Move prologue into its own file, and update deprecated stuff.

diff --git a/en/confirm b/en/confirm
index e729ec3d7fb67cfa798a3900fd6eaec74314ff5e..32dfdfd4db1f828861cdbc1d1829f364e38aefd4 100644 (file)
--- a/en/confirm
+++ b/en/confirm
@@ -1,7 +1,7 @@
-%ifaction sub%Subject: Confirm subscription to $listaddr$%endif%
-%ifaction unsub%Subject: Confirm unsubscribe from $listaddr$%endif%
+%ifaction sub%Subject: Confirm subscription to $list$@$domain$%endif%
+%ifaction unsub%Subject: Confirm unsubscribe from $list$@$domain$%endif%
 
-%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list.
+%text prologue%
 
 %wrap%
 %ifaction sub%

diff --git a/en/deny b/en/deny
index 5c1804bc6e2d1a077a20bce7e14a4e5e7576911f..0013d93788db81318dd9d42a30949c4144cdc7dc 100644 (file)
--- a/en/deny
+++ b/en/deny
@@ -1,9 +1,9 @@
-%ifaction sub%Subject: Unable to subscribe to $listaddr$%endif%
-%ifaction unsub%Subject: Unable to unsubscribe from $listaddr$%endif%
-%ifaction release reject%Subject: Unable to moderate $listaddr$%endif%
-%ifaction permit obstruct%Subject: Unable to gatekeep $listaddr$%endif%
+%ifaction sub%Subject: Unable to subscribe to $list$@$domain$%endif%
+%ifaction unsub%Subject: Unable to unsubscribe from $list$@$domain$%endif%
+%ifaction release reject%Subject: Unable to moderate $list$@$domain$%endif%
+%ifaction permit obstruct%Subject: Unable to gatekeep $list$@$domain$%endif%
 
-%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list.
+%text prologue%
 
 %wrap%
 %ifaction sub%
@@ -42,12 +42,12 @@
     %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
-      $listunsubaddr$
+      $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
-      $digestunsubaddr$
+      $list+$unsubscribe-digest@$domain$
     %endif
   %endif%
 %endif%

diff --git a/en/deny-post b/en/deny-post
index 6e8b21e1867ced9e2460bae2b1b4b1117e968b36..d949c2b6f317bfcc7a6fd0277f4fa982d4be2bdb 100644 (file)
--- a/en/deny-post
+++ b/en/deny-post
@@ -1,4 +1,4 @@
-Subject: Post to $listaddr$ denied: $subject$
+Subject: Post to $list$@$domain$ denied: $subject$
 MIME-Version: 1.0
 Content-Type: multipart/mixed;
  boundary="=_$random0$$random1$_="
@@ -8,7 +8,7 @@ Content-Transfer-Encoding: 8bit
 Content-Type: text/plain; charset=utf8
 Content-Transfer-Encoding: 8bit
 
-%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list.
+%text prologue%
 
 %wrap%The message from $posteraddr$ with subject "$subject" was unable
 to be delivered to the list
@@ -55,7 +55,8 @@ to be delivered to the list
   %endif%%endif%
   %ifcontrol closedlist closedlistsub%
     If you wish to become a subscriber, 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.
   %endif%
 
 %wrap%

diff --git a/en/digest b/en/digest
index 64d14f316003ec3e60955cc155a512bcee498a15..e9fa85926d5fc7828f34c4e6d426f297ece0bf71 100644 (file)
--- a/en/digest
+++ b/en/digest
@@ -1,4 +1,4 @@
-Subject: Digest of $listaddr$ issue $digestissue$ ($digestinterval$)
+Subject: Digest of $list$@$domain$ issue $digestissue$ ($digestinterval$)
 
 Topics (messages $digestfirst$ through $digestlast$):
 - %digestthreads%

diff --git a/en/faq b/en/faq
index 154c0f532e3abc6095352e7d6b5b1cd5c9d33ae6..28f22fe1f64af56c060d0c28113b9612dd8d5cf2 100644 (file)
--- a/en/faq
+++ b/en/faq
@@ -1,4 +1,4 @@
-Subject: Frequently asked questions of $listaddr$
+Subject: Frequently asked questions of $list$@$domain$
 
 Sorry, no FAQ available yet.
 

diff --git a/en/finish b/en/finish
index f9c14dc713f443e47a819e23d499e9556fb71b63..05e2c7079fe7c3104c9290d1879b37d0bf40a367 100644 (file)
--- a/en/finish
+++ b/en/finish
@@ -1,9 +1,9 @@
-%ifaction unsub%Subject: Goodbye from $listaddr$%endif%
-%ifaction release reject%Subject: Moderated $listaddr$: $subject$%endif%
-%ifaction permit obstruct%Subject: Guarded $listaddr$: $subaddr$%endif%
-%ifaction post%Subject: Posted to $listaddr$: $subject$%endif%
+%ifaction unsub%Subject: Goodbye from $list$@$domain$%endif%
+%ifaction release reject%Subject: Moderated $list$@$domain$: $subject$%endif%
+%ifaction permit obstruct%Subject: Guarded $list$@$domain$: $subaddr$%endif%
+%ifaction post%Subject: Posted to $list$@$domain$: $subject$%endif%
 
