From 4b9c62980599228f070b401c7673dce8085b0c61 Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Fri, 1 Jul 2011 17:40:48 -0500
Subject: backed out 648b42a75739, which was a NON-trivial whitespace commit. 
 It broke the Typography class's string replacements, for instance

---
 user_guide/database/fields.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'user_guide/database/fields.html')

diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html
index b20436129..04d8b8096 100644
--- a/user_guide/database/fields.html
+++ b/user_guide/database/fields.html
@@ -92,7 +92,7 @@ foreach ($query->list_fields() as $field)<br />
 <h2>$this->db->field_exists()</h2>
 
 <p>Sometimes it's helpful to know whether a particular field exists before performing an action.
-Returns a boolean TRUE/FALSE. Usage example:</p>
+Returns a boolean TRUE/FALSE.  Usage example:</p>
 
 <code>
 if ($this->db->field_exists('field_name', 'table_name'))<br />
@@ -101,7 +101,7 @@ if ($this->db->field_exists('field_name', 'table_name'))<br />
 }
 </code>
 
-<p>Note: Replace <em>field_name</em> with the name of the column you are looking for, and replace
+<p>Note:  Replace <em>field_name</em> with the name of the column you are looking for, and replace
 <em>table_name</em> with the name of the table you are looking for.</p>
 
 
-- 
cgit v1.2.3-24-g4f1b


From b8c038a3e7742f32915d7f1ab69627075e8d0c39 Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Sat, 20 Aug 2011 08:57:14 -0500
Subject: updated version number in user guide, removed some stray merge
 markers found in the change log

---
 user_guide/database/fields.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'user_guide/database/fields.html')

diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html
index 04d8b8096..3a1ea0cf2 100644
--- a/user_guide/database/fields.html
+++ b/user_guide/database/fields.html
@@ -28,7 +28,7 @@
 <div id="masthead">
 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">
 <tr>
-<td><h1>CodeIgniter User Guide Version 2.0.2</h1></td>
+<td><h1>CodeIgniter User Guide Version 2.0.3</h1></td>
 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>
 </tr>
 </table>
-- 
cgit v1.2.3-24-g4f1b