none

1 files changed, 11 insertions, 7 deletions

diff --git a/TWiki/TWikiUpgradeTo01Dec2000.mdwn b/TWiki/TWikiUpgradeTo01Dec2000.mdwn
index 9214df97..7ff7a671 100644
--- a/TWiki/TWikiUpgradeTo01Dec2000.mdwn
+++ b/TWiki/TWikiUpgradeTo01Dec2000.mdwn
@@ -10,7 +10,9 @@ This upgrade is somewhat more labor intensive, mainly caused by splitting up the
 
 These are the steps you need to perform to upgrade the 01 May 2000 version to the 01 Dec 2000 release: [ We assume `export TWIKIROOT=/some/dir/` ]
 
-* Unpack the beta zip file into some working directory: <br />`mkdir -p ~/tmp/`<br />`cd ~/tmp`<br />`unzip ~/TWiki20001105.zip`
+* **_Backup_** all existing TWiki directories ( `bin`, `pub`, `data`, `templates` )
+
+* **_Unpack the zip file_** into some working directory: <br />`mkdir -p ~/tmp/`<br />`cd ~/tmp`<br />`unzip ~/TWiki20001201.zip`
 
 * **_Upgrade the TWiki document files_** ( `twiki` )
   * Move the document files to your TWiki root, i.e. <br />`mv ~/tmp/TWiki*.html $TWIKIROOT`<br />`mv ~/tmp/readme.txt $TWIKIROOT`
@@ -35,13 +37,16 @@ These are the steps you need to perform to upgrade the 01 May 2000 version to th
 * **_Upgrade public files_** ( `twiki/pub` )
   * Move the new `twiki/pub/TWiki` directory to your installation, i.e. <br />`mv ~/tmp/pub/TWiki $TWIKIROOT/pub/`
   * Pay attention to the file permissions of the `TWiki` directory and its subdirectory and files. The files must be writable by the cgi-scripts (usually user "nobody")
+  * Move the new `twiki/pub/twikilogo*` image files to your installation, i.e. <br />`mv ~/tmp/pub/twikilogo* $TWIKIROOT/pub/`
 
 * **_Upgrade data files_** ( `twiki/data` )
-  * Move the new `twiki/data/TWiki` directory to your installation, i.e. <br />`mv ~/tmp/data/TWiki $TWIKIROOT/data/`
-  * Pay attention to the file permissions of the `TWiki` directory and its files. The files must be writable by the cgi-scripts (usually user "nobody")
+  * Move the new `twiki/data/TWiki` directory to your installation, i.e. <br />`mv ~/tmp/data/TWiki $TWIKIROOT/data/`<br /> Pay attention to the file permissions of the `TWiki` directory and its files. The files must be writable by the cgi-scripts (usually user "nobody")
+  * Optionally move the new `twiki/data/Test` directory to your installation, i.e. <br />`mv ~/tmp/data/Test $TWIKIROOT/data/`<br /> (Pay attention to the file permissions)
+  * Move these new TWiki.Main web topics to your TWiki.Main web: `TWikiGroups`, `TWikiAdminGroup`, and if needed also `OfficeLocations` , i.e. <br />`mv ~/tmp/data/Main/TWikiGroups.* $TWIKIROOT/data/Main`<br /> (Pay attention to the file permissions)
+  * The following topics in the TWiki.Main web are obsolete and can be deleted: `BillClinton`, `GoodStyle`, `RegularExpression`, `TextFormattingFAQ`, `TextFormattingRules`, `TWikiAdministration`, `TWikiCategoryTable`, `TWikiEnhancementRequests`, `TWikiImplementationNotes`, `TWikiInstallationNotes`, `TWikiNotificationOfChanges`, `TWikiPlannedFeatures`, `TWikiUpgradeTo01May2000`, `TWikiUsernameVsLoginUsername`, `TWikiWeb`, `WelcomeGuest`, `WelcomeVisitor`, `WikiName`, `WikiNotation`, `WikiTopic`, `WikiWikiClones`. Sample delete command: <br />`rm -f $TWIKIROOT/data/Main/BillClinton.*`
   * The following topics are new and most be copied to all of your TWiki webs: `WebChanges`, `WebIndex`. <br />`cp -p $TWIKIROOT/data/TWiki/WebChanges.txt* $TWIKIROOT/data/Main`<br />`cp -p $TWIKIROOT/data/TWiki/WebIndex.txt* $TWIKIROOT/data/Main`<br /> Repeat this for all your webs. Pay attention to the file permissions.
   * `TWikiRegistration` moved from TWiki.Main to TWiki.TWiki. In case you customized `TWikiRegistration` , merge your changes back into `TWiki.TWikiRegistration` , then delete `$TWIKIROOT/data/Main/TWikiRegistration*`.
