Changeset 684

Timestamp:

11/15/08 08:45:37 (4 years ago)

Author:

KennethLavrsen

Message:

Item109: A bit more TWikiVariables to Macros work
Next wave in 3 hours

Location:

trunk

Files:

• EditTablePlugin/data/TWiki/EditTablePlugin.txt (modified) (1 diff)
• PatternSkin/data/TWiki/WebLeftBar.txt (modified) (1 diff)
• SpreadSheetPlugin/data/TWiki/SpreadSheetPlugin.txt (modified) (1 diff)
• TipsContrib/data/TWiki/TWikiTip006.txt (modified) (1 diff)
• TipsContrib/data/TWiki/TWikiTip007.txt (modified) (1 diff)
• TipsContrib/data/TWiki/TWikiTip018.txt (modified) (1 diff)
• core/data/TWiki/DefaultPreferences.txt (modified) (3 diffs)
• core/data/TWiki/EditingShorthand.txt (modified) (1 diff)
• core/data/TWiki/FileAttachment.txt (modified) (1 diff)
• core/data/TWiki/FormattedSearch.txt (modified) (1 diff)
• core/data/TWiki/GlossaryOfTerms.txt (modified) (2 diffs)
• core/data/TWiki/IfStatements.txt (modified) (1 diff)
• core/data/TWiki/InstantEnhancements.txt (modified) (3 diffs)
• core/data/TWiki/MacrosQuickStart.txt (modified) (1 diff)
• core/data/TWiki/ManagingWebs.txt (modified) (1 diff)
• core/data/TWiki/MetaData.txt (modified) (1 diff)
• core/data/TWiki/ShortcutMacros.txt (modified) (1 diff)
• core/data/TWiki/StartingPoints.txt (modified) (1 diff)
• core/data/TWiki/TWikiScripts.txt (modified) (1 diff)
• core/data/TWiki/UsersGuide.txt (modified) (1 diff)
• core/data/TWiki/WikiName.txt (modified) (1 diff)
• core/data/TestCases/TestCaseSpacedWikiWordPlugin.txt (modified) (1 diff)
• core/data/TestCases/WebPreferences.txt (modified) (2 diffs)

trunk/EditTablePlugin/data/TWiki/EditTablePlugin.txt

@@ -227 +227 @@
 |  01 Dec 2007: | 4.3: Arthur Clemens: added support for TablePlugin =headerrows= and =footerrows=; updated edit button |
 |  16 Oct 2007: | 4.2: Arthur Clemens: refactoring, bug fixes. |
-|  07 Oct 2007: | 15182: PTh: Added %SYSTEMWEB%.VarEDITTABLE to have it listed in %SYSTEMWEB%.TWikiVariables |
+|  07 Oct 2007: | 15182: PTh: Added !VarEDITTABLE to have it listed in !TWikiVariables |
 |  15 Mar 2007: | Arthur Clemens: Fixed eating of double newlines; icons for javascript buttons and interface improvements. By default the javascript interface is turned off, set =JAVASCRIPTINTERFACE= to use it in edit mode. |
 |  05 Mar 2007: | Byron Darrah: Added ability to dynamically move and delete rows. |

trunk/PatternSkin/data/TWiki/WebLeftBar.txt

@@ -16 +16 @@
    * BeginnersStartHere
    * TextFormattingRules
-   * TWikiVariables
+   * [[%SYSTEMWEB%.Macros][Macros]]
    * FormattedSearch
    * QuerySearch

trunk/SpreadSheetPlugin/data/TWiki/SpreadSheetPlugin.txt

@@ -722 +722 @@
 |  13 Oct 2007: | Added $FORMATTIMEDIFF() |
 |  09 Sep 2007: | Enhanced documentation for $EVAL() and $INT() |
-|  02 Jun 2007: | Added %SYSTEMWEB%.VarCALC to have =%<nop>CALC{}%= listed in %SYSTEMWEB%.TWikiVariables |
+|  02 Jun 2007: | Added %SYSTEMWEB%.VarCALC to have =%<nop>CALC{}%= listed in [[%SYSTEMWEB%.Macros][Macros]] |
 |  14 Apr 2007: | Fixing bug in $EXISTS() that required full =web.topic= instead of just =topic= |
 |  11 Mar 2007: | Fixing bug in $VALUE() and $INT(), introduced by version 09 Mar 2007 |

trunk/TipsContrib/data/TWiki/TWikiTip006.txt

@@ -3 +3 @@
 ---+ Creating a Table of Contents
 
