--- a/en/deny	Mon Mar 21 02:08:34 2011 +1100
+++ b/en/deny	Mon Jun 27 02:49:32 2011 +1000
@@ -9,11 +9,11 @@
 %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.
@@ -31,11 +31,7 @@
 
 %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.
 
@@ -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.
-    %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%
 

--- a/en/finish	Mon Mar 21 02:08:34 2011 +1100
+++ b/en/finish	Mon Jun 27 02:49:32 2011 +1000
@@ -12,11 +12,7 @@
   %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%

--- a/en/finish-sub	Mon Mar 21 02:08:34 2011 +1100
+++ b/en/finish-sub	Mon Jun 27 02:49:32 2011 +1000
@@ -12,11 +12,15 @@
 %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$.
 
@@ -28,9 +32,7 @@
 %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%

--- a/en/gatekeep-sub	Mon Mar 21 02:08:34 2011 +1100
+++ b/en/gatekeep-sub	Mon Jun 27 02:49:32 2011 +1000
@@ -2,11 +2,11 @@
 
 %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.

--- a/en/help	Mon Mar 21 02:08:34 2011 +1100
+++ b/en/help	Mon Jun 27 02:49:32 2011 +1000
@@ -4,7 +4,7 @@
 
 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.
@@ -13,11 +13,6 @@
 %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
@@ -27,11 +22,6 @@
 %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%
@@ -44,11 +34,6 @@
 %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%
@@ -56,6 +41,12 @@
 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%

--- a/en/notify	Mon Mar 21 02:08:34 2011 +1100
+++ b/en/notify	Mon Jun 27 02:49:32 2011 +1000
@@ -5,11 +5,11 @@
 
 %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%