summaryrefslogtreecommitdiffstats
path: root/user_guide/installation/upgrade_141.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_141.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_141.html')
-rw-r--r--user_guide/installation/upgrade_141.html10
1 files changed, 5 insertions, 5 deletions
diff --git a/user_guide/installation/upgrade_141.html b/user_guide/installation/upgrade_141.html
index 79e51e4ab..c19143c64 100644
--- a/user_guide/installation/upgrade_141.html
+++ b/user_guide/installation/upgrade_141.html
@@ -56,7 +56,7 @@ Upgrading from 1.4.0 to 1.4.1 </td>
<h1>Upgrading from 1.4.0 to 1.4.1</h1>
-<p class="important"><strong>Note:</strong> The instructions on this page assume you are running version 1.4.0. If you
+<p class="important"><strong>Note:</strong> The instructions on this page assume you are running version 1.4.0. 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>
@@ -88,16 +88,16 @@ have not upgraded to that version please do so first.</p>
| Output Compression
|--------------------------------------------------------------------------
|
-| Enables Gzip output compression for faster page loads. When enabled,
+| Enables Gzip output compression for faster page loads. When enabled,
| the output class will test whether your server supports Gzip.
| Even if it does, however, not all browsers support compression
| so enable only if you are reasonably sure your visitors can handle it.
|
-| VERY IMPORTANT: If you are getting a blank page when compression is enabled it
+| VERY IMPORTANT: If you are getting a blank page when compression is enabled it
| means you are prematurely outputting something to your browser. It could
-| even be a line of whitespace at the end of one of your scripts. For
+| even be a line of whitespace at the end of one of your scripts. For
| compression to work, nothing can be sent before the output buffer is called
-| by the output class. Do not "echo" any values with compression enabled.
+| by the output class. Do not "echo" any values with compression enabled.
|
*/
$config['compress_output'] = FALSE;