summaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
authorDavid Krause <david@cvs.openbsd.org>2003-03-06 03:27:54 +0000
committerDavid Krause <david@cvs.openbsd.org>2003-03-06 03:27:54 +0000
commit90d1f19d3e6a1c6159c19cf5d2a9e70ad3d68a9f (patch)
tree4b3ab4cc2bc13ab2540adba78222f70af495cbf5 /libexec
parent5d78f6faf11502a47680192e5ed35718695dc96c (diff)
new sentence, new line
(fixes some sentences with only 1 space between) ok henning@
Diffstat (limited to 'libexec')
-rw-r--r--libexec/spamd/spamd-setup.815
-rw-r--r--libexec/spamd/spamd.820
2 files changed, 19 insertions, 16 deletions
diff --git a/libexec/spamd/spamd-setup.8 b/libexec/spamd/spamd-setup.8
index b9f8409dbef..846d6d88cb3 100644
--- a/libexec/spamd/spamd-setup.8
+++ b/libexec/spamd/spamd-setup.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: spamd-setup.8,v 1.9 2003/03/04 11:26:04 henning Exp $
+.\" $OpenBSD: spamd-setup.8,v 1.10 2003/03/06 03:27:53 david Exp $
.\"
.\" Copyright (c) 2003 Jason L. Wright (jason@thought.net)
.\" All rights reserved.
@@ -121,8 +121,8 @@ the following example:
.Sh BLACKLIST FILES
Additional files given as parameters to
.Nm
-will be read to configure blacklists. The blacklist file format is
-as follows.
+will be read to configure blacklists.
+The blacklist file format is as follows.
.Bd -literal -offset indent
.Ic SPAMD_SOURCE;mylist;"Sorry %A, You are probably spammer\enBye\en"
.Ic file:/usr/local/share/spammers.txt
@@ -139,10 +139,11 @@ as follows.
The
.Li SPAMD_SOURCE
line includes a tag to name the blacklist, and the message to be
-given to any connections that match this list. The message must
-be enclosed in double quotes
-and may include \en to produce a newline in the output. \e\" will produce
-a double quote in the output, and %% will produce a single % in the output.
+given to any connections that match this list.
+The message must be enclosed in double quotes
+and may include \en to produce a newline in the output.
+\e\" will produce a double quote in the output,
+and %% will produce a single % in the output.
%A will be expanded by
.Xr spamd 8
to display the connecting IP address in the output.
diff --git a/libexec/spamd/spamd.8 b/libexec/spamd/spamd.8
index 79261c16132..42fc0d33b9b 100644
--- a/libexec/spamd/spamd.8
+++ b/libexec/spamd/spamd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: spamd.8,v 1.19 2003/03/06 01:03:09 henning Exp $
+.\" $OpenBSD: spamd.8,v 1.20 2003/03/06 03:27:53 david Exp $
.\"
.\" Copyright (c) 2002 Theo de Raadt. All rights reserved.
.\"
@@ -136,7 +136,8 @@ information about each source of blacklist addresses, as well as custom
rejection messages for each blacklist source
that can be used to let any real person whose mail
is deferred by spamd know why their address has been listed
-from sending mail. This is important as it allows legitimate mail
+from sending mail.
+This is important as it allows legitimate mail
senders to pressure spam sources into behaving properly so that they
may be removed from the relevant blacklists.
.Pp
@@ -144,18 +145,19 @@ may be removed from the relevant blacklists.
.Nm
receives configuration information through a localhost connection.
Configuration information consists of blacklists, each with a name,
-a message to reject mail with, and addresses in CIDR format. When
-multiple lists are configured, each configuration line specifies
+a message to reject mail with, and addresses in CIDR format.
+When multiple lists are configured, each configuration line specifies
a blacklist, and must have the format:
.Bd -literal
tag;"rejection message";aaa.bbb.ccc.ddd/mm;aaa.bbb.ccc.ddd/mm
.Ed
-The rejection message must be inside double quotes. A \e" will
-produce a double quote in the output. \en will produce a newline. %A
-will expand to the connecting ip address in dotted quad format, %% may
-be used to produce a single % in the output, \e\e will produce a
-single \e.
+The rejection message must be inside double quotes.
+A \e" will produce a double quote in the output.
+\en will produce a newline.
+%A will expand to the connecting ip address in dotted quad format.
+%% may be used to produce a single % in the output.
+\e\e will produce a single \e.
.Nm
will reject mail by displaying all the messages from all blacklists in which
a connecting address is matched.