various minor improvements; ok jacekm gilles

5 files changed, 57 insertions, 57 deletions

diff --git a/usr.sbin/smtpd/makemap.8 b/usr.sbin/smtpd/makemap.8
index 350a7a3d16d..98cde0b84f1 100644
--- a/usr.sbin/smtpd/makemap.8
+++ b/usr.sbin/smtpd/makemap.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: makemap.8,v 1.6 2009/03/16 20:43:29 gilles Exp $
+.\"	$OpenBSD: makemap.8,v 1.7 2009/03/23 21:48:40 jmc Exp $
 .\"
 .\" Copyright (c) 2009 Jacek Masiulaniec <jacekm@openbsd.org>
 .\" Copyright (c) 2008-2009 Gilles Chechade <gilles@openbsd.org>
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: March 16 2009 $
+.Dd $Mdocdate: March 23 2009 $
 .Dt MAKEMAP 8
 .Os
 .Sh NAME
@@ -32,38 +32,39 @@ creates the database maps used by keyed map lookups in
 .Xr smtpd 8 .
 It reads input from
 .Ar file
-and writes database to a file
-whose name is made by adding .db suffix to
+and writes data to a file whose name is made by adding a
+.Dq .db
+suffix to
 .Ar file .
 .Pp
 In all cases,
 .Nm
 reads lines consisting of words separated by whitespace.
-The first is the database key,
-the remaining specify mapped value.
-Database key and value may optionally be separated
+The first word of a line is the database key;
+the remainder represents the mapped value.
+The database key and value may optionally be separated
 by the colon character.
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
 .It Fl o Ar dbfile
-Write generated database to
+Write the generated database to
 .Ar dbfile .
 .It Fl t Ar type
-Specify format of resulting map file.
-Default map format is suitable for storing simple, unstructured
+Specify the format of the resulting map file.
+The default map format is suitable for storing simple, unstructured,
 key-to-value string associations.
-However, if mapped value has special meaning,
-as in case of virtual domains definition file,
-suitable
+However, if the mapped value has special meaning,
+as in the case of the virtual domains file,
+a suitable
 .Ar type
-argument must be provided.
-Available output types are:
+must be provided.
+The available output types are:
 .Bl -tag -width "aliases"
 .It Cm aliases
-Mapped value is comma-separated list of mail destinations.
+The mapped value is a comma-separated list of mail destinations.
 This format can be used for building user aliases and
-virtual domains database files.
+virtual domains files.
 .El
 .Pp
 .El
@@ -75,7 +76,7 @@ List of user mail aliases.
 .It Pa /etc/mail/virtual
 List of hosted virtual domains.
 .It Pa /etc/mail/secrets
-List of remote hosts credentials.
+List of remote host credentials.
 .El
 .Sh SEE ALSO
 .Xr aliases 5 ,
@@ -88,4 +89,4 @@ The
 .Nm
 command first appeared in
 .Ox 4.6
-as the replacement for equivalent command shipped with sendmail.
+as a replacement for the equivalent command shipped with sendmail.
diff --git a/usr.sbin/smtpd/newaliases.8 b/usr.sbin/smtpd/newaliases.8
index 875d567936c..f070c12322b 100644
--- a/usr.sbin/smtpd/newaliases.8
+++ b/usr.sbin/smtpd/newaliases.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: newaliases.8,v 1.5 2009/03/16 21:15:40 gilles Exp $
+.\"	$OpenBSD: newaliases.8,v 1.6 2009/03/23 21:48:40 jmc Exp $
 .\"
 .\" Copyright (c) 2009 Jacek Masiulaniec <jacekm@openbsd.org>
 .\" Copyright (c) 2008-2009 Gilles Chechade <gilles@openbsd.org>
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: March 16 2009 $
+.Dd $Mdocdate: March 23 2009 $
 .Dt NEWALIASES 8
 .Os
 .Sh NAME
@@ -31,7 +31,7 @@ the location of which is defined in
 .Xr smtpd.conf 5 ,
 and which by default is
 .Pa /etc/mail/aliases .
-This utility must be run each time aliases file is changed
+This utility must be run each time the aliases file is changed
 in order for the change to take effect.
 .Pp
 The options are as follows:
@@ -44,11 +44,11 @@ instead of the default
 .Pa /etc/mail/smtpd.conf .
 .El
 .Pp
-Note: this utility is provided for Sendmail compatibilty.
+Note: this utility is provided for sendmail compatibilty.
 The preferred way of rebuilding the database is with
 .Xr makemap 8 :
 .Bd -literal -offset indent
-makemap -t aliases /etc/mail/aliases
+# makemap -t aliases /etc/mail/aliases
 .Ed
 .Pp
 .Ex -std newaliases
@@ -57,7 +57,7 @@ makemap -t aliases /etc/mail/aliases
 .It Pa /etc/mail/aliases
 List of local user mail aliases.
 .It Pa /etc/mail/virtual
-List of virtual hosts aliases.
+List of virtual host aliases.
 .El
 .Sh SEE ALSO
 .Xr smtpd.conf 5 ,
@@ -67,4 +67,4 @@ The
 .Nm
 command first appeared in
 .Ox 4.6
