summaryrefslogtreecommitdiffstats
path: root/user_guide/installation/upgrade_133.html
diff options
context:
space:
mode:
authorGreg Aker <greg.aker@ellislab.com>2011-04-27 08:47:47 +0200
committerGreg Aker <greg.aker@ellislab.com>2011-04-27 08:47:47 +0200
commita6507905578f1cf209776ae3d53099a005a06823 (patch)
tree9f23bb557f920034cf65c86059c84e37efd34d79 /user_guide/installation/upgrade_133.html
parent60ef4ea72e169e174ff8dbb421609a178a3c0c48 (diff)
parent25d495b4a2598f771a858108a2cd2e96f0130412 (diff)
merging in changes
Diffstat (limited to 'user_guide/installation/upgrade_133.html')
-rw-r--r--user_guide/installation/upgrade_133.html8
1 files changed, 4 insertions, 4 deletions
diff --git a/user_guide/installation/upgrade_133.html b/user_guide/installation/upgrade_133.html
index c63465955..a81f67bf5 100644
--- a/user_guide/installation/upgrade_133.html
+++ b/user_guide/installation/upgrade_133.html
@@ -57,7 +57,7 @@ Upgrading from 1.3.2 to 1.3.3
<h1>Upgrading from 1.3.2 to 1.3.3</h1>
-<p class="important"><strong>Note:</strong> The instructions on this page assume you are running version 1.3.2. If you
+<p class="important"><strong>Note:</strong> The instructions on this page assume you are running version 1.3.2. 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>
@@ -83,9 +83,9 @@ have not upgraded to that version please do so first.</p>
<p>If you are <strong>NOT</strong> using CodeIgniter's <a href="../general/models.html">Models</a> feature disregard this step.</p>
-<p>As of version 1.3.3, CodeIgniter does <strong>not</strong> connect automatically to your database when a model is loaded. This
-allows you greater flexibility in determining which databases you would like used with your models. If your application is not connecting
-to your database prior to a model being loaded you will have to update your code. There are several options for connecting,
+<p>As of version 1.3.3, CodeIgniter does <strong>not</strong> connect automatically to your database when a model is loaded. This
+allows you greater flexibility in determining which databases you would like used with your models. If your application is not connecting
+to your database prior to a model being loaded you will have to update your code. There are several options for connecting,
<a href="../general/models.html">as described here</a>.</p>