summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mailman/chains/docs/moderation.rst5
-rw-r--r--src/mailman/core/docs/chains.rst7
-rw-r--r--src/mailman/runners/docs/incoming.rst6
3 files changed, 12 insertions, 6 deletions
diff --git a/src/mailman/chains/docs/moderation.rst b/src/mailman/chains/docs/moderation.rst
index 3b40c7293..53c32bc33 100644
--- a/src/mailman/chains/docs/moderation.rst
+++ b/src/mailman/chains/docs/moderation.rst
@@ -87,6 +87,7 @@ built-in chain. No rules hit and so the message is accepted.
Subject: aardvark
Hits:
Misses:
+ dmarc-moderation
approved
emergency
loop
@@ -124,6 +125,7 @@ moderator approval.
Hits:
member-moderation
Misses:
+ dmarc-moderation
approved
emergency
loop
@@ -150,6 +152,7 @@ Anne's moderation action can also be set to `discard`...
Hits:
member-moderation
Misses:
+ dmarc-moderation
approved
emergency
loop
@@ -175,6 +178,7 @@ Anne's moderation action can also be set to `discard`...
Hits:
member-moderation
Misses:
+ dmarc-moderation
approved
emergency
loop
@@ -215,6 +219,7 @@ moderator approval.
Hits:
nonmember-moderation
Misses:
+ dmarc-moderation
approved
emergency
loop
diff --git a/src/mailman/core/docs/chains.rst b/src/mailman/core/docs/chains.rst
index 2b30a25e4..43b41bcf5 100644
--- a/src/mailman/core/docs/chains.rst
+++ b/src/mailman/core/docs/chains.rst
@@ -268,9 +268,9 @@ This message will end up in the `pipeline` queue.
Message-ID: <first>
Message-ID-Hash: 4CMWUN6BHVCMHMDAOSJZ2Q72G5M32MWB
X-Message-ID-Hash: 4CMWUN6BHVCMHMDAOSJZ2Q72G5M32MWB
- X-Mailman-Rule-Misses: approved; emergency; loop; banned-address;
- member-moderation; nonmember-moderation; administrivia; implicit-dest;
- max-recipients; max-size; news-moderation; no-subject;
+ X-Mailman-Rule-Misses: dmarc-moderation; approved; emergency; loop;
+ banned-address; member-moderation; nonmember-moderation; administrivia;
+ implicit-dest; max-recipients; max-size; news-moderation; no-subject;
suspicious-header
<BLANKLINE>
An important message.
@@ -285,6 +285,7 @@ hit and all rules that have missed.
administrivia
approved
banned-address
+ dmarc-moderation
emergency
implicit-dest
loop
diff --git a/src/mailman/runners/docs/incoming.rst b/src/mailman/runners/docs/incoming.rst
index 70b870d18..18b723ab4 100644
--- a/src/mailman/runners/docs/incoming.rst
+++ b/src/mailman/runners/docs/incoming.rst
@@ -128,9 +128,9 @@ Now the message is in the pipeline queue.
Message-ID-Hash: 4CMWUN6BHVCMHMDAOSJZ2Q72G5M32MWB
X-Message-ID-Hash: 4CMWUN6BHVCMHMDAOSJZ2Q72G5M32MWB
Date: ...
- X-Mailman-Rule-Misses: approved; emergency; loop; banned-address;
- member-moderation; nonmember-moderation; administrivia; implicit-dest;
- max-recipients; max-size; news-moderation; no-subject;
+ X-Mailman-Rule-Misses: dmarc-moderation; approved; emergency; loop;
+ banned-address; member-moderation; nonmember-moderation; administrivia;
+ implicit-dest; max-recipients; max-size; news-moderation; no-subject;
suspicious-header
<BLANKLINE>
First post!