none

1 files changed, 7 insertions, 7 deletions

diff --git a/TWiki/TWikiUpgradeGuide.mdwn b/TWiki/TWikiUpgradeGuide.mdwn
index 634aabfc..eed4c470 100644
--- a/TWiki/TWikiUpgradeGuide.mdwn
+++ b/TWiki/TWikiUpgradeGuide.mdwn
@@ -188,11 +188,11 @@ You can do the following changes using your old TWiki 01-Dec-2000 or new TWiki 0
   * Set the SMTPMAILHOST
 5. In `WebPreferences` of all webs, add or change the following web preferences: (see `TWiki.WebPreferences`)
   * Add a NOSEARCHALL in case you want to exclude the web from a `web="all"` search: <br />`* Set NOSEARCHALL = on`
-  * Modify WEBTOPICLIST, ex: <br /><code>\* Set WEBTOPICLIST = [[%HOMETOPIC%]\[Home]] %SEP% [[WebChanges]\[Changes]] %SEP% [[WebIndex]\[Index]] %SEP% [[WebSearch]\[Search]] %SEP% Go &lt;input type="text" name="topic" size="16" /&gt;</code>
+  * In WEBTOPICLIST, remove the <code>%WEB% . \{\}</code> decoration from the list (it is now in the templates), ex: <br />`* Set WEBTOPICLIST = <a href="%HOMETOPIC%">Home</a>`<br />`  | <a href="WebChanges">Changes</a>`<br />`  | <a href="WebIndex">Index</a>`<br />`  | <a href="WebSearch">Search</a>`<br />`  | Go <input type="text" name="topic" size="16" />`
   * Add a these new preferences: <br />`* Set DENYWEBVIEW =`<br />`* Set ALLOWWEBVIEW =`<br />`* Set DENYWEBRENAME =`<br />`* Set ALLOWWEBRENAME =`
-  * Set FINALPREFERENCES: <br />`* Set FINALPREFERENCES = WEBTOPICLIST, DENYWEBVIEW, ALLOWWEBVIEW, DENYWEBCHANGE, ALLOWWEBCHANGE, DENYWEBRENAME, ALLOWWEBRENAME`
-6. In `WebSearch` of all webs, replace content with this one line: <br /><code>%INCLUDE\{"%TWIKIWEB%.WebSearch"\}%</code>
-7. In `WebChanges` of all webs, replace content with this one line: <br /><code>%INCLUDE\{"%TWIKIWEB%.WebChanges"\}%</code>
+  * Set the FINALPREFERENCES: <br />`* Set FINALPREFERENCES = WEBTOPICLIST, DENYWEBVIEW, ALLOWWEBVIEW, DENYWEBCHANGE, ALLOWWEBCHANGE, DENYWEBRENAME, ALLOWWEBRENAME`
+6. Optional: In `WebSearch` of all webs, replace content with this one line: <br /><code>%INCLUDE\{"%TWIKIWEB%.WebSearch"\}%</code>
+7. Optional: In `WebChanges` of all webs, replace content with this one line: <br /><code>%INCLUDE\{"%TWIKIWEB%.WebChanges"\}%</code>
 
 ### <a name="Step_9_Customize_template_files"> Step 9: Customize template files </a>
 
@@ -205,13 +205,13 @@ You can do the following changes using your old TWiki 01-Dec-2000 or new TWiki 0
   * Templates are now rendered by TWiki. You can use all [[TextFormattingRules]], but you have to escape unwanted ones. Also, remove empty lines unless you want a `=<p />` tag added.
   * Added [[TWikiMetaData]] rendering.
 3. Form Templates replace the TWikiCategoryTables:
-  * Create a replacement [[TWikiForms]] template based on `twikicatitems.tmpl` in each web that used a Category Table.
+  * Create a replacement `WebForm` topic based on `twikicatitems.tmpl` in each web that uses a Category Table. See details in [[TWikiForms]] and compare with the settings in the <code>Know2.WebPreferences</code> topic. <br />**_NOTE:_** Do not remove the `twikicatitems.tmpl` file, it is still used for topics that are of the old format.
   * Searches need to be adjusted to deal with format change - if all topics are upgrades, a more specific search can be done.
 4. For each web that has a custom <code>**notedited.tmpl**</code> template, create an equivalent [[WebTopicEditTemplate]] to conform with the new [[TWIKIWEBTWikiTemplates]]. The new format replaces the `notedited.tmpl`, `notext.tmpl` and `notwiki.tmpl` templates.
 
 ### <a name="Step_10_Switch_over_to_new_insta"> Step 10: Switch over to new installation </a>
 
-In this step, you move the working 01-Sep-2001 installation to the old 01-Dec-2000 installation, so that you don't have to change the URL.
+In this step, you move the working 01-Sep-2001 installation to the old 01-Dec-2000 installation, so that users don't have to change the URL.
 
 1. Test your new 01-Sep-2001 installation under `twiki/bin/2/view` to make sure everything works as expected.
   * **_NOTE:_** Don't worry about the Plugins, they'll work after the switch.
@@ -257,6 +257,6 @@ In this step, you move the working 01-Sep-2001 installation to the old 01-Dec-20
 
 ## <a name="Known_Issues"> Known Issues </a>
 
-* * Check TWiki:Codev/KnownIssuesOfTWiki01Sep2001 for known issues of TWiki 01 Sep 2001 (production release)
+* Check TWiki:Codev/KnownIssuesOfTWiki01Sep2001 for known issues of TWiki 01 Sep 2001 (production release)
 
 -- [[JohnTalintyre]] - 18 Jul 2001 <br /> -- [[MikeMannix]] - 12 Sep 2001 <br /> -- [[PeterThoeny]] - 12 Sep 2001 <br />