Put email addresses in angle brackets.

[mlmmj-listtexts.git] / en / deny-post

diff --git a/en/deny-post b/en/deny-post
index f8d5ad7622f174f6f50a7a3c86ee6c6f569a9c88..8e228ffb51db925900d6cf6ea56df2cd6f945d2c 100644 (file)
--- a/en/deny-post
+++ b/en/deny-post
@@ -10,8 +10,8 @@ Content-Transfer-Encoding: 8bit
 
 %text prologue%
 
-%wrap%The message from $posteraddr$ with subject "$subject" was unable
-to be delivered to the list
+%wrap%The message from <$posteraddr$> with subject "$subject$" was unable to
+be delivered to the list
 %ifreason maxmailsize%
   because it exceeded the maximum allowed message size of $maxmailsize$
   bytes.
@@ -32,49 +32,26 @@ to be delivered to the list
   because you are not a list subscriber.
 
   %ifncontrol closedlist%%ifncontrol closedlistsub%
-%wrap%
-    However, this is an open list. If you wish, you can simultaneously
-    subscribe and release your post by sending a message to
-    $listsubreleaseaddr$ which can usually be done simply by replying to
-    this message. The subject and the body of the message can be anything.
-
-    %ifncontrol nodigestsub%
-%wrap%
-      Or you can simultaneously subscribe to the digest version of the list
-      and release your post by sending a message to $nomailsubreleaseaddr$
-      and you will receive multiple posts in a single message, at regular
-      intervals, or when a lot of posts have accumulated.
-    %endif%
-
-    %ifncontrol nonomailsub%
-%wrap%
-      Or you can simultaneously subscribe to the no-mail version of the list
-      and release your post by sending a message to $nomailsubreleaseaddr$
-      and you will not receive posts sent to the list. This means you
-      potentially will not see replies to your message, unless you follow
-      the list using a web archive or have another email address subscribed
-      to another version of the list.
-    %endif%
+    %^%%text subrelease%
   %endif%%endif%
 
   %ifcontrol closedlist closedlistsub%
-%wrap%
-    If you wish to become a subscriber, you will need to contact a list
-    administrator. You can email $list+$owner@$domain$ to contact the list
-    owner.
+    %^%%wrap%If you wish to become a subscriber, you will need to contact a
+    list administrator. You can email <$list+$owner@$domain$> to contact the
+    list owner.
   %endif%
 
-%wrap%
-  If you believe you are a subscriber, you are probably subscribed with a
-  different email address. 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.
+  %^%%wrap%If you believe you are a subscriber, you are probably subscribed
+  with a different email address. 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.
 %endif%
 
 %ifreason maxmailsize%
-(The beginning of the denied message is below.)
+  %^%(The beginning of the denied message is below.)
 %else%
-(The denied message is below.)
+  %^%(The denied message is below.)
 %endif%
 
 --=_$random0$$random1$_=
@@ -83,8 +60,8 @@ Content-Transfer-Encoding: 8bit
 Content-Disposition: inline; filename="message.eml"
 
 %ifreason maxmailsize%
-$originalmail100$
+  %^%%originalmail 300%
 %else%
-$originalmail1000000000$
+  %^%%originalmail%
 %endif%
 --=_$random0$$random1$_=--