summaryrefslogtreecommitdiff
path: root/doc/doc-txt/experimental-spec.txt
diff options
context:
space:
mode:
authorTodd Lyons <tlyons@exim.org>2014-04-15 13:10:59 -0700
committerTodd Lyons <tlyons@exim.org>2014-04-15 13:10:59 -0700
commit982650eceba2e54d2022f92b142b85fa083d3d13 (patch)
tree5008c3e0e00bd75bccdb5b48103127b6778e6376 /doc/doc-txt/experimental-spec.txt
parent8c8b8274fc537766da72eab2f79a62d1603d6638 (diff)
Add back deprecated SPF error conditions
Previous patch introduced a change that could break existing SPF configurations. Add back the two non-standard "err_temp" and "err_perm" result values, with note that it is deprecated and will be removed in a future release.
Diffstat (limited to 'doc/doc-txt/experimental-spec.txt')
-rw-r--r--doc/doc-txt/experimental-spec.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/doc/doc-txt/experimental-spec.txt b/doc/doc-txt/experimental-spec.txt
index d0503d9e8..265e1211b 100644
--- a/doc/doc-txt/experimental-spec.txt
+++ b/doc/doc-txt/experimental-spec.txt
@@ -460,9 +460,13 @@ which the spf condition should succeed. Valid strings are:
processing, including Exim's SPF processing.
You may defer messages when this occurs.
(Changed in 4.83)
+ o err_temp Same as permerror, deprecated in 4.83, will be
+ removed in a future release.
+ o err_perm Same as temperror, deprecated in 4.83, will be
+ removed in a future release.
You can prefix each string with an exclamation mark to invert
-is meaning, for example "!fail" will match all results but
+its meaning, for example "!fail" will match all results but
"fail". The string list is evaluated left-to-right, in a
short-circuit fashion. When a string matches the outcome of
the SPF check, the condition succeeds. If none of the listed