diff options
author | Derek Jones <derek.jones@ellislab.com> | 2011-10-10 23:32:55 +0200 |
---|---|---|
committer | Derek Jones <derek.jones@ellislab.com> | 2011-10-10 23:32:55 +0200 |
commit | bf6df692d7da01a8b3da4a7c4618f1dd1e7265c5 (patch) | |
tree | 165da355ed08948b1089584fbad09e4af8167f33 /user_guide_src/source/general/styleguide.rst | |
parent | 77a8c1fbae04389be9a524ce565bb09b51ffec3e (diff) | |
parent | 619b122cc8c213df558838ce9cc1c157a85a65b6 (diff) |
Merge branch 'feature/userguide-toc' into develop
Conflicts:
user_guide_src/source/_themes/eldocs/layout.html
user_guide_src/source/general/index.rst
user_guide_src/source/index.rst
Diffstat (limited to 'user_guide_src/source/general/styleguide.rst')
-rw-r--r-- | user_guide_src/source/general/styleguide.rst | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/user_guide_src/source/general/styleguide.rst b/user_guide_src/source/general/styleguide.rst index 0373fc791..b3dc08871 100644 --- a/user_guide_src/source/general/styleguide.rst +++ b/user_guide_src/source/general/styleguide.rst @@ -1,6 +1,7 @@ -######################## -General Style and Syntax -######################## +############### +PHP Style Guide +############### + The following page describes the use of coding rules adhered to when developing CodeIgniter. |