Add MLINKs from sendmail.8 to smtpd.8, hoststat.1, purgestat.1

Convert man pages back to mandoc format.

8 files changed, 797 insertions, 829 deletions

diff --git a/gnu/usr.sbin/sendmail/mailstats/mailstats.8 b/gnu/usr.sbin/sendmail/mailstats/mailstats.8
index 052d2206b2e..621a6f0d60d 100644
--- a/gnu/usr.sbin/sendmail/mailstats/mailstats.8
+++ b/gnu/usr.sbin/sendmail/mailstats/mailstats.8
@@ -1,5 +1,5 @@
-.\" Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers.
-.\"	 All rights reserved.
+.\" Copyright (c) 1998 Sendmail, Inc. and its suppliers.
+.\"	All rights reserved.
 .\"
 .\" By using this file, you agree to the terms and conditions set
 .\" forth in the LICENSE file which can be found at the top level of
@@ -8,100 +8,92 @@
 .\"
 .\"	$Sendmail: mailstats.8,v 8.16 2000/02/01 05:49:53 gshapiro Exp $
 .\"
-.TH MAILSTATS 1 "April 25, 1996"
-.SH NAME
-.B mailstats
-\- display mail statistics
-.SH SYNOPSIS
-.B mailstats
-.RB [ \-o "] [" \-p ]
-.RB [ \-C 
-.IR cffile ]
-.RB [ \-f
-.IR stfile ]
-.SH DESCRIPTION
+.Dd April 25, 1996
+.Dt MAILSTATS 1
+.Os
+.Sh NAME
+.Nm mailstats
+.Nd display mail statistics
+.Sh SYNOPSIS
+.Nm mailstats
+.Op Fl o
+.Op Fl p
+.Op Fl C Ar cffile
+.Op Fl f Ar stfile
+.Sh DESCRIPTION
 The
-.B mailstats
+.Nm mailstats
 utility displays the current mail statistics.
-.PP
+.Pp
 First, the time at which statistics started being kept is displayed,
-in the format specified by 
-ctime(3).  
-Then, 
-the statistics for each mailer are displayed on a single line, 
+in the format specified by
+.Xr ctime 3 .
+Then,
+the statistics for each mailer are displayed on a single line,
 each with the following whitespace separated fields:
-.sp
-.RS
-.PD 0.2v
-.TP 1.2i
-.B M
+.Pp
+.Bl -tag -width 10n -offset indent -compact
+.It Sy M
 The mailer number.
-.TP 
-.B msgsfr
+.It Sy msgsfr
 Number of messages from the mailer.
-.TP
-.B bytes_from
+.It Sy bytes_from
 Kbytes from the mailer.
-.TP
-.B msgsto
+.It Sy msgsto
 Number of messages to the mailer.
-.TP
-.B bytes_to
+.It Sy bytes_to
 Kbytes to the mailer.
-.TP
-.B msgsrej
+.It Sy msgsrej
 Number of messages rejected.
-.TP
-.B msgsdis
+.It Sy msgsdis
 Number of messages discarded.
-.TP
-.B Mailer
+.It Sy Mailer
 The name of the mailer.
-.PD
-.RE
-.PP
-After this display, a line totaling the values for all of the mailers 
-is displayed (preceeded with a ``T''),
-separated from the previous information by a line containing only equals 
-(``='') 
+.El
+.Pp
+After this display, a line totaling the values for all of the mailers
+is displayed,
+separated from the previous information by a line containing only equals
+.Pq Dq \&=
 characters.
-Another line preceeded with a ``C'' lists the number of connections.
-.PP
+Another line preceeded with a
+.Dq C
+lists the number of connections.
+.Pp
 The options are as follows:
-.TP 
-.B \-C
+.Bl -tag -width Ds
+.It Fl C
 Read the specified file instead of the default
-.B sendmail
-``cf'' file.
-.TP
-.B \-f
+.Nm sendmail
+.Dq cf
+file.
+.It Fl f
 Read the specified statistics file instead of the statistics file
 specified in the
-.B sendmail 
-``cf'' file.
-.TP 
-.B \-p
+.Nm sendmail
+.Dq cf
+file.
+.It Fl p
 Output information in program-readable mode and clear statistics.
-.TP
-.B \-o
+.It Fl o
 Don't display the name of the mailer in the output.
-.PP
+.El
+.Pp
 The
-.B mailstats
+.Nm mailstats
 utility exits 0 on success, and >0 if an error occurs.
-.SH FILES
-.PD 0.2v
-.TP 2.5i
-/etc/mail/sendmail.cf
+.Sh FILES
+.Bl -tag -width /var/log/sendmail.stXX -compact
+.It Pa /etc/mail/sendmail.cf
 The default
-.B sendmail
-``cf'' file.
-.TP
-/etc/mail/statistics
+.Nm sendmail
+.Dq cf
+file.
+.It Pa /var/log/sendmail.st
 The default
-.B sendmail
+.Nm sendmail
 statistics file.
-.PD
-.SH SEE ALSO
-mailq(1), 
-sendmail(8)
+.El
+.Sh SEE ALSO
+.Xr mailq 1 ,
+.Xr sendmail 8
diff --git a/gnu/usr.sbin/sendmail/makemap/makemap.8 b/gnu/usr.sbin/sendmail/makemap/makemap.8
index 3749f95c00b..8e0880f9e73 100644
--- a/gnu/usr.sbin/sendmail/makemap/makemap.8
+++ b/gnu/usr.sbin/sendmail/makemap/makemap.8
@@ -1,5 +1,5 @@
 .\" Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
-.\"	 All rights reserved.
+.\"	All rights reserved.
 .\" Copyright (c) 1988, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -10,134 +10,132 @@
 .\"
 .\"     $Sendmail: makemap.8,v 8.21 1999/07/30 06:15:31 gshapiro Exp $
 .\"
-.TH MAKEMAP 8 "November 16, 1992"
-.SH NAME
-.B makemap
-\- create database maps for sendmail
-.SH SYNOPSIS
-.B makemap
-.RB [ \-C
-.IR file ]
-.RB [ \-N ]
-.RB [ \-c
-.IR cachesize ]
-.RB [ \-d "] [" \-e "] [" \-f "] [" \-l "] [" \-o "] [" \-r "] [" \-s "] [" \-u "] [" \-v ]
-.I 
-maptype mapnam
-.SH DESCRIPTION
-.B Makemap
+.Dd November 16, 1992
+.Dt MAKEMAP 8
+.Os
+.Sh NAME
+.Nm makemap
+.Nd create database maps for sendmail
+.Sh SYNOPSIS
+.Nm makemap
+.Op Fl C Ar file
+.Op Fl N
+.Op Fl c Ar cachesize
+.Op Fl d
+.Op Fl e
+.Op Fl f
+.Op Fl l
+.Op Fl o
+.Op Fl r
+.Op Fl s
+.Op Fl u
+.Op Fl v
+.Ar maptype
+.Ar mapname
+.Sh DESCRIPTION
+.Nm
 creates the database maps used by the keyed map lookups in
-sendmail(8).  
+.Xr sendmail 8 .
 It reads input from the standard input
 and outputs them to the indicated
-.I mapname.
-.PP
+.Ar mapname .
+.Pp
 Depending on how it is compiled,
