remove trailing whitespace, some Nm cleanup

112 files changed, 873 insertions, 846 deletions

diff --git a/usr.sbin/ac/ac.8 b/usr.sbin/ac/ac.8
index 8bce5241a2d..938e6a486d6 100644
--- a/usr.sbin/ac/ac.8
+++ b/usr.sbin/ac/ac.8
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: ac.8,v 1.3 1998/11/08 00:21:25 aaron Exp $
+.\"	$Id: ac.8,v 1.4 1999/06/05 22:16:18 aaron Exp $
 .\"
 .Dd March 15, 1994
 .Dt AC 8
@@ -37,14 +37,14 @@
 .Nm ac
 .Nd connect time accounting
 .Sh SYNOPSIS
-.Nm ac
+.Nm
 .Op Fl dp
 .\".Op Fl c Ar console
 .Op Fl t Ar tty
 .Op Fl w Ar wtmp
 .Op Ar users ...
 .Sh DESCRIPTION
-If the file 
+If the file
 .Pa /var/log/wtmp
 exists, a record of individual login and logout
 times are written to it by
@@ -52,7 +52,7 @@ times are written to it by
 and
 .Xr init 8 ,
 respectively.
-.Nm ac
+.Nm
 examines these records and writes the accumulated connect time
 for all logins to the standard output.
 .Pp
@@ -61,7 +61,7 @@ The options are as follows:
 .It Fl d
 Display the connect times in 24 hour chunks.
 .\" .It Fl c Ar console
-.\" Use 
+.\" Use
 .\" .Ar console
 .\" as the name of the device that local X sessions (ut_host of ":0.0")
 .\" originate from.  If any login has been recorded on
@@ -73,9 +73,13 @@ Print individual users' totals.
 .It Fl t Ar tty
 Only do accounting logins on certain ttys.  The
 .Ar tty
-specification can start with '!' to indicate not this
+specification can start with
+.Ql \&!
+to indicate not this
 .Ar tty
-and end with '*' to indicate all similarly named ttys.
+and end with
+.Ql *
+to indicate all similarly named ttys.
 Multiple
 .Fl t
 flags may be specified.
@@ -89,7 +93,7 @@ Display totals for the given individuals only.
 .El
 .Pp
 If no arguments are given,
-.Nm ac
+.Nm
 displays the total connect time for all
 accounts with login sessions recorded in
 .Pa wtmp .
@@ -119,7 +123,7 @@ to be charged out at a different rate than
 .Pa other .
 .Pp
 The
-.Nm ac
+.Nm
 utility exits 0 on success or >0 if a fatal error occurred.
 .Sh FILES
 .Bl -tag -width /var/log/wtmp.[0-7] -compact
@@ -135,11 +139,11 @@ rotated files
 .Xr sa 8
 .Sh HISTORY
 An
-.Nm ac
+.Nm
 command appeard in
 .At v6 .
 This version of
-.Nm ac
+.Nm
 was written for
 .Nx 0.9a
 from the specification provided by various systems' manual pages.
@@ -148,10 +152,10 @@ from the specification provided by various systems' manual pages.
 .\" .Nm ac
 .\" ignores the fact that entries with ut_host of ":0.0" are not real
 .\" login sessions.  Normally such entries are ignored except in the case
-.\" of a user being logged in when the 
+.\" of a user being logged in when the
 .\" .Pa wtmp
 .\" file was rotated, in which case a login with ut_host of ":0.0" may
-.\" appear without any preceeding console logins.  
+.\" appear without any preceeding console logins.
 .\" If no one is logged in on the console, the user is deemed to have
 .\" logged in on at the earliest time stamp found in
 .\" .Pa wtmp .
diff --git a/usr.sbin/accton/accton.8 b/usr.sbin/accton/accton.8
index bb7f0af4369..a5ba5cf5ca5 100644
--- a/usr.sbin/accton/accton.8
+++ b/usr.sbin/accton/accton.8
@@ -24,7 +24,7 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: accton.8,v 1.2 1999/05/23 14:11:31 aaron Exp $
+.\"	$Id: accton.8,v 1.3 1999/06/05 22:16:24 aaron Exp $
 .\"
 .Dd October 18, 1993
 .Dt ACCTON 8
@@ -38,7 +38,7 @@
 .Sh DESCRIPTION
 With an argument naming an existing
 .Ar file ,
-.Nm accton
+.Nm
 causes system accounting information for every process executed
 to be placed at the end of the file.  If no argument is given,
 accounting is turned off.
@@ -47,5 +47,5 @@ accounting is turned off.
 .Xr acct 5
 .Sh HISTORY
 The
-.Nm accton
+.Nm
 command has existed nearly forever, but this man page is new.
diff --git a/usr.sbin/adduser/adduser.8 b/usr.sbin/adduser/adduser.8
index 7878d4115f5..043822982ff 100644
--- a/usr.sbin/adduser/adduser.8
+++ b/usr.sbin/adduser/adduser.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: adduser.8,v 1.8 1999/05/28 23:00:04 aaron Exp $
+.\"	$OpenBSD: adduser.8,v 1.9 1999/06/05 22:16:26 aaron Exp $
 .\"
 .\" Copyright (c) 1995-1996 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
 .\" All rights reserved.
@@ -50,9 +50,9 @@
 .Op Fl v | verbose
 .Op Fl unencrypted
 .Sh DESCRIPTION
-.Nm adduser 
+.Nm
 is a simple program for adding new users.
-.Nm adduser
+.Nm
 first performs consistency
 checks on the passwd, group, and shell databases. It creates passwd/group
 entries, a HOME directory, dotfiles for a new user, and sends him or her a
@@ -61,10 +61,10 @@ welcome message at the discretion of the person creating the account.
 .Bl -tag -width Ds
 .It Sy username
 Login names should contain only lowercase characters or digits. They should be
-no longer than 8 characters (see 
+no longer than 8 characters (see
 .Xr setlogin 2
-BUGS section). 
-.\" The reasons for this limit are "Historical". 
+BUGS section).
+.\" The reasons for this limit are "Historical".
 .\" Given that people have traditionally wanted to break this
 .\" limit for aesthetic reasons, it's never been of great importance to break
 .\" such a basic fundamental parameter in UNIX.
@@ -76,11 +76,11 @@ If you need a longer login name for e-mail addresses,
 you can define an alias in
 .Pa /etc/aliases .
 .It Sy fullname
-This should contain the user's firstname and surname.  The 
+This should contain the user's firstname and surname.  The
 .Dq \&:
 is not permitted.
 .It Sy shell
-Only valid entries from the 
+Only valid entries from the
 .Xr shells 5
 database or entries corresponding to
 .Xr sliplogin 8
@@ -97,9 +97,9 @@ searched for.  This value must be more than the value of uid_start.
 The default value is 32000 or as configured in the configuration file.
 .It Sy gid/login group
 This value is generated automatically, but can be specified at the
-discretion of the person invoking the program. 
+discretion of the person invoking the program.
 .It Sy password
-If not empty, the password is encrypted according to 
+If not empty, the password is encrypted according to
 .Xr passwd.conf 5 .
 If empty, the account will be automatically disabled to prevent spurious
 access to it.
@@ -109,19 +109,19 @@ access to it.
 .\" with most other schemes.  With each user in his/her own group the user can
 .\" safely run with a umask of 002 and have files created in their home directory
 .\" and not worry about others being able to read them.
-.\" 
+.\"
 .\" For a shared area you create a separate uid/gid (like cvs or ncvs on freefall),
 .\" you place each person that should be able to access this area into that new
 .\" group.
-.\" 
+.\"
 .\" This model of uid/gid administration allows far greater flexibility than lumping
 .\" users into groups and having to muck with the umask when working in a shared
 .\" area.
-.\" 
+.\"
 .\" I have been using this model for almost 10 years and found that it works
 .\" for most situations, and has never gotten in the way.  (Rod Grimes)
 .Sh CONFIGURATION
-.Nm adduser
+.Nm
 follows these steps to extract its configuration
 information:
 .Pp
@@ -148,16 +148,16 @@ By default the password is assumed to already be properly encrypted.
 Check the passwd, group, and shells databases for consistency and problems
 then exit without performing any other operation.
 .It Sy -create_config
-Create or edit default configuration information and message file before 
+Create or edit default configuration information and message file before
 proceeding with the normal interactive adduser procedure.
 .It Sy -dotdir Ar directory
-Copy files from 
-.Ar directory 
+Copy files from
+.Ar directory
 into the HOME directory of new users.  Files named in the fashion of
 .Dq Pa dot.foo
-will be renamed to 
+will be renamed to
 .Dq Pa .foo .
-By default, all files are made writable and readable by 
+By default, all files are made writable and readable by
 their owner.
 .\" don't allow group or world to write files and allow only owner
 .\" to read/execute/write .rhost, .Xauthority, .kermrc, .netrc, Mail,
@@ -165,10 +165,10 @@ their owner.
 .It Sy -encrypt,-e Ar method
 Encrypt local passwords using
 .Ar method
-of encryption as described in 
+of encryption as described in
 .Xr passwd.conf 5 .
 .It Sy -group Ar login_group
-Specify the default login group.  A value of 
+Specify the default login group.  A value of
 .Ar USER
 means that the username is to be used as the login group.
 .It Sy -help,-h,-?
@@ -186,12 +186,12 @@ for
 causes no message to be sent to new users.
 .It Sy -noconfig
 Do not read the default configuration file.
-.It Sy -shell Ar shell 
+.It Sy -shell Ar shell
 Specify the default shell for new users.
 .It Sy -silent,-s,-quiet,-q
-Causes the program to print fewer warnings, questions, and bug reports. 
+Causes the program to print fewer warnings, questions, and bug reports.
 .It Sy -uid Ar uid
-Use UIDs from 
+Use UIDs from
 .Ar uid
 up when automatically generating UIDs.
 .It Sy -unencrypted
@@ -207,11 +207,11 @@ This option is recommended for novice users.
 .\" .Sh FORMAT
 .\" .Bl -tag -width Ds -compact
 .\" .Ql Pa #
-.\" is a comment.  
+.\" is a comment.
 .\" .P
 .\" .It Sy config file
 .\" .Nm adduser
-.\" reads and writes this file. 
+.\" reads and writes this file.
 .\" See /etc/adduser.conf for more details.
 .\" .It Sy message file
 .\" Eval variables in this file. See /etc/adduser.message for more
@@ -221,7 +221,7 @@ This option is recommended for novice users.
 $ adduser
 .Pp
 Start
-.Nm adduser
+.Nm
 in interactive mode.
 .Pp
 $ adduser -unencrypted -batch falken guest,staff,beer 'Prof. Falken' joshua
@@ -231,14 +231,14 @@ Create user
 and
 login group
 .Dq falken .
-Invite user 
+Invite user
 .Dq falken
 into groups
 .Dq guest ,
 .Dq staff ,
 and
 .Dq beer .
-Realname (fullname) 
+Realname (fullname)
 is
 .Dq Prof. Falken .
 Password is
@@ -246,12 +246,12 @@ Password is
 (don't use such a password!).
 Create the HOME directory
 .Pa /home/falken
-and copy all files and directories 
+and copy all files and directories
 from
 .Pa /usr/share/skel
 to
 .Pa /home/falken .
-Send user falken 
+Send user falken
 a welcome message.
 .Pp
 $ adduser -uid_start 5000 -group guest -message no -batch vehlefanz
diff --git a/usr.sbin/adduser/adduser_proc.8 b/usr.sbin/adduser/adduser_proc.8
index 188688fc453..1d0465a5d25 100644
--- a/usr.sbin/adduser/adduser_proc.8
+++ b/usr.sbin/adduser/adduser_proc.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: adduser_proc.8,v 1.3 1999/05/23 14:11:31 aaron Exp $
+.\"	$OpenBSD: adduser_proc.8,v 1.4 1999/06/05 22:16:25 aaron Exp $
 .\"	$NetBSD: adduser.8,v 1.4 1994/11/30 19:36:21 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -46,11 +46,11 @@ A new user must choose a login name, which must not already appear in
 or
 .Pa /etc/aliases .
 It must also not begin with the hyphen
-.Ql Fl
+.Pq Ql -
 character.
 It is strongly recommended that it be all lower-case, and not contain
 the dot
-.Ql \&.
+.Pq Ql \&.
 character, as that tends to confuse mailers.
 An account can be added by editing a line into the passwd file; this
 must be done with the password file locked, e.g. by using
diff --git a/usr.sbin/adduser/rmuser.8 b/usr.sbin/adduser/rmuser.8
index ae397f1bb7a..541c256ab65 100644
--- a/usr.sbin/adduser/rmuser.8
+++ b/usr.sbin/adduser/rmuser.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rmuser.8,v 1.4 1999/05/28 23:00:05 aaron Exp $
+.\"	$OpenBSD: rmuser.8,v 1.5 1999/06/05 22:16:26 aaron Exp $
 .\"
 .\" Copyright 1995, 1996
 .\"     Guy Helmer, Madison, South Dakota 57042.  All rights reserved.
@@ -38,11 +38,11 @@
 .Nm rmuser
 .Op Ar username
 .Sh DESCRIPTION
-The utility
-.Nm rmuser
-removes a user's 
+The
+.Nm
+utility removes a user's
 .Xr crontab 1
-entry (if any) and any 
+entry (if any) and any
 .Xr at 1
 jobs belonging to the user,
 then removes a user from the system's local password file, removes
@@ -55,17 +55,17 @@ the group is removed (this complements
 .Xr adduser 8 Ns 's
 per-user unique groups).
 .Pp
-.Nm rmuser
+.Nm
 politely refuses to remove users whose uid is 0 (typically root), since
 it seemed like a good idea at the time
-.Nm rmuser
+.Nm
 was written.
 .Pp
-.Nm rmuser
+.Nm
 shows the selected user's password file entry and asks for confirmation
 that you wish to remove the user.  If the user's home directory is owned
 by the user (and not by any other user),
-.Nm rmuser
+.Nm
 asks whether you wish to remove the user's home directory and everything
 below.
 .Pp
@@ -74,7 +74,7 @@ Available options:
 .Bl -tag -width username
 .It Ar \&username
 Identifies the user to be removed; if not present,
-.Nm rmuser
+.Nm
 interactively asks for the user to be removed.
 .El
 .Sh FILES
@@ -101,6 +101,5 @@ interactively asks for the user to be removed.
 The
 .Nm
 command appeared in FreeBSD 2.1.5.
-
 .\" .Sh AUTHOR
 .\" Guy Helmer, Madison, South Dakota
diff --git a/usr.sbin/afs/afsd/afsd.8 b/usr.sbin/afs/afsd/afsd.8
index f113eb46b8e..e7f460caefe 100644
--- a/usr.sbin/afs/afsd/afsd.8
+++ b/usr.sbin/afs/afsd/afsd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: afsd.8,v 1.4 1998/12/15 01:20:49 aaron Exp $
+.\"	$OpenBSD: afsd.8,v 1.5 1999/06/05 22:18:37 aaron Exp $
 .\"
 .Dd September  5, 1998
 .Dt AFSD 8
@@ -35,7 +35,7 @@
 .Op Fl -help
 .Op Ar device
 .Sh DESCRIPTION
-.Nm afsd
+.Nm
 runs on AFS client machines. It is used to manage the file cache, fetch files
 from AFS servers, handle callbacks and manage the authentication information
 for users. In normal cases you will not need to run it by yourself. It is
@@ -113,7 +113,7 @@ Cache directory
 .Pc .
 .It Xo
 .Fl -version
-.Xc 
+.Xc
 Print version information.
 .It Xo
 .Fl -help
@@ -139,7 +139,7 @@ drastically improve performance.
 .Xr mount_afs 8
 .Sh BUGS
 This code is still in the experimental stage and some bugs are present. If
-.Nm afsd
+.Nm
 happens to crash, it's recommended to restart it with the
 .Fl z
 flag. Otherwise a corrupted cache can be reused.
diff --git a/usr.sbin/apm/apm.8 b/usr.sbin/apm/apm.8
index d1865f8d5b8..934c41efbe4 100644
--- a/usr.sbin/apm/apm.8
+++ b/usr.sbin/apm/apm.8
@@ -24,7 +24,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: apm.8,v 1.7 1999/05/23 14:11:31 aaron Exp $
+.\"	$Id: apm.8,v 1.8 1999/06/05 22:16:27 aaron Exp $
 .\"
 .Dd March 18, 1996
 .Dt APM 8
@@ -78,7 +78,7 @@ means connected, 2 means backup power source, and 255 means unknown.
 .It Fl v
 Request more verbose description of the displayed states.
 .It Fl f Ar sockname
-Set the name of the socket via which to contact 
+Set the name of the socket via which to contact
 .Xr apmd 8
 to
 .Pa sockname .
@@ -91,7 +91,7 @@ With no arguments,
 .Nm zzz
 places the system into suspend mode.
 The command line flags serve the same purpose as for the
-.Nm apm
+.Nm
 variant of this command.
 .Pp
 This command does not wait for positive confirmation that the requested
@@ -100,7 +100,7 @@ until the system resumes from its sleep state.
 .Sh FILES
 .Bl -tag -width /var/run/apmdev -compact
 .It Pa /var/run/apmdev
-default Unix domain socket used for communication with
+default Unix domain socket for communicating with
 .Xr apm 8
 .El
 .Pp
@@ -117,6 +117,6 @@ Advanced Power Management (APM) BIOS Interface Specification (revision
 1.1), Intel Corporation and Microsoft Corporation
 .Sh HISTORY
 The
-.Nm apm
+.Nm
 command appeared in
 .Ox 1.2 .
diff --git a/usr.sbin/apmd/apmd.8 b/usr.sbin/apmd/apmd.8
index f2e6a28b8d2..7064cbe5007 100644
--- a/usr.sbin/apmd/apmd.8
+++ b/usr.sbin/apmd/apmd.8
@@ -24,7 +24,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: apmd.8,v 1.9 1999/05/23 14:11:32 aaron Exp $
+.\"	$Id: apmd.8,v 1.10 1999/06/05 22:16:28 aaron Exp $
 .\"
 .Dd March 24, 1996
 .Dt APMD 8
@@ -42,7 +42,7 @@
 .Nm
 monitors the advanced power management (APM) pseudo-device, acting on
 signaled events and upon user requests as sent by the
-.Xr apm 8 
+.Xr apm 8
 program.
 For suspend and standby request events delivered by the BIOS, or via
 .Xr apm 8 ,
@@ -55,7 +55,7 @@ runs the appropriate configuration program (if one exists).
 For power status change events,
 .Nm
 fetches the current status and reports it via
-.Xr syslog 3 
+.Xr syslog 3
 with logging facility
 .Dv LOG_DAEMON .
 .Pp
@@ -67,7 +67,7 @@ device).
 Suspends are announced with two high tones.
 .Pp
 .Nm
-periodically polls the APM driver for the current power state.  
+periodically polls the APM driver for the current power state.
 If the battery charge level changes substantially or the external power
 status changes, the new status is logged.  The polling rate defaults to
 once per 10 minutes, but may be specified using the
@@ -165,10 +165,10 @@ and
 are the files that contain the host's customized actions.
 Each file must be an executable binary or shell script suitable
 for execution by the
-.Xr execve 2 
+.Xr execve 2
 function.
 If you wish to have the same program or script control all transitions, it
-may determine which transition is in progress by examining its 
+may determine which transition is in progress by examining its
 .Va argv[0]
 which is set to one of
 .Ar suspend ,
diff --git a/usr.sbin/arp/arp.4 b/usr.sbin/arp/arp.4
index 8371f538050..356744e2cca 100644
--- a/usr.sbin/arp/arp.4
+++ b/usr.sbin/arp/arp.4
@@ -48,7 +48,7 @@ It is used by all of the 10Mb/s Ethernet interface drivers.
 It is not specific to Internet protocols or to 10Mb/s Ethernet,
 but this implementation currently supports only that combination.
 .Pp
-ARP caches Internet-Ethernet address mappings. 
+ARP caches Internet-Ethernet address mappings.
 When an interface requests a mapping for an address not in the cache,
 ARP queues the message which requires the mapping and broadcasts
 a message on the associated network requesting the address mapping.
@@ -91,7 +91,7 @@ Manually added entries may be temporary, static or permanent,
 and may be
 .Dq published ,
 in which case the system will respond to ARP requests for that host
-as if it were the target of the request. A static entry will not 
+as if it were the target of the request. A static entry will not
 time out, but may be overwritten by network traffic, while a permanent
 entry will not time out and can not be overwritten.
 .Pp
diff --git a/usr.sbin/arp/arp.8 b/usr.sbin/arp/arp.8
index 777d6f1365c..816be2e472f 100644
--- a/usr.sbin/arp/arp.8
+++ b/usr.sbin/arp/arp.8
@@ -56,7 +56,7 @@
 .Fl f Ar filename
 .Sh DESCRIPTION
 The
-.Nm arp
+.Nm
 program displays and modifies the Internet-to-Ethernet address translation
 tables used by the address resolution protocol
 .Pq Xr arp 4 .
@@ -81,19 +81,19 @@ with the
 flag.
 .It Fl n
 Show network addresses as numbers (normally
-.Nm arp
+.Nm
 attempts to display addresses symbolically).
 .It Fl s Ar hostname ether_addr
 Create an
 .Tn ARP
 entry for the host called
 .Ar hostname
-with the Ethernet address 
+with the Ethernet address
 .Ar ether_addr .
 The Ethernet address is given as six hex bytes separated by
 colons.  The entry will be static, i.e. not time out, unless the word
 .Ar temp
-is given in the command.  A static ARP entry can be overwritten 
+is given in the command.  A static ARP entry can be overwritten
 by network traffic, unless the word
 .Ar permanent
 is given.  If the word
@@ -104,7 +104,7 @@ i.e., this system will
 act as an
 .Tn ARP
 server,
-responding to requests for 
+responding to requests for
 .Ar hostname
 even though the host address is not its own.
 .It Fl f
diff --git a/usr.sbin/bad144/bad144.8 b/usr.sbin/bad144/bad144.8
index 7099a5faefd..8bd49bfd290 100644
--- a/usr.sbin/bad144/bad144.8
+++ b/usr.sbin/bad144/bad144.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)bad144.8	8.1 (Berkeley) 6/6/93
-.\"	$Id: bad144.8,v 1.4 1999/05/23 14:11:32 aaron Exp $
+.\"	$Id: bad144.8,v 1.5 1999/06/05 22:16:31 aaron Exp $
 .\"
 .Dd June 6, 1993
 .Dt BAD144 8
@@ -56,7 +56,7 @@
 .Ar disk
 .Op Ar bad ...
 .Sh DESCRIPTION
-.Nm bad144
+.Nm
 can be used to inspect the information stored on a disk that is used by
 the disk drivers to implement bad sector forwarding.
 .Pp
@@ -139,19 +139,19 @@ Unused slots in the
 array are filled with all bits set, a putatively
 illegal value.
 .Pp
-.Nm bad144
+.Nm
 is invoked by giving a device name (e.g. hk0, hp1, etc.).
 With no optional arguments
 it reads the first sector of the last track
 of the corresponding disk and prints out the bad sector information.
 It issues a warning if the bad sectors are out of order.
-.Nm bad144
+.Nm
 may also be invoked with a serial number for the pack and a list
 of bad sectors.
 It will write the supplied information into all copies
 of the bad-sector file, replacing any previous information.
-Note, however, that 
-.Nm bad144
+Note, however, that
+.Nm
 does not arrange for the specified sectors to be marked bad in this case.
 This procedure should only be used to restore known bad sector information which
 was destroyed.
diff --git a/usr.sbin/bootpd/bootpd.8 b/usr.sbin/bootpd/bootpd.8
index 4a6148fdd1f..3d81c1d75de 100644
--- a/usr.sbin/bootpd/bootpd.8
+++ b/usr.sbin/bootpd/bootpd.8
@@ -1,6 +1,6 @@
 .\" Copyright (c) 1988, 1989, 1991 Carnegie Mellon University
 .\"
-.\"	$Header: /cvs/OpenBSD/src/usr.sbin/bootpd/Attic/bootpd.8,v 1.6 1998/11/14 21:18:20 millert Exp $
+.\"	$Header: /cvs/OpenBSD/src/usr.sbin/bootpd/Attic/bootpd.8,v 1.7 1999/06/05 22:16:32 aaron Exp $
 .\"
 .TH BOOTPD 8 "November 06, 1993" "Carnegie Mellon University"
 .SH NAME
@@ -96,7 +96,7 @@ it does not read a configuration file.
 .PP
 Either program automatically detects whether it was invoked from inetd
 or from a shell and automatically selects the appropriate mode.
-The 
+The
 .B \-s
 or
 .B \-i
diff --git a/usr.sbin/catman/catman.8 b/usr.sbin/catman/catman.8
index c0b2e88aaf3..d928d009a79 100644
--- a/usr.sbin/catman/catman.8
+++ b/usr.sbin/catman/catman.8
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: catman.8,v 1.2 1998/11/08 00:21:27 aaron Exp $
+.\"	$Id: catman.8,v 1.3 1999/06/05 22:16:33 aaron Exp $
 .\"
 .Dd July 30, 1993
 .Dt CATMAN 8
@@ -41,15 +41,15 @@
 .Op Fl M Ar directory
 .Op Ar sections
 .Sh DESCRIPTION
-.Nm catman 
-creates formatted versions of the on-line manual pages from their 
+.Nm
+creates formatted versions of the on-line manual pages from their
 .Xr nroff 1
 source.
-Manual pages whose formatted versions are missing or out of date are 
+Manual pages whose formatted versions are missing or out of date are
 regenerated.
-If manual pages are regenerated, 
-.Nm catman
-also regenerates the 
+If manual pages are regenerated,
+.Nm
+also regenerates the
 .Xr whatis 1
 database.
 .Pp
@@ -65,7 +65,7 @@ manual pages in sections 1, 3, and 8 will be checked and regenerated.
 If no
 .Ar sections
 argument is provided,
-.Nm catman
+.Nm
 will try to operate on all of the known manual sections.
 .Pp
 The options are as follows:
@@ -75,7 +75,7 @@ Ignore errors from
 .Xr nroff
 when building man pages.
 .It Fl n
-Do not create the 
+Do not create the
 .Xr whatis 1
 database.
 .It Fl p
@@ -83,15 +83,15 @@ Display the commands that would have been executed, but do not actually
 execute them.
 .It Fl s
 Perform work silently; do not echo commands as they are executed.  This
-flag is ignored if 
+flag is ignored if
 .Fl p
 is also specified.
 .It Fl w
-Only create the 
+Only create the
 .Xr whatis 1
 database.
 .It Fl M Ar directory
-Update manual pages in 
+Update manual pages in
 .Ar directory .
 .El
 .Sh SEE ALSO
@@ -99,6 +99,6 @@ Update manual pages in
 .Xr man 1 ,
 .Xr whatis 1
 .Sh BUGS
-Currently knows nothing about 
-.Pa /etc/man.conf 
+Currently knows nothing about
+.Pa /etc/man.conf
 and machine specific man pages.
diff --git a/usr.sbin/cron/cron.8 b/usr.sbin/cron/cron.8
index 7c7870f12fa..07847c4e86d 100644
--- a/usr.sbin/cron/cron.8
+++ b/usr.sbin/cron/cron.8
@@ -14,9 +14,9 @@
 .\" * I'll try to keep a version up to date.  I can be reached as follows:
 .\" * Paul Vixie          <paul@vix.com>          uunet!decwrl!vixie!paul
 .\" */
