From ce899c93d9ed60e004817b3ac485139d4ea0080b Mon Sep 17 00:00:00 2001 From: David Wosnitza Date: Sun, 14 Dec 2014 07:25:01 +0100 Subject: rebuild and optimized toctrees Signed-off-by: David Wosnitza --- user_guide_src/source/contributing/index.rst | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'user_guide_src/source/contributing') diff --git a/user_guide_src/source/contributing/index.rst b/user_guide_src/source/contributing/index.rst index 3548dbca1..427a0673f 100644 --- a/user_guide_src/source/contributing/index.rst +++ b/user_guide_src/source/contributing/index.rst @@ -2,6 +2,12 @@ Contributing to CodeIgniter ########################### +.. toctree:: + :titlesonly: + + ../documentation/index + ../DCO + CodeIgniter is a community driven project and accepts contributions of code and documentation from the community. These contributions are made in the form of Issues or `Pull Requests `_ on @@ -28,7 +34,7 @@ Note that GitHub is not for general support questions! If you are having trouble using a feature of CodeIgniter, ask for help on the forum. -If you are wondering if you are using +If you are wondering if you are using something correctly or if you have found a bug, ask on the forum first. **************************** @@ -132,10 +138,10 @@ This will sign your commits with the information setup in your git config, e.g. Signed-off-by: John Q Public -If you are using Tower there is a "Sign-Off" checkbox in the commit window. You -could even alias git commit to use the -s flag so you don’t have to think about +If you are using Tower there is a "Sign-Off" checkbox in the commit window. You +could even alias git commit to use the -s flag so you don’t have to think about it. -By signing your work in this manner, you certify to a "Developer's Certificate +By signing your work in this manner, you certify to a "Developer's Certificate or Origin". The current version of this certificate is in the :doc:`/DCO` file -in the root of this documentation. \ No newline at end of file +in the root of this documentation. -- cgit v1.2.3-24-g4f1b From fe9309d22c1b088f5363954d6dac013c8c955894 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Fri, 9 Jan 2015 17:48:58 +0200 Subject: 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 --- user_guide_src/source/contributing/index.rst | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'user_guide_src/source/contributing') 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 ========= -- cgit v1.2.3-24-g4f1b