none

1 files changed, 64 insertions, 2 deletions

diff --git a/TWiki/TWikiVariables.mdwn b/TWiki/TWikiVariables.mdwn
index 493d2eff..5f988f90 100644
--- a/TWiki/TWikiVariables.mdwn
+++ b/TWiki/TWikiVariables.mdwn
@@ -58,10 +58,26 @@
     <td> The current web, is <b>%WEB%</b></td>
   </tr>
   <tr>
+    <td><code>%<nop>BASEWEB%</nop></code></td>
+    <td> The web name where the includes started, e.g. the web of the first topic of nested includes. Same as <code>%<nop>WEB%</nop></code> in case there is no include. </td>
+  </tr>
+  <tr>
+    <td><code>%<nop>INCLUDINGWEB%</nop></code></td>
+    <td> The web name of the topic that includes the current topic. Same as <code>%<nop>WEB%</nop></code> in case there is no include. </td>
+  </tr>
+  <tr>
     <td><code>%<nop>TOPIC%</nop></code></td>
     <td> The current topic name, is <b>%TOPIC%</b></td>
   </tr>
   <tr>
+    <td><code>%<nop>BASETOPIC%</nop></code></td>
+    <td> The name of the topic where the includes started, e.g. the first topic of nested includes. Same as <code>%<nop>TOPIC%</nop></code> in case there is no include. </td>
+  </tr>
+  <tr>
+    <td><code>%<nop>INCLUDINGTOPIC%</nop></code></td>
+    <td> The name of the topic that includes the current topic. Same as <code>%<nop>TOPIC%</nop></code> in case there is no include. </td>
+  </tr>
+  <tr>
     <td><code>%<nop>SPACEDTOPIC%</nop></code></td>
     <td> The current topic name with added spaces, for regular expression search of Ref-By, is <b>%SPACEDTOPIC%</b></td>
   </tr>
@@ -71,7 +87,53 @@
   </tr>
   <tr>
     <td><code>%<nop>GMTIME{"format"}%</nop></code></td>
-    <td> Formatted GM time based on keywords (first three characters needed.) <br /> Example: <code>%<nop>GMTIME{"day month, year - hour:min:sec"}%</nop></code> is <b>%GMTIME{"day month, year - hour:min:sec"}%</b></td>
+    <td> Formatted GM time based on time variables. <table border="1" cellpadding="1" cellspacing="0">
+        <tr>
+          <th bgcolor="#99CCCC"><strong>Variable:</strong></th>
+          <th bgcolor="#99CCCC"><strong>Unit:</strong></th>
+          <th bgcolor="#99CCCC"><strong>Example</strong></th>
+        </tr>
+        <tr>
+          <td> $seconds </td>
+          <td> seconds </td>
+          <td> 59 </td>
+        </tr>
+        <tr>
+          <td> $minutes </td>
+          <td> minutes </td>
+          <td> 59 </td>
+        </tr>
+        <tr>
+          <td> $hours </td>
+          <td> hours </td>
+          <td> 23 </td>
+        </tr>
+        <tr>
+          <td> $day </td>
+          <td> day of month </td>
+          <td> 31 </td>
+        </tr>
+        <tr>
+          <td> $month </td>
+          <td> month in ISO format </td>
+          <td> Dec </td>
+        </tr>
+        <tr>
+          <td> $mo </td>
+          <td> 2 digit month </td>
+          <td> 12 </td>
+        </tr>
+        <tr>
+          <td> $year </td>
+          <td> 4 digit year </td>
+          <td> 1999 </td>
+        </tr>
+        <tr>
+          <td> $ye </td>
+          <td> 2 digit year </td>
+          <td> 99 </td>
+        </tr>
+      </table> Variables can be shortened to 3 characters. Example: <br /><code>%<nop>GMTIME{"$day $month, $year - $hour:$min:$sec"}%</nop></code> is <br /><b>%GMTIME{"$day $month, $year - $hour:$min:$sec"}%</b></td>
   </tr>
   <tr>
     <td><code>%<nop>SERVERTIME%</nop></code></td>
@@ -79,7 +141,7 @@
   </tr>
   <tr>
     <td><code>%<nop>SERVERTIME{"format"}%</nop></code></td>
-    <td> Formatted server time. Example: <code>%<nop>SERVERTIME{"hou:min"}%</nop></code> is <b>%SERVERTIME{"hou:min"}%</b></td>
+    <td> Formatted server time. <br /> Example: <code>%<nop>SERVERTIME{"$hou:$min"}%</nop></code> is <b>%SERVERTIME{"$hou:$min"}%</b></td>
   </tr>
   <tr>
     <td><code>%<nop>HTTP_HOST%</nop></code></td>