-.\" 
-.\" $Id: cron.8,v 1.3 1999/03/10 02:43:11 pjanzen Exp $
-.\" 
+.\"
+.\" $Id: cron.8,v 1.4 1999/06/05 22:16:34 aaron Exp $
+.\"
 .TH CRON 8 "20 December 1993"
 .UC 4
 .SH NAME
@@ -58,7 +58,7 @@ crontab.
 Special considerations exist when the clock is changed by less than 3
 hours, for example at the beginning and end of Daylight Saving
 Time. If the time has moved forwards, those jobs which would have
-run in the time that was skipped will be run soon after the change. 
+run in the time that was skipped will be run soon after the change.
 Conversely, if the time has moved backwards by less than 3 hours,
 those jobs that fall into the repeated time will not be run.
 .PP
diff --git a/usr.sbin/cron/crontab.5 b/usr.sbin/cron/crontab.5
index 7f57343ed6a..b6a83d10665 100644
--- a/usr.sbin/cron/crontab.5
+++ b/usr.sbin/cron/crontab.5
@@ -15,8 +15,8 @@
 .\" * Paul Vixie          <paul@vix.com>          uunet!decwrl!vixie!paul
 .\" */
 .\"
-.\" $Id: crontab.5,v 1.3 1997/07/17 07:34:44 deraadt Exp $
-.\" 
+.\" $Id: crontab.5,v 1.4 1999/06/05 22:16:35 aaron Exp $
+.\"
 .TH CRONTAB 5 "24 January 1994"
 .UC 4
 .SH NAME
@@ -58,7 +58,7 @@ Several environment variables are set up
 automatically by the
 .IR cron (8)
 daemon.
-SHELL is set to /bin/sh, and LOGNAME and HOME are set from the /etc/passwd 
+SHELL is set to /bin/sh, and LOGNAME and HOME are set from the /etc/passwd
 line of the crontab's owner.
 HOME and SHELL may be overridden by settings in the crontab; LOGNAME may not.
 .PP
diff --git a/usr.sbin/ctm/ctm/ctm.1 b/usr.sbin/ctm/ctm/ctm.1
index 5350db07dd8..a67cd064135 100644
--- a/usr.sbin/ctm/ctm/ctm.1
+++ b/usr.sbin/ctm/ctm/ctm.1
@@ -1,5 +1,5 @@
 .\"----------------------------------------------------------------------------
-.\""THE BEER-WARE LICENSE" (Revision 42): 
+.\""THE BEER-WARE LICENSE" (Revision 42):
 .\"<joerg@freebsd.org> wrote this file.  As long as you retain this notice you
 .\"can do whatever you want with this stuff. If we meet some day, and you think
 .\"this stuff is worth it, you can buy me a beer in return.       Joerg Wunsch
@@ -10,7 +10,7 @@
 .\"
 .\" CTM and ctm(1) by <phk@login.dknet.dk>
 .\"
-.\" $Id: ctm.1,v 1.5 1999/04/02 15:12:18 aaron Exp $
+.\" $Id: ctm.1,v 1.6 1999/06/05 22:16:36 aaron Exp $
 .\"
 .Dd Mar 25, 1995
 .Os
@@ -73,7 +73,7 @@ reject it.
 .Pp
 Pass 2 will validate that the directory tree is in the state expected by
 the CTM delta.  This is done by looking for files and directories which
-should/should not exist and by checking the MD5 checksums of files.  
+should/should not exist and by checking the MD5 checksums of files.
 .Pp
 Pass 3 will actually apply the delta.
 .Pp
@@ -148,7 +148,7 @@ options.
 .Xr ctm_rmail 1 ,
 .Xr ctm 5
 .Sh HISTORY
-Initial trials ran during FreeBSD 1.1.5, and many bugs and 
+Initial trials ran during FreeBSD 1.1.5, and many bugs and
 methods were hashed out.
 The
 .Nm
diff --git a/usr.sbin/ctm/ctm/ctm.5 b/usr.sbin/ctm/ctm/ctm.5
index 505ece29305..3d0c8284b06 100644
--- a/usr.sbin/ctm/ctm/ctm.5
+++ b/usr.sbin/ctm/ctm/ctm.5
@@ -1,5 +1,5 @@
 .\"----------------------------------------------------------------------------
-.\""THE BEER-WARE LICENSE" (Revision 42): 
+.\""THE BEER-WARE LICENSE" (Revision 42):
 .\"<joerg@freebsd.org> wrote this file.  As long as you retain this notice you
 .\"can do whatever you want with this stuff. If we meet some day, and you think
 .\"this stuff is worth it, you can buy me a beer in return.       Joerg Wunsch
@@ -10,7 +10,7 @@
 .\"
 .\" CTM and ctm(1) by <phk@login.dknet.dk>
 .\"
-.\" $Id: ctm.5,v 1.3 1998/11/08 00:21:28 aaron Exp $
+.\" $Id: ctm.5,v 1.4 1999/06/05 22:16:39 aaron Exp $
 .\"
 .Dd March 25, 1995
 .Os
@@ -65,7 +65,7 @@ field is currently not implemented.
 .It _END Ar md5
 This statement ends the CTM delta. The global
 .Ar md5
-checksum is matched against the MD5 checksum of the entire delta, up to 
+checksum is matched against the MD5 checksum of the entire delta, up to
 and including the space (0x20) character following
 .Dq _END .
 .It \&FM Ar name uid gid mode md5 count
@@ -168,7 +168,7 @@ CTM_END 74ddd298d76215ae45a077a4b6a74e9c
 .Xr ctm_rmail 1 ,
 .Xr ed 1
 .Sh HISTORY
-Initial trials ran during the FreeBSD 1.1.5, and many bugs and 
+Initial trials ran during the FreeBSD 1.1.5, and many bugs and
 methods were hashed out.
 The CTM system has been made publically available in FreeBSD 2.1.
 .Sh AUTHORS
diff --git a/usr.sbin/dev_mkdb/dev_mkdb.8 b/usr.sbin/dev_mkdb/dev_mkdb.8
index d685f30bb59..93d51d5f3bd 100644
--- a/usr.sbin/dev_mkdb/dev_mkdb.8
+++ b/usr.sbin/dev_mkdb/dev_mkdb.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)dev_mkdb.8	8.1 (Berkeley) 6/6/93
-.\"	$Id: dev_mkdb.8,v 1.2 1998/11/08 00:21:28 aaron Exp $
+.\"	$Id: dev_mkdb.8,v 1.3 1999/06/05 22:16:40 aaron Exp $
 .\"
 .Dd June 6, 1993
 .Os
@@ -44,7 +44,7 @@ database
 .Nm dev_mkdb
 .Sh DESCRIPTION
 The
-.Nm dev_mkdb
+.Nm
 command creates a
 .Xr db 3
 hash access method database in
@@ -52,7 +52,7 @@ hash access method database in
 which contains the names of all of the character and block special
 files in the
 .Dq Pa /dev
-directory, using the file type and the 
+directory, using the file type and the
 .Va st_rdev
 field as the key.
 .Pp
@@ -83,6 +83,6 @@ database file
 .Xr kvm_mkdb 8
 .Sh HISTORY
 The
-.Nm dev_mkdb
+.Nm
 command appeared in
 .Bx 4.4 .
diff --git a/usr.sbin/dhcp/common/dhcp-options.5 b/usr.sbin/dhcp/common/dhcp-options.5
index 52d9813f5f1..0f2203123d3 100644
--- a/usr.sbin/dhcp/common/dhcp-options.5
+++ b/usr.sbin/dhcp/common/dhcp-options.5
@@ -68,13 +68,13 @@ domain name resolves to a single IP address.
 .PP
 The
 .B int32
-data type specifies a signed 32-bit integer.   The 
+data type specifies a signed 32-bit integer.   The
 .B uint32
-data type specifies an unsigned 32-bit integer.   The 
+data type specifies an unsigned 32-bit integer.   The
 .B int16
 and
 .B uint16
-data types specify signed and unsigned 16-bit integers.   The 
+data types specify signed and unsigned 16-bit integers.   The
 .B int8
 and
 .B uint8
diff --git a/usr.sbin/dhcp/dhclient/dhclient.8 b/usr.sbin/dhcp/dhclient/dhclient.8
index c812323d3b9..93b7cf29192 100644
--- a/usr.sbin/dhcp/dhclient/dhclient.8
+++ b/usr.sbin/dhcp/dhclient/dhclient.8
@@ -61,10 +61,10 @@ The Internet Software Consortium DHCP Client, dhclient, provides a
 means for configuring one or more network interfaces using the Dynamic
 Host Configuration Protocol, BOOTP protocol, or if these protocols
 fail, by statically assigning an address.
-.SH SYSTEM REQUIREMENTS 
+.SH SYSTEM REQUIREMENTS
 You must have the Berkeley
 Packet Filter (bpf) configured in your kernel.   You must have
-at least one /dev/bpf* file for each broadcast network interface that  
+at least one /dev/bpf* file for each broadcast network interface that
 is attached to your system.
 .SH OPERATION
 .PP
diff --git a/usr.sbin/dhcp/relay/dhcrelay.8 b/usr.sbin/dhcp/relay/dhcrelay.8
index d3a5405dc28..d4f2be42e99 100644
--- a/usr.sbin/dhcp/relay/dhcrelay.8
+++ b/usr.sbin/dhcp/relay/dhcrelay.8
@@ -69,10 +69,10 @@ means for relaying DHCP and BOOTP requests from a subnet to which
 no DHCP server is directly to one or more DHCP servers on other
 subnets.
 .SH SYSTEM REQUIREMENTS
-You must have the Berkeley                         
-Packet Filter (bpf) configured in your kernel.   You must have  
+You must have the Berkeley
+Packet Filter (bpf) configured in your kernel.   You must have
 at least one /dev/bpf* file for each broadcast network interface that
-is attached to your system. 
+is attached to your system.
 .SH OPERATION
 .PP
 The DHCP Relay Agent listens for DHCP requests on all interfaces
diff --git a/usr.sbin/dhcp/server/dhcpd.conf.5 b/usr.sbin/dhcp/server/dhcpd.conf.5
index be9abe50232..15a53ee6ed2 100644
--- a/usr.sbin/dhcp/server/dhcpd.conf.5
+++ b/usr.sbin/dhcp/server/dhcpd.conf.5
@@ -278,7 +278,7 @@ group {
 .fi
 .SH REFERENCE: DECLARATIONS
 .PP
-.B The 
+.B The
 .I shared-network
 .B statement
 .PP
@@ -308,7 +308,7 @@ shared network.   The name may have the syntax of a valid domain name
 (although it will never be used as such), or it may be any arbitrary
 name, enclosed in quotes.
 .PP
-.B The 
+.B The
 .I subnet
 .B statement
 .PP
@@ -329,7 +329,7 @@ declaration.
 The
 .I subnet-number
 should be an IP address or domain name which resolves to the subnet
-number of the subnet being described.   The 
+number of the subnet being described.   The
 .I netmask
 should be an IP address or domain name which resolves to the subnet mask
 of the subnet being described.   The subnet number, together with the
@@ -372,7 +372,7 @@ single address, \fIhigh-address\fR can be omitted.
 .PP
 There must be at least one
 .B host
-statement for every BOOTP client that is to be served.   
+statement for every BOOTP client that is to be served.
 .B host
 statements may also be specified for DHCP clients, although this is
 not required unless booting is only enabled for known hosts.
@@ -386,7 +386,7 @@ parameter, or more than one
 statement may be specified.
 .PP
 If client-specific boot parameters must change based on the network
-to which the client is attached, then multiple 
+to which the client is attached, then multiple
 .B host
 statements should
 be used.
@@ -493,7 +493,7 @@ should be the maximum length in seconds that will be assigned to a
 lease if the client requesting the lease asks for a specific
 expiration time.
 .PP
-.B The 
+.B The
 .I hardware
 .B statement
 .PP
diff --git a/usr.sbin/edquota/edquota.8 b/usr.sbin/edquota/edquota.8
index 93821558ef2..2a7db52218e 100644
--- a/usr.sbin/edquota/edquota.8
+++ b/usr.sbin/edquota/edquota.8
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)edquota.8	8.1 (Berkeley) 6/6/93
-.\"	$Id: edquota.8,v 1.3 1998/11/08 00:21:29 aaron Exp $
+.\"	$Id: edquota.8,v 1.4 1999/06/05 22:16:46 aaron Exp $
 .\"
 .Dd June 6, 1993
 .Dt EDQUOTA 8
@@ -58,8 +58,8 @@
 .Fl g
 .Sh DESCRIPTION
 .Nm edquota
-is a quota editor.  
-By default, or if the 
+is a quota editor.
+By default, or if the
 .Fl u
 flag is specified,
 one or more users may be specified on the command line.
@@ -71,15 +71,19 @@ or
 .Pa /etc/group
 files.
 For each user a temporary file is created
-with an ASCII representation of the current
+with an
+.Tn ASCII
+representation of the current
 disk quotas for that user.
 The list of filesystems with user quotas is determined from
 .Pa /etc/fstab .
-An editor is invoked on the ASCII file.
-The editor invoked is 
+An editor is invoked on the
+.Tn ASCII
+file.
+The editor invoked is
 .Xr vi 1
-unless the environment variable 
-.Ev EDITOR 
+unless the environment variable
+.Ev EDITOR
 specifies otherwise.
 .Pp
 The quotas may then be modified, new quotas added, etc.
@@ -88,8 +92,8 @@ Setting a hard limit to one indicates that no allocations should
 be permitted.
 Setting a soft limit to one with a hard limit of zero
 indicates that allocations should be permitted on
-only a temporary basis (see 
-.Fl t 
+only a temporary basis (see
+.Fl t
 below).
 The current usage information in the file is for informational purposes;
 only the hard and soft limits can be changed.
@@ -99,7 +103,7 @@ On leaving the editor,
 reads the temporary file and modifies the binary
 quota files to reflect the changes made.
 .Pp
-If the 
+If the
 .Fl p
 flag is specified,
 .Nm edquota
@@ -108,17 +112,17 @@ specified for each user specified.
 This is the normal mechanism used to
 initialize quotas for groups of users.
 .Pp
-If the 
-.Fl g 
+If the
+.Fl g
 flag is specified,
 .Nm edquota
 is invoked to edit the quotas of
 one or more groups specified on the command line.
-The 
-.Fl p 
+The
+.Fl p
 flag can be specified in conjunction with
-the 
-.Fl g 
+the
+.Fl g
 flag to specify a prototypical group
 to be duplicated among the listed set of groups.
 .Pp
@@ -128,15 +132,15 @@ Once the grace period has expired,
 the soft limit is enforced as a hard limit.
 The default grace period for a filesystem is specified in
 .Pa /usr/include/ufs/ufs/quota.h .
-The 
+The
 .Fl t
 flag can be used to change the grace period.
-By default, or when invoked with the 
+By default, or when invoked with the
 .Fl u
 flag, the grace period is set for all the filesystems with user
 quotas specified in
 .Pa /etc/fstab .
-When invoked with the 
+When invoked with the
 .Fl g
 flag the grace period is
 set for all the filesystems with group quotas specified in
diff --git a/usr.sbin/eeprom/eeprom.8 b/usr.sbin/eeprom/eeprom.8
index ce77db89c6b..a24a30c7fe1 100644
--- a/usr.sbin/eeprom/eeprom.8
+++ b/usr.sbin/eeprom/eeprom.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: eeprom.8,v 1.7 1998/11/08 00:21:29 aaron Exp $
+.\"	$OpenBSD: eeprom.8,v 1.8 1999/06/05 22:16:47 aaron Exp $
 .\"	$NetBSD: eeprom.8,v 1.2 1996/02/28 01:13:24 thorpej Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -235,7 +235,7 @@ rather than the default Sun logo.
 A string to use at power-up, rather than the default Sun banner.
 .It oem-banner?
 If true, enables the use of the banner stored in
-.Pa oem-banner 
+.Pa oem-banner
 rather than the default Sun banner.
 .It ttya-mode
 A string of five comma separated fields in the format
diff --git a/usr.sbin/grfconfig/grfconfig.8 b/usr.sbin/grfconfig/grfconfig.8
index 1254dc13b53..37c7e7ff22c 100644
--- a/usr.sbin/grfconfig/grfconfig.8
+++ b/usr.sbin/grfconfig/grfconfig.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: grfconfig.8,v 1.7 1999/05/28 23:00:06 aaron Exp $
+.\"	$OpenBSD: grfconfig.8,v 1.8 1999/06/05 22:16:48 aaron Exp $
 .\"	$NetBSD: grfconfig.8,v 1.4 1997/07/29 17:40:47 veego Exp $
 .\"
 .\" Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
 .Dt GRFCONFIG 8 amiga
 .Os
 .Sh NAME
-.Nm grfconfig 
+.Nm grfconfig
 .Nd alter grf device screen mode definitions at run time
 .Sh SYNOPSIS
 .Nm grfconfig
@@ -63,10 +63,10 @@ pretty list normally shown.
 The grf device to manipulate.  This argument is required.
 .It Ar file
 The file which contains the mode definitions.  If this argument
-is not specified, 
+is not specified,
 .Nm
 will print out of a list of the modes currently loaded into
-the grf device.  
+the grf device.
 .El
 .Sh MODE DEFINITION FILE
 The mode definitions are taken from a file which has lines of the format:
@@ -104,7 +104,7 @@ use the default flags: -hsync -vsync
 .It doublescan
 doublescan mode
 .It interlace
-interlace mode 
+interlace mode
 .It +hsync
 positive horizontal sync pulses
 .It -hsync
diff --git a/usr.sbin/httpd/httpd.8 b/usr.sbin/httpd/httpd.8
index be0bcd56387..40d55c65b1b 100644
--- a/usr.sbin/httpd/httpd.8
+++ b/usr.sbin/httpd/httpd.8
@@ -8,7 +8,7 @@
 .\" are met:
 .\"
 .\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer. 
+.\"    notice, this list of conditions and the following disclaimer.
 .\"
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in
@@ -52,7 +52,7 @@
 .SH NAME
 httpd \- Apache hypertext transfer protocol server
 .SH SYNOPSIS
-.B httpd 
+.B httpd
 [
 .B \-X
 ] [
@@ -69,25 +69,25 @@ httpd \- Apache hypertext transfer protocol server
 .BI \-D " parameter"
 ]
 
-.B httpd 
+.B httpd
 [
 .B \-h
-] 
+]
 [
 .B \-l
-] 
+]
 [
 .B \-L
-] 
+]
 [
 .B \-v
-] 
+]
 [
 .B \-V
-] 
+]
 [
 .B \-S
-] 
+]
 
 .SH DESCRIPTION
 .B httpd
@@ -96,8 +96,8 @@ designed to be run as a standalone daemon process. When used like this
 is will create a pool of child processes to handle requests. To stop
 it, send a TERM signal to the initial (parent) process. The PID of
 this process is written to a file as given in the configuration file.
-Alternatively 
-.B httpd 
+Alternatively
+.B httpd
 may be invoked by the Internet daemon inetd(8) each
 time a connection to the HTTP service is made. Normally this service
 can be enabled for startup on OpenBSD by editing \fB/etc/rc.conf\fP.
@@ -112,7 +112,7 @@ compiled into httpd by default with OpenBSD.
 .TP 12
 .BI \-R " libexecdir"
 This option is only available if Apache was built with
-the 
+the
 .I SHARED_CORE
 rule enabled which forces the Apache core code to be
 placed into a dynamic shared object (DSO) file. This file
@@ -165,12 +165,12 @@ does not detach from the terminal or fork any children. Do NOT use this mode
 to provide ordinary web service.
 .TP
 .B \-v
-Print the version of 
+Print the version of
 .B httpd
 , and then exit.
 .TP
 .B \-V
-Print the version and build parameters of 
+Print the version and build parameters of
 .B httpd
 , and then exit.
 .SH FILES
diff --git a/usr.sbin/httpd/src/regex/regex.7 b/usr.sbin/httpd/src/regex/regex.7
index d89012bda1d..fcec9a8b37c 100644
--- a/usr.sbin/httpd/src/regex/regex.7
+++ b/usr.sbin/httpd/src/regex/regex.7
@@ -93,7 +93,7 @@ or a collating-sequence name for either)
 enclosed in `[.' and `.]' stands for the
 sequence of characters of that collating element.
 The sequence is a single element of the bracket expression's list.
-A bracket expression containing a multi-character collating element 
+A bracket expression containing a multi-character collating element
 can thus match more than one character,
 e.g. if the collating sequence includes a `ch' collating element,
 then the RE `[[.ch.]]*c' matches the first five characters
diff --git a/usr.sbin/httpd/src/support/ab.1 b/usr.sbin/httpd/src/support/ab.1
index 953704601ce..2a034d2d9ee 100644
--- a/usr.sbin/httpd/src/support/ab.1
+++ b/usr.sbin/httpd/src/support/ab.1
@@ -6,7 +6,7 @@
 .\" are met:
 .\"
 .\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer. 
+.\"    notice, this list of conditions and the following disclaimer.
 .\"
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in
@@ -54,7 +54,7 @@
 .SH NAME
 ab \- Apache HTTP server benchmarking tool
 .SH SYNOPSIS
-.B ab 
+.B ab
 [
 .B \-k
 ] [
@@ -64,13 +64,13 @@ ab \- Apache HTTP server benchmarking tool
 ] [
 .BI \-c " concurrency"
 ]
