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/installation/upgrade_160.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'user_guide/installation/upgrade_160.html')

diff --git a/user_guide/installation/upgrade_160.html b/user_guide/installation/upgrade_160.html
index 2adeff379..d06f58ec9 100644
--- a/user_guide/installation/upgrade_160.html
+++ b/user_guide/installation/upgrade_160.html
@@ -84,16 +84,16 @@ Upgrading from 1.5.4 to 1.6.0
 <p>Add the following to application/config/autoload.php</p>
 <p><code> /*<br />
 	| -------------------------------------------------------------------<br />
-	| Auto-load Model files<br />
+	|  Auto-load Model files<br />
 	| -------------------------------------------------------------------<br />
 	| Prototype:<br />
 	|<br />
-	| $autoload['model'] = array('my_model');<br />
+	|  $autoload['model'] = array('my_model');<br />
 	|<br />
 	*/<br />
 	<br />
 	$autoload['model'] = array();</code></p>
-<h2>Step 4: Add to your database.php </h2>
+<h2>Step 4: Add  to your database.php </h2>
 <p>Make the following changes to your application/config/database.php file:</p>
 <p>Add the following variable above the database configuration options, with <dfn>$active_group</dfn></p>
 <p><code>$active_record = TRUE;</code></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/installation/upgrade_160.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'user_guide/installation/upgrade_160.html')

diff --git a/user_guide/installation/upgrade_160.html b/user_guide/installation/upgrade_160.html
index d06f58ec9..16c53eb46 100644
--- a/user_guide/installation/upgrade_160.html
+++ b/user_guide/installation/upgrade_160.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