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/database/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/database/index.rst')
| -rw-r--r-- | user_guide_src/source/database/index.rst | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/user_guide_src/source/database/index.rst b/user_guide_src/source/database/index.rst index 3b59986be..ab12b7cb7 100644 --- a/user_guide_src/source/database/index.rst +++ b/user_guide_src/source/database/index.rst @@ -6,24 +6,20 @@ CodeIgniter comes with a full-featured and very fast abstracted database class that supports both traditional structures and Active Record patterns. The database functions offer clear, simple syntax. -- :doc:`Quick Start: Usage Examples <examples>` -- :doc:`Database Configuration <configuration>` -- :doc:`Connecting to a Database <connecting>` -- :doc:`Running Queries <queries>` -- :doc:`Generating Query Results <results>` -- :doc:`Query Helper Functions <helpers>` -- :doc:`Active Record Class <active_record>` -- :doc:`Transactions <transactions>` -- :doc:`Table MetaData <table_data>` -- :doc:`Field MetaData <fields>` -- :doc:`Custom Function Calls <call_function>` -- :doc:`Query Caching <caching>` -- :doc:`Database manipulation with Database Forge <forge>` -- :doc:`Database Utilities Class <utilities>` - .. toctree:: - :glob: :titlesonly: - :hidden: - *
\ No newline at end of file + Quick Start: Usage Examples <examples> + Database Configuration <configuration> + Connecting to a Database <connecting> + Running Queries <queries> + Generating Query Results <results> + Query Helper Functions <helpers> + Active Record Class <active_record> + Transactions <transactions> + Table MetaData <table_data> + Field MetaData <fields> + Custom Function Calls <call_function> + Query Caching <caching> + Database Manipulation with Database Forge <forge> + Database Utilities Class <utilities>
\ No newline at end of file |