-.I [http://]hostname[:port]/path 
+.I [http://]hostname[:port]/path
 
 .B ab
 [
-.B \-v 
+.B \-v
 ] [
-.B \-h 
+.B \-h
 ]
 .PP
 .SH DESCRIPTION
@@ -78,11 +78,11 @@ ab \- Apache HTTP server benchmarking tool
 is a tool for benchmarking your Apache HyperText Transfer Protocol (HTTP)
 server. It is designed to give you an impression on how performant is your
 current Apache installation.  This especially shows you how much requests per
-time your Apache installation is capable to serve. 
+time your Apache installation is capable to serve.
 .PP
 .SH OPTIONS
 .TP 12
-.B \-k 
+.B \-k
 Enable the HTTP KeepAlive feature, i.e. perform multiple requests within one
 HTTP session instead. Default is no KeepAlive.
 .TP 12
@@ -93,20 +93,20 @@ benchmarking results.
 .TP 12
 .BI \-t " timelimit"
 Seconds to max. spend for benchmarking. This implies
-a 
-.B \-n 
+a
+.B \-n
 .B 50000
 internally. Use this to benchmark the server within a fixed total amount of
-time.  Per default there is no timelimit. 
+time.  Per default there is no timelimit.
 .TP 12
 .BI \-c " concurrency"
-Number of multiple requests per time to perform. 
+Number of multiple requests per time to perform.
 Default is one request per time.
 .TP 12
-.B \-v 
+.B \-v
 Display version and copyright information.
 .TP 12
-.B \-h 
+.B \-h
 Display usage information.
 .PD
 .SH SEE ALSO
diff --git a/usr.sbin/httpd/src/support/apachectl.1 b/usr.sbin/httpd/src/support/apachectl.1
index 72300eb98b2..ebda1bc256b 100644
--- a/usr.sbin/httpd/src/support/apachectl.1
+++ b/usr.sbin/httpd/src/support/apachectl.1
@@ -6,7 +6,7 @@
 .\" are met:
 .\"
 .\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer. 
+.\"    notice, this list of conditions and the following disclaimer.
 .\"
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in
@@ -54,30 +54,30 @@
 .SH NAME
 apachectl \- Apache HTTP server control interface
 .SH SYNOPSIS
-.B apachectl 
+.B apachectl
 \fIcommand\fP [...]
 .SH DESCRIPTION
 .B apachectl
-is a front end to the Apache HyperText Transfer Protocol (HTTP) 
-server.  It is designed to help the administrator control the 
-functioning of the Apache 
+is a front end to the Apache HyperText Transfer Protocol (HTTP)
+server.  It is designed to help the administrator control the
+functioning of the Apache
 .B httpd
-daemon.  
+daemon.
 .PP
-.B NOTE: 
-If your Apache installation uses non-standard paths, you will need to 
-edit the 
+.B NOTE:
+If your Apache installation uses non-standard paths, you will need to
+edit the
 .B apachectl
-script to set the appropriate paths to your PID file and your 
+script to set the appropriate paths to your PID file and your
 .B httpd
 binary.  See the comments in the script for details.
 .PP
-The 
+The
 .B apachectl
-script returns a 0 exit value on success, and >0 if an error 
+script returns a 0 exit value on success, and >0 if an error
 occurs.  For more details, view the comments in the script.
 .PP
-Full documentation for Apache is available at 
+Full documentation for Apache is available at
 .B http://www.apache.org/
 .
 .SH OPTIONS
@@ -92,14 +92,14 @@ Stops the Apache daemon.
 .BI restart
 Restarts the Apache daemon by sending it a SIGHUP.  If the daemon
 is not running, it is started.
-This command automatically checks the configuration files via 
+This command automatically checks the configuration files via
 .BI configtest
 before initiating the restart to make sure Apache doesn't die.
 .TP
 .BI fullstatus
-Displays a full status report from 
-.B mod_status. 
-For this to work, you need to have mod_status enabled on your server 
+Displays a full status report from
+.B mod_status.
+For this to work, you need to have mod_status enabled on your server
 and a text-based browser such as \fIlynx\fP available on your system.  The
 URL used to access the status report can be set by editing the
 .B STATUSURL
@@ -116,13 +116,13 @@ normal restart in that currently open connections are not aborted.
 A side effect is that old log files will not be closed immediately.
 This means that if used in a log rotation script, a substantial delay may be
 necessary to ensure that the old log files are closed before processing them.
-This command automatically checks the configuration files via 
+This command automatically checks the configuration files via
 .BI configtest
 before initiating the restart to make sure Apache doesn't die.
 .TP
 .BI configtest
 Run a configuration file syntax test. It parses the configuration
-files and either reports 
+files and either reports
 .B "Syntax Ok"
 or detailed information about the particular syntax error.
 .TP
diff --git a/usr.sbin/httpd/src/support/apxs.8 b/usr.sbin/httpd/src/support/apxs.8
index 581d80b80cd..1c37279f750 100644
--- a/usr.sbin/httpd/src/support/apxs.8
+++ b/usr.sbin/httpd/src/support/apxs.8
@@ -6,7 +6,7 @@
 .\" are met:
 .\"
 .\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer. 
+.\"    notice, this list of conditions and the following disclaimer.
 .\"
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in
@@ -198,18 +198,18 @@ by guessing it from the filename.
 .PP
 Query options:
 .TP 12
-.B \-q 
-Performs a query for 
+.B \-q
+Performs a query for
 .BR apxs 's
 knowledge about certain settings. The
 .I query
 parameters can be one or more of the following strings:
 .nf
   CC              TARGET
-  CFLAGS          SBINDIR    
-  CFLAGS_SHLIB    INCLUDEDIR 
-  LD_SHLIB        LIBEXECDIR 
-  LDFLAGS_SHLIB   SYSCONFDIR 
+  CFLAGS          SBINDIR
+  CFLAGS_SHLIB    INCLUDEDIR
+  LD_SHLIB        LIBEXECDIR
+  LDFLAGS_SHLIB   SYSCONFDIR
   LIBS_SHLIB
 .fi
 Use this for manually determining settings. For instance use
@@ -278,13 +278,13 @@ This option is directly passed through to the linker command.
 Use this to add your own libraries to search to the build process.
 .TP 12
 .BI \-Wc, "compiler-flags"
-This option passes 
+This option passes
 .I compiler-flags
 as additional flags to the compiler command.
 Use this to add local compiler-specific options.
 .TP 12
 .BI \-Wl, "linker-flags"
-This option passes 
+This option passes
 .I linker-flags
 as additional flags to the linker command.
 Use this to add local linker-specific options.
@@ -299,7 +299,7 @@ servers
 directory.
 .TP 12
 .B \-a
-This additionally activates the module 
+This additionally activates the module
 by automatically adding a corresponding
 .B LoadModule
 line to Apache's
@@ -309,11 +309,11 @@ configuration file (only if still no such entry exists).
 .B \-A
 Same as option
 .B \-a
-but the created 
+but the created
 .B LoadModule
 directive is
 prefixed with a hash sign (#), i.e. the module is
-just prepared for later activation but initially disabled. 
+just prepared for later activation but initially disabled.
 .PD
 .SH EXAMPLES
 Assume you have an Apache module named mod_foo.c available which should extend
diff --git a/usr.sbin/httpd/src/support/dbmmanage.1 b/usr.sbin/httpd/src/support/dbmmanage.1
index f52bd2c02c8..67e5b60dfc4 100644
--- a/usr.sbin/httpd/src/support/dbmmanage.1
+++ b/usr.sbin/httpd/src/support/dbmmanage.1
@@ -6,7 +6,7 @@
 .\" are met:
 .\"
 .\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer. 
+.\"    notice, this list of conditions and the following disclaimer.
 .\"
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in
@@ -71,16 +71,16 @@ usernames and password for basic authentication of HTTP users.
 Resources available from the
 .B httpd
 Apache web server can be restricted to just the users listed
-in the files created by 
+in the files created by
 .B dbmmanage.
 This program can only be used
 when the usernames are stored in a DBM file. To use a
-flat-file database see 
+flat-file database see
 \fBhtpasswd\fP.
 .PP
 This manual page only lists the command line arguments. For details of
-the directives necessary to configure user authentication in 
-.B httpd 
+the directives necessary to configure user authentication in
+.B httpd
 see
 the Apache manual, which is part of the Apache distribution or can be
 found at http://www.apache.org/.
@@ -99,7 +99,7 @@ Asks for a password and then adds an entry for \fIusername\fP to
 \fIfilename\fP .
 .TP 12
 .B check
-Asks for a password and then checks if 
+Asks for a password and then checks if
 \fIusername\fP is in \fIfilename\fP and if it's password matches
 the specified one.
 .TP 12
diff --git a/usr.sbin/httpd/src/support/htdigest.1 b/usr.sbin/httpd/src/support/htdigest.1
index c719e456ce9..2ab3aa5450d 100644
--- a/usr.sbin/httpd/src/support/htdigest.1
+++ b/usr.sbin/httpd/src/support/htdigest.1
@@ -6,7 +6,7 @@
 .\" are met:
 .\"
 .\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer. 
+.\"    notice, this list of conditions and the following disclaimer.
 .\"
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in
@@ -55,10 +55,10 @@
 .SH NAME
 htdigest \- Create and update user authentication files
 .SH SYNOPSIS
-.B htdigest 
+.B htdigest
 [
 .B \-c
-] 
+]
 .I passwdfile
 .I realm
 .I username
@@ -69,29 +69,29 @@ usernames, realm and password for digest authentication of HTTP users.
 Resources available from the
 .B httpd
 Apache web server can be restricted to just the users listed
-in the files created by 
+in the files created by
 .B htdigest.
 .PP
 This manual page only lists the command line arguments. For details of
-the directives necessary to configure digest authentication in 
-.B httpd 
+the directives necessary to configure digest authentication in
+.B httpd
 see
 the Apache manual, which is part of the Apache distribution or can be
 found at http://www.apache.org/.
 .SH OPTIONS
-.IP \-c 
+.IP \-c
 Create the \fIpasswdfile\fP. If \fIpasswdfile\fP already exists, it
-is deleted first. 
+is deleted first.
 .IP \fB\fIpasswdfile\fP
 Name of the file to contain the username, realm and password. If \-c
 is given, this file is created if it does not already exist,
-or deleted and recreated if it does exist. 
+or deleted and recreated if it does exist.
 .IP \fB\fIrealm\fP
-The realm name to which the user name belongs to. 
+The realm name to which the user name belongs to.
 .IP \fB\fIusername\fP
 The user name to create or update in \fBpasswdfile\fP. If
 \fIusername\fP does not exist is this file, an entry is added. If it
 does exist, the password is changed.
 .SH SEE ALSO
-.BR httpd(8) 
+.BR httpd(8)
 .
diff --git a/usr.sbin/httpd/src/support/htpasswd.1 b/usr.sbin/httpd/src/support/htpasswd.1
index 5956de00d9b..c2bf8cf8ab3 100644
--- a/usr.sbin/httpd/src/support/htpasswd.1
+++ b/usr.sbin/httpd/src/support/htpasswd.1
@@ -6,7 +6,7 @@
 .\" are met:
 .\"
 .\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer. 
+.\"    notice, this list of conditions and the following disclaimer.
 .\"
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in
@@ -55,10 +55,10 @@
 .SH NAME
 htpasswd \- Create and update user authentication files
 .SH SYNOPSIS
-.B htpasswd 
+.B htpasswd
 [
 .B \-c
-] 
+]
 .I passwdfile
 .I username
 .SH DESCRIPTION
@@ -68,27 +68,27 @@ usernames and password for basic authentication of HTTP users.
 Resources available from the
 .B httpd
 Apache web server can be restricted to just the users listed
-in the files created by 
+in the files created by
 .B htpasswd.
 This program can only be used
 when the usernames are stored in a flat-file. To use a
-DBM database see 
+DBM database see
 \fBdbmmanage\fP.
 .PP
 This manual page only lists the command line arguments. For details of
-the directives necessary to configure user authentication in 
-.B httpd 
+the directives necessary to configure user authentication in
+.B httpd
 see
 the Apache manual, which is part of the Apache distribution or can be
 found at http://www.apache.org/.
 .SH OPTIONS
-.IP \-c 
+.IP \-c
 Create the \fIpasswdfile\fP. If \fIpasswdfile\fP already exists, it
-is deleted first. 
+is deleted first.
 .IP \fB\fIpasswdfile\fP
 Name of the file to contain the user name and password. If \-c
 is given, this file is created if it does not already exist,
-or deleted and recreated if it does exist. 
+or deleted and recreated if it does exist.
 .IP \fB\fIusername\fP
 The username to create or update in \fBpasswdfile\fP. If
 \fIusername\fP does not exist is this file, an entry is added. If it
diff --git a/usr.sbin/httpd/src/support/httpd.8 b/usr.sbin/httpd/src/support/httpd.8
index 56fd2c308b3..d5edaab9a21 100644
--- a/usr.sbin/httpd/src/support/httpd.8
+++ b/usr.sbin/httpd/src/support/httpd.8
@@ -7,7 +7,7 @@
 .\" are met:
 .\"
 .\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer. 
+.\"    notice, this list of conditions and the following disclaimer.
 .\"
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in
@@ -56,7 +56,7 @@
 .SH NAME
 httpd \- Apache hypertext transfer protocol server
 .SH SYNOPSIS
-.B httpd 
+.B httpd
 [
 .B \-X
 ] [
@@ -73,25 +73,25 @@ httpd \- Apache hypertext transfer protocol server
 .BI \-D " parameter"
 ]
 
-.B httpd 
+.B httpd
 [
 .B \-h
-] 
+]
 [
 .B \-l
-] 
+]
 [
 .B \-L
-] 
+]
 [
 .B \-v
-] 
+]
 [
 .B \-V
-] 
+]
 [
 .B \-S
-] 
+]
 
 .SH DESCRIPTION
 .B httpd
@@ -100,24 +100,24 @@ designed to be run as a standalone daemon process. When used like this
 is will create a pool of child processes to handle requests. To stop
 it, send a TERM signal to the initial (parent) process. The PID of
 this process is written to a file as given in the configuration file.
-Alternatively 
-.B httpd 
+Alternatively
+.B httpd
 may be invoked by the Internet daemon inetd(8) each
 time a connection to the HTTP service is made.
 .PP
 This manual page only lists the command line arguments. For details
-of the directives necessary to configure 
+of the directives necessary to configure
 .B httpd
 see the Apache manual,
 which is part of the Apache distribution or can be found at
 http://www.apache.org/. Paths in this manual may not reflect those
-compiled into 
+compiled into
 .B httpd.
 .SH OPTIONS
 .TP 12
 .BI \-R " libexecdir"
 This option is only available if Apache was built with
-the 
+the
 .I SHARED_CORE
 rule enabled which forces the Apache core code to be
 placed into a dynamic shared object (DSO) file. This file
@@ -170,12 +170,12 @@ does not detach from the terminal or fork any children. Do NOT use this mode
 to provide ordinary web service.
 .TP
 .B \-v
-Print the version of 
+Print the version of
 .B httpd
 , and then exit.
 .TP
 .B \-V
-Print the version and build parameters of 
+Print the version and build parameters of
 .B httpd
 , and then exit.
 .SH FILES
diff --git a/usr.sbin/httpd/src/support/logresolve.8 b/usr.sbin/httpd/src/support/logresolve.8
index 4851269ad61..9f12271820f 100644
--- a/usr.sbin/httpd/src/support/logresolve.8
+++ b/usr.sbin/httpd/src/support/logresolve.8
@@ -6,7 +6,7 @@
 .\" are met:
 .\"
 .\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer. 
+.\"    notice, this list of conditions and the following disclaimer.
 .\"
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in
@@ -59,7 +59,7 @@ logresolve \- resolve hostnames for IP-adresses in Apache logfiles
 .BI \-s " filename"
 ] [
 .B \-c
-] < 
+] <
 .I access_log
 >
 .I access_log.new
@@ -75,9 +75,9 @@ up the first time it is found in the log file.
 .BI \-s " filename"
 Specifies a filename to record statistics.
 .TP 12
-.B \-c 
-This causes 
-.B logresolve 
+.B \-c
+This causes
+.B logresolve
 to apply some DNS checks: after finding the hostname from the IP address, it
 looks up the IP addresses for the hostname and checks that one of these
 matches the original address.
diff --git a/usr.sbin/httpd/src/support/rotatelogs.8 b/usr.sbin/httpd/src/support/rotatelogs.8
index aee02e11ecd..2f08ce62cf4 100644
--- a/usr.sbin/httpd/src/support/rotatelogs.8
+++ b/usr.sbin/httpd/src/support/rotatelogs.8
@@ -6,7 +6,7 @@
 .\" are met:
 .\"
 .\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer. 
+.\"    notice, this list of conditions and the following disclaimer.
 .\"
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in
diff --git a/usr.sbin/httpd/src/support/suexec.8 b/usr.sbin/httpd/src/support/suexec.8
index 801d7abce91..cc5a8db585b 100644
--- a/usr.sbin/httpd/src/support/suexec.8
+++ b/usr.sbin/httpd/src/support/suexec.8
@@ -6,7 +6,7 @@
 .\" are met:
 .\"
 .\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer. 
+.\"    notice, this list of conditions and the following disclaimer.
 .\"
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in
@@ -55,7 +55,7 @@
 suexec \- Switch User For Exec
 .SH SYNOPSIS
 No synopsis for usage, because this program
-is used internally by Apache only. 
+is used internally by Apache only.
 .PP
 .SH DESCRIPTION
 .B suexec
diff --git a/usr.sbin/inetd/inetd.8 b/usr.sbin/inetd/inetd.8
index a1fbd88fb46..c90e4def347 100644
--- a/usr.sbin/inetd/inetd.8
+++ b/usr.sbin/inetd/inetd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)inetd.8	6.7 (Berkeley) 3/16/91
-.\"	$Id: inetd.8,v 1.9 1999/05/23 14:11:33 aaron Exp $
+.\"	$Id: inetd.8,v 1.10 1999/06/05 22:17:01 aaron Exp $
 .\"
 .Dd March 16, 1991
 .Dt INETD 8
@@ -148,16 +148,16 @@ services (discussed below), the service
 name
 .Em must
 be the official name of the service (that is, the first entry in
-.Pa /etc/services ) . 
+.Pa /etc/services ) .
 When used to specify a Sun-RPC
 based service, this field is a valid RPC service name in
 the file
-.Pa /etc/rpc . 
-The part on the right of the 
+.Pa /etc/rpc .
+The part on the right of the
 .Dq /
 is the RPC version number. This
 can simply be a single numeric argument or a range of versions.
-A range is bounded by the low version to the high version - 
+A range is bounded by the low version to the high version -
 .Dq rusers/1-3 .
 .Pp
 The
@@ -180,10 +180,10 @@ Examples might be
 .Dq tcp
 or
 .Dq udp .
-RPC based services are specified with the 
+RPC based services are specified with the
 .Dq rpc/tcp
-or 
-.Dq rpc/udp 
+or
+.Dq rpc/udp
 service type.
 .Pp
 The
@@ -245,7 +245,7 @@ out and exit when no more connections are active.
 .Nm
 will continue to
 listen on the master socket for connections, so the server should not close
-it when it exits. 
+it when it exits.
 .Xr identd 8
 is usually the only stream server marked as wait.
 .Pp
diff --git a/usr.sbin/iostat/iostat.8 b/usr.sbin/iostat/iostat.8
index 028a420aee4..682d15ebe7f 100644
--- a/usr.sbin/iostat/iostat.8
+++ b/usr.sbin/iostat/iostat.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: iostat.8,v 1.9 1998/11/08 00:21:30 aaron Exp $
+.\"	$OpenBSD: iostat.8,v 1.10 1999/06/05 22:17:03 aaron Exp $
 .\"	$NetBSD: iostat.8,v 1.10 1996/10/25 18:21:57 scottr Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
@@ -57,7 +57,7 @@ displays kernel
 statistics on terminal, disk and CPU operations.  By default,
 .Nm iostat
 displays one line of statistics averaged over the machine's run time.
-The use of 
+The use of
 .Fl c
 presents successive lines averaged over the
 .Ar wait
@@ -83,9 +83,9 @@ If no
 interval is specified, the default is 1 second.
 .It Fl C
 Show CPU statistics.  This is enabled by default unless the
-.Fl d, 
+.Fl d,
 .Fl D,
-or 
+or
 .Fl T
 flags are used.
 .It Fl d
@@ -93,7 +93,7 @@ Show disk statistics.  This is the default.  Displays kilobytes per
 transfer, number of transfers, and megabytes transferred.  Use of this
 flag disables display of CPU and tty statistics.
 .It Fl D
-Show alternate disk statistics.  Displays kilobytes transfered, number of 
+Show alternate disk statistics.  Displays kilobytes transfered, number of
 transfers, and time spent in transfers.  Use of this flag disables the
 default display.
 .It Fl I
@@ -107,9 +107,9 @@ Extract the name list from the specified system instead of the default
 .Dq Pa /bsd .
 .It Fl T
 Show tty statistics.  This is enabled by default unless the
-.Fl C, 
+.Fl C,
 .Fl d,
-or 
+or
 .Fl D
 flags are used.
 .It Fl w
@@ -132,7 +132,7 @@ characters read from terminals
 characters written to terminals
 .El
 .It disks
-Disk operations. 
+Disk operations.
 The header of the field is the disk name and unit number.
 If more than four disk drives are configured in the system,
 .Nm iostat
diff --git a/usr.sbin/ipftest/ipftest.1 b/usr.sbin/ipftest/ipftest.1
index 3663c7032d1..730ef870c62 100644
--- a/usr.sbin/ipftest/ipftest.1
+++ b/usr.sbin/ipftest/ipftest.1
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: ipftest.1,v 1.8 1999/05/24 23:39:57 aaron Exp $          
+.\"     $OpenBSD: ipftest.1,v 1.9 1999/06/05 22:17:04 aaron Exp $
 .Dd May 23, 1999
 .Os
 .Dt IPFTEST 1
@@ -27,39 +27,39 @@ reads test packets from
 .Ar stdin
 or the file specified by the
 .Fl i
-option, applies the ruleset specified by the 
+option, applies the ruleset specified by the
 .Fl r
 option to each, and generates information about the effect of the ruleset on
-each packet to 
+each packet to
 .Ar stdout .
 .Pp
 Captured or handcrafted packets to be tested can be supplied
 in a variety of formats. See the options
-.Fl P , Fl S , 
-.Fl T , Fl H 
+.Fl P , Fl S ,
+.Fl T , Fl H
 and
-.Fl E 
+.Fl E
 for details. In addition the
 .Fl X
-option gives 
+option gives
 .Nm
-the ability to use its own text description format to generate 
-.Dq fake 
+the ability to use its own text description format to generate
+.Dq fake
 packets.  The format used is:
-.Bd -ragged 
+.Bd -ragged
 in|out on
 .Ar if
 .Op tcp|udp|icmp
 .Ar srchost
-.Op , Ar port 
+.Op , Ar port
 .Ar dsthost
 .Op , Ar port
 .Op Fl FSRPAU
 .Ed
 .Pp
-This allows for input or output ICMP, TCP, or UDP packets to be generated for 
+This allows for input or output ICMP, TCP, or UDP packets to be generated for
 any interface. For TCP or UDP it allows the specification of source and
-destination ports. For TCP it allows the specification of TCP flags. 
+destination ports. For TCP it allows the specification of TCP flags.
 Some examples are:
 .Bd -literal -offset indent
 # a UDP packet coming in on le0
@@ -93,7 +93,7 @@ not otherwise possible to associate a packet with an interface.  Normal
 .Dq text packets
 can override this setting.
 .It Fl P
-The input file is in 
+The input file is in
 the binary format produced using libpcap
 (i.e.,
 .Xr tcpdump
diff --git a/usr.sbin/ipmon/ipmon.8 b/usr.sbin/ipmon/ipmon.8
index 9ccea80632e..a67771982b0 100644
--- a/usr.sbin/ipmon/ipmon.8
+++ b/usr.sbin/ipmon/ipmon.8
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: ipmon.8,v 1.10 1999/03/10 21:25:30 pjanzen Exp $          
+.\"     $OpenBSD: ipmon.8,v 1.11 1999/06/05 22:17:06 aaron Exp $
 .TH ipmon 8
 .SH NAME
 ipmon \- monitors /dev/ipl for logged packets
diff --git a/usr.sbin/ipsend/ipsend/ipsend.5 b/usr.sbin/ipsend/ipsend/ipsend.5
index dae402b4f05..f7ac9113fae 100644
--- a/usr.sbin/ipsend/ipsend/ipsend.5
+++ b/usr.sbin/ipsend/ipsend/ipsend.5
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: ipsend.5,v 1.1 1998/01/26 04:17:03 dgregor Exp $
+.\"     $OpenBSD: ipsend.5,v 1.2 1999/06/05 22:17:08 aaron Exp $
 .TH IPSEND 5
 .SH NAME
 ipsend \- IP packet description language
@@ -123,7 +123,7 @@ be adjusted to accomodate data or further protocol headers.
 sets the fragment offset field of the IP packet.  Default is 0.
 .TP
 .B ttl <number>
-sets the time to live (TTL) field of the IP header.  Default is 60. 
+sets the time to live (TTL) field of the IP header.  Default is 60.
 .TP
 .B proto <protocol>
 sets the protocol field of the IP header.  The protocol can either be a
diff --git a/usr.sbin/iteconfig/iteconfig_amiga.8 b/usr.sbin/iteconfig/iteconfig_amiga.8
index 940ff68beb5..c728e29e235 100644
--- a/usr.sbin/iteconfig/iteconfig_amiga.8
+++ b/usr.sbin/iteconfig/iteconfig_amiga.8
@@ -33,7 +33,7 @@
 .Dt ITECONFIG 8 amiga
 .Os
 .Sh NAME
-.Nm iteconfig 
+.Nm iteconfig
 .Nd modify console attributes at run time
 .Sh SYNOPSIS
 .Nm iteconfig
@@ -79,7 +79,7 @@ Set the pitch of the console bell to
 which must be between 10 and 1399.
 .It Fl t Ar msec
 Set the duration of the beep to
-.Ar msec 
+.Ar msec
 milliseconds which must be between 1 and 5000 (5 seconds).
 .It Fl w Ar width
 Set the width of the console display to
@@ -91,7 +91,7 @@ must be a positive integer.
 Set the height of the console display to
 .Ar height
 pixel rows.
-.Ar height 
+.Ar height
 must be a positive integer.
 .It Fl d Ar depth
 Set the number of bitplanes the console view should use to
@@ -131,7 +131,7 @@ and
 .Ar BB
 are taken to be 8-bit values specifying the
 intensities of the red, green and blue components, respectively,
-of the color to be used.  For example, 
+of the color to be used.  For example,
 .Li 0xff0000
 is bright red,
 .Li 0xffffff
diff --git a/usr.sbin/iteconfig/iteconfig_atari.8 b/usr.sbin/iteconfig/iteconfig_atari.8
index e306f0cbb5b..c6aea65a18e 100644
--- a/usr.sbin/iteconfig/iteconfig_atari.8
+++ b/usr.sbin/iteconfig/iteconfig_atari.8
@@ -33,7 +33,7 @@
 .Dt ITECONFIG 8 atari
 .Os
 .Sh NAME
-.Nm iteconfig 
+.Nm iteconfig
 .Nd modify console attributes at run time
 .Sh SYNOPSIS
 .Nm iteconfig
@@ -79,7 +79,7 @@ Set the pitch of the console bell to
 which must be between 10 and 1399.
 .It Fl t Ar msec
 Set the duration of the beep to
-.Ar msec 
+.Ar msec
 milliseconds which must be between 1 and 5000 (5 seconds).
 .It Fl w Ar width
 Set the width of the console display to
@@ -91,7 +91,7 @@ must be a positive integer.
 Set the height of the console display to
 .Ar height
 pixel rows.
-.Ar height 
+.Ar height
 must be a positive integer.
 .It Fl d Ar depth
 Set the number of bitplanes the console view should use to
@@ -131,7 +131,7 @@ and
 .Ar BB
 are taken to be 8-bit values specifying the
 intensities of the red, green and blue components, respectively,
-of the color to be used.  For example, 
+of the color to be used.  For example,
 .Li 0xff0000
 is bright red,
 .Li 0xffffff
diff --git a/usr.sbin/kgmon/kgmon.8 b/usr.sbin/kgmon/kgmon.8
index a285f01d95e..4587b5087a8 100644
--- a/usr.sbin/kgmon/kgmon.8
+++ b/usr.sbin/kgmon/kgmon.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: kgmon.8,v 1.4 1999/05/23 14:11:33 aaron Exp $
+.\" $OpenBSD: kgmon.8,v 1.5 1999/06/05 22:17:13 aaron Exp $
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)kgmon.8	8.1 (Berkeley) 6/6/93
-.\"	$Id: kgmon.8,v 1.4 1999/05/23 14:11:33 aaron Exp $
+.\"	$Id: kgmon.8,v 1.5 1999/06/05 22:17:13 aaron Exp $
 .\"
 .Dd June 6, 1993
 .Dt KGMON 8
@@ -76,7 +76,7 @@ Dump the contents of the profile buffers into a
 .Pa gmon.out
 file.
 .It Fl r
-Reset all the profile buffers. 
+Reset all the profile buffers.
 If the
 .Fl p
 flag is also specified, the
@@ -88,11 +88,11 @@ instead of the default
 .Pa /dev/kmem .
 .It Fl N
 Extract the name list from the specified system instead of the
-default 
+default
 .Pa /bsd .
 .El
 .Pp
-If neither 
+If neither
 .Fl b
 nor
 .Fl h
@@ -117,8 +117,8 @@ default memory
 Users with only read permission on
 .Pa /dev/kmem
 cannot change the state
-of profiling collection. 
-They can get a 
+of profiling collection.
+They can get a
 .Pa gmon.out
 file with the warning that the data may be
 inconsistent if profiling is in progress.
diff --git a/usr.sbin/kvm_mkdb/kvm_mkdb.8 b/usr.sbin/kvm_mkdb/kvm_mkdb.8
index a6c6b9053ee..eacd754e02c 100644
--- a/usr.sbin/kvm_mkdb/kvm_mkdb.8
+++ b/usr.sbin/kvm_mkdb/kvm_mkdb.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)kvm_mkdb.8	8.1 (Berkeley) 6/9/93
-.\"	$Id: kvm_mkdb.8,v 1.5 1999/04/18 17:11:10 espie Exp $
+.\"	$Id: kvm_mkdb.8,v 1.6 1999/06/05 22:17:14 aaron Exp $
 .\"
 .Dd June 9, 1993
 .Dt KVM_MKDB 8
@@ -43,24 +43,27 @@
 .Op Fl v
 .Op file
 .Sh DESCRIPTION
-.Nm Kvm_mkdb
+.Nm kvm_mkdb
 creates a database in
 .Pa /var/db
 containing information about the specified file.
 If no file is specified,
 .Pa /bsd
 is used by default.
-The file is named ``kvm_filename.db'', where ``filename'' is the
-name of the file read.
+The file is named
+.Pa kvm_filename.db ,
+where
+.Ar filename
+is the name of the file read.
 Various library routines consult this database.
 The only information currently stored is the kernel namelist, which is
 used by the
 .Xr kvm_nlist 3
-function.  However, in the future the database may contain other static
+function. However, in the future the database may contain other static
 information about the current system.
 .Pp
 The
-.Fl v 
+.Fl v
 option yields slightly more verbose operation.
 .Sh FILES
 .Bl -tag -width /var/db/kvm_bsd.db -compact
diff --git a/usr.sbin/lpr/lpc/lpc.8 b/usr.sbin/lpr/lpc/lpc.8
index 1d7285d0eab..264b162a3c7 100644
--- a/usr.sbin/lpr/lpc/lpc.8
+++ b/usr.sbin/lpr/lpc/lpc.8
@@ -46,7 +46,7 @@
 .Sh DESCRIPTION
 .Nm lpc
 is used by the system administrator to control the
-operation of the line printer system.  
+operation of the line printer system.
 For each line printer configured in
 .Pa /etc/printcap ,
 .Nm lpc
@@ -111,7 +111,7 @@ This is normally used to take a printer down and let others know why
 will indicate the printer is down and print the status message.
 .Pp
 .It Ic enable  No {\ all\ |\ printer\ }
-Enable spooling on the local queue for the listed printers. 
+Enable spooling on the local queue for the listed printers.
 This will allow
 .Xr lpr 1
 to put new jobs in the spool queue.
@@ -122,11 +122,11 @@ Exit from lpc.
 .ne 1i
 .Pp
 .It Ic restart  No {\ all\ |\ printer\ }
-Attempt to start a new printer daemon. 
+Attempt to start a new printer daemon.
 This is useful when some abnormal condition causes the daemon to
 die unexpectedly, leaving jobs in the queue.
 .Xr Lpq
-will report that there is no daemon present when this condition occurs. 
+will report that there is no daemon present when this condition occurs.
 If the user is the super-user,
 try to abort the current daemon first (i.e., kill and restart a stuck daemon).
 .Pp
