1 files changed, 14 insertions, 6 deletions
diff --git a/TWiki/TWikiVariables.mdwn b/TWiki/TWikiVariables.mdwn
index 752aa074..ca02a36e 100644
--- a/TWiki/TWikiVariables.mdwn
+++ b/TWiki/TWikiVariables.mdwn
@@ -47,7 +47,7 @@ TWiki expands the following variables enclosed in % percent signs:
   </tr>
   <tr>
     <td><code>%<nop>WIKIUSERNAME%</nop></code></td>
-    <td> Your Wiki username, if defined in <span style="background:"><font color="">TWiki Users</font></span><a href="http://LOCATION/TWikiUsers">?</a>. Same as %<nop>USERNAME% if not defined. Is <b>%WIKIUSERNAME%</b> </nop></td>
+    <td> Your Wiki username, if defined in %MAINWEB%.TWikiUsers. Same as %<nop>USERNAME% if not defined. Is <b>%WIKIUSERNAME%</b> </nop></td>
   </tr>
   <tr>
     <td><code>%<nop>WEB%</nop></code></td>
@@ -58,12 +58,20 @@ TWiki expands the following variables enclosed in % percent signs:
     <td> The current topic name, is <b>%TOPIC%</b></td>
   </tr>
   <tr>
-    <td><code>%<nop>DATE%</nop></code></td>
-    <td> Todays date (local server time), is <b>%DATE%</b></td>
+    <td><code>%<nop>GMTIME%</nop></code></td>
+    <td> GM time, is <b>%GMTIME%</b></td>
   </tr>
   <tr>
-    <td><code>%<nop>GMTIME%</nop></code></td>
-    <td> Todays date (GM time), is <b>%GMTIME%</b></td>
+    <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>
+  </tr>
+  <tr>
+    <td><code>%<nop>SERVERTIME%</nop></code></td>
+    <td> Server time, is <b>%SERVERTIME%</b></td>
+  </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>
   </tr>
   <tr>
     <td><code>%<nop>HTTP_HOST%</nop></code></td>
@@ -132,7 +140,7 @@ TWiki expands the following variables enclosed in % percent signs:
   </tr>
 </table>
 
-Additional variables are defined in the preferences ( site-level ( **_SL_** ) in %MAINWEB%.%WIKIPREFSTOPIC%, web-level ( **_WL_** ) in %WEBPREFSTOPIC% of each web, and user level ( **_UL_** ) preferences in individual user topics):
+Additional variables are defined in the preferences ( site-level ( **_SL_** ) in %TWIKIWEB%.%WIKIPREFSTOPIC%, web-level ( **_WL_** ) in %WEBPREFSTOPIC% of each web, and user level ( **_UL_** ) preferences in individual user topics):
 
 <table border="1">
   <tr>