-.B makemap
-handles up to three different database formats, 
+.Nm
+handles up to three different database formats,
 selected using the
-.I maptype
-parameter.  
+.Ar maptype
+parameter.
 They may be
-.TP
-dbm
-DBM format maps.  
-This requires the 
-ndbm(3) 
+.Bl -tag -width Fl
+.It Li dbm
+DBM format maps.
+This requires the
+.Xr ndbm 3
 library.
-.TP
-btree
-B-Tree format maps.  
-This requires the new Berkeley DB 
+.It Li btree
+B-Tree format maps.
+This requires the new Berkeley DB
 library.
-.TP
-hash
-Hash format maps.  
-This also requires the Berkeley DB 
+.It Li hash
+Hash format maps.
+This also requires the Berkeley DB
 library.
-.PP
+.El
+.Pp
 In all cases,
-.B makemap
-reads lines from the standard input consisting of two 
-words separated by white space.  
-The first is the database key, 
-the second is the value.  
-The value may contain 
-``%\fIn\fP'' 
-strings to indicate parameter substitution.  
-Literal percents should be doubled 
+.Nm
+reads lines from the standard input consisting of two
+words separated by whitespace.
+The first is the database key,
+the second is the value.
+The value may contain
+``%\fIn\fP''
+strings to indicated parameter substitution.
+Literal percents should be doubled
 (``%%'').
 Blank lines and lines beginning with ``#'' are ignored.
-.PP
+.Pp
 If the
-.I TrustedUser
+.Li TrustedUser
 option is set in the sendmail configuration file and
-.B makemap
+.Nm
 is invoked as root, the generated files will be owned by 
 the specified
-.IR TrustedUser.
-.SS Flags
-.TP  
-.B \-C
-Use the specified sendmail configuration file for 
-looking up the TrustedUser option.
-.TP 
-.B \-N
-Include the null byte that terminates strings 
-in the map.  
-This must match the \-N flag in the sendmail.cf 
+.Li TrustedUser.
+.Ss Flags
+.Bl -tag -width Fl
+.It Fl C Ar file
+Use the specified sendmail configuration
+.Ar file
+for looking up the TrustedUser option.
+.It Fl N
+Include the null byte that terminates strings
+in the map.
+This must match the \-N flag in the sendmail.cf
 ``K'' line.
-.TP
-.B \-c
+.It Fl c
 Use the specified hash and B-Tree cache size.
-.TP
-.B \-d
-Allow duplicate keys in the map.  
-This is only allowed on B-Tree format maps.  
-If two identical keys are read, 
+.It Fl d
+Allow duplicate keys in the map.
+This is only allowed on B-Tree format maps.
+If two identical keys are read,
 they will both be inserted into the map.
-.TP
-.B \-e
+.It Fl e
 Allow empty value (right hand side).
-.TP
-.B \-f
-Normally all upper case letters in the key 
-are folded to lower case.  
-This flag disables that behaviour.  
-This is intended to mesh with the 
-\-f flag in the 
-.B K 
-line in sendmail.cf.  
+.It Fl f
+Normally all upper case letters in the key
+are folded to lower case.
+This flag disables that behaviour.
+This is intended to mesh with the
+\-f flag in the
+\fBK\fP
+line in sendmail.cf.
 The value is never case folded.
-.TP
-.B \-l
+.It Fl l
 List supported map types.
-.TP
-.B \-o
-Append to an old file.  
+.It Fl o
+Append to an old file.
 This allows you to augment an existing file.
-.TP
-.B \-r
-Allow replacement of existing keys.  
+.It Fl r
+Allow replacement of existing keys.
 Normally
-.B makemap
-complains if you repeat a key, 
+.Nm
+complains if you repeat a key,
 and does not do the insert.
-.TP
-.B \-s
-Ignore safety checks on maps being created.  
-This includes checking for hard or symbolic 
+.It Fl s
+Ignore safety checks on maps being created.
+This includes checking for hard or symbolic
 links in world writable directories.
-.TP
-.B \-u
+.It Fl u
 dump (unmap) the content of the database to standard output.
-.TP
-.B \-v
+.It Fl v
 Verbosely print what it is doing.
-.SH SEE ALSO
-sendmail(8)
-.SH HISTORY
+.El
+.Sh SEE ALSO
+.Xr sendmail 8
+.Sh HISTORY
 The
-.B makemap
-command appeared in 
-4.4BSD.
+.Nm
+command appeared in
+.Bx 4.4 .
diff --git a/gnu/usr.sbin/sendmail/praliases/praliases.1 b/gnu/usr.sbin/sendmail/praliases/praliases.1
index 71bb33bedf1..c3f8cff4680 100644
--- a/gnu/usr.sbin/sendmail/praliases/praliases.1
+++ b/gnu/usr.sbin/sendmail/praliases/praliases.1
@@ -1,5 +1,5 @@
 .\" Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers.
-.\"	 All rights reserved.
+.\"	All rights reserved.
 .\"
 .\" By using this file, you agree to the terms and conditions set
 .\" forth in the LICENSE file which can be found at the top level of
@@ -8,50 +8,57 @@
 .\"
 .\"	$Sendmail: praliases.8,v 8.14 2000/03/17 07:32:46 gshapiro Exp $
 .\"
-.TH PRALIASES 1 "April 25, 1996"
-.SH NAME
-.B praliases
-\- display system mail aliases
-.SH SYNOPSIS
-.B praliases
-.RB [ \-C
-.IR file ]
-.RB [ \-f
-.IR file ]
-.RB [\c
-.IR key
-.IR ... ]
-.SH DESCRIPTION
+.Dd April 25, 1996
+.Dt PRALIASES 1
+.Os
+.Sh NAME
+.Nm praliases
+.Nd display system mail aliases
+.Sh SYNOPSIS
+.Nm praliases
+.Op Fl C Ar file
+.Op Fl f Ar file
+.Op key ...
+.Sh DESCRIPTION
 The
-.B praliases
-utility displays the current system aliases, 
+.Nm praliases
+utility displays the current system aliases,
 one per line, in no particular order.
 The special internal @:@ alias will be displayed if present.
-.PP
+.Pp
 The options are as follows:
-.TP
-.B \-C
+.Bl -tag -width Ds
+.It Fl C
 Read the specified sendmail configuration file instead of the default
-.B sendmail
+.Nm sendmail
 configuration file.
-.TP 
-.B \-f
+.It Fl f
 Read the specified file instead of the configured
-.B sendmail
+.Nm sendmail
 system aliases file(s).
-.PP
+.El
+.Pp
 If one or more keys are specified on the command line,
 only entries which match those keys are displayed.
-.PP
+.Pp
 The
-.B praliases
+.Nm praliases
 utility exits 0 on success, and >0 if an error occurs.
-.SH FILES
-.TP 2.5i
-/etc/mail/sendmail.cf
+.Sh FILES
+.Bl -tag -width /etc/mail/sendmail.cf -compact
+.It Pa /etc/mail/sendmail.cf
 The default
-.B sendmail
+.Nm sendmail
 configuration file.