diff --git a/usr.sbin/lpr/lpd/lpd.8 b/usr.sbin/lpr/lpd/lpd.8
index fb119db5287..9a0d06d5319 100644
--- a/usr.sbin/lpr/lpd/lpd.8
+++ b/usr.sbin/lpr/lpd/lpd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: lpd.8,v 1.7 1999/05/23 14:11:34 aaron Exp $
+.\"	$OpenBSD: lpd.8,v 1.8 1999/06/05 22:17:17 aaron Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -96,7 +96,7 @@ The daemon begins processing files
 after it has successfully set the lock for exclusive
 access (described a bit later),
 and scans the spool directory
-for files beginning with 
+for files beginning with
 .Em cf .
 Lines in each
 .Em cf
@@ -177,7 +177,7 @@ Indent.  The number of characters to indent the output by (in ascii).
 Unlink.  Name of file to remove upon completion of printing.
 .It N
 File name.  The name of the file which is being printed, or a blank
-for the standard input (when 
+for the standard input (when
 .Xr lpr 1
 is invoked in a pipeline).
 .El
diff --git a/usr.sbin/lpr/lprm/lprm.1 b/usr.sbin/lpr/lprm/lprm.1
index e52ce2b1cfd..0bdd955b8ad 100644
--- a/usr.sbin/lpr/lprm/lprm.1
+++ b/usr.sbin/lpr/lprm/lprm.1
@@ -115,7 +115,7 @@ exists,
 and a printer has not been specified with the
 .Fl P
 option,
-the default printer is assumed from 
+the default printer is assumed from
 .Ev PRINTER .
 .El
 .Sh FILES
diff --git a/usr.sbin/map-mbone/map-mbone.8 b/usr.sbin/map-mbone/map-mbone.8
index 3c54a50d84f..9a472b8e00c 100644
--- a/usr.sbin/map-mbone/map-mbone.8
+++ b/usr.sbin/map-mbone/map-mbone.8
@@ -10,16 +10,16 @@ map-mbone \- Multicast connection mapper
 .B \-d
 .I debug_level
 ] [
-.B \-f 
+.B \-f
 ] [
-.B \-g 
+.B \-g
 ] [
-.B \-n 
+.B \-n
 ] [
-.B \-r 
+.B \-r
 .I retry_count
 ] [
-.B \-t 
+.B \-t
 .I timeout_count
 ] [
 .B starting_router
@@ -30,18 +30,18 @@ attempts to display all multicast routers that are reachable from the multicast
 .I starting_router.
 If not specified on the command line, the default multicast
 .I starting_router
-is the localhost. 
+is the localhost.
 .PP
 .I map-mbone
 traverses neighboring multicast routers by sending the ASK_NEIGHBORS IGMP
 message to the multicast starting_router. If this multicast router responds,
 the version number and a list of their neighboring multicast router addresses is
 part of that response. If the responding router has recent multicast version
-number, then 
+number, then
 .I map-mbone
 requests additional information such as metrics, thresholds, and flags from the
-multicast router. For each new occurrence of neighboring multicast router in 
-the reply and provided the flooding option has been selected, then 
+multicast router. For each new occurrence of neighboring multicast router in
+the reply and provided the flooding option has been selected, then
 .I map-mbone
 asks each of this multicast router for a list of neighbors. This search
 for unique routers will continue until no new neighboring multicast routers
@@ -53,7 +53,7 @@ are reported.
 "\-d" option sets the debug level. When the debug level is greater than the
 default value of 0, addition debugging messages are printed. Regardless of
 the debug level, an error condition, will always write an error message and will
-cause 
+cause
 .I map-mbone
 to terminate.
 Non-zero debug levels have the following effects:
diff --git a/usr.sbin/mopd/mopa.out/mopa.out.1 b/usr.sbin/mopd/mopa.out/mopa.out.1
index 342496f2472..9dce4b7222b 100644
--- a/usr.sbin/mopd/mopa.out/mopa.out.1
+++ b/usr.sbin/mopd/mopa.out/mopa.out.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mopa.out.1,v 1.4 1999/05/16 19:58:12 alex Exp $
+.\"	$OpenBSD: mopa.out.1,v 1.5 1999/06/05 22:17:21 aaron Exp $
 .\"
 .\" Copyright (c) 1996 Mats O Jansson.  All rights reserved.
 .\"
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" @(#) $OpenBSD: mopa.out.1,v 1.4 1999/05/16 19:58:12 alex Exp $
+.\" @(#) $OpenBSD: mopa.out.1,v 1.5 1999/06/05 22:17:21 aaron Exp $
 .\"
 .Dd August 11, 1996
 .Dt MOPA.OUT 1
@@ -46,9 +46,9 @@ This program will check if
 .Xr a.out 5
 machine-id is recognized. If not it will try to swap the
 .Xr a.out 5
-header, and try again. 
+header, and try again.
 .Sh BUGS
-This program just supports the VAX machine-id for now. 
+This program just supports the VAX machine-id for now.
 .Sh SEE ALSO
 .Xr mopchk 1 ,
 .Xr mopprobe 1 ,
diff --git a/usr.sbin/mopd/mopchk/mopchk.1 b/usr.sbin/mopd/mopchk/mopchk.1
index efec6d806fb..150a29cef27 100644
--- a/usr.sbin/mopd/mopchk/mopchk.1
+++ b/usr.sbin/mopd/mopchk/mopchk.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mopchk.1,v 1.4 1999/05/15 02:17:58 aaron Exp $
+.\"	$OpenBSD: mopchk.1,v 1.5 1999/06/05 22:17:22 aaron Exp $
 .\"
 .\" Copyright (c) 1996 Mats O Jansson.  All rights reserved.
 .\"
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" @(#) $OpenBSD: mopchk.1,v 1.4 1999/05/15 02:17:58 aaron Exp $
+.\" @(#) $OpenBSD: mopchk.1,v 1.5 1999/06/05 22:17:22 aaron Exp $
 .\"
 .Dd October 2, 1995
 .Dt MOPCHK 1
@@ -35,12 +35,12 @@
 .Nm mopchk
 .Nd MOP check utility
 .Sh SYNOPSIS
-.Nm mopchk 
+.Nm mopchk
 .Op Fl a
 .Op Fl v
 .Op Ar filename
 .Sh DESCRIPTION
-.Nm mopchk
+.Nm
 shows information about which devices are known, version of mopd suite or
 information about a MOP-image.
 .Pp
diff --git a/usr.sbin/mopd/mopd/mopd.8 b/usr.sbin/mopd/mopd/mopd.8
index d34b762cefa..38e4aa7b17a 100644
--- a/usr.sbin/mopd/mopd/mopd.8
+++ b/usr.sbin/mopd/mopd/mopd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mopd.8,v 1.4 1999/05/15 00:56:08 aaron Exp $
+.\"	$OpenBSD: mopd.8,v 1.5 1999/06/05 22:17:23 aaron Exp $
 .\"
 .\" Copyright (c) 1993-96 Mats O Jansson.  All rights reserved.
 .\"
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" @(#) $OpenBSD: mopd.8,v 1.4 1999/05/15 00:56:08 aaron Exp $
+.\" @(#) $OpenBSD: mopd.8,v 1.5 1999/06/05 22:17:23 aaron Exp $
 .\"
 .Dd September 24, 1995
 .Dt MOPD 8
@@ -52,7 +52,7 @@ If a filename isn't given
 .Nm mopd
 must know what image to load.
 .Pp
-Upon receiving a request, 
+Upon receiving a request,
 .Nm mopd
 checks if the requested file exists in
 .Pa /tftpboot/mop .
@@ -68,24 +68,24 @@ supports two kinds of files. The file is first checked to see if it is in
 .Xr a.out 5
 format. If not, a few of Digital's formats are checked.
 .Pp
-In normal operation, 
+In normal operation,
 .Nm mopd
 forks a copy of itself and runs in
-the background.  Anomalies and errors are reported via 
+the background.  Anomalies and errors are reported via
 .Xr syslog 3 .
 .Pp
 The options are as follows:
 .Bl -tag -width indent
 .It Fl a
 Listen on all the Ethernets attached to the system.
-If 
-.Fl a 
+If
+.Fl a
 is omitted, an interface must be specified.
 .It Fl d
 Run in debug mode, with all the output to stdout. The process will run in
 the foreground.
 .It Fl f
-Run in the foreground. 
+Run in the foreground.
 .El
 .Sh BUGS
 .Xr a.out 5
@@ -100,13 +100,13 @@ isn't supported yet on non-BSD implementations (otherOS).
 .Xr mopprobe 1 ,
 .Xr moptrace 1 ,
 .Xr bpf 4
-.Rs 
-DECnet Digital Network Architecture Phase IV, 
+.Rs
+DECnet Digital Network Architecture Phase IV,
 .%R Maintenance Operations Functional Specification V3.0.0
 .%N AA-X436A-TK
 .Re
-.Rs 
-DECnet Digital Network Architecture, 
+.Rs
+DECnet Digital Network Architecture,
 .%R Maintenance Operations Protocol Functional Specification V4.0.0
 .%N EK-DNA11-FS-001
 .Re
diff --git a/usr.sbin/mopd/mopprobe/mopprobe.1 b/usr.sbin/mopd/mopprobe/mopprobe.1
index 244558d3cd0..ed9ff29bf0b 100644
--- a/usr.sbin/mopd/mopprobe/mopprobe.1
+++ b/usr.sbin/mopd/mopprobe/mopprobe.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mopprobe.1,v 1.4 1999/05/15 02:17:57 aaron Exp $
+.\"	$OpenBSD: mopprobe.1,v 1.5 1999/06/05 22:17:24 aaron Exp $
 .\"
 .\" Copyright (c) 1996 Mats O Jansson.  All rights reserved.
 .\"
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" @(#) $OpenBSD: mopprobe.1,v 1.4 1999/05/15 02:17:57 aaron Exp $
+.\" @(#) $OpenBSD: mopprobe.1,v 1.5 1999/06/05 22:17:24 aaron Exp $
 .\"
 .Dd October 2, 1995
 .Dt MOPPROBE 1
@@ -35,13 +35,13 @@
 .Nm mopprobe
 .Nd MOP Probe Utility
 .Sh SYNOPSIS
-.Nm mopprobe 
+.Nm mopprobe
 .Fl a
 .Op Fl 3 | 4
 .Op Fl o
 .Op Fl v
 .Pp
-.Nm mopprobe 
+.Nm mopprobe
 .Op Fl 3 | 4
 .Op Fl o
 .Op Fl v
@@ -51,7 +51,7 @@
 prints the Ethernet address and nodename of DECserver 100/200/250/300 on the
 Ethernet connected to
 .Ar interface
-or all known interfaces if 
+or all known interfaces if
 .Fl a
 is given.
 .Sq Fl a
@@ -64,8 +64,8 @@ all MOP/RC SID messages will be shown (e.g. machines running DECnet).
 .Bl -tag -width indent
 .It Fl a
 Listen on all the Ethernets attached to the system.
-If 
-.Fl a 
+If
+.Fl a
 is omitted, an interface must be specified.
 .It Fl 3
 Ignore MOP V3 messages (Ethernet II).
diff --git a/usr.sbin/mopd/moptrace/moptrace.1 b/usr.sbin/mopd/moptrace/moptrace.1
index 6dcd97f9d9b..d486a655e8c 100644
--- a/usr.sbin/mopd/moptrace/moptrace.1
+++ b/usr.sbin/mopd/moptrace/moptrace.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: moptrace.1,v 1.3 1999/05/15 02:17:59 aaron Exp $
+.\"	$OpenBSD: moptrace.1,v 1.4 1999/06/05 22:17:27 aaron Exp $
 .\"
 .\" Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
 .\"
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" @(#) $OpenBSD: moptrace.1,v 1.3 1999/05/15 02:17:59 aaron Exp $
+.\" @(#) $OpenBSD: moptrace.1,v 1.4 1999/06/05 22:17:27 aaron Exp $
 .\"
 .Dd October 2, 1995
 .Dt MOPTRACE 1
@@ -35,12 +35,12 @@
 .Nm moptrace
 .Nd MOP Trace Utility
 .Sh SYNOPSIS
-.Nm moptrace 
+.Nm moptrace
 .Op Fl a
 .Op Fl d
 .Op Fl 3 | 4
 .Pp
-.Nm moptrace 
+.Nm moptrace
 .Op Fl d
 .Op Fl 3 | 4
 .Op Ar interface
@@ -48,15 +48,15 @@
 .Nm moptrace
 prints the contents of MOP packages on the Ethernet connected to
 .Ar interface
-or all known interfaces if 
+or all known interfaces if
 .Fl a
 is given.
 .Sh OPTIONS
 .Bl -tag -width indent
 .It Fl a
 Listen on all the Ethernets attached to the system.
-If 
-.Fl a 
+If
+.Fl a
 is omitted, an interface must be specified.
 .It Fl d
 Run in debug mode, with all the output to stderr.
@@ -70,13 +70,13 @@ Ignore MOP V4 messages (Ethernet 802.3).
 .Xr mopchk 1 ,
 .Xr mopprobe 1 ,
 .Xr mopd 8
-.Rs 
-DECnet Digital Network Architecture Phase IV, 
+.Rs
+DECnet Digital Network Architecture Phase IV,
 .%R Maintenance Operations Functional Specification V3.0.0
 .%N AA-X436A-TK
 .Re
-.Rs 
-DECnet Digital Network Architecture, 
+.Rs
+DECnet Digital Network Architecture,
 .%R Maintenance Operations Protocol Functional Specification V4.0.0
 .%N EK-DNA11-FS-001
 .Re
diff --git a/usr.sbin/mrinfo/mrinfo.8 b/usr.sbin/mrinfo/mrinfo.8
index 60174c8686b..8801a22971e 100644
--- a/usr.sbin/mrinfo/mrinfo.8
+++ b/usr.sbin/mrinfo/mrinfo.8
@@ -10,12 +10,12 @@ mrinfo \- Displays configuration info from a multicast router
 .B \-d
 .I debug_level
 ] [
-.B \-r 
+.B \-r
 .I retry_count
 ] [
-.B \-t 
+.B \-t
 .I timeout_count
-] 
+]
 .B multicast_router
 
 .SH DESCRIPTION
@@ -27,7 +27,7 @@ attempts to display the configuration information from the multicast router
 uses the ASK_NEIGHBORS IGMP message to the specified multicast router. If this
 multicast router responds, the version number and a list of their neighboring
 multicast router addresses is part of that response. If the responding router
-has a recent multicast version number, then 
+has a recent multicast version number, then
 .I mrinfo
 requests additional information such as metrics, thresholds, and flags from the
 multicast router. Once the specified multicast router responds, the
@@ -39,7 +39,7 @@ configuration is displayed to the standard output.
 "\-d" option sets the debug level. When the debug level is greater than the
 default value of 0, addition debugging messages are printed. Regardless of
 the debug level, an error condition, will always write an error message and will
-cause 
+cause
 .I mrinfo
 to terminate.
 Non-zero debug levels have the following effects:
diff --git a/usr.sbin/mrouted/mrouted.8 b/usr.sbin/mrouted/mrouted.8
index 33d6a631b7d..fb9f82adc3d 100644
--- a/usr.sbin/mrouted/mrouted.8
+++ b/usr.sbin/mrouted/mrouted.8
@@ -5,26 +5,26 @@
 .SH NAME
 mrouted \- IP multicast routing daemon
 .SH SYNOPSIS
-.B mrouted 
+.B mrouted
 [
 .B \-p
 ] [
-.B \-c 
+.B \-c
 .I config_file
 ] [
-.B \-d 
-[ 
+.B \-d
+[
 .I debug_level
 ]]
 .SH DESCRIPTION
-.I Mrouted 
+.I Mrouted
 is an implementation of the Distance-Vector Multicast Routing
 Protocol (DVMRP), an earlier version of which is specified in RFC-1075.
 It maintains topological knowledge via a distance-vector routing protocol
 (like RIP, described in RFC-1058), upon which it implements a multicast
 datagram forwarding algorithm called Reverse Path Multicasting.
 .PP
-.I Mrouted 
+.I Mrouted
 forwards a multicast datagram along a shortest (reverse) path tree
 rooted at the subnet on which the datagram originates. The multicast
 delivery tree may be thought of as a broadcast delivery tree that has
@@ -35,55 +35,55 @@ multicast group. The IP time-to-live of a multicast datagram can be
 used to limit the range of multicast datagrams.
 .PP
 In order to support multicasting among subnets that are separated by (unicast)
-routers that do not support IP multicasting, 
-.I mrouted 
+routers that do not support IP multicasting,
+.I mrouted
 includes support for
-"tunnels", which are virtual point-to-point links between pairs of 
+"tunnels", which are virtual point-to-point links between pairs of
 .IR mrouted s
 located anywhere in an internet.  IP multicast packets are encapsulated for
 transmission through tunnels, so that they look like normal unicast datagrams
-to intervening routers and subnets.  The encapsulation 
+to intervening routers and subnets.  The encapsulation
 is added on entry to a tunnel, and stripped off
 on exit from a tunnel.
 By default, the packets are encapsulated using the IP-in-IP protocol
 (IP protocol number 4).
-Older versions of 
+Older versions of
 .I mrouted
 tunnel using IP source routing, which puts a heavy load on some
 types of routers.
 This version does not support IP source route tunnelling.
 .PP
-The tunnelling mechanism allows 
-.I mrouted 
+The tunnelling mechanism allows
+.I mrouted
 to establish a virtual internet, for
 the purpose of multicasting only, which is independent of the physical
 internet, and which may span multiple Autonomous Systems.  This capability
 is intended for experimental support of internet multicasting only, pending
 widespread support for multicast routing by the regular (unicast) routers.
-.I Mrouted 
+.I Mrouted
 suffers from the well-known scaling problems of any distance-vector
 routing protocol, and does not (yet) support hierarchical multicast routing.
 .PP
-.I Mrouted 
+.I Mrouted
 handles multicast routing only; there may or may not be unicast routing
-software running on the same machine as 
+software running on the same machine as
 .IR mrouted .
 With the use of tunnels, it
-is not necessary for 
-.I mrouted 
+is not necessary for
+.I mrouted
 to have access to more than one physical subnet
 in order to perform multicast forwarding.
 .br
 .ne 5
 .SH INVOCATION
 .PP
-If no "\-d" option is given, or if the debug level is specified as 0, 
+If no "\-d" option is given, or if the debug level is specified as 0,
 .I mrouted
 detaches from the invoking terminal.  Otherwise, it remains attached to the
 invoking terminal and responsive to signals from that terminal.  If "\-d" is
 given with no argument, the debug level defaults to 2.  Regardless of the
-debug level, 
-.I mrouted 
+debug level,
+.I mrouted
 always writes warning and error messages to the system
 log daemon.  Non-zero debug levels have the following effects:
 .IP "level 1"
@@ -98,7 +98,7 @@ arrivals and departures are printed to stderr.
 Upon startup, mrouted writes its pid to the file /var/run/mrouted.pid .
 .SH CONFIGURATION
 .PP
-.I Mrouted 
+.I Mrouted
 automatically configures itself to forward on all multicast-capable
 interfaces, i.e., interfaces that have the IFF_MULTICAST flag set (excluding
 the loopback "interface"), and it finds other
@@ -140,7 +140,7 @@ options may be specified as many times as necessary.
 The phyint command can be used to disable multicast routing on the physical
 interface identified by local IP address <local-addr>, or to associate a
 non-default metric or threshold with the specified physical interface.
-The local IP address <local-addr> may be replaced by the 
+The local IP address <local-addr> may be replaced by the
 interface name (e.g le0).
 If a phyint is attached to multiple IP subnets, describe each additional subnet
 with the altnet keyword.
@@ -157,7 +157,7 @@ The tunnel must be set
 up in the mrouted.conf files of both routers before it can be used.
 '\"For backwards compatibility with older
 '\".IR mrouted s,
-'\"the srcrt keyword specifies 
+'\"the srcrt keyword specifies
 '\"encapsulation using IP source routing.
 .PP
 The cache_lifetime is a value that determines the amount of time that a
@@ -166,9 +166,9 @@ entry should lie between 300 (5 min) and 86400 (1 day). It defaults to 300.
 .PP
 The pruning <off/on> option is provided for
 .IR mrouted
-to act as a non-pruning router. It is also possible to start 
+to act as a non-pruning router. It is also possible to start
 .IR mrouted
-in a non-pruning mode using the "-p" option on the command line. It is 
+in a non-pruning mode using the "-p" option on the command line. It is
 expected that a router would be configured in this manner for test
 purposes only. The default mode is pruning enabled.
 .PP
@@ -179,7 +179,7 @@ can accept either a name or a boundary.
 The metric is the "cost" associated with sending a datagram on the given
 interface or tunnel; it may be used to influence the choice of routes.
 The metric defaults to 1.  Metrics should be kept as small as possible,
-because 
+because
 .I mrouted
 cannot route along paths with a sum of metrics greater
 than 31.
@@ -195,7 +195,7 @@ In general, all
 connected to a particular subnet or tunnel should
 use the same metric and threshold for that subnet or tunnel.
 .PP
-The rate_limit option allows the network administrator to specify a 
+The rate_limit option allows the network administrator to specify a
 certain bandwidth in Kbits/second which would be allocated to multicast
 traffic.  It defaults to 500Kbps on tunnels, and 0 (unlimited) on physical
 interfaces.
@@ -210,7 +210,7 @@ a name or a boundary spec.
 will not initiate execution if it has fewer than two enabled vifs,
 where a vif (virtual interface) is either a physical multicast-capable
 interface or a tunnel.  It will log a warning if all of its vifs are
-tunnels; such an 
+tunnels; such an
 .I mrouted
 configuration would be better replaced by more
 direct tunnels (i.e., eliminate the middle man).
@@ -255,7 +255,7 @@ tunnel 192.168.5.4 10.11.12.13 metric 1 threshold 32
 .fi
 .SH SIGNALS
 .PP
-.I Mrouted 
+.I Mrouted
 responds to the following signals:
 .IP HUP
 restarts
@@ -272,8 +272,8 @@ dumps the internal routing tables to /var/tmp/mrouted.dump.
 dumps the internal cache tables to /var/tmp/mrouted.cache.
 .IP QUIT
 dumps the internal routing tables to stderr (only if
-.I mrouted 
-was invoked with a non-zero debug level). 
+.I mrouted
+was invoked with a non-zero debug level).
 .PP
 For convenience in sending signals,
 .I mrouted
@@ -293,13 +293,13 @@ Virtual Interface Table
                   pkts out: 2322323
 
   1   36.11.0.1     subnet: 36.11         1       1    querier
-                    groups: 224.0.2.1      
-                            224.0.1.0      
-                            224.0.0.4      
+                    groups: 224.0.2.1
+                            224.0.1.0
+                            224.0.0.4
                    pkts in: 345
                   pkts out: 3456
 
-  2   36.2.0.8      tunnel: 36.8.0.77     3       1   
+  2   36.2.0.8      tunnel: 36.8.0.77     3       1
                      peers: 36.8.0.77 (2.2)
                 boundaries: 239.0.1
                           : 239.1.2
@@ -321,7 +321,7 @@ Multicast Routing Table (1136 entries)
 In this example, there are four vifs connecting to two subnets and two
 tunnels.  The vif 3 tunnel is not in use (no peer address). The vif 0 and
 vif 1 subnets have some groups present; tunnels never have any groups.  This
-instance of 
+instance of
 .I mrouted
 is the one responsible for sending periodic group
 membership queries on the vif 0 and vif 1 subnets, as indicated by the
@@ -339,9 +339,9 @@ origin, and a multicast datagram from that origin will be forwarded on that
 outgoing vif only if there are members of the destination group on that leaf.
 .bp
 .PP
-.I Mrouted 
+.I Mrouted
 also maintains a copy of the kernel forwarding cache table. Entries
-are created and deleted by 
+are created and deleted by
 .I mrouted.
 .PP
 The cache tables look like this:
@@ -349,17 +349,17 @@ The cache tables look like this:
 
 Multicast Routing Cache Table (147 entries)
  Origin             Mcast-group     CTmr  Age Ptmr IVif Forwvifs
- 13.2.116/22        224.2.127.255     3m   2m    -  0    1 
+ 13.2.116/22        224.2.127.255     3m   2m    -  0    1
 >13.2.116.19
 >13.2.116.196
- 138.96.48/21       224.2.127.255     5m   2m    -  0    1 
+ 138.96.48/21       224.2.127.255     5m   2m    -  0    1
 >138.96.48.108
- 128.9.160/20       224.2.127.255     3m   2m    -  0    1 
+ 128.9.160/20       224.2.127.255     3m   2m    -  0    1
 >128.9.160.45
- 198.106.194/24     224.2.135.190     9m  28s   9m  0P  
+ 198.106.194/24     224.2.135.190     9m  28s   9m  0P
 >198.106.194.22
 
-.fi 
+.fi
 Each entry is characterized by the origin subnet number and mask and the
 destination multicast group. The 'CTmr' field indicates the lifetime
 of the entry.  The entry is deleted from the cache table
diff --git a/usr.sbin/mtrace/mtrace.8 b/usr.sbin/mtrace/mtrace.8
index 66ac0fb802c..eb9cc75ee05 100644
--- a/usr.sbin/mtrace/mtrace.8
+++ b/usr.sbin/mtrace/mtrace.8
@@ -150,7 +150,7 @@ and the response destination.
 .TP 8 8
 .B \-l
 Loop indefinitely printing packet rate and loss statistics for the
