summaryrefslogtreecommitdiff
path: root/doc/doc-docbook
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2015-02-15 16:50:27 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2015-02-15 16:50:27 +0000
commitdc7b3d368017727e9438fc7463b0841df1e4aa41 (patch)
tree80f3c212b14e3d1036315e859636f1643dc6b366 /doc/doc-docbook
parent6c54be6459b83b955fbd2fd6d6a844f80c98427a (diff)
SpamAssassin: replace "backup" option on server spec with "pri=<N>". Bug 670
Diffstat (limited to 'doc/doc-docbook')
-rw-r--r--doc/doc-docbook/spec.xfpt22
1 files changed, 14 insertions, 8 deletions
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index a112ec7e9..411eb988e 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -30829,20 +30829,29 @@ Elements after the first for Unix sockets, or second for TCP socket,
are options.
The supported option are:
.code
-variant=rspamd Use Rspamd rather than SpamAssassin protocol
+pri=<priority> Selection priority
+weight=<value> Selection bias
time=<start>-<end> Use only between these times of day
+retry=<timespec> Retry on connect fail
tmo=<timespec> Connection time limit
-weight=<value> Selection bias
-backup Use only if all non-backup servers fail
-retry=<timespec> Retry on connect fail
+variant=rspamd Use Rspamd rather than SpamAssassin protocol
.endd
+The &`pri`& option specifies a priority for the server within the list,
+higher values being tried first.
+The deafult priority is 1.
+
+The &`weight`& option specifies a selection bias.
+Within a priority set
+servers are queried in a random fashion, weighted by this value.
+The default value for selection bias is 1.
+
Time specifications for the &`time`& option are <hour>.<minute>.<second>
in the local time zone; each element being one or more digits.
Either the seconds or both minutes and seconds, plus the leading &`.`&
characters, may be omitted and will be taken as zero.
-Timeout specifications for the &`tmo`& and &`retry`& options
+Timeout specifications for the &`retry`& and &`tmo`& options
are the usual Exim time interval standard, eg. &`20s`& or &`1m`&.
The &`tmo`& option specifies an overall timeout for communication.
@@ -30851,9 +30860,6 @@ The default value is two minutes.
The &`retry`& option specifies a time after which a single retry for
a failed connect is made.
The default is to not retry.
-
-Servers are queried in a random fashion, weighted by the selection bias.
-The default value for selection bias is 1.
.wen
The &%spamd_address%& variable is expanded before use if it starts with