diff options
| author | Anton Lindqvist <anton@qvister.se> | 2012-06-08 10:09:47 +0200 |
|---|---|---|
| committer | Anton Lindqvist <anton@qvister.se> | 2012-06-08 10:09:47 +0200 |
| commit | 94c6b1f1c02466178c1f8e144542d753f27dd3d8 (patch) | |
| tree | 8e8ca4b8383e2481b0a689fd07fc230013531822 /user_guide_src/source/database/index.rst | |
| parent | 6581cac4d2b5fef69478ce1a5c3464200bfcbba5 (diff) | |
| parent | c78e56a7df140ee777ffc67687877f3e70c77e28 (diff) | |
Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into develop
Conflicts:
system/libraries/Cache/Cache.php
Diffstat (limited to 'user_guide_src/source/database/index.rst')
| -rw-r--r-- | user_guide_src/source/database/index.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/user_guide_src/source/database/index.rst b/user_guide_src/source/database/index.rst index ab12b7cb7..7ccb8fb00 100644 --- a/user_guide_src/source/database/index.rst +++ b/user_guide_src/source/database/index.rst @@ -3,7 +3,7 @@ The Database Class ################## CodeIgniter comes with a full-featured and very fast abstracted database -class that supports both traditional structures and Active Record +class that supports both traditional structures and Query Builder patterns. The database functions offer clear, simple syntax. .. toctree:: @@ -15,7 +15,7 @@ patterns. The database functions offer clear, simple syntax. Running Queries <queries> Generating Query Results <results> Query Helper Functions <helpers> - Active Record Class <active_record> + Query Builder Class <query_builder> Transactions <transactions> Table MetaData <table_data> Field MetaData <fields> |