summaryrefslogtreecommitdiffstats
path: root/user_guide_src/source/general
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-01-09 16:48:58 +0100
committerAndrey Andreev <narf@devilix.net>2015-01-09 16:48:58 +0100
commitfe9309d22c1b088f5363954d6dac013c8c955894 (patch)
tree08e77d99771b174ac65af7cda8c208607dc0c44a /user_guide_src/source/general
parent93455e31f1f88fa88394091a5156ac96e61c4179 (diff)
Bulk (mostly documentation) update
- Remove PHP version from license notices - Bump year number in copyright notices - Recommend PHP 5.4 or newer to be used - Tell Travis-CI to test on PHP 5.3.0 instead of the latest 5.3 version Related: #3450
Diffstat (limited to 'user_guide_src/source/general')
-rw-r--r--user_guide_src/source/general/requirements.rst2
-rw-r--r--user_guide_src/source/general/styleguide.rst8
2 files changed, 5 insertions, 5 deletions
diff --git a/user_guide_src/source/general/requirements.rst b/user_guide_src/source/general/requirements.rst
index 0b67e8e3a..1cb5938aa 100644
--- a/user_guide_src/source/general/requirements.rst
+++ b/user_guide_src/source/general/requirements.rst
@@ -2,7 +2,7 @@
Server Requirements
###################
-- `PHP <http://www.php.net/>`_ version 5.2.4 or newer.
+- `PHP <http://www.php.net/>`_ version 5.4 or newer is recommended and 5.2.4 as the absolute minimum required.
- A Database is required for most web application programming.
Currently supported databases are:
diff --git a/user_guide_src/source/general/styleguide.rst b/user_guide_src/source/general/styleguide.rst
index 6718bc342..3d8f0a78a 100644
--- a/user_guide_src/source/general/styleguide.rst
+++ b/user_guide_src/source/general/styleguide.rst
@@ -368,10 +368,10 @@ inability for CodeIgniter to send proper headers.
Compatibility
=============
-CodeIgniter requires a minimum PHP version of 5.2.4. Your code must either
-be compatible with this minimum requirement, provide a suitable fallback,
-or be an optional feature that dies quietly without affecting a user's
-application.
+CodeIgniter recommends PHP 5.4 or newer to be used, but the absolute
+minimum version required is 5.2.4. Your code must either be compatible
+with this minimum requirement, provide a suitable fallback, or be an
+optional feature that dies quietly without affecting a user's application.
Additionally, do not use PHP functions that require non-default libraries
to be installed unless your code contains an alternative method when the