-multicast path every 10 seconds (see 
+multicast path every 10 seconds (see
 .B \-S
 .IR stat_int ).
 .TP 8 8
@@ -353,13 +353,13 @@ output might be:
 .ft C
 oak.isi.edu 80# mtrace -l caraway.lcs.mit.edu 224.2.0.3
 Mtrace from 18.26.0.170 to 128.9.160.100 via group 224.2.0.3
-Querying full reverse path... 
+Querying full reverse path...
   0  oak.isi.edu (128.9.160.100)
- -1  cub.isi.edu (128.9.160.153)  DVMRP  thresh^ 1  3 ms  
- -2  la.dart.net (140.173.128.1)  DVMRP  thresh^ 1  14 ms  
- -3  dc.dart.net (140.173.64.1)  DVMRP  thresh^ 1  50 ms  
- -4  bbn.dart.net (140.173.32.1)  DVMRP  thresh^ 1  63 ms  
- -5  mit.dart.net (140.173.48.2)  DVMRP  thresh^ 1  71 ms  
+ -1  cub.isi.edu (128.9.160.153)  DVMRP  thresh^ 1  3 ms
+ -2  la.dart.net (140.173.128.1)  DVMRP  thresh^ 1  14 ms
+ -3  dc.dart.net (140.173.64.1)  DVMRP  thresh^ 1  50 ms
+ -4  bbn.dart.net (140.173.32.1)  DVMRP  thresh^ 1  63 ms
+ -5  mit.dart.net (140.173.48.2)  DVMRP  thresh^ 1  71 ms
  -6  caraway.lcs.mit.edu (18.26.0.170)
 Round trip time 124 ms
 .fi
@@ -415,23 +415,23 @@ Waiting to accumulate statistics... Results after 101 seconds:
 18.26.0.170    128.9.160.100  All Multicast Traffic  From 18.26.0.170
      |       __/ rtt  125 ms  Lost/Sent = Pct  Rate    To 224.2.0.3
      v      /    hop   65 ms  ---------------------  ------------------
-18.26.0.144    
-140.173.48.2   mit.dart.net          
+18.26.0.144
+140.173.48.2   mit.dart.net
      |     ^     ttl    1      0/6    = --%   0 pps   0/2  = --%  0 pps
      v     |     hop    8 ms   1/52   =  2%   0 pps   0/18 =  0%  0 pps
-140.173.48.1   
+140.173.48.1
 140.173.32.1   bbn.dart.net
      |     ^     ttl    2      0/6    = --%   0 pps   0/2  = --%  0 pps
      v     |     hop   12 ms   1/52   =  2%   0 pps   0/18 =  0%  0 pps
-140.173.32.2   
-140.173.64.1   dc.dart.net 
+140.173.32.2
+140.173.64.1   dc.dart.net
      |     ^     ttl    3      0/271  =  0%  27 pps   0/2  = --%  0 pps
      v     |     hop   34 ms  -1/2652 =  0%  26 pps   0/18 =  0%  0 pps
-140.173.64.2   
+140.173.64.2
 140.173.128.1  la.dart.net
      |     ^     ttl    4     -2/831  =  0%  83 pps   0/2  = --%  0 pps
      v     |     hop   11 ms  -3/8072 =  0%  79 pps   0/18 =  0%  0 pps
-140.173.128.2  
+140.173.128.2
 128.9.160.153  cub.isi.edu
      |      \\__  ttl    5        833         83 pps     2         0 pps
      v         \\ hop   -8 ms     8075        79 pps     18        0 pps
@@ -491,8 +491,8 @@ Mtrace from 204.62.246.73 to 18.26.0.151 via group 224.2.143.24
 Querying full reverse path... * switching to hop-by-hop:
   0  butter.lcs.mit.edu (18.26.0.151)
  -1  jam.lcs.mit.edu (18.26.0.144)  DVMRP  thresh^ 1  33 ms  Route pruned
- -2  bbn.dart.net (140.173.48.1)  DVMRP  thresh^ 1  36 ms  
- -3  dc.dart.net (140.173.32.2)  DVMRP  thresh^ 1  44 ms  
+ -2  bbn.dart.net (140.173.48.1)  DVMRP  thresh^ 1  36 ms
+ -3  dc.dart.net (140.173.32.2)  DVMRP  thresh^ 1  44 ms
  -4  darpa.dart.net (140.173.240.2)  DVMRP  thresh^ 16  47 ms
  -5  * * * noc.hpc.org (192.187.8.2) [mrouted 2.2] didn't respond
 Round trip time 95 ms
@@ -508,7 +508,7 @@ format of
 .B mtrace
 are modeled after the unicast
 .B traceroute
-program written by Van Jacobson. 
+program written by Van Jacobson.
 .SH SEE ALSO
 .BR mrouted (8) ,
 .BR mrinfo (8) ,
diff --git a/usr.sbin/mtree/mtree.8 b/usr.sbin/mtree/mtree.8
index f870c6cb873..aab2ef221c0 100644
--- a/usr.sbin/mtree/mtree.8
+++ b/usr.sbin/mtree/mtree.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mtree.8,v 1.9 1999/05/16 19:58:13 alex Exp $
+.\"	$OpenBSD: mtree.8,v 1.10 1999/06/05 22:17:32 aaron Exp $
 .\"	$NetBSD: mtree.8,v 1.4 1995/03/07 21:26:25 cgd Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
@@ -66,9 +66,9 @@ Ignore everything except directory type files.
 .It Fl e
 Don't complain about files that are in the file hierarchy, but not in the
 specification.
-.It Fl f
-Read the specification from
-.Ar file  ,
+.It Fl f Ar spec
+Read the specification from file
+.Ar spec ,
 instead of from the standard input.
 .It Fl i
 Indents the output 4 spaces each time a directory level is descended when
@@ -78,31 +78,33 @@ option.
 This does not effect either the /set statements or the comment before each
 directory.
 It does however effect the comment before the close of each directory.
-.It Fl K
+.It Fl K Ar keywords
 Add the specified (whitespace or comma separated) keywords to the current
 set of keywords.
-.It Fl k
-Use the ``type'' keyword plus the specified (whitespace or comma separated)
+.It Fl k Ar keywords
+Use the
+.Dq type
+keyword plus the specified (whitespace or comma separated)
 keywords instead of the current set of keywords.
 .It Fl n
-Do not emit pathname comments when creating a specification.  Normally 
+Do not emit pathname comments when creating a specification.  Normally
 a comment is emitted before each directory and before the close of that
-directory when using the 
+directory when using the
 .Fl c
 option.
-.It Fl p
+.It Fl p Ar path
 Use the file hierarchy rooted in
 .Ar path  ,
 instead of the current directory.
 .It Fl q
 Quiet mode.  Do not complain when a
-.Sq missing
+.Dq missing
 directory can not be created because it is already exists.  This occurs
 when the directory is a symbolic link.
 .It Fl r
 Remove any files in the file hierarchy that are not described in the
 specification.
-.It Fl s
+.It Fl s Ar seed
 Display a single checksum to the standard error output that represents all
 of the files for which the keyword
 .Cm cksum
@@ -110,7 +112,8 @@ was specified.
 The checksum is seeded with the specified value.
 .It Fl t
 If a file's timestamp is different from the specification,
-``touch'' it to match the specification (and list as modified).
+.Dq touch
+it to match the specification (and list as modified).
 .It Fl U
 Modify the owner, group, and permissions of existing files to match
 the specification and create any missing directories.
@@ -127,8 +130,9 @@ did not match the specification.
 Don't descend below mount points in the file hierarchy.
 .El
 .Pp
-Specifications are mostly composed of ``keywords'', i.e. strings that
-that specify values relating to files.
+Specifications are mostly composed of
+.Dq keywords ,
+(i.e., strings that specify values relating to files).
 No keywords have default values, and if a keyword has no value set, no
 checks based on it are performed.
 .Pp
@@ -203,15 +207,19 @@ and
 There are four types of lines in a specification.
 .Pp
 The first type of line sets a global value for a keyword, and consists of
-the string ``/set'' followed by whitespace, followed by sets of keyword/value
+the string
+.Dq /set
+followed by whitespace, followed by sets of keyword/value
 pairs, separated by whitespace.
 Keyword/value pairs consist of a keyword, followed by an equals sign
-(``=''), followed by a value, without whitespace characters.
+.Pq Sq = ,
+followed by a value, without whitespace characters.
 Once a keyword has been set, its value remains unchanged until either
 reset or unset.
 .Pp
 The second type of line unsets keywords and consists of the string
-``/unset'', followed by whitespace, followed by one or more keywords,
+.Dq /unset ,
+followed by whitespace, followed by one or more keywords,
 separated by whitespace.
 .Pp
 The third type of line is a file specification and consists of a file
@@ -219,12 +227,20 @@ name, followed by whitespace, followed by zero or more whitespace
 separated keyword/value pairs.
 The file name may be preceded by whitespace characters.
 The file name may contain any of the standard file name matching
-characters (``['', ``]'', ``?'' or ``*''), in which case files
-in the hierarchy will be associated with the first pattern that
+characters
+.Po
+.Dq [ ,
+.Dq ] ,
+.Dq ? ,
+or
+.Dq \&*
+.Pc ,
+in which case files in the hierarchy will be associated with the first
+pattern that they match.
 they match.
 .Pp
 Each of the keyword/value pairs consist of a keyword, followed by an
-equals sign (``=''), followed by the keyword's value, without
+equals sign, followed by the keyword's value, without
 whitespace characters.
 These values override, without changing, the global value of the
 corresponding keyword.
@@ -239,7 +255,9 @@ causes the current directory
 path to ascend one level.
 .Pp
 Empty lines and lines whose first non-whitespace character is a hash
-mark (``#'') are ignored.
+mark
+.Pq Sq #
+are ignored.
 .Pp
 The
 .Nm mtree
@@ -249,7 +267,9 @@ A status of 2 is converted to a status of 0 if the
 .Fl U
 option is used.
 .Sh EXAMPLES
-To detect system binaries that have been ``trojan horsed'', it is recommended
+To detect system binaries that have been
+.Dq trojan horsed ,
+it is recommended
 that
 .Nm mtree
 .Fl K
diff --git a/usr.sbin/named/man/dig.1 b/usr.sbin/named/man/dig.1
index 5fe3fdd39af..8735ee4164a 100644
--- a/usr.sbin/named/man/dig.1
+++ b/usr.sbin/named/man/dig.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dig.1,v 1.12 1999/06/05 01:29:39 aaron Exp $
+.\"	$OpenBSD: dig.1,v 1.13 1999/06/05 22:17:34 aaron Exp $
 .\" $From: dig.1,v 8.2 1997/06/01 20:34:33 vixie Exp $
 .\"
 .\" ++Copyright++ 1993
@@ -85,7 +85,7 @@
 .Op Fl envset
 .Op Fl stick | Fl nostick
 .Oo
-.Cm + Ns Ar keyword Ns 
+.Cm + Ns Ar keyword Ns
 .Oo
 .Cm \= Ns Ar value
 .Oc
@@ -109,11 +109,11 @@ accessible from the command line.
 The usual simple use of
 .Nm
 will take the form:
-.Bd -filled -offset indent 
-.Ic dig 
-.Cm @ Ns Ar server 
-.Ar domain 
-.Ar query-type 
+.Bd -filled -offset indent
+.Ic dig
+.Cm @ Ns Ar server
+.Ar domain
+.Ar query-type
 .Ar query-class
 .Ed
 where:
@@ -134,7 +134,7 @@ dot-notation address. Alternatively, if there is a server
 at your disposal somewhere, all that is required is that
 .Pa /etc/resolv.conf
 be present and indicate where the default
-name servers reside, so that 
+name servers reside, so that
 .Ar server
 itself can be
 resolved. See
@@ -233,8 +233,8 @@ is used to included an argument that is simply not
 parsed. This may be useful if running
 .Nm
 in batch
-mode. Instead of resolving every 
-.Cm @ Ns Ar server-domain-name 
+mode. Instead of resolving every
+.Cm @ Ns Ar server-domain-name
 in a list of queries, you can avoid the overhead of doing
 so, and still have the domain name on the command line
 as a reference. Example:
@@ -380,7 +380,7 @@ subsequent lines (i.e. they are not restored to the
 .Dq sticky
 default).
 .\" .El
-.It Xo Cm + Ns Ar keyword Ns 
+.It Xo Cm + Ns Ar keyword Ns
 .Op = Ns Ar value
 .Xc
 .Dq Li "+"
@@ -392,8 +392,8 @@ of these are the same parameters accepted by
 .Xr nslookup 8 .
 .\" If an option requires a parameter, the form is as
 .\" follows:
-.\" .Bd -ragged -offset indent 
-.\" .Cm + Ns Ar keyword Ns 
+.\" .Bd -ragged -offset indent
+.\" .Cm + Ns Ar keyword Ns
 .\" .Oo
 .\" .Cm \= Ns Ar value
 .\" .Oc
@@ -444,9 +444,9 @@ pfand=#		bitwise and print flags with #
 pfor=#		bitwise or print flags with #
 .fi
 .sp 1
-The 
+The
 .Ar retry
-and 
+and
 .Ar time
 keywords affect the retransmission strategy used by resolver
 library when sending datagram queries. The algorithm is as follows:
diff --git a/usr.sbin/named/man/dnsquery.1 b/usr.sbin/named/man/dnsquery.1
index 76503379595..7c18ea3be92 100644
--- a/usr.sbin/named/man/dnsquery.1
+++ b/usr.sbin/named/man/dnsquery.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dnsquery.1,v 1.4 1997/07/03 09:26:13 deraadt Exp $
+.\"	$OpenBSD: dnsquery.1,v 1.5 1999/06/05 22:17:33 aaron Exp $
 .TH DNSQUERY 1 "10 March 1990"
 .UC 6
 .SH NAME
@@ -11,10 +11,10 @@ dnsquery \- query domain name servers using resolver
 .I type]
 [-c
 .I class]
-[-r 
-.I retry] 
-[-p 
-.I retry_period] 
+[-r
+.I retry]
+[-p
+.I retry_period]
 [-d] [-s] [-v] host
 .SH DESCRIPTION
 The
@@ -32,8 +32,8 @@ are treated without case-sensitivity.
 .SH OPTIONS
 .TP 1i
 .B \-n
-The nameserver to be used in the query.  Nameservers can appear as either 
-Internet addresses of the form w.x.y.z or can appear as domain names.  
+The nameserver to be used in the query.  Nameservers can appear as either
+Internet addresses of the form w.x.y.z or can appear as domain names.
 (default: as specified in /etc/resolv.conf)
 .TP 1i
 .B \-t
@@ -139,7 +139,7 @@ The name of the host (or domain) of interest.
 .br
 <resolv.h>		list of resolver flags
 .SH "SEE ALSO"
-nslookup(1), nstest(1), nsquery(1), 
+nslookup(1), nstest(1), nsquery(1),
 named(8), resolver(3)
 .SH DIAGNOSTICS
 If the resolver fails to answer the query and debugging has not been
diff --git a/usr.sbin/named/man/gethostbyname.3 b/usr.sbin/named/man/gethostbyname.3
index d6d2977a041..cf39542924a 100644
--- a/usr.sbin/named/man/gethostbyname.3
+++ b/usr.sbin/named/man/gethostbyname.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: gethostbyname.3,v 1.2 1997/03/12 10:42:13 downsj Exp $
+.\"	$OpenBSD: gethostbyname.3,v 1.3 1999/06/05 22:17:35 aaron Exp $
 .\" Copyright (c) 1983, 1987 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -61,7 +61,7 @@ following structure describing an internet host
 referenced by name or by address, respectively.
 This structure contains either the information obtained from the name server,
 .IR named (8),
-or broken-out fields from a line in 
+or broken-out fields from a line in
 .IR /etc/hosts .
 If the local name server is not running these routines do a lookup in
 .IR /etc/hosts .
@@ -133,7 +133,7 @@ If the
 .I stayopen
 flag is non-zero,
 this sets the option to send all queries to the name server using TCP
-and to retain the connection after each call to 
+and to retain the connection after each call to
 .I gethostbyname
 or
 .IR gethostbyaddr .
@@ -143,7 +143,7 @@ Otherwise, queries are performed using UDP datagrams.
 closes the TCP connection.
 .SH DIAGNOSTICS
 .PP
-Error return status from 
+Error return status from
 .I gethostbyname
 and
 .I gethostbyaddr
@@ -180,8 +180,8 @@ A retry at some later time may succeed.
 Some unexpected server failure was encountered.
 This is a non-recoverable error.
 .IP NO_DATA \w'HOST_NOT_FOUND'u+2n
-The requested name is valid but does not have an IP address; 
-this is not a temporary error.  
+The requested name is valid but does not have an IP address;
+this is not a temporary error.
 This means that the name is known to the name server but there is no address
 associated with this name.
 Another type of request to the name server using this domain name
@@ -203,7 +203,7 @@ are redefined,
 when
 .IR libc
 is built to use only the routines to lookup in
-.IR /etc/hosts 
+.IR /etc/hosts
 and not the name server.
 .PP
 .I Gethostent
@@ -211,7 +211,7 @@ reads the next line of
 .IR /etc/hosts ,
 opening the file if necessary.
 .PP
-.I Sethostent 
+.I Sethostent
 is redefined to open and rewind the file.  If the
 .I stayopen
 argument is non-zero,
diff --git a/usr.sbin/named/man/getnetent.3 b/usr.sbin/named/man/getnetent.3
index fa9cfedddfc..44c30bad46c 100644
--- a/usr.sbin/named/man/getnetent.3
+++ b/usr.sbin/named/man/getnetent.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getnetent.3,v 1.3 1998/06/15 17:56:16 mickey Exp $
+.\"	$OpenBSD: getnetent.3,v 1.4 1999/06/05 22:17:36 aaron Exp $
 .\" $From: getnetent.3,v 8.2 1996/05/09 05:59:10 vixie Exp $
 .TH getnetent 3
 .SH NAME
@@ -31,8 +31,8 @@ subroutines
 each return a pointer to an object with the
 following structure
 containing the broken-out
-fields of a line in the 
-.I networks 
+fields of a line in the
+.I networks
 database.
 .RS
 .PP
@@ -65,20 +65,20 @@ order.
 .PP
 If the
 .I stayopen
-flag on a 
+flag on a
 .I setnetent
 subroutine is NULL, the
 .I networks
 database is opened.  Otherwise the
 .I setnetent
-has the effect of rewinding the 
-.I networks 
+has the effect of rewinding the
+.I networks
 database.
 The
 .I endnetent
 may be called to
-close the 
-.I networks 
+close the
+.I networks
 database when processing is complete.
 .PP
 The
@@ -97,7 +97,7 @@ number is found
 The
 .I getnetent
 subroutine keeps a pointer in the database, allowing
-successive calls to be used 
+successive calls to be used
 to search the entire file.
 .PP
 A call to
diff --git a/usr.sbin/named/man/host.1 b/usr.sbin/named/man/host.1
index 500d721969b..299dc8fe7d5 100644
--- a/usr.sbin/named/man/host.1
+++ b/usr.sbin/named/man/host.1
@@ -1,16 +1,16 @@
-.\"	$OpenBSD: host.1,v 1.2 1997/03/12 10:42:14 downsj Exp $
+.\"	$OpenBSD: host.1,v 1.3 1999/06/05 22:17:37 aaron Exp $
 .\"
 .\"	@(#)host.1              e07@nikhef.nl (Eric Wassenaar) 961010
 .\"
 .TH host 1 "961010"
 .SH NAME
 host \- query nameserver about domain names and zones
-.SH SYNOPSIS 
+.SH SYNOPSIS
 .na
 .nf
-\fBhost\fP [\fB\-v\fP] [\fB\-a\fP] [\fB\-t\fP \fIquerytype\fP] [\fIoptions\fP]  \fIname\fP  [\fIserver\fP] 
+\fBhost\fP [\fB\-v\fP] [\fB\-a\fP] [\fB\-t\fP \fIquerytype\fP] [\fIoptions\fP]  \fIname\fP  [\fIserver\fP]
 .br
-\fBhost\fP [\fB\-v\fP] [\fB\-a\fP] [\fB\-t\fP \fIquerytype\fP] [\fIoptions\fP]  \fB\-l\fP \fIzone\fP  [\fIserver\fP] 
+\fBhost\fP [\fB\-v\fP] [\fB\-a\fP] [\fB\-t\fP \fIquerytype\fP] [\fIoptions\fP]  \fB\-l\fP \fIzone\fP  [\fIserver\fP]
 .br
 \fBhost\fP [\fB\-v\fP] [\fIoptions\fP] \fB\-H\fP [\fB\-D\fP] [\fB\-E\fP] [\fB\-G\fP] \fIzone\fP
 .br
@@ -21,7 +21,7 @@ host \- query nameserver about domain names and zones
 \fBhost\fP [\fIoptions\fP] \fB\-x\fP [\fIname\fP ...]
 .br
 \fBhost\fP [\fIoptions\fP] \fB\-X\fP \fIserver\fP [\fIname\fP ...]
-.SH DESCRIPTION 
+.SH DESCRIPTION
 .I host
 looks for information about Internet hosts and domain names.
 It gets this information from a set of interconnected servers
diff --git a/usr.sbin/named/man/hostname.7 b/usr.sbin/named/man/hostname.7
index 46e40bf5960..f86dc6ff391 100644
--- a/usr.sbin/named/man/hostname.7
+++ b/usr.sbin/named/man/hostname.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: hostname.7,v 1.2 1997/03/12 10:42:14 downsj Exp $
+.\"	$OpenBSD: hostname.7,v 1.3 1999/06/05 22:17:38 aaron Exp $
 .\" Copyright (c) 1987 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -52,11 +52,11 @@ the file, the substituted name is looked up with no further processing.
 .PP
 If there is at least one dot in the name, then the name is first tried as
 is.  The number of dots to cause this action is configurable by setting the
-threshold using the ``\fIndots\fP'' option in 
+threshold using the ``\fIndots\fP'' option in
 .I /etc/resolv.conf
 (default: \fI1\fP).  If the name ends with a dot, the trailing dot is
 removed, and the remaining name is looked up (regardless of the setting of
-the 'ndots' option) and no further processing is done. 
+the 'ndots' option) and no further processing is done.
 .PP
 If the input name does not end with a trailing dot, it is looked up by
 searching through a list of domains until a match is found.  If neither the
@@ -66,7 +66,7 @@ file or the ``\s-1LOCALDOMAIN\s+1'' environment variable is used, then the
 search list of domains contains only the full domain specified by the domain
 option (in
 .IR /etc/resolv.conf )
-or the domain used in the local hostname (see 
+or the domain used in the local hostname (see
 .IR hostname (1)
 and
 .IR resolver (5)).
@@ -85,7 +85,7 @@ example, if the ``\fIsearch\fP'' option contained
 	\fICS.Berkeley.EDU CChem.Berkeley.EDU Berkeley.EDU\fP
 .br
 then the partial hostname (e.g., ``\fIlithium\fP'') will be tried with each
-domainname appended (in the same order specified).  The resulting hostnames 
+domainname appended (in the same order specified).  The resulting hostnames
 that would be tried are:
 .nf
 	\fIlithium.CS.Berkeley.EDU\fP
diff --git a/usr.sbin/named/man/named-xfer.8 b/usr.sbin/named/man/named-xfer.8
index 62023c12710..5b5646bb39b 100644
--- a/usr.sbin/named/man/named-xfer.8
+++ b/usr.sbin/named/man/named-xfer.8
@@ -1,9 +1,9 @@
-.\"	$OpenBSD: named-xfer.8,v 1.4 1998/05/31 17:35:10 millert Exp $
+.\"	$OpenBSD: named-xfer.8,v 1.5 1999/06/05 22:17:39 aaron Exp $
 .\" ++Copyright++ 1985
 .\" -
 .\" Copyright (c) 1985
 .\"    The Regents of the University of California.  All rights reserved.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -19,7 +19,7 @@
 .\" 4. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33,14 +33,14 @@
 .\" SUCH DAMAGE.
 .\" -
 .\" Portions Copyright (c) 1993 by Digital Equipment Corporation.
-.\" 
+.\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
 .\" copyright notice and this permission notice appear in all copies, and that
 .\" the name of Digital Equipment Corporation not be used in advertising or
 .\" publicity pertaining to distribution of the document or software without
 .\" specific, written prior permission.
-.\" 
+.\"
 .\" THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
 .\" WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
 .\" OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
diff --git a/usr.sbin/named/man/named.8 b/usr.sbin/named/man/named.8
index bc7b02272ba..4cc84afe780 100644
--- a/usr.sbin/named/man/named.8
+++ b/usr.sbin/named/man/named.8
@@ -1,9 +1,9 @@
-.\"	$OpenBSD: named.8,v 1.8 1999/06/05 04:16:05 aaron Exp $
+.\"	$OpenBSD: named.8,v 1.9 1999/06/05 22:17:40 aaron Exp $
 .\" ++Copyright++ 1985
 .\" -
 .\" Copyright (c) 1985
 .\"    The Regents of the University of California.  All rights reserved.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -19,7 +19,7 @@
 .\" 4. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33,14 +33,14 @@
 .\" SUCH DAMAGE.
 .\" -
 .\" Portions Copyright (c) 1993 by Digital Equipment Corporation.
-.\" 
+.\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
 .\" copyright notice and this permission notice appear in all copies, and that
 .\" the name of Digital Equipment Corporation not be used in advertising or
 .\" publicity pertaining to distribution of the document or software without
 .\" specific, written prior permission.
-.\" 
+.\"
 .\" THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
 .\" WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
 .\" OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -149,7 +149,7 @@ Any additional argument is taken as the name of the boot file.
 If multiple boot files are specified, only the last is used.
 .PP
 The boot file contains information about where the name server is to get
-its initial data.  
+its initial data.
 Lines in the boot file cannot be continued on subsequent lines.
 The following is a small example:
 .in +2m
@@ -249,7 +249,7 @@ in your ``xfrnets'' directives.  This directive may also be given as
 .LP
 The ``include'' directive (not shown) can be used to process the contents
 of some other file as though they appeared in place of the ``include''
-directive.  This is useful if you have a lot of zones or if you have 
+directive.  This is useful if you have a lot of zones or if you have
 logical groupings of zones which are maintained by different people.
 The ``include'' directive takes one argument, that being the name of the
 file whose contents are to be included.  No quotes are necessary around
@@ -351,7 +351,7 @@ The
 .I opt_class
 field is the object address type; currently only one type is supported,
 .BR IN ,
-for objects connected to the DARPA Internet. 
+for objects connected to the DARPA Internet.
 The
 .I type
 field contains one of the following tokens; the data expected in the
@@ -467,7 +467,7 @@ Toggles logging of all incoming queries via syslog(8)
 /var/named/named.stats	nameserver statistics data
 .fi
 .SH "SEE ALSO"
-kill(1), gethostbyname(3), signal(2), 
+kill(1), gethostbyname(3), signal(2),
 resolver(3), resolver(5), hostname(7),
 RFC 882, RFC 883, RFC 973, RFC 974, RFC 1033, RFC 1034, RFC 1035, RFC 1123,
 \fIName Server Operations Guide for \s-1BIND\s+1\fR
diff --git a/usr.sbin/named/man/named.reload.8 b/usr.sbin/named/man/named.reload.8
index 921a4d5c742..64279aa3721 100644
--- a/usr.sbin/named/man/named.reload.8
+++ b/usr.sbin/named/man/named.reload.8
@@ -1,9 +1,9 @@
-.\"	$OpenBSD: named.reload.8,v 1.2 1997/03/12 10:42:16 downsj Exp $
+.\"	$OpenBSD: named.reload.8,v 1.3 1999/06/05 22:17:42 aaron Exp $
 .\" ++Copyright++ 1987, 1993
 .\" -
 .\" Copyright (c) 1987, 1993
 .\"    The Regents of the University of California.  All rights reserved.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -19,7 +19,7 @@
 .\" 4. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33,14 +33,14 @@
 .\" SUCH DAMAGE.
 .\" -
 .\" Portions Copyright (c) 1993 by Digital Equipment Corporation.
-.\" 
+.\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
 .\" copyright notice and this permission notice appear in all copies, and that
 .\" the name of Digital Equipment Corporation not be used in advertising or
 .\" publicity pertaining to distribution of the document or software without
 .\" specific, written prior permission.
-.\" 
+.\"
 .\" THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
 .\" WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
 .\" OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
diff --git a/usr.sbin/named/man/named.restart.8 b/usr.sbin/named/man/named.restart.8
index ade45493188..b1f62597993 100644
--- a/usr.sbin/named/man/named.restart.8
+++ b/usr.sbin/named/man/named.restart.8
@@ -1,9 +1,9 @@
-.\"	$OpenBSD: named.restart.8,v 1.2 1997/03/12 10:42:17 downsj Exp $
+.\"	$OpenBSD: named.restart.8,v 1.3 1999/06/05 22:17:43 aaron Exp $
 .\" ++Copyright++ 1987, 1993
 .\" -
 .\" Copyright (c) 1987, 1993
 .\"    The Regents of the University of California.  All rights reserved.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -19,7 +19,7 @@
 .\" 4. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33,14 +33,14 @@
 .\" SUCH DAMAGE.
 .\" -
 .\" Portions Copyright (c) 1993 by Digital Equipment Corporation.
-.\" 
+.\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
 .\" copyright notice and this permission notice appear in all copies, and that
 .\" the name of Digital Equipment Corporation not be used in advertising or
 .\" publicity pertaining to distribution of the document or software without
 .\" specific, written prior permission.
-.\" 
+.\"
 .\" THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
 .\" WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
 .\" OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
diff --git a/usr.sbin/named/man/ndc.8 b/usr.sbin/named/man/ndc.8
index 514aa1dfd5c..045c935f688 100644
--- a/usr.sbin/named/man/ndc.8
+++ b/usr.sbin/named/man/ndc.8
@@ -1,7 +1,7 @@
-.\"	$OpenBSD: ndc.8,v 1.3 1997/06/10 20:04:33 deraadt Exp $
+.\"	$OpenBSD: ndc.8,v 1.4 1999/06/05 22:17:44 aaron Exp $
 .\" Copyright (c) 1994
 .\"    The Regents of the University of California.  All rights reserved.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -17,7 +17,7 @@
 .\" 4. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/usr.sbin/named/man/nslookup.8 b/usr.sbin/named/man/nslookup.8
index 6195b3b7720..f69cc7147e9 100644
--- a/usr.sbin/named/man/nslookup.8
+++ b/usr.sbin/named/man/nslookup.8
@@ -1,10 +1,10 @@
-.\"	$OpenBSD: nslookup.8,v 1.3 1999/05/12 13:26:53 aaron Exp $
+.\"	$OpenBSD: nslookup.8,v 1.4 1999/06/05 22:17:45 aaron Exp $
 .\"
 .\" ++Copyright++ 1985, 1989
 .\" -
 .\" Copyright (c) 1985, 1989
 .\"    The Regents of the University of California.  All rights reserved.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -20,7 +20,7 @@
 .\" 4. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -34,14 +34,14 @@
 .\" SUCH DAMAGE.
 .\" -
 .\" Portions Copyright (c) 1993 by Digital Equipment Corporation.
-.\" 
+.\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
 .\" copyright notice and this permission notice appear in all copies, and that
 .\" the name of Digital Equipment Corporation not be used in advertising or
 .\" publicity pertaining to distribution of the document or software without
 .\" specific, written prior permission.
-.\" 
+.\"
 .\" THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
 .\" WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
 .\" OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -61,21 +61,21 @@
 nslookup \- query Internet name servers interactively
 .SH SYNOPSIS
 .B nslookup
-[ 
+[
 .I \-option ...
 ]
 [
 .I host-to-find
 | \- [
 .I server
-]] 
+]]
 .SH DESCRIPTION
 .I Nslookup
