none

[openafs-wiki.git] / TWiki / TWikiPreferences.mdwn

diff --git a/TWiki/TWikiPreferences.mdwn b/TWiki/TWikiPreferences.mdwn
index 939a89d..8527a1c 100644 (file)
--- a/TWiki/TWikiPreferences.mdwn
+++ b/TWiki/TWikiPreferences.mdwn
@@ -42,8 +42,8 @@ The following are **_site-level_** settings that affect all users in all webs on
   - Set NOAUTOLINK =
   - **_Note:_** Use the `[[...][...]]` syntax to link topics in case you disabled WikiWord linking. The `<noautolink> ... </noautolink>` syntax can be used to prevents links within a block of text.
 
-- Warn if `%INCLUDE{}%` of other topic fails (if set to `on`); silently fail (if empty); can be overwritten by web preferences:
-  - Set INCLUDEWARNING =
+- Warn if `%INCLUDE{}%` of topic fails: Fail silently (if empty or `off`); output "Warning: Can't INCLUDE Topic, topic not found" (if set to `on`); else, output specific text (use `$topic` for topic). You can override this setting by web preferences and by a `warn="..."` parameter in `%INCLUDE{}%` :
+  - Set INCLUDEWARNING = %RED% **_Note:_** %ENDCOLOR% Included topic [[$topic|Main/Topic]] does not exist yet
 
 ## <a name="User Settings"></a> User Settings
 
@@ -80,7 +80,7 @@ The following are **_site-level_** settings that affect all users in all webs on
 ## <a name="TWiki Platform Settings"></a> TWiki Platform Settings
 
 - TWiki platform name:
-  - Set WIKITOOLNAME = TWiki
+  - Set WIKITOOLNAME = TWikibeta
 
 - Image, URL and alternate tooltip text of TWiki logo: (can be overwritten by web preferences)
   - Set WIKILOGOIMG = ![twikiRobot46x50.gif](http://www.dementia.org/twiki//view/TWiki/TWikiLogos/twikiRobot46x50.gif)
@@ -99,6 +99,9 @@ The following are **_site-level_** settings that affect all users in all webs on
 - TWiki webmaster email address:
   - Set WIKIWEBMASTER = <webmaster@your.company>
 
+- TWiki webmaster name (first name and last name, e.g. `Fred Smith`):
+  - Set WIKIWEBMASTERNAME = TWiki Webmaster
+
 - Mail host for outgoing mail. This is used for [[WebChangesAlert]] if Perl module <code>**Net::SMTP**</code> is installed. If not, or if `SMTPMAILHOST` is empty, the external sendmail program is used instead (defined by <code>**$mailProgram**</code> in <code>**TWiki.cfg**</code>). Examples: <code>**mail.your.company**</code> or <code>**localhost**</code>
   - Set SMTPMAILHOST = mail