small cleanup;

ok millert@

4 files changed, 34 insertions, 38 deletions

diff --git a/gnu/usr.sbin/sendmail/makemap/makemap.8 b/gnu/usr.sbin/sendmail/makemap/makemap.8
index 88f4f84e826..2c658b87df9 100644
--- a/gnu/usr.sbin/sendmail/makemap/makemap.8
+++ b/gnu/usr.sbin/sendmail/makemap/makemap.8
@@ -90,7 +90,7 @@ If the
 .Li TrustedUser
 option is set in the sendmail configuration file and
 .Nm
-is invoked as root, the generated files will be owned by 
+is invoked as root, the generated files will be owned by
 the specified
 .Li TrustedUser .
 .Ss Flags
diff --git a/gnu/usr.sbin/sendmail/sendmail/aliases.5 b/gnu/usr.sbin/sendmail/sendmail/aliases.5
index 90637c6a1db..67177602dbc 100644
--- a/gnu/usr.sbin/sendmail/sendmail/aliases.5
+++ b/gnu/usr.sbin/sendmail/sendmail/aliases.5
@@ -46,7 +46,7 @@ or an external address.
 .Bl -tag
 .It Em Local Username
 username
-
+.Pp
 The username must be available via
 .Xr getpwnam 3 .
 .El
@@ -54,34 +54,34 @@ The username must be available via
 .It Em Local Filename
 username
 /path/name
-
+.Pp
 Messages are appended to the file specified by the full pathname
 (starting with a slash (/))
 .El
 .Bl -tag
 .It Em Command
 |command
-
+.Pp
 A command starts with a pipe symbol (|),
 it receives messages via standard input.
 .El
 .Bl -tag
 .It Em Include File
 :include: /path/name
-
+.Pp
 The aliases in pathname are added to the aliases for
 .Em name .
 .El
 .Bl -tag
 .It Em E-Mail Address
 user@domain
-
+.Pp
 An e-mail address in RFC 822 format.
 .El
 .Pp
 Lines beginning with whitespace are continuation lines.
-Another way to continue lines is by placing a backslash 
-directly before a newline.  
+Another way to continue lines is by placing a backslash
+directly before a newline.
 Lines beginning with
 .Ql #
 are comments.
@@ -118,6 +118,11 @@ change to take effect.
 .%V SMM
 .%N \&No. 9
 .Re
+.Sh HISTORY
+The
+.Nm
+file format appeared in
+.Bx 4.0 .
 .Sh BUGS
 If you have compiled
 .Xr sendmail
@@ -127,8 +132,3 @@ you may have encountered problems in
 restricting a single alias to about 1000 bytes of information.
 You can get longer aliases by ``chaining''; that is, make the last name in
 the alias be a dummy name which is a continuation alias.
-.Sh HISTORY
-The
-.Nm
-file format appeared in
-.Bx 4.0 .
diff --git a/gnu/usr.sbin/sendmail/sendmail/mailq.8 b/gnu/usr.sbin/sendmail/sendmail/mailq.8
index ae581414d9c..6d6c19643c4 100644
--- a/gnu/usr.sbin/sendmail/sendmail/mailq.8
+++ b/gnu/usr.sbin/sendmail/sendmail/mailq.8
@@ -61,7 +61,7 @@ instead of the MTA queue specified in
 .It Fl q\fR[\fI!\fR] Ns Cm I Ar substr
 Limit processed jobs to those containing
 .Ar substr
-as a substring of the queue id or not when
+as a substring of the queue ID or not when
 .Sq !
 is specified.
 .It Fl q\fR[\fI!\fR] Ns Cm R Ar substr
diff --git a/gnu/usr.sbin/sendmail/sendmail/sendmail.8 b/gnu/usr.sbin/sendmail/sendmail/sendmail.8
index 33c1de4a775..a501cc862a9 100644
--- a/gnu/usr.sbin/sendmail/sendmail/sendmail.8
+++ b/gnu/usr.sbin/sendmail/sendmail/sendmail.8
@@ -55,10 +55,10 @@ Local addresses are looked up in a file
 and aliased appropriately.
 Aliasing can be prevented by preceding the address
 with a backslash.
