25 files changed, 140 insertions, 122 deletions

diff --git a/sbin/raidctl/raidctl.8 b/sbin/raidctl/raidctl.8
index c7a3a3b7bf9..6f7a8cffd30 100644
--- a/sbin/raidctl/raidctl.8
+++ b/sbin/raidctl/raidctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: raidctl.8,v 1.2 1999/02/16 21:51:39 niklas Exp $
+.\"	$OpenBSD: raidctl.8,v 1.3 1999/04/02 15:12:18 aaron Exp $
 .\"
 .\"     $NetBSD: raidctl.8,v 1.3 1999/02/04 14:50:31 oster Exp $
 .\"
@@ -69,26 +69,26 @@
 .Nm raidctl
 .Nd configuration utility for the RAIDframe disk driver
 .Sh SYNOPSIS
-.Nm
+.Nm raidctl
 .Fl c Ar config_file Ar dev
-.Nm ""
+.Nm raidctl
 .Fl C Ar dev
-.Nm ""
+.Nm raidctl
 .Fl f Ar component Ar dev
-.Nm ""
+.Nm raidctl
 .Fl F Ar component Ar dev
-.Nm ""
+.Nm raidctl
 .Fl r Ar dev
-.Nm ""
+.Nm raidctl
 .Fl R Ar dev
-.Nm ""
+.Nm raidctl
 .Fl s Ar dev 
-.Nm ""
+.Nm raidctl
 .Fl u Ar dev
 .Sh DESCRIPTION
 .Nm
 is the user-land control program for
-.Xr raid 4 , Ns
+.Xr raid 4 ,
 the RAIDframe disk device.  
 .Nm 
 is primarily used to dynamically configure and unconfigure RAIDframe disk
@@ -112,7 +112,7 @@ A description of the contents of
 is given later.
 .It Fl C Ar dev
 Initiate a copyback of reconstructed data from a spare disk to 
-it's original disk.  This is performed after a component has failed, 
+its original disk.  This is performed after a component has failed, 
 and the failed drive has been reconstructed onto a spare drive.
 .It Fl f Ar component Ar dev
 This marks the specified 
@@ -122,12 +122,12 @@ component.
 .It Fl F Ar component Ar dev
 Fails the specified 
 .Ar component
-of the device, and immediately begin a reconstruction of the failed
+of the device, and immediately beginis a reconstruction of the failed
 disk onto an available hot spare.  This is the mechanism used to start
 the reconstruction process if a component does have a hardware failure.
 .It Fl r Ar dev
 Re-write the parity on the device.  This 
