summaryrefslogtreecommitdiffstats
path: root/user_guide_src/source/contributing
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/contributing
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/contributing')
-rw-r--r--user_guide_src/source/contributing/index.rst7
1 files changed, 4 insertions, 3 deletions
diff --git a/user_guide_src/source/contributing/index.rst b/user_guide_src/source/contributing/index.rst
index 427a0673f..89bceaa61 100644
--- a/user_guide_src/source/contributing/index.rst
+++ b/user_guide_src/source/contributing/index.rst
@@ -92,9 +92,10 @@ must also be updated for every change. Also PHPDoc blocks must be maintained.
Compatibility
=============
-CodeIgniter is compatible with PHP 5.2.4 so all code supplied must stick to
-this requirement. If PHP 5.3 or 5.4 functions or features are used then there
-must be a fallback for PHP 5.2.4.
+CodeIgniter recommends PHP 5.4 or newer to be used, but is compatible with
+PHP 5.2.4 so all code supplied must stick to this requirement. If PHP 5.3
+(and above) functions or features are used then there must be a fallback
+for PHP 5.2.4.
Branching
=========