none

diff --git a/Main/NobodyGroup.mdwn b/Main/NobodyGroup.mdwn
new file mode 100644 (file)
index 0000000..57c9c3d
--- /dev/null
+++ b/Main/NobodyGroup.mdwn
@@ -0,0 +1,8 @@
+**Nobody Group**
+
+- Set GROUP =
+- Set ALLOWTOPICCHANGE = [[TWikiAdminGroup]]
+
+Used to prevent dangerous actions e.g. renaming [[TWikiPreferences]].
+
+**_Related topics:_** [[TWikiUsers]], [[TWikiGroups]], [[TWikiAccessControl]]

diff --git a/Main/TWikiAdminGroup.mdwn b/Main/TWikiAdminGroup.mdwn
index 4ae7850..9c3c280 100644 (file)
--- a/Main/TWikiAdminGroup.mdwn
+++ b/Main/TWikiAdminGroup.mdwn
@@ -1,6 +1,6 @@
 **TWiki Administrator Group**
 
-- Set GROUP = [[PeterThoeny]]
+- Set GROUP = [[PeterThoeny]], [[JohnTalintyre]]
 - #Set ALLOWTOPICCHANGE = [[TWikiAdminGroup]]
 
 (Note: Set the members of TWiki Administrator Group in GROUP, then enable the ALLOWTOPICCHANGE variable by removing # sign)

diff --git a/Main/WebPreferences.mdwn b/Main/WebPreferences.mdwn
index 43c03bb..1bb07ea 100644 (file)
--- a/Main/WebPreferences.mdwn
+++ b/Main/WebPreferences.mdwn
@@ -13,9 +13,11 @@ The following settings are **_web preferences_** of the %WIKITOOLNAME%.%WEB% web
 - Exclude web from a `web="all"` search: (Set to `on` for hidden webs)
   - Set NOSEARCHALL =
 
-- Users or groups who **_are not_** / **_are_** allowed to change topics in the %WEB% web: (See [[TWikiAccessControl]])
+- Users or groups who **_are not_** / **_are_** allowed to change/rename topics in the %WEB% web: (See [[TWikiAccessControl]])
   - Set DENYWEBCHANGE =
   - Set ALLOWWEBCHANGE =
+  - Set DENYWEBRENAME =
+  - #Set ALLOWEBRENAME = [[TWikiAdminGroup]]
 
 - Users or groups allowed to change this %TOPIC% topic: (I.e. [[TWikiAdminGroup]])
   - Set ALLOWTOPICCHANGE =

diff --git a/TWiki/DeleteOrRenameATopic.mdwn b/TWiki/DeleteOrRenameATopic.mdwn
new file mode 100644 (file)
index 0000000..5025fdf
--- /dev/null
+++ b/TWiki/DeleteOrRenameATopic.mdwn
@@ -0,0 +1 @@
+[[RenameTopic]] can also be used to delete a topic. This is done by moving the topic to the Trash Web. If this Web does not exist ask your to add it.

diff --git a/TWiki/GoodStyle.mdwn b/TWiki/GoodStyle.mdwn
index e90866d..e8c86cb 100644 (file)
--- a/TWiki/GoodStyle.mdwn
+++ b/TWiki/GoodStyle.mdwn
@@ -14,6 +14,6 @@ Date format: %WIKITOOLNAME% is international, so the ISO date format like "06 Fe
 
 ----
 
-Feel free to look at the source to an existing page if you want to see how something is formatted. A bit of HTML experience can't hurt, but is far from necessary.
+Feel free to look at the source to an existing page (click `Raw text`) if you want to see how something is formatted. A bit of HTML experience can't hurt, but is far from necessary.
 
 -- [[TWikiGuest]] - 27 May 2000

diff --git a/TWiki/ManagingTopics.mdwn b/TWiki/ManagingTopics.mdwn
new file mode 100644 (file)
index 0000000..2e96232
--- /dev/null
+++ b/TWiki/ManagingTopics.mdwn
@@ -0,0 +1,37 @@
++ Rename/move/delete a topic
+
+Select rename/move when viewing a topic to change its name, do [[DeleteTopic]] or [[MoveTopic]].
+
+1. Select target Web if other than existing Web
+2. Fill in new name - defaults to current name
+3. You will be warned if there are locks or if there is a name clash
+4. A list of _links_ to the topic will be listed, by default these links will be updated, click checkbox to prevent this
+5. Press the Rename/Move button, topic will be renamed and links to the topic updated as requested.
+  - If any of the referring pages are locked then they will be listed
+  - You can correct these later by again pressing Rename/Move
+
+++ Referring topics
+
+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_.
+
+++ Deleting a topic
+
+Topics can be _deleted_ by moving them to the Trash Web (this should be added to the default distribution). Note that topics from all Webs go into this, so there could be name clashes, the user is warned of this and asked to choose a new name. When TWiki support sub-webs, these could be created on demand in the Trash Web, which would avoid this name clash problem.
+
+It is up to the administrator of a TWiki installation to clean the Trash Web periodically e.g. by archiving to tape of CDROM entries older than 6 months.
+
+++ Redirection from old topic
+
+Something like the following can be put in [[WebTopicViewTemplate]] and [[WebTopicNonWikiTemplate]] to show if a topic has moved. It does this by searching for the tag %META:TOPICMOVED\{...\}%.
+
+## This topic used to exist and was moved to:
+
+# TWiki Installation Error
+
+Incorrect format of searchmeta template (missing sections? There should be 4 %SPLIT% tags)
+
+++ Permissions
+
+Permissions affect rename in various ways. To rename a topic you need both change and rename permissions. To alter refering topics, you need change permission. See [[TWikiAccessControl]] for information on setting up permissions.

diff --git a/TWiki/ManagingWebs.mdwn b/TWiki/ManagingWebs.mdwn
index 796400a..ddafc7c 100644 (file)
--- a/TWiki/ManagingWebs.mdwn
+++ b/TWiki/ManagingWebs.mdwn
@@ -1,17 +1,6 @@
 ## <a name="TWiki Administration"></a> TWiki Administration
 
-The current implementation of %WIKITOOLNAME% is designed to never forget, that means all topic changes are under revision control and you can't delete or rename topics.
-
-Nevertheless there are cases where you wish to delete topics. %WIKITOOLNAME% requires administrative stuff like that to be done on the shell level, so please ask your %WIKITOOLNAME% administrator to do that for you. A future version will allow administrators to do that on the browser level.
-
-### <a name="How to Rename or Delete a Topic"></a> How to Rename or Delete a Topic
-
-- Go to the topic you want to rename / delete.
-- Find out the back-links to this page from _Ref-By_ . Modify other topics if needed.
-- Telnet to the %WIKITOOLNAME% installation.
-- cd to <code>**twiki/data**</code> and then to the web where the topic is located. Rename / delete the topic ( <code>**name.txt**</code> ) and repository file ( <code>**name.txt,v**</code> ). **_Hint:_** Instead of deleting a topic you could create a <code>**Trash**</code> web and move topics/repositories to this web. (A future version of TWiki might have a Trash web.)
-- Edit the <code>**.changes**</code> file and rename / delete all occurrences of the topic. **_Note:_** There might be several lines of the topic.
-- cd to <code>**twiki/pub**</code> and then to the web where the topic is located. Rename / delete the topic attachment directory if present.
+The current implementation of %WIKITOOLNAME% is designed to never forget. So you can't delete a topic, however you can move or rename a topic and the original information is saved in topic meta data. If you want an even stronger memory, you can disable renaming on some or all topics; see [[TWikiAccessControl]].
 
 ### <a name="How to add a New Web"></a> How to add a New Web
 
@@ -28,4 +17,4 @@ Nevertheless there are cases where you wish to delete topics. %WIKITOOLNAME% req
 - cd to <code>**twiki/templates**</code> and rename / delete the web directory if present.
 - cd to <code>**twiki/pub**</code> and rename / delete the web directory if present.
 
--- [[PeterThoeny]] - 03 Mar 2001 <br />
+-- [[PeterThoeny]] - 03 Mar 2001 <br /> -- [[JohnTalintyre]] - 07 Aug 2001 <br />

diff --git a/TWiki/MoveTopic.mdwn b/TWiki/MoveTopic.mdwn
new file mode 100644 (file)
index 0000000..8ffe20a
--- /dev/null
+++ b/TWiki/MoveTopic.mdwn
@@ -0,0 +1 @@
+[[RenameTopic]] can be used to move a topic from one Web to another. One specialised use of this is [[DeleteWeb]].

diff --git a/TWiki/TWikiAccessControl.mdwn b/TWiki/TWikiAccessControl.mdwn
index 48a73b6..8712989 100644 (file)
--- a/TWiki/TWikiAccessControl.mdwn
+++ b/TWiki/TWikiAccessControl.mdwn
@@ -54,6 +54,35 @@ The same rules apply like the one for Access Control for Individual Topics; with
 - DENYTOPICCHANGE (in topic) overrides DENYWEBCHANGE (in WebPreferences)
 - ALLOWTOPICCHANGE (in topic) overrides ALLOWWEBCHANGE (in WebPreferences)
 
+### <a name="Rename Access Restriction for In"></a> Rename Access Restriction for Individual Topics
+
+You can define restrictions of who is allowed to rename a topic. Note that users need this permission in addition to the CHANGE permission in order to rename a topic. They also need CHANGE access to change references in referring topics.
+
+Define one or both of these variables in a topic, preferably at the end of the topic:
+
+- Set DENYTOPICRENAME = &lt; list of users and groups &gt;
+- Set ALLOWTOPICRENAME = &lt; list of users and groups &gt;
+
+DENYTOPICCRENAME defines users or groups that **are not** allowed to rename the topic. It is a comma delimited list of users and groups. Example: <br />`    * Set DENYTOPICRENAME = Main.SomeBadBoy, Main.SomeBadGirl, Main.SomeHackerGroup`
+
+ALLOWTOPICRENAME defines users or groups that **are** allowed to rename the topic. It is a comma delimited list of users and groups. Example: <br />`    * Set ALLOWTOPICRENAME = Main.SomeGoodGuy, Main.SomeGoodGirl, Main.TWikiAdminGroup`
+
+DENYTOPICRENAME is evaluated before ALLOWTOPICRENAME. Access is denied if the authenticated person is in the DENYTOPICRENAME list, or not in the ALLOWTOPICRENAME list. Access is granted in case DENYTOPICRENAME and ALLOWTOPICRENAME is not defined.
+
+### <a name="Rename Access Restriction for a"></a><a name="Rename Access Restriction for a "></a> Rename Access Restriction for a Whole %WIKITOOLNAME% Web
+
+You can define restrictions of who is allowed to do renames for a %WIKITOOLNAME% web.
+
+Define one or both of these variable in the [[WebPreferences]] topic:
+
+- Set DENYWEBRENAME = &lt; list of users and groups &gt;
+- Set ALLOWWEBRENAME = &lt; list of users and groups &gt;
+
+The same rules apply like the one for Access Control for Individual Topics; with these additions:
+
+- DENYTOPICRENAME (in topic) overrides DENYWEBRENAME (in WebPreferences)
+- ALLOWTOPICRENAME (in topic) overrides ALLOWWEBRENAME (in WebPreferences)
+
 ### <a name="Read Access Restriction for a Wh"></a> Read Access Restriction for a Whole %WIKITOOLNAME% Web
 
 You can define restrictions of who is allowed to view a %WIKITOOLNAME% web.

diff --git a/TWiki/TWikiForms.mdwn b/TWiki/TWikiForms.mdwn
new file mode 100644 (file)
index 0000000..54a95b2
--- /dev/null
+++ b/TWiki/TWikiForms.mdwn
@@ -0,0 +1,245 @@
+## <a name="Form Templates"></a> Form Templates
+
+<div>
+  <ul>
+    <li><a href="#Form Templates"> Form Templates</a><ul>
+        <li><a href="#Background"> Background</a></li>
+        <li><a href="#Terminology"> Terminology</a></li>
+        <li><a href="#Specification"> Specification</a><ul>
+            <li><a href="#Enable forms for a web"> Enable forms for a web</a></li>
+            <li><a href="#Enabling single default form"> Enabling single default form</a></li>
+            <li><a href="#Enabling multiple forms"> Enabling multiple forms</a></li>
+            <li><a href="#Define a form template"> Define a form template</a></li>
+          </ul>
+        </li>
+        <li><a href="#Examples"> Examples</a><ul>
+            <li><a href="#Defining form in one topic"> Defining form in one topic</a></li>
+            <li><a href="#Defining form in multiple topics"> Defining form in multiple topics</a></li>
+            <li><a href="#Notes"> Notes</a></li>
+          </ul>
+        </li>
+        <li><a href="#Changes from category system"> Changes from category system</a></li>
+        <li><a href="#Creating new topics with forms"> Creating new topics with forms</a></li>
+        <li><a href="#Topic meta data"> Topic meta data</a></li>
+        <li><a href="#UI for multiple form templates"> UI for multiple form templates</a></li>
+        <li><a href="#Migration of Category informatio"> Migration of Category information</a></li>
+      </ul>
+    </li>
+  </ul>
+</div>
+
+### <a name="Background"></a> Background
+
+This is a more general replacement for the [[TWikiCategoryTable]] capability, in particular Forms are defined by special topics, where as categories were defineind using special templates.
+
+### <a name="Terminology"></a> Terminology
+
+- **Form Template:** A set of fields defining a form. (_Class_ in OO speak; used to be called _category table definition_)
+  - A web may contain more then one form template.
+- **Form:** A topic containing additional meta-data (besides the free form TEXTAREA) which categorizes the content. (_Object_ in OO speak; used to be called _category table_)
+  - A topic has zero or one of the defined forms. So there are topics with a form or without.
+- **Form Field:** A named item in a form. (Used to be called _category item name_)
+- **Field Type:** The type of a field when editing a form. The type defines the HTML INPUT tag widgets when editing a topic:
+  - **select:** Drop down box or selector
+  - **checkbox:** One or more check boxes
+  - **checkbox+buttons:** One or more check boxes, plus _set_ and _clear_ buttons to set/clear all check boxes
+  - **radio:** One or more radio buttons
+  - **text:** A one-line text field
+  - **textarea:** A general text area - size is _rows_x_cols_ e.g. 40x10
+- **Field Value:** Value of a form field. Can be one or more values from a fixed set (select, checkbox, radio type) or free form (text type). (Used to be called _category item value_)
+
+### <a name="Specification"></a> Specification
+
+#### <a name="Enable forms for a web"></a> Enable forms for a web
+
+By default topics can be edited in free form. A form can be added to a topic to give it more structure. Forms are enabled on a per web basis. This can be done in two ways. One is similar to that used for the older category system, with this a Web can have only one form. The other allows a Web to have any number of forms.
+
+A default form template can be provided by creating the <code>**WebTopicEditTemplate**</code> topic in a Web and adding a form to it. Initial form values can be set here.
+
+#### <a name="Enabling single default form"></a> Enabling single default form
+
+The <code>**DEFAULTFORM**</code> variable in [[WebPreferences]] is optional. If present it specifies the default form for all topics in the Web. Every time you edit a topic you will be presented with a form. The form must contain the special field `UseForm` (analogous to the `UseCategory` line in the old category system). The values for this must be:
+
+- First field - "Yes" (any capitalisation)
+- Second field - any text, but must mean _no form_
+
+#### <a name="Enabling multiple forms"></a> Enabling multiple forms
+
+The <code>**WEBFORMS**</code> variable in [[WebPreferences]] is optional and defines a list of possible form templates e.g.
+
+- Set WEBFORMS = BugForm, FeatureForm, BookLoanForm
+
+With this present an extra button is added to the edit view. If the topic doesn't have a form the button appears at the end of the page. If a form is present the button appears in the top row of the form. Pressing the button leads to a screen that enables _no form_ to be selected of one of those specified by `WEBFORMS`.
+
+#### <a name="Define a form template"></a> Define a form template
+
+Form templates are defined by topics, one topic per form template. A form template topic has descriptive text mixed with the form template definition in the form of a TWiki table.
+
+### <a name="Examples"></a> Examples
+
+#### <a name="Defining form in one topic"></a> Defining form in one topic
+
+Example: WebFormTemplate of the TWiki.Know web:
+
+<table border="1" cellpadding="0" cellspacing="0">
+  <tr>
+    <th bgcolor="#99CCCC"><strong> Name: </strong></th>
+    <th bgcolor="#99CCCC"><strong> Type: </strong></th>
+    <th bgcolor="#99CCCC"><strong> Size: </strong></th>
+    <th bgcolor="#99CCCC"><strong> Values: </strong></th>
+    <th bgcolor="#99CCCC"><strong> Tooltip message: </strong></th>
+  </tr>
+  <tr>
+    <td>[[Know/UseForm]]</td>
+    <td> radio </td>
+    <td> 0 </td>
+    <td> Yes, No </td>
+    <td> Select 'No' to remove the form </td>
+  </tr>
+  <tr>
+    <td>[[Know/TopicClassification]]</td>
+    <td> select </td>
+    <td> 1 </td>
+    <td>[[Know/NoDisclosure]], [[Know/PublicSupported]], [[Know/PublicFAQ]]</td>
+    <td> blah blah... </td>
+  </tr>
+  <tr>
+    <td>[[Know/OperatingSystem]]</td>
+    <td> checkbox </td>
+    <td> 3 </td>
+    <td>[[Know/OsHPUX]], [[Know/OsLinux]], [[Know/OsSolaris]], [[Know/OsWin]]</td>
+    <td> blah blah... </td>
+  </tr>
+  <tr>
+    <td>[[Know/OsVersion]]</td>
+    <td> text </td>
+    <td> 16 </td>
+    <td>   </td>
+    <td> blah blah... </td>
+  </tr>
+</table>
+
+#### <a name="Defining form in multiple topics"></a> Defining form in multiple topics
+
+The form template can also be defined in an alternative way by using more then one topic:
+
+- A **form template topic** defines the form
+- Values of fields that have more then one value, e.g. of type radio, select and checkbox can be defined by **field value template topics**
+
+Above Example:
+
+- WebFormTemplate of the TWiki.Know web: <table border="1" cellpadding="0" cellspacing="0">
+  <tr>
+    <th bgcolor="#99CCCC"><strong> Name: </strong></th>
+    <th bgcolor="#99CCCC"><strong> Type: </strong></th>
+    <th bgcolor="#99CCCC"><strong> Size: </strong></th>
+    <th bgcolor="#99CCCC"><strong> Values: </strong></th>
+    <th bgcolor="#99CCCC"><strong> Tooltip message: </strong></th>
+  </tr>
+  <tr>
+    <td>[[Know/UseForm]]</td>
+    <td> radio </td>
+    <td> 0 </td>
+    <td> Yes, No </td>
+    <td> blah blah... </td>
+  </tr>
+  <tr>
+    <td>[[Know/TopicClassification]]</td>
+    <td> select </td>
+    <td> 1 </td>
+    <td>   </td>
+    <td> blah blah... </td>
+  </tr>
+  <tr>
+    <td>[[Know/OperatingSystem]]</td>
+    <td> checkbox </td>
+    <td> 3 </td>
+    <td>   </td>
+    <td> blah blah... </td>
+  </tr>
+  <tr>
+    <td>[[Know/OsVersion]]</td>
+    <td> text </td>
+    <td> 16 </td>
+    <td>   </td>
+    <td> blah blah... </td>
+  </tr>
+</table>
+
+- TopicClassification topic: <table border="1" cellpadding="0" cellspacing="0">
+  <tr>
+    <th bgcolor="#99CCCC"><strong> Name: </strong></th>
+    <th bgcolor="#99CCCC"><strong> Type: </strong></th>
+    <th bgcolor="#99CCCC"><strong> Tooltip message: </strong></th>
+  </tr>
+  <tr>
+    <td>[[Know/NoDisclosure]]</td>
+    <td> option </td>
+    <td> blah blah... </td>
+  </tr>
+  <tr>
+    <td>[[Know/PublicSupported]]</td>
+    <td> option </td>
+    <td> blah blah... </td>
+  </tr>
+  <tr>
+    <td>[[Know/PublicFAQ]]</td>
+    <td> option </td>
+    <td> blah blah... </td>
+  </tr>
+</table>
+
+#### <a name="Notes"></a> Notes
+
+- This format allows you to define field items with / without [[WikiNames]], depending on your needs.
+- The topic can be protected in the usual manner so that not everybody can change the form template.
+- <code>[[...|/WebHome]]</code> can be used for force a link, at present <code>[[...|/WebHome]]</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 [[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 <code>**WebTopicEditTemplate**</code> or using fieldFLD=value or for checkboxes fieldFLDcheckbox=1 in URL
+- The `UseForm` field is special.
+  - Will always default to second value (don't use form) when topic doesn't have a form
+  - Is not show on preview or view
+  - When set to no on save, form data is deleted.
+- It is not a good idea to use both `DEFAULTFORM` and `WEBFORMS` [[WebPreferences]] in the same Web.
+
+### <a name="Changes from category system"></a> Changes from category system
+
+Main changes from [[TWikiCategoryTable]]:
+
+- Name changed in the hope that form is more readily understandable than category
+- `UseCategory` is now `UseForm`
+- The templates for category view/edit have been dropped
+- Forms are defined by topics, categories were defined in a template file
+- A Web can have multiple forms, only one category was possible
+- Form data is saved in meta variables - see [[MetaDataDefinition]], and render to HTML on viewing. Category data was stored as HTML
+
+### <a name="Creating new topics with forms"></a> Creating new topics with forms
+
+When you create a new topic in a web that has the WEBFORM preferences variable set you will get a topic with the default form template specified by the variable.
+
+For simplicity we should use the default form template when one creates a new topic by question mark link or "Go" field, i.e. better not to show a menu to select a form template.
+
+### <a name="Topic meta data"></a> Topic meta data
+
+See [[TWikiMetaDataDefinition]].
+
+The form template topic name and all form fields/values are stored in the topic meta data. The form template topic name is needed for edit and save.
+
+The order of form field/value items in the meta-data is the same as in the form template.
+
+### <a name="UI for multiple form templates"></a> UI for multiple form templates
+
+- Optional <code>**WEBFORMS**</code> variable defines possibles form templates that can be selected after pressing "Change" (forms) button on edit page
+- A template topic can use any form template
+- Decided not to ask user to choose a template or form template when creating a topic as goes against the KISS of Wiki systems.
+- New topics with a form get instantiated by simple HTML forms asking for a topic name, i.e. there is a SubmitExpenseReport topic were you can create new expense reports, a SubmitVacationRequest topic and so on. These can specify the required template topic and hence form.
+
+### <a name="Migration of Category informatio"></a> Migration of Category information
+
+Principle: new system should work with old data with no special conversion.
+
+Old data should be transparently upgraded to the new meta format when a topic is edit/previewed/saved.
+
+On upgrading the administrator must produce a form template topic for each Web that using the old category system. `twikicatitems.tmpl` defines the categories and is used in the conversion. The form template must be put as first item in [[WebPreferences]] variable <code>**WEBFORM**</code> or <code>**DEFAULTFORM**</code> (if/when put in). If it's not present, an _oops_ dialog results.
+
+-- [[JohnTalintyre]] - 07 Aug 2001 <br />

diff --git a/TWiki/TWikiPreferences.mdwn b/TWiki/TWikiPreferences.mdwn
index 8c59f96..c8ab1f7 100644 (file)
--- a/TWiki/TWikiPreferences.mdwn
+++ b/TWiki/TWikiPreferences.mdwn
@@ -71,6 +71,9 @@ The following settings are **_site-level preferences_** , e.g. affecting all use
 - Users or groups allowed to change this %TOPIC% topic: (I.e. [[TWikiAdminGroup]])
   - Set ALLOWTOPICCHANGE =
 
+- Users or groups allow to rename this %TOPIC% topic:
+  - Set ALLOWTOPICRENAME = [[NobodyGroup]]
+
 - Site-level preferences that are **not** allowed to be overridden by [[WebPreferences]] and user preferences:
   - Set FINALPREFERENCES = PREVIEWBGIMAGE, WIKIWEBMASTER, MAILHOST
 

diff --git a/TWiki/WebHome.mdwn b/TWiki/WebHome.mdwn
index 122c419..a88c518 100644 (file)
--- a/TWiki/WebHome.mdwn
+++ b/TWiki/WebHome.mdwn
@@ -19,6 +19,8 @@
   - [[TextFormattingFAQ]]: Answers to frequently asked questions about text formatting.
   - [[TWikiVariables]]: Add variable content like other topics and inline search.
   - [[FileAttachments]]: Add files to any topic.
+  - [[RenameTopic]]: Renaming, moving, deleting topics.
+  - [[TWikiFormTemplate]]: Defining and using forms that add structured information to a topic.
 - **_Webmaster documentation:_**
   - [[TWikiHistory]] shows TWiki's implementation history.
   - [[TWikiDocumentation]] is the implementation documentation of TWiki, containing these topics:
@@ -32,9 +34,10 @@
     8. [[TWikiSkins]]
     9. [[TWikiVariables]]
     10. [[TWikiNotificationOfChanges]]
-    11. [[TWikiCategoryTable]]
+    11. [[TWikiFormTemplate]]
     12. [[TWikiPlugins]]
-    13. [[TWikiAdministration]] tells you how to rename or delete a topic or web.
+    13. [[RenameTopic]]
+    14. [[TWikiAdministration]] tells you how to rename or delete a topic or web.
 
 <form action="http://www.dementia.org/twiki//search/%WEB%/">
   <ul>