-.Ar MUST
+.Em must
 be done before the RAID device is labeled and before
 filesystems are created on the RAID device, and is normally used after
 a system crash (and before a 
@@ -148,9 +148,13 @@ The device used by
 is specified by 
 .Ar dev .  
 .Ar dev
-may be either the full name of the device, e.g. /dev/rraid0d,
-for the i386 architecture, and /dev/rraid0c
-for all others, or just simply raid0 (for /dev/rraid0d).
+may be either the full name of the device (e.g.,
+.Pa /dev/rraid0d
+for the i386 architecture, and
+.Pa /dev/rraid0c
+for all others),
+or just simply raid0 (for
+.Pa /dev/rraid0d ) .
 .Pp
 The format of the configuration file is complex, and
 only an abbreviated treatment is given here.  In the configuration
@@ -160,11 +164,11 @@ indicates the beginning of a comment.
 .Pp
 There are 4 required sections of a configuration file, and 2
 optional components.  Each section begins with a 
-.Sq START , 
+.Dq START , 
 followed by
 the section name, and the confuration parameters associated with that
 section.  The first section is the 
-.Sq array
+.Dq array
 section, and it specifies
 the number of rows, columns, and spare disks in the RAID array.  For
 example: 
@@ -174,12 +178,12 @@ START array
 .Ed
 .Pp
 indicates an array with 1 row, 3 columns, and 0 spare disks.  Note
-that although multi-dimenstional arrays may be specified, they are 
-.Ar NOT
+that although multi-dimensional arrays may be specified, they are 
+.Em not
 supported in the driver.
 .Pp
 The second section, the 
-.Sq disks
+.Dq disks
 section, specifies the actual
 components of the device.  For example:
 .Bd -unfilled -offset indent
@@ -192,24 +196,23 @@ START disks
 specifies the three component disks to be used in the RAID device.  If
 any of the specified drives cannot be found when the RAID device is
 configured, then they will be marked as 
-.Sq failed , 
+.Dq failed , 
 and the system will
-operate in degraded mode.  Note that it is 
-.Ar imperative
+operate in degraded mode.  Note that it is
+.Em imperative
 that the order of the components in the configuration file does not
 change between configurations of a RAID device.  Changing the order
 of the components (at least at the time of this writing) will result in
 data loss.  
 .Pp
-The next section, which is the 
-.Sq spare
-section, is optional, and, if
-present, specifies the devices to be used as 
-.Sq hot spares
+The next section,
+.Dq spare ,
+is optional, and if present specifies the devices to be used as
+.Dq hot spares
 -- devices
 which are on-line, but are not actively used by the RAID driver unless
 one of the main components fail.  A simple 
-.Sq spare
+.Dq spare
 section might be:
 .Bd -unfilled -offset indent
 START spare 
@@ -218,11 +221,11 @@ START spare
 .Pp
 for a configuration with a single spare component.  If no spare drives
 are to be used in the configuration, then the 
-.Sq spare
-section may be ommitted.  
+.Dq spare
+section may be omitted.  
 .Pp
 The next section is the 
-.Sq layout
+.Dq layout
 section.  This section describes the
 general layout parameters for the RAID device, and provides such
 information as sectors per stripe unit, stripe units per parity unit,
@@ -235,7 +238,7 @@ START layout
 .Ed
 .Pp
 The sectors per stripe unit specifies, in blocks, the interleave
-factor; i.e. the number of contiguous sectors to be written to each
+factor; i.e., the number of contiguous sectors to be written to each
 component for a single stripe.  Appropriate selection of this value
 (32 in this example) is the subject of much research in RAID
 architectures.  The stripe units per parity unit and
@@ -265,7 +268,7 @@ those parity operations has not been tested with
 .Ox .
 .Pp
 The next required section is the 
-.Sq queue
+.Dq queue
 section.  This is most often
 specified as:
 .Bd -unfilled -offset indent
@@ -273,31 +276,29 @@ START queue
 fifo 1
 .Ed
 .Pp
-where the queueing method is specified as fifo (first-in, first-out),
-and the size of the per-component queue is limited to 1 requests.  A
+where the queuing method is specified as FIFO (first-in, first-out),
+and the size of the per-component queue is limited to 1 request.  A
 value of 1 is quite conservative here, and values of 100 or more may
 been used to increase the driver performance. 
 Other queuing methods may also be specified, but a discussion of them
 is beyond the scope of this document.
 .Pp
 The final section, the 
-.Sq debug section, is optional.  For more details
+.Dq debug
+section, is optional.  For more details
 on this the reader is referred to the RAIDframe documentation
 dissussed in the 
 .Sx HISTORY
 section.
-
 See
 .Sx EXAMPLES
 for a more complete configuration file example.
-
 .Sh EXAMPLES
-
 The examples in this section will focus on a RAID 5 configuration.
 Other RAID configurations will behave similarly.  It is highly
 recommended that before using the RAID driver for real filesystems
 that the system administrator(s) have used 
-.Ar all
+.Em all
 of the options for 
 .Nm ,
 and that they understand how the component reconstruction process
@@ -305,11 +306,11 @@ works.  While this example is not created as a tutorial, the steps
 shown here can be easily dupilicated using four equal-sized partitions
 from any number of disks (including all four from a single disk).  
 .Pp
-The primary uses of 
+The primary use of 
 .Nm
 is to configure and unconfigure
 .Xr raid 4 
-devices.  To configure the device, a configuration
+devices.  To configure a device, a configuration
 file which looks something like:
 .Bd -unfilled -offset indent
 START array
@@ -333,13 +334,19 @@ fifo 100
 .Ed
 .Pp
 is first created.  In short, this configuration file specifies a RAID
-5 configuration consisting of the disks /dev/sd1e, /dev/sd2e, and
-/dev/sd3e, with /dev/sd4e available as a 
-.Sq hot spare
+5 configuration consisting of the disks
+.Pa /dev/sd1e ,
+.Pa /dev/sd2e ,
+and
+.Pa /dev/sd3e ,
+with
+.Pa /dev/sd4e
+available as a 
+.Dq hot spare
 in case one of
 the three main drives should fail.  If the above configuration is in a
 file called 
-.Sq rfconfig , 
+.Pa rfconfig , 
 raid device 0 can be configured with: 
 .Bd -unfilled -offset indent
 raidctl -c rfconfig raid0
@@ -350,8 +357,10 @@ The above is equivalent to the following:
 raidctl -c rfconfig /dev/rraid0d
 .Ed
 .Pp
-on the i386 architecture.  On all other architectures, /dev/rraid0c
-is used in place of /dev/rraid0d.
+on the i386 architecture.  On all other architectures,
+.Pa /dev/rraid0c
+is used in place of
+.Pa /dev/rraid0d .
 .Pp
 To see how the device is doing, the following will show the status:
 .Bd -unfilled -offset indent
@@ -391,7 +400,7 @@ raidctl -f /dev/sd2e raid0
 .Ed
 .Pp
 The system will then be performing all operations in degraded mode,
-were missing data is re-computed from existing data and the parity.
+where missing data is re-computed from existing data and the parity.
 In this case, obtaining the status of raid0 will return:
 .Bd -unfilled -offset indent
 Components:
@@ -439,8 +448,9 @@ Spares:
            /dev/sd4e [0][0]: used_spare
 .Ed
 .Pp
-At this point there are at least two options.  First, if /dev/sd2e is
-known to be good (i.e. the failure was either caused by 
+At this point there are at least two options.  First, if
+.Pa /dev/sd2e
+is known to be good (i.e., the failure was either caused by 
 .Fl f
 or 
 .Fl F ,
@@ -448,8 +458,10 @@ or the failed disk was replaced), then a copyback of the data can
 be initiated with the 
 .Fl C
 option.  In this example, this would copy the entire contents of
-/dev/sd4e to /dev/sd2e.  Once the copyback procedure is complete, the
-status of the device would be:
+.Pa /dev/sd4e
+to
+.Pa /dev/sd2e .
+Once the copyback procedure is complete, the status of the device would be:
 .Bd -unfilled -offset indent
 Components:
            /dev/sd1e: optimal
@@ -461,8 +473,11 @@ Spares:
 .Pp
 and the system is back to normal operation.
 .Pp
-The second option after the reconstruction is to simply use /dev/sd4e
-in place of /dev/sd2e in the configuration file.  For example, the
+The second option after the reconstruction is to simply use
+.Pa /dev/sd4e
+in place of
+.Pa /dev/sd2e
+in the configuration file.  For example, the
 configuration file (in part) might now look like:
 .Bd -unfilled -offset indent
 START array
@@ -474,13 +489,16 @@ START drives
 /dev/sd3e
 .Ed
 .Pp
-This can be done as /dev/sd4e is completely interchangeable with
-/dev/sd2e at this point.  Note that extreme care must be taken when 
+This can be done as
+.Pa /dev/sd4e
+is completely interchangeable with
+.Pa /dev/sd2e
+at this point.  Note that extreme care must be taken when 
 changing the order of the drives in a configuration.  This is one of
 the few instances where the devices and/or their orderings can be
 changed without loss of data!  In general, the ordering of components
 in a configuration file should 
-.Ar never 
+.Em never 
 be changed.
 .Pp
 The final operation performed by 
@@ -499,11 +517,11 @@ data loss due to component failure.  However the loss of two
 components of a RAID 4 or 5 system, or the loss of a single component
 of a RAID 0 system will result in the entire filesystem being lost.
 RAID is 
-.Ar NOT
+.Em not
 a substitute for good backup practices.
 .Pp
 Recomputation of parity 
-.Ar MUST
+.Em must
 be performed whenever there is a chance that it may have been
 compromised.  This includes after system crashes, or before a RAID
 device has been used for the first time.  Failure to keep parity
@@ -516,12 +534,12 @@ is to use parity, but not keep the parity correct.  At least with RAID
 .Bl -tag -width /dev/XXrXraidX -compact
 .It Pa /dev/{,r}raid*
 .Nm
-device special files.
+device special files
 .El
 .Pp
 .Sh SEE ALSO
-.Xr raid 4 ,
 .Xr ccd 4 ,
+.Xr raid 4 ,
 .Xr rc 8
 .Sh HISTORY
 RAIDframe is a framework for rapid prototyping of RAID structures
diff --git a/usr.bin/midiplay/midiplay.1 b/usr.bin/midiplay/midiplay.1
index 9ca15d0e986..0ebc5c3e3bc 100644
--- a/usr.bin/midiplay/midiplay.1
+++ b/usr.bin/midiplay/midiplay.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: midiplay.1,v 1.1 1999/01/01 23:58:22 niklas Exp $
+.\" $OpenBSD: midiplay.1,v 1.2 1999/04/02 15:12:18 aaron Exp $
 .\" $NetBSD: midiplay.1,v 1.3 1998/08/13 18:26:36 augustss Exp $
 .\" Copyright (c) 1998 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -40,7 +40,7 @@
 .Nm midiplay
 .Nd play MIDI files
 .Sh SYNOPSIS
-.Nm
+.Nm midiplay
 .Op Fl d Ar devno
 .Op Fl f Ar file
 .Op Fl l
@@ -59,24 +59,24 @@ it will play the named files.
 The program accepts the following options:
 .Bl -tag -width Fl
 .It Fl d Ar devno
-specifies the number of the MIDI device used for output (as listed
+Specifies the number of the MIDI device used for output (as listed
 by the
 .Fl l
 flag).  The default is device 0.
 .It Fl f Ar file
-specifies the name of the sequencer device.
+Specifies the name of the sequencer device.
 .It Fl l
-list the possible devices without playing anything.
+List the possible devices without playing anything.
 .It Fl m
-show MIDI file meta events (copyright, lyrics, etc).
+Show MIDI file meta events (copyright, lyrics, etc).
 .It Fl q
-specifies that the MIDI file should not be played, justed parsed.
+Do not play the MIDI file, just parse it.
 .It Fl t Ar tempo
-specifies the tempo.  The default tempo is 100.
+Specifies the tempo.  Default is 100.
 .It Fl v
-be verbose.  If the flag is repeated the verbosity increases.
+Be verbose.  If the flag is repeated the verbosity increases.
 .It Fl x
-play a small sample sound.
+Play a small sample sound.
 .Sh FILES
 .Bl -tag -width /dev/music
 .It Pa /dev/music
diff --git a/usr.sbin/ctm/ctm/ctm.1 b/usr.sbin/ctm/ctm/ctm.1
index ab17cd4cc2a..5350db07dd8 100644
--- a/usr.sbin/ctm/ctm/ctm.1
+++ b/usr.sbin/ctm/ctm/ctm.1
@@ -10,7 +10,7 @@
 .\"
 .\" CTM and ctm(1) by <phk@login.dknet.dk>
 .\"
-.\" $Id: ctm.1,v 1.4 1999/03/01 05:53:58 aaron Exp $
+.\" $Id: ctm.1,v 1.5 1999/04/02 15:12:18 aaron Exp $
 .\"
 .Dd Mar 25, 1995
 .Os
@@ -19,7 +19,7 @@
 .Nm ctm
 .Nd source code mirror program
 .Sh SYNOPSIS
-.Nm
+.Nm ctm
 .Op Fl cFpPquv
 .Op Fl b Ar basedir
 .Op Fl T Ar tmpdir
diff --git a/usr.sbin/ppp/ppp/ppp.8 b/usr.sbin/ppp/ppp/ppp.8
index 955ad061d08..962e789ec08 100644
--- a/usr.sbin/ppp/ppp/ppp.8
+++ b/usr.sbin/ppp/ppp/ppp.8
@@ -1,4 +1,4 @@
-.\" $Id: ppp.8,v 1.34 1999/03/25 23:36:52 brian Exp $
+.\" $Id: ppp.8,v 1.35 1999/04/02 15:12:19 aaron Exp $
 .Dd 20 September 1995
 .nr XX \w'\fC00'
 .Os FreeBSD
@@ -7,7 +7,7 @@
 .Nm ppp
 .Nd Point to Point Protocol (a.k.a. user-ppp) 
 .Sh SYNOPSIS
-.Nm
+.Nm ppp
 .Oo
 .Fl auto |
 .Fl background |
diff --git a/usr.sbin/pstat/pstat.8 b/usr.sbin/pstat/pstat.8
index 20d8411487d..eb8c6a3de4d 100644
--- a/usr.sbin/pstat/pstat.8
+++ b/usr.sbin/pstat/pstat.8
@@ -40,7 +40,7 @@
 .Nm pstat
 .Nd display system data structures
 .Sh SYNOPSIS
-.Nm
+.Nm pstat
 .Op Fl Tfknstv
 .Op Fl M Ar core
 .Op Fl N Ar system
diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.8 b/usr.sbin/pwd_mkdb/pwd_mkdb.8
index d4570a40f5c..59159756524 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.5 1999/03/11 19:39:40 aaron Exp $
+.\"	$OpenBSD: pwd_mkdb.8,v 1.6 1999/04/02 15:12:19 aaron Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -40,7 +40,7 @@
 .Nm pwd_mkdb
 .Nd "generate the password databases"
 .Sh SYNOPSIS
-.Nm
+.Nm pwd_mkdb
 .Op Fl c
 .Op Fl p
 .Op Fl d Ar directory
diff --git a/usr.sbin/quot/quot.8 b/usr.sbin/quot/quot.8
index b6ac2d306ec..0150cfa5f90 100644
--- a/usr.sbin/quot/quot.8
+++ b/usr.sbin/quot/quot.8
@@ -27,7 +27,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: quot.8,v 1.5 1999/03/11 19:39:42 aaron Exp $
+.\"	$Id: quot.8,v 1.6 1999/04/02 15:12:20 aaron Exp $
 .\"
 .Dd February 8, 1994
 .Dt QUOT 8
@@ -36,7 +36,7 @@
 .Nm quot
 .Nd display disk space occupied by each user
 .Sh SYNOPSIS
-.Nm
+.Nm quot
 .Op Fl acfhknv
 .Op Ar filesystem ...
 .Sh DESCRIPTION
diff --git a/usr.sbin/rarpd/rarpd.8 b/usr.sbin/rarpd/rarpd.8
index 8ff4268fc81..a481029959f 100644
--- a/usr.sbin/rarpd/rarpd.8
+++ b/usr.sbin/rarpd/rarpd.8
@@ -17,7 +17,7 @@
 .\" 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.4 1999/03/11 19:39:43 aaron Exp $
+.\" @(#) $Id: rarpd.8,v 1.5 1999/04/02 15:12:20 aaron Exp $
 .\"
 .Dd October 26, 1990
 .Dt RARPD 8
@@ -25,7 +25,7 @@
 .Nm rarpd 
 .Nd reverse ARP daemon
 .Sh SYNOPSIS
-.Nm
+.Nm rarpd
 .Op Fl adfl
 .Op Ar interface
 .Sh DESCRIPTION
diff --git a/usr.sbin/rbootd/rbootd.8 b/usr.sbin/rbootd/rbootd.8
index db1aad45a17..84899a2226e 100644
--- a/usr.sbin/rbootd/rbootd.8
+++ b/usr.sbin/rbootd/rbootd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rbootd.8,v 1.3 1999/03/11 19:39:43 aaron Exp $
+.\"	$OpenBSD: rbootd.8,v 1.4 1999/04/02 15:12:20 aaron Exp $
 .\"	$NetBSD: rbootd.8,v 1.3 1995/08/21 17:05:16 thorpej Exp $
 .\"
 .\" Copyright (c) 1988, 1992 The University of Utah and the Center
@@ -52,7 +52,7 @@
 .Nm rbootd
 .Nd HP remote boot server
 .Sh SYNOPSIS
-.Nm
+.Nm rbootd
 .Op Fl ad
 .Op Fl i Ar interface
 .Op Ar config_file
diff --git a/usr.sbin/rdate/rdate.8 b/usr.sbin/rdate/rdate.8
index 241905af205..bbbe54c24cb 100644
--- a/usr.sbin/rdate/rdate.8
+++ b/usr.sbin/rdate/rdate.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rdate.8,v 1.7 1999/03/11 19:39:44 aaron Exp $
+.\"	$OpenBSD: rdate.8,v 1.8 1999/04/02 15:12:20 aaron Exp $
 .\"	$NetBSD: rdate.8,v 1.4 1996/04/08 20:55:17 jtc Exp $
 .\"
 .\" Copyright (c) 1994 Christos Zoulas
@@ -36,7 +36,7 @@
 .Nm rdate
 .Nd set the system's date from a remote host
 .Sh SYNOPSIS
-.Nm
+.Nm rdate
 .Op Fl psa
 .Ar host 
 .Sh DESCRIPTION
diff --git a/usr.sbin/rmt/rmt.8 b/usr.sbin/rmt/rmt.8
index 79c989d87f3..901989b9f44 100644
--- a/usr.sbin/rmt/rmt.8
+++ b/usr.sbin/rmt/rmt.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rmt.8,v 1.3 1999/03/11 19:39:45 aaron Exp $
+.\"	$OpenBSD: rmt.8,v 1.4 1999/04/02 15:12:20 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.3 1999/03/11 19:39:45 aaron Exp $
+.\"	$Id: rmt.8,v 1.4 1999/04/02 15:12:20 aaron Exp $
 .\"
 .Dd March 16, 1991
 .Dt RMT 8
@@ -40,7 +40,7 @@
 .Nm rmt
 .Nd remote magtape protocol module
 .Sh SYNOPSIS
-.Nm
+.Nm rmt
 .Sh DESCRIPTION
 .Nm
 is a program used by the remote dump and restore programs
diff --git a/usr.sbin/rwhod/rwhod.8 b/usr.sbin/rwhod/rwhod.8
index 243269067fd..df64af3e6f6 100644
--- a/usr.sbin/rwhod/rwhod.8
+++ b/usr.sbin/rwhod/rwhod.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rwhod.8,v 1.7 1999/03/11 21:07:58 aaron Exp $
+.\"	$OpenBSD: rwhod.8,v 1.8 1999/04/02 15:12:20 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.7 1999/03/11 21:07:58 aaron Exp $
+.\"     $OpenBSD: rwhod.8,v 1.8 1999/04/02 15:12:20 aaron Exp $
 .\"
 .Dd December 11, 1993
 .Dt RWHOD 8
@@ -40,7 +40,7 @@
 .Nm rwhod
 .Nd system status server
 .Sh SYNOPSIS
-.Nm
+.Nm rwhod
 .Sh DESCRIPTION
 .Nm
 is the server which maintains the database used by the
diff --git a/usr.sbin/sa/sa.8 b/usr.sbin/sa/sa.8
index af06bc313c0..421e420873a 100644
--- a/usr.sbin/sa/sa.8
+++ b/usr.sbin/sa/sa.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sa.8,v 1.4 1999/03/11 21:07:59 aaron Exp $
+.\"	$OpenBSD: sa.8,v 1.5 1999/04/02 15:12:20 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.4 1999/03/11 21:07:59 aaron Exp $
+.\"	$Id: sa.8,v 1.5 1999/04/02 15:12:20 aaron Exp $
 .\"
 .Dd February 25, 1994
 .Dt SA 8
@@ -37,7 +37,7 @@
 .Nm sa
 .Nd print system accounting statistics
 .Sh SYNOPSIS
-.Nm
+.Nm sa
 .Op Fl abcdDfijkKlmnqrstu
 .Op Fl v Ar cutoff
 .Op Ar
diff --git a/usr.sbin/screenblank/screenblank.1 b/usr.sbin/screenblank/screenblank.1
index 341eabc037d..e23a67b26f2 100644
--- a/usr.sbin/screenblank/screenblank.1
+++ b/usr.sbin/screenblank/screenblank.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: screenblank.1,v 1.3 1999/03/11 21:07:59 aaron Exp $
+.\"	$OpenBSD: screenblank.1,v 1.4 1999/04/02 15:12:21 aaron Exp $
 .\"	$NetBSD: screenblank.1,v 1.2 1996/02/28 01:18:32 thorpej Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
 .Nm screenblank
 .Nd screen saver daemon for the Sun 3 and SPARC
 .Sh SYNOPSIS
-.Nm
+.Nm screenblank
 .Op Fl k | Fl m
 .Op Fl d Ar timeout
 .Op Fl e Ar timeout
diff --git a/usr.sbin/sliplogin/sliplogin.8 b/usr.sbin/sliplogin/sliplogin.8
index 009c65de9f5..bbffb885c12 100644
--- a/usr.sbin/sliplogin/sliplogin.8
+++ b/usr.sbin/sliplogin/sliplogin.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sliplogin.8,v 1.2 1999/03/11 21:08:02 aaron Exp $
+.\"	$OpenBSD: sliplogin.8,v 1.3 1999/04/02 15:12:21 aaron Exp $
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)sliplogin.8	5.4 (Berkeley) 8/5/91
-.\"	$Id: sliplogin.8,v 1.2 1999/03/11 21:08:02 aaron Exp $
+.\"	$Id: sliplogin.8,v 1.3 1999/04/02 15:12:21 aaron Exp $
 .\"
 .Dd August 5, 1991
 .Dt SLIPLOGIN 8
@@ -40,7 +40,7 @@
 .Nm sliplogin
 .Nd attach a serial line network interface
 .Sh SYNOPSIS
-.Nm
+.Nm sliplogin
 .Op Ar loginname
 .Sh DESCRIPTION
 .Nm
diff --git a/usr.sbin/spray/spray.8 b/usr.sbin/spray/spray.8
index 15b61b93892..56a94dae8b1 100644
--- a/usr.sbin/spray/spray.8
+++ b/usr.sbin/spray/spray.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: spray.8,v 1.3 1999/03/11 21:08:03 aaron Exp $
+.\"	$OpenBSD: spray.8,v 1.4 1999/04/02 15:12:21 aaron Exp $
 .\"
 .\" Copyright (c) 1994 James A. Jegers
 .\" All rights reserved.
@@ -29,7 +29,7 @@
 .Nm spray
 .Nd send many packets to host 
 .Sh SYNOPSIS
-.Nm
+.Nm spray
 .Op Fl c Ar count 
 .Op Fl d Ar delay 
 .Op Fl l Ar length
diff --git a/usr.sbin/syslogd/syslogd.8 b/usr.sbin/syslogd/syslogd.8
index 23518ce9388..fe244ade808 100644
--- a/usr.sbin/syslogd/syslogd.8
+++ b/usr.sbin/syslogd/syslogd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: syslogd.8,v 1.8 1999/03/11 21:08:03 aaron Exp $
+.\"	$OpenBSD: syslogd.8,v 1.9 1999/04/02 15:12:21 aaron Exp $
 .\" Copyright (c) 1983, 1986, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -40,7 +40,7 @@
 .Nm syslogd
 .Nd log systems messages
 .Sh SYNOPSIS
-.Nm
+.Nm syslogd
 .Op Fl du
 .Op Fl f Ar config_file
 .Op Fl m Ar mark_interval
diff --git a/usr.sbin/timed/timed/timed.8 b/usr.sbin/timed/timed/timed.8
index a73e4f9d87d..809f9f6749a 100644
--- a/usr.sbin/timed/timed/timed.8
+++ b/usr.sbin/timed/timed/timed.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: timed.8,v 1.2 1999/03/11 21:08:04 aaron Exp $
+.\"	$OpenBSD: timed.8,v 1.3 1999/04/02 15:12:21 aaron Exp $
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -39,7 +39,7 @@
 .Nm timed
 .Nd time server daemon
 .Sh SYNOPSIS
-.Nm
+.Nm timed
 .Op Fl M
 .Op Fl t
 .Op Fl d
diff --git a/usr.sbin/timed/timedc/timedc.8 b/usr.sbin/timed/timedc/timedc.8
index 7076bfcc98b..b83297bf7b7 100644
--- a/usr.sbin/timed/timedc/timedc.8
+++ b/usr.sbin/timed/timedc/timedc.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: timedc.8,v 1.2 1999/03/11 21:08:04 aaron Exp $
+.\"	$OpenBSD: timedc.8,v 1.3 1999/04/02 15:12:21 aaron Exp $
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -40,7 +40,7 @@
 .Nm timedc
 .Nd timed control program
 .Sh SYNOPSIS
-.Nm
+.Nm timedc
 .Oo Ar command\ \&
 .Op Ar argument ...
 .Oc
diff --git a/usr.sbin/traceroute/traceroute.8 b/usr.sbin/traceroute/traceroute.8
index 2e4696e3e15..69a8be0142e 100644
--- a/usr.sbin/traceroute/traceroute.8
+++ b/usr.sbin/traceroute/traceroute.8
@@ -43,7 +43,7 @@
 .Nm traceroute
 .Nd print the route packets take to network host
 .Sh SYNOPSIS
-.Nm
+.Nm traceroute
 .Op Fl d
 .Op Fl D
 .Op Fl g Ar gateway_addr
diff --git a/usr.sbin/trpt/trpt.8 b/usr.sbin/trpt/trpt.8
index 2353c46e673..75a5d948237 100644
--- a/usr.sbin/trpt/trpt.8
+++ b/usr.sbin/trpt/trpt.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: trpt.8,v 1.6 1999/03/12 15:33:58 aaron Exp $
+.\"	$OpenBSD: trpt.8,v 1.7 1999/04/02 15:12:22 aaron Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -40,7 +40,7 @@
 .Nm trpt
 .Nd transliterate protocol trace
 .Sh SYNOPSIS
-.Nm
+.Nm trpt
 .Op Fl a
 .Op Fl f
 .Op Fl j
diff --git a/usr.sbin/trsp/trsp.8 b/usr.sbin/trsp/trsp.8
index aefb5ccd5e6..fdeb590b4df 100644
--- a/usr.sbin/trsp/trsp.8
+++ b/usr.sbin/trsp/trsp.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: trsp.8,v 1.5 1999/03/12 15:33:58 aaron Exp $
+.\"	$OpenBSD: trsp.8,v 1.6 1999/04/02 15:12:22 aaron Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -40,7 +40,7 @@
 .Nm trsp
 .Nd transliterate sequenced packet protocol trace
 .Sh SYNOPSIS
-.Nm
+.Nm trsp
 .Op Fl a
 .Op Fl j
 .Op Fl p Ar hex-address
diff --git a/usr.sbin/vipw/vipw.8 b/usr.sbin/vipw/vipw.8
index 9df7ef250f8..44fec390f9d 100644
--- a/usr.sbin/vipw/vipw.8
+++ b/usr.sbin/vipw/vipw.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vipw.8,v 1.3 1999/03/12 15:33:58 aaron Exp $
+.\"	$OpenBSD: vipw.8,v 1.4 1999/04/02 15:12:22 aaron Exp $
 .\"	$NetBSD: vipw.8,v 1.4 1995/01/20 19:19:56 mycroft Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -41,7 +41,7 @@
 .Nm vipw
 .Nd edit the password file
 .Sh SYNOPSIS
-.Nm
+.Nm vipw
 .Sh DESCRIPTION
 .Nm
 edits the password file after setting the appropriate locks,
diff --git a/usr.sbin/yppoll/yppoll.8 b/usr.sbin/yppoll/yppoll.8
index 716bd616f72..27b5a26b228 100644
--- a/usr.sbin/yppoll/yppoll.8
+++ b/usr.sbin/yppoll/yppoll.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: yppoll.8,v 1.3 1999/03/12 15:33:58 aaron Exp $
+.\"	$OpenBSD: yppoll.8,v 1.4 1999/04/02 15:12:22 aaron Exp $
 .\"	$NetBSD: yppoll.8,v 1.3 1996/02/28 01:23:12 thorpej Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
 .Nm yppoll
 .Nd ask version of YP map from YP server
 .Sh SYNOPSIS
-.Nm
+.Nm yppoll
 .Op Fl h Ar host
 .Op Fl d Ar domain
 .Ar mapname
diff --git a/usr.sbin/ypserv/ypserv/ypserv.8 b/usr.sbin/ypserv/ypserv/ypserv.8
index cb826bfadb6..9b9c6be231a 100644
--- a/usr.sbin/ypserv/ypserv/ypserv.8
+++ b/usr.sbin/ypserv/ypserv/ypserv.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ypserv.8,v 1.11 1999/03/01 06:02:50 aaron Exp $
+.\"	$OpenBSD: ypserv.8,v 1.12 1999/04/02 15:12:22 aaron Exp $
 .\" Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
 .\" All rights reserved.
 .\"
@@ -35,7 +35,7 @@
 .Nm ypserv
 .Nd YP server daemon
 .Sh SYNOPSIS
-.Nm
+.Nm ypserv
 .Op Fl 1
 .Op Fl a Ar aclfile
 .Op Fl d