summaryrefslogtreecommitdiffstats
path: root/user_guide_src/source/installation/upgrade_b11.rst
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2011-10-05 23:33:16 +0200
committerDerek Jones <derek.jones@ellislab.com>2011-10-05 23:33:16 +0200
commit3af48520578c79460e31743d145f6509482a8ff9 (patch)
treeaab5c300e9f498b558919b187aa2403c8596fee9 /user_guide_src/source/installation/upgrade_b11.rst
parent70ff9c9b90e01fee332dc2b3c9376af2915494a7 (diff)
fixed code block spacing in installation docs files
Diffstat (limited to 'user_guide_src/source/installation/upgrade_b11.rst')
-rw-r--r--user_guide_src/source/installation/upgrade_b11.rst27
1 files changed, 24 insertions, 3 deletions
diff --git a/user_guide_src/source/installation/upgrade_b11.rst b/user_guide_src/source/installation/upgrade_b11.rst
index 1d8efbe72..e70759be6 100644
--- a/user_guide_src/source/installation/upgrade_b11.rst
+++ b/user_guide_src/source/installation/upgrade_b11.rst
@@ -44,14 +44,35 @@ Step 5: Edit your config file
The original application/config/config.php file has a typo in it Open
the file and look for the items related to cookies::
- $conf['cookie_prefix'] = ""; $conf['cookie_domain'] = ""; $conf['cookie_path'] = "/";
+ $conf['cookie_prefix'] = "";
+ $conf['cookie_domain'] = "";
+ $conf['cookie_path'] = "/";
Change the array name from $conf to $config, like this::
- $config['cookie_prefix'] = ""; $config['cookie_domain'] = ""; $config['cookie_path'] = "/";
+ $config['cookie_prefix'] = "";
+ $config['cookie_domain'] = "";
+ $config['cookie_path'] = "/";
Lastly, add the following new item to the config file (and edit the
option if needed)::
- /* |------------------------------------------------ | URI PROTOCOL |------------------------------------------------ | | This item determines which server global | should be used to retrieve the URI string. The | default setting of "auto" works for most servers. | If your links do not seem to work, try one of | the other delicious flavors: | | 'auto' Default - auto detects | 'path_info' Uses the PATH_INFO | 'query_string' Uses the QUERY_STRING */ $config['uri_protocol'] = "auto";
+
+ /*
+ |------------------------------------------------
+ | URI PROTOCOL
+ |------------------------------------------------
+ |
+ | This item determines which server global
+ | should be used to retrieve the URI string. The
+ | default setting of "auto" works for most servers.
+ | If your links do not seem to work, try one of
+ | the other delicious flavors:
+ |
+ | 'auto' Default - auto detects
+ | 'path_info' Uses the PATH_INFO
+ | 'query_string' Uses the QUERY_STRING
+ */
+
+ $config['uri_protocol'] = "auto";