none

diff --git a/Main/WebPreferences.mdwn b/Main/WebPreferences.mdwn
index acac2f5..43c03bb 100644 (file)
--- a/Main/WebPreferences.mdwn
+++ b/Main/WebPreferences.mdwn
@@ -5,8 +5,7 @@ The following settings are **_web preferences_** of the %WIKITOOLNAME%.%WEB% web
 **_Preferences:_**
 
 - List of topics of the %WIKITOOLNAME%.%WEB% web:
-  - Set WEBTOPICLIST = %WEB% . \{ [[Home|Main/WebHome]] | [[Users|Main/TWikiUsers]] | [[Groups|Main/TWikiGroups]] | [[Offices|Main/OfficeLocations]] | [[Changes|Main/WebChanges]] | [[Index|Main/WebIndex]] | [[Search|Main/WebSearch]] | Go <input name="topic" size="16" type="text" />
- \}
+  - Set WEBTOPICLIST = [[Home|Main/WebHome]] | [[Users|Main/TWikiUsers]] | [[Groups|Main/TWikiGroups]] | [[Offices|Main/OfficeLocations]] | [[Changes|Main/WebChanges]] | [[Index|Main/WebIndex]] | [[Search|Main/WebSearch]] | Go <input name="topic" size="16" type="text" />
 
 - Web specific background color: (Pick a lighter one of the [[StandardColors]])
   - Set WEBBGCOLOR = #FFFFC0

diff --git a/TWiki/TWikiPreferences.mdwn b/TWiki/TWikiPreferences.mdwn
index 5d70f50..8c59f96 100644 (file)
--- a/TWiki/TWikiPreferences.mdwn
+++ b/TWiki/TWikiPreferences.mdwn
@@ -5,11 +5,11 @@ The following settings are **_site-level preferences_** , e.g. affecting all use
 **_Preferences:_**
 
 - List of %WIKITOOLNAME% webs: (the first line of a topic; to add a web see [[TWikiDocumentation]] and [[TWikiWebsTable]])
