summaryrefslogtreecommitdiffstats
path: root/contributing.md
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 /contributing.md
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 'contributing.md')
-rw-r--r--contributing.md9
1 files changed, 5 insertions, 4 deletions
diff --git a/contributing.md b/contributing.md
index 126bdc74f..5296daa88 100644
--- a/contributing.md
+++ b/contributing.md
@@ -29,9 +29,10 @@ If you change anything that requires a change to documentation then you will nee
### 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 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
@@ -91,4 +92,4 @@ If you are using command-line you can do the following:
2. `git pull codeigniter develop`
3. `git push origin develop`
-Now your fork is up to date. This should be done regularly, or before you send a pull request at least.
+Now your fork is up to date. This should be done regularly, or before you send a pull request at least. \ No newline at end of file