summaryrefslogtreecommitdiffstats
path: root/user_guide/installation/upgrade_170.html
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2011-07-02 00:54:49 +0200
committerDerek Jones <derek.jones@ellislab.com>2011-07-02 00:54:49 +0200
commit8f371a4954ec84f9ea80c26e654a4793714f8a07 (patch)
tree912d83e6e2adbe136d892f0a41ea1730dc11206a /user_guide/installation/upgrade_170.html
parent806b82448ddccece1311228519dc1410dacd0971 (diff)
parent4b9c62980599228f070b401c7673dce8085b0c61 (diff)
hand merged remaining unresolved files following the backout of 648b42a75739, which was a NON-trivial whitespace commit
Diffstat (limited to 'user_guide/installation/upgrade_170.html')
-rw-r--r--user_guide/installation/upgrade_170.html8
1 files changed, 4 insertions, 4 deletions
diff --git a/user_guide/installation/upgrade_170.html b/user_guide/installation/upgrade_170.html
index 6fd92f52a..01597a416 100644
--- a/user_guide/installation/upgrade_170.html
+++ b/user_guide/installation/upgrade_170.html
@@ -88,14 +88,14 @@ Here is an example of what this column might look like for MySQL:</p>
<code>ALTER TABLE `ci_sessions` ADD `user_data` text NOT NULL</code>
-<p>You'll find more information regarding the new Session functionality in the <a href="../libraries/sessions.html">Session class</a> page.</p>
+<p>You'll find more information regarding the new Session functionality in the <a href="../libraries/sessions.html">Session class</a> page.</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
-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>
+<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>