Added and modified various options regarding DMARC. See the NEWS file.

1 files changed, 22 insertions, 20 deletions

diff --git a/Mailman/Gui/General.py b/Mailman/Gui/General.py
index 24bc009a..a917642c 100644
--- a/Mailman/Gui/General.py
+++ b/Mailman/Gui/General.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2013 by the Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 by the Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -153,25 +153,27 @@ class General(GUIBase):
              directive. eg.; [listname %%d] -> [listname 123]
                             (listname %%05d) -> (listname 00123)
              """)),
-          ]
 
-        if mm_cfg.ALLOW_FROM_IS_LIST:
-            rtn.append(
-                ('from_is_list', mm_cfg.Radio,
-                 (_('No'), _('Mung From'), _('Wrap Message')), 0,
-                 _("""Replace the sender with the list address to conform with
-                 policies like ADSP and DMARC.  It replaces the poster's
-                 address in the From: header with the list address and adds the
-                 poster to the Reply-To: header, but the anonymous_list and
-                 Reply-To: header munging settings below take priority.  If
-                 setting this to Yes, it is advised to set the MTA to DKIM sign
-                 all emails.""") +
-                 _("""<br>If this is set to Wrap Message, just wrap the message
-                 in an outer message From: the list with Content-Type:
-                 message/rfc822."""))
-              )
-
-        rtn.extend([
+            ('from_is_list', mm_cfg.Radio,
+             (_('No'), _('Munge From'), _('Wrap Message')), 0,
+             _("""Replace the sender with the list address to conform with
+             policies like DMARC."""),
+             _("""Replace the sender with the list address to conform with
+             policies like ADSP and DMARC.  It replaces the poster's
+             address in the From: header with the list address and adds the
+             poster to the Reply-To: header, but the anonymous_list and
+             Reply-To: header munging settings below take priority.  If
+             setting this to Yes, it is advised to set the MTA to DKIM sign
+             all emails.""") +
+             _("""<p>If this is set to Wrap Message, just wrap the message
+             in an outer message From: the list with Content-Type:
+             message/rfc822.""") +
+             _("""<p>If <a
+             href="?VARHELP=privacy/sender/dmarc_moderation_action">
+             dmarc_moderation_action</a> applies to this message with an
+             action other than Accept, that action rather than this is
+             applied""")),
+
             ('anonymous_list', mm_cfg.Radio, (_('No'), _('Yes')), 0,
              _("""Hide the sender of a message, replacing it with the list
              address (Removes From, Sender and Reply-To fields)""")),
@@ -392,7 +394,7 @@ class General(GUIBase):
              useful for selecting among alternative names of a host that has
              multiple addresses.""")),
 
-          ])
+          ]
 
         if mm_cfg.ALLOW_RFC2369_OVERRIDES:
             rtn.append(