summaryrefslogtreecommitdiffstats
path: root/user_guide_src/source/tutorial/news_section.rst
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2012-04-26 23:34:05 +0200
committerTimothy Warren <tim@timshomepage.net>2012-04-26 23:34:05 +0200
commitf59bb1ac944dfaed23150ffd452ce5bca9f5f5c0 (patch)
treed48f5d570c9f1696997aabb863507d5854e8af50 /user_guide_src/source/tutorial/news_section.rst
parent96ddee29ef2d2deac9bfb91f7d508efca09ee70f (diff)
parent8ebd1b7a21dec212be7ba0be51ce671f45b389ca (diff)
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into patch
Diffstat (limited to 'user_guide_src/source/tutorial/news_section.rst')
-rw-r--r--user_guide_src/source/tutorial/news_section.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/user_guide_src/source/tutorial/news_section.rst b/user_guide_src/source/tutorial/news_section.rst
index 38e4214ca..82b3e3b38 100644
--- a/user_guide_src/source/tutorial/news_section.rst
+++ b/user_guide_src/source/tutorial/news_section.rst
@@ -54,7 +54,7 @@ seed records.
Now that the database and a model have been set up, you'll need a method
to get all of our posts from our database. To do this, the database
abstraction layer that is included with CodeIgniter — `Active
-Record <../database/active_record.html>`_ — is used. This makes it
+Record <../database/query_builder.html>`_ — is used. This makes it
possible to write your 'queries' once and make them work on `all
supported database systems <../general/requirements.html>`_. Add the
following code to your model.
@@ -76,7 +76,7 @@ following code to your model.
With this code you can perform two different queries. You can get all
news records, or get a news item by its `slug <#>`_. You might have
noticed that the $slug variable wasn't sanitized before running the
-query; Active Record does this for you.
+query; Query Builder does this for you.
Display the news
----------------