none

1 files changed, 13 insertions, 17 deletions

diff --git a/TWiki/WelcomeGuest.mdwn b/TWiki/WelcomeGuest.mdwn
index 18f773b9..d2005560 100644
--- a/TWiki/WelcomeGuest.mdwn
+++ b/TWiki/WelcomeGuest.mdwn
@@ -1,8 +1,8 @@
 Welcome,
 
-you have reached the TWiki web (pronounced twee-kee web). TWiki is a meeting place to collaborate on common interests. Everybody can contribute by just using a web browser. It looks like a normal web site, but then... everybody can edit web pages.
+you have reached the TWiki web (pronounced twee-kee web). %WIKITOOLNAME% is a meeting place to collaborate on common interests. Everybody can contribute by just using a web browser. It looks like a normal web site, but then... **_everybody can edit web pages_**.
 
-**Main Features of TWiki**
+**Main Features of %WIKITOOLNAME%**
 
 * Edit existing pages or create new pages by using any web browser.
 * Web pages are automatically linked. You do not need to learn HTML commands to link pages.
@@ -13,32 +13,28 @@ you have reached the TWiki web (pronounced twee-kee web). TWiki is a meeting pla
 * File attachments: Upload and download any file as an attachment to a page by using your browser. This is similar to email file attachments, but it happens on web pages.
 * Topic locking: Users are warned if a page is being edited by an other person. This is to prevent contention, e.g. simultaneous page editing.
 
-**How TWiki Works**
+**How %WIKITOOLNAME% Works**
 
-TWiki is divided up into **webs** , each one represents one area of collaboration. Currently we have three TWiki webs:
+%WIKITOOLNAME% is divided up into **webs** , each one represents one area of collaboration.
 
-* [TWiki.Main](%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/Main): The web you are currently in. It is the entry point, has a list of all [[TWikiUsers]] and offices.
-* [TWiki.Know](%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/Know): Knowledge Base area. This is to demonstrate how to use TWiki as a knowledge base for support.
-* [TWiki.Test](%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/Test): Just for testing.
+%INCLUDE\{"TWikiWebsTable"\}%
 
 Each web has hyper-linked topics. A **topic** is one web page in your browser.
 
-To browse this Wiki site, just click on any highlighted link. These links are called [[WikiWords]], and comprise two or more words with initial capitals, run together.
+To browse this %WIKITOOLNAME% site, just click on any highlighted link. These links are called [[WikiWords]], and comprise two or more words with initial capitals, run together.
 
-To edit any page, click on "Edit" at the bottom of the page. You can edit the page from within your browser, using [[WikiSyntax]], a very simple markup language. You could also use HTML if you wish, but his is optional. (Before you can edit pages you need to register in [[TWikiRegistration]].)
+To edit any topic, click on "Edit" at the bottom of the topic. You can edit the topic from within your browser, using [[WikiSyntax]], a very simple markup language. You could also use HTML if you wish, but this is optional. (Before you can edit pages you need to register in [[TWikiRegistration]].)
 
 A highlighted "?" following a [[WikiTopic]] means that no content has yet been entered for that topic. You are invited to add some content by clicking on the "?". You are encouraged to include [[WikiWords]] in your content, for others to fill out later.
 
-Please follow the [[TWikiTutorial]] to get you up to speed on TWiki.
+Please follow the [[TWikiTutorial]] to get you up to speed on TWiki. You can use the [%WIKITOOLNAME%.Test](../Test/WebHome) web for testing.
 
-**Starting points in the TWiki.Main web**
+**Starting points in the %WIKITOOLNAME%.%WEB% web**
 
-* ** [[TWikiTutorial]] **: Familiarize yourself with TWiki before you start editing content.
-* [[WebHome]]: Entry point of this TWiki web.
-* [[TWikiWeb]]: Explains what a TWiki web is.
+* ** [[TWikiTutorial]] **: Familiarize yourself with %WIKITOOLNAME% before you start editing content.
+* [[WebHome]]: Entry point of this %WIKITOOLNAME% web.
+* [[TWikiWeb]]: Explains what a %WIKITOOLNAME% web is.
 * [[GoodStyle]]: Things to consider when changing text.
 * [[WikiSyntax]]: Easy to learn rules when editing text.
-* [Changes](%SCRIPTURLPATH%/changes%SCRIPTSUFFIX%/Main): Recent changes to the TWiki.Main web.
-* [[OfficeLocations]]: Wind River Offices.
-* [[TWikiUsers]]: List of TWiki users.
+* [[WebChanges]]: Recent changes to the %WIKITOOLNAME%.%WEB% web.
 * [[TWikiRegistration]]: **Before you leave** add your name here.