Changeset 688 for trunk/core/data/TWiki/TemplateTopics.txt

Timestamp:

11/15/08 11:01:50 (5 years ago)

Author:

CrawfordCurrie

Message:

Item109: terminology of variables fixed

File:

• trunk/core/data/TWiki/TemplateTopics.txt (modified) (3 diffs)

trunk/core/data/TWiki/TemplateTopics.txt

@@ -18 +18 @@
 
 #TemplateTopicsVars
----+++ Variable Expansion
+---+++ Macro Expansion
 
-When the following variables are used in a template topic, they automatically get expanded when new topic is created based on it:
+When the following macros are used in a template topic, they automatically get expanded when new topic is created based on it:
 
-| *Variable:* | *Description:* |
+| *Macro:* | *Description:* |
 | =%<nop>DATE%= | Signature format date. See VarDATE |
 | =%<nop>GMTIME%= | Date/time. See VarGMTIME |
@@ -46 +46 @@
 =%<nop>NOP%= can be used to prevent expansion of [[macros]] that would otherwise be expanded during topic creation e.g.i escape =%<nop>SERVERTIME%= with =%<nop>SER%<nop>NOP%VERTIME%=.
 
-All other variables are unchanged, e.g. are carried over "as is" into the new topic.
+All other macros are unchanged, e.g. are carried over "as is" into the new topic.
 
 ---+++ Specifying a Form
@@ -99 +99 @@
 See CommandAndCgiScripts#edit for details of the parameters that the =edit= script understands.
 
-%T% *TIP:* You can use the =%<nop>WIKIUSERNAME%= and =%<nop>DATE%= variables in your template topics to include the signature of the person creating a new topic. The variables are expanded into fixed text when a new topic is created. The standard signature is: <br />
+%T% *TIP:* You can use the =%<nop>WIKIUSERNAME%= and =%<nop>DATE%= macros in your template topics to include the signature of the person creating a new topic. The variables are expanded into fixed text when a new topic is created. The standard signature is: <br />
 ==-- %<nop>WIKIUSERNAME% - %<nop>DATE%==