summaryrefslogtreecommitdiffstats
path: root/user_guide_src/source/general
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2011-10-11 14:38:36 +0200
committerTimothy Warren <tim@timshomepage.net>2011-10-11 14:38:36 +0200
commit2c129c82933ebc733003c5aa5ba7ef907a9abcbf (patch)
tree4e57f14887b74b377ab0305c699a54c9b65c1195 /user_guide_src/source/general
parente347927cf69a71d2fa0895806da7847ddf4f6075 (diff)
parent8352f093567caf7e64e38698b6d9cf65396d5a10 (diff)
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'user_guide_src/source/general')
-rw-r--r--user_guide_src/source/general/index.rst63
-rw-r--r--user_guide_src/source/general/styleguide.rst7
2 files changed, 32 insertions, 38 deletions
diff --git a/user_guide_src/source/general/index.rst b/user_guide_src/source/general/index.rst
index ae0d0961c..2162b8140 100644
--- a/user_guide_src/source/general/index.rst
+++ b/user_guide_src/source/general/index.rst
@@ -1,39 +1,32 @@
-##################
-General
-##################
-
-
-- :doc:`CodeIgniter URLs <urls>`
-- :doc:`Controllers <controllers>`
-- :doc:`Reserved Names <reserved_names>`
-- :doc:`Views <views>`
-- :doc:`Models <models>`
-- :doc:`Helpers <helpers>`
-- :doc:`Using CodeIgniter Libraries <libraries>`
-- :doc:`Creating Your Own Libraries <creating_libraries>`
-- :doc:`Using CodeIgniter Drivers <drivers>`
-- :doc:`Creating Your Own Drivers <creating_drivers>`
-- :doc:`Creating Core Classes <core_classes>`
-- :doc:`Creating Ancillary Classes <ancillary_classes>`
-- :doc:`Hooks - Extending the Core <hooks>`
-- :doc:`Auto-loading Resources <autoloader>`
-- :doc:`Common Function <common_functions>`
-- :doc:`URI Routing <routing>`
-- :doc:`Error Handling <errors>`
-- :doc:`Caching <caching>`
-- :doc:`Profiling Your Application <profiling>`
-- :doc:`Running via the CLI <cli>`
-- :doc:`Managing Applications <managing_apps>`
-- :doc:`Handling Multiple Environments <environments>`
-- :doc:`Alternative PHP Syntax <alternative_php>`
-- :doc:`Security <security>`
-- :doc:`PHP Style Guide <styleguide>`
-- :doc:`Server Requirements <requirements>`
-- :doc:`Credits <credits>`
+##############
+General Topics
+##############
.. toctree::
- :glob:
:titlesonly:
- :hidden:
- * \ No newline at end of file
+ urls
+ controllers
+ reserved_names
+ views
+ models
+ Helpers <helpers>
+ libraries
+ creating_libraries
+ drivers
+ creating_drivers
+ core_classes
+ ancillary_classes
+ hooks
+ autoloader
+ common_functions
+ routing
+ errors
+ Caching <caching>
+ profiling
+ cli
+ managing_apps
+ environments
+ alternative_php
+ security
+ PHP Style Guide <styleguide>
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.