-.SH SEE ALSO
-mailq(1), 
-sendmail(8)
+.It Pa /etc/mail/aliases
+The default
+.Nm sendmail
+system aliases file.
+.It Pa /etc/mail/aliases.db
+The database version of the
+.Pa /etc/mail/aliases
+file.
+.El
+.Sh SEE ALSO
+.Xr mailq 1 ,
+.Xr sendmail 8
diff --git a/gnu/usr.sbin/sendmail/sendmail/Makefile b/gnu/usr.sbin/sendmail/sendmail/Makefile
index 3fe5b640115..1994c8d7b03 100644
--- a/gnu/usr.sbin/sendmail/sendmail/Makefile
+++ b/gnu/usr.sbin/sendmail/sendmail/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 2000/04/02 19:48:34 millert Exp $
+#	$OpenBSD: Makefile,v 1.3 2000/04/04 04:50:14 millert Exp $
 
 PROG=	sendmail
 
@@ -12,6 +12,7 @@ SRCS=	main.c alias.c arpadate.c bf_torek.c clock.c collect.c \
 	sfsasl.c shmticklib.c srvrsmtp.c stab.c stats.c sysexits.c \
 	timers.c trace.c udb.c usersmtp.c util.c version.c
 MAN=	aliases.5 mailq.1 newaliases.1 sendmail.8
+MLINKS=	sendmail.8 smtpd.8 sendmail.8 hoststat.1 sendmail.8 purgestat.1
 BINDIR=	/usr/libexec/sendmail
 BINOWN=	root
 BINGRP=	bin
diff --git a/gnu/usr.sbin/sendmail/sendmail/aliases.5 b/gnu/usr.sbin/sendmail/sendmail/aliases.5
index 69a97a6874c..998b05a30ae 100644
--- a/gnu/usr.sbin/sendmail/sendmail/aliases.5
+++ b/gnu/usr.sbin/sendmail/sendmail/aliases.5
@@ -1,5 +1,5 @@
 .\" Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers.
-.\"	 All rights reserved.
+.\"	All rights reserved.
 .\" Copyright (c) 1983, 1997 Eric P. Allman.  All rights reserved.
 .\" Copyright (c) 1985, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -11,109 +11,124 @@
 .\"
 .\"     $Sendmail: aliases.5,v 8.15 2000/02/26 01:12:21 ca Exp $
 .\"
-.TH ALIASES 5 "$Date: 2000/04/02 19:48:34 $"
-.SH NAME
-.B aliases
-\- aliases file for sendmail
-.SH SYNOPSIS
-.B aliases
-.SH DESCRIPTION
-This file describes user 
-ID 
-aliases used by 
-sendmail.
-The file resides in 
-/etc/mail 
-and 
+.Dd February 26, 1999
+.Dt ALIASES 5
+.Os
+.Sh NAME
+.Nm aliases
+.Nd aliases file for sendmail
+.Sh SYNOPSIS
+.Nm aliases
+.Sh DESCRIPTION
+This file describes user
+.Tn ID
+aliases used by
+.Pa /usr/sbin/sendmail .
+The file resides in
+.Pa /etc/mail
+and
 is formatted as a series of lines of the form
-.IP
+.Bd -filled -offset indent
 name: addr_1, addr_2, addr_3, . . .
-.PP
+.Ed
+.Pp
 The
-.I name
+.Em name
 is the name to alias, and the
-.I addr_n
-are the aliases for that name.  
-.I addr_n
+.Em addr_n
+are the aliases for that name.
+.Em addr_n
 can be another alias, a local username, a local filename,
 a command,
 an include file,
 or an external address.
-.TP
-.B Local Username
+.Pp
+.Bl -tag
+.It Em Local Username
+username
+
+The username must be available via
+.Xr getpwnam 3 .
+.El
+.Bl -tag
+.It Em Local Filename
 username
-.IP
-The username must be available via getpwnam(3).
-.TP
-.B Local Filename
 /path/name
-.IP
+
 Messages are appended to the file specified by the full pathname
 (starting with a slash (/))
-.TP
-.B Command
+.El
+.Bl -tag
+.It Em Command
 |command
-.IP
+
 A command starts with a pipe symbol (|),
 it receives messages via standard input.
-.TP
-.B Include File
+.El
+.Bl -tag
+.It Em Include File
 :include: /path/name
-.IP
+
 The aliases in pathname are added to the aliases for
-.I name.
-.TP
-.B E-Mail Address
+.Em name .
+.El
+.Bl -tag
+.It Em E-Mail Address
 user@domain
-.IP
+
 An e-mail address in RFC 822 format.
-.PP
-Lines beginning with white space are continuation lines.  
+.El
+.Pp
+Lines beginning with whitespace are continuation lines.
 Another way to continue lines is by placing a backslash 
 directly before a newline.  
-Lines beginning with 
-# 
+Lines beginning with
+.Ql #
 are comments.
-.PP
-Aliasing occurs only on local names.  
+.Pp
+Aliasing occurs only on local names.
 Loops can not occur, since no message will be sent to any person more than once.
-.PP
-After aliasing has been done, local and valid recipients who have a 
-``.forward'' 
-file in their home directory have messages forwarded to the 
+.Pp
+After aliasing has been done, local and valid recipients who have a
+.Dq Pa .forward
+file in their home directory have messages forwarded to the
 list of users defined in that file.
-.PP
+.Pp
 This is only the raw data file; the actual aliasing information is
-placed into a binary format in the file 
-/etc/mail/aliases.db
-using the program 
-newaliases(1).  
-A 
-newaliases
-command should be executed each time the aliases file is changed for the 
+placed into a binary format in the file
+.Pa /etc/mail/aliases.db
+using the program
+.Xr newaliases 1 .
+A
+.Xr newaliases
+command should be executed each time the aliases file is changed for the
 change to take effect.
-.SH SEE  ALSO
-newaliases(1), 
-dbopen(3), 
-dbm(3), 
-sendmail(8)
-.PP
-.I
-SENDMAIL Installation and Operation Guide.
-.PP
-.I 
-SENDMAIL An Internetwork Mail Router.
-.SH BUGS
-If you have compiled 
-sendmail 
+.Sh SEE ALSO
+.Xr newaliases 1 ,
+.Xr dbopen 3 ,
+.Xr dbm 3 ,
+.Xr sendmail 8
+.Rs
+.%T "Sendmail Installation and Operation Guide"
+.%V SMM
+.%N \&No. 8
+.Re
+.Rs
+.%T "Sendmail \- An Internetwork Mail Router"
+.%V SMM
+.%N \&No. 9
+.Re
+.Sh BUGS
+If you have compiled
+.Xr sendmail
 with DBM support instead of NEWDB,
-you may have encountered problems in 
-dbm(3) 
-restricting a single alias to about 1000 bytes of information.  
-You can get longer aliases by ``chaining''; that is, make the last name in 
+you may have encountered problems in
+.Xr dbm 3
+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
+.Sh HISTORY
 The
-.B aliases
-file format appeared in 
-4.0BSD.
+.Nm
+file format appeared in
+.Bx 4.0 .
diff --git a/gnu/usr.sbin/sendmail/sendmail/mailq.1 b/gnu/usr.sbin/sendmail/sendmail/mailq.1
index 4c388219485..cc352ffddf7 100644
--- a/gnu/usr.sbin/sendmail/sendmail/mailq.1
+++ b/gnu/usr.sbin/sendmail/sendmail/mailq.1
@@ -1,5 +1,5 @@
 .\" Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