-as the replacement for equivalent command shipped with sendmail.
+as a replacement for the equivalent command shipped with sendmail.
diff --git a/usr.sbin/smtpd/smtpctl.8 b/usr.sbin/smtpd/smtpctl.8
index c1dfd5915cf..58e18bf254d 100644
--- a/usr.sbin/smtpd/smtpctl.8
+++ b/usr.sbin/smtpd/smtpctl.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: smtpctl.8,v 1.7 2009/03/16 22:40:35 gilles Exp $
+.\" $OpenBSD: smtpctl.8,v 1.8 2009/03/23 21:48:40 jmc Exp $
 .\"
 .\" Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: March 16 2009 $
+.Dd $Mdocdate: March 23 2009 $
 .Dt SMTPCTL 8
 .Os
 .Sh NAME
@@ -32,33 +32,33 @@ program controls
 .Pp
 The following commands are available:
 .Bl -tag -width Ds
+.It Cm pause incoming
+Temporarily stop accepting incoming sessions.
+.It Cm pause local
+Temporarily stop deliveries to local users.
+.It Cm pause outgoing
+Temporarily stop relaying and deliveries to
+remote users.
+.It Cm resume incoming
+Resume accepting incoming sessions.
+.It Cm resume local
+Resume deliveries to local users.
+.It Cm resume outgoing
+Resume relaying and deliveries to remote users.
+.It Cm schedule message-id
+Marks all messages with same message ID as ready
+for immediate delivery.
+.It Cm schedule message-uid
+Marks a message as ready for immediate delivery.
 .It Cm show queue
 Displays information concerning envelopes
-that are currently in queue.
+that are currently in a queue.
 .It Cm show runqueue
 Displays information concerning envelopes
 that are scheduled for delivery.
 .It Cm show stats
 Displays runtime statistics concerning
 .Xr smtpd 8 .
-.It Cm schedule message-uid
-Marks a message as ready for immediate delivery.
-.It Cm schedule message-id
-Marks all messages with same message id as ready
-for immediate delivery.
-.It Cm pause local
-Temporarily stop deliveries to local users.
-.It Cm resume local
-Resume deliveries to local users.
-.It Cm pause outgoing
-Temporarily stop relaying and deliveries to
-remote users.
-.It Cm resume outgoing
-Resume relaying and deliveries to remote users.
-.It Cm pause incoming
-Temporarily stop accepting incoming sessions.
-.It Cm resume incoming
-Resume accepting incoming sessions.
 .El
 .Sh FILES
 .Bl -tag -width "/var/run/smtpd.sockXX" -compact
@@ -72,4 +72,4 @@ Unix-domain socket used for communication with
 The
 .Nm
 program first appeared in
-.Ox 4.5 .
+.Ox 4.6 .
diff --git a/usr.sbin/smtpd/smtpctl.c b/usr.sbin/smtpd/smtpctl.c
index 748b10c83ee..65cdb302215 100644
--- a/usr.sbin/smtpd/smtpctl.c
+++ b/usr.sbin/smtpd/smtpctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smtpctl.c,v 1.18 2009/03/22 13:52:03 ian Exp $	*/
+/*	$OpenBSD: smtpctl.c,v 1.19 2009/03/23 21:48:40 jmc Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -78,7 +78,7 @@ usage(void)
 	if (sendmail)
 		fprintf(stderr, "usage: %s [-i] rcpt [...]\n", __progname);
 	else
-		fprintf(stderr, "usage: %s <command> [arg [...]]\n", __progname);
+		fprintf(stderr, "usage: %s command [argument ...]\n", __progname);
 	exit(1);
 }
 
diff --git a/usr.sbin/smtpd/smtpd.8 b/usr.sbin/smtpd/smtpd.8
index a8bed7c7971..8c0e6b416ba 100644
--- a/usr.sbin/smtpd/smtpd.8
+++ b/usr.sbin/smtpd/smtpd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: smtpd.8,v 1.4 2008/12/12 17:24:51 jacekm Exp $
+.\"	$OpenBSD: smtpd.8,v 1.5 2009/03/23 21:48:40 jmc Exp $
 .\"
 .\" Copyright (c) 2008, Gilles Chehade <gilles@openbsd.org>
 .\" Copyright (c) 2008, Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -15,12 +15,12 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: December 12 2008 $
+.Dd $Mdocdate: March 23 2009 $
 .Dt SMTPD 8
 .Os
 .Sh NAME
 .Nm smtpd
-.Nd "Simple Mail Transfer Protocol daemon"
+.Nd Simple Mail Transfer Protocol daemon
 .Sh SYNOPSIS
 .Nm
 .Op Fl dnv
@@ -37,8 +37,7 @@ can listen on a network interface and handle SMTP
 transactions; it can also be fed messages through the standard
 .Xr sendmail 8
 interface.
-.Nm
-can relay messages through remote mail transfer agents or store them
+It can relay messages through remote mail transfer agents or store them
 locally using either the mbox or maildir format.
 This implementation supports SMTP as defined by RFC 5321 as well as several
 extensions.
@@ -73,7 +72,7 @@ Only check the configuration file for validity.
 Produce more verbose output.
 .El
 .Sh FILES
-.Bl -tag -width "/var/run/smtpd.sockXX" -compact
+.Bl -tag -width "/var/run/smtpd.sockXXX" -compact
 .It /etc/mail/smtpd.conf
 Default
 .Nm
@@ -94,4 +93,4 @@ Unix-domain socket used for communication with
 The
 .Nm
 program first appeared in
-.Ox 4.5 .
+.Ox 4.6 .