-is a program to query Internet domain name servers. 
+is a program to query Internet domain name servers.
 Nslookup has two modes: interactive and non-interactive.
 Interactive mode allows the user to query name servers for
-information about various hosts and domains or to print a list of hosts 
-in a domain. 
+information about various hosts and domains or to print a list of hosts
+in a domain.
 Non-interactive mode is used to print just the name and requested information
 for a host or domain.
 .sp 1
@@ -87,13 +87,13 @@ when no arguments are given (the default name server will be used),
 when the first argument is a hyphen (\-) and the second argument
 is the host name or Internet address of a name server.
 .LP
-Non-interactive mode is used when the name or Internet address 
+Non-interactive mode is used when the name or Internet address
 of the host to be looked up
 is given as the first argument. The optional second argument specifies
 the host name or address of a name server.
 .LP
 The options listed under the ``set'' command below can be specified in
-the .nslookuprc file in the user's home directory if they are listed 
+the .nslookuprc file in the user's home directory if they are listed
 one per line. Options can also be specified
 on the command line if they precede the arguments and are prefixed with
 a hyphen. For example, to change the default query type to host information,
@@ -105,29 +105,29 @@ and the initial timeout to 10 seconds, type:
 Commands may be interrupted at any time by typing a control-C.
 To exit, type a control-D (EOF) or type exit.
 The command line length must be less than 256 characters.
-To treat a built-in command as a host name, 
-precede it with an escape character (\e). 
+To treat a built-in command as a host name,
+precede it with an escape character (\e).
 \fBN.B.\fP an unrecognized command will be interpreted as a host name.
 .sp .5v
 .IP "\fIhost\fP [\fIserver\fP]"
 Look up information for \fIhost\fP using the current default server
 or using \fIserver\fP if specified.
-If \fIhost\fP is an Internet address and the query type is A or PTR, the 
+If \fIhost\fP is an Internet address and the query type is A or PTR, the
 name of the host is returned.
-If \fIhost\fP is a name and does not have a trailing period, the default 
+If \fIhost\fP is a name and does not have a trailing period, the default
 domain name is appended to the name. (This behavior depends on the state of the
-\fBset\fP options \fBdomain\fP, \fBsrchlist\fP, 
+\fBset\fP options \fBdomain\fP, \fBsrchlist\fP,
 \fBdefname\fP, and \fBsearch\fP).
-To look up a host not in the current domain, append a period to 
+To look up a host not in the current domain, append a period to
 the name.
 .sp 1
 .IP "\fBserver\fP \fIdomain\fP"
 .ns
 .IP "\fBlserver\fP \fIdomain\fP"
-Change the default server to \fIdomain\fP. 
-\fBLserver\fP uses the initial server to look up 
+Change the default server to \fIdomain\fP.
+\fBLserver\fP uses the initial server to look up
 information about \fIdomain\fP while \fBserver\fP
-uses the current default server. 
+uses the current default server.
 If an authoritative answer can't be found, the names of servers
 that might have the answer are returned.
 .sp 1
@@ -140,11 +140,11 @@ The name of the root server can be changed with the \fBset root\fP command.
 .IP "\fBfinger\fP [\fIname\fP] [\fB>\fP \fIfilename\fP]"
 .ns
 .IP "\fBfinger\fP [\fIname\fP] [\fB>>\fP \fIfilename\fP]"
-Connects with the finger server on the current host. 
+Connects with the finger server on the current host.
 The current host is defined when a previous lookup for a host
-was successful and returned address information (see the 
+was successful and returned address information (see the
 \fBset querytype=A\fP command).
-\fIName\fP is optional. 
+\fIName\fP is optional.
 \fB>\fP and \fB>>\fP can be used to redirect output in the
 usual manner.
 .sp 1
@@ -153,14 +153,14 @@ usual manner.
 .IP "\fBls\fR [\fIoption\fR] \fIdomain\fR [\fB>>\fR \fIfilename\fR]"
 List the information available for \fIdomain\fP, optionally creating
 or appending to \fIfilename\fP.
-The default output contains host names and their Internet addresses. 
-.I Option 
+The default output contains host names and their Internet addresses.
+.I Option
 can be one of the following:
 .RS
 .IP "\fB\-t \fIquerytype\fP" 4
 lists all records of the specified type (see \fIquerytype\fP below).
 .IP \fB\-a\fP 4
-lists aliases of hosts in the domain. 
+lists aliases of hosts in the domain.
 synonym for \fB\-t\ \ CNAME\fP.
 .IP \fB\-d\fP 4
 lists all records for the domain.
@@ -177,7 +177,7 @@ When output is directed to a file, hash marks are printed for every
 .RE
 .sp 1
 .IP "\fBview\fP \fIfilename\fP"
-Sorts and lists the output of previous \fBls\fP command(s) with 
+Sorts and lists the output of previous \fBls\fP command(s) with
 \fImore\fP(1).
 .sp 1
 .ne 4
@@ -223,17 +223,17 @@ Essentially all fields of every packet are printed.
 .br
 (Default = nod2)
 .IP "\fBdomain=\fIname\fR"
-Change the default domain name to \fIname\fP. 
+Change the default domain name to \fIname\fP.
 The default domain name is appended to a lookup request depending on the
 state of the \fBdefname\fP and \fBsearch\fP options.
-The domain search list contains the parents of the default domain if it has 
-at least two components in its name. 
+The domain search list contains the parents of the default domain if it has
+at least two components in its name.
 For example, if the default domain
 is CC.Berkeley.EDU, the search list is CC.Berkeley.EDU and Berkeley.EDU.
 Use the \fBset srchlist\fP command to specify a different list.
 Use the \fBset all\fP command to display the list.
 .br
-(Default = value from hostname, /etc/resolv.conf or LOCALDOMAIN, 
+(Default = value from hostname, /etc/resolv.conf or LOCALDOMAIN,
 abbreviation = do)
 .IP "\fBsrchlist=\fIname1/name2/...\fR"
 Change the default domain name to \fIname1\fP and the domain search list
@@ -248,22 +248,22 @@ This command overrides the
 default domain name and search list of the \fBset domain\fP command.
 Use the \fBset all\fP command to display the list.
 .br
-(Default = value based on hostname, /etc/resolv.conf or LOCALDOMAIN, 
+(Default = value based on hostname, /etc/resolv.conf or LOCALDOMAIN,
 abbreviation = srchl)
 .IP "\fB[no]defname\fP"
-If set, append the default domain name to a single-component lookup request 
+If set, append the default domain name to a single-component lookup request
 (i.e., one that does not contain a period).
 .br
 (Default = defname, abbreviation = [no]def)
 .IP "\fB[no]search\fP"
-If the lookup request contains at least one period but doesn't end 
-with a trailing period, 
+If the lookup request contains at least one period but doesn't end
+with a trailing period,
 append the domain names in the domain search list
 to the request until an answer is received.
 .br
 (Default = search, abbreviation = [no]sea)
 .IP "\fBport=\fIvalue\fR"
-Change the default TCP/UDP name server port to \fIvalue\fP. 
+Change the default TCP/UDP name server port to \fIvalue\fP.
 .br
 (Default = 53, abbreviation = po)
 .IP "\fBquerytype=\fIvalue\fR"
@@ -275,7 +275,7 @@ Change the type of information query to one of:
 .IP A 10
 the host's Internet address.
 .IP CNAME  10
-the canonical name for an alias. 
+the canonical name for an alias.
 .IP HINFO 10
 the host CPU and operating system type.
 .IP MINFO 10
@@ -296,7 +296,7 @@ the user information.
 .IP WKS 10
 the supported well-known services.
 .P
-Other types (ANY, AXFR, MB, MD, MF, NULL) are described in the 
+Other types (ANY, AXFR, MB, MD, MF, NULL) are described in the
 RFC-1035 document.
 .br
 (Default = A, abbreviations = q, ty)
@@ -307,22 +307,22 @@ information.
 .br
 (Default = recurse, abbreviation = [no]rec)
 .IP \fBretry=\fInumber\fR
-Set the number of retries to \fInumber\fP. 
-When a reply to a request is not received within a certain 
-amount of time (changed with \fBset timeout\fP), 
-the timeout period is doubled and the request is resent. 
+Set the number of retries to \fInumber\fP.
+When a reply to a request is not received within a certain
+amount of time (changed with \fBset timeout\fP),
+the timeout period is doubled and the request is resent.
 The retry value controls how many times a request is resent before giving up.
 .br
 (Default = 4, abbreviation = ret)
 .IP \fBroot=\fIhost\fR
 Change the name of the root server to \fIhost\fP. This
-affects the \fBroot\fP command. 
+affects the \fBroot\fP command.
 .br
 (Default = ns.internic.net., abbreviation = ro)
 .IP \fBtimeout=\fInumber\fR
-Change the initial timeout interval 
-for waiting for a reply 
-to \fInumber\fP seconds. 
+Change the initial timeout interval
+for waiting for a reply
+to \fInumber\fP seconds.
 Each retry doubles the timeout period.
 .br
 (Default = 5 seconds, abbreviation = ti)
@@ -340,7 +340,7 @@ If the lookup request was not successful, an error message is printed.
 Possible errors are:
 .IP "Timed out" 5
 The server did not respond to a request after a certain amount of
-time (changed with \fBset timeout=\fIvalue\fR) 
+time (changed with \fBset timeout=\fIvalue\fR)
 and a certain number of retries (changed with \fBset retry=\fIvalue\fR).
 .IP "No response from server" 5
 No name server is running on the server machine.
@@ -353,9 +353,9 @@ The host or domain name does not exist.
 .IP "Connection refused" 5
 .ns
 .IP "Network is unreachable" 5
-The connection to the name or finger server could not be made 
+The connection to the name or finger server could not be made
 at the current time.
-This error commonly occurs with \fBls\fP and \fBfinger\fP requests. 
+This error commonly occurs with \fBls\fP and \fBfinger\fP requests.
 .IP "Server failure" 5
 The name server found an internal inconsistency in its database
 and could not return a valid answer.
@@ -367,7 +367,7 @@ It may indicate an error in \fInslookup\fP.
 .sp 1
 .SH FILES
 .ta \w'/usr/share/misc/nslookup.helpXXX'u
-/etc/resolv.conf	initial domain name and 
+/etc/resolv.conf	initial domain name and
 	name server addresses.
 .br
 $HOME/.nslookuprc	user's initial options.
@@ -379,7 +379,7 @@ HOSTALIASES	file containing host aliases.
 .br
 LOCALDOMAIN	overrides default domain.
 .SH SEE ALSO
-resolver(3), resolver(5), named(8), 
+resolver(3), resolver(5), named(8),
 .br
 RFC-1034  ``Domain Names \- Concepts and Facilities''
 .br
diff --git a/usr.sbin/named/man/resolver.3 b/usr.sbin/named/man/resolver.3
index ff9984c5eb0..791817b8ddb 100644
--- a/usr.sbin/named/man/resolver.3
+++ b/usr.sbin/named/man/resolver.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: resolver.3,v 1.4 1999/05/12 13:26:53 aaron Exp $
+.\"	$OpenBSD: resolver.3,v 1.5 1999/06/05 22:17:45 aaron Exp $
 .\" Copyright (c) 1985, 1995 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -335,6 +335,6 @@ parameter.
 .SH "SEE ALSO"
 gethostbyname(3), named(8), resolver(5), hostname(7),
 .br
-RFC1032, RFC1033, RFC1034, RFC1035, RFC974, 
+RFC1032, RFC1033, RFC1034, RFC1035, RFC974,
 .br
 SMM:11 Name Server Operations Guide for BIND
diff --git a/usr.sbin/netgroup_mkdb/netgroup_mkdb.8 b/usr.sbin/netgroup_mkdb/netgroup_mkdb.8
index 751d4804f09..ddda1a9dd6f 100644
--- a/usr.sbin/netgroup_mkdb/netgroup_mkdb.8
+++ b/usr.sbin/netgroup_mkdb/netgroup_mkdb.8
@@ -27,27 +27,27 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: netgroup_mkdb.8,v 1.1 1995/10/18 08:47:57 deraadt Exp $
+.\"	$Id: netgroup_mkdb.8,v 1.2 1999/06/05 22:17:46 aaron Exp $
 .\"
 .Dd February 3, 1994
-.Dt NETGROUP_MKDB 8 
+.Dt NETGROUP_MKDB 8
 .Os
 .Sh NAME
-.Nm netgroup_mkdb 
+.Nm netgroup_mkdb
 .Nd generate the netgroup databases
 .Sh SYNOPSIS
-.Nm netgroup_mkdb 
+.Nm netgroup_mkdb
 .Op Fl o Ar database
 .Op file
 .Sh DESCRIPTION
-.Nm Netgroup_mkdb
+.Nm netgroup_mkdb
 creates
 .Xr db 3
 style databases for the specified file. If no file is specified, then
 .Pa /etc/netgroup
 is used.
-These databases are then installed into 
-.Pa /etc/netgroup.db.
+These databases are then installed into
+.Pa /etc/netgroup.db .
 The file must be in the correct format (see
 .Xr netgroup 5 ).
 .Pp
@@ -60,16 +60,16 @@ Put the output databases in the named file.
 The databases are used by the C library netgroup routines (see
 .Xr getnetgrent 3 ).
 .Pp
-.Nm Netgroup_mkdb
+.Nm netgroup_mkdb
 exits zero on success, non-zero on failure.
 .Sh FILES
 .Bl -tag -width 24n -compact
 .It Pa /etc/netgroup.db
-The current netgroup database
+current netgroup database
 .It Pa /etc/netgroup.db.tmp
-A temporary file
+a temporary file
 .It Pa /etc/netgroup
-The current netgroup file
+current netgroup file
 .El
 .Sh BUGS
 Because
@@ -78,11 +78,11 @@ guarantees not to install a partial destination file it must
 build a temporary file in the same file system and if successful use
 .Xr rename 2
 to install over the destination file.
-.Pp   
-If    
+.Pp
+If
 .Nm netgroup_mkdb
 fails it will leave the previous version of the destination file intact.
 .Sh SEE ALSO
 .Xr db 3 ,
 .Xr getnetgrent 3 ,
-.Xr netgroup 5 
+.Xr netgroup 5
diff --git a/usr.sbin/pkg_install/add/pkg_add.1 b/usr.sbin/pkg_install/add/pkg_add.1
index 17e02cebf9a..e69af9b9518 100644
--- a/usr.sbin/pkg_install/add/pkg_add.1
+++ b/usr.sbin/pkg_install/add/pkg_add.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg_add.1,v 1.8 1999/04/21 21:27:49 aaron Exp $
+.\"	$OpenBSD: pkg_add.1,v 1.9 1999/06/05 22:17:48 aaron Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintainance
 .\" of non-core utilities.
@@ -52,7 +52,7 @@ to insure it poses no danger to your system's integrity.  Pay particular
 attention to any +INSTALL, +DEINSTALL, +REQUIRE or +MTREE_DIRS files,
 and inspect the +CONTENTS file for
 .Cm @cwd ,
-.Cm @mode 
+.Cm @mode
 (check for setuid),
 .Cm @dirrm ,
 .Cm @exec ,
@@ -72,7 +72,7 @@ The named packages are installed.  A package name of
 will cause
 .Nm
 to read from stdin. If the packages are not found in the current
-working directory, 
+working directory,
 .Nm
 will search them in each directory named by
 .Ev PKG_PATH .
@@ -119,8 +119,8 @@ options).
 .It Fl t Ar template
 Use
 .Ar template
-as the input to 
-.Xr mkdtemp 3 
+as the input to
+.Xr mkdtemp 3
 when creating a
 .Dq staging area .
 By default, this is the string
@@ -208,7 +208,7 @@ passive mode ftp correctly. This is very rare since
 will try active mode ftp if the server refuses a passive mode
 connection.
 .Sh TECHNICAL DETAILS
-.Nm 
+.Nm
 extracts each package's
 .Dq packing list
 into a special staging directory in
@@ -257,7 +257,7 @@ final location, otherwise it is extracted into the staging area.
 .It
 If the package contains a
 .Ar require
-script (see 
+script (see
 .Xr pkg_create 1 ),
 it is executed with the following arguments:
 .Bl -tag -width indentindent
@@ -302,20 +302,20 @@ then mtree is invoked as:
 .Pp
 .Bd -filled -offset indent -compact
 .Cm mtree
-.Fl u 
-.Fl f 
+.Fl u
+.Fl f
 .Ar mtreefile
 .Fl d
-.Fl e 
-.Fl p 
-.Pa prefix 
+.Fl e
+.Fl p
+.Pa prefix
 .Ed
 .Pp
 where
 .Pa prefix
 is either the prefix specified with the
 .Fl p
-flag or, if no 
+flag or, if no
 .Fl p
 flag was specified, the name of the first directory named by a
 .Cm @cwd
@@ -338,7 +338,7 @@ script, description, and display files are copied into
 .Pa /var/db/pkg/<pkg-name>
 for subsequent possible use by
 .Xr pkg_delete 1 .
-Any package dependencies are recorded in the other packages' 
+Any package dependencies are recorded in the other packages'
 .Pa /var/db/pkg/<other-pkg>/+REQUIRED_BY
 file
 (if the environment variable
@@ -397,7 +397,7 @@ Hard links between files in a distribution are only preserved if either
 (1) the staging area is on the same file system as the target directory of
 all the links to the file, or (2) all the links to the file are bracketed by
 .Cm @cwd
-directives in the contents file, 
+directives in the contents file,
 .Em and
 the link names are extracted with a single
 .Cm tar
diff --git a/usr.sbin/pkg_install/create/pkg_create.1 b/usr.sbin/pkg_install/create/pkg_create.1
index 41cd3e2bd83..ffd733a3e5a 100644
--- a/usr.sbin/pkg_install/create/pkg_create.1
+++ b/usr.sbin/pkg_install/create/pkg_create.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg_create.1,v 1.6 1998/12/16 02:47:53 aaron Exp $	
+.\"	$OpenBSD: pkg_create.1,v 1.7 1999/06/05 22:17:49 aaron Exp $	
 .\"
 .\" FreeBSD install - a package for the installation and maintainance
 .\" of non-core utilities.
@@ -159,7 +159,7 @@ installation/deinstallation should proceed.
 .It Fl t Ar template
 Use
 .Ar template
-as the input to 
+as the input to
 .Xr mktemp 3 .
 By default, this is the string
 .Pa /tmp/instmp.XXXXXX ,
@@ -187,22 +187,22 @@ with
 flag) for further information on using this flag.
 .It Fl D Ar displayfile
 Display the file (using
-.Xr more 1 ) 
+.Xr more 1 )
 after installing the package.  Useful for things like
 legal notices on almost-free software, etc.
 .It Fl m Ar mtreefile
 Run
 .Xr mtree 8
-with input from mtreefile before the package is installed.  
+with input from mtreefile before the package is installed.
 .Xr mtree
 is invoked as
 .Cm mtree
-.Fl u 
-.Fl f 
+.Fl u
+.Fl f
 .Ar mtreefile
 .Fl d
-.Fl e 
-.Fl p 
+.Fl e
+.Fl p
 .Pa prefix ,
 where
 .Pa prefix
@@ -338,12 +338,12 @@ trying to document some particularly hairy sequence that
 may trip someone up later.
 .It Cm @ignore
 Used internally to tell extraction to ignore the next file (don't
-copy it anywhere), as it's used for some special purpose. 
+copy it anywhere), as it's used for some special purpose.
 .It Cm @ignore_inst
 Similar to
 .Cm @ignore ,
 but the ignoring of the next file is delayed one evaluation cycle.  This
-makes it possible to use this directive in the 
+makes it possible to use this directive in the
 .Ar packinglist
 file, so you can pack a
 specialized datafile in with a distribution for your install script (or
@@ -373,15 +373,15 @@ Declare
 .Pa name
 as an
 .Xr mtree 8
-input file to be used at install time (see 
+input file to be used at install time (see
 .Fl m
 above).  Only the first
 .Cm @mtree
-directive is honored. 
+directive is honored.
 .It Cm @display Ar name
 Declare
 .Pa name
-as the file to be displayed at install time (see 
+as the file to be displayed at install time (see
 .Fl D
 above).
 .It Cm @pkgdep Ar pkgname
diff --git a/usr.sbin/pkg_install/delete/pkg_delete.1 b/usr.sbin/pkg_install/delete/pkg_delete.1
index fecba972110..9155dc176ce 100644
--- a/usr.sbin/pkg_install/delete/pkg_delete.1
+++ b/usr.sbin/pkg_install/delete/pkg_delete.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg_delete.1,v 1.4 1998/12/16 02:47:53 aaron Exp $
+.\"	$OpenBSD: pkg_delete.1,v 1.5 1999/06/05 22:17:50 aaron Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintainance
 .\" of non-core utilities.
@@ -51,7 +51,7 @@ Pay particular
 attention to any +INSTALL, +DEINSTALL, +REQUIRE or +MTREE_DIRS files,
 and inspect the +CONTENTS file for
 .Cm @cwd ,
-.Cm @mode 
+.Cm @mode
 (check for setuid),
 .Cm @dirrm ,
 .Cm @exec ,
@@ -88,7 +88,7 @@ normal files/directories or with the
 directive) will be removed at deinstallation time.  This option tells
 .Nm
 to also remove any directories that were emptied as a result of removing
-the package.  
+the package.
 .It Fl f
 Force removal of the package, even if a dependency is recorded or the
 deinstall or require script fails.
@@ -96,7 +96,7 @@ deinstall or require script fails.
 .Pp
 .Sh TECHNICAL DETAILS
 .Nm
-does pretty much what it says.  It examines installed package records in 
+does pretty much what it says.  It examines installed package records in
 .Pa /var/db/pkg/<pkg-name> ,
 deletes the package contents, and finally removes the package records.
 .Pp
@@ -109,7 +109,7 @@ option is given).
 .Pp
 If the package contains a
 .Ar require
-file (see 
+file (see
 .Xr pkg_create 1 ),
 then this is executed first as
 .Bd -filled -offset indent
diff --git a/usr.sbin/ppp/ppp/ppp.8 b/usr.sbin/ppp/ppp/ppp.8
index 1d7aed9cb7e..374a4ec92cb 100644
--- a/usr.sbin/ppp/ppp/ppp.8
+++ b/usr.sbin/ppp/ppp/ppp.8
@@ -1,11 +1,11 @@
-.\" $Id: ppp.8,v 1.46 1999/06/05 04:16:05 aaron Exp $
+.\" $Id: ppp.8,v 1.47 1999/06/05 22:17:51 aaron Exp $
 .Dd 20 September 1995
 .nr XX \w'\fC00'
 .Os
 .Dt PPP 8
 .Sh NAME
 .Nm ppp
-.Nd Point to Point Protocol (a.k.a. user-ppp) 
+.Nd Point to Point Protocol (a.k.a. user-ppp)
 .Sh SYNOPSIS
 .Nm ppp
 .Oo
@@ -189,7 +189,7 @@ and group
 .Dv network ,
 with permissions
 .Dv 04554 .
-By default, 
+By default,
 .Nm
 will not run if the invoking user ID is not 0.  This may be overridden
 by using the
@@ -290,7 +290,7 @@ See below for details.
 .Pp
 Enabling IP aliasing allows
 .Nm ppp
-to act as a NAT or masquerading engine for all machines on an internal 
+to act as a NAT or masquerading engine for all machines on an internal
 LAN.  Refer to
 .Xr libalias 3
 for details.
@@ -370,7 +370,7 @@ command in
 .It
 Create a log file.
 .Nm
-uses 
+uses
 .Xr syslog 3
 to log information.  A common log file name is
 .Pa /var/log/ppp.log .
@@ -510,7 +510,7 @@ Defaults:
 Connect time: 0 secs
 0 octets in, 0 octets out
 Overall 0 bytes/sec
-ppp ON awfulhak> 
+ppp ON awfulhak>
 .Ed
 .Pp
 The term command can now be used to talk directly to the device:
@@ -1343,7 +1343,7 @@ from the outside world.
 In general, correct
 .Nm
 operation should first be verified with packet aliasing disabled.
-Then, the 
+Then, the
 .Fl alias
 option should be switched on, and network applications (web browser,
 .Xr telnet 1 ,
@@ -2592,7 +2592,7 @@ layer shuts down, and is also available using the
 .Dq show
 command.  Throughput statistics are available at the
 .Dq IPCP
-and 
+and
 .Dq physical
 levels.
 .It utmp
@@ -3676,8 +3676,8 @@ command before dialing):
 .Bd -literal -offset indent
 Dial attempt 1 of 1
 dial OK!
-Chat: Expecting: 
-Chat: Sending: 
+Chat: Expecting:
+Chat: Sending:
 Chat: Expecting: login:--login:
 Chat: Wait for (5): login:
 Chat: Sending: ppp
@@ -3688,7 +3688,7 @@ Chat: Expecting: !sh \\-c "echo \\-n label: >&2"
 Chat: Exec: sh -c "echo -n label: >&2"
 Chat: Wait for (5): !sh \\-c "echo \\-n label: >&2" --> label:
 Chat: Exec: /bin/echo in
-Chat: Sending: 
+Chat: Sending:
 Chat: Expecting: HELLO
 Chat: Wait for (5): HELLO
 login OK!
@@ -4508,7 +4508,7 @@ Logging and debugging information file.  Note, this name is specified in
 See
 .Xr syslog.conf 5
 for further details.
-.It Pa /var/spool/lock/LCK..* 
+.It Pa /var/spool/lock/LCK..*
 tty port locking file.  Refer to
 .Xr uucplock 3
 for further details.
diff --git a/usr.sbin/pppd/chat/chat.8 b/usr.sbin/pppd/chat/chat.8
index e30219480df..908caf8a4d6 100644
--- a/usr.sbin/pppd/chat/chat.8
+++ b/usr.sbin/pppd/chat/chat.8
@@ -1,6 +1,6 @@
 .\" -*- nroff -*-
 .\" manual page [] for chat 1.8
-.\" $OpenBSD: chat.8,v 1.8 1999/03/10 21:25:31 pjanzen Exp $
+.\" $OpenBSD: chat.8,v 1.9 1999/06/05 22:17:54 aaron Exp $
 .\" Id: chat.8,v 1.7 1998/02/04 01:35:49 paulus Exp $
 .\" SH section heading
 .\" SS subsection heading
@@ -80,7 +80,7 @@ substituted for the \\T substitution metacharacter in a send string.
 .B -U \fI<phone number 2>
 Pass in a second string, usually a phone number, that will be
 substituted for the \\U substitution metacharacter in a send string.
-This is useful when dialing an ISDN terminal adapter that requires two 
+This is useful when dialing an ISDN terminal adapter that requires two
 numbers.
 .TP
 .B script
@@ -197,19 +197,19 @@ The SAY strings could be used to give progress messages in sections of
 the script where you want to have 'ECHO OFF' but still let the user
 know what is happening.  An example is:
 .IP
-ABORT BUSY 
+ABORT BUSY
 .br
-ECHO OFF 
+ECHO OFF
 .br
-SAY "Dialling your ISP...\\n" 
+SAY "Dialling your ISP...\\n"
 .br
-\'' ATDT5551212 
+\'' ATDT5551212
 .br
 TIMEOUT 120
 .br
 SAY "Waiting up to 2 minutes for connection ... "
 .br
-CONNECT '' 
+CONNECT ''
 .br
 SAY "Connected, now logging in ...\n"
 .br
diff --git a/usr.sbin/pppd/pppd.8 b/usr.sbin/pppd/pppd.8
index e96e440d903..1eb63b301c8 100644
--- a/usr.sbin/pppd/pppd.8
+++ b/usr.sbin/pppd/pppd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pppd.8,v 1.15 1998/06/15 17:56:17 mickey Exp $
+.\" $OpenBSD: pppd.8,v 1.16 1999/06/05 22:17:55 aaron Exp $
 .\" manual page [] for pppd 2.3
 .\" Id: pppd.8,v 1.27 1998/03/31 04:31:08 paulus Exp $
 .\" SH section heading
@@ -142,7 +142,7 @@ bytes of data).
 Set the MTU [Maximum Transmit Unit] value to \fIn\fR.  Unless the
 peer requests a smaller value via MRU negotiation, pppd will
 request that the kernel networking code send data packets of no more
-than \fIn\fR bytes through the PPP network interface. 
+than \fIn\fR bytes through the PPP network interface.
 .TP
 .B passive
 Enables the "passive" option in the LCP.  With this option, pppd will
@@ -594,7 +594,7 @@ supports Predictor-1 compression.
 Add an entry to this system's ARP [Address Resolution Protocol] table
 with the IP address of the peer and the Ethernet address of this
 system.  This will have the effect of making the peer appear to other
-systems to be on the local ethernet.
+systems to be on the local Ethernet.
 .TP
 .B remotename \fIname
 Set the assumed name of the remote system for authentication purposes
@@ -1035,7 +1035,7 @@ executed with the parameters
 .IP
 \fIinterface-name tty-device speed network-number local-IPX-node-address
 remote-IPX-node-address local-IPX-routing-protocol remote-IPX-routing-protocol
-local-IPX-router-name remote-IPX-router-name ipparam pppd-pid\fR 
+local-IPX-router-name remote-IPX-router-name ipparam pppd-pid\fR
 .IP
 The local-IPX-routing-protocol and remote-IPX-routing-protocol field
 may be one of the following:
diff --git a/usr.sbin/pppd/pppstats/pppstats.8 b/usr.sbin/pppd/pppstats/pppstats.8
index d44c2e2d655..bb06f36aa15 100644
--- a/usr.sbin/pppd/pppstats/pppstats.8
+++ b/usr.sbin/pppd/pppstats/pppstats.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pppstats.8,v 1.5 1997/09/01 22:17:17 millert Exp $
+.\" $OpenBSD: pppstats.8,v 1.6 1999/06/05 22:17:58 aaron Exp $
 .Dd September 1, 1997
 .Dt PPPSTATS 8
 .Sh NAME
@@ -15,8 +15,7 @@
 .Op Fl w Ar secs
 .Op Ar interface
 .Sh DESCRIPTION
-.Pp
-The 
+The
 .Nm pppstats
 utility reports PPP-related statistics at regular intervals for the
 specified PPP
diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.8 b/usr.sbin/pwd_mkdb/pwd_mkdb.8
index fe6ce3b46a0..0701e731362 100644
--- a/usr.sbin/pwd_mkdb/pwd_mkdb.8
+++ b/usr.sbin/pwd_mkdb/pwd_mkdb.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pwd_mkdb.8,v 1.7 1999/05/23 14:11:36 aaron Exp $
+.\"	$OpenBSD: pwd_mkdb.8,v 1.8 1999/06/05 22:17:59 aaron Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -80,7 +80,7 @@ format, as described in
 .Xr passwd 5 .
 .El
 .Pp
-The two databases differ in that the secure version contains the user's 
+The two databases differ in that the secure version contains the user's
 encrypted password and the insecure version has an asterisk
 .Pq Sq \&* .
 .Pp
@@ -118,7 +118,7 @@ directory.
 There are the obvious races with multiple people running
 .Nm
 on different password files at the same time.
-The front-ends to 
+The front-ends to
 .Nm pwd_mkdb ,
 .Xr chpass 1 ,
 .Xr passwd 1 ,
diff --git a/usr.sbin/rarpd/rarpd.8 b/usr.sbin/rarpd/rarpd.8
index a481029959f..181954742de 100644
--- a/usr.sbin/rarpd/rarpd.8
+++ b/usr.sbin/rarpd/rarpd.8
@@ -17,12 +17,12 @@
 .\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
 .\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-.\" @(#) $Id: rarpd.8,v 1.5 1999/04/02 15:12:20 aaron Exp $
+.\" @(#) $Id: rarpd.8,v 1.6 1999/06/05 22:18:01 aaron Exp $
 .\"
 .Dd October 26, 1990
 .Dt RARPD 8
 .Sh NAME
-.Nm rarpd 
+.Nm rarpd
 .Nd reverse ARP daemon
 .Sh SYNOPSIS
 .Nm rarpd
@@ -32,12 +32,12 @@
 .Nm
 services Reverse ARP requests on the Ethernet connected to
 .Ar interface .
-Upon receiving a request, 
+Upon receiving a request,
 .Nm
-maps the target hardware address to an IP address via its name, which 
+maps the target hardware address to an IP address via its name, which
 must be present in both the
 .Xr ethers 5
-and 
+and
 .Xr hosts 5
 databases.
 If a host does not exist in both databases, the translation cannot
@@ -45,30 +45,30 @@ proceed and a reply will not be sent.
 .\" .Pp
 .\" Additionally, a request is honored only if the server
 .\" (i.e., the host that rarpd is running on)
-.\" can "boot" the target; that is, if the directory 
+.\" can "boot" the target; that is, if the directory
 .\" .Pa /tftpboot/ Ns Em ipaddr
-.\" exists, where 
+.\" exists, where
 .\" .Rm ipaddr
 .\" is the target IP address.
 .Pp
-In normal operation, 
+In normal operation,
 .Nm
 forks a copy of itself and runs in
-the background.  Anomalies and errors are reported via 
+the background.  Anomalies and errors are reported via
 .Xr syslog 3 .
 .Pp
 The options are as follows:
 .Bl -tag -width indent
 .It Fl a
 Listen on all the Ethernets attached to the system.
-If 
-.Fl a 
+If
+.Fl a
 is omitted, an
 .Ar interface
 must be specified.
 .It Fl d
 Run in debug mode, with all the output to stderr.
-This option implies the 
+This option implies the
 .Fl f
 option.
 .It Fl f
@@ -88,7 +88,7 @@ host name data base
 .Sh SEE ALSO
 .Xr bpf 4 ,
 .Xr diskless 8
-.Rs 
+.Rs
 .%R A Reverse Address  Resolution Protocol
 .%N RFC 903
 .%A Finlayson, R.
diff --git a/usr.sbin/rdate/rdate.8 b/usr.sbin/rdate/rdate.8
index bbbe54c24cb..c8464bdbffc 100644
--- a/usr.sbin/rdate/rdate.8
+++ b/usr.sbin/rdate/rdate.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rdate.8,v 1.8 1999/04/02 15:12:20 aaron Exp $
+.\"	$OpenBSD: rdate.8,v 1.9 1999/06/05 22:18:02 aaron Exp $
 .\"	$NetBSD: rdate.8,v 1.4 1996/04/08 20:55:17 jtc Exp $
 .\"
 .\" Copyright (c) 1994 Christos Zoulas
@@ -38,7 +38,7 @@
 .Sh SYNOPSIS
 .Nm rdate
 .Op Fl psa
-.Ar host 
+.Ar host
 .Sh DESCRIPTION
 .Nm
 displays and sets the local date and time from the
@@ -54,7 +54,7 @@ Do not set, just print the remote time
 .It Fl s
 Do not print the time.
 .It Fl a
-Use the 
+Use the
 .Xr adjtime 2
 call to gradually skew the local time to the
 remote time rather than just hopping.
diff --git a/usr.sbin/rdconfig/rdconfig.8 b/usr.sbin/rdconfig/rdconfig.8
index 97bcb230355..c8c88251a9b 100644
--- a/usr.sbin/rdconfig/rdconfig.8
+++ b/usr.sbin/rdconfig/rdconfig.8
@@ -41,7 +41,7 @@
 The
 .Nm rdconfig
 command configures RAM disk devices.
-It will associate the special file 
+It will associate the special file
 .Ar special_file
 with a range of user-virtual memory allocated by the
 .Nm rdconfig
diff --git a/usr.sbin/rmt/rmt.8 b/usr.sbin/rmt/rmt.8
index 38abe659076..41401fdf4e7 100644
--- a/usr.sbin/rmt/rmt.8
+++ b/usr.sbin/rmt/rmt.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rmt.8,v 1.5 1999/05/23 14:11:37 aaron Exp $
+.\"	$OpenBSD: rmt.8,v 1.6 1999/06/05 22:18:04 aaron Exp $
 .\" Copyright (c) 1983, 1991 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)rmt.8	6.5 (Berkeley) 3/16/91
-.\"	$Id: rmt.8,v 1.5 1999/05/23 14:11:37 aaron Exp $
+.\"	$Id: rmt.8,v 1.6 1999/06/05 22:18:04 aaron Exp $
 .\"
 .Dd March 16, 1991
 .Dt RMT 8
@@ -53,14 +53,14 @@ or
 .Xr rcmd 3
 call.
 .Pp
-The 
+The
 .Nm
 program accepts requests specific to the manipulation of
 magnetic tapes, performs the commands, then responds with
 a status indication.  All responses are in
 .Tn ASCII
 and in
-one of two forms. 
+one of two forms.
 Successful commands have responses of:
 .Bd -filled -offset indent
 .Sm off
@@ -101,7 +101,7 @@ indicates that a newline should be supplied:
 .It Xo Sy \&O Ar device
 .No \en Ar mode No \en
 .Xc
-Open the specified 
+Open the specified
 .Ar device
 using the indicated
 .Ar mode .
@@ -155,9 +155,9 @@ If
 exceeds the size of the data buffer (10 kilobytes), it is
 truncated to the data buffer size.
 .Nm
-then performs the requested 
+then performs the requested
 .Xr read 2
-and responds with 
+and responds with
 .Sm off
 .Sy A Ar count-read No \en
 .Sm on
@@ -177,7 +177,7 @@ command using the specified parameters.
 The parameters are interpreted as the
 .Tn ASCII
 representations of the decimal values
-to place in the 
+to place in the
 .Ar mt_op
 and
 .Ar mt_count
@@ -198,7 +198,7 @@ sent (in binary).
 .El
 .Sm on
 .Pp
-Any other command causes 
+Any other command causes
 .Nm
 to exit.
 .Sh DIAGNOSTICS
diff --git a/usr.sbin/rpc.bootparamd/rpc.bootparamd.8 b/usr.sbin/rpc.bootparamd/rpc.bootparamd.8
index 0942263da48..5e8ac76483d 100644
--- a/usr.sbin/rpc.bootparamd/rpc.bootparamd.8
+++ b/usr.sbin/rpc.bootparamd/rpc.bootparamd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rpc.bootparamd.8,v 1.8 1998/12/16 02:47:53 aaron Exp $
+.\" $OpenBSD: rpc.bootparamd.8,v 1.9 1999/06/05 22:18:05 aaron Exp $
 .\" @(#)bootparamd.8
 .Dd Jan 8, 1994
 .Dt BOOTPARAMD 8
@@ -39,7 +39,7 @@ will be searched immediately.
 Display the debugging information. The daemon does not fork in this
 case.
 .It Fl s
-Log the debugging information with syslog. 
+Log the debugging information with syslog.
 .It Fl r
 Set the default router (a hostname or IP address).
 This defaults to the machine running the server.
diff --git a/usr.sbin/rpc.pcnfsd/pcnfsd.8 b/usr.sbin/rpc.pcnfsd/pcnfsd.8
index d6672eb000d..ff5d643097c 100644
--- a/usr.sbin/rpc.pcnfsd/pcnfsd.8
+++ b/usr.sbin/rpc.pcnfsd/pcnfsd.8
@@ -4,7 +4,7 @@
 .SH NAME
 pcnfsd \- (PC)NFS authentication and print request server
 .SH SYNOPSIS
-.B /usr/sbin/rpc.pcnfsd 
+.B /usr/sbin/rpc.pcnfsd
 .SH WARNING
 This program probably contains 5 to 6 security holes in it (it has been
 diagnosed to have a few, but they were not yet been fixed).  Use it at
@@ -20,36 +20,36 @@ systems. This page describes version two of the
 server.
 .LP
 .B rpc.pcnfsd
-may be started from 
+may be started from
 .B /etc/rc.local
 or by the
 .BR inetd (8)
 superdaemon. It reads the configuration file
 .B /etc/pcnfsd.conf
 if present, and then services RPC requests directed to
-program number 150001. This release of the 
+program number 150001. This release of the
 .B pcnfsd
 daemon supports both version 1 and version 2 of the pcnfsd
-protocol. Consult the 
+protocol. Consult the
 .B rpcgen
 source file
 .B pcnfsd.x
 for details of the protocols.
 .LP
-The requests serviced by 
+The requests serviced by
 .B pcnfsd
 fall into three categories: authentication, printing, and other. Only the
 authentication and printing services have administrative significance.
 .SH AUTHENTICATION
-When 
+When
 .B pcnfsd
-receives a 
+receives a
 .B PCNFSD_AUTH
 or
 .B PCNFSD2_AUTH
 request\**, it will "log in" the user by validating the username and
 password and returning the corresponding uid, gids, home directory,
-and umask. If 
+and umask. If
 .B pcnfsd
 was built with the
 .B WTMP
@@ -98,7 +98,7 @@ will issue a
 .B PCNFSD_PR_START
 or
 .B PCNFSD2_PR_START
-request. 
+request.
 .B pcnfsd
 handles this, and most other print-related requests, by
 constructing a command based on the printing services of
@@ -120,10 +120,10 @@ and the creation of filters to perform the required processing. This
 is outside the scope of this discussion. In addition,
 .B pcnfsd
 includes a mechanism by which  you can define virtual printers known
-only to 
+only to
 .B pcnfsd
 clients. Each printer is defined by a line in the
-.B /etc/pcnfsd.conf 
+.B /etc/pcnfsd.conf
 file of the following form
 .RS
 .sp
@@ -131,7 +131,7 @@ file of the following form
 .sp
 .RE
 \fIname\fP is the name of the printer you want to define. \fIalias-for\fP
-is the name of a "real" printer which corresponds to this printer. For 
+is the name of a "real" printer which corresponds to this printer. For
 example, a request to
 display the queue for \fIname\fP will be translated into the
 corresponding request for the printer \fIalias-for\fP. If you have
@@ -143,7 +143,7 @@ below for an example.) \fIcommand\fP is a
 command which will be executed whenever a file is printed on \fIname\fP.
 This command is executed by the Bourne shell,
 .B /bin/sh
-using the 
+using the
 .B -c
 option. For complex operations you should
 construct an executable shell program and invoke that in \fIcommand\fP.
@@ -173,7 +173,7 @@ printer rotated lw /usr/local/bin/enscript -2r \s-2$FILE\s0
 printer test - /usr/bin/cp \s-2$FILE\s0 /usr/tmp/\s-2$HOST\s0-\s-2$USER\s0
 .sp
 .RE
-If a client system prints a job on the printer 
+If a client system prints a job on the printer
 .B rotated
 the utility
 .B enscript
@@ -193,7 +193,7 @@ the printer
 The printer
 .B test
 is used only for testing. Any file sent to this printer
-will be copied into 
+will be copied into
 .B /usr/tmp.
 Any request to list the queue, check the status, etc. of printer
 .B test
diff --git a/usr.sbin/rwhod/rwhod.8 b/usr.sbin/rwhod/rwhod.8
index 7fc3bac5453..a7021504b5d 100644
--- a/usr.sbin/rwhod/rwhod.8
+++ b/usr.sbin/rwhod/rwhod.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rwhod.8,v 1.9 1999/05/23 14:11:37 aaron Exp $
+.\"	$OpenBSD: rwhod.8,v 1.10 1999/06/05 22:18:07 aaron Exp $
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)rwhod.8	8.2 (Berkeley) 12/11/93
-.\"     $OpenBSD: rwhod.8,v 1.9 1999/05/23 14:11:37 aaron Exp $
+.\"     $OpenBSD: rwhod.8,v 1.10 1999/06/05 22:18:07 aaron Exp $
 .\"
 .Dd December 11, 1993
 .Dt RWHOD 8