-  - Set WIKIWEBLIST = [%WIKITOOLNAME%](%WIKIHOMEURL%) . \{ [Main](http://www.dementia.org/twiki//view/Main/WebHome) | [TWiki](http://www.dementia.org/twiki//view/TWiki/WebHome) | [Know](http://www.dementia.org/twiki//view/Know/WebHome) | [Test](http://www.dementia.org/twiki//view/Test/WebHome) \}
+  - Set WIKIWEBLIST = [[Main|Main/WebHome]] | [[TWiki|TWiki/WebHome]] | [[Know|Know/WebHome]] | [[Test|Test/WebHome]]
+  - **_Note:_** To automatically list all non-hidden webs in alphabetical order you can use this variable instead: Set WIKIWEBLIST =
 
 - List of topics of a web: (the second line of a topic, is overwritten by web preferences)
-  - Set WEBTOPICLIST = %WEB% . \{ [Home](WebHome) | [Changes](WebChanges) | [Index](http://www.dementia.org/twiki//search/%WEB%/?scope=topic&regex=on&search=.*) | [Search](WebSearch) | Go <input name="topic" size="16" type="text" />
- \}
+  - Set WEBTOPICLIST = [[Home|Main/WebHome]] | [[Changes|Main/WebChanges]] | [[Index|Main/WebIndex]] | [[Search|Main/WebSearch]] | Go <input name="topic" size="16" type="text" />
 
 - Copyright notice:
   - Set WEBCOPYRIGHT = <font>Copyright © 2000 by the contributing authors. \\nAll material on this collaboration tool is the property of the contributing authors. <br /> \\nIdeas, requests, problems regarding %WIKITOOLNAME%? [Send](mailto:?subject=%WIKITOOLNAME% Feedback) feedback. </font>

diff --git a/TWiki/TWikiVariables.mdwn b/TWiki/TWikiVariables.mdwn
index 9ccf522..16aa02d 100644 (file)
--- a/TWiki/TWikiVariables.mdwn
+++ b/TWiki/TWikiVariables.mdwn
@@ -66,6 +66,14 @@
     <td> Your %WIKINAME% including the Main web name. Usefull for signatures. Is <b>Main.admin</b></td>
   </tr>
   <tr>
+    <td><code>%MAINWEB%</code></td>
+    <td> The Main web containing [[Main/TWikiUsers]], [[Main/OfficeLocations]] and [[Main/TWikiGroups]]. Is <b>Main</b></td>
+  </tr>
+  <tr>
+    <td><code>%TWIKIWEB%</code></td>
+    <td> The web containing all documentation and configuration of %WIKITOOLNAME%. Is <b>TWiki</b></td>
+  </tr>
+  <tr>
     <td><code>%WEB%</code></td>
     <td> The current web, is <b>%WEB%</b></td>
   </tr>
@@ -78,6 +86,26 @@
     <td> The web name of the topic that includes the current topic. Same as <code>%WEB%</code> in case there is no include. </td>
   </tr>
   <tr>
+    <td><code>%HOMETOPIC%</code></td>
+    <td> The home topic in each web. Is <b>[[Main/WebHome]]</b></td>
+  </tr>
+  <tr>
+    <td><code>%NOTIFYTOPIC%</code></td>
+    <td> The notify topic in each web. Is <b>[[Main/WebNotify]]</b></td>
+  </tr>
+  <tr>
+    <td><code>%WIKIUSERSTOPIC%</code></td>
+    <td> The index topic of all registered users. Is <b>TWikiUsers</b></td>
+  </tr>
+  <tr>
+    <td><code>%WEBPREFSTOPIC%</code></td>
+    <td> The web preferences topic. Is <b>WebPreferences</b></td>
+  </tr>
+  <tr>
+    <td><code>%STATISTICSTOPIC%</code></td>
+    <td> The web statistics topic. Is <b>WebStatistics</b></td>
+  </tr>
+  <tr>
     <td><code>%TOPIC%</code></td>
     <td> The current topic name, is <b>%TOPIC%</b></td>
   </tr>
@@ -200,7 +228,7 @@
           <td> 2 digit year </td>
           <td> 99 </td>
         </tr>
-      </table> Variables can be shortened to 3 characters. Example: <br /><code>%GMTIME{"$day $month, $year - $hour:$min:$sec"}%</code> is <br /><b>29 Jun, 2010 - 15:26:48</b></td>
+      </table> Variables can be shortened to 3 characters. Example: <br /><code>%GMTIME{"$day $month, $year - $hour:$min:$sec"}%</code> is <br /><b>29 Jun, 2010 - 15:26:53</b></td>
   </tr>
   <tr>
     <td><code>%SERVERTIME%</code></td>
@@ -499,4 +527,4 @@ Additional variables are defined in the preferences ( site-level ( **_SL_** ) in
 - Additional preferences variables can be defined on all three level as needed. Example:
   - `Set MYLOGO = %PUBURLPATH%/%MAINWEB%/LogoTopic/logo.gif`
 
--- [[PeterThoeny]] - 14 Jul 2001 <br />
+-- [[PeterThoeny]] - 23 Jul 2001 <br />

diff --git a/TWiki/WebPreferences.mdwn b/TWiki/WebPreferences.mdwn
index fd95d7f..f7ae5e0 100644 (file)
--- a/TWiki/WebPreferences.mdwn
+++ b/TWiki/WebPreferences.mdwn
@@ -5,8 +5,7 @@ The following settings are **_web preferences_** of the %WIKITOOLNAME%.%WEB% web
 **_Preferences:_**
 
 - List of topics of the %WIKITOOLNAME%.%WEB% web:
-  - Set WEBTOPICLIST = %WEB% . \{ [[Home|Main/WebHome]] | [[Welcome|Main/WelcomeGuest]] | [[Register|Main/TWikiRegistration]] | [[Changes|Main/WebChanges]] | [[Index|Main/WebIndex]] | [[Search|Main/WebSearch]] | Go <input name="topic" size="16" type="text" />
- \}
+  - Set WEBTOPICLIST = [[Home|Main/WebHome]] | [[Welcome|Main/WelcomeGuest]] | [[Register|Main/TWikiRegistration]] | [[Changes|Main/WebChanges]] | [[Index|Main/WebIndex]] | [[Search|Main/WebSearch]] | Go <input name="topic" size="16" type="text" />
 
 - Web specific background color: (Pick a lighter one of the [[StandardColors]])
   - Set WEBBGCOLOR = #FFE0B0