-.\"	 All rights reserved.
+.\"	All rights reserved.
 .\" Copyright (c) 1983, 1997 Eric P. Allman.  All rights reserved.
 .\" Copyright (c) 1985, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -11,54 +11,59 @@
 .\"
 .\"     $Sendmail: mailq.1,v 8.14 1999/06/22 20:41:34 tony Exp $
 .\"
-.TH MAILQ 1 "$Date: 2000/04/02 19:48:35 $"
-.SH NAME
-.B mailq
-\- print the mail queue
-.SH SYNOPSIS
-.B mailq
-.RB [ \-v ]
-.SH DESCRIPTION
-.B Mailq
+.Dd June 22, 1999
+.Dt MAILQ 1
+.Os
+.Sh NAME
+.Nm mailq
+.Nd print the mail queue
+.Sh SYNOPSIS
+.Nm mailq
+.Op Fl v
+.Sh DESCRIPTION
+.Nm Mailq
 prints a summary of the mail messages queued for future delivery.
-.PP
-The first line printed for each message 
-shows the internal identifier used on this host 
-for the message, 
+.Pp
+The first line printed for each message
+shows the internal identifier used on this host
+for the message,
 the size of the message in bytes,
-the date and time the message was accepted into the queue, 
-and the envelope sender of the message.  
-The second line shows the error message that caused this message 
-to be retained in the queue; 
-it will not be present if the message is being processed 
-for the first time.  
-The following lines show message recipients, 
+the date and time the message was accepted into the queue,
+and the envelope sender of the message.
+The second line shows the error message that caused this message
+to be retained in the queue;
+it will not be present if the message is being processed
+for the first time.
+The following lines show message recipients,
 one per line.
-.PP
-.B Mailq
-is identical to ``sendmail -bp''.
-.PP
+.Pp
+.Nm Mailq
+is identical to
+.Dq Li "sendmail -bp" .
+.Pp
 The options are as follows:
-.TP
-.B \-v
-Print verbose information.  
-This adds the priority of the message and 
-a single character indicator (``+'' or blank) 
-indicating whether a warning message has been sent 
+.Bl -tag -width Ds
+.It Fl v
+Print verbose information.
+This adds the priority of the message and
+a single character indicator (``+'' or blank)
+indicating whether a warning message has been sent
 on the first line of the message.
 Additionally, extra lines may be intermixed with the recipients
-indicating the ``controlling user'' information; 
-this shows who will own any programs that are executed 
-on behalf of this message 
+indicating the ``controlling user'' information;
+this shows who will own any programs that are executed
+on behalf of this message
 and the name of the alias this command expanded from, if any.
-.PP
+.El
+.Pp
 The
-.B mailq
+.Nm mailq
 utility exits 0 on success, and >0 if an error occurs.
-.SH SEE ALSO
-sendmail(8)
-.SH HISTORY
+.Sh SEE ALSO
+.Xr mailer.conf 5 ,
+.Xr sendmail 8
+.Sh HISTORY
 The
-.B mailq
-command appeared in 
-4.0BSD.
+.Nm mailq
+command appeared in
+.Bx 4.0 .
diff --git a/gnu/usr.sbin/sendmail/sendmail/newaliases.1 b/gnu/usr.sbin/sendmail/sendmail/newaliases.1
index 8aa03969df3..f0e5262a8aa 100644
--- a/gnu/usr.sbin/sendmail/sendmail/newaliases.1
+++ b/gnu/usr.sbin/sendmail/sendmail/newaliases.1
@@ -1,5 +1,5 @@
-.\" Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
-.\"	 All rights reserved.
+.\" Copyright (c) 1998, 1999 Sendmail, Inc and its suppliers.
+.\"	All rights reserved.
 .\" Copyright (c) 1983, 1997 Eric P. Allman.  All rights reserved.
 .\" Copyright (c) 1985, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -11,31 +11,39 @@
 .\"
 .\"     $Sendmail: newaliases.1,v 8.15 1999/06/22 20:41:34 tony Exp $
 .\"
-.TH NEWALIASES 1 "$Date: 2000/04/02 19:48:35 $"
-.SH NAME
-.B newaliases
-\- rebuild the data base for the mail aliases file
-.SH SYNOPSIS
-.B newaliases
-.SH DESCRIPTION
-.B Newaliases
+.Dd June 22, 1999
+.Dt NEWALIASES 1
+.Os
+.Sh NAME
+.Nm newaliases
+.Nd rebuild the data base for the mail aliases file
+.Sh SYNOPSIS
+.Nm newaliases
+.Sh DESCRIPTION
+.Nm Newaliases
 rebuilds the random access data base for the mail aliases file
-/etc/mail/aliases.  It must be run each time this file is changed
+.Pa /etc/mail/aliases .
+It must be run each time this file is changed
 in order for the change to take effect.
-.PP
-.B Newaliases
-is identical to ``sendmail -bi''.
-.PP
+.Pp
+.Nm Newaliases
+is identical to
+.Dq Li "sendmail -bi" .
+.Pp
 The
-.B newaliases
+.Nm newaliases
 utility exits 0 on success, and >0 if an error occurs.
-.SH FILES
-.TP 2i
-/etc/mail/aliases
+.Sh FILES
+.Bl -tag -width /etc/mail/aliases -compact
+.It Pa /etc/mail/aliases
 The mail aliases file
-.SH SEE ALSO
-aliases(5), sendmail(8)
-.SH HISTORY
+.El
+.Sh SEE ALSO
+.Xr aliases 5 ,
+.Xr mailer.conf 5 ,
+.Xr sendmail 8
+.Sh HISTORY
 The
-.B newaliases
-command appeared in 4.0BSD.
+.Nm newaliases
+command appeared in
+.Bx 4.0 .
diff --git a/gnu/usr.sbin/sendmail/sendmail/sendmail.8 b/gnu/usr.sbin/sendmail/sendmail/sendmail.8
index 159bf91b276..79fcbfacfbb 100644
--- a/gnu/usr.sbin/sendmail/sendmail/sendmail.8
+++ b/gnu/usr.sbin/sendmail/sendmail/sendmail.8
@@ -1,8 +1,8 @@
 .\" Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers.
-.\"      All rights reserved.
+.\"	All rights reserved.
 .\" Copyright (c) 1983, 1997 Eric P. Allman.  All rights reserved.
 .\" Copyright (c) 1988, 1991, 1993
-.\"     The Regents of the University of California.  All rights reserved.
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" By using this file, you agree to the terms and conditions set
 .\" forth in the LICENSE file which can be found at the top level of
@@ -11,675 +11,617 @@
 .\"
 .\"     $Sendmail: sendmail.8,v 8.36 2000/02/01 05:49:57 gshapiro Exp $
 .\"