-%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list.
+%text prologue%
 
 %wrap%
 %ifaction unsub%

diff --git a/en/finish-sub b/en/finish-sub
index f4aa7985442194290450e3aa07ec9c4356c533b2..a3eb8918f2b3e18aa53ce4f96ed5b1dab4d4c148 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%
@@ -23,16 +23,17 @@ The email address you are subscribed with is $reqaddr$.
 %wrap%
 %ifcontrol closedlist%
   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%
   If you ever wish to unsubscribe, send a message to
-  %iftype normal%$listunsubaddr$%endif%
-  %iftype digest%$digestunsubaddr$%endif%
-  %iftype nomail%$nomailunsubaddr$%endif%
+  %iftype normal%$list+$unsubscribe@$domain$%endif%
+  %iftype digest%$list+$unsubscribe-digest@$domain$%endif%
+  %iftype nomail%$list+$unsubscribe-nomail@$domain$%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%
 
 %wrap%For other information and help about this list, send a message to
-$helpaddr$
+$list+$help@$domain$
 

diff --git a/en/gatekeep-sub b/en/gatekeep-sub
index 467d5f03a731903e0686226f966f059c299bfd2d..3e708c29c3e9cb8a48adb9a0cb401eabb8ba71c3 100644 (file)
--- a/en/gatekeep-sub
+++ b/en/gatekeep-sub
@@ -1,6 +1,6 @@
-Subject: Subscription request for $listaddr$: $subaddr$
+Subject: Subscription request for $list$@$domain$: $subaddr$
 
-%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list.
+%text prologue%
 
 %wrap%There has been a request from $subaddr$ to join
 %iftype normal%%endif%

diff --git a/en/help b/en/help
index e068e4819a13d651f7d77e83803c1eef79278e02..fa7a61766b0b143126f61952b3541aa1830e0dff 100644 (file)
--- a/en/help
+++ b/en/help
@@ -1,6 +1,6 @@
-Subject: Information for $listaddr$
+Subject: Information for $list$@$domain$
 
-%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list.
+%text prologue%
 
 Here is some information about the list.
 
@@ -11,12 +11,12 @@ It has the following versions:
 %ifcontrol closedlist closedlistsub%
   - Subscribe by contacting a list administrator.
 %else%
-  - %wrap%Subscribe by emailing: $listsubaddr$
+  - %wrap%Subscribe by emailing: $list+$subscribe@$domain$
 %endif%
 %ifcontrol closedlist%
   - Unsubscribe by contacting a list administrator.
 %else%
-  - %wrap%Unsubscribe by emailing: $listunsubaddr$
+  - %wrap%Unsubscribe by emailing: $list+$unsubscribe@$domain$
 %endif%
 
 %ifncontrol nodigestsub%
@@ -25,12 +25,12 @@ It has the following versions:
 %ifcontrol closedlist closedlistsub%
   - Subscribe by contacting a list administrator.
 %else%
-  - %wrap%Subscribe by emailing: $digestsubaddr$
+  - %wrap%Subscribe by emailing: $list+$subscribe-digest@$domain$
 %endif%
 %ifcontrol closedlist%
   - Unsubscribe by contacting a list administrator.
 %else%
-  - %wrap%Unsubscribe by emailing: $digestunsubaddr$
+  - %wrap%Unsubscribe by emailing: $list+$unsubscribe-digest@$domain$
 %endif%
 
 %endif%
@@ -42,12 +42,12 @@ It has the following versions:
 %ifcontrol closedlist closedlistsub%
   - Subscribe by contacting a list administrator.
 %else%
-  - %wrap%Subscribe by emailing: $nomailsubaddr$
+  - %wrap%Subscribe by emailing: $list+$subscribe-nomail@$domain$
 %endif%
 %ifcontrol closedlist%
   - Unsubscribe by contacting a list administrator.
 %else%
-  - %wrap%Unsubscribe by emailing: $nomailunsubaddr$
+  - %wrap%Unsubscribe by emailing: $list+$unsubscribe-nomail@$domain$
 %endif%
 
 %endif%
@@ -56,7 +56,7 @@ The list has gatekeepers who will review subscription requests before
 permitting new members.
 
 %endif%
-Posts are made by emailing $listaddr$
+Posts are made by emailing $list$@$domain$
 
 %ifcontrol subonlypost%%ifncontrol modnonsubposts%
 However, only subscribers may post to the list.
@@ -86,8 +86,13 @@ Anyone
 Subscribers
 %endif%
 can retrieve message number N from the list's archive by sending a message