-  * `TWikiPreferences` moved from TWiki.Main to TWiki.TWiki. Merge your changes to `TWikiPreferences` into `TWiki.TWikiPreferences`, then delete `$TWIKIROOT/data/Main/TWikiPreferences*`.
+  * `TWikiPreferences` moved from TWiki.Main to TWiki.TWiki. Merge your changes to `TWikiPreferences` into `TWiki.TWikiPreferences`.
   * Modify the `WebPreferences` topics in all your webs to reflect the following:
     * `WEBTOPICLIST` should use `WebChanges` for `"Changes"`, and `WebIndex` for `"Index"`, i.e. <br />`| <a href="WebChanges">Changes</a>`<br />`| <a href="WebIndex">Index</a>`
     * In case you want to exclude a web from a `web="all"` search: Set this new preference <br />`Set NOSEARCHALL = on`
@@ -49,10 +54,9 @@ These are the steps you need to perform to upgrade the 01 May 2000 version to th
   * Change the `WebHome` topics in all your webs to reflect these changes:
     1. The "Changes" link should point to `WebChanges`.
     2. The "Topic index" link should point to `WebIndex`.
-    3. Change the include of the web table to <code>%INCLUDE\{"TWiki.TWikiWebsTable"\}%</code>
+    3. Change the include of the web table to <code>%INCLUDE\{"%TWIKIWEB%.TWikiWebsTable"\}%</code>
   * Merge your `TWikiWebsTable` topic in TWiki.Main with the `TWikiWebsTable` topic in TWiki.TWiki. Note the new variable to query the color of a web. Delete the old `TWikiWebsTable` topic in TWiki.Main after merge is complete.
-  * The following topics in the TWiki.Main web are depreciated (because they moved to TWiki.TWiki), but still need to be present in TWiki.Main because of existing links to these topics: `FileAttachment`, `TWikiDocumentation`, `TWikiHistory`, `TWikiPreferences`, `TWikiVariables`. <br /> It is recommended to edit these topics in TWiki.Main and replace the content with this line: <br /><code>This topic moved to %TWIKIWEB%.%TOPIC% in the %WIKITOOLNAME%.%TWIKIWEB% web.</code>
-  * The following topics in the TWiki.Main web are obsolete and can be deleted: `BillClinton`, `GoodStyle`, `RegularExpression`, `TextFormattingFAQ`, `TextFormattingRules`, `TWikiAdministration`, `TWikiCategoryTable`, `TWikiEnhancementRequests`, `TWikiImplementationNotes`, `TWikiInstallationNotes`, `TWikiNotificationOfChanges`, `TWikiPlannedFeatures`, `TWikiUpgradeTo01May2000`, `TWikiUsernameVsLoginUsername`, `TWikiWeb`, `WelcomeGuest`, `WelcomeVisitor`, `WikiName`, `WikiNotation`, `WikiTopic`, `WikiWikiClones`. Sample delete command: <br />`rm -f $TWIKIROOT/data/Main/BillClinton.*`
+  * The following topics in the TWiki.Main web are depreciated (because they moved to TWiki.TWiki), but still need to be present in TWiki.Main because of existing links to them: `FileAttachment`, `TWikiDocumentation`, `TWikiHistory`, `TWikiPreferences`, `TWikiVariables`. <br /> It is recommended to edit these topics in TWiki.Main and replace the content with this line: <br /><code>This topic moved to %TWIKIWEB%.%TOPIC% in the %WIKITOOLNAME%.%TWIKIWEB% web.</code>
   * In all your webs, change references to topics that moved to the TWiki.TWiki web:
     * Change topics: `TWikiUsers` , `WebNotify` , `WebHome`
     * With links to: `TWikiPreferences` , `TWikiVariables` , `TWikiUsers` , `TWikiWebsTable` and `WelcomeGuest`