- move LOGGING into the main body

- move some relevant bits of SYNCHRONISATION into -Yy descriptions
- tweaks for SYNCHRONISATION

ok reyk beck

1 files changed, 45 insertions, 44 deletions

diff --git a/libexec/spamd/spamd.8 b/libexec/spamd/spamd.8
index 8e7c4a720ef..ec329a0647c 100644
--- a/libexec/spamd/spamd.8
+++ b/libexec/spamd/spamd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: spamd.8,v 1.90 2007/03/06 02:00:25 beck Exp $
+.\"	$OpenBSD: spamd.8,v 1.91 2007/03/06 08:56:32 jmc Exp $
 .\"
 .\" Copyright (c) 2002 Theo de Raadt.  All rights reserved.
 .\"
@@ -185,16 +185,31 @@ level.
 .It Fl w Ar window
 Set the socket receive buffer to this many bytes, adjusting the window size.
 .It Fl Y Ar synctarget
-Add a target to receive synchronisation messages; see
+Add target
+.Ar synctarget
+to receive synchronisation messages.
+.Ar synctarget
+can be either an IPv4 address for unicast messages
+or a network interface and optional TTL value for multicast messages
+to the group 224.0.1.240.
+If the multicast TTL is not specified, a default value of 1 is used.
+This option can be specified multiple times.
+See also
 .Sx SYNCHRONISATION
 below.
-This option can be specified multiple times.
 .It Fl y Ar synclisten
-Listen for incoming synchronisation messages on the specified address
-or interface; see
+Listen on
+.Ar synclisten
+for incoming synchronisation messages.
+The format for
+.Ar synclisten
+is the same as for
+.Ar synctarget ,
+above.
+This option can be specified only once.
+See also
 .Sx SYNCHRONISATION
 below.
-This option can be specified only once.
 .El
 .Pp
 When run in default mode,
@@ -292,6 +307,22 @@ can be used to examine and alter the contents of
 See
 .Xr spamdb 8
 for further information.
+.Pp
+.Nm
+sends log messages to
+.Xr syslogd 8
+using
+.Em facility
+daemon and, with increasing verbosity,
+.Em level
+err, warn, info, and debug.
+The following
+.Xr syslog.conf 5
+section can be used to log connection details to a dedicated file:
+.Bd -literal -offset indent
+!spamd
+daemon.err;daemon.warn;daemon.info	/var/log/spamd
+.Ed
 .Sh GREYTRAPPING
 When running
 .Nm
@@ -435,48 +466,17 @@ will reject mail by displaying all the messages from all blacklists in which
 a connecting address is matched.
 .Xr spamd-setup 8
 is normally used to configure this information.
-.Sh LOGGING
-.Nm
-sends log messages to
-.Xr syslogd 8
-using
-.Em facility
-daemon and, with increasing verbosity,
-.Em level
-err, warn, info and debug.
-The following
-.Xr syslog.conf 5
-section can be used to log connection details to a dedicated file:
-.Bd -literal -offset indent
-!spamd
-daemon.err;daemon.warn;daemon.info	/var/log/spamd
-.Ed
 .Sh SYNCHRONISATION
 .Nm
 supports realtime synchronisation of greylisting states between
 a number of
 .Nm
-daemons running on multiple machines.
-To enable synchronisation, use the command line options
-.Fl y
+daemons running on multiple machines,
+using the
+.Fl Y
 and
-.Fl Y .
-.Pp
-If the
 .Fl y
-option is specified,
-.Nm
-will listen for incoming synchronisation messages to synchronize
-the local
-.Pa /var/db/spamd
-database.
-The
-.Fl Y
-option will add a target for outgoing messages.
-A target can be either an IPv4 address for unicast messages or a
-network interface and optional TTL value for multicast messages
-to the group 224.0.1.240.
-If the multicast TTL is not specified, a default value of 1 is used.
+options.
 .Pp
 The following example will accept incoming multicast and unicast
 synchronisation messages, and send outgoing multicast messages through
@@ -505,13 +505,14 @@ exists,
 .Nm
 will calculate the message-digest fingerprint (checksum) for the file
 and use it as a shared key to authenticate the synchronisation messages.
-The file can contain any data.
-For example, create a secure random key:
+The file itself can contain any data.
+For example, to create a secure random key:
 .Bd -literal -offset indent
 # dd if=/dev/arandom of=/etc/mail/spamd.key bs=2048 count=1
 .Ed
 .Pp
-The file needs to be copied to all synchronised hosts.
+The file needs to be copied to all hosts
+sending or receiving synchronisation messages.
 .Sh FILES
 .Bl -tag -width "/etc/mail/spamd.alloweddomainsXX" -compact
 .It /etc/mail/spamd.conf