@@ -63,7 +63,7 @@ them in a collection of files located in the directory
 .Pa /var/rwho .
 .Pp
 The server transmits and receives messages at the port indicated
-in the ``who'' service specification; see 
+in the ``who'' service specification; see
 .Xr services 5 .
 The messages sent and received, are of the form:
 .Bd -literal -offset indent
@@ -92,15 +92,15 @@ struct	whod {
 All fields are converted to network byte order prior to
 transmission.  The load averages are as calculated by the
 .Xr w 1
-program, and represent load averages over the 5, 10, and 15 minute 
+program, and represent load averages over the 5, 10, and 15 minute
 intervals prior to a server's transmission; they are multiplied by 100
 for representation in an integer.  The host name
 included is that returned by
 .Xr gethostname 3
 with any trailing domain name omitted.
 The array at the end of the message contains information about
-the users logged in to the sending machine.  This information 
-includes the contents of the 
+the users logged in to the sending machine.  This information
+includes the contents of the
 .Xr utmp 5
 entry for each non-idle terminal line and a value indicating the
 time in seconds since a character was last received on the terminal line.
@@ -128,7 +128,7 @@ Status messages are generated approximately once every
 .Xr ruptime 1 ,
 .Xr rwho 1
 .Sh BUGS
-There should be a way to relay status information between networks. 
+There should be a way to relay status information between networks.
 Status information should be sent only upon request rather than continuously.
 People often interpret the server dying
 or network communication failures
diff --git a/usr.sbin/sa/sa.8 b/usr.sbin/sa/sa.8
index 421e420873a..393d2de1ac4 100644
--- a/usr.sbin/sa/sa.8
+++ b/usr.sbin/sa/sa.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sa.8,v 1.5 1999/04/02 15:12:20 aaron Exp $
+.\"	$OpenBSD: sa.8,v 1.6 1999/06/05 22:18:08 aaron Exp $
 .\"
 .\" Copyright (c) 1994 Christopher G. Demetriou
 .\" All rights reserved.
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: sa.8,v 1.5 1999/04/02 15:12:20 aaron Exp $
+.\"	$Id: sa.8,v 1.6 1999/06/05 22:18:08 aaron Exp $
 .\"
 .Dd February 25, 1994
 .Dt SA 8
@@ -112,7 +112,7 @@ those used only once under the name
 If printing command statistics, sort output by the sum of user and system
 time divided by number of calls.
 .It Fl c
-In addition to the number of calls and the user, system and real times 
+In addition to the number of calls and the user, system and real times
 for each command, print their percentage of the total over all commands.
 .It Fl d
 If printing command statistics, sort by the average number of disk
@@ -197,7 +197,7 @@ flag is specified, only the
 .Fl k ,
 .Fl q ,
 and
-.Fl s 
+.Fl s
 flags are honored.
 .Pp
 The
diff --git a/usr.sbin/slstats/slstats.8 b/usr.sbin/slstats/slstats.8
index 51d5872f360..a49ad9c6c72 100644
--- a/usr.sbin/slstats/slstats.8
+++ b/usr.sbin/slstats/slstats.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: slstats.8,v 1.3 1996/07/08 22:09:50 ccappuc Exp $
+.\"	$OpenBSD: slstats.8,v 1.4 1999/06/05 22:18:10 aaron Exp $
 .\"	$NetBSD: slstats.8,v 1.2.6.1 1996/06/07 01:42:24 thorpej Exp $
 .Dd July 5, 1993
 .Dt SLSTATS 8
@@ -13,8 +13,7 @@
 .Op Fl i Ar interval
 .Op Ar unit-number
 .Sh DESCRIPTION
-.Pp
-The 
+The
 .Nm slstats
 utility reports slip-related statistics for the
 .Nm sl Ns
diff --git a/usr.sbin/spray/spray.8 b/usr.sbin/spray/spray.8
index 56a94dae8b1..dcacd06f334 100644
--- a/usr.sbin/spray/spray.8
+++ b/usr.sbin/spray/spray.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: spray.8,v 1.4 1999/04/02 15:12:21 aaron Exp $
+.\"	$OpenBSD: spray.8,v 1.5 1999/06/05 22:18:11 aaron Exp $
 .\"
 .\" Copyright (c) 1994 James A. Jegers
 .\" All rights reserved.
@@ -27,18 +27,18 @@
 .Os
 .Sh NAME
 .Nm spray
-.Nd send many packets to host 
+.Nd send many packets to host
 .Sh SYNOPSIS
 .Nm spray
-.Op Fl c Ar count 
-.Op Fl d Ar delay 
+.Op Fl c Ar count
+.Op Fl d Ar delay
 .Op Fl l Ar length
-.Ar host 
+.Ar host
 \&...
 .Ek
 .Sh DESCRIPTION
 .Nm
-sends multiple RPC packets to 
+sends multiple RPC packets to
 .Ar host
 and records how many of them were correctly received and how long it took.
 .Pp
@@ -53,12 +53,12 @@ Pause
 .Ar delay
 microseconds between sending each packet.
 .It Fl l Ar length
-Set the length of the packet that holds the RPC call message to 
+Set the length of the packet that holds the RPC call message to
 .Ar length
 bytes.
 Not all values of
 .Ar length
-are possible because RPC data is encoded using XDR. 
+are possible because RPC data is encoded using XDR.
 .Nm
 rounds up to the nearest possible value.
 .El
@@ -66,7 +66,7 @@ rounds up to the nearest possible value.
 .Nm
 is intended for use in network testing, measurement, and management.
 This command
-.Bf -emphasis 
+.Bf -emphasis
 can be very hard on a network and should be used with caution.
 .Ef
 .Pp
@@ -74,4 +74,4 @@ can be very hard on a network and should be used with caution.
 .Xr netstat 1 ,
 .Xr ifconfig 8 ,
 .Xr ping 8 ,
-.Xr rpc.sprayd 8 
+.Xr rpc.sprayd 8
diff --git a/usr.sbin/ssio/fs1toppm.1 b/usr.sbin/ssio/fs1toppm.1
index 26c3eba8c5f..c814f7bb9f7 100644
--- a/usr.sbin/ssio/fs1toppm.1
+++ b/usr.sbin/ssio/fs1toppm.1
@@ -1,4 +1,4 @@
-.\" $Id: fs1toppm.1,v 1.1 1997/03/11 03:23:11 kstailey Exp $
+.\" $Id: fs1toppm.1,v 1.2 1999/06/05 22:18:12 aaron Exp $
 .\"
 .\" Copyright (c) 1996 Kenneth Stailey
 .\" All rights reserved.
@@ -50,7 +50,7 @@ the Ricoh FS1 scanner and Portable Pix Map (PPM) are incompatible.
 In PPM the red, green and blue samples are interleaved at the pixel level;
 the Ricoh FS1 interleaves them at the row level.
 .PP
-The 
+The
 .I grabscan
 script uses
 .I fs1toppm
diff --git a/usr.sbin/ssio/set_scanner.1 b/usr.sbin/ssio/set_scanner.1
index 5d50b71b8b0..6d993bfd301 100644
--- a/usr.sbin/ssio/set_scanner.1
+++ b/usr.sbin/ssio/set_scanner.1
@@ -1,4 +1,4 @@
-.\" $Id: set_scanner.1,v 1.1 1997/03/11 03:23:16 kstailey Exp $
+.\" $Id: set_scanner.1,v 1.2 1999/06/05 22:18:14 aaron Exp $
 .\"
 .\" Copyright (c) 1996 Kenneth Stailey
 .\" All rights reserved.
@@ -36,7 +36,7 @@ set_scanner - change the parameter settings for the scanner
 .SH SYNOPSIS
 .B set_scanner
 .RI [ -w width ]
-.RI [ -h height] 
+.RI [ -h height]
 .RI [ -x x_origin ]
 .RI [ -y y_origin ]
 .RI [ -r resolution ]
@@ -104,11 +104,11 @@ is followed by a decimal integer that specifies the level of contrast used.
 To see acceptable values for
 .I contrast
 use the command "lsattr -R -l scan0 -a contrast".
-.I 
+.I
 .PP
 .B \-d
 Set the defaults.  Scanner settings will be remembered even after the system
-reboots. 
+reboots.
 .B set_scanner
 will use "chdev" to alter the ODM instead of the ioctl(2) system call on the
 device special file.
diff --git a/usr.sbin/syslogd/syslog.conf.5 b/usr.sbin/syslogd/syslog.conf.5
index a3156bbd180..e3e598f1021 100644
--- a/usr.sbin/syslogd/syslog.conf.5
+++ b/usr.sbin/syslogd/syslog.conf.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)syslog.conf.5	8.1 (Berkeley) 6/9/93
-.\"     $OpenBSD: syslog.conf.5,v 1.4 1997/11/09 09:45:04 todd Exp $
+.\"     $OpenBSD: syslog.conf.5,v 1.5 1999/06/05 22:18:15 aaron Exp $
 .\"	$NetBSD: syslog.conf.5,v 1.4 1996/01/02 17:41:46 perry Exp $
 .\"
 .Dd June 9, 1993
