diff options
author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-04-26 23:15:36 +0200 |
---|---|---|
committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-04-26 23:15:36 +0200 |
commit | ba4636187a745a287c81517fbc53f2f30fe16d88 (patch) | |
tree | bdcb56cc80e72735d0118f3abf91e04f0dfba5cd /user_guide_src/source/tutorial/index.rst | |
parent | cdfbd5281e4dec7278a07943832c2590c1141eb3 (diff) | |
parent | f3b0074b0ccaadef31737cbd6be21ec7272f7538 (diff) |
Fixed conflicts.
Diffstat (limited to 'user_guide_src/source/tutorial/index.rst')
-rw-r--r-- | user_guide_src/source/tutorial/index.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/user_guide_src/source/tutorial/index.rst b/user_guide_src/source/tutorial/index.rst index c959d04d2..b1ab331d1 100644 --- a/user_guide_src/source/tutorial/index.rst +++ b/user_guide_src/source/tutorial/index.rst @@ -16,7 +16,7 @@ This tutorial will primarily focus on: - Model-View-Controller basics - Routing basics - Form validation -- Performing basic database queries using "Active Record" +- Performing basic database queries using "Query Builder" The entire tutorial is split up over several pages, each explaining a small part of the functionality of the CodeIgniter framework. You'll go |