Changes to make text structure clearer (changed conditional algorithm).

diff --git a/en/confirm b/en/confirm
index 32dfdfd4db1f828861cdbc1d1829f364e38aefd4..7a07b070714b78dd1fb3dca2adce7b8fc2d5c210 100644 (file)
--- a/en/confirm
+++ b/en/confirm
@@ -3,8 +3,8 @@
 
 %text prologue%
 
-%wrap%
 %ifaction sub%
+%wrap%
   Somebody (and we hope it was you) has requested that your email address
   $subaddr$ be added
   %iftype normal%
@@ -24,7 +24,9 @@
     email address.
   %endif%
 %endif%
+
 %ifaction unsub%
+%wrap%
   Somebody (and we hope it was you) has requested that the email address
   $subaddr$ be removed from
   %iftype normal%%endif%

diff --git a/en/deny b/en/deny
index 0013d93788db81318dd9d42a30949c4144cdc7dc..0579dbd9725bded2d68a9633ffb53c9eb8d95e14 100644 (file)
--- a/en/deny
+++ b/en/deny
@@ -5,8 +5,8 @@
 
 %text prologue%
 
-%wrap%
 %ifaction sub%
+%wrap%
   You were unable to be subscribed to the list
   %ifreason disabled%
     because
@@ -25,7 +25,9 @@
     because a gatekeeper obstructed your entry.
   %endif%
 %endif%
+
 %ifaction unsub%
+%wrap%
   You were unable to be unsubscribed from
   %iftype normal%%endif%
   %iftype digest% the digest version of %endif%
@@ -51,7 +53,9 @@
     %endif
   %endif%
 %endif%
+
 %ifaction release reject%
+%wrap%
   %ifaction release%
     You were unable to release the specified post to the list
   %endif%
@@ -66,7 +70,9 @@
     because you are not a moderator for the list.
   %endif%
 %endif%
+
 %ifaction permit obstruct%
+%wrap%
   %ifaction permit%
     You were unable to permit the specified subscription request
   %endif%

diff --git a/en/deny-post b/en/deny-post
index d949c2b6f317bfcc7a6fd0277f4fa982d4be2bdb..7603b53459acb115bd7ae272f7c99ab491abfde0 100644 (file)
--- a/en/deny-post
+++ b/en/deny-post
@@ -28,22 +28,22 @@ to be delivered to the list
 %ifreason subonlypost%
   because you are not a list subscriber.
 
-%wrap%
   %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%
 
+    %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%
 
+    %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$
@@ -53,7 +53,9 @@ to be delivered to the list
       to another version of the list.
     %endif%
   %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.

diff --git a/en/finish b/en/finish
index 05e2c7079fe7c3104c9290d1879b37d0bf40a367..1845ce64354d4dc6aa1a443d2cfbaef03d50c84d 100644 (file)
--- a/en/finish
+++ b/en/finish
@@ -5,8 +5,8 @@
 
 %text prologue%
 
-%wrap%
 %ifaction unsub%
+%wrap%
   %ifreason request%
   %endif%
   %ifreason confirm%
@@ -18,21 +18,31 @@
   %iftype nomail% the no-mail version of %endif%
   the list.
 %endif%
+
 %ifaction release%
+%wrap%
   You have successfully released the message from $posteraddr$ with subject
   "$subject" to the list.
 %endif%
+
 %ifaction reject%
+%wrap%
   You have successfully rejected the message from $posteraddr$ with subject
   "$subject".
 %endif%
+
 %ifaction permit%
+%wrap%
   You have successfully permitted $subaddr$ to join the list.
 %endif%
+
 %ifaction obstruct%
+%wrap%
   You have successfully obstructed $subaddr$ from joining the list.
 %endif%
+
 %ifaction post%
+%wrap%
   %ifreason confirm%
     Thank you for confirming your post.
   %endif%

diff --git a/en/finish-sub b/en/finish-sub
index a3eb8918f2b3e18aa53ce4f96ed5b1dab4d4c148..2071d65d85e1f0670f923663e67631999cc626b1 100644 (file)
--- a/en/finish-sub
+++ b/en/finish-sub
@@ -20,12 +20,13 @@ 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 $list+$owner@$domain$ to contact the list
   owner.
 %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%

