tweak previous; ok jacekm

1 files changed, 21 insertions, 18 deletions

diff --git a/usr.sbin/smtpd/smtpd.8 b/usr.sbin/smtpd/smtpd.8
index e9e86c2ff91..d81b014d6bb 100644
--- a/usr.sbin/smtpd/smtpd.8
+++ b/usr.sbin/smtpd/smtpd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: smtpd.8,v 1.6 2009/09/17 10:42:35 jacekm Exp $
+.\"	$OpenBSD: smtpd.8,v 1.7 2009/09/17 14:19:17 jmc Exp $
 .\"
 .\" Copyright (c) 2008, Gilles Chehade <gilles@openbsd.org>
 .\" Copyright (c) 2008, Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -71,26 +71,18 @@ Only check the configuration file for validity.
 .It Fl v
 Produce more verbose output.
 .El
-.Sh FILES
-.Bl -tag -width "/var/run/smtpd.sockXXX" -compact
-.It /etc/mail/smtpd.conf
-Default
+.Pp
 .Nm
-configuration file.
-.It /var/run/smtpd.sock
-Unix-domain socket used for communication with
-.Xr smtpctl 8 .
-.El
-.Sh EXAMPLES
-smtpd is not enabled by default.
+is not enabled by default.
 In order to use it as the system mailer,
-ensure your sendmail queue is empty,
-then stop sendmail:
+ensure the mail queue is empty,
+then stop
+.Xr sendmail 8 :
 .Bd -literal -offset indent
 # pkill sendmail
 .Ed
 .Pp
-Modify your
+Modify the current
 .Xr mailwrapper 8
 settings by editing
 .Pa /etc/mailer.conf :
@@ -102,16 +94,27 @@ makemap		/usr/libexec/smtpd/makemap
 newaliases	/usr/libexec/smtpd/makemap
 .Ed
 .Pp
-Rebuild aliases database,
+Rebuild the aliases database,
 and enable the daemon:
 .Bd -literal -offset indent
 # newaliases
-# echo "sendmail_flags=NO" >> /etc/mailer.conf
-# echo "smtpd_flags=" >> /etc/mailer.conf
+# echo "sendmail_flags=NO" \*(Gt\*(Gt /etc/mailer.conf
+# echo "smtpd_flags=" \*(Gt\*(Gt /etc/mailer.conf
 # smtpd
 .Ed
+.Sh FILES
+.Bl -tag -width "/var/run/smtpd.sockXXX" -compact
+.It /etc/mail/smtpd.conf
+Default
+.Nm
+configuration file.
+.It /var/run/smtpd.sock
+Unix-domain socket used for communication with
+.Xr smtpctl 8 .
+.El
 .Sh SEE ALSO
 .Xr smtpd.conf 5 ,
+.Xr mailwrapper 8 ,
 .Xr smtpctl 8
 .Rs
 .%R RFC 5321