diff options
| author | Ahmad Anbar <aanbar@gmail.com> | 2015-01-11 18:39:06 +0100 |
|---|---|---|
| committer | Ahmad Anbar <aanbar@gmail.com> | 2015-01-11 18:39:06 +0100 |
| commit | c8e1de74b139dc7f3e776f7ebf98495ec5b780a6 (patch) | |
| tree | 51709a1855d570ba495d81a172a029015341c2bd /user_guide_src/source/contributing/index.rst | |
| parent | faa4890addbaa90254ef160813a08f727d069415 (diff) | |
| parent | 99f31e76bd06876cd3bf789f9d2774f79818b7df (diff) | |
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'user_guide_src/source/contributing/index.rst')
| -rw-r--r-- | user_guide_src/source/contributing/index.rst | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/user_guide_src/source/contributing/index.rst b/user_guide_src/source/contributing/index.rst index 3548dbca1..89bceaa61 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 <http://help.github.com/send-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. **************************** @@ -86,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 ========= @@ -132,10 +139,10 @@ This will sign your commits with the information setup in your git config, e.g. Signed-off-by: John Q Public <john.public@example.com> -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. |