none

1 files changed, 17 insertions, 19 deletions

diff --git a/TWiki/MetaDataDefinition.mdwn b/TWiki/MetaDataDefinition.mdwn
index 7aab24a0..dc304561 100644
--- a/TWiki/MetaDataDefinition.mdwn
+++ b/TWiki/MetaDataDefinition.mdwn
@@ -1,28 +1,26 @@
+%TOC% %STARTINCLUDE%
+
 ## <a name="Meta_Data_Definition"> Meta Data Definition </a>
 
-See [[MetaDataRendering]] for display of meta data
+See [[TWikiDocumentation]] for variables used to display meta data.
 
 Current version: **1\.0**
 
-Table of contents: %TOC%
-
 ### <a name="Example_of_format"> Example of format </a>
 
-<pre>
-%<nop>META:TOPICINFO{version="1.6" date="976762663" author="PeterThoeny" format="1.0"}%
-   text of the topic
-%<nop>META:TOPICMOVED{from="Codev.OldName" to="CoDev.NewName" by="JohnTalintyre" date="976762680"}%
-%<nop>META:TOPICPARENT{name="NavigationByTopicContext"}%
-%<nop>META:FILEATTACHMENT{name="Sample.txt" version="1.3" ... }%
-%<nop>META:FILEATTACHMENT{name="Smile.gif" version="1.1" ... }%
-%<nop>META:FORM{name="WebFormTemplate"}%
-%<nop>META:FIELD{name="OperatingSystem" value="OsWin"}%
-%<nop>META:FIELD{name="TopicClassification" value="PublicFAQ"}%
-</nop></nop></nop></nop></nop></nop></nop></nop></pre>
+    %<nop>META:TOPICINFO{version="1.6" date="976762663" author="PeterThoeny" format="1.0"}%
+       text of the topic
+    %<nop>META:TOPICMOVED{from="Codev.OldName" to="CoDev.NewName" by="JohnTalintyre" date="976762680"}%
+    %<nop>META:TOPICPARENT{name="NavigationByTopicContext"}%
+    %<nop>META:FILEATTACHMENT{name="Sample.txt" version="1.3" ... }%
+    %<nop>META:FILEATTACHMENT{name="Smile.gif" version="1.1" ... }%
+    %<nop>META:FORM{name="WebFormTemplate"}%
+    %<nop>META:FIELD{name="OperatingSystem" value="OsWin"}%
+    %<nop>META:FIELD{name="TopicClassification" value="PublicFAQ"}%
 
 ### <a name="General_notes"> General notes </a>
 
-* Format is as for %TWIKIWEB%.TWikiVariables, except all fields have a key.
+* Format is as for \[[TWikiDocumentation#TWiki\_Variables, except all fields have a key.
   * %META:&lt;type&gt;\{key1="value1" [key2="value2" [...]]\}%
 * Order of fields within the meta variables is not defined, except that if there is a field with key `name`, this appears first for easier searching (note the order of the variables themselves is defined)
 * Each meta variable is on one line
@@ -195,7 +193,7 @@ Extra field that are added if an attachment is moved:
   </tr>
   <tr>
     <td> name </td>
-    <td> A topic name - the topic is a <span style="background:"><font color="">TWiki Form Template</font></span><a href="http://LOCATION/TWikiFormTemplate">?</a>. Can optionally include the web name i.e. web.topic, but doesn't normally </td>
+    <td> A topic name - the topic is a <span style="background:"><font color="">Form Template</font></span><a href="http://LOCATION/TWikiDocumentation">?</a>. Can optionally include the web name i.e. web.topic, but doesn't normally </td>
   </tr>
 </table>
 
@@ -210,11 +208,11 @@ Should only be present if there is a FORM entry. Note that this data is used whe
   </tr>
   <tr>
     <td> name </td>
-    <td> Ties to entry in <span style="background:"><font color="">TWiki Form Template</font></span><a href="http://LOCATION/TWikiFormTemplate">?</a>, is title with all bar alphanumerics and . removed </td>
+    <td> Ties to entry in <span style="background:"><font color="">Form Template</font></span><a href="http://LOCATION/TWikiDocumentation">?</a>, is title with all bar alphanumerics and . removed </td>
   </tr>
   <tr>
     <td> title </td>
-    <td> Full text from <span style="background:"><font color="">TWiki Form Template</font></span><a href="http://LOCATION/TWikiFormTemplate">?</a></td>
+    <td> Full text from <span style="background:"><font color="">Form Template</font></span><a href="http://LOCATION/TWikiDocumentation">?</a></td>
   </tr>
   <tr>
     <td> value </td>
@@ -230,4 +228,4 @@ When viewing a topic the `Raw Text` link can be clicked to show the text of a to
 
 There is currently no support for meta data for Plugins. However, the format is readily extendable and the `Meta.pm` code that supports the format only needs minor alteration.
 
--- [[Main/JohnTalintyre]] - 16 Aug 2001 <br />
+-- [[JohnTalintyre]] - 16 Aug 2001 <br />