Item9986: Remove "%USERSWEB%.WikiGuest - example@your.company" from W…

…ebNotify because it hasn't been documented or supported by MailerContrib for a long while (since TWiki). git-svn-id: http://svn.foswiki.org/trunk@9968 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Nov 11, 2010 · 74bcc47 · 74bcc47
1 parent bcac3c3
commit 74bcc47
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 13 deletions.
diff --git a/core/data/Main/WebNotify.txt b/core/data/Main/WebNotify.txt
@@ -3,7 +3,6 @@
 %MAKETEXT{"This is a subscription service to be automatically notified by e-mail when topics change in this [_1] web. This is a convenient service, so you do not have to come back and check all the time if something has changed. To subscribe, please add a bullet with your [_2] in alphabetical order to this list:" args="*<nop>%WEB%*,[[%SYSTEMWEB%.WikiName][WikiName]]"}%
 
    * %USERSWEB%.WikiGuest
-   * %USERSWEB%.WikiGuest - example@your.company
 
 
 %INCLUDE{"%SYSTEMWEB%.WebNotifyHelp"}%
diff --git a/core/data/Sandbox/WebNotify.txt b/core/data/Sandbox/WebNotify.txt
@@ -2,7 +2,6 @@
 %MAKETEXT{"This is a subscription service to be automatically notified by e-mail when topics change in this [_1] web. This is a convenient service, so you do not have to come back and check all the time if something has changed. To subscribe, please add a bullet with your [_2] in alphabetical order to this list:" args="*<nop>%WEB%*,[[%SYSTEMWEB%.WikiName][WikiName]]"}%
 
    * %USERSWEB%.WikiGuest
-   * %USERSWEB%.WikiGuest - example@your.company
 
 
 %INCLUDE{"%SYSTEMWEB%.WebNotifyHelp"}%
diff --git a/core/data/System/VarIF.txt b/core/data/System/VarIF.txt
@@ -2,7 +2,7 @@
 %META:TOPICPARENT{name="Macros"}%
 #VarIF
 ---+++ IF{"condition" ...} -- simple conditionals
-   * Evaluate a condition and show one text or another based on the result. See details in IfStatements
+   * Evaluate a condition and show one text or another based on the result. See details in [[IfStatements]].
    * Syntax: <verbatim class="tml">%IF{"CONDITION" then="THEN" else="ELSE"}%</verbatim> shows<br/> ="THEN"= if ="CONDITION"= evaluates to =TRUE=, otherwise ="ELSE"= will be shown
    * Example: <verbatim class="tml"> %IF{"defined FUNFACTOR"
    then="FUNFACTOR is defined"

diff --git a/core/data/System/WebNotify.txt b/core/data/System/WebNotify.txt
@@ -4,7 +4,6 @@
 %MAKETEXT{"This is a subscription service to be automatically notified by e-mail when topics change in this [_1] web. This is a convenient service, so you do not have to come back and check all the time if something has changed. To subscribe, please add a bullet with your [_2] in alphabetical order to this list:" args="*<nop>%WEB%*,[[%SYSTEMWEB%.WikiName][WikiName]]"}%
 
    * %USERSWEB%.WikiGuest
-   * %USERSWEB%.WikiGuest - example@your.company
 
 
-%INCLUDE{"%SYSTEMWEB%.WebNotifyHelp"}%
+%INCLUDE{"%SYSTEMWEB%.WebNotifyHelp"}%
diff --git a/core/data/Trash/WebNotify.txt b/core/data/Trash/WebNotify.txt
@@ -2,7 +2,6 @@
 %MAKETEXT{"This is a subscription service to be automatically notified by e-mail when topics change in this [_1] web. This is a convenient service, so you do not have to come back and check all the time if something has changed. To subscribe, please add a bullet with your [_2] in alphabetical order to this list:" args="*<nop>%WEB%*,[[%SYSTEMWEB%.WikiName][WikiName]]"}%
 
    * %USERSWEB%.WikiGuest
-   * %USERSWEB%.WikiGuest - example@your.company
 
 
 %INCLUDE{"%SYSTEMWEB%.WebNotifyHelp"}%
diff --git a/core/data/_default/WebNotify.txt b/core/data/_default/WebNotify.txt
@@ -2,7 +2,6 @@
 %MAKETEXT{"This is a subscription service to be automatically notified by e-mail when topics change in this [_1] web. This is a convenient service, so you do not have to come back and check all the time if something has changed. To subscribe, please add a bullet with your [_2] in alphabetical order to this list:" args="*<nop>%WEB%*,[[%SYSTEMWEB%.WikiName][WikiName]]"}%
 
    * %USERSWEB%.WikiGuest
-   * %USERSWEB%.WikiGuest - example@your.company
 
 
 %INCLUDE{"%SYSTEMWEB%.WebNotifyHelp"}%
diff --git a/core/lib/Foswiki/Render.pm b/core/lib/Foswiki/Render.pm
@@ -1377,12 +1377,10 @@ sub _filterScript {
 
 ---++ ObjectMethod TML2PlainText( $text, $topicObject, $opts ) -> $plainText
 
-Clean up TML for display as plain text without pushing it
-through the full rendering pipeline. Intended for generation of
-topic and change summaries. Adds nop tags to prevent
-subsequent rendering; nops get removed at the very end.
-
-Defuses TML.
+Strip TML markup from text for display as plain text without
+pushing it through the full rendering pipeline. Intended for 
+generation of topic and change summaries. Adds nop tags to 
+prevent subsequent rendering; nops get removed at the very end.
 
 $opts:
    * showvar - shows !%VAR% names if not expanded