Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
diff --git a/user_guide_src/source/database/active_record.rst b/user_guide_src/source/database/active_record.rst
index 5555a30..228d1d5 100644
--- a/user_guide_src/source/database/active_record.rst
+++ b/user_guide_src/source/database/active_record.rst
@@ -96,7 +96,7 @@
Please read the about the where function below for more information.
-Note: get_where() was formerly known as getwhere(), which has been
+.. note:: get_where() was formerly known as getwhere(), which has been
removed
$this->db->select()
@@ -198,7 +198,7 @@
$query = $this->db->get();
// Produces:
- // SELECT * FROM blogs // JOIN comments ON comments.id = blogs.id
+ // SELECT * FROM blogs JOIN comments ON comments.id = blogs.id
Multiple function calls can be made if you need several joins in one
query.
@@ -836,7 +836,7 @@
Generates a delete SQL string and runs the
query.::
- $this->db->empty_table('mytable'); // Produces // DELETE FROM mytable
+ $this->db->empty_table('mytable'); // Produces: DELETE FROM mytable
$this->db->truncate()
@@ -847,7 +847,7 @@
::
$this->db->from('mytable');
- $this->db->truncate();
+ $this->db->truncate();
// or
@@ -878,8 +878,6 @@
->limit(10, 20)
->get('mytable');
-.. note:: Method chaining only works with PHP 5.
-
.. _ar-caching:
*********************