none

diff --git a/TWiki/ManagingTopics.mdwn b/TWiki/ManagingTopics.mdwn
index f76d92a..7a2f62e 100644 (file)
--- a/TWiki/ManagingTopics.mdwn
+++ b/TWiki/ManagingTopics.mdwn
@@ -24,7 +24,7 @@ _Browser-based rename, move, and delete for individual topics_
 
 ## <a name="Overview"></a> Overview
 
-Select **Rename/move** when viewing a topic to change its name, move it to another TWiki web, or delete it:
+Using browser controls while viewing a topic, you change its name, move it to another TWiki web, or delete it:
 
 1. **Select** target web if other than the current web - chose <code>**Trash**</code> to [[delete a topic|Main/WebHome#DeleteTopic]]
 2. **Enter** the new topic name - default is current name <br />**_NOTE:_** You will be warned if there are locks or if there is a name conflict
@@ -35,7 +35,7 @@ Select **Rename/move** when viewing a topic to change its name, move it to anoth
 
 ### <a name="Referring Topics"></a> Referring Topics
 
-Referring topics are found using the the %SEARCH% variable, see the template <code>**searchrenameview.tmpl**</code>. First, matching topics in the current Web are listed - matches are to _topic_. Next, all Webs (including the current one) are listed that match _web.topic_. Because %SEARCH% is used, Webs marked in [[WebPreferences]] as NOSEARCHALL will not show up in the search for refernces to the _topic_ being changed.
+Referring topics are found using the the %SEARCH% variable, see the template `searchrenameview.tmpl`. First, matching topics in the current Web are listed - matches are to _topic_. Next, all Webs (including the current one) are listed that match _web.topic_. Because %SEARCH% is used, Webs marked in [[WebPreferences]] as NOSEARCHALL will not show up in the search for refernces to the _topic_ being changed.
 
 Changed references are kept are as short as possible, i.e. _topic_ is used in preference to _web.topic_.
 
@@ -79,3 +79,5 @@ The following shows some limitations of square bracket processing.
 >     [[old topic]]  => [[NewTopic][old topic]]
 >     [[old t opic]] => not changed
 >     [[OldTopic]]   => [[NewTopic]]
+
+-- [[MikeMannix]] - 15 Sep 2001 <br />

diff --git a/TWiki/TWikiForms.mdwn b/TWiki/TWikiForms.mdwn
index 1077e16..0a2e501 100644 (file)
--- a/TWiki/TWikiForms.mdwn
+++ b/TWiki/TWikiForms.mdwn
@@ -246,4 +246,4 @@ A form embedded in a topic also appears in a new topic. This is done by specifyi
 
 The Form Template topic name, fields and values are stored as [[TWikiMetaData]]. The order of field/value pairs in the Meta Data is the same as in the Template.
 
--- [[JohnTalintyre]] - 16 Aug 2001 <br />
+-- [[JohnTalintyre]] - 16 Aug 2001 <br /> -- [[MikeMannix]] - 15 Sep 2001 <br />

diff --git a/TWiki/TWikiHistory.mdwn b/TWiki/TWikiHistory.mdwn
index 9cd8d89..df57372 100644 (file)
--- a/TWiki/TWikiHistory.mdwn
+++ b/TWiki/TWikiHistory.mdwn
@@ -258,6 +258,8 @@
 
 ## <a name="Dev Flow"></a> Dev Flow
 
+The typical TWiki development flow...
+
 - [FeatureBrainstorming](http://twiki.org/cgi-bin/view/Codev/FeatureBrainstorming): open forum for new ideas
 - [TWikiEnhancementRequests](http://twiki.org/cgi-bin/view/Codev/TWikiEnhancementRequests): specific detailed request
 - [TWikiPlannedFeatures](http://twiki.org/cgi-bin/view/Codev/TWikiPlannedFeatures): accepted for future development

diff --git a/TWiki/TWikiPlugins.mdwn b/TWiki/TWikiPlugins.mdwn
index ca5dcfa..d46e30c 100644 (file)
--- a/TWiki/TWikiPlugins.mdwn
+++ b/TWiki/TWikiPlugins.mdwn
@@ -34,11 +34,11 @@
 
 # <a name="TWiki Plugins"></a> TWiki Plugins
 
-Plugin use and development; about the Plugin API.
+_Plug-in enhanced feature add-ons, with a Plugin API for developers_
 
 ## <a name="Overview"></a> Overview
 
-You can add Plugins to greatly extend TWiki's functionality, without alering the program core. With a plug-in approach, you can:
+You can add Plugins to extend TWiki's functionality, without altering the core program code. With a plug-in approach, you can:
 
 - add virtually unlimited features while keeping the main TWiki code compact and efficient;
 - heavily customize an installation and still do clean updates to new versions of TWiki;
@@ -54,7 +54,7 @@ TWiki comes with three Plugins as part of the standard installation.
 
 - **EmptyPlugin** is a fully functional module, minus active code; it does nothing and serves as a template for new Plugin development.
 
-- **InterwikiPlugin** is preinstalled but can be disabled or removed. Use it for quick linking to to remote sites: <code>**TWiki:Plugins**</code> expands to TWiki:Plugins on TWiki.org. You can add your own shortcuts and URLs to the existing directory of Wiki-related and other probably useful sites.
+- **InterwikiPlugin** is preinstalled but can be disabled or removed. Use it for quick linking to to remote sites: `TWiki:Plugins` expands to TWiki:Plugins on TWiki.org. You can add your own shortcuts and URLs to the existing directory of Wiki-related and other probably useful sites.
 
 <a name="InstallPlugin"></a>
 
@@ -70,10 +70,10 @@ Most Plugins can be installed in three easy steps, with no programming skills re
 
 **Special Requests:** Some Plugins need certain Perl modules to be preinstalled on the host system. Plugins may also use other resources, like graphics, other modules, applications, templates. In these cases, detailed instructions are in the Plugin documentation.
 
-Each Plugin has a standard release page, located in the TWiki:Plugins web at TWiki.org. In addition to the documentation topic (<code>**SomePlugin**</code>), there's a separate development page.
+Each Plugin has a standard release page, located in the TWiki:Plugins web at TWiki.org. In addition to the documentation topic (`SomePlugin`), there's a separate development page.
 
 - **Doc page:** Read all available info about the Plugin; download the attached distribution files.
-- **Dev page:** Post feature requests, bug reports and general dev comments; topic title ends in <code>**Dev**</code> (<code>**SomePluginDev**</code>).
+- **Dev page:** Post feature requests, bug reports and general dev comments; topic title ends in `Dev` (`SomePluginDev`).
 - **User support:** Post installation, how to use type questions (and answers, if you have them) in the TWiki:Support web.
 
 ### <a name="On-Site Pretesting"></a> On-Site Pretesting
@@ -81,11 +81,11 @@ Each Plugin has a standard release page, located in the TWiki:Plugins web at TWi
 To test new Plugins on your installation before making them public, you may want to use one of these two approaches:
 
 - **Method 1:** Create Production and a Test installation of TWiki.
-  - Duplicate the <code>**twiki/bin**</code> and <code>**twiki/lib**</code> directories for the Test version, adjusting the paths in the new <code>**lib/TWiki.cfg**</code>, the <code>**twiki/data**</code>; the <code>**twiki/templates**</code> and <code>**twiki/pub**</code> directories are shared.
+  - Duplicate the `twiki/bin` and `twiki/lib` directories for the Test version, adjusting the paths in the new `lib/TWiki.cfg`, the `twiki/data`; the `twiki/templates` and `twiki/pub` directories are shared.
   - Test Plugins and other new features in the Test installation until you're satisfied.
   - Copy the modified files to the Production installation. You can update a live TWiki installation and users won't even notice.
 
-- **Method 2:** List the Plugin under <code>**Test**</code> in the DISABLEDPLUGINS variable in [[TWikiPreferences]]. Redefine the DISABLEDPLUGINS variable in the Test web and do the testing there.
+- **Method 2:** List the Plugin under `Test` in the DISABLEDPLUGINS variable in [[TWikiPreferences]]. Redefine the DISABLEDPLUGINS variable in the Test web and do the testing there.
 
 ## <a name="Managing Plugins"></a> Managing Plugins
 
@@ -95,33 +95,33 @@ Ideally, after you've [[installed a Plugin|Main/WebHome#InstallPlugin]], just re
 
 Installed Plugins can be **toggled on or off**, site-wide or by web, through TWikiPreferences and individual WebPreferences:
 
-- All Plugin modules present in the <code>**lib/TWiki/Plugins**</code> directory are activated automatically unless disabled by the <code>**DISABLEDPLUGINS**</code> Preferences variable in TWikiPreferences. You can optionally list the installed Plugins in the <code>**INSTALLEDPLUGINS**</code> Preferences variable. This is useful to define the sequence of Plugin execution, or to specify other webs than the %WIKITOOLNAME% web for the Plugin topics. Settings in [[TWikiPreferences]] are:
-  - <code>**Set INSTALLEDPLUGINS = DefaultPlugin, ...**</code>
-  - <code>**Set DISABLEDPLUGINS = EmptyPlugin, ...**</code>
+- All Plugin modules present in the `lib/TWiki/Plugins` directory are activated automatically unless disabled by the `DISABLEDPLUGINS` Preferences variable in TWikiPreferences. You can optionally list the installed Plugins in the `INSTALLEDPLUGINS` Preferences variable. This is useful to define the sequence of Plugin execution, or to specify other webs than the %WIKITOOLNAME% web for the Plugin topics. Settings in [[TWikiPreferences]] are:
+  - `Set INSTALLEDPLUGINS = DefaultPlugin, ...`
+  - `Set DISABLEDPLUGINS = EmptyPlugin, ...`
 
-**Plugin execution order** in TWiki is determined by searching Plugin topics in a specific sequence: First, full <code>**web.topicname**</code> name, if specified in <code>**INSTALLEDPLUGINS**</code>; next, the TWiki web is searched; and finally, the current web.
+**Plugin execution order** in TWiki is determined by searching Plugin topics in a specific sequence: First, full `web.topicname` name, if specified in `INSTALLEDPLUGINS`; next, the TWiki web is searched; and finally, the current web.
 
 **Plugin-specific settings** are done in individual Plugin topics. Two settings are standard for each Plugin:
 
 1. One line description, used to form the bullets describing the Plugins in the [[TextFormattingRules]] topic:
-  - <code>**Set SHORTDESCRIPTION = Blah blah woof woof.**</code>
-2. Debug Plugin, output can be seen in <code>**data/debug.txt**</code>. Set to 0=off or 1=on:
-  - <code>**Set DEBUG = 0**</code>
+  - `Set SHORTDESCRIPTION = Blah blah woof woof.`
+2. Debug Plugin, output can be seen in `data/debug.txt`. Set to 0=off or 1=on:
+  - `Set DEBUG = 0`
 
-- The settings can be retrieved as Preferences variables like <code>**%&lt;pluginname&gt;\_&lt;var&gt;%**</code>, ex: <code>**%DEFAULTPLUGIN\_SHORTDESCRIPTION%**</code> shows the description of the DefaultPlugin.
+- The settings can be retrieved as Preferences variables like `%<pluginname>_<var>%`, ex: `%DEFAULTPLUGIN_SHORTDESCRIPTION%` shows the description of the DefaultPlugin.
 
 ### <a name="Listing Active Plugins"></a> Listing Active Plugins
 
 Plugin status variables let you list all active Plugins wherever needed. There are two list formats:
 
-- The <code>**%ACTIVATEDPLUGINS%**</code> variable lists activated Plugins by name. (This variable is displayed in [[TWikiPreferences]] for debugging use.)
-- The <code>**%PLUGINDESCRIPTIONS%**</code> variable displays a bullet list with a one-line description of each active Plugins. This variable is based on the <code>**%&lt;plugin&gt;\_SHORTDESCRIPTION%**</code> Preferences variables of individual topics and is shown in [[TextFormattingRules]].
+- The `%ACTIVATEDPLUGINS%` variable lists activated Plugins by name. (This variable is displayed in [[TWikiPreferences]] for debugging use.)
+- The `%PLUGINDESCRIPTIONS%` variable displays a bullet list with a one-line description of each active Plugins. This variable is based on the `%<plugin>_SHORTDESCRIPTION%` Preferences variables of individual topics and is shown in [[TextFormattingRules]].
 
 > <span><font> **DEMO: Active Plugin Variables** </font></span>
 >
-> <code>**%ACTIVATEDPLUGINS%**</code><br /> On this TWiki site, the active Plugins are: [[SpreadSheetPlugin]], [[CommentPlugin]], [[EditTablePlugin]], [[InterwikiPlugin]], [[PreferencesPlugin]], [[SlideShowPlugin]], [[SmiliesPlugin]], [[TablePlugin]], [[TwistyPlugin]].
+> `%ACTIVATEDPLUGINS%`<br /> On this TWiki site, the active Plugins are: [[SpreadSheetPlugin]], [[CommentPlugin]], [[EditTablePlugin]], [[InterwikiPlugin]], [[PreferencesPlugin]], [[SlideShowPlugin]], [[SmiliesPlugin]], [[TablePlugin]], [[TwistyPlugin]].
 >
-> <code>**%PLUGINDESCRIPTIONS%**</code><br /> You can use any of these active TWiki Plugins:
+> <code>%PLUGINDESCRIPTIONS%</code><br /> You can use any of these active TWiki Plugins:
 >
 > - [[SpreadSheetPlugin]] <span>(any TWiki, 10197)</span>:
 > - [[CommentPlugin]] <span>(Dakar, 11359)</span>: Allows users to quickly post comments to a page without an edit/preview/save cycle
@@ -141,28 +141,28 @@ The Application Programming Interface (API) for TWikiPlugins provides the specif
 
 ### <a name="Available Core Functions"></a> Available Core Functions
 
-The <code>**lib/TWiki/Func.pm**</code> implements ALL official Plugin functions. Plugins should ONLY use functions published in this module.
+The `lib/TWiki/Func.pm` implements ALL official Plugin functions. Plugins should ONLY use functions published in this module.
 
-<span><font>**DevALERT:**</font></span> If you use functions not in <code>**Func.pm**</code>, you run the risk of creating security holes. Also, your Plugin will likely break and require updating when you upgrade to a new version of TWiki.
+<span><font>**DevALERT:**</font></span> If you use functions not in `Func.pm`, you run the risk of creating security holes. Also, your Plugin will likely break and require updating when you upgrade to a new version of TWiki.
 
-- For best performance, enable only the functions you really need. NOTE: <code>**outsidePREHandler**</code> and <code>**insidePREHandler**</code> are particularly expensive.
+- For best performance, enable only the functions you really need. NOTE: `outsidePREHandler` and `insidePREHandler` are particularly expensive.
 
 ### <a name="Predefined Hooks"></a> Predefined Hooks
 
-In addition to TWiki core functions, Plugins can use **predefined hooks**, or **call backs**, listed in the <code>**lib/TWiki/Plugins/EmptyPlugin.pm**</code> module.
+In addition to TWiki core functions, Plugins can use **predefined hooks**, or **call backs**, listed in the `lib/TWiki/Plugins/EmptyPlugin.pm` module.
 
-- All but the initPlugin are disabled. To enable a call back, remove <code>**DISABLE\_**</code> from the function name.
+- All but the initPlugin are disabled. To enable a call back, remove `DISABLE_` from the function name.
 
 ### <a name="Plugin Version Detection"></a> Plugin Version Detection
 
-To eliminate the incompatibility problems bound to arise from active open Plugin development, a Plugin versioning system and an API <code>**GetVersion**</code> detection routine are provided for automatic compatibility checking.
+To eliminate the incompatibility problems bound to arise from active open Plugin development, a Plugin versioning system and an API `GetVersion` detection routine are provided for automatic compatibility checking.
 
-- All modules require a <code>**$VERSION='0.000'**</code> variable, beginning at <code>**1\.000**</code>.
+- All modules require a `$VERSION='0.000'` variable, beginning at `1.000`.
 
-- The <code>**initPlugin**</code> handler should check all dependencies and return TRUE if the initialization is OK or FALSE if something went wrong.
-  - The Plugin initialization code does not register a Plugin that returns FALSE (or that has no <code>**initPlugin**</code> handler).
+- The `initPlugin` handler should check all dependencies and return TRUE if the initialization is OK or FALSE if something went wrong.
+  - The Plugin initialization code does not register a Plugin that returns FALSE (or that has no `initPlugin` handler).
 
-- <code>**$VERSION='1.000'**</code> is the current setting in <code>**TWiki::Plugins.pm**</code> and in the preinstalled system Plugins ([[DefaultPlugin]], [[EmptyPlugin]], [[InterwikiPlugin]]).
+- `$VERSION='1.000'` is the current setting in `TWiki::Plugins.pm` and in the preinstalled system Plugins ([[DefaultPlugin]], [[EmptyPlugin]], [[InterwikiPlugin]]).
 
 <a name="CreatePlugins"></a>
 
@@ -178,16 +178,16 @@ With a reasonable knowledge of the Perl scripting language, you can create new P
 
 A basic TWiki Plugin consists of two elements:
 
-- a Perl module, ex: <code>**MyFirstPlugin.pm**</code>
-- a documentation topic, ex: <code>**MyFirstPlugin.txt**</code>
+- a Perl module, ex: `MyFirstPlugin.pm`
+- a documentation topic, ex: `MyFirstPlugin.txt`
 
-The Perl module can be a block of code that connects with TWiki alone, or it can include other elements, like other Perl modules (including other Plugins), graphics, TWiki templates, external applications (ex: a Java applet), or just about anything else it can call. In particular, files that should be web-accessible (graphics, Java applets ...) are best placed as attachments of the <code>**MyFirstPlugin**</code> topic. Other needed Perl code is best placed in a <code>**lib/TWiki/Plugins/MyFirstPlugin/**</code> directory.
+The Perl module can be a block of code that connects with TWiki alone, or it can include other elements, like other Perl modules (including other Plugins), graphics, TWiki templates, external applications (ex: a Java applet), or just about anything else it can call. In particular, files that should be web-accessible (graphics, Java applets ...) are best placed as attachments of the `MyFirstPlugin` topic. Other needed Perl code is best placed in a `lib/TWiki/Plugins/MyFirstPlugin/` directory.
 
 The Plugin API handles the details of connecting your Perl module with main TWiki code. When you're familiar with the [[Plugin API|Main/WebHome#PluginAPI]], you're ready to develop Plugins.
 
 ### <a name="Creating the Perl Module"></a> Creating the Perl Module
 
-Copy file `lib/TWiki/Plugins/EmptyPlugin.pm` to <code>**&lt;name&gt;Plugin.pm**</code>. <code>**EmptyPlugin.pm**</code> contains no executable code, so it does nothing, but it's ready to be used. Customize it. Refer to the [[Plugin API|Main/WebHome#PluginAPI]] specs for more information.
+Copy file `lib/TWiki/Plugins/EmptyPlugin.pm` to `<name>Plugin.pm`. `EmptyPlugin.pm` contains no executable code, so it does nothing, but it's ready to be used. Customize it. Refer to the [[Plugin API|Main/WebHome#PluginAPI]] specs for more information.
 
 <a name="CreatePluginTopic"></a>
 
@@ -231,27 +231,27 @@ The Plugin documentation topic contains usage instructions and version details.
 
 ### <a name="Packaging for Distribution"></a> Packaging for Distribution
 
-A minimum Plugin release consists of a Perl module with a [[WikiName]] that ends in <code>**Plugin**</code>, ex: <code>**MyFirstPlugin.pm**</code>, and a documentation page with the same name(<code>**MyFirstPlugin.txt**</code>).
+A minimum Plugin release consists of a Perl module with a [[WikiName]] that ends in `Plugin`, ex: `MyFirstPlugin.pm`, and a documentation page with the same name(`MyFirstPlugin.txt`).
 
 1. Distribute the Plugin files in a directory structure that mirrors TWiki. If your Plugin uses additional files, include them ALL:
-  - <code>**lib/TWiki/Plugins/MyFirstPlugin.pm**</code>
-  - <code>**data/TWiki/MyFirstPlugin.txt**</code>
-  - <code>**pub/TWiki/MyFirstPlugin/uparrow.gif**</code> [a required graphic]
-2. Create a zip archive with the Plugin name (<code>**MyFirstPlugin.zip**</code>) and add the entire directory structure from Step 1. The archive should look like this:
-  - <code>**lib/TWiki/Plugins/MyFirstPlugin.pm**</code>
-  - <code>**data/TWiki/MyFirstPlugin.txt**</code>
-  - <code>**pub/TWiki/MyFirstPlugin/uparrow.gif**</code>
+  - `lib/TWiki/Plugins/MyFirstPlugin.pm`
+  - `data/TWiki/MyFirstPlugin.txt`
+  - `pub/TWiki/MyFirstPlugin/uparrow.gif` [a required graphic]
+2. Create a zip archive with the Plugin name (`MyFirstPlugin.zip`) and add the entire directory structure from Step 1. The archive should look like this:
+  - `lib/TWiki/Plugins/MyFirstPlugin.pm`
+  - `data/TWiki/MyFirstPlugin.txt`
+  - `pub/TWiki/MyFirstPlugin/uparrow.gif`
 
 <a name="PublishPlugin"></a>
 
 ### <a name="Publishing for Public Use"></a> Publishing for Public Use
 
-You can release your tested, packaged Plugin to the TWiki community through the TWiki:Plugins web, where all Plugins submitted to TWiki.org are available for download and further development discussion. Publish your Plugin in three steps:
+You can release your tested, packaged Plugin to the TWiki community through the TWiki:Plugins web. All Plugins submitted to TWiki.org are available for download and further development in TWiki:Plugins. Publish your Plugin in three steps:
 
 1. **Post** the Plugin documentation topic in the TWiki:Plugins web:
-  - create a new topic using the Plugin name, ex: <code>**MyFirstPlugin.txt**</code>;
-  - paste in the topic text from [[Creating Plugin Documentation|Main/WebHome#CreatePluginTopic]] and Save.
-2. **Attach** the distribution zip file to the topic, ex: <code>**MyFirstPlugin.zip**</code>.
-3. **Link** from the doc page to a new, blank page named after the Plugin, and ending in <code>**Dev**</code>, ex: <code>**MyFirstPluginDev**</code>. This is the discussion page for future development. (User support for Plugins is handled in TWiki:Support.)
+  - create a new topic using the Plugin name, ex: `MyFirstPlugin.txt`
+  - paste in the topic text from [[Creating Plugin Documentation|Main/WebHome#CreatePluginTopic]] and save
+2. **Attach** the distribution zip file to the topic, ex: `MyFirstPlugin.zip`
+3. **Link** from the doc page to a new, blank page named after the Plugin, and ending in `Dev`, ex: `MyFirstPluginDev`. This is the discussion page for future development. (User support for Plugins is handled in TWiki:Support.)
 
 -- [[AndreaSterbini]] - 29 May 2001 <br /> -- [[MikeMannix]] - 01 Sep 2001 <br /> -- [[PeterThoeny]] - 14 Sep 2001 <br />

diff --git a/TWiki/TWikiTemplates.mdwn b/TWiki/TWikiTemplates.mdwn
index 1d9a348..34c70de 100644 (file)
--- a/TWiki/TWikiTemplates.mdwn
+++ b/TWiki/TWikiTemplates.mdwn
@@ -110,11 +110,11 @@ The template files are in the <code>**twiki/templates**</code> directory. As an
 1. <code>**twiki/templates/$webName/$scriptName.tmpl**</code>
 2. <code>**twiki/templates/$scriptName.tmpl**</code>
 
-**_Note:_** <code>**$webName**</code> is the name of the web ( i.e. <code>**Main**</code> ), and <code>**$scriptName**</code> is the script ( i.e. <code>**view**</code> ).
+**_Note:_** `$webName` is the name of the web (ex: `Main`), and <code>**$scriptName**</code> is the script (ex: `view`).
 
 **_Note:_** [[TWikiSkins]] can be defined to overload the standard templates.
 
-Some special variables are used in templates ( especially <code>**view**</code> ) to show meta data - see [[Meta Data Rendering|Main/TWikiDocumentation#Meta_Data_Rendering]]
+Special variables are used in templates, especially in `view`, to display [[meta data|Main/TWikiMetaData#MetaDataRendering]].
 
 ### <a name="Template Topics"></a> Template Topics
 

diff --git a/TWiki/TWikiVariables.mdwn b/TWiki/TWikiVariables.mdwn
index d07d27b..a41659f 100644 (file)
--- a/TWiki/TWikiVariables.mdwn
+++ b/TWiki/TWikiVariables.mdwn
@@ -13,19 +13,19 @@
 
 # <a name="TWiki Variables"></a> TWiki Variables
 
-_Text strings expanded on the fly include predefined, preference-driven and custom-defined data_
+_Text strings expanded on the fly to display data or system info_
 
 ## <a name="Overview"></a> Overview
 
-TWikiVariables are text strings enclosed in percentage signs: <code>**%VARIABLE%**</code> that represent stored data. When a topic is rendered for viewing, defined variables are replaced by their actual values. TWiki has two types of variable, predefined and Preference-based, where usually you determine the content. Through Preference variables, you can also define custom variables, creating new variable name and value. TWiki variables are as simple to use as they are powerful, and vice versa!
+TWikiVariables are text strings - `%VARIABLE%` - that expand into content whenever a page is opened. Variables are replaced by their actual values: stored data, or system info (like the date, or the current user). There are predefined variables, and Preference variables that you set. You can also define custom variables, with new names and values.
 
 ## <a name="Predefined Variables"></a> Predefined Variables
 
-With a couple of notable exceptions, predefined variables return set values that are defined one-time on installation and left alone. Most are directory names and file paths, customized for your server, and only have to be updated once in the main configuration file if your server set-up changes.
+With a couple of notable exceptions, predefined variables return set values that are defined on installation and left alone. Most are directory names and file paths, customized for your server, and only have to be updated once in the main configuration file if your server set-up changes.
 
-%WIKITOOLNAME% expands the following variables enclosed in % percent signs:
+%WIKITOOLNAME% expands the following variables (enclosed in <code>**%**</code> percent signs):
 
-<table align="center" border="1" cellpadding="2" cellspacing="0" style="background-color: #fafafa" width="90%"><font size="13px"><font face="sans-serif"><tr>
+<table align="center" border="1" cellpadding="2" cellspacing="0" style="background-color: #f5f5f5" width="90%"><font size="13px"><font face="sans-serif"><tr>
         <th width="160"> Variable: </th>
         <th> Expanded to: </th>
       </tr>
@@ -118,6 +118,10 @@ With a couple of notable exceptions, predefined variables return set values that
         <td> The index topic of all registered users. Is <b>TWikiUsers</b></td>
       </tr>
       <tr>
+        <td><code>%WIKIPREFSTOPIC%</code></td>
+        <td> The web preferences topic. Is <b>TWikiPreferences</b></td>
+      </tr>
+      <tr>
         <td><code>%WEBPREFSTOPIC%</code></td>
         <td> The web preferences topic. Is <b>WebPreferences</b></td>
       </tr>
@@ -263,7 +267,7 @@ With a couple of notable exceptions, predefined variables return set values that
               <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:30:25</b></td>
+          </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:30:48</b></td>
       </tr>
       <tr>
         <td><code>%SERVERTIME%</code></td>
@@ -471,7 +475,7 @@ With a couple of notable exceptions, predefined variables return set values that
 
 Additional variables are defined in the preferences ( site-level ( **_SL_** ) in [[TWikiPreferences]], web-level ( **_WL_** ) in [[WebPreferences]] of each web, and user level ( **_UL_** ) preferences in individual user topics):
 
-<table align="center" border="1" cellpadding="2" cellspacing="0" style="background-color: #fafafa" width="90%"><font size="13px"><font face="sans-serif"><tr>
+<table align="center" border="1" cellpadding="2" cellspacing="0" style="background-color: #f5f5f5" width="90%"><font size="13px"><font face="sans-serif"><tr>
         <th width="160"> Variable: </th>
         <th> Level: </th>
         <th> What: </th>

diff --git a/TWiki/WebHome.mdwn b/TWiki/WebHome.mdwn
index e8d0c57..99dbfbb 100644 (file)
--- a/TWiki/WebHome.mdwn
+++ b/TWiki/WebHome.mdwn
@@ -50,7 +50,7 @@
     10. [[TWikiForms]]
     11. [[TWikiPlugins]]
     12. [[Monitoring Activity|Main/MonitoringSiteActivity]]
-    13. [[Managing Pages|Main/ManagingTopics]]
+    13. [[Managing Topics|Main/ManagingTopics]]
     14. [[Managing Webs|Main/ManagingWebs]]
     15. [[A - TWiki File System|Main/AppendixFileSystem]]
 
@@ -76,5 +76,3 @@ Site tools include utilities for navigating and keeping up with site activity on
 - TWiki<sup>TM</sup> is a trademark of [[PeterThoeny]]
 - TWiki is developed as Free Software under the [[GNU/GPL|Main/GnuGeneralPublicLicense]]
 - Get the current version from [TWiki.org Downloads](http://TWiki.org/download.html)<br />![twikilogo88x31.gif](http://www.dementia.org/twiki//view/twikilogo88x31.gif)
-
--- [[MikeMannix]] - 14 Sep 2001 <br />