-.TH SENDMAIL 8 "$Date: 2000/04/02 19:48:35 $"
-.SH NAME
-.B sendmail
-\- an electronic mail transport agent
-.SH SYNOPSIS
-.B sendmail
-.RI [ flags "] [" "address ..." ]
-.br
-.B newaliases
-.br
-.B mailq
-.RB [ \-v ]
-.br
-.B hoststat
-.br
-.B purgestat
-.br
-.B smtpd
-.SH DESCRIPTION
-.B Sendmail
+.Dd January 2, 2000
+.Dt SENDMAIL 8
+.Os
+.Sh NAME
+.Nm sendmail
+.Nd an electronic mail transport agent
+.Sh SYNOPSIS
+.Nm sendmail
+.Op Ar flags
+.Op Ar address ...
+.Op Fl v
+.Nm hoststat
+.Nm purgestat
+.Nm smtpd
+.Sh DESCRIPTION
+.Nm Sendmail
 sends a message to one or more
-.I recipients,
-routing the message over whatever networks 
+.Em recipients ,
+routing the message over whatever networks
 are necessary.
-.B Sendmail
-does internetwork forwarding as necessary 
+.Nm Sendmail
+does internetwork forwarding as necessary
 to deliver the message to the correct place.
-.PP
-.B Sendmail
-is not intended as a user interface routine; 
-other programs provide user-friendly 
+.Pp
+.Nm Sendmail
+is not intended as a user interface routine;
+other programs provide user-friendly
 front ends;
-.B sendmail
+.Nm sendmail
 is used only to deliver pre-formatted messages.
-.PP
+.Pp
 With no flags,
-.B sendmail
-reads its standard input 
-up to an end-of-file 
-or a line consisting only of a single dot 
+.Nm sendmail
+reads its standard input
+up to an end-of-file
+or a line consisting only of a single dot
 and sends a copy of the message found there
-to all of the addresses listed.  
-It determines the network(s) to use 
+to all of the addresses listed.
+It determines the network(s) to use
 based on the syntax and contents of the addresses.
-.PP
-Local addresses are looked up in a file 
+.Pp
+Local addresses are looked up in a file
 and aliased appropriately.
-Aliasing can be prevented by preceding the address 
+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, 
 then the letter will also be delivered to `john'.
-.SS Parameters
-.TP
-.BI \-B type
+.Ss Parameters
+.Bl -tag -width Fl
+.It Fl B Ns Ar type
 Set the body type to
-.IR type .
-Current legal values are 
-7BIT 
-or  
-8BITMIME.
-.TP
-.B \-ba
-Go into 
-ARPANET 
-mode.  All input lines must end with a CR-LF, 
-and all messages will be generated with a CR-LF at the end.  
-Also, 
-the ``From:'' and ``Sender:'' 
+.Ar type .
+Current legal values
+.Li 7BIT
+or
+.Li 8BITMIME .
+.It Fl ba
+Go into
+.Tn ARPANET
+mode.
+All input lines must end with a CR-LF,
+and all messages will be generated with a CR-LF at the end.
+Also,
+the ``From:'' and ``Sender:''
 fields are examined for the name of the sender.
-.TP
-.B \-bd
-Run as a daemon.  This requires Berkeley 
-IPC.
-.B Sendmail
-will fork and run in background 
+.It Fl bd
+Run as a daemon.  This requires Berkeley
+.Tn IPC .
+.Nm Sendmail
+will fork and run in background
 listening on socket 25 for incoming
-SMTP 
-connections.  
-This is normally run from 
-/etc/rc.
-.TP
-.B \-bD
+.Tn SMTP
+connections.
+This is normally run from
+.Pa /etc/rc .
+.It Fl bD
 Same as
-.B \-bd
+.Fl bd
 except runs in foreground.
-.TP
-.B \-bh
+.It Fl bh
 Print the persistent host status database.
-.TP
-.B \-bH
+.It Fl bH
 Purge expired entries from the persistent host status database.
-.TP
-.B \-bi
+.It Fl bi
 Initialize the alias database.
-.TP
-.B \-bm
+.It Fl bm
 Deliver mail in the usual way (default).
-.TP
-.B \-bp
+.It Fl bp
 Print a listing of the queue.
-.TP
-.B \-bs
-Use the 
-SMTP 
-protocol as described in 
-RFC821 
-on standard input and output.  
+.It Fl bs
+Use the
+.Tn SMTP
+protocol as described in
+.Tn RFC821
+on standard input and output.
 This flag implies all the operations of the
-.B \-ba
-flag that are compatible with 
-SMTP.
-.TP
-.B \-bt
-Run in address test mode.  
-This mode reads addresses and shows the steps in parsing; 
+.Fl ba
+flag that are compatible with
+.Tn SMTP .
+.It Fl bt
+Run in address test mode.
+This mode reads addresses and shows the steps in parsing;
 it is used for debugging configuration tables.
-.TP
-.B \-bv
+.It Fl bv
 Verify names only \- do not try to collect or deliver a message.
-Verify mode is normally used for validating 
+Verify mode is normally used for validating
 users or mailing lists.
-.TP
-.BI \-C file
+.It Fl C Ns Ar file
 Use alternate configuration file.
-.B Sendmail
+.Nm Sendmail
 refuses to run as root if an alternate configuration file is specified.
-.TP
-.BI \-d X
+.It Fl d Ns Ar X
 Set debugging value to
-.IR X .
+.Ar X .
 .ne 1i
-.TP
-.BI \-F fullname
+.It Fl F Ns Ar fullname
 Set the full name of the sender.
-.TP
-.BI \-f name
-Sets the name of the ``from'' person 
+.It Fl f Ns Ar name
+Sets the name of the ``from'' person
 (i.e., the envelope sender of the mail).
 This address may also be used in the From: header
 if that header is missing during initial submission.
 The envelope sender address is used as the recipient
 for delivery status notifications
 and may also appear in a Return-Path: header.
-.B \-f
+.Fl f
 should only be used 
-by ``trusted'' users 
+by ``trusted'' users
 (normally
-.IR root ", " daemon ,
+.Em root ,
+.Em daemon ,
 and
-.IR network )
-or if the person you are trying to become 
+.Em network )
+or if the person you are trying to become
 is the same as the person you are.
 Otherwise,
 an X-Authentication-Warning header
 will be added to the message.
-.TP
-.BI \-h N
+.It Fl h Ns Ar N
 Set the hop count to
-.IR N .
-The hop count is incremented every time the mail is 
+.Ar N .
+The hop count is incremented every time the mail is
 processed.
-When it reaches a limit, 
+When it reaches a limit,
 the mail is returned with an error message,
-the victim of an aliasing loop.  
-If not specified, 
+the victim of an aliasing loop.
+If not specified,
 ``Received:'' lines in the message are counted.
-.TP
-.B \-i
+.It Fl i
 Ignore dots alone on lines by themselves in incoming messages.
 This should be set if you are reading data from a file.
-.TP
-.BI "\-L " tag
+.It Fl L Ar tag
 Set the identifier used in syslog messages to the supplied
-.IR tag .
-.TP
-.BI "\-N " dsn
+.Ar tag .
+.It Fl N Ar dsn
 Set delivery status notification conditions to
-.IR dsn ,
-which can be 
-`never' 
-for no notifications 
-or a comma separated list of the values 
-`failure' 
-to be notified if delivery failed, 
-`delay'
-to be notified if delivery is delayed, and 
-`success' 
+.Ar dsn,
+which can be
+.Ql never
+for no notifications
+or a comma separated list of the values
+.Ql failure
+to be notified if delivery failed,
+.Ql delay
+to be notified if delivery is delayed, and
+.Ql success
 to be notified when the message is successfully delivered.
-.TP
-.B \-n
+.It Fl n
 Don't do aliasing.
-.TP
-\fB\-O\fP \fIoption\fR=\fIvalue\fR 
+.It Fl O Ar option Ns = Ns Em value
 Set option
-.I option
+.Ar option
 to the specified
-.IR value .
+.Em value .
 This form uses long names.  See below for more details.
-.TP
-.BI \-o "x value"
+.It Fl o Ns Ar x Em value
 Set option
-.I x
+.Ar x
 to the specified
-.IR value .
-This form uses single character names only.  
-The short names are not described in this manual page; 
+.Em value .
+This form uses single character names only.
+The short names are not described in this manual page;
 see the
-.I "Sendmail Installation and Operation Guide"
+.%T "Sendmail Installation and Operation Guide"
 for details.
-.TP
-.BI \-p protocol
-Set the name of the protocol used to receive the message.  
-This can be a simple protocol name such as ``UUCP'' 
+.It Fl p Ns Ar protocol
+Set the name of the protocol used to receive the message.
+This can be a simple protocol name such as ``UUCP''
 or a protocol and hostname, such as ``UUCP:ucbvax''.
-.TP
-\fB\-q\fR[\fItime\fR] 
-Processed saved messages in the queue at given intervals.  
+.It Fl q Ns Bq Ar time
+Processed saved messages in the queue at given intervals.
 If
-.I time
+.Ar time
 is omitted, process the queue once.
-.I Time
-is given as a tagged number, 
-with 
-`s' 
-being seconds, 
-`m' 
-being minutes, 
-`h' 
-being hours, 
-`d' 
-being days, 
-and 
-`w' 
+.Xr Time
+is given as a tagged number,
+with
+.Ql s
+being seconds,
+.Ql m
+being minutes,
+.Ql h
+being hours,
+.Ql d
+being days,
+and
+.Ql w
 being weeks.
