Updated to reflect new unsubscription and version switching behaviour.

diff --git a/en/deny b/en/deny
index 2e1dd9aa7eb8b6c8dea3acfad161c5d74b635804..d3e8b283b5cb9958c10b58d8b5e28b67890390d9 100644 (file)
--- a/en/deny
+++ b/en/deny
@@ -9,11 +9,11 @@
 %wrap%
   You were unable to be subscribed to the list
   %ifreason disabled%
 %wrap%
   You were unable to be subscribed to the list
   %ifreason disabled%

-    because
-    %iftype normal%%endif%
-    %iftype digest% the digest version of %endif%
-    %iftype nomail% the no-mail version of %endif%
-    the list is turned off.
+    because the
+    %iftype normal% normal %endif%
+    %iftype digest% digest %endif%
+    %iftype nomail% no-mail %endif%
+    version of the list is turned off.

   %endif%
   %ifreason closed%
     because people are not allowed to subscribe to this list by email.
   %endif%
   %ifreason closed%
     because people are not allowed to subscribe to this list by email.


@@ -31,11 +31,7 @@
 
 %ifaction unsub%
 %wrap%
 
 %ifaction unsub%
 %wrap%

-  You were unable to be unsubscribed from
-  %iftype normal%%endif%
-  %iftype digest% the digest version of %endif%
-  %iftype nomail% the no-mail version of %endif%
-  the list
+  You were unable to be unsubscribed from the list

   %ifreason unsubbed%
     because you are not subscribed.
 
   %ifreason unsubbed%
     because you are not subscribed.
 


@@ -44,16 +40,6 @@
     subscribed. To find out which address you are subscribed with, refer to
     the message welcoming you to the list, or look at the envelope
     "Return-Path" header of a message you receive from the list.
     subscribed. To find out which address you are subscribed with, refer to
     the message welcoming you to the list, or look at the envelope
     "Return-Path" header of a message you receive from the list.

-    %iftype digest%
-      Or perhaps you are subscribed to the normal version of the list. To
-      unsubscribe from that version of the list, send a message to
-      $list+$unsubscribe@$domain$
-    %endif
-    %iftype normal%
-      Or perhaps you are subscribed to the digest version of the list. To
-      unsubscribe from that version of the list, send a message to
-      $list+$unsubscribe-digest@$domain$
-    %endif

   %endif%
 %endif%
 
   %endif%
 %endif%
 

diff --git a/en/finish b/en/finish
index 1845ce64354d4dc6aa1a443d2cfbaef03d50c84d..2c9e61400876c2cfe1d62179beed25d75633c4f5 100644 (file)
--- a/en/finish
+++ b/en/finish
@@ -12,11 +12,7 @@
   %ifreason confirm%
     Thank you for confirming your unsubscribe.
   %endif%
   %ifreason confirm%
     Thank you for confirming your unsubscribe.
   %endif%

-  You have now been removed from
-  %iftype normal%%endif%
-  %iftype digest% the digest version of %endif%
-  %iftype nomail% the no-mail version of %endif%
-  the list.
+  You have now been removed from the list.

 %endif%
 
 %ifaction release%
 %endif%
 
 %ifaction release%

diff --git a/en/finish-sub b/en/finish-sub
index 2071d65d85e1f0670f923663e67631999cc626b1..031f289804dcb51654d166b80bc031b8894953e0 100644 (file)
--- a/en/finish-sub
+++ b/en/finish-sub
@@ -12,11 +12,15 @@ Subject: Welcome to $list$@$domain$
 %ifreason permit%
   A gatekeeper has permitted you to join us.
 %endif%
 %ifreason permit%
   A gatekeeper has permitted you to join us.
 %endif%

-You have now been added to
-%iftype normal%%endif%
-%iftype digest% the digest version of %endif%
-%iftype nomail% the no-mail version of %endif%
-the list.
+%ifreason switch%
+  Your subscription has been switched to the
+%else%
+  You have now been added to the
+%endif%
+%iftype normal% normal %endif%
+%iftype digest% digest %endif%
+%iftype nomail% no-mail %endif%
+version of the list.

 
 The email address you are subscribed with is $reqaddr$.
 
 
 The email address you are subscribed with is $reqaddr$.
 


@@ -28,9 +32,7 @@ The email address you are subscribed with is $reqaddr$.
 %else%
 %wrap%
   If you ever wish to unsubscribe, send a message to
 %else%
 %wrap%
   If you ever wish to unsubscribe, send a message to

-  %iftype normal%$list+$unsubscribe@$domain$%endif%
-  %iftype digest%$list+$unsubscribe-digest@$domain$%endif%
-  %iftype nomail%$list+$unsubscribe-nomail@$domain$%endif%
+  $list+$unsubscribe@$domain$

   using this email address. The subject and the body of the message can be
   anything. You will then receive confirmation or further instructions.
 %endif%
   using this email address. The subject and the body of the message can be
   anything. You will then receive confirmation or further instructions.
 %endif%

