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_150.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_150.html')
-rw-r--r-- | user_guide/installation/upgrade_150.html | 8 |
1 files changed, 4 insertions, 4 deletions
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. | */ |