From 37f4b9caa02783e06dd7c5318200113409a0deb1 Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Fri, 1 Jul 2011 17:56:50 -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_150.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html
index 9cd0089c0..342d486df 100644
--- a/user_guide/installation/upgrade_150.html
+++ b/user_guide/installation/upgrade_150.html
@@ -57,7 +57,7 @@ Upgrading from 1.4.1 to 1.5.0
 
 <h1>Upgrading from 1.4.1 to 1.5.0</h1>
 
-<p class="important"><strong>Note:</strong> The instructions on this page assume you are running version 1.4.1. If you
+<p class="important"><strong>Note:</strong> The instructions on this page assume you are running version 1.4.1.  If you
 have not upgraded to that version please do so first.</p>
 
 <p>Before performing an update you should take your site offline by replacing the index.php file with a static one.</p>
@@ -105,7 +105,7 @@ $db['default']['cachedir'] = '';
 |--------------------------------------------------------------------------
 |
 | This item allows you to set the filename/classname prefix when extending
-| native libraries. For more information please see the user guide:
+| native libraries.  For more information please see the user guide:
 |
 | http://codeigniter.com/user_guide/general/core_classes.html
 | http://codeigniter.com/user_guide/general/creating_libraries.html
@@ -120,7 +120,7 @@ $config['subclass_prefix'] = 'MY_';
 |
 | If your PHP installation does not have short tag support enabled CI
 | can rewrite the tags on-the-fly, enabling you to utilize that syntax
-| in your view files. Options are TRUE or FALSE (boolean)
+| in your view files.  Options are TRUE or FALSE (boolean)
 |
 */
 $config['rewrite_short_tags'] = FALSE;
@@ -136,7 +136,7 @@ $config['rewrite_short_tags'] = FALSE;
 |--------------------------------------------------------------------------
 |
 | If you would like errors or debug messages logged set this variable to
-| TRUE (boolean). Note: You must set the file permissions on the "logs" folder
+| TRUE (boolean).  Note: You must set the file permissions on the "logs" folder
 | such that it is writable.
 |
 */
-- 
cgit v1.2.3-24-g4f1b


From 9c63d0bb34be4007178d5a7e46348d5e23fee3ff Mon Sep 17 00:00:00 2001
From: Phil Sturgeon <email@philsturgeon.co.uk>
Date: Thu, 27 Oct 2011 01:55:44 +0100
Subject: Bumped CodeIgniter version to 2.1.0.

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

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

diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html
index f622ea310..f910aa039 100644
--- a/user_guide/installation/upgrade_150.html
+++ b/user_guide/installation/upgrade_150.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.3</h1></td>
+<td><h1>CodeIgniter User Guide Version 2.1.0</h1></td>
 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>
 </tr>
 </table>
-- 
cgit v1.2.3-24-g4f1b