-The TWikiVariables =%<nop>TOC%= will automatically create a table of contents for a topic based on the headers of the topic. To exclude a heading from a =%<nop>TOC%= add =!!= to the end of the syntax for a header, e.g. write =---+!!= for a =---+= heading.
+The [[%SYSTEMWEB%.Macros][Macros]] =%<nop>TOC%= will automatically create a table of contents for a topic based on the headers of the topic. To exclude a heading from a =%<nop>TOC%= add =!!= to the end of the syntax for a header, e.g. write =---+!!= for a =---+= heading.
 
 [[TWikiTipsOfTheDay][See More Tips...]]

trunk/TipsContrib/data/TWiki/TWikiTip007.txt

@@ -3 +3 @@
 ---+ Linking to a file attachment
 
-One can create a link to a file attachment using one of the following TWikiVariables, =%<nop>ATTACHURL%= or =%<nop>PUBURL%=.
+One can create a link to a file attachment using one of the following [[Macros]], =%<nop>ATTACHURL%= or =%<nop>PUBURL%=.
 
 =%<nop>ATTACHURL%= is the full URL for attachments in the current topic. For example:

trunk/TipsContrib/data/TWiki/TWikiTip018.txt

@@ -5 +5 @@
 To embed a search in a topic, use the =%<nop>SEARCH{ &lt;parameters&gt; }%= TWiki Variable. The search variable is used by many TWiki based applications.
 
