summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd Lyons <tlyons@exim.org>2013-09-30 12:55:44 -0700
committerTodd Lyons <tlyons@exim.org>2013-09-30 12:56:57 -0700
commit05070e30ddf4711848752213928f862ada1a509e (patch)
tree7c155dc62454a38a2f056c1aa09a207b31cb7d12
parent1a7b746d86ec130021bc42586e54246e04142f40 (diff)
parent7a8678e64e9843e3eded4437c20aec6e12d92dd9 (diff)
Merge branch 'patch-3' of https://github.com/bes-internal/exim into master_dmarc_doc
-rw-r--r--doc/doc-txt/experimental-spec.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/doc-txt/experimental-spec.txt b/doc/doc-txt/experimental-spec.txt
index 3e8f5c549..271ab0ba0 100644
--- a/doc/doc-txt/experimental-spec.txt
+++ b/doc/doc-txt/experimental-spec.txt
@@ -755,11 +755,13 @@ mean, refer to the DMARC website above. Valid strings are:
rejecting the email.
o quarantine The DMARC check failed and the library recommends
keeping it for further inspection.
+ o none The DMARC check passed and the library recommends
+ no specific action, neutral.
o norecord No policy section in the DMARC record for this
sender domain.
o nofrom Unable to determine the domain of the sender.
- o none There is no DMARC record for this sender domain.
- o error Library error or dns error.
+ o temperror Library error or dns error.
+ o off The DMARC check was disabled for this email.
You can prefix each string with an exclamation mark to invert its
meaning, for example "!accept" will match all results but