From 63d954782cb5804f79a460125a4a2030202f5e9f Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sun, 24 May 2020 19:17:59 +0100 Subject: [PATCH] Docs: SPF options --- doc/doc-docbook/spec.xfpt | 6 +++--- doc/doc-txt/OptionLists.txt | 4 ++++ 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 -- 2.30.2