summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2020-05-24 19:17:59 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2020-05-24 19:17:59 +0100
commit63d954782cb5804f79a460125a4a2030202f5e9f (patch)
tree3c8c95912be2d63c866a9081e3f1bb098e8909c8
parenta36d168cb99bc1055c6751102bd9ffbfbb384315 (diff)
Docs: SPF options
-rw-r--r--doc/doc-docbook/spec.xfpt6
-rw-r--r--doc/doc-txt/OptionLists.txt4
2 files changed, 7 insertions, 3 deletions
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index d33685033..2774f6d4d 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -17800,9 +17800,9 @@ The capitalized placeholders do proper URL encoding, if you use them
lowercased, no encoding takes place. This list was compiled from the
libspf2 sources.
-A note on using Exim variables: As currenty the SPF library is initialized
-already during the EHLO phase, the amount of variables available for
-expansion is quite limited.
+A note on using Exim variables: As
+currently the SPF library is initialized before the SMTP EHLO phase,
+the variables useful for expansion are quite limited.
.wen
diff --git a/doc/doc-txt/OptionLists.txt b/doc/doc-txt/OptionLists.txt
index f15ccd553..8b2dee352 100644
--- a/doc/doc-txt/OptionLists.txt
+++ b/doc/doc-txt/OptionLists.txt
@@ -553,6 +553,10 @@ smtp_reserve_hosts host list unset main
smtp_return_error_details boolean false main 4.11
socket string* unset lmtp 4.11
spamd_address string* + main 4.50 with content scan
+spf_guess string "v=spf1 a/24 mx/24 ptr ?all"
+ main 4.91 with SUPPORT_SPF
+spf_smtp_comment_template string* "Please see http://www.open-spf.org/Why"
+ main 4.94 with SUPPORT_SPF
split_spool_directory boolean false main 1.70
spool_directory string ++ main
spool_wireformat boolean false main 4.90