-[[TWikiVariables#VarSEARCH][More Information...]]
+[[Macros#VarSEARCH][More Information...]]
 
 [[TWikiTipsOfTheDay][See More Tips...]]

trunk/core/data/TWiki/DefaultPreferences.txt

@@ -8 +8 @@
 Preference settings local to your site should be set in [[%LOCALSITEPREFS%]] (this topic is pointed to by {LocalSitePreferences}, which is set by the admin in the [[%SCRIPTURLPATH{"configure"}%][configure]] interface). Settings in [[%LOCALSITEPREFS%]] will override settings in this topic, and should be used for defining custom settings and variables.
 
-[[TWikiVariables#PreferencesVariables][Read more]] on how to set Preferences Variables.
+[[Macros#PreferencesVariables][Read more]] on how to set Preferences Variables.
 
 %TOC%
@@ -338 +338 @@
    * A preference is defined in a TWikiShorthand bullet item: ==[3 spaces] * [space] Set NAME = value== <br /> Example (as a nested bullet item, indented 6 spaces):
       * S<nop>et WEBBGCOLOR = #FFFFC0
-   * Preferences are used as %SYSTEMWEB%.TWikiVariables by enclosing the name in percent signs: ==%==. Example:
+   * Preferences are used as [[%SYSTEMWEB%.Macros][Macros]] by enclosing the name in percent signs: ==%==. Example:
       * When you write variable ==%WEB<nop>BGCOLOR%==, it gets expanded to =%WEBBGCOLOR%= .
 
@@ -355 +355 @@
    * %WEBPREFSTOPIC% has preferences of the <nop>%WEB% web.
    * User topics in %USERSWEB% can have optional user preferences.
-   * %SYSTEMWEB%.TWikiVariables has a list of common =%<nop>VARIABLES%=.
+   * [[%SYSTEMWEB%.Macros][Macros]] has a list of common =%<nop>VARIABLES%=.
    * %SYSTEMWEB%.AccessControl explains how to restrict access by users or groups.
    * TWiki:Plugins.PreferencesPlugin makes editing preferences a snap.

trunk/core/data/TWiki/EditingShorthand.txt

@@ -311 +311 @@
 %X% Dots ='.'= are used to separate webs and subwebs from topic names and therefore cannot be used in topic names.
 
-It's generally a good idea to use the TWikiVariables %<nop>SYSTEMWEB% and %<nop>USERSWEB% instead of %SYSTEMWEB% and %USERSWEB%.
+It's generally a good idea to use the [[%SYSTEMWEB%.Macros][Macros]] %<nop>SYSTEMWEB% and %<nop>USERSWEB% instead of %SYSTEMWEB% and %USERSWEB%.
 </td><td>
 <verbatim>

trunk/core/data/TWiki/FileAttachment.txt

@@ -22 +22 @@
 
    * Through your Web browser, you can easily upload graphics (or sound files, or anything else you want to link to on a page) and place them on a single page, or use them across a web, or site-wide.
-      * __NOTE:__ You can also add graphics - any files - directly, typically by FTP upload. This requires FTP access, and may be more convenient if you have a large number of files to load. FTP-ed files can't be managed using browser-based Attachment controls. You can use your browser to create TWikiVariables shortcuts, like this %<nop>H% = %H%.
+      * __NOTE:__ You can also add graphics - any files - directly, typically by FTP upload. This requires FTP access, and may be more convenient if you have a large number of files to load. FTP-ed files can't be managed using browser-based Attachment controls. You can use your browser to create [[%SYSTEMWEB%.Macros][Macros]] shortcuts, like this %<nop>H% = %H%.
 
 ---++ Uploading Files

trunk/core/data/TWiki/FormattedSearch.txt

@@ -202 +202 @@
 %SEARCH{ search="%URLPARAM{"q"}%" format="   * $web.$topic: %BR% $summary" nosearch="on" }%
 
-__Related Topics:__ UserDocumentationCategory, SearchHelp, TWikiVariables#VarSEARCH, SearchPatternCookbook, RegularExpression
+__Related Topics:__ UserDocumentationCategory, SearchHelp, [[%SYSTEMWEB%.Macros#VarSEARCH][Macros#VarSEARCH]], SearchPatternCookbook, RegularExpression

trunk/core/data/TWiki/GlossaryOfTerms.txt

@@ -10 +10 @@
 | Plugin: | Prepackaged server-side extension that adds all sorts of additional functions, seamlessly integrated into TWiki. [[Plugins][Details...]] |
 | Plugin API: | The standard interface for creating TWiki _Plugins_ and add-on programs that ensure a perfect integration. [[TWikiFuncDotPm][Details...]] |
-| Preferences: | The site-wide, single _web_ and single user-level preferences settings. The settings are stored in DefaultPreferences, WebPreferences and %USERSWEB%.WikiUsers home pages. [[TWikiVariables#PreferencesVariables][Details...]] |
+| Preferences: | The site-wide, single _web_ and single user-level preferences settings. The settings are stored in DefaultPreferences, WebPreferences and %USERSWEB%.WikiUsers home pages. [[Macros#PreferencesVariables][Details...]] |
 | Site: | A TWiki installation consisting of one or more _webs_. [[TWikiSite][Details...]] |
 | Skin: | Skins overlay regular _templates_ with alternate header/footer layout of _pages_; topic text is not affected. Skins are typically enabled site-wide or per _web_. [[Skins][Details...]] |
@@ -17 +17 @@
 | TWiki: | A web-based collaboration platform targeting the corporate world. Contraction of "TakeFive Wiki". By chance, also happens to be the name of the AI robot star of the Buck Rogers 1979 movie and TV series. Features include browser based editing, automatic linking of text (based on ideas of the original <nop>WikiWikiWeb), revision control, file _attachments_, _form_ handling, _preferences_ settings, access control and more. [[http://TWiki.org/][Details...]] |
 | TWiki.org: |Official home site, center of all development. [[http://TWiki.org/][Details...]] |
-| Variables: | Text-strings of the form =%VARIABLE%= that are expanded on the fly into text, image, or any other type of embedded content; there are system variables coded into the main TWiki package, _preferences_ settings, and Plugins variables. [[TWikiVariables][Details...]] |
+| Variables: | Text-strings of the form =%VARIABLE%= that are expanded on the fly into text, image, or any other type of embedded content; there are system variables coded into the main TWiki package, _preferences_ settings, and Plugins variables. [[Macros][Details...]] |
 | Web: | A collection of _topics_ under a common name. Various features, like search, access privileges, Plugin availability, template design, can be controlled on a web-wide basis. [[ManagingWebs][Details...]] |
 

trunk/core/data/TWiki/IfStatements.txt

@@ -19 +19 @@
 | defined | True if a preference variable or url parameter of this name is defined. |
 | isempty | True if a preference variable, url parameter or session variable of this name has an empty value. It is equivalent to the expression =(!defined(x) || $x='')= |
-| $ | expands a URL parameter or [[TWikiVariables][TWikiVariable]] name. Plugin handlers *are not called*. Built-in variables and user-defined preferences are supported. You can pass a limited subset of parameters to TWiki variables by enclosing the variable name in single quotes; for example, =$ 'VARIABLE{value}'=. The ='VARIABLE{value}'= string may *not* contain quotes (' or "). |
+| $ | expands a URL parameter or [[Macros][Macro]] name. Plugin handlers *are not called*. Built-in variables and user-defined preferences are supported. You can pass a limited subset of parameters to TWiki variables by enclosing the variable name in single quotes; for example, =$ 'VARIABLE{value}'=. The ='VARIABLE{value}'= string may *not* contain quotes (' or "). |
 | {X} | expands to the value of the configuration variable {X} - for example, ={ScriptUrlPath}= |
 

trunk/core/data/TWiki/InstantEnhancements.txt

@@ -4 +4 @@
 These quick enhancements are aimed at improving and customising your TWiki.  New TWiki site administrators are especially encouraged to review this document for ideas before deploying a new TWikiSite. The metaphor of building a house is useful.  The listed enhancements are some of the details possible when moving into a new office or home. These small changes can make a *big* differences for user satisfaction at your site. All modifications can be done through your Web browser, and they don't take more then in a couple of minutes.  No system administration expertise is required. Some of these enhancements are also mentioned in the reference manual and other topics.
 
-Many of these tips are based on setting some special TWikiVariables.
+Many of these tips are based on setting some special [[Macros]].
 
 %S% We recommend implementing at least __some__ of these enhancements __right after installation__ to get a taste for what is possible.  Some of these tips and enhancements _should_ be implemented before or during initial roll-out.
@@ -15 +15 @@
 ---++ Tips using TWiki Variables
 
-TWikiVariables are a great resource to customize your site. You need to know the variable name and decide where to put it.
+[[Macros]] are a great resource to customize your site. You need to know the variable name and decide where to put it.
 
 ---+++ Change Colors of Page Header/Footer
@@ -136 +136 @@
 *End Copy*
 
-The SEARCH variable has many more formatting options, see TWikiVariables.
+The SEARCH variable has many more formatting options, see [[Macros]].
 
 ---+++ Recently changed pages 

trunk/core/data/TWiki/MacrosQuickStart.txt

@@ -10 +10 @@
 Many TWiki variables are built-in, and others are predefined for your convenience. You can also define your own
 TWiki Variables at the entire site, individual web, or individual topic level. For more information,
-go to *[[TWikiVariables]]*
+go to *[[Macros]]*
 
 TWiki Variables are fully expanded _before_ any of the TWiki text formatting rules are applied.

trunk/core/data/TWiki/ManagingWebs.txt

@@ -18 +18 @@
 The second method is to use an existing web as a template web.  This may be useful if you already have a web that you would like to use as a starting point.  Only topics that have names beginning with *Web...* (like "%HOMETOPIC%", "%NOTIFYTOPIC%", etc.) are copied.
 
-In either case you will want to be sure to verify that your new web has all the custom modifications that you desire. Any TWikiVariables defined in the form below will automatically be set in the !WebPreferences of the new web.
+In either case you will want to be sure to verify that your new web has all the custom modifications that you desire. Any [[%SYSTEMWEB%.Macros][Macros]] defined in the form below will automatically be set in the !WebPreferences of the new web.
 
 #CreateNewWeb

trunk/core/data/TWiki/MetaData.txt

@@ -18 +18 @@
 ---++ Meta Data Syntax
 
-   * Format is the same as in TWikiVariables, except all fields have a key.
+   * Format is the same as in [[%SYSTEMWEB%.Macros][Macros]], except all fields have a key.
       * =%<nop>META:&lt;type&gt;{key1="value1" key2="value2" ...}%=
 

trunk/core/data/TWiki/ShortcutMacros.txt

@@ -12 +12 @@
 
 __See also:__
-   * TWikiVariables - an alphabetical list of all variables
+   * [[%SYSTEMWEB%.Macros][Macros]] - an alphabetical list of all variables
    * DefaultPreferences#RenderingShortcuts - where shortcuts are defined 
    * TWikiShorthand - summary of the TWiki markup language

trunk/core/data/TWiki/StartingPoints.txt

@@ -16 +16 @@
    * TextFormattingFAQ: Common how-to questions about posting in TWiki
 
-   * TWikiVariables: How to easily embed text, graphics, dynamic content 
+   * [[%SYSTEMWEB%.Macros][Macros]]: How to easily embed text, graphics, dynamic content 
 
    * MainFeatures: The main features of the TWiki collaboration platform

trunk/core/data/TWiki/TWikiScripts.txt

@@ -273 +273 @@
 | ="text"= | Search term. Is a keyword search, literal search or regular expression search, depending on the =type= parameter. SearchHelp has more | required |
 | =search="text"= | (Alternative to above) | N/A |
-| =web="Name"= <br /> =web="%USERSWEB%, Know"= <br /> =web="all"= | Comma-separated list of webs to search. See TWikiVariables#VarSEARCH for more details. | Current web |
+| =web="Name"= <br /> =web="%USERSWEB%, Know"= <br /> =web="all"= | Comma-separated list of webs to search. See [[%SYSTEMWEB%.Macros#VarSEARCH][Macros#VarSEARCH]] for more details. | Current web |
 | =topic="%WEBPREFSTOPIC%"= <br /> =topic="*Bug"= | Limit search to topics: A topic, a topic with asterisk wildcards, or a list of topics separated by comma. | All topics in a web |
 | =excludetopic="Web*"= <br /> =excludetopic="%HOMETOPIC%, <nop>WebChanges"= | Exclude topics from search: A topic, a topic with asterisk wildcards, or a list of topics separated by comma. | None |

trunk/core/data/TWiki/UsersGuide.txt

@@ -17 +17 @@
       * TWikiShorthand: All of the TWiki shorthand basics
       * TextFormattingRules: Scan all TWiki text formatting rules on one page
-      * TWikiVariables: How to easily embed text, graphics, dynamic content
+      * [[%SYSTEMWEB%.Macros][Macros]]: How to easily embed text, graphics, dynamic content
       * FileAttachments: Browser-upload files for distribution or display
       * WebChangesAlert: Get e-mail alerts linking to the latest page changes

trunk/core/data/TWiki/WikiName.txt

@@ -7 +7 @@
 %X% Your name is also a potentially valid WikiWord when used within a topic. However the home pages of registered users on this site are stored in the *%USERSWEB%* web. When you sign your username in a topic, prefix it with =%USERSWEB%.= (including the dot). That is, write ==%USERSWEB%.%WIKINAME%== to link to %USERSWEB%.%WIKINAME%, your personal home page in the %USERSWEB% web. For convenience, your signature is also provided for copying and pasting when editing a topic.
 
-%Y% Though rarely used in common practice, you can use the special ==%<nop>USERSWEB%== [[TWikiVariables][variable]] prefix for user names, for example, ==%<nop>USERSWEB%.%WIKINAME%==.
+%Y% Though rarely used in common practice, you can use the special ==%<nop>USERSWEB%== [[%SYSTEMWEB%.Macros][macro]] prefix for user names, for example, ==%<nop>USERSWEB%.%WIKINAME%==.

trunk/core/data/TestCases/TestCaseSpacedWikiWordPlugin.txt

@@ -27 +27 @@
 
 <verbatim>
-TWiki.TWikiVariables
-</verbatim>
-
-   * Core spaced out word: %SPACEOUT{"TWikiVariables"}%
-   * Plugin spaced out: TWiki.TWikiVariables
+%SYSTEMWEB%.DefaultPreferences
+</verbatim>
+
+   * Core spaced out word: %SPACEOUT{"DefaultPreferences"}%
+   * Plugin spaced out: %SYSTEMWEB%.DefaultPreferences
       * Testing if the T and W don't show a gap
    * Expected: <a href="#">TWiki Variables</a>

trunk/core/data/TestCases/WebPreferences.txt

@@ -57 +57 @@
         * A preference is defined as: <br /> =6 spaces * Set NAME = value= <br /> Example:
                 * S<nop>et WEBBGCOLOR = #FFFFC0
-        * Preferences are used as %SYSTEMWEB%.TWikiVariables by enclosing the name in percent signs. Example:
+        * Preferences are used as [[%SYSTEMWEB%.Macros][Macros]] by enclosing the name in percent signs. Example:
                 * When you write variable =%WEB<nop>BGCOLOR%= , it gets expanded to =%WEBBGCOLOR%= .
         * The sequential order of the preference settings is significant. Define preferences that use other preferences first, i.e. set =<nop>WEBCOPYRIGHT= before =<nop>WIKIWEBMASTER= since =%<nop>WEBCOPYRIGHT%= uses the =%<nop>WIKIWEBMASTER%= variable.
@@ -65 +65 @@
         * %SYSTEMWEB%.%WIKIPREFSTOPIC% has site-level preferences.
         * %USERSWEB%.%WIKIUSERSTOPIC% has a list of user topics. User topics can have optional user preferences.
-        * %SYSTEMWEB%.TWikiVariables has a list of common =%<nop>VARIABLES%=.
+        * [[%SYSTEMWEB%.Macros][Macros]] has a list of common =%<nop>VARIABLES%=.
         * %SYSTEMWEB%.AccessControl explains how to restrict access by users or groups.