@@ -102,9 +102,9 @@ similar
 values specified to the
 .Xr syslog
 library routine.
-.Pp 
+.Pp
 Each block of lines is separated from the previous block by a tag. The tag
-is a line beginning with 
+is a line beginning with
 .Em #!prog
 or
 .Em !prog
@@ -206,7 +206,6 @@ beginning with (``!'').  This allows
 .Nm
 files to be shared with systems that don't recognise the (``!'') syntax.
 .Sh EXAMPLES
-.Pp
 A configuration file might appear as follows:
 .Bd -literal
 # Log all kernel messages, authentication messages of
@@ -236,7 +235,7 @@ mail.*							/var/log/maillog
 # Save mail and news errors of level err and higher in a
 # special file.
 uucp,news.crit						/var/log/spoolerr
-  
+
 # Save ftpd transactions along with mail and news
 !ftpd
 *.*                                                     /var/log/spoolerr
diff --git a/usr.sbin/timed/timed/timed.8 b/usr.sbin/timed/timed/timed.8
index 75d3da67528..cabd693f2c7 100644
--- a/usr.sbin/timed/timed/timed.8
+++ b/usr.sbin/timed/timed/timed.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: timed.8,v 1.4 1999/05/23 14:11:38 aaron Exp $
+.\"	$OpenBSD: timed.8,v 1.5 1999/06/05 22:18:17 aaron Exp $
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -51,9 +51,9 @@ This
 is a time server daemon and is normally invoked
 at boot time from the
 .Xr rc 8
-file.  
+file.
 It synchronizes the host's time with the time of other
-machines in a local area network running 
+machines in a local area network running
 .Nm timed .
 These time servers will slow down the clocks of some machines
 and speed up the clocks of others to bring them to the average network time.
@@ -71,18 +71,18 @@ When
 is started on a machine, it asks the master for the network time
 and sets the host's clock to that time.
 After that, it accepts synchronization messages periodically sent by
-the master and calls 
+the master and calls
 .Xr adjtime 2
 to perform the needed corrections on the host's clock.
 .Pp
 It also communicates with
 .Xr date 1
 in order to set the date globally,
-and with 
+and with
 .Xr timedc 8 ,
 a timed control program.
 If the machine running the master crashes, then the slaves will elect
-a new master from among slaves running with the 
+a new master from among slaves running with the
 .Fl M
 flag.
 A
@@ -92,7 +92,7 @@ running without the
 or
 .Fl F
 flags will remain a slave.
-The 
+The
 .Fl t
 flag enables
 .Nm
@@ -116,7 +116,7 @@ If permitted by the
 flag, it will provide synchronization service on any attached networks
 on which no current master server was detected.
 Such a server propagates the time computed by the top-level master.
-The 
+The
 .Fl n
 flag, followed by the name of a network which the host is connected to
 (see
@@ -127,7 +127,7 @@ Each time the
 .Fl n
 flag appears, that network name is added to a list of valid networks.
 All other networks are ignored.
-The 
+The
 .Fl i
 flag, followed by the name of a network to which the host is connected
 (see
@@ -139,7 +139,7 @@ flag appears, that network name is added to a list of networks to ignore.
 All other networks are used by the time daemon.
 The
 .Fl n
-and 
+and
 .Fl i
 flags are meaningless if used together.
 .Pp
@@ -154,14 +154,14 @@ If it finds masters on more than one network, it chooses one network
 on which to be a "slave," and then periodically checks the other
 networks to see if the masters there have disappeared.
 .Pp
-One way to synchronize a group of machines is to use an NTP daemon to 
+One way to synchronize a group of machines is to use an NTP daemon to
 synchronize the clock of one machine to a distant standard or a radio
-receiver and 
+receiver and
 .Fl F Ar hostname
 to tell its timed daemon to trust only itself.
 .Pp
 Messages printed by the kernel on the system console occur with
-interrupts disabled. 
+interrupts disabled.
 This means that the clock stops while they are printing.
 A machine with many disk or network hardware problems and consequent
 messages cannot keep good time by itself.  Each message typically causes
@@ -176,19 +176,19 @@ settings are often associated with
 machines that looked for time masters on more than one network and eventually
 chose to become a slave on the other network.
 .Sh WARNINGS
-If two or more time daemons, whether 
+If two or more time daemons, whether
 .Nm timed ,
 .Xr NTP ,
 try to adjust the same clock, temporal chaos will result.
-If both 
+If both
 .Nm
 and another time daemon are run on the same machine,
-ensure that the 
+ensure that the
 .Fl F
-flag is used, so that 
+flag is used, so that
 .Nm
 never attempts to adjust the local clock.
-.Pp 
+.Pp
 The protocol is based on UDP/IP broadcasts.  All machines within
 the range of a broadcast that are using the TSP protocol must cooperate.
 There cannot be more than a single administrative domain using the
diff --git a/usr.sbin/timed/timedc/timedc.8 b/usr.sbin/timed/timedc/timedc.8
index c5a1481f3e7..46decf1f6b0 100644
--- a/usr.sbin/timed/timedc/timedc.8
+++ b/usr.sbin/timed/timedc/timedc.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: timedc.8,v 1.4 1999/05/23 14:11:38 aaron Exp $
+.\"	$OpenBSD: timedc.8,v 1.5 1999/06/05 22:18:18 aaron Exp $
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -54,7 +54,7 @@ It may be used to:
 .Bl -bullet -compact
 .It
 Measure the differences between machines' clocks,
-.It 
+.It
 Find the location where the master time server is running,
 .It
 Enable or disable tracing of messages received by
diff --git a/usr.sbin/trpt/trpt.8 b/usr.sbin/trpt/trpt.8
index e5ce52a7b62..20fdbc4e02b 100644
--- a/usr.sbin/trpt/trpt.8
+++ b/usr.sbin/trpt/trpt.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: trpt.8,v 1.8 1999/05/23 14:11:38 aaron Exp $
+.\"	$OpenBSD: trpt.8,v 1.9 1999/06/05 22:18:19 aaron Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -59,7 +59,7 @@ when a socket is marked for
 (see
 .Xr setsockopt 2 ) ,
 and prints a readable description of these records.
-When no options are supplied, 
+When no options are supplied,
 .Nm
 prints all the trace records found in the system
 grouped according to
@@ -110,9 +110,9 @@ is as follows.
 Isolate the problem and enable debugging on the
 socket(s) involved in the connection.
 Find the address of the protocol control blocks
-associated with the sockets using the 
+associated with the sockets using the
 .Fl A
-option to 
+option to
 .Xr netstat 1 .
 Then run
 .Nm
diff --git a/usr.sbin/trsp/trsp.8 b/usr.sbin/trsp/trsp.8
index 82c1be6965f..d4615d4518e 100644
--- a/usr.sbin/trsp/trsp.8
+++ b/usr.sbin/trsp/trsp.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: trsp.8,v 1.7 1999/05/23 14:11:39 aaron Exp $
+.\"	$OpenBSD: trsp.8,v 1.8 1999/06/05 22:18:20 aaron Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -59,7 +59,7 @@ when a socket is marked for
 (see
 .Xr setsockopt 2 ) ,
 and prints a readable description of these records.
-When no options are supplied, 
+When no options are supplied,
 .Nm
 prints all the trace records found in the system
 grouped according to
@@ -109,9 +109,9 @@ is as follows.
 Isolate the problem and enable debugging on the
 socket(s) involved in the connection.
 Find the address of the protocol control blocks
-associated with the sockets using the 
+associated with the sockets using the
 .Fl A
-option to 
+option to
 .Xr netstat 1 .
 Then run
 .Nm
diff --git a/usr.sbin/vnconfig/vnconfig.8 b/usr.sbin/vnconfig/vnconfig.8
index c04cf9af409..f8c2e9203ca 100644
--- a/usr.sbin/vnconfig/vnconfig.8
+++ b/usr.sbin/vnconfig/vnconfig.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vnconfig.8,v 1.7 1999/05/23 14:11:39 aaron Exp $
+.\"	$OpenBSD: vnconfig.8,v 1.8 1999/06/05 22:18:21 aaron Exp $
 .\
 .\" Copyright (c) 1993 University of Utah.
 .\" Copyright (c) 1980, 1989, 1991, 1993
@@ -56,7 +56,7 @@
 The
 .Nm vnconfig
 command configures vnode pseudo disk devices.
-It will associate the special file 
+It will associate the special file
 .Ar rawdev
 with the regular file
 .Ar regular_file
diff --git a/usr.sbin/ypserv/makedbm/makedbm.8 b/usr.sbin/ypserv/makedbm/makedbm.8
index 1c50dff7a22..8201bd83aa5 100644
--- a/usr.sbin/ypserv/makedbm/makedbm.8
+++ b/usr.sbin/ypserv/makedbm/makedbm.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: makedbm.8,v 1.6 1999/03/12 15:33:59 aaron Exp $
+.\"	$OpenBSD: makedbm.8,v 1.7 1999/06/05 22:18:23 aaron Exp $
 .\" Copyright (c) 1994-97 Mats O Jansson <moj@stacken.kth.se>
 .\" All rights reserved.
 .\"
@@ -59,7 +59,7 @@ Dump a database to standard output.
 .It Fl U
 Same as
 .Fl u
-but also try 
+but also try
 .Xr db 3
 hash format.
 .It Fl b
@@ -69,8 +69,8 @@ effect on the two maps hosts.byname and hosts.byaddr.
 .It Fl l
 Lowercase. Convert all keys to lower case before adding them to the YP
 database.
-.It Fl s 
-Secure map. Include an entry in the database informing 
+.It Fl s
+Secure map. Include an entry in the database informing
 .Xr ypxfr 8
 and
 .Xr ypserv 8
diff --git a/usr.sbin/ypserv/mkalias/mkalias.8 b/usr.sbin/ypserv/mkalias/mkalias.8
index 4d9e71340b8..333edf91e62 100644
--- a/usr.sbin/ypserv/mkalias/mkalias.8
+++ b/usr.sbin/ypserv/mkalias/mkalias.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mkalias.8,v 1.2 1999/03/12 15:33:59 aaron Exp $
+.\"	$OpenBSD: mkalias.8,v 1.3 1999/06/05 22:18:24 aaron Exp $
 .\" Copyright (c) 1997 Mats O Jansson <moj@stacken.kth.se>
 .\" All rights reserved.
 .\"
@@ -37,7 +37,7 @@
 .Sh SYNOPSIS
 .Nm mkalias
 .Op Fl v
-.Op Fl e 
+.Op Fl e
 .Op Fl E
 .Op Fl d
 .Op Fl u
@@ -47,7 +47,7 @@
 .Sh DESCRIPTION
 .Nm
 is used to convert a mail.aliases map to a mail.byaddr map. This is
-an inverse map of user@host (or user!host) back to alias. 
+an inverse map of user@host (or user!host) back to alias.
 .Pp
 .Pp
 The options are as follows:
@@ -62,22 +62,22 @@ Same as
 but also check for any MX-record.
 .It Fl d
 Assume Domain names are OK. Only useful together with
-.Fl e 
+.Fl e
 or
 .Fl E .
 .It Fl u
 Assume UUCP names are OK. Only useful together with
-.Fl e 
+.Fl e
 or
 .Fl E .
 .It Fl n
-Capitalize name. eg mats.o.jansson becomes Mats.O.Jansson.  
+Capitalize name. eg mats.o.jansson becomes Mats.O.Jansson.
 .It Ar input
 Use this map as input.
 .It Ar output
 Use this map as output. If the output map isn't given don't create database.
 Can be useful together with
-.Fl e 
+.Fl e
 or
 .Fl E .
 .El
@@ -88,6 +88,6 @@ on SunOS 4.1.x seems to have a
 Since I don't know what it is supposed to do I haven't implemented it. But it is accepted by the program.
 .Sh SEE ALSO
 .Xr yp 8 ,
-.Xr ypserv 8 
+.Xr ypserv 8
 .Sh AUTHOR
 Mats O Jansson <moj@stacken.kth.se>
diff --git a/usr.sbin/ypserv/mknetid/mknetid.8 b/usr.sbin/ypserv/mknetid/mknetid.8
index 543582577cb..f624915e659 100644
--- a/usr.sbin/ypserv/mknetid/mknetid.8
+++ b/usr.sbin/ypserv/mknetid/mknetid.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mknetid.8,v 1.5 1999/05/23 14:11:06 aaron Exp $
+.\"	$OpenBSD: mknetid.8,v 1.6 1999/06/05 22:18:25 aaron Exp $
 .\" Copyright (c) 1996 Mats O Jansson <moj@stacken.kth.se>
 .\" All rights reserved.
 .\"
@@ -44,13 +44,13 @@
 .Op Fl m Ar netidfile
 .Sh DESCRIPTION
 .Nm
-is used to create a map named 
+is used to create a map named
 .Ar netid.byname .
 The map consists of information from
 .Xr passwd 5 ,
 .Xr group 5
 and
-.Xr hosts 5 
+.Xr hosts 5
 eventually concatenated with a
 .Xr netid 5
 file.
diff --git a/usr.sbin/ypserv/mknetid/netid.5 b/usr.sbin/ypserv/mknetid/netid.5
index ace8d553c1b..147e2391377 100644
--- a/usr.sbin/ypserv/mknetid/netid.5
+++ b/usr.sbin/ypserv/mknetid/netid.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: netid.5,v 1.5 1999/05/23 14:11:06 aaron Exp $
+.\"	$OpenBSD: netid.5,v 1.6 1999/06/05 22:18:25 aaron Exp $
 .\" Copyright (c) 1996 Mats O Jansson <moj@stacken.kth.se>
 .\" All rights reserved.
 .\"
@@ -33,7 +33,7 @@
 .Os
 .Sh NAME
 .Nm netid
-.Nd 
+.Nd
 .Nm YP
 network credential file
 .Sh DESCRIPTION
@@ -58,7 +58,7 @@ The second type contains information about hosts:
 unix.<hostname>@<yp-domain> 0:<hostname>
 .Ed
 .Pp
-The third type refers to records from a 
+The third type refers to records from a
 .Xr netid 5
 file other than the two types above.
 .Sh EXAMPLES
diff --git a/usr.sbin/ypserv/stdethers/stdethers.8 b/usr.sbin/ypserv/stdethers/stdethers.8
index b6e34606cd8..6720d64c10f 100644
--- a/usr.sbin/ypserv/stdethers/stdethers.8
+++ b/usr.sbin/ypserv/stdethers/stdethers.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: stdethers.8,v 1.4 1999/03/12 15:33:59 aaron Exp $
+.\"	$OpenBSD: stdethers.8,v 1.5 1999/06/05 22:18:26 aaron Exp $
 .\" Copyright (c) 1995 Mats O Jansson <moj@stacken.kth.se>
 .\" All rights reserved.
 .\"
@@ -47,6 +47,6 @@ argument is given. This utility is used by YP when creating YP maps.
 .Pp
 .Sh SEE ALSO
 .Xr yp 8 ,
-.Xr ypserv 8 
+.Xr ypserv 8
 .Sh AUTHOR
 Mats O Jansson <moj@stacken.kth.se>
diff --git a/usr.sbin/ypserv/stdhosts/stdhosts.8 b/usr.sbin/ypserv/stdhosts/stdhosts.8
index 3dcf7275d3c..e51f6ac1871 100644
--- a/usr.sbin/ypserv/stdhosts/stdhosts.8
+++ b/usr.sbin/ypserv/stdhosts/stdhosts.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: stdhosts.8,v 1.5 1999/03/12 15:34:00 aaron Exp $
+.\"	$OpenBSD: stdhosts.8,v 1.6 1999/06/05 22:18:27 aaron Exp $
 .\" Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
 .\" All rights reserved.
 .\"
@@ -47,6 +47,6 @@ argument is given. This utility is used by YP when creating YP maps.
 .Pp
 .Sh SEE ALSO
 .Xr yp 8 ,
-.Xr ypserv 8 
+.Xr ypserv 8
 .Sh AUTHOR
 Mats O Jansson <moj@stacken.kth.se>
diff --git a/usr.sbin/ypserv/ypinit/ypinit.8 b/usr.sbin/ypserv/ypinit/ypinit.8
index 9455804dc7d..ef8b9bfc569 100644
--- a/usr.sbin/ypserv/ypinit/ypinit.8
+++ b/usr.sbin/ypserv/ypinit/ypinit.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ypinit.8,v 1.2 1999/03/12 15:34:00 aaron Exp $
+.\"	$OpenBSD: ypinit.8,v 1.3 1999/06/05 22:18:30 aaron Exp $
 .\" Copyright (c) 1997 Mats O Jansson <moj@stacken.kth.se>
 .\" All rights reserved.
 .\"
@@ -48,7 +48,7 @@ may be used to setup a YP server, or to change the ypserver map.
 The options are as follows:
 .Bl -tag -width indent
 .It Fl m Ar domainname
-Setup a master YP server. If 
+Setup a master YP server. If
 .Ar domainname
 is not given the default domainname will be used.
 .It Fl s Ar master_server Op Ar domainname
@@ -58,12 +58,12 @@ is not given the default domainname will be used.
 .Ar master_server
 must be a running YP master server.
 .It Fl u Op Ar domainname
-Update the ypserver map on a YP master server. If 
+Update the ypserver map on a YP master server. If
 .Ar domainname
 is not given the default domainname will be used.
 .El
 .Sh SEE ALSO
 .Xr yp 8 ,
-.Xr ypserv 8 
+.Xr ypserv 8
 .Sh AUTHOR
 Mats O Jansson <moj@stacken.kth.se>
diff --git a/usr.sbin/ypserv/yppush/yppush.8 b/usr.sbin/ypserv/yppush/yppush.8
index 2777199c967..0c6296c9c2f 100644
--- a/usr.sbin/ypserv/yppush/yppush.8
+++ b/usr.sbin/ypserv/yppush/yppush.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: yppush.8,v 1.4 1997/05/01 21:08:49 niklas Exp $
+.\"	$OpenBSD: yppush.8,v 1.5 1999/06/05 22:18:31 aaron Exp $
 .\" Copyright (c) 1995 Mats O Jansson <moj@stacken.kth.se>
 .\" All rights reserved.
 .\"
@@ -63,6 +63,6 @@ Verbose. Announce what the program is doing.
 .El
 .Sh SEE ALSO
 .Xr yp 8 ,
-.Xr ypserv 8 
+.Xr ypserv 8
 .Sh AUTHOR
 Mats O Jansson
diff --git a/usr.sbin/ypserv/ypserv/securenet.5 b/usr.sbin/ypserv/ypserv/securenet.5
index ad0d98f9213..2edf9416c26 100644
--- a/usr.sbin/ypserv/ypserv/securenet.5
+++ b/usr.sbin/ypserv/ypserv/securenet.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: securenet.5,v 1.5 1999/03/12 15:34:00 aaron Exp $
+.\"	$OpenBSD: securenet.5,v 1.6 1999/06/05 22:18:32 aaron Exp $
 .\" Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
 .\" All rights reserved.
 .\"
@@ -33,11 +33,11 @@
 .Os
 .Sh NAME
 .Nm securenet
-.Nd 
+.Nd
 .Xr ypserv 8
 configuration file for secure networks
 .Sh DESCRIPTION
-The 
+The
 .Nm
 file controls which hosts can connect to the
 .Nm YP
@@ -49,7 +49,7 @@ is the network mask. The second item is the network.
 A configuration file might look like the following:
 .Bd -literal
 #
-# Only my local net is secure. 
+# Only my local net is secure.
 #
 255.255.255.0 139.58.253.0
 .Ed
diff --git a/usr.sbin/ypserv/ypserv/ypserv.8 b/usr.sbin/ypserv/ypserv/ypserv.8
index 9b9c6be231a..fbf58c4ac83 100644
--- a/usr.sbin/ypserv/ypserv/ypserv.8
+++ b/usr.sbin/ypserv/ypserv/ypserv.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ypserv.8,v 1.12 1999/04/02 15:12:22 aaron Exp $
+.\"	$OpenBSD: ypserv.8,v 1.13 1999/06/05 22:18:33 aaron Exp $
 .\" Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
 .\" All rights reserved.
 .\"
@@ -51,7 +51,7 @@ A YP map is stored on the server as a
 database. A number of YP maps is grouped together in a domain.
 .Nm
 determines the domains it serves by looking for a directory with
-the domain name in 
+the domain name in
 .Pa /var/yp .
 .Pp
 YP hasn't been known for high security through the years. In recent years
@@ -62,7 +62,7 @@ It contains networks the server can assume is secure. For information about
 file format see
 .Xr securenet 5 .
 .Pp
-Before the author of this server had seen 
+Before the author of this server had seen
 .Xr securenet 5
 another format,
 .Xr ypserv.acl 5 ,
@@ -70,8 +70,8 @@ was implemented.
 This file format makes it possible to allow and deny hosts and networks
 access to the server. This file can have any name since it's given by
 the argument to
-.Fl a 
-(use full path). 
+.Fl a
+(use full path).
 .Pp
 The file used can be reread by sending a
 .Dv SIGHUP
@@ -105,7 +105,7 @@ Allow
 .Nm
 to answer old YP version 1 requests.
 .It Fl a Ar aclfile
-Don't use 
+Don't use
 .Pa /var/yp/securenet .
 Use another file with a different file format. For further information see
 .Xr ypserv.acl 5 .
@@ -119,7 +119,7 @@ Alternately, if these maps were built on the YP master using
 .Nm makedbm
 .Fl b
 then DNS queries will be done without needing to specify
-.Fl d . 
+.Fl d .
 .It Fl x
 Terminate the server after processing
 .Ar aclfile
diff --git a/usr.sbin/ypserv/ypserv/ypserv.acl.5 b/usr.sbin/ypserv/ypserv/ypserv.acl.5
index fd2f2f4036c..66ebdae6717 100644
--- a/usr.sbin/ypserv/ypserv/ypserv.acl.5
+++ b/usr.sbin/ypserv/ypserv/ypserv.acl.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ypserv.acl.5,v 1.7 1999/03/12 15:34:00 aaron Exp $
+.\"	$OpenBSD: ypserv.acl.5,v 1.8 1999/06/05 22:18:34 aaron Exp $
 .\" Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
 .\" All rights reserved.
 .\"
@@ -33,11 +33,11 @@
 .Os
 .Sh NAME
 .Nm ypserv.acl
-.Nd 
+.Nd
 .Xr ypserv 8
 configuration file
 .Sh DESCRIPTION
-The 
+The
 .Nm
 file controls which hosts can connect to the
 .Nm YP
@@ -64,12 +64,12 @@ is processed from the beginning for every incomming request. As soon a
 match is found in the list the search terminates and it returns success
 or failure depending on which of
 .Nm allow
-or 
+or
 .Nm deny
 was specified.
 If no match was found in the list success is returned.
 .Pp
-If access is denied every call will cause a 
+If access is denied every call will cause a
 .Nm no such domain
 error for the caller.
 .Pp
@@ -77,7 +77,7 @@ Don't forget to allow localhost access if you want the machine running
 .Nm ypserv
 to be able to access it too.
 .Pp
-There is no default name for this file. Start 
+There is no default name for this file. Start
 .Nm ypserv
 with a
 .Fl a Ar filename
@@ -93,7 +93,7 @@ The following syntaxes may be used:
 .Ic hostname|ip-address
 >
 .Pp
-If 
+If
 .Ic hostname
 has more than one IP address then all will be added to the list.
 .Pp
@@ -112,7 +112,7 @@ part of the command isn't given then the netmask will be assumed to be a
 class A, B or C net depending on the net number.
 .Pp
 <
-.Ic allow|deny 
+.Ic allow|deny
 >
 .Ic all
 .Pp
@@ -158,7 +158,7 @@ allow net mojathome netmask 255.255.255.0
 ###########################################################################
 # At last we have a command that will match any caller:
 #
-#	allow all 
+#	allow all
 #	deny all
 #
 
diff --git a/usr.sbin/ypserv/yptest/yptest.8 b/usr.sbin/ypserv/yptest/yptest.8
index f9c8695ced0..469897e0b59 100644
--- a/usr.sbin/ypserv/yptest/yptest.8
+++ b/usr.sbin/ypserv/yptest/yptest.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: yptest.8,v 1.5 1999/03/12 15:34:00 aaron Exp $
+.\"	$OpenBSD: yptest.8,v 1.6 1999/06/05 22:18:35 aaron Exp $
 .\" Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
 .\" All rights reserved.
 .\"
@@ -58,6 +58,6 @@ checks various YP functions to see if the YP server works as expected.
 .\".El
 .Sh SEE ALSO
 .Xr yp 8 ,
-.Xr ypserv 8 
+.Xr ypserv 8
 .Sh AUTHOR
 Mats O Jansson <moj@stacken.kth.se>
diff --git a/usr.sbin/ypserv/ypxfr/ypxfr.8 b/usr.sbin/ypserv/ypxfr/ypxfr.8
index 95d504c0f9e..7d1092569a9 100644
--- a/usr.sbin/ypserv/ypxfr/ypxfr.8
+++ b/usr.sbin/ypserv/ypxfr/ypxfr.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ypxfr.8,v 1.7 1998/01/15 17:23:24 niklas Exp $
+.\"	$OpenBSD: ypxfr.8,v 1.8 1999/06/05 22:18:36 aaron Exp $
 .\" Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
 .\" All rights reserved.
 .\"
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: ypxfr.8,v 1.7 1998/01/15 17:23:24 niklas Exp $
+.\"	$OpenBSD: ypxfr.8,v 1.8 1999/06/05 22:18:36 aaron Exp $
 .\"
 .Dd August 18, 1994
 .Dt YPXFR 8
@@ -45,7 +45,7 @@
 .Op Fl C Ar tid prog ipadd port
 .Ar mapname
 .Sh DESCRIPTION
-.Nm ypxfr 
+.Nm ypxfr
 is the utiliy in YP that transfers maps to the local host.
 .Pp
 Since the YP master transfers a map when it has changed, an YP slave should
@@ -65,8 +65,8 @@ DNS to get information about unknown hosts. This option will only have
 effect on the two maps hosts.byname and hosts.byaddr.
 .It Fl c
 Don't send a "Clear current map" to local ypserv process. Useful if ypserv
-isn't running localy to avoid timeout message. 
-.It Fl f 
+isn't running localy to avoid timeout message.
+.It Fl f
 Force map transfer, even if version of master is older than local copy.
 .It Fl d Ar domain
 Don't use default domain, use the specified domain.
@@ -87,6 +87,6 @@ an yppush on another host.
 .Sh SEE ALSO
 .Xr yp 8 ,
 .Xr yppush 8 ,
-.Xr ypserv 8 
+.Xr ypserv 8
 .Sh AUTHOR
 Mats O Jansson <moj@stacken.kth.se>