-For example, 
-`\-q1h30m' 
-or 
-`\-q90m' 
+For example,
+.Ql \-q1h30m
+or
+.Ql \-q90m
 would both set the timeout to one hour thirty minutes.
 If
-.I time
+.Ar time
 is specified,
-.B sendmail
-will run in the background.  
+.Nm sendmail
+will run in background.
 This option can be used safely with
-.BR \-bd .
-.TP
-.BI \-qI substr
+.Fl bd .
+.It Fl qI Ns Ar substr
 Limit processed jobs to those containing
-.I substr
+.Ar substr
 as a substring of the queue id.
-.TP
-.BI \-qR substr
+.It Fl qR Ns Ar substr
 Limit processed jobs to those containing
-.I substr
+.Ar substr
 as a substring of one of the recipients.
-.TP
-.BI \-qS substr
+.It Fl qS Ns Ar substr
 Limit processed jobs to those containing
-.I substr
+.Ar substr
 as a substring of the sender.
-.TP
-.BI "\-R " return
-Set the amount of the message to be returned 
+.It Fl R Ar return
+Set the amount of the message to be returned
 if the message bounces.
 The
-.I return
-parameter can be 
-`full' 
-to return the entire message or 
-`hdrs' 
-to return only the headers.  
+.Ar return
+parameter can be
+.Ql full
+to return the entire message or
+.Ql hdrs
+to return only the headers.
 In the latter case also local bounces return only the headers.
-.TP
-.BI \-r name
+.It Fl r Ns Ar name
 An alternate and obsolete form of the
-.B \-f
+.Fl f
 flag.
-.TP
-.B \-t
-Read message for recipients.  
-To:, Cc:, and Bcc: lines will be scanned for recipient addresses.  
+.It Fl t
+Read message for recipients.
+To:, Cc:, and Bcc: lines will be scanned for recipient addresses.
 The Bcc: line will be deleted before transmission.
-.TP
-.B \-U
+.It Fl U
 Initial (user) submission.  This should
-.I always
+.Em always
 be set when called from a user agent such as
-.B Mail
+.Nm Mail
 or
-.B exmh
+.Nm exmh
 and
-.I never
+.Em never
 be set when called by a network delivery agent such as
-.BR rmail .
-.TP
-.BI "\-V " envid
-Set the original envelope id.  
-This is propagated across SMTP to servers that support DSNs 
+.Nm rmail .
+.It Fl V Ar envid
+Set the original envelope id.
+This is propagated across SMTP to servers that support DSNs
 and is returned in DSN-compliant error messages.
-.TP
-.B \-v
-Go into verbose mode.  
+.It Fl v
+Go into verbose mode.
 Alias expansions will be announced, etc.
-.TP
-.BI "\-X " logfile
+.It Fl X Ar logfile
 Log all traffic in and out of mailers in the indicated log file.
-This should only be used as a last resort 
-for debugging mailer bugs.  
+This should only be used as a last resort
+for debugging mailer bugs.
 It will log a lot of data very quickly.
-.TP
-.B \-\-
-Stop processing command flags and use the rest of the arguments as
-addresses.
-.SS Options
+.It Fl -
+Stop processing command flags and use the rest of the arguments
+as addresses.
+.El
+.Ss Options
 There are also a number of processing options that may be set.
-Normally these will only be used by a system administrator.  
-Options may be set either on the command line 
+Normally these will only be used by a system administrator.
+Options may be set either on the command line
 using the
-.B \-o
-flag (for short names), the
-.B \-O
-flag (for long names), 
-or in the configuration file.  
+.Fl o
+flag (for short names),
+the
+.Fl O
+flag (for long names),
+or in the configuration file.
 This is a partial list limited to those options that are likely to be useful
-on the command line 
-and only shows the long names; 
+on the command line
+and only shows the long names;
 for a complete list (and details), consult the
-.IR "Sendmail Installation and Operation Guide" .
+.%T "Sendmail Installation and Operation Guide" .
 The options are:
-.TP
-.RI AliasFile= file
+.Bl -tag -width Fl
+.It Li AliasFile= Ns Ar file
 Use alternate alias file.
-.TP
-HoldExpensive 
-On mailers that are considered ``expensive'' to connect to, 
-don't initiate immediate connection.  
+.It Li HoldExpensive
+On mailers that are considered ``expensive'' to connect to,
+don't initiate immediate connection.
 This requires queueing.
-.TP
-.RI CheckpointInterval= N
+.It Li CheckpointInterval= Ns Ar N
 Checkpoint the queue file after every
-.I N
-successful deliveries (default 10).  
-This avoids excessive duplicate deliveries 
-when sending to long mailing lists 
+.Ar N
+successful deliveries (default 10).
+This avoids excessive duplicate deliveries
+when sending to long mailing lists
 interrupted by system crashes.
 .ne 1i
-.TP
-.RI DeliveryMode= x
+.It Li DeliveryMode= Ns Ar x
 Set the delivery mode to
