spamd typos;

ok beck@

1 files changed, 28 insertions, 25 deletions

diff --git a/share/man/man5/spamd.conf.5 b/share/man/man5/spamd.conf.5
index 024a0f3bb36..b9f4306ed3b 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.3 2003/03/08 20:55:32 beck Exp $
+.\"	$OpenBSD: spamd.conf.5,v 1.4 2003/03/08 21:36:12 jmc Exp $
 .\"
 .\" Copyright (c) 2003 Jason L. Wright (jason@thought.net)
 .\" Copyright (c) 2003 Bob Beck
@@ -48,7 +48,7 @@ file is read by
 to configure blacklists and whitelists with corresponding
 .Xr pf 4
 table entries for 
-.Xr spamd 8
+.Xr spamd 8 .
 .Nm
 follows the syntax of configuration databases as documented in 
 .Xr getcap 3 . 
@@ -79,24 +79,26 @@ Example:
 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
-preceding blacklist. In the above example, if address that was present
-in all three lists, blacklists
+are to be applied.
+The addresses in a whitelist are removed from the preceding blacklist.
+In the above example, if the address was present in all three lists, blacklists
 .Ar spews1
 and
-.Ar myblack
+.Ar myblack ,
 as well as whitelist
 .Ar white ,
 the address would be removed from blacklist
 .Ar spews1
 by the subsequent
 .Ar white
-whitelist. However, the address would not be removed from the
+whitelist.
+However, the address would not be removed from the
 .Ar myblack
-blacklist. To remove all the addresses in
+blacklist.
+To remove all the addresses in
 .Ar white
 from
-.Ar myblack
+.Ar myblack ,
 the configuration
 .Bd -literal -offset indent
 .Ic all:\e
@@ -104,9 +106,10 @@ the configuration
 .Ic 	
 .Ed
 would be used instead.
-.Pp blacklists and whitelists are then constructed by name,
+.Pp
+Blacklists and whitelists are then constructed by name;
 blacklists are identified by the capability
-.Ar black
+.Ar black ,
 and whitelists by the capability
 .Ar white .
 .Pp
@@ -119,14 +122,14 @@ capability entries.
 .Pp
 .Ar method
 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
+addresses that consist of the blacklist or whitelist, and may be
+.Ar http ,
+.Ar ftp ,
 .Ar file
 or
 .Ar exec .
 The methods
-.Ar http
+.Ar http ,
 .Ar ftp
 and
 .Ar file
@@ -146,7 +149,8 @@ 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
+text that is ignored).
+Comment lines beginning with
 .Ar #
 are ignored.
 Network blocks may be specified in any of the formats as in
@@ -165,11 +169,10 @@ Each blacklist must include a message, specified in the
 capability as a string. If the
 .Ar msg
 string is enclosed in double quotes, the characters in the quoted string
-are escaped as
-specified in
+are escaped as specified in
 .Xr getcap 3
-with the exception that a colon (:) is allowed in the quoted string. The
-resulting string is used as the message.
+with the exception that a colon (:) is allowed in the quoted string.
+The resulting string is used as the message.
 Alternatively, if the
 .Ar msg
 string is not specified in quotes, it is assumed to be a local filename
@@ -178,15 +181,15 @@ 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 in the blacklist. The sequence \e" in the message will
-produce a double quote in the output. The sequence %% will produce a
-single % in the output, and the sequence %A will be expanded in the
-message by
+addresses in the blacklist.
+The sequence \e" in the message will produce a double quote in the output.
+The sequence %% will produce a single % in the output,
+and the sequence %A will be expanded in the message by
 .Xr spamd 8
 to display the connecting IP address in the output.
 .Pp
 .Sh SEE ALSO
 .Xr ftp 1 ,
 .Xr pf 4 ,
-.Xr spamd 8,
+.Xr spamd 8 ,
 .Xr spamd-setup 8