-to $listgetN$ (and changing the N to the number of the desired message).
+to $list+$get-N@$domain$ (change the N to the number of the desired message).
 
 %endif%%endif%
-To contact the list owner, send a message to $listowner$
+%wrap%
+You can retrieve the frequently asked questions document for the list by
+sending a message to $list+$faq@$domain$
+
+%wrap%
+To contact the list owner, send a message to $list+$owner@$domain$
 

diff --git a/en/list b/en/list
index 82ec4a36ecdb44e6618e0c956abe1e3213602526..f95b687663e883631413deb2e66eac721e856516 100644 (file)
--- a/en/list
+++ b/en/list
@@ -1,6 +1,6 @@
-Subject: Subscribers to $listaddr$
+Subject: Subscribers to $list$@$domain$
 
-%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list.
+%text prologue%
 
 %wrap%Here is the list of subscribers
 %iftype all%

diff --git a/en/moderate-post b/en/moderate-post
index 1dc296f9581b666a136743b1c0389a866bf1db78..ffb44a71ed32c8dceb9ac0304b9bc12e7a777ab4 100644 (file)
--- a/en/moderate-post
+++ b/en/moderate-post
@@ -1,4 +1,4 @@
-Subject: Please moderate $listaddr$: $subject$
+Subject: Please moderate $list$@$domain$: $subject$
 MIME-Version: 1.0
 Content-Type: multipart/mixed;
  boundary="=_$random0$$random1$_="
@@ -8,7 +8,7 @@ Content-Transfer-Encoding: 8bit
 Content-Type: text/plain; charset=utf8
 Content-Transfer-Encoding: 8bit
 
-%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list.
+%text prologue%
 
 %wrap%A message from $posteraddr$ with subject "$subject$" has been
 submitted for posting. You are being asked to moderate

diff --git a/en/notify b/en/notify
index ac55ef08fde4c8cd97dc8ae3ddf85c4631e3d367..e2e32709934f6627b97a54ec0c51416a30806cae 100644 (file)
--- a/en/notify
+++ b/en/notify
@@ -1,7 +1,7 @@
-%ifaction sub%Subject: Subscribed to $listaddr$: $subaddr$%endif%
-%ifaction unsub%Subject: Unsubscribed from $listaddr$: $subaddr$%endif%
+%ifaction sub%Subject: Subscribed to $list$@$domain$: $subaddr$%endif%
+%ifaction unsub%Subject: Unsubscribed from $list$@$domain$: $subaddr$%endif%
 
-%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list.
+%text prologue%
 
 %wrap%
 %ifaction sub%

diff --git a/en/probe b/en/probe
index 48cd3f425c8b722b75cb29beb1b130aeb455ac5d..397ebbec14ae766bb6d48ec94bd0247eaa587eb0 100644 (file)
--- a/en/probe
+++ b/en/probe
@@ -1,6 +1,6 @@
-Subject: Bouncing messages from $listaddr$
+Subject: Bouncing messages from $list$@$domain$
 
-%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list.
+%text prologue%
 
 Some messages to you could not be delivered. If you're seeing this
 message it means things are back to normal, and it's merely for your

diff --git a/en/prologue b/en/prologue
new file mode 100644 (file)
index 0000000..10b5e87
--- /dev/null
+++ b/en/prologue
@@ -0,0 +1,2 @@
+%wrap%Hi, this is the Mlmmj program managing the $list$@$domain$ mailing
+list.

diff --git a/en/wait-post b/en/wait-post
index 3a9964e356fc13202310b91ab02111c39e870819..e9ca37a668c0810e12625824d9d290f80d152d95 100644 (file)
--- a/en/wait-post
+++ b/en/wait-post
@@ -1,4 +1,4 @@
-Subject: Awaiting release to $listaddr$: $subject$
+Subject: Awaiting release to $list$@$domain$: $subject$
 MIME-Version: 1.0
 Content-Type: multipart/mixed;
  boundary="=_$random0$$random1$_="
@@ -8,7 +8,7 @@ Content-Transfer-Encoding: 8bit
 Content-Type: text/plain; charset=utf8
 Content-Transfer-Encoding: 8bit
 
-%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list.
+%text prologue%
 
 %wrap%The message from $posteraddr$ with subject "$subject$" has been
 submitted to the list. However, the moderators are being asked to review it

diff --git a/en/wait-sub b/en/wait-sub
index e9f889e459d0f142e005a915b584c48d874bc44f..84df549eb6f86f05d15fa3922bf29c32ba5a57df 100644 (file)
--- a/en/wait-sub
+++ b/en/wait-sub
@@ -1,6 +1,6 @@
-Subject: Awaiting permission to join $listaddr$
+Subject: Awaiting permission to join $list$@$domain$
 
-%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list.
+%text prologue%
 
 %wrap%Your request to join the list has been received. However, the
 gatekeepers are being asked to review it before permitting you to join.