-.IR x .
-Delivery modes are 
-`i' 
-for interactive (synchronous) delivery, 
-`b'
-for background (asynchronous) delivery, 
-`q' 
+.Ar x .
+Delivery modes are
+.Ql i
+for interactive (synchronous) delivery,
+.Ql b
+for background (asynchronous) delivery,
+.Ql q
 for queue only \- i.e.,
-actual delivery is done the next time the queue is run, and 
-`d'
-for deferred \- the same as 
-`q' 
+actual delivery is done the next time the queue is run, and
+.Ql d
+for deferred \- the same as
+.Ql q
 except that database lookups for maps which have set the \-D option
 (default for the host map) are avoided.
-.TP
-.RI ErrorMode= x
+.It Li ErrorMode= Ns Ar x
 Set error processing to mode
-.IR x .
-Valid modes are 
-`m' 
-to mail back the error message, 
-`w' 
+.Ar x .
+Valid modes are
+.Ql m
+to mail back the error message,
+.Ql w
 to ``write''
-back the error message 
-(or mail it back if the sender is not logged in), 
-`p' 
-to print the errors on the terminal 
-(default), 
-`q' 
-to throw away error messages 
-(only exit status is returned), 
-and 
-`e'
-to do special processing for the BerkNet.  
-If the text of the message is not mailed back 
-by 
+back the error message
+(or mail it back if the sender is not logged in),
+.Ql p
+to print the errors on the terminal
+(default),
+.Ql q
+to throw away error messages
+(only exit status is returned),
+and
+.Ql e
+to do special processing for the BerkNet.
+If the text of the message is not mailed back
+by
 modes
-`m'
+.Ql m
 or
-`w'
-and if the sender is local to this machine, 
+.Ql w
+and if the sender is local to this machine,
 a copy of the message is appended to the file
-.I dead.letter
+.Pa dead.letter
 in the sender's home directory.
-.TP
-SaveFromLine
+.It Li SaveFromLine
 Save
-UNIX-style
+.Tn UNIX Ns \-style
 From lines at the front of messages.
-.TP
-.RI MaxHopCount= N
-The maximum number of times a message is allowed to ``hop'' 
+.It Li MaxHopCount= Ar N
+The maximum number of times a message is allowed to ``hop''
 before we decide it is in a loop.
-.TP
-IgnoreDots
-Do not take dots on a line by themselves 
+.It Li IgnoreDots
+Do not take dots on a line by themselves
 as a message terminator.
-.TP
-SendMimeErrors
-Send error messages in MIME format.  
-If not set, the DSN (Delivery Status Notification) SMTP extension 
+.It Li SendMimeErrors
+Send error messages in MIME format.
+If not set, the DSN (Delivery Status Notification) SMTP extension
 is disabled.
-.TP
-.RI ConnectionCacheTimeout= timeout
+.It Li ConnectionCacheTimeout= Ns Ar timeout
 Set connection cache timeout.
-.TP
-.RI ConnectionCacheSize= N
+.It Li ConnectionCacheSize= Ns Ar N
 Set connection cache size.
-.TP
-.RI LogLevel= n
+.It Li LogLevel= Ns Ar n
 The log level.
-.TP
-.RI MeToo= False
+.It Li MeToo= Ns Ar False
 Don't send to ``me'' (the sender) if I am in an alias expansion.
-.TP
-CheckAliases
+.It Li CheckAliases
 Validate the right hand side of aliases during a
-newaliases(1)
+.Xr newaliases 1
 command.
-.TP
-OldStyleHeaders
-If set, this message may have 
-old style headers.  
-If not set, 
-this message is guaranteed to have new style headers 
-(i.e., commas instead of spaces between addresses).  
-If set, an adaptive algorithm is used that will correctly 
+.It Li OldStyleHeaders
+If set, this message may have
+old style headers.
+If not set,
+this message is guaranteed to have new style headers
+(i.e., commas instead of spaces between addresses).
+If set, an adaptive algorithm is used that will correctly
 determine the header format in most cases.
-.TP
-.RI QueueDirectory= queuedir
+.It Li QueueDirectory= Ns Ar queuedir
 Select the directory in which to queue messages.
-.TP
-.RI StatusFile= file
+.It Li StatusFile= Ns Ar file
 Save statistics in the named file.
-.TP
-.RI Timeout.queuereturn= time
-Set the timeout on undelivered messages in the queue to the specified time.  
-After delivery has failed 
-(e.g., because of a host being down) 
-for this amount of time, 
-failed messages will be returned to the sender.  
+.It Li Timeout.queuereturn= Ns Ar time
+Set the timeout on undelivered messages in the queue to the specified time.
+After delivery has failed
+(e.g., because of a host being down)
+for this amount of time,
+failed messages will be returned to the sender.
 The default is five days.
-.TP
-.RI UserDatabaseSpec= userdatabase
+.It Li UserDatabaseSpec= Ns Ar userdatabase
 If set, a user database is consulted to get forwarding information.
-You can consider this an adjunct to the aliasing mechanism, 
-except that the database is intended to be distributed; 
-aliases are local to a particular host.  
+You can consider this an adjunct to the aliasing mechanism,
+except that the database is intended to be distributed;
+aliases are local to a particular host.
 This may not be available if your sendmail does not have the
-USERDB
+.Dv USERDB
 option compiled in.
-.TP
-ForkEachJob
-Fork each job during queue runs.  
+.It Li ForkEachJob
+Fork each job during queue runs.
 May be convenient on memory-poor machines.
-.TP
-SevenBitInput
+.It Li SevenBitInput
 Strip incoming messages to seven bits.
-.TP
-.RI EightBitMode= mode
+.It Li EightBitMode= Ns Ar mode
 Set the handling of eight bit input to seven bit destinations to
-.IR mode :
-m
+.Ar mode :
+.Li m
 (mimefy) will convert to seven-bit MIME format,
-p
-(pass) will pass it as eight bits (but violates protocols), 
+.Li p
+(pass) will pass it as eight bits (but violates protocols),
 and
-s
+.Li s
 (strict) will bounce the message.
-.TP
-.RI MinQueueAge= timeout
+.It Li MinQueueAge= Ns Ar timeout
 Sets how long a job must ferment in the queue between attempts to send it.
-.TP
-.RI DefaultCharSet= charset
-Sets the default character set used to label 8-bit data 
+.It Li DefaultCharSet= Ns Ar charset
+Sets the default character set used to label 8-bit data
 that is not otherwise labelled.
-.TP
-.RI DialDelay= sleeptime
-If opening a connection fails, 
+.It Li DialDelay= Ns Ar sleeptime
+If opening a connection fails,
 sleep for
-.I sleeptime
-seconds and try again.  
+.Ar sleeptime
+seconds and try again.
 Useful on dial-on-demand sites.
-.TP
-.RI NoRecipientAction= action
-Set the behaviour when there are no recipient headers (To:, Cc: or
-Bcc:) in the message to
-.IR action :
-none
+.It Li NoRecipientAction= Ns Ar action
+Set the behaviour when there are no recipient headers (To:, Cc: or Bcc:)
+in the message to
+.Ar action :
+.Li none
 leaves the message unchanged,
-add-to
+.Li add-to
 adds a To: header with the envelope recipients,
-add-apparently-to
+.Li add-apparently-to
 adds an Apparently-To: header with the envelope recipients,
-add-bcc
+.Li add-bcc
 adds an empty Bcc: header, and
-add-to-undisclosed
+.Li add-to-undisclosed
 adds a header reading
