none

diff --git a/Main/WebPreferences.mdwn b/Main/WebPreferences.mdwn
index 6d64a82..615e7f6 100644 (file)
--- a/Main/WebPreferences.mdwn
+++ b/Main/WebPreferences.mdwn
@@ -13,6 +13,12 @@ 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 =
 
+- Default template for new topics and form(s) for this web:
+  - [[WebTopicEditTemplate]]: Default template for new topics in this web. (Site-level is used if topic does not exist)
+  - [[TWiki.WebTopicEditTemplate|TWiki/WebTopicEditTemplate]]: Site-level default template
+  - [[TWikiFormTemplate]]: How to enable form(s)
+  - Set WEBFORMS =
+
 - Users or groups who **_are not_** / **_are_** allowed to **_view_** / **_change_** / **_rename_** topics in the %WEB% web: (See [[TWikiAccessControl]])
   - Set DENYWEBVIEW =
   - Set ALLOWWEBVIEW =
@@ -21,8 +27,9 @@ The following settings are **_web preferences_** of the %WIKITOOLNAME%.%WEB% web
   - Set DENYWEBRENAME =
   - Set ALLOWWEBRENAME =
 
-- Users or groups allowed to change this %TOPIC% topic: (I.e. [[TWikiAdminGroup]])
+- Users or groups allowed to change or rename this %TOPIC% topic: (I.e. [[TWikiAdminGroup]])
   - Set ALLOWTOPICCHANGE =
+  - Set ALLOWTOPICRENAME =
 
 - Web preferences that are **not** allowed to be overridden by user preferences:
   - Set FINALPREFERENCES = WEBTOPICLIST, DENYWEBVIEW, ALLOWWEBVIEW, DENYWEBCHANGE, ALLOWWEBCHANGE, DENYWEBRENAME, ALLOWWEBRENAME

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

diff --git a/TWiki/WebPreferences.mdwn b/TWiki/WebPreferences.mdwn
index 303f118..d8c09b2 100644 (file)
--- a/TWiki/WebPreferences.mdwn
+++ b/TWiki/WebPreferences.mdwn
@@ -13,6 +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 =
 
+- Default template for new topics and form(s) for this web:
+  - [[WebTopicEditTemplate]]: Site-level default template for new topics
+  - [[TWikiFormTemplate]]: How to enable form(s)
+  - Set WEBFORMS =
+
 - Users or groups who **_are not_** / **_are_** allowed to **_view_** / **_change_** / **_rename_** topics in the %WEB% web: (See [[TWikiAccessControl]])
   - Set DENYWEBVIEW =
   - Set ALLOWWEBVIEW =
@@ -21,8 +26,9 @@ The following settings are **_web preferences_** of the %WIKITOOLNAME%.%WEB% web
   - Set DENYWEBRENAME =
   - Set ALLOWWEBRENAME =
 
-- Users or groups allowed to change this %TOPIC% topic: (I.e. [[TWikiAdminGroup]])
+- Users or groups allowed to change or rename this %TOPIC% topic: (I.e. [[TWikiAdminGroup]])
   - Set ALLOWTOPICCHANGE =
+  - Set ALLOWTOPICRENAME =
 
 - Web preferences that are **not** allowed to be overridden by user preferences:
   - Set FINALPREFERENCES = WEBTOPICLIST, DENYWEBVIEW, ALLOWWEBVIEW, DENYWEBCHANGE, ALLOWWEBCHANGE, DENYWEBRENAME, ALLOWWEBRENAME