summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Beck <beck@cvs.openbsd.org>2003-03-08 20:15:15 +0000
committerBob Beck <beck@cvs.openbsd.org>2003-03-08 20:15:15 +0000
commitc5712ffbc5d7559f631b8fb4954b903a54085e92 (patch)
treee8847c5c1b14eba70c0b623dafe11939008f2dac
parentf26076ab9a925166897317c12f41f7905527d3c9 (diff)
clarity, for small values thererof. Speling.
-rw-r--r--share/man/man5/spamd.conf.535
1 files changed, 18 insertions, 17 deletions
diff --git a/share/man/man5/spamd.conf.5 b/share/man/man5/spamd.conf.5
index a9c2551d60c..6b49c17a300 100644
--- a/share/man/man5/spamd.conf.5
+++ b/share/man/man5/spamd.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: spamd.conf.5,v 1.1 2003/03/08 19:26:31 beck Exp $
+.\" $OpenBSD: spamd.conf.5,v 1.2 2003/03/08 20:15:14 beck Exp $
.\"
.\" Copyright (c) 2003 Jason L. Wright (jason@thought.net)
.\" Copyright (c) 2003 Bob Beck
@@ -67,7 +67,7 @@ Example:
.Ic white:\e
.Ic :white:\e
.Ic :method=file:\e
-.Ic :file=/var/white/mywhite:\e
+.Ic :file=/var/mail/mywhite.txt:\e
.Ic \ \
.Ic myblack:\e
.Ic :black:\e
@@ -80,7 +80,7 @@ The default configuration file must include the entry
.Ar all
which specifies the order in which named blacklists and whitelists
are to be applied. The addresses in a whitelist are removed from the
-preceeding blacklist. In the above example, if address that was present
+preceding blacklist. In the above example, if address that was present
in all three lists, blacklists
.Ar spews1
and
@@ -97,7 +97,7 @@ blacklist. To remove all the addresses in
.Ar white
from
.Ar myblack
-the configution
+the configuration
.Bd -literal -offset indent
.Ic all:\e
.Ic :spews1:white:myblack:white:\e
@@ -116,9 +116,10 @@ specified using the
and
.Ar file
capability entries.
+.Pp
.Ar method
-specifies the method by which to retrieve the addresses, which may
-be
+specifies the method by which to retrieve a file containing a list of
+addresses that compose the blacklist or whitelist, and may be
.Ar http
.Ar ftp
.Ar file
@@ -131,8 +132,7 @@ and
.Ar file
capabilities will make
.Nm
-retrieve the source file as specified in the location in
-the
+retrieve a list of addresses specified in the location in the
.Ar file
capability for the list.
The
@@ -141,11 +141,12 @@ capability will make
.Nm
spawn the program with arguments indicated in the
.Ar file
-capability for the list, and read the source file
-from the output of the program. the source file for each blacklist or
-whitelist is expected to consist of one network block or address per
-line (optionally followed by a space and text that is ignored).
-Comment lines beginning with
+capability for the list, and reads a list of addresses
+from the output of the program.
+.Pp
+The format of the list of addresses is expected to consist of one
+network block or address per line (optionally followed by a space and
+text that is ignored). Comment lines beginning with
.Ar #
are ignored.
Network blocks may be specified in any of the formats as in
@@ -166,14 +167,14 @@ capability as a string. The argument to
specifies the message, the message may be includes in
quotes, in which case characters may be escaped as specified in
.Xr getcap 3
-with the execption that a colon (:) is allowed in the quoted string.
+with the exception that a colon (:) is allowed in the quoted string.
Alternatively, if the argument to
.Ar msg
is not specified in quotes, it is assumed to be a local filename
from which the message text may be read.
The message is configured in
.Xr spamd 8
-to be displayed in the smtp dialogue to any connections that match addresses
+to be displayed in the SMTP dialogue to any connections that match addresses
in the blacklist.
\e\" will produce a double quote in the output,
and %% will produce a single % in the output.
@@ -184,5 +185,5 @@ to display the connecting IP address in the output.
.Sh SEE ALSO
.Xr ftp 1 ,
.Xr pf 4 ,
-.Xr spamd-setup 8,
-.Xr spamd 8
+.Xr spamd 8,
+.Xr spamd-setup 8