none

1 files changed, 9 insertions, 9 deletions

diff --git a/TWiki/TWikiTutorial.mdwn b/TWiki/TWikiTutorial.mdwn
index eb4ac794..e8842861 100644
--- a/TWiki/TWikiTutorial.mdwn
+++ b/TWiki/TWikiTutorial.mdwn
@@ -6,22 +6,22 @@ This is a short, step-by-step tutorial to get you up to speed on %WIKITOOLNAME%.
 * Navigation and search:
   * %WIKITOOLNAME% is divided up into webs; each one represents one area of collaboration. The webs are accessible at the upper right corner of each web page.
   * Each web has hyper-linked topics. A topic is one web page in your browser.
-  * The home page in each web is the [[WebHome]] topic.
+  * The home page in each web is the %HOMETOPIC% topic.
   * To browse a %WIKITOOLNAME% web, just click on any highlighted link. These links are called [[WikiWords]] and comprise two or more words with initial capitals, run together.
   * Follow the [[WikiWord]] link and learn what it is.
   * If you know the name of a topic, you can jump directly to it by typing its name into the **Go** field on the top of the page. Type `WebSearch` to jump to the search page. **_Hint:_** Do not confuse the **Go** field with search.
-  * You can search each %WIKITOOLNAME% web. Enter a search string in the [[WebHome]] topic or the [[WebSearch]] topic accessible from the `Search` link on each topic. %WIKITOOLNAME% searches for an exact match; optionally, you can also use [[RegularExpressions]]. **_Note:_** A search only looks in the current web unless you use the advanced search option.
+  * You can search each %WIKITOOLNAME% web. Enter a search string in the %HOMETOPIC% topic or the [[WebSearch]] topic accessible from the `Search` link on each topic. %WIKITOOLNAME% searches for an exact match; optionally, you can also use [[RegularExpressions]]. **_Note:_** A search only looks in the current web unless you use the advanced search option.
 
 * Create your account:
   * To edit topics, you need to have a %WIKITOOLNAME% account.
   * Go to the [[TWikiRegistration]] page to create your TWiki account.
 
 * %WIKITOOLNAME% Users and offices:
-  * Go to the [[Main/TWikiUsers]] topic in the %WIKITOOLNAME%.Main web; it has a list of all users of %WIKITOOLNAME%. Your [[WikiName]] will be in this list after you register.
-  * Go to the [[Main/OfficeLocations]] topic in the %WIKITOOLNAME%.Main web; it has a list of corporate offices already entered into %WIKITOOLNAME%.
+  * Go to the %MAINWEB%.%WIKIUSERSTOPIC% topic in the %WIKITOOLNAME%.Main web; it has a list of all users of %WIKITOOLNAME%. Your [[WikiName]] will be in this list after you register.
+  * Go to the %MAINWEB%.OfficeLocations topic in the %WIKITOOLNAME%.%MAINWEB% web; it has a list of corporate offices already entered into %WIKITOOLNAME%.
 
 * Operations on topics:
-  * Go the the [[WebHome]] topic to learn what we can do with a topic.
+  * Go the the %HOMETOPIC% topic to learn what we can do with a topic.
   * The bottom of the page has some links:
   * `Edit` : Allows you to edit the topic (discussed later)
   * `Ref-By` : Find out what other topics link to this topic (reverse link)
@@ -30,7 +30,7 @@ This is a short, step-by-step tutorial to get you up to speed on %WIKITOOLNAME%.
   * `r1.3 | > | r1.2 | > | r1.1` : Allows you to see a previous topic revision or the difference between revisions.
 
 * Editing a topic and creating hyperlinked pages:
-  * Go the the [[Test/WebHome]] topic of the %WIKITOOLNAME%.Test web. This web is the sandbox where you can make changes at will.
+  * Go the the Test.%HOMETOPIC% topic of the %WIKITOOLNAME%.Test web. This web is the sandbox where you can make changes at will.
   * Press the `Edit` link. You are now in edit mode and you can see the source of the page. (Go to a different topic like [[Test/TestTopic3]] in case you see a "Topic is locked by an other user" warning.)
   * Look at the text in edit mode and compare it with the rendered page (move back and forth in your browser.)
   * Notice how [[WikiWords]] are linked automatically; there is no link if you look at the text in edit mode.
@@ -40,7 +40,7 @@ This is a short, step-by-step tutorial to get you up to speed on %WIKITOOLNAME%.
     * You can see a linked question mark after the topic name. This means that the topic does not exist yet.
     * Click on the question mark. Now you are in edit mode of the new topic.
     * Type some text, basically like you write an email.
-    * A signature with your name is already entered by default. **_Note:_** Please note the `Main.` in front of your name. This means that you have a link from the current web to your personal topic located in the Main web.
+    * A signature with your name is already entered by default. **_Note:_** Please note the `%MAINWEB%.` in front of your name. This means that you have a link from the current web to your personal topic located in the %MAINWEB% web.
     * Preview and save the topic.
   * Learn about text formatting:
     * You write text in [[WikiSyntax]], a very simple markup language. Follow the [[WikiSyntax]] link and learn how to write text.
@@ -61,11 +61,11 @@ This is a short, step-by-step tutorial to get you up to speed on %WIKITOOLNAME%.
 
 * Getting notified of topic changes:
   * It is very important that team members are kept in synch of changes.
-  * [[WebNotify]] (one per %WIKITOOLNAME% web) is a subscription service to be automatically notified by email when topics change in a %WIKITOOLNAME% web. This is a convenient service, so you do not have to come back and check all the time to see if something has changed.
+  * %NOTIFYTOPIC% (one per %WIKITOOLNAME% web) is a subscription service to be automatically notified by email when topics change in a %WIKITOOLNAME% web. This is a convenient service, so you do not have to come back and check all the time to see if something has changed.
   * It is strongly recommended that you subscribe to the %WIKITOOLNAME% web(s) relevant to your work.
 
 This concludes the tutorial. Now you are ready to roll.
 
 **_A side note:_** Initially it can be intriguing to change text someone else wrote. Please do not worry, nothing gets lost, because previous versions are always accessible (and also recoverable by the %WIKITOOLNAME% administrator if needed.)
 
--- [[Main/PeterThoeny]] - 18 Aug 2000 <br />
+-- [[Main/PeterThoeny]] - 13 Dec 2000 <br />