-`To: undisclosed-recipients:;'.
-.TP
-.RI MaxDaemonChildren= N
+.Ql "To: undisclosed-recipients:;" .
+.It Li MaxDaemonChildren= Ns Ar N
 Sets the maximum number of children that an incoming SMTP daemon
 will allow to spawn at any time to
-.IR N .
-.TP
-.RI ConnectionRateThrottle= N
+.Ar N .
+.It Li ConnectionRateThrottle= Ns Ar N
 Sets the maximum number of connections per second to the SMTP port to
-.IR N .
-.PP
-In aliases, 
-the first character of a name may be 
-a vertical bar to cause interpretation of 
-the rest of the name as a command 
-to pipe the mail to.  
-It may be necessary to quote the name 
+.Ar N .
+.El
+.Pp
+In aliases,
+the first character of a name may be
+a vertical bar to cause interpretation of
+the rest of the name as a command
+to pipe the mail to.
+It may be necessary to quote the name
 to keep
-.B sendmail
-from suppressing the blanks from between arguments. 
+.Nm sendmail
+from suppressing the blanks from between arguments.
 For example, a common alias is:
-.IP
+.Pp
+.Bd -literal -offset indent -compact
 msgs: "|/usr/bin/msgs -s"
-.PP
+.Ed
+.Pp
 Aliases may also have the syntax
-.RI ``:include: filename ''
+.Dq :include: Ns Ar filename
 to ask
-.B sendmail
-to read the named file for a list of recipients.  
+.Xr sendmail
+to read the named file for a list of recipients.
 For example, an alias such as:
-.IP
+.Pp
+.Bd -literal -offset indent -compact
 poets: ":include:/usr/local/lib/poets.list"
-.PP
+.Ed
+.Pp
 would read
-.I /usr/local/lib/poets.list
+.Pa /usr/local/lib/poets.list
 for the list of addresses making up the group.
-.PP
-.B Sendmail
-returns an exit status 
-describing what it did.  
+.Pp
+.Nm Sendmail
+returns an exit status
+describing what it did.
 The codes are defined in
-.RI < sysexits.h >:
-.TP
-EX_OK
+.Aq Pa sysexits.h :
+.Bl -tag -width EX_UNAVAILABLE -compact -offset indent
+.It Dv EX_OK
 Successful completion on all addresses.
-.TP
-EX_NOUSER
+.It Dv EX_NOUSER
 User name not recognized.
-.TP
-EX_UNAVAILABLE
-Catchall meaning necessary resources 
+.It Dv EX_UNAVAILABLE
+Catchall meaning necessary resources
 were not available.
-.TP
-EX_SYNTAX
+.It Dv EX_SYNTAX
 Syntax error in address.
-.TP
-EX_SOFTWARE
-Internal software error, 
+.It Dv EX_SOFTWARE
+Internal software error,
 including bad arguments.
-.TP
-EX_OSERR
-Temporary operating system error, 
+.It Dv EX_OSERR
+Temporary operating system error,
 such as
-``cannot fork''.
-.TP
-EX_NOHOST
+.Dq cannot fork .
+.It Dv EX_NOHOST
 Host name not recognized.
-.TP
-EX_TEMPFAIL
-Message could not be sent immediately, 
+.It Dv EX_TEMPFAIL
+Message could not be sent immediately,
 but was queued.
-.PP
+.El
+.Pp
 If invoked as
-.BR newaliases ,
-.B sendmail
+.Nm newaliases ,
+.Nm sendmail
 will rebuild the alias database.  If invoked as
-.BR mailq ,
-.B sendmail
+.Nm mailq ,
+.Nm sendmail
 will print the contents of the mail queue.
 If invoked as
-.BR hoststat ,
-.B sendmail
+.Nm hoststat ,
+.Nm sendmail
 will print the persistent host status database.
 If invoked as
-.BR purgestat ,
-.B sendmail
+.Nm purgestat ,
+.Nm sendmail
 will purge expired entries from the persistent host status database.
 If invoked as
-.BR smtpd ,
-.B sendmail
+.Nm smtpd ,
+.Nm sendmail
 will act as a daemon, as if the
-.B \-bd
+.Fl bd
 option were specified.
-.SH NOTES
-.B sendmail
+.Sh NOTES
+.Nm sendmail
 often gets blamed for many problems
 that are actually the result of other problems,
 such as overly permissive modes on directories.
 For this reason,
-.B sendmail
+.Nm sendmail
 checks the modes on system directories and files
 to determine if they can be trusted.
 Although these checks can be turned off
 and your system security reduced by setting the
-.BR DontBlameSendmail
+.Li DontBlameSendmail
 option,
 the permission problems should be fixed.
 For more information, see:
 
-.I http://www.sendmail.org/tips/DontBlameSendmail.html
-.SH FILES
+.%T http://www.sendmail.org/tips/DontBlameSendmail.html
+.Sh FILES
 Except for the file
-.I /etc/mail/sendmail.cf
+.Pa /etc/mail/sendmail.cf
 itself the following pathnames are all specified in
-.IR /etc/mail/sendmail.cf .
-Thus, 
+.Pa /etc/sendmail.cf.
+Thus,
 these values are only approximations.
-.PP
-.TP
- /etc/mail/aliases
+.Pp
+.Bl -tag -width /etc/mail/sendmail.cf -compact
+.It Pa /etc/mail/aliases
 raw data for alias names
-.TP
- /etc/mail/aliases.db
+.It Pa /etc/mail/aliases.db
 data base of alias names
-.TP
- /etc/mail/sendmail.cf
+.It Pa /etc/mail/sendmail.cf
 configuration file
-.TP
- /etc/mail/helpfile
+.It Pa /etc/mail/sendmail.hf
 help file
-.TP
- /etc/mail/statistics
+.It Pa /var/log/sendmail.st
 collected statistics
-.TP
- /var/spool/mqueue/*
+.It Pa /var/spool/mqueue/*
 temp files
-.SH SEE ALSO
-binmail(1),
-mail(1),
-rmail(1),
-syslog(3),
-aliases(5),
-mailaddr(7),
-rc(8)
-.PP
-DARPA 
+.El
+.Sh SEE ALSO
+.Xr mail 1 ,
+.Xr mailq 1 ,
+.Xr newaliases 1 ,
+.Xr syslog 3 ,
+.Xr aliases 5 ,
+.Xr mailer.conf 5 ,
+.Xr mailaddr 7 ,
+.Xr mail.local 8 ,
+.Xr rc 8 ,
+.Xr rmail 8
+.Pp
+DARPA
 Internet Request For Comments
-.IR RFC819 ,
-.IR RFC821 ,
-.IR RFC822 .
-.IR "Sendmail \- An Internetwork Mail Router" ,
-No. 9, SMM.
-.IR "Sendmail Installation and Operation Guide" ,
-No. 8, SMM.
-.PP
+.%T RFC819 ,
+.%T RFC821 ,
+.%T RFC822 .
+.Rs
+.%T "Sendmail \- An Internetwork Mail Router"
+.%V SMM
+.%N \&No. 9
+.Re
+.Rs
+.%T "Sendmail Installation and Operation Guide"
+.%V SMM
+.%N \&No. 8
+.Re
+.Pp
 http://www.sendmail.org/
-.SH HISTORY
+.Sh HISTORY
 The
-.B sendmail
+.Nm
 command appeared in
-4.2BSD.
+.Bx 4.2 .