diff options
| author | Mark Sapiro | 2016-11-01 08:04:07 -0700 |
|---|---|---|
| committer | Mark Sapiro | 2016-11-01 08:04:07 -0700 |
| commit | c77e6918d80a5aeab557f9f171594c858ef926f5 (patch) | |
| tree | 8d9d3d9142f98e5d4dd26dd4f17136c61b3c5d8b | |
| parent | 49d8574bf25039b67d33c1390b4d23d54a81e8f8 (diff) | |
| download | mailman-c77e6918d80a5aeab557f9f171594c858ef926f5.tar.gz mailman-c77e6918d80a5aeab557f9f171594c858ef926f5.tar.zst mailman-c77e6918d80a5aeab557f9f171594c858ef926f5.zip | |
| -rw-r--r-- | src/mailman/rules/dmarc.py | 2 | ||||
| -rw-r--r-- | src/mailman/rules/docs/dmarc-moderation.rst | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/mailman/rules/dmarc.py b/src/mailman/rules/dmarc.py index ba42ef70a..67a8d9045 100644 --- a/src/mailman/rules/dmarc.py +++ b/src/mailman/rules/dmarc.py @@ -261,7 +261,7 @@ class DMARCModeration: 'policy of reject or quarantine, and your message' ' has been automatically rejected. If you think ' 'that your messages are being rejected in error, ' - 'contact the mailing list owner at $listowner.')) + 'contact the mailing list owner at ${listowner}.')) msgdata['moderation_reasons'] = [wrap(reason)] # Add the hit for the reject notice. msgdata.setdefault('rule_hits', []).append('dmarc-moderation') diff --git a/src/mailman/rules/docs/dmarc-moderation.rst b/src/mailman/rules/docs/dmarc-moderation.rst index e0bfe6b07..91da762d3 100644 --- a/src/mailman/rules/docs/dmarc-moderation.rst +++ b/src/mailman/rules/docs/dmarc-moderation.rst @@ -136,7 +136,8 @@ There is now a reject message in the virgin queue. You are not allowed to post to this mailing list From: a domain which publishes a DMARC policy of reject or quarantine, and your message has been automatically rejected. If you think that your messages are - being rejected in error, contact the mailing list owner at $listowner. + being rejected in error, contact the mailing list owner at + _xtest-owner@example.com. <BLANKLINE> The original message as received by Mailman is attached. <BLANKLINE> |