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_b11.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_b11.html')
| -rw-r--r-- | user_guide/installation/upgrade_b11.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/user_guide/installation/upgrade_b11.html b/user_guide/installation/upgrade_b11.html index d2fc20d18..add7228c8 100644 --- a/user_guide/installation/upgrade_b11.html +++ b/user_guide/installation/upgrade_b11.html @@ -61,7 +61,7 @@ Upgrading from Beta 1.0 to Beta 1.1 <h2>Step 1: Replace your index file</h2> -<p>Replace your main <kbd>index.php</kbd> file with the new index.php file. Note: If you have renamed your "system" folder you will need to edit this info in the new file.</p> +<p>Replace your main <kbd>index.php</kbd> file with the new index.php file. Note: If you have renamed your "system" folder you will need to edit this info in the new file.</p> <h2>Step 2: Relocate your config folder</h2> @@ -91,7 +91,7 @@ the following item to your version: <dfn>language/english/calendar_lang.php</dfn <h2>Step 5: Edit your config file</h2> -<p>The original <kbd>application/config/config.php</kbd> file has a typo in it Open the file and look for the items related to cookies:</p> +<p>The original <kbd>application/config/config.php</kbd> file has a typo in it Open the file and look for the items related to cookies:</p> <code>$conf['cookie_prefix'] = "";<br /> $conf['cookie_domain'] = "";<br /> @@ -112,7 +112,7 @@ $config['cookie_path'] = "/";</code> |------------------------------------------------<br /> |<br /> | This item determines which server global <br /> -| should be used to retrieve the URI string. The <br /> +| should be used to retrieve the URI string. The <br /> | default setting of "auto" works for most servers.<br /> | If your links do not seem to work, try one of <br /> | the other delicious flavors:<br /> |