diff options
author | Derek Jones <derek.jones@ellislab.com> | 2011-07-02 00:54:49 +0200 |
---|---|---|
committer | Derek Jones <derek.jones@ellislab.com> | 2011-07-02 00:54:49 +0200 |
commit | 8f371a4954ec84f9ea80c26e654a4793714f8a07 (patch) | |
tree | 912d83e6e2adbe136d892f0a41ea1730dc11206a /user_guide/installation/upgrade_130.html | |
parent | 806b82448ddccece1311228519dc1410dacd0971 (diff) | |
parent | 4b9c62980599228f070b401c7673dce8085b0c61 (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_130.html')
-rw-r--r-- | user_guide/installation/upgrade_130.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/user_guide/installation/upgrade_130.html b/user_guide/installation/upgrade_130.html index e6bb9480e..f7ffac74e 100644 --- a/user_guide/installation/upgrade_130.html +++ b/user_guide/installation/upgrade_130.html @@ -57,7 +57,7 @@ Upgrading from 1.2 to 1.3 <h1>Upgrading from 1.2 to 1.3</h1> -<p class="important"><strong>Note:</strong> The instructions on this page assume you are running version 1.2. If you +<p class="important"><strong>Note:</strong> The instructions on this page assume you are running version 1.2. If you have not upgraded to that version please do so first.</p> @@ -72,8 +72,8 @@ with a static one.</p> <p class="important"><strong>Note:</strong> If you have any custom developed files in these folders please make copies of them first.</p> <ul> -<li>application/<strong>models</strong>/ (new for 1.3)</li> -<li>codeigniter (new for 1.3)</li> +<li>application/<strong>models</strong>/ (new for 1.3)</li> +<li>codeigniter (new for 1.3)</li> <li>drivers</li> <li>helpers</li> <li>init</li> @@ -109,7 +109,7 @@ replace this folder:</p> <h2>Step 3: Update your index.php file</h2> -<p>Please open your main <dfn>index.php</dfn> file (located at your root). At the very bottom of the file, change this:</p> +<p>Please open your main <dfn>index.php</dfn> file (located at your root). At the very bottom of the file, change this:</p> <code>require_once BASEPATH.'libraries/Front_controller'.EXT;</code> |