Automated merge with http://hg.ellislab.com/CodeIgniter2

5 files changed, 9 insertions, 9 deletions

diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html
index f4114b7d1..f557a7887 100644
--- a/user_guide/installation/downloads.html
+++ b/user_guide/installation/downloads.html
@@ -84,11 +84,11 @@ Downloading CodeIgniter
 
 <h1 id="hg">Mercurial Server</h1>
 <p><a href="http://mercurial.selenic.com">Mercurial</a> is a distributed version control system.</p>
-							
+
 							<p>Public Hg access is available at <a href="http://bitbucket.org/ellislab/codeigniter/">BitBucket</a>.
 								Please note that while every effort is made to keep this code base functional, we cannot guarantee the functionality of code taken
 								from the tip.</p>
-							
+
 							<p>Beginning with version 1.6.1, stable tags are also available via BitBucket, simply select the version from the Tags dropdown.</p>
 </div>
 <!-- END CONTENT -->
diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html
index 3d58725ed..973d21064 100644
--- a/user_guide/installation/index.html
+++ b/user_guide/installation/index.html
@@ -73,7 +73,7 @@ variables at the top of the file with the new name you've chosen.</p>
 <p>For the best security, both the <dfn>system</dfn> and any <dfn>application</dfn> folders should be placed above web root so that they are not directly accessible via a browser.  By default, .htaccess files are included in each folder to help prevent direct access, but it is best to remove them from public access entirely in case the web server configuration changes or doesn't abide by the .htaccess.</p>
 
 <p>After moving them, open your main <kdb>index.php</kbd> file and set the <samp>$system_folder</samp> and <samp>$application_folder</samp> variables, preferably with a full path, e.g. '<dfn>/www/MyUser/system</dfn>'.</p>
-	
+
 
 <p>That's it!</p>
 
diff --git a/user_guide/installation/upgrade_160.html b/user_guide/installation/upgrade_160.html
index e0e987ede..b6a946d7e 100644
--- a/user_guide/installation/upgrade_160.html
+++ b/user_guide/installation/upgrade_160.html
@@ -79,7 +79,7 @@ Upgrading from 1.5.4 to 1.6.0
 
 <h2>Step 2: Add time_to_update to your config.php </h2>
 <p>Add the following to application/config/config.php with the other session configuration options</p>
-<p><code>$config['sess_time_to_update'] 		= 300;</code></p>
+<p><code>$config['sess_time_to_update']			= 300;</code></p>
 <h2>Step 3: Add $autoload['model']</h2>
 <p>Add the following to application/config/autoload.php</p>
 <p><code> /*<br />
diff --git a/user_guide/installation/upgrade_170.html b/user_guide/installation/upgrade_170.html
index 7f3cec614..91238ecbc 100644
--- a/user_guide/installation/upgrade_170.html
+++ b/user_guide/installation/upgrade_170.html
@@ -79,7 +79,7 @@ Upgrading from 1.6.3 to 1.7.0
 
 <h2>Step 2: Update your Session Table</h2>
 
-<p>If you are using the Session class in your application, AND if you are storing session data to a database, you must add a new column named <dfn>user_data</dfn> to your session table. 
+<p>If you are using the Session class in your application, AND if you are storing session data to a database, you must add a new column named <dfn>user_data</dfn> to your session table.
 Here is an example of what this column might look like for MySQL:</p>
 
 <code>user_data text NOT NULL</code>
@@ -93,7 +93,7 @@ Here is an example of what this column might look like for MySQL:</p>
 
 <h2>Step 3: Update your Validation Syntax</h2>
 
-<p>This is an <strong>optional</strong>, but recommended step, for people currently using the Validation class.  CI 1.7 introduces a new  <a href="../libraries/form_validation.html">Form Validation class</a>, which 
+<p>This is an <strong>optional</strong>, but recommended step, for people currently using the Validation class.  CI 1.7 introduces a new  <a href="../libraries/form_validation.html">Form Validation class</a>, which
 deprecates the old Validation library.  We have left the old one in place so that existing applications that use it will not break, but you are encouraged to
 migrate to the new version as soon as possible.  Please read the user guide carefully as the new library works a little differently, and has several new features.</p>
 
diff --git a/user_guide/installation/upgrade_200.html b/user_guide/installation/upgrade_200.html
index 155df90d3..58ed6e5ce 100644
--- a/user_guide/installation/upgrade_200.html
+++ b/user_guide/installation/upgrade_200.html
@@ -80,9 +80,9 @@ Upgrading from 1.7.2 to 2.0.0
 <h2>Step 3: Convert your Plugins to Helpers</h2>
 
 <p>2.0.0 gets rid of the "Plugin" system as their functionality was identical to Helpers, but non-extensible.  You will need to rename your plugin files from <var>filename_pi.php</var> to <var>filename_helper.php</var>, move them to your <kbd>helpers</kbd> folder, and change all instances of:
-	
+
 	<code>$this->load->plugin('foo');</code>
-	
+
 to
 
 	<code>$this->load->helper('foo');</code>
@@ -97,7 +97,7 @@ to
 	making it no longer possible to decode encrypted data produced by the original version of this library.  To help with the transition, a new method has
 	been added, <kbd>encode_from_legacy()</kbd> that will decode the data with the original algorithm and return a re-encoded string using the improved methods.
 	This will enable you to easily replace stale encrypted data with fresh in your applications, either on the fly or en masse.</p>
-	
+
 <p>Please read <a href="../libraries/encryption.html#legacy">how to use this method</a> in the Encryption library documentation.</p>
 
 </p>