diff options
| author | Barry Warsaw | 2017-08-04 01:13:04 +0000 |
|---|---|---|
| committer | Barry Warsaw | 2017-08-04 01:13:04 +0000 |
| commit | 9cdcffbc1189a19bc2963cf3d5c86a3d4f1f24a6 (patch) | |
| tree | f021166b8c82bb02feff82a9360ba61a44b804ee /src/mailman/rules/docs | |
| parent | e6326533b78290514ede917ed1cb95804759a45a (diff) | |
| download | mailman-9cdcffbc1189a19bc2963cf3d5c86a3d4f1f24a6.tar.gz mailman-9cdcffbc1189a19bc2963cf3d5c86a3d4f1f24a6.tar.zst mailman-9cdcffbc1189a19bc2963cf3d5c86a3d4f1f24a6.zip | |
Rename metadata key for clarity
Diffstat (limited to 'src/mailman/rules/docs')
| -rw-r--r-- | src/mailman/rules/docs/dmarc-mitigation.rst | 6 | ||||
| -rw-r--r-- | src/mailman/rules/docs/moderation.rst | 18 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/mailman/rules/docs/dmarc-mitigation.rst b/src/mailman/rules/docs/dmarc-mitigation.rst index bee7b3a55..cf7ceeb74 100644 --- a/src/mailman/rules/docs/dmarc-mitigation.rst +++ b/src/mailman/rules/docs/dmarc-mitigation.rst @@ -102,7 +102,7 @@ message. True >>> dump_msgdata(msgdata) dmarc : True - moderation_action : discard + dmarc_action : discard moderation_reasons: ['DMARC moderation'] moderation_sender : aperson@example.biz @@ -121,7 +121,7 @@ We can reject the message with a default reason. True >>> dump_msgdata(msgdata) dmarc : True - moderation_action : reject + dmarc_action : reject moderation_reasons: ['You are not allowed to post to this mailing list... moderation_sender : aperson@example.biz @@ -140,6 +140,6 @@ And, we can reject with a custom message. True >>> dump_msgdata(msgdata) dmarc : True - moderation_action : reject + dmarc_action : reject moderation_reasons: ['A silly reason'] moderation_sender : aperson@example.biz diff --git a/src/mailman/rules/docs/moderation.rst b/src/mailman/rules/docs/moderation.rst index d1cc5fd67..8bdcd2f1a 100644 --- a/src/mailman/rules/docs/moderation.rst +++ b/src/mailman/rules/docs/moderation.rst @@ -60,9 +60,9 @@ the eventual moderation chain. >>> member_rule.check(mlist, member_msg, msgdata) True >>> dump_msgdata(msgdata) - moderation_action : hold - moderation_reasons: ['The message comes from a moderated member'] - moderation_sender : aperson@example.com + member_moderation_action: hold + moderation_reasons : ['The message comes from a moderated member'] + moderation_sender : aperson@example.com Nonmembers @@ -107,9 +107,9 @@ rule matches and the message metadata again carries some useful information. >>> nonmember_rule.check(mlist, nonmember_msg, msgdata) True >>> dump_msgdata(msgdata) - moderation_action : hold - moderation_reasons: ['The message is not from a list member'] - moderation_sender : bperson@example.com + member_moderation_action: hold + moderation_reasons : ['The message is not from a list member'] + moderation_sender : bperson@example.com Of course, the nonmember action can be set to defer the decision, in which case the rule does not match. @@ -161,9 +161,9 @@ nonmember of the list. The rule also matches. >>> nonmember_rule.check(mlist, msg, msgdata) True >>> dump_msgdata(msgdata) - moderation_action : hold - moderation_reasons: ['The message is not from a list member'] - moderation_sender : cperson@example.com + member_moderation_action: hold + moderation_reasons : ['The message is not from a list member'] + moderation_sender : cperson@example.com >>> dump_list(mlist.members.members, key=memberkey) <Member: Anne Person <aperson@example.com> |