diff --git a/en/gatekeep-sub b/en/gatekeep-sub
index 3e708c29c3e9cb8a48adb9a0cb401eabb8ba71c3..9f9094bfb3f0bd4a0f88d07605e5878b8f7fb568 100644 (file)
--- a/en/gatekeep-sub
+++ b/en/gatekeep-sub
@@ -2,11 +2,11 @@ Subject: Subscription request for $list$@$domain$: $subaddr$
 
 %text prologue%
 
 
 %text prologue%
 

-%wrap%There has been a request from $subaddr$ to join
-%iftype normal%%endif%
-%iftype digest% the digest version of %endif%
-%iftype nomail% the no-mail version of %endif%
-the list.
+%wrap%There has been a request from $subaddr$ to join the
+%iftype normal% normal %endif%
+%iftype digest% digest %endif%
+%iftype nomail% no-mail %endif%
+version of the list.

 
 %wrap%To permit this, please send a message to $permitaddr$ which can
 usually be done simply by replying to this message.
 
 %wrap%To permit this, please send a message to $permitaddr$ which can
 usually be done simply by replying to this message.

diff --git a/en/help b/en/help
index e6bde884ff1cdd3baecffa28af1585febce2570d..7bf0a2b8bdd802de56250ef49b2279a8a48ec708 100644 (file)
--- a/en/help
+++ b/en/help
@@ -4,7 +4,7 @@ Subject: Information for $list$@$domain$
 
 Here is some information about the list.
 
 
 Here is some information about the list.
 

-It has the following versions:
+You can subscribe to the following versions:

 
 - The normal version: Every time a post is sent to the list, subscribers
   receive a copy of it.
 
 - The normal version: Every time a post is sent to the list, subscribers
   receive a copy of it.


@@ -13,11 +13,6 @@ It has the following versions:
 %else%
   - %wrap%Subscribe by emailing: $list+$subscribe@$domain$
 %endif%
 %else%
   - %wrap%Subscribe by emailing: $list+$subscribe@$domain$
 %endif%

-%ifcontrol closedlist%
-  - Unsubscribe by contacting a list administrator.
-%else%
-  - %wrap%Unsubscribe by emailing: $list+$unsubscribe@$domain$
-%endif%

 
 %ifncontrol nodigestsub%
 - The digest version: Subscribers receive multiple posts in a single mail
 
 %ifncontrol nodigestsub%
 - The digest version: Subscribers receive multiple posts in a single mail


@@ -27,11 +22,6 @@ It has the following versions:
 %else%
   - %wrap%Subscribe by emailing: $list+$subscribe-digest@$domain$
 %endif%
 %else%
   - %wrap%Subscribe by emailing: $list+$subscribe-digest@$domain$
 %endif%

-%ifcontrol closedlist%
-  - Unsubscribe by contacting a list administrator.
-%else%
-  - %wrap%Unsubscribe by emailing: $list+$unsubscribe-digest@$domain$
-%endif%

 %endif%
 
 %ifncontrol nonomailsub%
 %endif%
 
 %ifncontrol nonomailsub%


@@ -44,11 +34,6 @@ It has the following versions:
 %else%
   - %wrap%Subscribe by emailing: $list+$subscribe-nomail@$domain$
 %endif%
 %else%
   - %wrap%Subscribe by emailing: $list+$subscribe-nomail@$domain$
 %endif%

-%ifcontrol closedlist%
-  - Unsubscribe by contacting a list administrator.
-%else%
-  - %wrap%Unsubscribe by emailing: $list+$unsubscribe-nomail@$domain$
-%endif%

 %endif%
 
 %ifcontrol submod%
 %endif%
 
 %ifcontrol submod%


@@ -56,6 +41,12 @@ The list has gatekeepers who will review subscription requests before
 permitting new members.
 %endif%
 
 permitting new members.
 %endif%
 

+%ifcontrol closedlist%
+Unsubscribe by contacting a list administrator.
+%else%
+%wrap%Unsubscribe by emailing: $list+$unsubscribe@$domain$
+%endif%
+

 Posts are made by emailing $list$@$domain$
 
 %ifcontrol subonlypost%%ifncontrol modnonsubposts%
 Posts are made by emailing $list$@$domain$
 
 %ifcontrol subonlypost%%ifncontrol modnonsubposts%

diff --git a/en/notify b/en/notify
index a56509870d847b8dd271adb522b7ed337f4da683..5b4481cb6afc4ac8eb014834359be0dfbc0d17fe 100644 (file)
--- a/en/notify
+++ b/en/notify
@@ -5,11 +5,11 @@
 
 %ifaction sub%
 %wrap%
 
 %ifaction sub%
 %wrap%

-  The address $subaddr$ has been subscribed to
-  %iftype normal%%endif%
-  %iftype digest% the digest version of %endif%
-  %iftype nomail% the no-mail version of %endif%
-  the list
+  The address $subaddr$ has been subscribed to the
+  %iftype normal% normal %endif%
+  %iftype digest% digest %endif%
+  %iftype nomail% no-mail %endif%
+  version of the list

   %ifreason request%
     because a request to join was received.
   %endif%
   %ifreason request%
     because a request to join was received.
   %endif%