none

diff --git a/Main/WebNotify.mdwn b/Main/WebNotify.mdwn
index 65df54a..3b73bfc 100644 (file)
--- a/Main/WebNotify.mdwn
+++ b/Main/WebNotify.mdwn
@@ -2,6 +2,4 @@ This is a subscription service to be automatically notified by e-mail when topic
 
 - [[TWikiGuest]] - <example@your.company>
 
-**_Format:_** &lt;space&gt;&lt;space&gt;&lt;space&gt;, followed by:%BR% `* Main.yourWikiName` (if you want the e-mail address in your home page to be used) %BR% `* Main.yourWikiName - yourEmailAddress` (if you want to specify a different e-mail address) %BR% `* Main.anyTWikiGroup` (if you want to notify all members of a particular [[TWikiGroup|Main/TWikiGroups]])
-
-**_Related topics:_** [[TWikiUsers]], [[TWikiRegistration]]
+**_Related topics:_** [[WebChangesAlert]], [[TWikiUsers]], [[TWikiRegistration]]

diff --git a/TWiki/TWikiSiteTools.mdwn b/TWiki/TWikiSiteTools.mdwn
index e975192..14e3617 100644 (file)
--- a/TWiki/TWikiSiteTools.mdwn
+++ b/TWiki/TWikiSiteTools.mdwn
@@ -34,14 +34,6 @@ Each TWiki web has an automatic email alert service that sends a list of recent
 
 - You can create a [[WebNotify]] link using [[TWikiVariables]] with <code>**%NOTIFYTOPIC%**</code>
 
-TWiki handles WebNotify entries that include the [[WikiName]] of a user or a [[TWikiGroup|Main/TWikiGroups]] and an optional e-mail address. Example entries in WebNotify:
-
-        * Main.FredBloggs
-        * Main.FredBloggs - secondary@home.com
-        * Main.EngineeringGroup
-
-The first entry is the default form, the notification gets sent to the e-mail address specified in the user's home page. The second entry lists an alternative e-mail address. The third entry specifies a group, the notification gets sent to each member of the group.
-
 You can also use `%MAINWEB%` instead of `Main`, but this is not necessary even if you have renamed the main web by configuring `$mainWebname` in `TWiki.cfg`.
 
 ### <a name="Configuring Outgoing Mail"></a> Configuring Outgoing Mail
@@ -101,7 +93,7 @@ TWiki generates monthly log files which are used by the statistics
 - The file name is `log<year><month>.txt`
 - Example path name: `twiki/data/log201006.txt`
 - Each access gets logged as: %BR% `| <time> | <wikiusername> | <action> | <web>.<topic> | <extra info> | <IP address> |`
-- Example log entry: %BR% `| 29 Jun 2010 - 11:45 | Main.TWikiGuest | view | TWiki.WebRss |  | 66.124.232.02 |`
+- Example log entry: %BR% `| 29 Jun 2010 - 11:48 | Main.TWikiGuest | view | TWiki.WebRss |  | 66.124.232.02 |`
 - Actions are logged if enabled in TWiki.cfg by the `$doLogTopic<action>` flags
 - Logged actions: <table border="1" cellpadding="0" cellspacing="0">
   <tr>
@@ -194,4 +186,4 @@ This is simply a preset `SEARCH`. The number of topics listed by the `limit` par
 
 > %SEARCH{"\.*" scope="topic" regex="on" nosearch="on"}%
 
--- TWiki:Main.MikeMannix - 01 Dec 2001 %BR% -- TWiki:Main.PeterThoeny - 24 Apr 2004
+-- TWiki:Main.MikeMannix - 01 Dec 2001 %BR% -- TWiki:Main.PeterThoeny - 28 Aug 2004

diff --git a/TWiki/WebChangesAlert.mdwn b/TWiki/WebChangesAlert.mdwn
index 0d201b6..9b45b7e 100644 (file)
--- a/TWiki/WebChangesAlert.mdwn
+++ b/TWiki/WebChangesAlert.mdwn
@@ -1,12 +1,23 @@
 ## <a name="Web Changes Notification Service"></a> Web Changes Notification Service
 
-Each %WIKITOOLNAME% web has an automatic email notification service that sends you an email with links to all of the topics modified since the last alert.
+Each TWiki web has an automatic email notification service that sends you an email with links to all of the topics modified since the last alert.
 
-- You can subscribe and unsubscribe yourself in [[WebNotify]] on each web. Changes are immediate.
+### <a name="Subscription"></a> Subscription
 
-- The frequency of alerts is set by the TWiki site administrator: it could be once a day, every hour, whatever works for the particular web.
-  - On TWiki.org, alerts are sent once a day.
+You can subscribe and unsubscribe yourself in [[WebNotify]] on each web. Please keep the list in alphabetical order so that names can be found easily.
+
+**_Format:_** TWiki handles entries in bullet list (`<space><space><space>*`) format containing the [[WikiName]] of a user; a WikiName with e-mail address; or a [[TWikiGroup|Main/TWikiGroups]]. Examples:
+
+- `Main.FredBloggs`
+- `Main.FredBloggs - secondary@home.com`
+- `Main.EngineeringGroup`
+
+The first entry is the default form, the notification gets sent to the e-mail address specified in the user's home page. The second entry lists an alternative e-mail address. The third entry specifies a group, the notification gets sent to each member of the group.
+
+### <a name="E-mail Alerts"></a> E-mail Alerts
+
+The frequency of alerts is set by the TWiki site administrator: It could be once a day, every hour, whatever works for the particular web. On TWiki.org, alerts are sent once a day.
 
 See [[TWikiSiteTools]] for information on how to setup the alerts.
 
--- TWiki:Main.MikeMannix - 20 Nov 2001
+-- TWiki:Main.MikeMannix - 20 Nov 2001 %BR% -- [[PeterThoeny]] - 28 Aug 2004

diff --git a/TWiki/WebNotify.mdwn b/TWiki/WebNotify.mdwn
index 65df54a..3b73bfc 100644 (file)
--- a/TWiki/WebNotify.mdwn
+++ b/TWiki/WebNotify.mdwn
@@ -2,6 +2,4 @@ This is a subscription service to be automatically notified by e-mail when topic
 
 - [[TWikiGuest]] - <example@your.company>
 
-**_Format:_** &lt;space&gt;&lt;space&gt;&lt;space&gt;, followed by:%BR% `* Main.yourWikiName` (if you want the e-mail address in your home page to be used) %BR% `* Main.yourWikiName - yourEmailAddress` (if you want to specify a different e-mail address) %BR% `* Main.anyTWikiGroup` (if you want to notify all members of a particular [[TWikiGroup|Main/TWikiGroups]])
-
-**_Related topics:_** [[TWikiUsers]], [[TWikiRegistration]]
+**_Related topics:_** [[WebChangesAlert]], [[TWikiUsers]], [[TWikiRegistration]]