none

1 files changed, 35 insertions, 10 deletions

diff --git a/TWiki/TWikiVariables.mdwn b/TWiki/TWikiVariables.mdwn
index 962e2173..bea4b5ed 100644
--- a/TWiki/TWikiVariables.mdwn
+++ b/TWiki/TWikiVariables.mdwn
@@ -1,4 +1,4 @@
-TWiki expands the following variables enclosed in % percent signs:
+%WIKITOOLNAME% expands the following variables enclosed in % percent signs:
 
 <table border="1">
   <tr>
@@ -7,15 +7,15 @@ TWiki expands the following variables enclosed in % percent signs:
   </tr>
   <tr>
     <td><code>%<nop>WIKIHOMEURL%</nop></code></td>
-    <td> The base script URL of TWiki, link of Home icon in upper left corner, is <b>%WIKIHOMEURL%</b></td>
+    <td> The base script URL of %WIKITOOLNAME%, is the link of the Home icon in the upper left corner, is <b>%WIKIHOMEURL%</b></td>
   </tr>
   <tr>
     <td><code>%<nop>SCRIPTURL%</nop></code></td>
-    <td> The script URL of TWiki, is <b>%SCRIPTURL%</b></td>
+    <td> The script URL of %WIKITOOLNAME%, is <b>%SCRIPTURL%</b></td>
   </tr>
   <tr>
     <td><code>%<nop>SCRIPTURLPATH%</nop></code></td>
-    <td> The path of the script URL of TWiki, is <b>%SCRIPTURLPATH%</b></td>
+    <td> The path of the script URL of %WIKITOOLNAME%, is <b>%SCRIPTURLPATH%</b></td>
   </tr>
   <tr>
     <td><code>%<nop>PUBURL%</nop></code></td>
@@ -23,7 +23,7 @@ TWiki expands the following variables enclosed in % percent signs:
   </tr>
   <tr>
     <td><code>%<nop>PUBURLPATH%</nop></code></td>
-    <td> The path of the public URL of TWiki, is <b>%PUBURLPATH%</b></td>
+    <td> The path of the public URL of %WIKITOOLNAME%, is <b>%PUBURLPATH%</b></td>
   </tr>
   <tr>
     <td><code>%<nop>ATTACHURL%</nop></code></td>
@@ -95,7 +95,7 @@ TWiki expands the following variables enclosed in % percent signs:
   </tr>
   <tr>
     <td><code>%<nop>INCLUDE{"SomeTopic"}%</nop></code></td>
-    <td> Server side include, includes another topic. The current Wiki web is searched by default. Example: <code><b>%<nop>INCLUDE{"TWiki.TWikiWebsTable"}%</nop></b></code></td>
+    <td> Server side include, includes another topic. The current Wiki web is searched by default. Example: <code><b>%<nop>INCLUDE{"%TWIKIWEB%.TWikiWebsTable"}%</nop></b></code></td>
   </tr>
   <tr>
     <td><code>%<nop>SEARCH{"str" ...}%</nop></code></td>
@@ -106,7 +106,7 @@ TWiki expands the following variables enclosed in % percent signs:
           <th bgcolor="#99CCCC"><strong>Default:</strong></th>
         </tr>
         <tr>
-          <td><code>web="Name"</code><br /><code>web="Main Know"</code><br /><code>web="all"</code></td>
+          <td><code>web="Name"</code><br /><code>web="%MAINWEB% Know"</code><br /><code>web="all"</code></td>
           <td> Wiki web to search: A web, a list of webs separated by whitespace, or all webs <code>[1]</code></td>
           <td> Current web </td>
         </tr>
@@ -160,11 +160,11 @@ TWiki expands the following variables enclosed in % percent signs:
           <td> Do not show number of topics found </td>
           <td> Show number </td>
         </tr>
-      </table> Example: <code><b>%<nop>SEARCH{"wiki" web="Main" scope="topic"}%</nop></b></code></td>
+      </table> Example: <code><b>%<nop>SEARCH{"wiki" web="%MAINWEB%" scope="topic"}%</nop></b></code></td>
   </tr>
   <tr>
     <td><code>%<nop>VAR{"NAME" web="Web"}%</nop></code></td>
-    <td> Get a preference value from another web then the current one. Example: To get <code>%<nop>WEBBGCOLOR%</nop></code> of the Main web write <code>%<nop>VAR{"WEBBGCOLOR" web="Main"}%</nop></code>, is <code><b>%VAR{"WEBBGCOLOR" web="Main"}%</b></code></td>
+    <td> Get a preference value from another web then the current one. Example: To get <code>%<nop>WEBBGCOLOR%</nop></code> of the %MAINWEB% web write <code>%<nop>VAR{"WEBBGCOLOR" web="%MAINWEB%"}%</nop></code>, is <code><b>%VAR{"WEBBGCOLOR" web="%MAINWEB%"}%</b></code></td>
     <td>
       <p>
       </p>
@@ -252,6 +252,31 @@ Additional variables are defined in the preferences ( site-level ( **_SL_** ) in
     <td><strong><em>SL</em></strong> , <strong><em>UL</em></strong></td>
     <td> http-equiv meta tags for preview script. </td>
   </tr>
+  <tr>
+    <td><code>%<nop>DENYWEBCHANGE%</nop></code></td>
+    <td><strong><em>WL</em></strong></td>
+    <td> List of users and groups who are <strong>not allowed</strong> to change topics in the %WIKITOOLNAME% web. (More in <span style="background:"><font color="">TWiki Access Control</font></span><a href="http://LOCATION/TWikiAccessControl">?</a>) </td>
+  </tr>
+  <tr>
+    <td><code>%<nop>ALLOWWEBCHANGE%</nop></code></td>
+    <td><strong><em>WL</em></strong></td>
+    <td> List of users and groups who are <strong>allowed</strong> to change topics in the %WIKITOOLNAME% web. (More in <span style="background:"><font color="">TWiki Access Control</font></span><a href="http://LOCATION/TWikiAccessControl">?</a>) </td>
+  </tr>
+  <tr>
+    <td><code>%<nop>DENYTOPICCHANGE%</nop></code></td>
+    <td><strong><em>(any topic)</em></strong></td>
+    <td> List of users and groups who are <strong>not allowed</strong> to change the current topic. (More in <span style="background:"><font color="">TWiki Access Control</font></span><a href="http://LOCATION/TWikiAccessControl">?</a>) </td>
+  </tr>
+  <tr>
+    <td><code>%<nop>ALLOWTOPICCHANGE%</nop></code></td>
+    <td><strong><em>(any topic)</em></strong></td>
+    <td> List of users and groups who are <strong>allowed</strong> to change the current topic. (More in <span style="background:"><font color="">TWiki Access Control</font></span><a href="http://LOCATION/TWikiAccessControl">?</a>) </td>
+  </tr>
+  <tr>
+    <td><code>%<nop>FINALPREFERENCES%</nop></code></td>
+    <td><strong><em>SL</em></strong> , <strong><em>WL</em></strong></td>
+    <td> List of preferences that are not allowed to be overridden by next level preferences</td>
+  </tr>
 </table>
 
 **_Notes:_**
@@ -261,4 +286,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:
   * <code>Set MYLOGO = %PUBURLPATH%/%MAINWEB%/LogoTopic/logo.gif</code>
 
--- [[Main/PeterThoeny]] - 01 Nov 2000 <br />
+-- %MAINWEB%.PeterThoeny - 10 Nov 2000 <br />