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/overview/index.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/overview/index.rst')
| -rw-r--r-- | user_guide_src/source/overview/index.rst | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/user_guide_src/source/overview/index.rst b/user_guide_src/source/overview/index.rst index d541e796c..dc91f78c4 100644 --- a/user_guide_src/source/overview/index.rst +++ b/user_guide_src/source/overview/index.rst @@ -4,15 +4,13 @@ CodeIgniter Overview The following pages describe the broad concepts behind CodeIgniter: -- :doc:`CodeIgniter at a Glance <at_a_glance>` -- :doc:`Supported Features <features>` -- :doc:`Application Flow Chart <appflow>` -- :doc:`Introduction to the Model-View-Controller <mvc>` -- :doc:`Design and Architectural Goals <goals>` - .. toctree:: - :glob: - :hidden: :titlesonly: - *
\ No newline at end of file + Getting Started <getting_started> + CodeIgniter at a Glance <at_a_glance> + CodeIgniter Cheatsheets <cheatsheets> + Supported Features <features> + Application Flow Chart <appflow> + Model-View-Controller <mvc> + Architectural Goals <goals>
\ No newline at end of file |