Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop

1 files changed, 4 insertions, 6 deletions

diff --git a/user_guide_src/source/database/active_record.rst b/user_guide_src/source/database/active_record.rst
index 5555a30bc..228d1d509 100644
--- a/user_guide_src/source/database/active_record.rst
+++ b/user_guide_src/source/database/active_record.rst
@@ -96,7 +96,7 @@ function::
 
 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 @@ Permits you to write the JOIN portion of your query::
 	$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 @@ $this->db->empty_table()
 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 @@ Generates a truncate SQL string and runs the query.
 ::
 
 	$this->db->from('mytable');
-	$this->db->truncate();  
+	$this->db->truncate();
 	
 	// or  
 	
@@ -878,8 +878,6 @@ multiple functions. Consider this example::
 				->limit(10, 20)
 				->get('mytable');
 
-.. note:: Method chaining only works with PHP 5.
-
 .. _ar-caching:
 
 *********************