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_140.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_140.html')
-rw-r--r-- | user_guide/installation/upgrade_140.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/user_guide/installation/upgrade_140.html b/user_guide/installation/upgrade_140.html index 234e2f5b3..2049628a6 100644 --- a/user_guide/installation/upgrade_140.html +++ b/user_guide/installation/upgrade_140.html @@ -57,7 +57,7 @@ Upgrading from 1.3.3 to 1.4.0 <h1>Upgrading from 1.3.3 to 1.4.0</h1> -<p class="important"><strong>Note:</strong> The instructions on this page assume you are running version 1.3.3. If you +<p class="important"><strong>Note:</strong> The instructions on this page assume you are running version 1.3.3. 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> @@ -95,7 +95,7 @@ have not upgraded to that version please do so first.</p> |-------------------------------------------------------------------------- | | If you would like to use the "hooks" feature you must enable it by -| setting this variable to TRUE (boolean). See the user guide for details. +| setting this variable to TRUE (boolean). See the user guide for details. | */ $config['enable_hooks'] = FALSE; @@ -111,7 +111,7 @@ $config['enable_hooks'] = FALSE; | get a warning message. | | As a security measure you are STRONGLY encouraged to restrict URLs to -| as few characters as possible. By default only these are allowed: a-z 0-9~%.:_- +| as few characters as possible. By default only these are allowed: a-z 0-9~%.:_- | | Leave blank to allow all characters -- but only if you are insane. | |