1 files changed, 6 insertions, 8 deletions
diff --git a/TWiki/TWikiForms.mdwn b/TWiki/TWikiForms.mdwn
index 5d833d5f..5bec1d24 100644
--- a/TWiki/TWikiForms.mdwn
+++ b/TWiki/TWikiForms.mdwn
@@ -1,5 +1,3 @@
-%INCLUDE\{"UtilTempDocNote"\}%
-
 %TOC% %STARTINCLUDE%
 
 # <a name="TWiki_Forms"> TWiki Forms </a>
@@ -8,7 +6,7 @@ _Form-based input in topics, with name/value pairs stored as Meta Data variables
 
 ## <a name="Overview"> Overview </a>
 
-By adding form-based input to free-form content, you can structure topics with unlimited, easily searchable categories. When forms are enabled for a web and selected in a topic, the form appears in edit mode, and the contents are rendered as a table when viewing the actual page. When editing, can switch forms, if more than one is defined, or remove forms entirely. Form input values are stored as [[TWikiDocumentation]]; all data is saved.
+By adding form-based input to free-form content, you can structure topics with unlimited, easily searchable categories. When forms are enabled for a web and selected in a topic, the form appears in edit mode, and the contents are rendered as a table when viewing the actual page. When editing, can switch forms, if more than one is defined, or remove forms entirely. Form input values are stored as [[TWikiMetaData]]; all data is saved.
 
 Form Templates replace TWikiCategory Tables from the 01-Dec-2000 version of TWiki.
 
@@ -43,7 +41,7 @@ Form Templates more powerful, flexible replacement for the original TWikiCategor
 
 ### <a name="Importing_Category_Table_Data"> Importing Category Table Data </a>
 
-On upgrading from the previous TWiki, a Form Template topic has to be built for each web that used a Category Table, recreating the fields and values from the old <code>**twikicatitems.tmpl**</code>. The replacement Form Template must be set as the first item in the [[WebPreferences]] variable `=WEBFORM`. If missing, pages will display, but attempting to edit results in an error message.
+On upgrading from the previous TWiki, a Form Template topic has to be built for each web that used a Category Table, recreating the fields and values from the old <code>**twikicatitems.tmpl**</code>. The replacement Form Template must be set as the first item in the [[WebPreferences]] variable `WEBFORMS`. If missing, pages will display, but attempting to edit results in an error message.
 
 The new Form Template system should work with old Category Table data with no special conversion. Data is assigned to Meta variables the first time an imported topic is edited and saved in the new system.
 
@@ -76,7 +74,7 @@ A Form Template is simply a page containing your form, defined in a table where
 3. For each field, fill in a new line; for the type of field, select from the list.
 4. Save the topic.
 
-> **Example: WebFormTemplate from the TWiki.Know web**
+> **Example: WebForm from the TWiki.Know web**
 >
 >     | *Name* | *Type* | *Size* | *Values* | *Tooltip message* |
 >     | Know.TopicClassification | select | 1 | Know.NoDisclosure,
@@ -183,9 +181,9 @@ The Form Template can also be defined in an alternative way by using more then o
 
 * * The topic can be protected in the usual manner so that not everybody can change the form template - see [[TWikiAccessControl]]
 
-* * `...` can be used for force a link, at present `...` format is not supported.
+* * <code>[[...]]</code> links can be used for force a link, at present <code>[[...]\[...]]</code> format is not supported.
 
-* * The "Tooltip message:" column is used as a tool tip for the field name (only if field name is a [[TWiki/WikiName]]) - you only see the tooltip on edit.
+* * The "Tooltip message" column is used as a tool tip for the field name (only if field name is a [[TWiki/WikiName]]) - you only see the tooltip on edit.
 
 * * The first item in the list is the default item. Alternative initial values can be given in a topic template such as `WebTopicEditTemplate` or using field=value or for checkboxes field=1.
 
@@ -225,6 +223,6 @@ A form embedded in a topic also appears in a new topic. This is done by specifyi
 
 ## <a name="Form_Template_Data_Storage"> Form Template Data Storage </a>
 
-The Form Template topic name, fields and values are stored as [[TWikiDocumentation]]. The order of field/value pairs in the Meta Data is the same as in the Template.
+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 />