diff --git a/en/help b/en/help
index fa7a61766b0b143126f61952b3541aa1830e0dff..e6bde884ff1cdd3baecffa28af1585febce2570d 100644 (file)
--- a/en/help
+++ b/en/help
@@ -32,8 +32,8 @@ It has the following versions:
 %else%
   - %wrap%Unsubscribe by emailing: $list+$unsubscribe-digest@$domain$
 %endif%
-
 %endif%
+
 %ifncontrol nonomailsub%
 - The no-mail version: Subscribers do not receive any posts to the list.
   This means, though, they are able to post to a list which only subscribers
@@ -49,46 +49,45 @@ It has the following versions:
 %else%
   - %wrap%Unsubscribe by emailing: $list+$unsubscribe-nomail@$domain$
 %endif%
-
 %endif%
+
 %ifcontrol submod%
 The list has gatekeepers who will review subscription requests before
 permitting new members.
-
 %endif%
+
 Posts are made by emailing $list$@$domain$
 
 %ifcontrol subonlypost%%ifncontrol modnonsubposts%
 However, only subscribers may post to the list.
-
 %endif%%endif%
+
 %ifcontrol moderated%
 The list has moderators who will review all posts before releasing them to
 the list.
-
 %else%
 %ifcontrol subonlypost%%ifcontrol modnonsubposts%
 The list has moderators who will review posts from non-subscribers before
 releasing them to the list.
-
 %endif%%endif%
 %endif%
+
 %ifcontrol access%
 The list also has access rules which may affect who can post and which posts
 are moderated.
-
 %endif%
+
 %ifncontrol noget%%ifncontrol noarchive%
 %wrap%
 %ifcontrol subonlyget%
-Anyone
+  Anyone
 %else%
-Subscribers
+  Subscribers
 %endif%
 can retrieve message number N from the list's archive by sending a message
 to $list+$get-N@$domain$ (change the N to the number of the desired message).
-
 %endif%%endif%
+
 %wrap%
 You can retrieve the frequently asked questions document for the list by
 sending a message to $list+$faq@$domain$

diff --git a/en/list b/en/list
index f95b687663e883631413deb2e66eac721e856516..fa6c9ee54040527a318c3b779d0985ed217f5993 100644 (file)
--- a/en/list
+++ b/en/list
@@ -17,3 +17,4 @@ to the no-mail version of the list:
 %endif%
 
 %subs%
+

diff --git a/en/moderate-post b/en/moderate-post
index ffb44a71ed32c8dceb9ac0304b9bc12e7a777ab4..ba74558d675aae0ff01316a30812ae3f33351730 100644 (file)
--- a/en/moderate-post
+++ b/en/moderate-post
@@ -25,8 +25,8 @@ The message is below.
 
 %wrap%To release it to the list, please send a message to $releaseaddr$
 which can usually be done simply by replying to this message.
-%ifcontrol subonrelease%
 
+%ifcontrol subonrelease%
 If you wish, you can simultaneously release the post and subscribe the
 poster by sending a message to one of the following addresses:
 - Normal version: $listsubreleaseaddr$

diff --git a/en/notify b/en/notify
index e2e32709934f6627b97a54ec0c51416a30806cae..a56509870d847b8dd271adb522b7ed337f4da683 100644 (file)
--- a/en/notify
+++ b/en/notify
@@ -3,8 +3,8 @@
 
 %text prologue%
 
-%wrap%
 %ifaction sub%
+%wrap%
   The address $subaddr$ has been subscribed to
   %iftype normal%%endif%
   %iftype digest% the digest version of %endif%
@@ -23,12 +23,14 @@
     because a gatekeeper permitted it.
   %endif%
 %endif%
+
 %ifaction unsub%
+%wrap%
   The address $subaddr$ has been unsubscribed from
   %iftype normal%%endif%
   %iftype digest% the digest version of %endif%
   %iftype nomail% the no-mail version of %endif%
-  the list.
+  the list
   %ifreason request%
     because a request to unsubscribe was received.
   %endif%

diff --git a/en/wait-post b/en/wait-post
index e9ca37a668c0810e12625824d9d290f80d152d95..63bd862aa238f55fc3dd529c5ab8a484c4543c42 100644 (file)
--- a/en/wait-post
+++ b/en/wait-post
@@ -21,23 +21,23 @@ because of an access rule.
 %endif%
 %ifreason modnonsubposts%
 because you are not a subscriber.
-  %ifncontrol closedlist%%ifncontrol closedlistsub%
 
+  %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%
 
+    %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%
 
+    %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$