summaryrefslogtreecommitdiff
path: root/doc/doc-txt/experimental-spec.txt
diff options
context:
space:
mode:
authorJeremy Harris <jgh@wizmail.org>2017-10-01 15:36:32 +0100
committerJeremy Harris <jgh@wizmail.org>2017-10-01 15:36:32 +0100
commitd5b80e59458182b2d557a929a18cb8c70cd56b68 (patch)
tree1707bd0710e1a37ef5872533ab531dd22b138d6d /doc/doc-txt/experimental-spec.txt
parentd5c0d8c9374623620844d539d4810da63e9abca1 (diff)
parente924c08b7d031b712013a7a897e2d430b302fe6c (diff)
Merge branch 'master' into 4.next
Diffstat (limited to 'doc/doc-txt/experimental-spec.txt')
-rw-r--r--doc/doc-txt/experimental-spec.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/doc-txt/experimental-spec.txt b/doc/doc-txt/experimental-spec.txt
index 0b1afb247..1e826aee1 100644
--- a/doc/doc-txt/experimental-spec.txt
+++ b/doc/doc-txt/experimental-spec.txt
@@ -595,12 +595,14 @@ package controlled locations (/usr/include and /usr/lib).
2. Use the following global settings to configure DMARC:
-Required:
+Optional:
dmarc_tld_file Defines the location of a text file of valid
top level domains the opendmarc library uses
during domain parsing. Maintained by Mozilla,
the most current version can be downloaded
from a link at http://publicsuffix.org/list/.
+ If unset, "/etc/exim/opendmarc.tlds" (hardcoded)
+ is used.
Optional:
dmarc_history_file Defines the location of a file to log results