Add admin reason to finish-sub and finish-unsub.

[mlmmj-listtexts.git] / en / finish-sub

diff --git a/en/finish-sub b/en/finish-sub
index f4aa7985442194290450e3aa07ec9c4356c533b2..f6fe8cf74c7de5e2c589e69fa0bedd64f531f518 100644 (file)
--- a/en/finish-sub
+++ b/en/finish-sub
@@ -1,6 +1,6 @@
-Subject: Welcome to $listaddr$
+Subject: Welcome to $list$@$domain$
 
-%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list.
+%text prologue%
 
 %wrap%
 %ifreason request%
@@ -12,27 +12,35 @@ Subject: Welcome to $listaddr$
 %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%
+  %ifreason admin%
+    An administrator has subscribed you to the
+  %else%
+    You have now been added to the
+  %endif%
+%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$.
 
-%wrap%
 %ifcontrol closedlist%
+%wrap%
   If you ever wish to unsubscribe, you will need to contact a list
-  administrator. You can email $listowner$ to contact the list owner.
+  administrator. You can email $list+$owner@$domain$ to contact the list
+  owner.
 %else%
+%wrap%
   If you ever wish to unsubscribe, send a message to
-  %iftype normal%$listunsubaddr$%endif%
-  %iftype digest%$digestunsubaddr$%endif%
-  %iftype nomail%$nomailunsubaddr$%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%
 
 %wrap%For other information and help about this list, send a message to
-$helpaddr$
+$list+$help@$domain$