-Beginning with 8.10, the sender is included in any alias 
-expansions, e.g., 
-if `john' sends to `group', 
-and `group' includes `john' in the expansion, 
+Beginning with 8.10, the sender is included in any alias
+expansions, e.g.,
+if `john' sends to `group',
+and `group' includes `john' in the expansion,
 then the letter will also be delivered to `john'.
 .Ss Parameters
 .Bl -tag -width Fl
@@ -94,9 +94,7 @@ listening on socket 25 for incoming
 connections.
 By default,
 .Nm Sendmail
-will also listen on socket 587 for
-.Tn RFC2476
-message submission.
+will also listen on socket 587 for RFC 2476 message submission.
 This is normally run from
 .Pa /etc/rc .
 .It Fl bD
@@ -119,8 +117,7 @@ only available with shared memory support.
 .It Fl bs
 Use the
 .Tn SMTP
-protocol as described in
-.Tn RFC821
+protocol as described in RFC 821
 on standard input and output.
 This flag implies all the operations of the
 .Fl ba
@@ -153,7 +150,7 @@ The envelope sender address is used as the recipient
 for delivery status notifications
 and may also appear in a Return-Path: header.
 .Fl f
-should only be used 
+should only be used
 by ``trusted'' users
 (normally
 .Em root ,
@@ -188,7 +185,7 @@ Set the identifier used in syslog messages to the supplied
 .Ar tag .
 .It Fl N Ar dsn
 Set delivery status notification conditions to
-.Ar dsn,
+.Ar dsn ,
 which can be
 .Ql never
 for no notifications
@@ -206,7 +203,8 @@ Set option
 .Ar option
 to the specified
 .Em value .
-This form uses long names.  See below for more details.
+This form uses long names.
+See below for more details.
 .It Fl o Ns Ar x Em value
 Set option
 .Ar x
@@ -226,7 +224,7 @@ Process saved messages in the queue at given intervals.
 If
 .Ar time
 is omitted, process the queue once.
-.Xr Time
+.Ar time
 is given as a tagged number,
 with
 .Ql s
@@ -271,7 +269,7 @@ only.
 .Xc
 Limit processed jobs to those containing
 .Ar substr
-as a substring of the queue id or not when
+as a substring of the queue ID or not when
 .Em !
 is specified.
 .It Xo Fl q Ns Op Ar ! Ns
@@ -523,7 +521,7 @@ msgs: "|/usr/bin/msgs -s"
 Aliases may also have the syntax
 .Dq :include: Ns Ar filename
 to ask
-.Xr sendmail
+.Nm sendmail
 to read the named file for a list of recipients.
 For example, an alias such as:
 .Pp
@@ -567,7 +565,8 @@ but was queued.
 If invoked as
 .Nm newaliases ,
 .Nm sendmail
-will rebuild the alias database.  If invoked as
+will rebuild the alias database.
+If invoked as
 .Nm mailq ,
 .Nm sendmail
 will print the contents of the mail queue.
@@ -594,13 +593,13 @@ and your system security reduced by setting the
 option,
 the permission problems should be fixed.
 For more information, see:
-
-.%T http://www.sendmail.org/tips/DontBlameSendmail.html
+.Pp
+.Pa http://www.sendmail.org/tips/DontBlameSendmail.html
 .Sh FILES
 Except for the file
 .Pa /etc/mail/sendmail.cf
 itself the following pathnames are all specified in
-.Pa /etc/mail/sendmail.cf.
+.Pa /etc/mail/sendmail.cf .
 Thus,
 these values are only approximations.
 .Pp
@@ -630,11 +629,8 @@ temp files
 .Xr rc 8 ,
 .Xr rmail 8
 .Pp
-DARPA
-Internet Request For Comments
-.%T RFC819 ,
-.%T RFC821 ,
-.%T RFC822 .
+DARPA Internet Request For Comments
+RFC 819, RFC 821, RFC 822.
 .Rs
 .%T "Sendmail \- An Internetwork Mail Router"
 .%V SMM