From: PeterThoeny <PeterThoeny>
Date: Sat, 20 Jan 2001 08:58:55 +0000 (+0000)
Subject: none
X-Git-Url: https://git.openafs.org/?p=openafs-wiki.git;a=commitdiff_plain;h=1f5f7352efeeb1f2bb6146450297a2ccca26d329

none
---

diff --git a/TWiki/TWikiVariables.mdwn b/TWiki/TWikiVariables.mdwn
index d33048b..7f78355 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>%BASEWEB%</code></td>
+    <td> The web name where the includes started, e.g. the web of the first topic of nested includes. Same as <code>%WEB%</code> in case there is no include. </td>
+  </tr>
+  <tr>
+    <td><code>%INCLUDINGWEB%</code></td>
+    <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>%TOPIC%</code></td>
     <td> The current topic name, is <b>%TOPIC%</b></td>
   </tr>
   <tr>
+    <td><code>%BASETOPIC%</code></td>
+    <td> The name of the topic where the includes started, e.g. the first topic of nested includes. Same as <code>%TOPIC%</code> in case there is no include. </td>
+  </tr>
+  <tr>
+    <td><code>%INCLUDINGTOPIC%</code></td>
+    <td> The name of the topic that includes the current topic. Same as <code>%TOPIC%</code> in case there is no include. </td>
+  </tr>
+  <tr>
     <td><code>%SPACEDTOPIC%</code></td>
     <td> The current topic name with added spaces, for regular expression search of Ref-By, is <b></b></td>
   </tr>
@@ -71,7 +87,53 @@
   </tr>
   <tr>
     <td><code>%GMTIME{"format"}%</code></td>
-    <td> Formatted GM time based on keywords (first three characters needed.) <br /> Example: <code>%GMTIME{"day month, year - hour:min:sec"}%</code> is <b>day month, year - hour:min:sec</b></td>
+    <td> Formatted GM time based on time variables. <table border="1" cellpadding="0" 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>%GMTIME{"$day $month, $year - $hour:$min:$sec"}%</code> is <br /><b>29 Jun, 2010 - 15:25:46</b></td>
   </tr>
   <tr>
     <td><code>%SERVERTIME%</code></td>
@@ -79,7 +141,7 @@
   </tr>
   <tr>
     <td><code>%SERVERTIME{"format"}%</code></td>
-    <td> Formatted server time. Example: <code>%SERVERTIME{"hou:min"}%</code> is <b>hou:min</b></td>
+    <td> Formatted server time. <br /> Example: <code>%SERVERTIME{"$hou:$min"}%</code> is <b>11:25</b></td>
   </tr>
   <tr>
     <td><code>%HTTP_HOST%</code></td>