summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sbin/adjkerntz/adjkerntz.84
-rw-r--r--sbin/badsect/badsect.84
-rw-r--r--sbin/bsdlabel/bsdlabel.844
-rw-r--r--sbin/camcontrol/camcontrol.888
-rw-r--r--sbin/ccdconfig/ccdconfig.812
-rw-r--r--sbin/clri/clri.82
-rw-r--r--sbin/comcontrol/comcontrol.82
-rw-r--r--sbin/cxconfig/cxconfig.82
-rw-r--r--sbin/disklabel/disklabel.844
-rw-r--r--sbin/dmesg/dmesg.82
-rw-r--r--sbin/dump/dump.88
-rw-r--r--sbin/dumpfs/dumpfs.82
-rw-r--r--sbin/dumpon/dumpon.84
-rw-r--r--sbin/fdisk/fdisk.84
-rw-r--r--sbin/fdisk_pc98/fdisk.84
-rw-r--r--sbin/fsck/fsck.82
-rw-r--r--sbin/fsck_ffs/fsck_ffs.810
-rw-r--r--sbin/fsck_ifs/fsck_ifs.810
-rw-r--r--sbin/fsdb/fsdb.82
-rw-r--r--sbin/fsirand/fsirand.82
-rw-r--r--sbin/i386/cxconfig/cxconfig.82
-rw-r--r--sbin/i386/fdisk/fdisk.84
-rw-r--r--sbin/i386/nextboot/nextboot.84
-rw-r--r--sbin/ifconfig/ifconfig.812
-rw-r--r--sbin/init/init.84
-rw-r--r--sbin/ip6fw/ip6fw.812
-rw-r--r--sbin/ipfw/ipfw.822
-rw-r--r--sbin/kget/kget.82
-rw-r--r--sbin/kldload/kldload.82
-rw-r--r--sbin/kldstat/kldstat.82
-rw-r--r--sbin/kldunload/kldunload.84
-rw-r--r--sbin/ldconfig/ldconfig.84
-rw-r--r--sbin/md5/md5.12
-rw-r--r--sbin/mknod/mknod.84
-rw-r--r--sbin/mount/getmntopts.38
-rw-r--r--sbin/mount/mount.88
-rw-r--r--sbin/mount_cd9660/mount_cd9660.82
-rw-r--r--sbin/mount_ext2fs/mount_ext2fs.82
-rw-r--r--sbin/mount_hpfs/mount_hpfs.82
-rw-r--r--sbin/mount_ifs/getmntopts.38
-rw-r--r--sbin/mount_ifs/mount.88
-rw-r--r--sbin/mount_msdos/mount_msdos.84
-rw-r--r--sbin/mount_msdosfs/mount_msdosfs.84
-rw-r--r--sbin/mount_nfs/mount_nfs.84
-rw-r--r--sbin/mount_ntfs/mount_ntfs.82
-rw-r--r--sbin/mount_null/mount_null.82
-rw-r--r--sbin/mount_nullfs/mount_nullfs.82
-rw-r--r--sbin/mount_nwfs/mount_nwfs.84
-rw-r--r--sbin/mount_portal/mount_portal.82
-rw-r--r--sbin/mount_portalfs/mount_portalfs.82
-rw-r--r--sbin/mount_std/mount_std.84
-rw-r--r--sbin/mount_umap/mount_umap.82
-rw-r--r--sbin/mount_umapfs/mount_umapfs.82
-rw-r--r--sbin/mount_union/mount_union.82
-rw-r--r--sbin/mount_unionfs/mount_unionfs.82
-rw-r--r--sbin/mountd/exports.54
-rw-r--r--sbin/mountd/mountd.82
-rw-r--r--sbin/mountd/netgroup.52
-rw-r--r--sbin/natd/natd.810
-rw-r--r--sbin/newfs/newfs.86
-rw-r--r--sbin/newfs_msdos/newfs_msdos.82
-rw-r--r--sbin/nextboot/nextboot.84
-rw-r--r--sbin/nfsd/nfsd.814
-rw-r--r--sbin/nfsiod/nfsiod.82
-rw-r--r--sbin/nologin/nologin.82
-rw-r--r--sbin/nos-tun/nos-tun.82
-rw-r--r--sbin/pc98/fdisk/fdisk.84
-rw-r--r--sbin/ping/ping.84
-rw-r--r--sbin/ping6/ping6.84
-rw-r--r--sbin/quotacheck/quotacheck.84
-rw-r--r--sbin/reboot/reboot.82
-rw-r--r--sbin/restore/restore.842
-rw-r--r--sbin/route/route.811
-rw-r--r--sbin/routed/routed.88
-rw-r--r--sbin/routed/rtquery/rtquery.84
-rw-r--r--sbin/savecore/savecore.84
-rw-r--r--sbin/shutdown/shutdown.82
-rw-r--r--sbin/slattach/slattach.88
-rw-r--r--sbin/spppcontrol/spppcontrol.82
-rw-r--r--sbin/startslip/startslip.16
-rw-r--r--sbin/swapon/swapon.84
-rw-r--r--sbin/sysctl/sysctl.86
-rw-r--r--sbin/tunefs/tunefs.82
-rw-r--r--sbin/umount/umount.84
-rw-r--r--sbin/vinum/vinum.835
-rw-r--r--share/examples/mdoc/example.12
-rw-r--r--share/examples/mdoc/example.42
-rw-r--r--usr.sbin/mount_nwfs/mount_nwfs.84
-rw-r--r--usr.sbin/mount_portalfs/mount_portalfs.82
-rw-r--r--usr.sbin/mountd/exports.54
-rw-r--r--usr.sbin/mountd/mountd.82
-rw-r--r--usr.sbin/mountd/netgroup.52
-rw-r--r--usr.sbin/nfsd/nfsd.814
-rw-r--r--usr.sbin/nologin/nologin.82
94 files changed, 328 insertions, 320 deletions
diff --git a/sbin/adjkerntz/adjkerntz.8 b/sbin/adjkerntz/adjkerntz.8
index 15a99e2..512b4cc 100644
--- a/sbin/adjkerntz/adjkerntz.8
+++ b/sbin/adjkerntz/adjkerntz.8
@@ -31,9 +31,9 @@
.Nm adjkerntz
.Nd "adjust local time CMOS clock to reflect time zone changes and keep current timezone offset for the kernel"
.Sh SYNOPSIS
-.Nm adjkerntz
+.Nm
.Fl i
-.Nm adjkerntz
+.Nm
.Fl a Op Fl s
.Sh DESCRIPTION
.Nm Adjkerntz
diff --git a/sbin/badsect/badsect.8 b/sbin/badsect/badsect.8
index a67767b..a1e4924 100644
--- a/sbin/badsect/badsect.8
+++ b/sbin/badsect/badsect.8
@@ -39,7 +39,7 @@
.Nm badsect
.Nd create files to contain bad sectors
.Sh SYNOPSIS
-.Nm badsect
+.Nm
.Ar bbdir sector ...
.Sh DESCRIPTION
.Nm Badsect
@@ -120,7 +120,7 @@ A warning is issued if the block is already in use.
.Sh BUGS
If more than one sector which comprise a file system fragment are bad,
you should specify only one of them to
-.Nm Ns ,
+.Nm ,
as the blocks in the bad sector files actually cover all the sectors in a
file system fragment.
.Sh HISTORY
diff --git a/sbin/bsdlabel/bsdlabel.8 b/sbin/bsdlabel/bsdlabel.8
index 13aa183..109bc08 100644
--- a/sbin/bsdlabel/bsdlabel.8
+++ b/sbin/bsdlabel/bsdlabel.8
@@ -42,27 +42,27 @@
.Nm disklabel
.Nd read and write disk pack label
.Sh SYNOPSIS
-.Nm disklabel
+.Nm
.Op Fl r
.Ar disk
-.Nm disklabel
+.Nm
.Fl w
.Op Fl r
.Ar disk Ar disktype/auto
.Oo Ar packid Oc
-.Nm disklabel
+.Nm
.Fl e
.Op Fl r
.Ar disk
-.Nm disklabel
+.Nm
.Fl R
.Op Fl r
.Ar disk Ar protofile
-.Nm disklabel
+.Nm
.Op Fl NW
.Ar disk
.Pp
-.Nm disklabel
+.Nm
.Fl B
.Oo
.Fl b Ar boot1
@@ -70,7 +70,7 @@
.Oc
.Ar disk
.Oo Ar disktype/auto Oc
-.Nm disklabel
+.Nm
.Fl w
.Fl B
.Oo
@@ -79,7 +79,7 @@
.Oc
.Ar disk Ar disktype/auto
.Oo Ar packid Oc
-.Nm disklabel
+.Nm
.Fl R
.Fl B
.Oo
@@ -114,7 +114,7 @@ is described under each command.
.Ss Disk device name
.Pp
All
-.Nm disklabel
+.Nm
forms require a disk device name, which should always be the raw
device name representing the disk or slice. For example
.Pa da0
@@ -140,7 +140,7 @@ To examine or save the label on a disk drive, use
.Nm
without options:
.Pp
-.Nm disklabel
+.Nm
.Op Fl r
.Ar disk
.Pp
@@ -167,13 +167,13 @@ is corrupt.
.Pp
To write a standard label, use the form
.Pp
-.Nm disklabel
+.Nm
.Fl w
.Op Fl r
.Ar disk Ar disktype/auto
.Oo Ar packid Oc
.Pp
-.Nm disklabel
+.Nm
.Fl w
.Op Fl r
.Ar disk
@@ -241,7 +241,7 @@ described later on in this manual page.
.Pp
To edit an existing disk label, use the form
.Pp
-.Nm disklabel
+.Nm
.Fl e
.Op Fl r
.Ar disk
@@ -262,7 +262,7 @@ was specified.
.Pp
To restore a disk label from a file, use the form
.Pp
-.Nm disklabel
+.Nm
.Fl R
.Op Fl r
.Ar disk Ar protofile
@@ -283,14 +283,14 @@ By default, it is not possible to write to the disk label area at the beginning
of a disk. The disk driver silently ignores any attempt to do so. If you need
to write to this area (for example, to obliterate the label), use the form
.Pp
-.Nm disklabel
+.Nm
.Op Fl W
.Ar disk
.Pp
To disallow writing to the label area after previously allowing it, use the
command
.Pp
-.Nm disklabel
+.Nm
.Op Fl N
.Ar disk
.Ss Installing bootstraps
@@ -311,7 +311,7 @@ then install the
.Fx
bootblocks in the slice.
.Pp
-.Nm disklabel
+.Nm
.Fl B
.Oo
.Fl b Ar boot1
@@ -328,7 +328,7 @@ disk, such as
This command is typically run on a slice such as
.Ar da0s1 .
.Pp
-.Nm disklabel
+.Nm
.Fl w
.Fl B
.Oo
@@ -346,7 +346,7 @@ If run on a base disk this command will create a
.Dq dangerously-dedicated
label. This command is normally run on a slice rather then a base disk.
.Pp
-.Nm disklabel
+.Nm
.Fl R
.Fl B
.Oo
@@ -454,9 +454,9 @@ partition for /home (usally all remaining space).
Your mileage may vary.
.El
.Pp
-.Nm fdisk -BI da0
+.Nm fdisk Fl BI Ar da0
.Pp
-.Nm disklabel
+.Nm
.Fl w
.Fl r
.Fl B
@@ -464,7 +464,7 @@ Your mileage may vary.
auto
.Pp
.Pp
-.Nm disklabel
+.Nm
.Fl e
.Ar da0s1
.Pp
diff --git a/sbin/camcontrol/camcontrol.8 b/sbin/camcontrol/camcontrol.8
index cdd26ee..3c89925 100644
--- a/sbin/camcontrol/camcontrol.8
+++ b/sbin/camcontrol/camcontrol.8
@@ -34,56 +34,56 @@
.Nm camcontrol
.Nd CAM control program
.Sh SYNOPSIS
-.Nm camcontrol
+.Nm
.Aq Ar command
.Op device id
.Op generic args
.Op command args
-.Nm camcontrol
+.Nm
.Ic devlist
.Op Fl v
-.Nm camcontrol
+.Nm
.Ic periphlist
.Op device id
.Op Fl n Ar dev_name
.Op Fl u Ar unit_number
-.Nm camcontrol
+.Nm
.Ic tur
.Op device id
.Op generic args
-.Nm camcontrol
+.Nm
.Ic inquiry
.Op device id
.Op generic args
.Op Fl D
.Op Fl S
.Op Fl R
-.Nm camcontrol
+.Nm
.Ic start
.Op device id
.Op generic args
-.Nm camcontrol
+.Nm
.Ic stop
.Op device id
.Op generic args
-.Nm camcontrol
+.Nm
.Ic eject
.Op device id
.Op generic args
-.Nm camcontrol
+.Nm
.Ic rescan
.Aq bus Ns Op :target:lun
-.Nm camcontrol
+.Nm
.Ic reset
.Aq bus Ns Op :target:lun
-.Nm camcontrol
+.Nm
.Ic defects
.Op device id
.Op generic args
.Aq Fl f Ar format
.Op Fl P
.Op Fl G
-.Nm camcontrol
+.Nm
.Ic modepage
.Op device id
.Op generic args
@@ -91,7 +91,7 @@
.Op Fl P Ar pgctl
.Op Fl b | Fl e
.Op Fl d
-.Nm camcontrol
+.Nm
.Ic cmd
.Op device id
.Op generic args
@@ -100,21 +100,21 @@
.Bk -words
.Op Fl o Ar len Ar fmt Op args
.Ek
-.Nm camcontrol
+.Nm
.Ic debug
.Op Fl I
.Op Fl T
.Op Fl S
.Op Fl c
.Aq all|off|bus Ns Op :target Ns Op :lun
-.Nm camcontrol
+.Nm
.Ic tags
.Op device id
.Op generic args
.Op Fl N Ar tags
.Op Fl q
.Op Fl v
-.Nm camcontrol
+.Nm
.Ic negotiate
.Op device id
.Op generic args
@@ -127,27 +127,27 @@
.Op Fl U
.Op Fl W Ar bus_width
.Op Fl v
-.Nm camcontrol
+.Nm
.Ic format
.Op device id
.Op generic args
.Op Fl q
.Op Fl w
.Op Fl y
-.Nm camcontrol
+.Nm
.Ic help
.Sh DESCRIPTION
-.Nm camcontrol
+.Nm
is a utility designed to provide a way for users to access and control the
.Fx
CAM subsystem.
.Pp
-.Nm camcontrol
+.Nm
can cause a loss of data and/or system crashes if used improperly. Even
expert users are encouraged to exercise caution when using this command.
Novice users should stay away from this utility.
.Pp
-.Nm camcontrol
+.Nm
has a number of primary functions, many of which support an optional
device identifier. A device identifier can take one of three forms:
.Bl -tag -width 01234567890123
@@ -182,7 +182,7 @@ arguments will
override a specified bus:target or bus:target:lun, however.
.Pp
Most of the
-.Nm camcontrol
+.Nm
primary functions support these generic arguments:
.Bl -tag -width 01234567890123
.It Fl C Ar count
@@ -226,11 +226,11 @@ List all peripheral drivers attached to a given physical device (logical
unit).
.It Ic tur
Send the SCSI test unit ready (0x00) command to the given device.
-.Nm camcontrol
+.Nm
will report whether the device is ready or not.
.It Ic inquiry
Send a SCSI inquiry command (0x12) to a device. By default,
-.Nm camcontrol
+.Nm
will print out the standard inquiry data, device serial number, and
transfer rate information. The user can specify that only certain types of
inquiry data be printed:
@@ -239,7 +239,7 @@ inquiry data be printed:
Get the standard inquiry data.
.It Fl S
Print out the serial number. If this flag is the only one specified,
-.Nm camcontrol
+.Nm
will not print out "Serial Number" before the value returned by the drive.
This is to aid in script writing.
.It Fl R
@@ -283,11 +283,11 @@ required. Most drives support the physical sector format. Some drives
support the logical block format. Many drives, if they don't support the
requested format, return the data in an alternate format, along with sense
information indicating that the requested data format isn't supported.
-.Nm camcontrol
+.Nm
attempts to detect this, and print out whatever format the drive returns.
If the drive uses a non-standard sense code to report that it doesn't
support the requested format,
-.Nm camcontrol
+.Nm
will probably see the error as a failure to complete the request.
.It Fl G
Print out the grown defect list. This is a list of bad blocks that have
@@ -301,7 +301,7 @@ If neither
nor
.Fl G
is specified,
-.Nm camcontrol
+.Nm
will print out the number of defects given in the READ DEFECT DATA header
returned from the drive.
.It Ic modepage
@@ -325,9 +325,9 @@ either edit mode page values with the text editor pointed to by his
.Ev EDITOR
environment variable, or supply mode page values via standard input, using
the same format that
-.Nm camcontrol
+.Nm
uses to display mode page values. The editor will be invoked if
-.Nm camcontrol
+.Nm
detects that standard input is terminal.
.It Fl l
Lists all available mode pages.
@@ -428,7 +428,7 @@ determined by using the
switch. The meaning of the
.Fl v
switch for this
-.Nm camcontrol
+.Nm
subcommand is described below.
.It Fl q
Be quiet, and don't report the number of tags. This is generally used when
@@ -437,7 +437,7 @@ setting the number of tags.
The verbose flag has special functionality for the
.Em tags
argument. It causes
-.Nm camcontrol
+.Nm
to print out the tagged queueing related fields of the XPT_GDEV_TYPE CCB:
.Bl -tag -width 0123456789012
.It dev_openings
@@ -480,7 +480,7 @@ Show or negotiate various communication parameters. Some controllers may
not support setting or changing some of these values. For instance, the
Adaptec 174x controllers do not support changing a device's sync rate or
offset.
-.Nm camcontrol
+.Nm
will not attempt to set the parameter if the controller indicates that it
does not support setting the parameter. To find out what the controller
supports, use the
@@ -522,7 +522,7 @@ current negotiation settings.
The verbose switch has special meaning for the
.Ic negotiate
subcommand. It causes
-.Nm camcontrol
+.Nm
to print out the contents of a Path Inquiry (XPT_PATH_INQ) CCB sent to the
controller driver.
.It Fl W Ar bus_width
@@ -578,24 +578,24 @@ the questions, however. To disable questions, use the
argument, below.
.It Fl w
Issue a non-immediate format command. By default,
-.Nm camcontrol
+.Nm
issues the FORMAT UNIT command with the immediate bit set. This tells the
device to immediately return the format command, before the format has
actually completed. Then,
-.Nm camcontrol
+.Nm
gathers
.Tn SCSI
sense information from the device every second to determine how far along
in the format process it is. If the
.Fl w
argument is specified,
-.Nm camcontrol
+.Nm
will issue a non-immediate format command, and will be unable to print any
information to let the user know what percentage of the disk has been
formatted.
.It Fl y
Don't ask any questions. By default,
-.Nm camcontrol
+.Nm
will ask the user if he/she really wants to format the disk in question,
and also if the default format command timeout is acceptable. The user
will not be asked about the timeout if a timeout is specified on the
@@ -612,7 +612,7 @@ variable allows the user to specify an alternate mode page format file.
The
.Ev EDITOR
variable determines which text editor
-.Nm camcontrol
+.Nm
starts when editing mode pages.
.Sh FILES
.Bl -tag -width /usr/share/misc/scsi_modes -compact
@@ -632,7 +632,7 @@ fails.
.Dl camcontrol tur da0
.Pp
Send the SCSI test unit ready command to da0.
-.Nm camcontrol
+.Nm
will report whether the disk is ready, but will not display sense
information if the command fails since the
.Fl v
@@ -648,7 +648,7 @@ printing (with the
.Fl v
flag) if the command fails. Since error recovery is turned on, the
disk will be spun up if it is not currently spinning.
-.Nm camcontrol
+.Nm
will report whether the disk is ready.
.Bd -literal -offset indent
camcontrol cmd -n cd -u 1 -v -c "3C 00 00 00 00 00 00 00 0e 00" \e
@@ -710,7 +710,7 @@ Test Unit Ready command to make the settings take effect.
.Xr xpt 4
.Sh HISTORY
The
-.Nm camcontrol
+.Nm
command first appeared in
.Fx 3.0 .
.Pp
@@ -739,7 +739,7 @@ The sense information from the test unit ready command would not get
printed out, since the first
.Xr getopt 3
call in
-.Nm camcontrol
+.Nm
bails out when it sees the second argument to
.Fl c
.Po
@@ -749,5 +749,5 @@ above. Fixing this behavior would take some gross code, or changes to the
.Xr getopt 3
interface. The best way to circumvent this problem is to always make sure
to specify generic
-.Nm camcontrol
+.Nm
arguments before any command-specific arguments.
diff --git a/sbin/ccdconfig/ccdconfig.8 b/sbin/ccdconfig/ccdconfig.8
index d5e9243..9fd3551 100644
--- a/sbin/ccdconfig/ccdconfig.8
+++ b/sbin/ccdconfig/ccdconfig.8
@@ -39,27 +39,27 @@
.Nm ccdconfig
.Nd configuration utility for the concatenated disk driver
.Sh SYNOPSIS
-.Nm ccdconfig
+.Nm
.Op Fl cv
.Ar ccd
.Ar ileave
.Op Ar flags
.Ar dev
.Op Ar
-.Nm ccdconfig
+.Nm
.Fl C
.Op Fl v
.Op Fl f Ar config_file
-.Nm ccdconfig
+.Nm
.Fl u
.Op Fl v
.Ar ccd
.Op Ar
-.Nm ccdconfig
+.Nm
.Fl U
.Op Fl v
.Op Fl f Ar config_file
-.Nm ccdconfig
+.Nm
.Fl g
.Op Fl M Ar core
.Op Fl N Ar system
@@ -77,7 +77,7 @@ The options are as follows:
.Bl -tag -width indent
.It Fl c
Configure a ccd. This is the default behavior of
-.Nm Ns .
+.Nm .
.It Fl C
Configure all ccd devices listed in the ccd configuration file.
.It Fl f Ar config_file
diff --git a/sbin/clri/clri.8 b/sbin/clri/clri.8
index 7f66ecc..3ea8e8e 100644
--- a/sbin/clri/clri.8
+++ b/sbin/clri/clri.8
@@ -39,7 +39,7 @@
.Nm clri
.Nd clear an inode
.Sh SYNOPSIS
-.Nm clri
+.Nm
.Ar special_device inode_number ...
.Sh DESCRIPTION
.Bf -symbolic
diff --git a/sbin/comcontrol/comcontrol.8 b/sbin/comcontrol/comcontrol.8
index 4175520..c39928b 100644
--- a/sbin/comcontrol/comcontrol.8
+++ b/sbin/comcontrol/comcontrol.8
@@ -6,7 +6,7 @@
.Nm comcontrol
.Nd control a special tty device
.Sh SYNOPSIS
-.Nm comcontrol
+.Nm
.Ar special_device
.Op dtrwait Ar number
.Op drainwait Ar number
diff --git a/sbin/cxconfig/cxconfig.8 b/sbin/cxconfig/cxconfig.8
index 5b6d7cb..913e758 100644
--- a/sbin/cxconfig/cxconfig.8
+++ b/sbin/cxconfig/cxconfig.8
@@ -6,7 +6,7 @@
.Nm cxconfig
.Nd channel options management utility for Cronyx-Sigma adapter
.Sh SYNOPSIS
-.Nm cxconfig
+.Nm
.Op Fl a
.Op Ar <channel> Op Ar <option>...
.Sh DESCRIPTION
diff --git a/sbin/disklabel/disklabel.8 b/sbin/disklabel/disklabel.8
index 13aa183..109bc08 100644
--- a/sbin/disklabel/disklabel.8
+++ b/sbin/disklabel/disklabel.8
@@ -42,27 +42,27 @@
.Nm disklabel
.Nd read and write disk pack label
.Sh SYNOPSIS
-.Nm disklabel
+.Nm
.Op Fl r
.Ar disk
-.Nm disklabel
+.Nm
.Fl w
.Op Fl r
.Ar disk Ar disktype/auto
.Oo Ar packid Oc
-.Nm disklabel
+.Nm
.Fl e
.Op Fl r
.Ar disk
-.Nm disklabel
+.Nm
.Fl R
.Op Fl r
.Ar disk Ar protofile
-.Nm disklabel
+.Nm
.Op Fl NW
.Ar disk
.Pp
-.Nm disklabel
+.Nm
.Fl B
.Oo
.Fl b Ar boot1
@@ -70,7 +70,7 @@
.Oc
.Ar disk
.Oo Ar disktype/auto Oc
-.Nm disklabel
+.Nm
.Fl w
.Fl B
.Oo
@@ -79,7 +79,7 @@
.Oc
.Ar disk Ar disktype/auto
.Oo Ar packid Oc
-.Nm disklabel
+.Nm
.Fl R
.Fl B
.Oo
@@ -114,7 +114,7 @@ is described under each command.
.Ss Disk device name
.Pp
All
-.Nm disklabel
+.Nm
forms require a disk device name, which should always be the raw
device name representing the disk or slice. For example
.Pa da0
@@ -140,7 +140,7 @@ To examine or save the label on a disk drive, use
.Nm
without options:
.Pp
-.Nm disklabel
+.Nm
.Op Fl r
.Ar disk
.Pp
@@ -167,13 +167,13 @@ is corrupt.
.Pp
To write a standard label, use the form
.Pp
-.Nm disklabel
+.Nm
.Fl w
.Op Fl r
.Ar disk Ar disktype/auto
.Oo Ar packid Oc
.Pp
-.Nm disklabel
+.Nm
.Fl w
.Op Fl r
.Ar disk
@@ -241,7 +241,7 @@ described later on in this manual page.
.Pp
To edit an existing disk label, use the form
.Pp
-.Nm disklabel
+.Nm
.Fl e
.Op Fl r
.Ar disk
@@ -262,7 +262,7 @@ was specified.
.Pp
To restore a disk label from a file, use the form
.Pp
-.Nm disklabel
+.Nm
.Fl R
.Op Fl r
.Ar disk Ar protofile
@@ -283,14 +283,14 @@ By default, it is not possible to write to the disk label area at the beginning
of a disk. The disk driver silently ignores any attempt to do so. If you need
to write to this area (for example, to obliterate the label), use the form
.Pp
-.Nm disklabel
+.Nm
.Op Fl W
.Ar disk
.Pp
To disallow writing to the label area after previously allowing it, use the
command
.Pp
-.Nm disklabel
+.Nm
.Op Fl N
.Ar disk
.Ss Installing bootstraps
@@ -311,7 +311,7 @@ then install the
.Fx
bootblocks in the slice.
.Pp
-.Nm disklabel
+.Nm
.Fl B
.Oo
.Fl b Ar boot1
@@ -328,7 +328,7 @@ disk, such as
This command is typically run on a slice such as
.Ar da0s1 .
.Pp
-.Nm disklabel
+.Nm
.Fl w
.Fl B
.Oo
@@ -346,7 +346,7 @@ If run on a base disk this command will create a
.Dq dangerously-dedicated
label. This command is normally run on a slice rather then a base disk.
.Pp
-.Nm disklabel
+.Nm
.Fl R
.Fl B
.Oo
@@ -454,9 +454,9 @@ partition for /home (usally all remaining space).
Your mileage may vary.
.El
.Pp
-.Nm fdisk -BI da0
+.Nm fdisk Fl BI Ar da0
.Pp
-.Nm disklabel
+.Nm
.Fl w
.Fl r
.Fl B
@@ -464,7 +464,7 @@ Your mileage may vary.
auto
.Pp
.Pp
-.Nm disklabel
+.Nm
.Fl e
.Ar da0s1
.Pp
diff --git a/sbin/dmesg/dmesg.8 b/sbin/dmesg/dmesg.8
index b989e90..39f0e39 100644
--- a/sbin/dmesg/dmesg.8
+++ b/sbin/dmesg/dmesg.8
@@ -39,7 +39,7 @@
.Nm dmesg
.Nd "display the system message buffer"
.Sh SYNOPSIS
-.Nm dmesg
+.Nm
.Op Fl M Ar core
.Op Fl N Ar system
.Sh DESCRIPTION
diff --git a/sbin/dump/dump.8 b/sbin/dump/dump.8
index fae945d..855288c 100644
--- a/sbin/dump/dump.8
+++ b/sbin/dump/dump.8
@@ -41,7 +41,7 @@
.Nm rdump
.Nd filesystem backup
.Sh SYNOPSIS
-.Nm dump
+.Nm
.Op Fl 0123456789acknu
.Op Fl B Ar records
.Op Fl b Ar blocksize
@@ -51,10 +51,10 @@
.Op Fl s Ar feet
.Op Fl T Ar date
.Ar filesystem
-.Nm dump
+.Nm
.Op Fl W Li \&| Fl w
.Pp
-.in -\\n(iSu
+.in -\n(iSu
(The
.Bx 4.3
option syntax is implemented for backward compatibility, but
@@ -87,7 +87,7 @@ By default, the same output file name is used for each volume
after prompting the operator to change media.
.Pp
The following options are supported by
-.Nm Ns :
+.Nm :
.Bl -tag -width Ds
.It Fl 0\-9
Dump levels.
diff --git a/sbin/dumpfs/dumpfs.8 b/sbin/dumpfs/dumpfs.8
index 8c668c1..51a634b 100644
--- a/sbin/dumpfs/dumpfs.8
+++ b/sbin/dumpfs/dumpfs.8
@@ -39,7 +39,7 @@
.Nm dumpfs
.Nd dump file system information
.Sh SYNOPSIS
-.Nm dumpfs
+.Nm
.Op Ar filesys No \&| Ar device
.Sh DESCRIPTION
.Nm Dumpfs
diff --git a/sbin/dumpon/dumpon.8 b/sbin/dumpon/dumpon.8
index 3e9e1bd..fc4680d 100644
--- a/sbin/dumpon/dumpon.8
+++ b/sbin/dumpon/dumpon.8
@@ -39,10 +39,10 @@
.Nm dumpon
.Nd "specify a device for crash dumps"
.Sh SYNOPSIS
-.Nm dumpon
+.Nm
.Op Fl v
.Ar special_file
-.Nm dumpon
+.Nm
.Op Fl v
.Ar off
.Sh DESCRIPTION
diff --git a/sbin/fdisk/fdisk.8 b/sbin/fdisk/fdisk.8
index 68cc63e..f78d406 100644
--- a/sbin/fdisk/fdisk.8
+++ b/sbin/fdisk/fdisk.8
@@ -7,13 +7,13 @@
.Nm fdisk
.Nd PC partition table maintenance program
.Sh SYNOPSIS
-.Nm fdisk
+.Nm
.Op Fl BIaistu
.Op Fl b Ar bootcode
.Op Fl 1234
.Op Ar disk
.Bl -tag -width time
-.Nm fdisk
+.Nm
.Fl f Ar configfile
.Op Fl itv
.Op Ar disk
diff --git a/sbin/fdisk_pc98/fdisk.8 b/sbin/fdisk_pc98/fdisk.8
index 0f48fa6..d39ce8c 100644
--- a/sbin/fdisk_pc98/fdisk.8
+++ b/sbin/fdisk_pc98/fdisk.8
@@ -7,14 +7,14 @@
.Nm fdisk
.Nd PC partition table maintenance program
.Sh SYNOPSIS
-.Nm fdisk
+.Nm
.\" !PC98 .Op Fl BIaistu
.Op Fl Bastu
.Op Fl b Ar bootcode
.Op Fl 1234
.Op Ar disk
.Bl -tag -width time
-.Nm fdisk
+.Nm
.Fl f Ar configfile
.Op Fl itv
.Op Ar disk
diff --git a/sbin/fsck/fsck.8 b/sbin/fsck/fsck.8
index c56d8f8..f25be2b 100644
--- a/sbin/fsck/fsck.8
+++ b/sbin/fsck/fsck.8
@@ -35,7 +35,7 @@
.Nm fsck
.Nd file system consistency check and interactive repair
.Sh SYNOPSIS
-.Nm fsck
+.Nm
.Op Fl dvplfyn
.Op Fl l Ar maxparallel
.Op Fl t Ar fstype
diff --git a/sbin/fsck_ffs/fsck_ffs.8 b/sbin/fsck_ffs/fsck_ffs.8
index 59d7fa8..1cb1699 100644
--- a/sbin/fsck_ffs/fsck_ffs.8
+++ b/sbin/fsck_ffs/fsck_ffs.8
@@ -40,13 +40,13 @@
.Nm fsck
.Nd filesystem consistency check and interactive repair
.Sh SYNOPSIS
-.Nm fsck
+.Nm
.Fl p
.Op Fl f
.Op Fl m Ar mode
.Op Ar filesystem
.Ar ...
-.Nm fsck
+.Nm
.Op Fl ny
.Op Fl b Ar block#
.Op Fl c Ar level
@@ -162,7 +162,7 @@ and
combined.
.Pp
The following flags are interpreted by
-.Nm Ns .
+.Nm .
.Bl -tag -width indent
.It Fl b
Use the block specified immediately after the flag as
@@ -203,7 +203,7 @@ first line of output from
.Xr dumpfs 8 .
.It Fl f
Force
-.Nm fsck
+.Nm
to check
.Sq clean
filesystems when preening.
@@ -232,7 +232,7 @@ do not open the filesystem for writing.
Preen filesystems (see above).
.It Fl y
Assume a yes response to all questions asked by
-.Nm Ns ;
+.Nm ;
this should be used with great caution as this is a free license
to continue after essentially unlimited trouble has been encountered.
.El
diff --git a/sbin/fsck_ifs/fsck_ifs.8 b/sbin/fsck_ifs/fsck_ifs.8
index 59d7fa8..1cb1699 100644
--- a/sbin/fsck_ifs/fsck_ifs.8
+++ b/sbin/fsck_ifs/fsck_ifs.8
@@ -40,13 +40,13 @@
.Nm fsck
.Nd filesystem consistency check and interactive repair
.Sh SYNOPSIS
-.Nm fsck
+.Nm
.Fl p
.Op Fl f
.Op Fl m Ar mode
.Op Ar filesystem
.Ar ...
-.Nm fsck
+.Nm
.Op Fl ny
.Op Fl b Ar block#
.Op Fl c Ar level
@@ -162,7 +162,7 @@ and
combined.
.Pp
The following flags are interpreted by
-.Nm Ns .
+.Nm .
.Bl -tag -width indent
.It Fl b
Use the block specified immediately after the flag as
@@ -203,7 +203,7 @@ first line of output from
.Xr dumpfs 8 .
.It Fl f
Force
-.Nm fsck
+.Nm
to check
.Sq clean
filesystems when preening.
@@ -232,7 +232,7 @@ do not open the filesystem for writing.
Preen filesystems (see above).
.It Fl y
Assume a yes response to all questions asked by
-.Nm Ns ;
+.Nm ;
this should be used with great caution as this is a free license
to continue after essentially unlimited trouble has been encountered.
.El
diff --git a/sbin/fsdb/fsdb.8 b/sbin/fsdb/fsdb.8
index 6a33433..46489d8 100644
--- a/sbin/fsdb/fsdb.8
+++ b/sbin/fsdb/fsdb.8
@@ -35,7 +35,7 @@
.Nm fsdb
.Nd FFS debugging/editing tool
.Sh SYNOPSIS
-.Nm fsdb
+.Nm
.Op Fl d
.Op Fl f
.Op Fl r
diff --git a/sbin/fsirand/fsirand.8 b/sbin/fsirand/fsirand.8
index 2711038..6d9764f 100644
--- a/sbin/fsirand/fsirand.8
+++ b/sbin/fsirand/fsirand.8
@@ -36,7 +36,7 @@
.Nm fsirand
.Nd randomize inode generation numbers
.Sh SYNOPSIS
-.Nm fsirand
+.Nm
.Op Fl b
.Op Fl f
.Op Fl p
diff --git a/sbin/i386/cxconfig/cxconfig.8 b/sbin/i386/cxconfig/cxconfig.8
index 5b6d7cb..913e758 100644
--- a/sbin/i386/cxconfig/cxconfig.8
+++ b/sbin/i386/cxconfig/cxconfig.8
@@ -6,7 +6,7 @@
.Nm cxconfig
.Nd channel options management utility for Cronyx-Sigma adapter
.Sh SYNOPSIS
-.Nm cxconfig
+.Nm
.Op Fl a
.Op Ar <channel> Op Ar <option>...
.Sh DESCRIPTION
diff --git a/sbin/i386/fdisk/fdisk.8 b/sbin/i386/fdisk/fdisk.8
index 68cc63e..f78d406 100644
--- a/sbin/i386/fdisk/fdisk.8
+++ b/sbin/i386/fdisk/fdisk.8
@@ -7,13 +7,13 @@
.Nm fdisk
.Nd PC partition table maintenance program
.Sh SYNOPSIS
-.Nm fdisk
+.Nm
.Op Fl BIaistu
.Op Fl b Ar bootcode
.Op Fl 1234
.Op Ar disk
.Bl -tag -width time
-.Nm fdisk
+.Nm
.Fl f Ar configfile
.Op Fl itv
.Op Ar disk
diff --git a/sbin/i386/nextboot/nextboot.8 b/sbin/i386/nextboot/nextboot.8
index 5796c36..3afe41b 100644
--- a/sbin/i386/nextboot/nextboot.8
+++ b/sbin/i386/nextboot/nextboot.8
@@ -6,11 +6,11 @@
.Nm nextboot
.Nd install a default bootstring block on the boot disk
.Sh SYNOPSIS
-.Nm nextboot
+.Nm
.Op Fl b
.Ar filename bootstring
.Ar
-.Nm nextboot
+.Nm
.Op Fl ed
.Ar filename
.Sh DESCRIPTION
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index 6f67af9..f3ca86f 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -39,7 +39,7 @@
.Nm ifconfig
.Nd configure network interface parameters
.Sh SYNOPSIS
-.Nm ifconfig
+.Nm
.Op Fl L
.Ar interface
.Op Ar address_family
@@ -48,18 +48,18 @@
.Op Ar dest_address
.Oc
.Op Ar parameters
-.Nm ifconfig
+.Nm
.Fl a
.Op Fl L
.Op Fl d
.Op Fl u
.Op Ar address_family
-.Nm ifconfig
+.Nm
.Fl l
.Op Fl d
.Op Fl u
.Op Ar address_family
-.Nm ifconfig
+.Nm
.Op Fl L
.Op Fl d
.Op Fl u
@@ -136,7 +136,7 @@ for example,
.El
.Pp
The following parameters may be set with
-.Nm ifconfig :
+.Nm :
.Bl -tag -width indent
.It Cm add
Another name for the ``alias'' parameter. Introduced for compatibility
@@ -441,7 +441,7 @@ tried to alter an interface's configuration.
IPv6 link-local addresses are required for several basic communication
between IPv6 node.
If they are deleted by
-.Nm ifconfig
+.Nm
manually, the kernel might show very strange behavior.
So, such manual deletions are strongly discouraged.
.Sh SEE ALSO
diff --git a/sbin/init/init.8 b/sbin/init/init.8
index 3e77ade..5a1831d 100644
--- a/sbin/init/init.8
+++ b/sbin/init/init.8
@@ -42,8 +42,8 @@
.Nm init
.Nd process control initialization
.Sh SYNOPSIS
-.Nm init
-.Nm init
+.Nm
+.Nm
.Oo
.Cm 0 | 1 | 6 |
.Cm c | q
diff --git a/sbin/ip6fw/ip6fw.8 b/sbin/ip6fw/ip6fw.8
index 1417663..2b21208 100644
--- a/sbin/ip6fw/ip6fw.8
+++ b/sbin/ip6fw/ip6fw.8
@@ -10,25 +10,25 @@
.Sh SYNOPSIS
.Nm
.Ar file
-.Nm ip6fw
+.Nm
.Op Fl f | Fl q
flush
-.Nm ip6fw
+.Nm
.Op Fl q
zero
.Op Ar number ...
-.Nm ip6fw
+.Nm
delete
.Ar number ...
-.Nm ip6fw
+.Nm
.Op Fl aftN
list
.Op Ar number ...
-.Nm ip6fw
+.Nm
.Op Fl ftN
show
.Op Ar number ...
-.Nm ip6fw
+.Nm
.Op Fl q
add
.Op Ar number
diff --git a/sbin/ipfw/ipfw.8 b/sbin/ipfw/ipfw.8
index fc07dfe..514e9cb 100644
--- a/sbin/ipfw/ipfw.8
+++ b/sbin/ipfw/ipfw.8
@@ -8,7 +8,7 @@
.Nm ipfw
.Nd controlling utility for IP firewall and traffic shaper
.Sh SYNOPSIS
-.Nm ipfw
+.Nm
.Op Fl q
.Oo
.Fl p Ar preproc
@@ -21,41 +21,41 @@
.Op Fl U Ar macro
.Oc
.Ar pathname
-.Nm ipfw
+.Nm
.Op Fl f | q
.Cm flush
-.Nm ipfw
+.Nm
.Op Fl q
.Es \&{ \&}
.En Cm zero | resetlog | delete
.Op Ar number ...
-.Nm ipfw
+.Nm
.Op Fl s Op Ar field
.Op Fl aftN
.Es \&{ \&}
.En Cm list | show
.Op Ar number ...
-.Nm ipfw
+.Nm
.Op Fl q
.Cm add
.Op Ar number
.Ar rule-body
-.Nm ipfw
+.Nm
.Cm pipe
.Ar number
.Cm config
.Ar pipe-config-options
-.Nm ipfw
+.Nm
.Cm pipe
.Es \&{ \&}
.En Cm delete | list | show
.Op Ar number ...
-.Nm ipfw
+.Nm
.Cm queue
.Ar number
.Cm config
.Ar queue-config-options
-.Nm ipfw
+.Nm
.Cm queue
.Es \&{ \&}
.En Cm delete | list | show
@@ -122,7 +122,7 @@ See the
and
.Sx EXAMPLES
sections below for more information on the stateful behaviour of
-.Nm ipfw .
+.Nm .
.Pp
All rules (including dynamic ones) have a few associated counters:
a packet count, a byte count, a log count and a timestamp
@@ -1105,7 +1105,7 @@ meaning:
.Bl -tag -width indent
.It Em net.inet.ip.fw.debug : No 1
Controls debugging messages produced by
-.Nm ipfw .
+.Nm .
.It Em net.inet.ip.fw.one_pass : No 1
When set, the packet exiting from the
.Xr dummynet 4
diff --git a/sbin/kget/kget.8 b/sbin/kget/kget.8
index 7fea15f..4b84730 100644
--- a/sbin/kget/kget.8
+++ b/sbin/kget/kget.8
@@ -31,7 +31,7 @@
.Nm kget
.Nd print kernel change information.
.Sh SYNOPSIS
-.Nm kget
+.Nm
.Ar filename
.Sh DESCRIPTION
The
diff --git a/sbin/kldload/kldload.8 b/sbin/kldload/kldload.8
index 83842fd..520a35e 100644
--- a/sbin/kldload/kldload.8
+++ b/sbin/kldload/kldload.8
@@ -32,7 +32,7 @@
.Nm kldload
.Nd load a file into the kernel
.Sh SYNOPSIS
-.Nm kldload
+.Nm
.Op Fl v
.Ar filename
.Sh DESCRIPTION
diff --git a/sbin/kldstat/kldstat.8 b/sbin/kldstat/kldstat.8
index f12d503..bb47b78 100644
--- a/sbin/kldstat/kldstat.8
+++ b/sbin/kldstat/kldstat.8
@@ -32,7 +32,7 @@
.Nm kldstat
.Nd display status of dynamic kernel linker
.Sh SYNOPSIS
-.Nm kldstat
+.Nm
.Op Fl v
.Op Fl i Ar id
.Op Fl n Ar name
diff --git a/sbin/kldunload/kldunload.8 b/sbin/kldunload/kldunload.8
index 6cbb60b..39832e6 100644
--- a/sbin/kldunload/kldunload.8
+++ b/sbin/kldunload/kldunload.8
@@ -32,10 +32,10 @@
.Nm kldunload
.Nd unload a file from the kernel
.Sh SYNOPSIS
-.Nm kldunload
+.Nm
.Op Fl v
.Fl i Ar id
-.Nm kldunload
+.Nm
.Op Fl v
.Op Fl n
.Ar name
diff --git a/sbin/ldconfig/ldconfig.8 b/sbin/ldconfig/ldconfig.8
index ae77842..85746da 100644
--- a/sbin/ldconfig/ldconfig.8
+++ b/sbin/ldconfig/ldconfig.8
@@ -36,7 +36,7 @@
.Nm ldconfig
.Nd configure the shared library cache
.Sh SYNOPSIS
-.Nm ldconfig
+.Nm
.Op Fl aout | Fl elf
.Op Fl Rimrsv
.Op Fl f Ar hints_file
@@ -91,7 +91,7 @@ switch of
is typically run as part of the boot sequence.
.Pp
The following options recognized by
-.Nm ldconfig:
+.Nm :
.Bl -tag -width indent
.It Fl aout
Generate the hints for a.out format shared libraries.
diff --git a/sbin/md5/md5.1 b/sbin/md5/md5.1
index c485184..559663d 100644
--- a/sbin/md5/md5.1
+++ b/sbin/md5/md5.1
@@ -6,7 +6,7 @@
.Nm md5
.Nd calculate a message-digest fingerprint (checksum) for a file
.Sh SYNOPSIS
-.Nm md5
+.Nm
.Op Fl pqrtx
.Op Fl s Ar string
.Op Ar file ...
diff --git a/sbin/mknod/mknod.8 b/sbin/mknod/mknod.8
index 22e60a9..8e76667 100644
--- a/sbin/mknod/mknod.8
+++ b/sbin/mknod/mknod.8
@@ -39,14 +39,14 @@
.Nm mknod
.Nd build special file
.Sh SYNOPSIS
-.Nm mknod
+.Nm
.Ar name
.Op Cm c | Cm b
.Ar major minor
.Op owner:group
.Sh DESCRIPTION
The
-.Nm mknod
+.Nm
command creates device special files.
Normally the shell script
.Pa /dev/MAKEDEV
diff --git a/sbin/mount/getmntopts.3 b/sbin/mount/getmntopts.3
index 84ad24f..f9380ac 100644
--- a/sbin/mount/getmntopts.3
+++ b/sbin/mount/getmntopts.3
@@ -44,7 +44,7 @@
.Fn getmntopts "char *options" "struct mntopt *mopts" "int *flagp" "int *altflagp"
.Sh DESCRIPTION
The
-.Nm getmntopts
+.Fn getmntopts
function takes a comma separated option list and a list
of valid option names, and computes the bitmask
corresponding to the requested set of options.
@@ -64,7 +64,7 @@ or
field of the option's table entry)
are updated.
The flag words are not initialized by
-.Nm getmntopt .
+.Fn getmntopts .
The table,
.Dv mopts ,
has the following format:
@@ -85,7 +85,7 @@ for example
.Dq suid .
.It Fa m_inverse
tells
-.Nm getmntopts
+.Fn getmntopts
that the name has the inverse meaning of the
bit.
For example,
@@ -164,7 +164,7 @@ struct mntopt mopts[] = {
If the external integer variable
.Dv getmnt_silent
is non-zero then the
-.Nm getmntopts
+.Fn getmntopts
function displays an error message and exits if an
unrecognized option is encountered.
By default
diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8
index 8401a1d..8993e80 100644
--- a/sbin/mount/mount.8
+++ b/sbin/mount/mount.8
@@ -39,13 +39,13 @@
.Nm mount
.Nd mount file systems
.Sh SYNOPSIS
-.Nm mount
+.Nm
.Op Fl adfpruvw
.Op Fl t Ar ufs | lfs | external_type
-.Nm mount
+.Nm
.Op Fl dfpruvw
.Ar special | node
-.Nm mount
+.Nm
.Op Fl dfpruvw
.Op Fl o Ar options
.Op Fl t Ar ufs | lfs | external_type
@@ -70,7 +70,7 @@ file.
.Pp
The system maintains a list of currently mounted file systems.
If no arguments are given to
-.Nm mount ,
+.Nm ,
this list is printed.
.Pp
The options are as follows:
diff --git a/sbin/mount_cd9660/mount_cd9660.8 b/sbin/mount_cd9660/mount_cd9660.8
index 7e409fa..4e2a6f8 100644
--- a/sbin/mount_cd9660/mount_cd9660.8
+++ b/sbin/mount_cd9660/mount_cd9660.8
@@ -43,7 +43,7 @@
.Nm mount_cd9660
.Nd mount an ISO-9660 filesystem
.Sh SYNOPSIS
-.Nm mount_cd9660
+.Nm
.Op Fl egjrv
.Op Fl o Ar options
.Op Fl s Ar startsector
diff --git a/sbin/mount_ext2fs/mount_ext2fs.8 b/sbin/mount_ext2fs/mount_ext2fs.8
index 3360b90..1ff6ea0 100644
--- a/sbin/mount_ext2fs/mount_ext2fs.8
+++ b/sbin/mount_ext2fs/mount_ext2fs.8
@@ -38,7 +38,7 @@
.Nm mount_ext2fs
.Nd mount a ext2fs file system
.Sh SYNOPSIS
-.Nm mount_ext2fs
+.Nm
.Op Fl o Ar options
.Ar special
.Ar node
diff --git a/sbin/mount_hpfs/mount_hpfs.8 b/sbin/mount_hpfs/mount_hpfs.8
index 40f1848..34a9bed 100644
--- a/sbin/mount_hpfs/mount_hpfs.8
+++ b/sbin/mount_hpfs/mount_hpfs.8
@@ -37,7 +37,7 @@
.Nm mount_hpfs
.Nd mount an HPFS file system
.Sh SYNOPSIS
-.Nm mount_hpfs
+.Nm
.Op Fl o Ar options
.Op Fl u Ar uid
.Op Fl g Ar gid
diff --git a/sbin/mount_ifs/getmntopts.3 b/sbin/mount_ifs/getmntopts.3
index 84ad24f..f9380ac 100644
--- a/sbin/mount_ifs/getmntopts.3
+++ b/sbin/mount_ifs/getmntopts.3
@@ -44,7 +44,7 @@
.Fn getmntopts "char *options" "struct mntopt *mopts" "int *flagp" "int *altflagp"
.Sh DESCRIPTION
The
-.Nm getmntopts
+.Fn getmntopts
function takes a comma separated option list and a list
of valid option names, and computes the bitmask
corresponding to the requested set of options.
@@ -64,7 +64,7 @@ or
field of the option's table entry)
are updated.
The flag words are not initialized by
-.Nm getmntopt .
+.Fn getmntopts .
The table,
.Dv mopts ,
has the following format:
@@ -85,7 +85,7 @@ for example
.Dq suid .
.It Fa m_inverse
tells
-.Nm getmntopts
+.Fn getmntopts
that the name has the inverse meaning of the
bit.
For example,
@@ -164,7 +164,7 @@ struct mntopt mopts[] = {
If the external integer variable
.Dv getmnt_silent
is non-zero then the
-.Nm getmntopts
+.Fn getmntopts
function displays an error message and exits if an
unrecognized option is encountered.
By default
diff --git a/sbin/mount_ifs/mount.8 b/sbin/mount_ifs/mount.8
index 570e8e8..02311ce 100644
--- a/sbin/mount_ifs/mount.8
+++ b/sbin/mount_ifs/mount.8
@@ -39,13 +39,13 @@
.Nm mount
.Nd mount file systems
.Sh SYNOPSIS
-.Nm mount
+.Nm
.Op Fl adfpruvw
.Op Fl t Ar ufs | lfs | external_type
-.Nm mount
+.Nm
.Op Fl dfpruvw
.Ar special | node
-.Nm mount
+.Nm
.Op Fl dfpruvw
.Op Fl o Ar options
.Op Fl t Ar ufs | lfs | external_type
@@ -70,7 +70,7 @@ file.
.Pp
The system maintains a list of currently mounted file systems.
If no arguments are given to
-.Nm mount ,
+.Nm ,
this list is printed.
.Pp
The options are as follows:
diff --git a/sbin/mount_msdos/mount_msdos.8 b/sbin/mount_msdos/mount_msdos.8
index 8083d2f..99cfa68 100644
--- a/sbin/mount_msdos/mount_msdos.8
+++ b/sbin/mount_msdos/mount_msdos.8
@@ -37,7 +37,7 @@
.Nm mount_msdos
.Nd mount an MS-DOS file system
.Sh SYNOPSIS
-.Nm mount_msdos
+.Nm
.Op Fl o Ar options
.Op Fl u Ar uid
.Op Fl g Ar gid
@@ -212,4 +212,4 @@ utility appeared in
.Fx 1.0 ,
and was abandoned in favor
of the more aptly-named
-.Nm Ns .
+.Nm .
diff --git a/sbin/mount_msdosfs/mount_msdosfs.8 b/sbin/mount_msdosfs/mount_msdosfs.8
index 8083d2f..99cfa68 100644
--- a/sbin/mount_msdosfs/mount_msdosfs.8
+++ b/sbin/mount_msdosfs/mount_msdosfs.8
@@ -37,7 +37,7 @@
.Nm mount_msdos
.Nd mount an MS-DOS file system
.Sh SYNOPSIS
-.Nm mount_msdos
+.Nm
.Op Fl o Ar options
.Op Fl u Ar uid
.Op Fl g Ar gid
@@ -212,4 +212,4 @@ utility appeared in
.Fx 1.0 ,
and was abandoned in favor
of the more aptly-named
-.Nm Ns .
+.Nm .
diff --git a/sbin/mount_nfs/mount_nfs.8 b/sbin/mount_nfs/mount_nfs.8
index d5245fe..21a639f 100644
--- a/sbin/mount_nfs/mount_nfs.8
+++ b/sbin/mount_nfs/mount_nfs.8
@@ -40,7 +40,7 @@
.Nm mount_nfs
.Nd mount nfs file systems
.Sh SYNOPSIS
-.Nm mount_nfs
+.Nm
.Op Fl 23KNPTUbcdilqs
.Op Fl D Ar deadthresh
.Op Fl I Ar readdirsize
@@ -211,7 +211,7 @@ the longer the cache is considered valid, subject to the limits above.
.Pp
Use of these options is deprecated, they are only mentioned here for
compatibility with historic versions of
-.Nm Ns .
+.Nm .
.It bg
Same as
.Fl b .
diff --git a/sbin/mount_ntfs/mount_ntfs.8 b/sbin/mount_ntfs/mount_ntfs.8
index 1a757ec..5208446 100644
--- a/sbin/mount_ntfs/mount_ntfs.8
+++ b/sbin/mount_ntfs/mount_ntfs.8
@@ -37,7 +37,7 @@
.Nm mount_ntfs
.Nd mount an NTFS file system
.Sh SYNOPSIS
-.Nm mount_ntfs
+.Nm
.Op Fl a
.Op Fl i
.Op Fl u Ar uid
diff --git a/sbin/mount_null/mount_null.8 b/sbin/mount_null/mount_null.8
index af82cc7..c2e7167 100644
--- a/sbin/mount_null/mount_null.8
+++ b/sbin/mount_null/mount_null.8
@@ -45,7 +45,7 @@
.Nd mount a loopback filesystem sub-tree;
demonstrate the use of a null file system layer
.Sh SYNOPSIS
-.Nm mount_null
+.Nm
.Op Fl o Ar options
.Ar target
.Ar mount-point
diff --git a/sbin/mount_nullfs/mount_nullfs.8 b/sbin/mount_nullfs/mount_nullfs.8
index af82cc7..c2e7167 100644
--- a/sbin/mount_nullfs/mount_nullfs.8
+++ b/sbin/mount_nullfs/mount_nullfs.8
@@ -45,7 +45,7 @@
.Nd mount a loopback filesystem sub-tree;
demonstrate the use of a null file system layer
.Sh SYNOPSIS
-.Nm mount_null
+.Nm
.Op Fl o Ar options
.Ar target
.Ar mount-point
diff --git a/sbin/mount_nwfs/mount_nwfs.8 b/sbin/mount_nwfs/mount_nwfs.8
index b56d26c..2e92a68 100644
--- a/sbin/mount_nwfs/mount_nwfs.8
+++ b/sbin/mount_nwfs/mount_nwfs.8
@@ -6,7 +6,7 @@
.Nm mount_nwfs
.Nd mount NetWare volume from a NetWare file server
.Sh SYNOPSIS
-.Nm mount_nwfs
+.Nm
.Op Fl Chv
.Fl S Ar server
.Fl U Ar user
@@ -22,7 +22,7 @@
.Op Fl u Ar uid
.Op Fl w Ar scheme
.Ar node
-.Nm mount_nwfs
+.Nm
.Op Fl options
.Ar /server:user/volume[/path]
.Ar node
diff --git a/sbin/mount_portal/mount_portal.8 b/sbin/mount_portal/mount_portal.8
index 306a220..f84fa48 100644
--- a/sbin/mount_portal/mount_portal.8
+++ b/sbin/mount_portal/mount_portal.8
@@ -44,7 +44,7 @@
.Nm mount_portal
.Nd mount the portal daemon
.Sh SYNOPSIS
-.Nm mount_portal
+.Nm
.Op Fl o Ar options
.Ar /etc/portal.conf
.Ar mount_point
diff --git a/sbin/mount_portalfs/mount_portalfs.8 b/sbin/mount_portalfs/mount_portalfs.8
index 306a220..f84fa48 100644
--- a/sbin/mount_portalfs/mount_portalfs.8
+++ b/sbin/mount_portalfs/mount_portalfs.8
@@ -44,7 +44,7 @@
.Nm mount_portal
.Nd mount the portal daemon
.Sh SYNOPSIS
-.Nm mount_portal
+.Nm
.Op Fl o Ar options
.Ar /etc/portal.conf
.Ar mount_point
diff --git a/sbin/mount_std/mount_std.8 b/sbin/mount_std/mount_std.8
index 3dc527b..01d992b 100644
--- a/sbin/mount_std/mount_std.8
+++ b/sbin/mount_std/mount_std.8
@@ -83,7 +83,7 @@ and
has a kernel filesystem module name the same as its user-visible name.
.It
requires no other special processing on the part of the
-.Nm mount_std
+.Nm
command.
.El
.Pp
@@ -155,7 +155,7 @@ loadable module for it was found.
None of the ``standard'' filesystems may be NFS-exported.
.Sh HISTORY
The
-.Nm mount_std
+.Nm
utility first appeared in
.Fx 2.2 .
Loadable filesystem modules first appeared in
diff --git a/sbin/mount_umap/mount_umap.8 b/sbin/mount_umap/mount_umap.8
index 4c6abfa..f0801d8 100644
--- a/sbin/mount_umap/mount_umap.8
+++ b/sbin/mount_umap/mount_umap.8
@@ -43,7 +43,7 @@
.Nm mount_umap
.Nd sample file system layer
.Sh SYNOPSIS
-.Nm mount_umap
+.Nm
.Op Fl o Ar options
.Fl u Ar uid-mapfile
.Fl g Ar gid-mapfile
diff --git a/sbin/mount_umapfs/mount_umapfs.8 b/sbin/mount_umapfs/mount_umapfs.8
index 4c6abfa..f0801d8 100644
--- a/sbin/mount_umapfs/mount_umapfs.8
+++ b/sbin/mount_umapfs/mount_umapfs.8
@@ -43,7 +43,7 @@
.Nm mount_umap
.Nd sample file system layer
.Sh SYNOPSIS
-.Nm mount_umap
+.Nm
.Op Fl o Ar options
.Fl u Ar uid-mapfile
.Fl g Ar gid-mapfile
diff --git a/sbin/mount_union/mount_union.8 b/sbin/mount_union/mount_union.8
index d23d01c..8294b8a 100644
--- a/sbin/mount_union/mount_union.8
+++ b/sbin/mount_union/mount_union.8
@@ -42,7 +42,7 @@
.Nm mount_union
.Nd mount union filesystems
.Sh SYNOPSIS
-.Nm mount_union
+.Nm
.Op Fl br
.Op Fl o Ar options
.Ar directory
diff --git a/sbin/mount_unionfs/mount_unionfs.8 b/sbin/mount_unionfs/mount_unionfs.8
index d23d01c..8294b8a 100644
--- a/sbin/mount_unionfs/mount_unionfs.8
+++ b/sbin/mount_unionfs/mount_unionfs.8
@@ -42,7 +42,7 @@
.Nm mount_union
.Nd mount union filesystems
.Sh SYNOPSIS
-.Nm mount_union
+.Nm
.Op Fl br
.Op Fl o Ar options
.Ar directory
diff --git a/sbin/mountd/exports.5 b/sbin/mountd/exports.5
index b5fff27..e2d332c 100644
--- a/sbin/mountd/exports.5
+++ b/sbin/mountd/exports.5
@@ -41,7 +41,7 @@
.Tn NFS
mount requests
.Sh SYNOPSIS
-.Nm exports
+.Nm
.Sh DESCRIPTION
The
.Nm
@@ -285,7 +285,7 @@ The
utility can be made to re-read the
.Nm
file by sending it a hangup signal as follows:
-.Bd -literal -offset indet
+.Bd -literal -offset indent
kill -s HUP `cat /var/run/mountd.pid`
.Ed
.Pp
diff --git a/sbin/mountd/mountd.8 b/sbin/mountd/mountd.8
index fdb62a1..509fbb7 100644
--- a/sbin/mountd/mountd.8
+++ b/sbin/mountd/mountd.8
@@ -41,7 +41,7 @@
.Tn NFS
mount requests
.Sh SYNOPSIS
-.Nm mountd
+.Nm
.Op Fl 2dlnr
.Op Ar exportsfile
.Sh DESCRIPTION
diff --git a/sbin/mountd/netgroup.5 b/sbin/mountd/netgroup.5
index fb1a8bc..919f1fe 100644
--- a/sbin/mountd/netgroup.5
+++ b/sbin/mountd/netgroup.5
@@ -39,7 +39,7 @@
.Nm netgroup
.Nd defines network groups
.Sh SYNOPSIS
-.Nm netgroup
+.Nm
.Sh DESCRIPTION
The
.Nm
diff --git a/sbin/natd/natd.8 b/sbin/natd/natd.8
index a9691ff..7a1f6de 100644
--- a/sbin/natd/natd.8
+++ b/sbin/natd/natd.8
@@ -6,7 +6,7 @@
.Nm natd
.Nd Network Address Translation Daemon
.Sh SYNOPSIS
-.Nm natd
+.Nm
.Bk -words
.Op Fl unregistered_only | u
.Op Fl log | l
@@ -466,7 +466,7 @@ The range will be cleared for all rules on startup.
.El
.Sh RUNNING NATD
The following steps are necessary before attempting to run
-.Nm No :
+.Nm :
.Bl -enum
.It
Build a custom kernel with the following options:
@@ -502,7 +502,7 @@ and you are using
on that interface, you must make sure that you start
.Nm ppp
prior to starting
-.Nm No .
+.Nm .
.El
.Pp
Running
@@ -519,7 +519,7 @@ on how to configure it to be started automatically during boot.
Once
.Nm
is running, you must ensure that traffic is diverted to
-.Nm No :
+.Nm :
.Bl -enum
.It
You will need to adjust the
@@ -550,7 +550,7 @@ the start of the script so that
sees all packets before they are dropped by the firewall.
.Pp
After translation by
-.Nm No ,
+.Nm ,
packets re-enter the firewall at the rule number following the rule number
that caused the diversion (not the next rule if there are several at the
same number).
diff --git a/sbin/newfs/newfs.8 b/sbin/newfs/newfs.8
index 4c21dd6..c1f6b49 100644
--- a/sbin/newfs/newfs.8
+++ b/sbin/newfs/newfs.8
@@ -40,7 +40,7 @@
.Nm mount_mfs
.Nd construct a new file system
.Sh SYNOPSIS
-.Nm newfs
+.Nm
.Op Fl NO
.Op Fl S Ar sector-size
.Op Fl T Ar disktype
@@ -118,7 +118,7 @@ corresponding file system.
The parameters to
.Nm mount_mfs
are the same as those to
-.Nm Ns .
+.Nm .
If the
.Fl T
flag is specified (see below), the special file is unused.
@@ -245,7 +245,7 @@ Specify that the disk does not contain any partitions, and that
.Nm
should build a file system on the whole disk.
This option is useful for synthetic disks such as
-.Nm vinum.
+.Nm vinum .
.El
.Pp
The following options override the standard sizes for the disk geometry.
diff --git a/sbin/newfs_msdos/newfs_msdos.8 b/sbin/newfs_msdos/newfs_msdos.8
index 6a10a86..c2943e6 100644
--- a/sbin/newfs_msdos/newfs_msdos.8
+++ b/sbin/newfs_msdos/newfs_msdos.8
@@ -32,7 +32,7 @@
.Nm newfs_msdos
.Nd construct a new MS-DOS (FAT) file system
.Sh SYNOPSIS
-.Nm newfs_msdos
+.Nm
.Op Fl N
.Op Fl B Ar boot
.Op Fl F Ar FAT-type
diff --git a/sbin/nextboot/nextboot.8 b/sbin/nextboot/nextboot.8
index 5796c36..3afe41b 100644
--- a/sbin/nextboot/nextboot.8
+++ b/sbin/nextboot/nextboot.8
@@ -6,11 +6,11 @@
.Nm nextboot
.Nd install a default bootstring block on the boot disk
.Sh SYNOPSIS
-.Nm nextboot
+.Nm
.Op Fl b
.Ar filename bootstring
.Ar
-.Nm nextboot
+.Nm
.Op Fl ed
.Ar filename
.Sh DESCRIPTION
diff --git a/sbin/nfsd/nfsd.8 b/sbin/nfsd/nfsd.8
index f5d0efb..fb44149 100644
--- a/sbin/nfsd/nfsd.8
+++ b/sbin/nfsd/nfsd.8
@@ -41,7 +41,7 @@
.Tn NFS
server
.Sh SYNOPSIS
-.Nm nfsd
+.Nm
.Op Fl arut
.Op Fl n Ar num_servers
.Op Fl h Ar bindip
@@ -51,7 +51,7 @@ runs on a server machine to service
.Tn NFS
requests from client machines.
At least one
-.Nm nfsd
+.Nm
must be running for a machine to operate as a server.
.Pp
Unless otherwise specified, four servers for
@@ -118,7 +118,7 @@ RFC1094 and
.%T "NFS: Network File System Version 3 Protocol Specification" .
.Pp
If
-.Nm nfsd
+.Nm
detects that
.Tn NFS
is not loaded in the running kernel, it will attempt
@@ -131,11 +131,11 @@ by way of
If this fails, or no
.Tn NFS
KLD is available,
-.Nm nfsd
+.Nm
will exit with an error.
.Pp
If
-.Nm nfsd
+.Nm
is to be run on a host with multiple interfaces or interface aliases, use
of the
.Fl h
@@ -148,7 +148,7 @@ would then be used to block nfs-related packets that come in on the outside
interface.
.Pp
The
-.Nm nfsd
+.Nm
utility exits 0 on success, and >0 if an error occurs.
.Sh SEE ALSO
.Xr nfsstat 1 ,
@@ -160,6 +160,6 @@ utility exits 0 on success, and >0 if an error occurs.
.Xr ipfw 8
.Sh HISTORY
The
-.Nm nfsd
+.Nm
utility first appeared in
.Bx 4.4 .
diff --git a/sbin/nfsiod/nfsiod.8 b/sbin/nfsiod/nfsiod.8
index 6ff15bf..50e5a11 100644
--- a/sbin/nfsiod/nfsiod.8
+++ b/sbin/nfsiod/nfsiod.8
@@ -41,7 +41,7 @@
.Tn NFS
asynchronous I/O server
.Sh SYNOPSIS
-.Nm nfsiod
+.Nm
.Op Fl n Ar num_servers
.Sh DESCRIPTION
.Nm Nfsiod
diff --git a/sbin/nologin/nologin.8 b/sbin/nologin/nologin.8
index 74463a2..0c25a1c 100644
--- a/sbin/nologin/nologin.8
+++ b/sbin/nologin/nologin.8
@@ -39,7 +39,7 @@
.Nm nologin
.Nd politely refuse a login
.Sh SYNOPSIS
-.Nm nologin
+.Nm
.Sh DESCRIPTION
.Nm Nologin
displays a message that an account is not available and
diff --git a/sbin/nos-tun/nos-tun.8 b/sbin/nos-tun/nos-tun.8
index f6f74ee..df1d500 100644
--- a/sbin/nos-tun/nos-tun.8
+++ b/sbin/nos-tun/nos-tun.8
@@ -15,7 +15,7 @@
.Nm nos-tun
.Nd implement ``nos'' or ``ka9q'' style IP over IP tunnel
.Sh SYNOPSIS
-.Nm nos-tun
+.Nm
.Fl t
.Ar tunnel
.Fl s
diff --git a/sbin/pc98/fdisk/fdisk.8 b/sbin/pc98/fdisk/fdisk.8
index 0f48fa6..d39ce8c 100644
--- a/sbin/pc98/fdisk/fdisk.8
+++ b/sbin/pc98/fdisk/fdisk.8
@@ -7,14 +7,14 @@
.Nm fdisk
.Nd PC partition table maintenance program
.Sh SYNOPSIS
-.Nm fdisk
+.Nm
.\" !PC98 .Op Fl BIaistu
.Op Fl Bastu
.Op Fl b Ar bootcode
.Op Fl 1234
.Op Ar disk
.Bl -tag -width time
-.Nm fdisk
+.Nm
.Fl f Ar configfile
.Op Fl itv
.Op Ar disk
diff --git a/sbin/ping/ping.8 b/sbin/ping/ping.8
index d0bffd3..02f492d 100644
--- a/sbin/ping/ping.8
+++ b/sbin/ping/ping.8
@@ -41,7 +41,7 @@
.Tn ICMP ECHO_REQUEST
packets to network hosts
.Sh SYNOPSIS
-.Nm ping
+.Nm
.Op Fl QRadfnqrv
.Op Fl c Ar count
.Op Fl i Ar wait
@@ -329,7 +329,7 @@ You can then examine this file for repeated patterns that you can test
using the
.Fl p
option of
-.Nm Ns .
+.Nm .
.Sh TTL DETAILS
The
.Tn TTL
diff --git a/sbin/ping6/ping6.8 b/sbin/ping6/ping6.8
index f2e81f1..f9c25fc 100644
--- a/sbin/ping6/ping6.8
+++ b/sbin/ping6/ping6.8
@@ -38,7 +38,7 @@
.Tn ICMPv6 ECHO_REQUEST
packets to network hosts
.Sh SYNOPSIS
-.Nm ping6
+.Nm
.\" without ipsec, or new ipsec
.Op Fl dfHnNqRvw
.\" old ipsec
@@ -381,7 +381,7 @@ You can then examine this file for repeated patterns that you can test
using the
.Fl p
option of
-.Nm Ns .
+.Nm .
.Sh RETURN VALUES
.Nm
returns 0 on success (the host is alive),
diff --git a/sbin/quotacheck/quotacheck.8 b/sbin/quotacheck/quotacheck.8
index 5a42e5a..cc903d2 100644
--- a/sbin/quotacheck/quotacheck.8
+++ b/sbin/quotacheck/quotacheck.8
@@ -42,13 +42,13 @@
.Nm quotacheck
.Nd filesystem quota consistency checker
.Sh SYNOPSIS
-.Nm quotacheck
+.Nm
.Op Fl g
.Op Fl u
.Op Fl v
.Ar filesystem
.Ar
-.Nm quotacheck
+.Nm
.Op Fl g
.Op Fl u
.Op Fl v
diff --git a/sbin/reboot/reboot.8 b/sbin/reboot/reboot.8
index 9d64763..c593a52 100644
--- a/sbin/reboot/reboot.8
+++ b/sbin/reboot/reboot.8
@@ -44,7 +44,7 @@
.Sh SYNOPSIS
.Nm halt
.Op Fl nqp
-.Nm reboot
+.Nm
.Op Fl dnqp
.Nm fasthalt
.Op Fl nqp
diff --git a/sbin/restore/restore.8 b/sbin/restore/restore.8
index 100323c..5441036 100644
--- a/sbin/restore/restore.8
+++ b/sbin/restore/restore.8
@@ -40,32 +40,32 @@
.Nm rrestore
.Nd "restore files or file systems from backups made with dump"
.Sh SYNOPSIS
-.Nm restore
+.Nm
.Fl i
.Op Fl chkmNuvy
.Op Fl b Ar blocksize
.Op Fl f Ar file
.Op Fl s Ar fileno
-.Nm restore
+.Nm
.Fl R
.Op Fl ckNuvy
.Op Fl b Ar blocksize
.Op Fl f Ar file
.Op Fl s Ar fileno
-.Nm restore
+.Nm
.Fl r
.Op Fl ckNuvy
.Op Fl b Ar blocksize
.Op Fl f Ar file
.Op Fl s Ar fileno
-.Nm restore
+.Nm
.Fl t
.Op Fl chkNuvy
.Op Fl b Ar blocksize
.Op Fl f Ar file
.Op Fl s Ar fileno
.Op file ...
-.Nm restore
+.Nm
.Fl x
.Op Fl chkmNuvy
.Op Fl b Ar blocksize
@@ -73,14 +73,14 @@
.Op Fl s Ar fileno
.Op file ...
.Pp
-.in -\\n(iSu
+.in -\n(iSu
(The
.Bx 4.3
option syntax is implemented for backward compatibility, but
is not documented here.)
.Sh DESCRIPTION
The
-.Nm restore
+.Nm
command performs the inverse function of
.Xr dump 8 .
A full backup of a file system may be restored and
@@ -106,7 +106,7 @@ Exactly one of the following flags is required:
.It Fl i
This mode allows interactive restoration of files from a dump.
After reading in the directory information from the dump,
-.Nm restore
+.Nm
provides a shell like interface that allows the user to move
around the directory tree selecting files to be extracted.
The available commands are given below;
@@ -170,7 +170,7 @@ When set, the verbose flag causes the
.Ic ls
command to list the inode numbers of all entries.
It also causes
-.Nm restore
+.Nm
to print out information about each file as it is extracted.
.El
.It Fl R
@@ -208,7 +208,7 @@ restore rf /dev/rsa0
.Ed
.Pp
Note that
-.Nm restore
+.Nm
leaves a file
.Pa restoresymtable
in the root directory to pass information between incremental
@@ -264,11 +264,11 @@ The number of kilobytes per dump record.
If the
.Fl b
option is not specified,
-.Nm restore
+.Nm
tries to determine the media block size dynamically.
.It Fl c
Normally,
-.Nm restore
+.Nm
will try to determine dynamically whether the dump was made from an
old (pre-4.4) or new format file system. The
.Fl c
@@ -292,14 +292,14 @@ If the name of the file is of the form
.Dq host:file ,
or
.Dq user@host:file ,
-.Nm restore
+.Nm
reads from the named file on the remote host using
.Xr rmt 8 .
.Pp
.It Fl k
Use Kerberos authentication when contacting the remote tape server.
(Only available if this options was enabled when
-.Nm restore
+.Nm
was compiled.)
.Pp
.It Fl h
@@ -331,7 +331,7 @@ To prevent this, the
to create new ones.
.It Fl v
Normally
-.Nm restore
+.Nm
does its work silently.
The
.Fl v
@@ -348,24 +348,24 @@ If
.Fl y
has been specified, or the user responds
.Ql y ,
-.Nm restore
+.Nm
will attempt to continue the restore.
.Pp
If a backup was made using more than one tape volume,
-.Nm restore
+.Nm
will notify the user when it is time to mount the next volume.
If the
.Fl x
or
.Fl i
flag has been specified,
-.Nm restore
+.Nm
will also ask which volume the user wishes to mount.
The fastest way to extract a few files is to
start with the last volume, and work towards the first volume.
.Pp
There are numerous consistency checks that can be listed by
-.Nm restore .
+.Nm .
Most checks are self-explanatory or can ``never happen''.
Common errors are given below.
.Pp
@@ -407,7 +407,7 @@ though files may not be found on the tape.
.Pp
.It resync restore, skipped <num> blocks
After a dump read error,
-.Nm restore
+.Nm
may have to resynchronize itself.
This message lists the number of blocks that were skipped over.
.El
@@ -467,6 +467,6 @@ have two different dumps started at the same time, and separate
operations shouldn't conflict with each other.
.Sh HISTORY
The
-.Nm restore
+.Nm
command appeared in
.Bx 4.2 .
diff --git a/sbin/route/route.8 b/sbin/route/route.8
index f475f07..e35356f 100644
--- a/sbin/route/route.8
+++ b/sbin/route/route.8
@@ -39,7 +39,7 @@
.Nm route
.Nd manually manipulate the routing tables
.Sh SYNOPSIS
-.Nm route
+.Nm
.Op Fl dnqtv
.Ar command
.Oo
@@ -99,14 +99,16 @@ routing lookup misses, or suspected network partitionings.
The monitor command has the syntax:
.Pp
.Bd -filled -offset indent -compact
-.Nm route Op Fl n
+.Nm
+.Op Fl n
.Cm monitor
.Ed
.Pp
The flush command has the syntax:
.Pp
.Bd -filled -offset indent -compact
-.Nm route Op Fl n
+.Nm
+.Op Fl n
.Cm flush
.Op Ar family
.Ed
@@ -129,7 +131,8 @@ delineated family will be deleted.
The other commands have the following syntax:
.Pp
.Bd -filled -offset indent -compact
-.Nm route Op Fl n
+.Nm
+.Op Fl n
.Ar command
.Op Fl net No \&| Fl host
.Ar destination gateway
diff --git a/sbin/routed/routed.8 b/sbin/routed/routed.8
index e00a9ca..ed21687 100644
--- a/sbin/routed/routed.8
+++ b/sbin/routed/routed.8
@@ -43,7 +43,7 @@
.Nm rdisc
.Nd network RIP and router discovery routing daemon
.Sh SYNOPSIS
-.Nm routed
+.Nm
.Op Fl sqdghmpAtv
.Op Fl T Ar tracefile
.Oo
@@ -167,7 +167,7 @@ of ICMP Redirect messages are deleted after a while to minimize
.Em black-holes .
When a TCP connection suffers a timeout,
the kernel tells
-.Nm Ns ,
+.Nm ,
which deletes all redirected routes
through the gateway involved, advances the age of all RIP routes through
the gateway to allow an alternate to be chosen, and advances of the
@@ -422,7 +422,7 @@ that another routing process
will install such a route if necessary,
and that other routes to that destination should not be installed
by
-.Nm Ns .
+.Nm .
Such entries are only required when both routers may learn of routes
to the same destination.
.Pp
@@ -469,7 +469,7 @@ or
or
.Xr named 8 ,
must have been started before
-.Nm Ns .)
+.Nm . )
.Pp
.Ar Mask
is an optional number between 1 and 32 indicating the netmask associated
diff --git a/sbin/routed/rtquery/rtquery.8 b/sbin/routed/rtquery/rtquery.8
index 02926e2..c0e1f06 100644
--- a/sbin/routed/rtquery/rtquery.8
+++ b/sbin/routed/rtquery/rtquery.8
@@ -8,13 +8,13 @@
.Nm rtquery
.Nd query routing daemons for their routing tables
.Sh SYNOPSIS
-.Nm rtquery
+.Nm
.Op Fl np1
.Op Fl w Ar timeout
.Op Fl r Ar addr
.Op Fl a Ar secret
.Ar host ...
-.Nm rtquery
+.Nm
.Op Fl t Ar op
.Ar host ...
.Sh DESCRIPTION
diff --git a/sbin/savecore/savecore.8 b/sbin/savecore/savecore.8
index 37e1f71..78429a2 100644
--- a/sbin/savecore/savecore.8
+++ b/sbin/savecore/savecore.8
@@ -39,9 +39,9 @@
.Nm savecore
.Nd "save a core dump of the operating system"
.Sh SYNOPSIS
-.Nm savecore
+.Nm
.Fl c
-.Nm savecore
+.Nm
.Op Fl fvz
.Op Fl N Ar system
.Ar directory
diff --git a/sbin/shutdown/shutdown.8 b/sbin/shutdown/shutdown.8
index bf2276b..d8c987d 100644
--- a/sbin/shutdown/shutdown.8
+++ b/sbin/shutdown/shutdown.8
@@ -39,7 +39,7 @@
.Nm shutdown
.Nd "close down the system at a given time"
.Sh SYNOPSIS
-.Nm shutdown
+.Nm
.Op Fl
.Oo
.Fl h | Fl p |
diff --git a/sbin/slattach/slattach.8 b/sbin/slattach/slattach.8
index 6bdb275..cb45860 100644
--- a/sbin/slattach/slattach.8
+++ b/sbin/slattach/slattach.8
@@ -40,7 +40,7 @@
.Nm slattach
.Nd attach serial lines as network interfaces
.Sh SYNOPSIS
-.Nm slattach
+.Nm
.Op Fl a
.Op Fl c
.Op Fl e Ar exit-command
@@ -124,12 +124,12 @@ using more than one slip line.
When
.Nm
is connected for the first time,
-.Ql Nm "sh -c" Ar unit-command Nm \-1 Ar new
+.Ql Nm "sh -c" Ar unit-command \-1 new
is run.
When
.Nm
is disconnected,
-.Ql Nm "sh -c" Ar unit-command old Nm \-1
+.Ql Nm "sh -c" Ar unit-command old \-1
is run.
.Nm Slattach
will abort if the unit number
@@ -233,7 +233,7 @@ slattach \-r 'kermit -y dial.script >kermit.log 2>&1'
.Sh DIAGNOSTICS
Look for error messages in
.Pa /var/log/messages
-.Pf ( Nm slattach
+.No ( Nm
is a daemon).
Messages indicating the specified interface does not exit, the
requested address is unknown, the user is not privileged and tried to
diff --git a/sbin/spppcontrol/spppcontrol.8 b/sbin/spppcontrol/spppcontrol.8
index a679d7a..d531de9 100644
--- a/sbin/spppcontrol/spppcontrol.8
+++ b/sbin/spppcontrol/spppcontrol.8
@@ -31,7 +31,7 @@
.Nm spppcontrol
.Nd display or set parameters for an sppp interface
.Sh SYNOPSIS
-.Nm spppcontrol
+.Nm
.Op Fl v
.Ar ifname
.Op Ar parameter Ns Op \&= Ns Ar value
diff --git a/sbin/startslip/startslip.1 b/sbin/startslip/startslip.1
index 285816b..7f2632a 100644
--- a/sbin/startslip/startslip.1
+++ b/sbin/startslip/startslip.1
@@ -39,7 +39,7 @@
.Nm startslip
.Nd dial up and login to a slip server
.Sh SYNOPSIS
-.Nm startslip
+.Nm
.Op Fl d
.Op Fl b Ar speed
[
@@ -79,14 +79,14 @@ and goes to wait mode.
If carrier drops (modem control enabled) or a
.Dv SIGHUP
is sent to
-.Nm Ns ,
+.Nm ,
it closes the device, calls
.Ar downscript
and attempts to repeat the dialup and login sequence.
If a
.Dv SIGTERM
is send to
-.Nm Ns ,
+.Nm ,
it closes the device, calls
.Ar downscript
and exits.
diff --git a/sbin/swapon/swapon.8 b/sbin/swapon/swapon.8
index 8779299..6e22dce 100644
--- a/sbin/swapon/swapon.8
+++ b/sbin/swapon/swapon.8
@@ -39,9 +39,9 @@
.Nm swapon
.Nd "specify additional device for paging and swapping"
.Sh SYNOPSIS
-.Nm swapon
+.Nm
.Fl a
-.Nm swapon
+.Nm
.Ar special_file ...
.Sh DESCRIPTION
.Nm Swapon
diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8
index 92f39b2..7c366a3 100644
--- a/sbin/sysctl/sysctl.8
+++ b/sbin/sysctl/sysctl.8
@@ -39,14 +39,14 @@
.Nm sysctl
.Nd get or set kernel state
.Sh SYNOPSIS
-.Nm sysctl
+.Nm
.Op Fl bn
.Ar name ...
-.Nm sysctl
+.Nm
.Op Fl bn
.Fl w
.Ar name=value ...
-.Nm sysctl
+.Nm
.Op Fl bn
.Fl aAX
.Sh DESCRIPTION
diff --git a/sbin/tunefs/tunefs.8 b/sbin/tunefs/tunefs.8
index ae86c7b..c2a0501 100644
--- a/sbin/tunefs/tunefs.8
+++ b/sbin/tunefs/tunefs.8
@@ -39,7 +39,7 @@
.Nm tunefs
.Nd tune up an existing file system
.Sh SYNOPSIS
-.Nm tunefs
+.Nm
.Op Fl A
.Op Fl a Ar maxcontig
.Op Fl d Ar rotdelay
diff --git a/sbin/umount/umount.8 b/sbin/umount/umount.8
index d8222da..2b11394 100644
--- a/sbin/umount/umount.8
+++ b/sbin/umount/umount.8
@@ -39,10 +39,10 @@
.Nm umount
.Nd unmount filesystems
.Sh SYNOPSIS
-.Nm umount
+.Nm
.Op Fl fv
.Ar special \&| node
-.Nm umount
+.Nm
.Fl a | A
.Op Fl fv
.Op Fl h Ar host
diff --git a/sbin/vinum/vinum.8 b/sbin/vinum/vinum.8
index c74cc5d..0900d7e 100644
--- a/sbin/vinum/vinum.8
+++ b/sbin/vinum/vinum.8
@@ -315,7 +315,7 @@ is a utility program to communicate with the \fBVinum\fP\| logical volume
manager. See
.Xr vinum 4
for more information about the volume manager.
-.Xr vinum 8
+.Nm
is designed either for interactive use, when started without command line
arguments, or to execute a single command if the command is supplied on the
command line. In interactive mode,
@@ -905,7 +905,7 @@ This command is deprecated.
.Ar list
is used to show information about the specified object. If the argument is
omitted, information is shown about all objects known to
-.Nm vinum .
+.Nm .
The
.Ar l
command is a synonym for
@@ -1355,7 +1355,7 @@ If no parameters are specified,
removes the
.Nm
kld and stops
-.Xr vinum 8 .
+.Nm .
This can only be done if no objects are active. In particular, the
.Fl f
option does not override this requirement. Normally, the
@@ -1633,7 +1633,7 @@ must be the name of a disk partition, for example
or
.Pa /dev/wd3s2h ,
and it must be of type
-.Nm vinum .
+.Nm .
Do not use the
.Nm c
partition, which is reserved for the complete disk.
@@ -1916,7 +1916,7 @@ the maximum size of a subdisk is 265 sectors smaller than the drive.
maintains a log file, by default
.Pa /var/tmp/vinum_history ,
in which it keeps track of the commands issued to
-.Nm vinum .
+.Nm .
You can override the name of this file by setting the environment variable
.Ev VINUM_HISTORY
to the name of the file.
@@ -1935,7 +1935,7 @@ system.
.Ss Where to put the data
The first choice you need to make is where to put the data. You need dedicated
disk partitions for
-.Nm vinum .
+.Nm .
They should be partitions, not devices, and they should not be partition
.Nm c .
For example, good names are
@@ -2313,7 +2313,7 @@ command.
A number of misconceptions exist about how to set up a RAID array for best
performance. In particular, most systems use far too small a stripe size. The
following discussion applies to all RAID systems, not just to
-.Nm vinum .
+.Nm .
.Pp
The FreeBSD block I/O system issues requests of between .5kB and 128 kB; a
typical mix is somewhere round 8 kB. You can't stop any striping system from
@@ -2523,7 +2523,8 @@ you can easily overwrite a file system.
will not permit this.
.Pp
For similar reasons, the
-.Nm vinum Ar start
+.Nm
+.Ar start
command will not accept a drive on partition
.Ar c .
Partition
@@ -2562,7 +2563,8 @@ provides two ways to ensure that newly created plexes are
.Bl -bullet
.It
Create the plexes and then synchronize them with
-.Nm vinum start .
+.Nm
+.Ar start .
.It
Create the volume (not the plex) with the keyword
.Ar setupstate ,
@@ -2601,7 +2603,7 @@ please report the situation.
If you build the kernel module with the
.Ar -DVINUMDEBUG
option, you must also build
-.Nm vinum(8)
+.Nm
with the
.Ar -DVINUMDEBUG
option, since the size of some data objects used by both components depends on
@@ -2616,12 +2618,15 @@ vinumioctl: invalid ioctl from process 247 (vinum): c0e44642
This error may also occur if you use old versions of kld or userland program.
.It
The
-.Nm vinum Ar read
+.Nm
+.Ar read
command has a particularly emetic syntax. Once it was the only way to start
-.Nm vinum ,
+.Nm ,
but now the preferred method is with
-.Nm vinum Ar start .
-.Nm vinum Ar read
+.Nm
+.Ar start .
+.Nm
+.Ar read
should be used for maintenance purposes only. Note that its syntax has changed,
and the arguments must be disk slices, such as
.Pa /dev/da0 ,
@@ -2637,7 +2642,7 @@ objects.
.br
.Ar /dev/vinum/control
- control device for
-.Nm vinum
+.Nm
.br
.Ar /dev/vinum/plex
- directory containing device nodes for
diff --git a/share/examples/mdoc/example.1 b/share/examples/mdoc/example.1
index 53ba9cf..6959b0d 100644
--- a/share/examples/mdoc/example.1
+++ b/share/examples/mdoc/example.1
@@ -39,7 +39,7 @@
.Nm example
.Nd example command manual page
.Sh SYNOPSIS
-.Nm example
+.Nm
.Op Fl abc
.Op Fl d Ar argument
.Ar file
diff --git a/share/examples/mdoc/example.4 b/share/examples/mdoc/example.4
index 45be914..eb27bd6 100644
--- a/share/examples/mdoc/example.4
+++ b/share/examples/mdoc/example.4
@@ -43,7 +43,7 @@
.Sh DESCRIPTION
This is an example device driver manual page for
the
-.Nm example
+.Nm
driver. It is intended
that this example can be used as a template when writing
a new manual page.
diff --git a/usr.sbin/mount_nwfs/mount_nwfs.8 b/usr.sbin/mount_nwfs/mount_nwfs.8
index b56d26c..2e92a68 100644
--- a/usr.sbin/mount_nwfs/mount_nwfs.8
+++ b/usr.sbin/mount_nwfs/mount_nwfs.8
@@ -6,7 +6,7 @@
.Nm mount_nwfs
.Nd mount NetWare volume from a NetWare file server
.Sh SYNOPSIS
-.Nm mount_nwfs
+.Nm
.Op Fl Chv
.Fl S Ar server
.Fl U Ar user
@@ -22,7 +22,7 @@
.Op Fl u Ar uid
.Op Fl w Ar scheme
.Ar node
-.Nm mount_nwfs
+.Nm
.Op Fl options
.Ar /server:user/volume[/path]
.Ar node
diff --git a/usr.sbin/mount_portalfs/mount_portalfs.8 b/usr.sbin/mount_portalfs/mount_portalfs.8
index 306a220..f84fa48 100644
--- a/usr.sbin/mount_portalfs/mount_portalfs.8
+++ b/usr.sbin/mount_portalfs/mount_portalfs.8
@@ -44,7 +44,7 @@
.Nm mount_portal
.Nd mount the portal daemon
.Sh SYNOPSIS
-.Nm mount_portal
+.Nm
.Op Fl o Ar options
.Ar /etc/portal.conf
.Ar mount_point
diff --git a/usr.sbin/mountd/exports.5 b/usr.sbin/mountd/exports.5
index b5fff27..e2d332c 100644
--- a/usr.sbin/mountd/exports.5
+++ b/usr.sbin/mountd/exports.5
@@ -41,7 +41,7 @@
.Tn NFS
mount requests
.Sh SYNOPSIS
-.Nm exports
+.Nm
.Sh DESCRIPTION
The
.Nm
@@ -285,7 +285,7 @@ The
utility can be made to re-read the
.Nm
file by sending it a hangup signal as follows:
-.Bd -literal -offset indet
+.Bd -literal -offset indent
kill -s HUP `cat /var/run/mountd.pid`
.Ed
.Pp
diff --git a/usr.sbin/mountd/mountd.8 b/usr.sbin/mountd/mountd.8
index fdb62a1..509fbb7 100644
--- a/usr.sbin/mountd/mountd.8
+++ b/usr.sbin/mountd/mountd.8
@@ -41,7 +41,7 @@
.Tn NFS
mount requests
.Sh SYNOPSIS
-.Nm mountd
+.Nm
.Op Fl 2dlnr
.Op Ar exportsfile
.Sh DESCRIPTION
diff --git a/usr.sbin/mountd/netgroup.5 b/usr.sbin/mountd/netgroup.5
index fb1a8bc..919f1fe 100644
--- a/usr.sbin/mountd/netgroup.5
+++ b/usr.sbin/mountd/netgroup.5
@@ -39,7 +39,7 @@
.Nm netgroup
.Nd defines network groups
.Sh SYNOPSIS
-.Nm netgroup
+.Nm
.Sh DESCRIPTION
The
.Nm
diff --git a/usr.sbin/nfsd/nfsd.8 b/usr.sbin/nfsd/nfsd.8
index f5d0efb..fb44149 100644
--- a/usr.sbin/nfsd/nfsd.8
+++ b/usr.sbin/nfsd/nfsd.8
@@ -41,7 +41,7 @@
.Tn NFS
server
.Sh SYNOPSIS
-.Nm nfsd
+.Nm
.Op Fl arut
.Op Fl n Ar num_servers
.Op Fl h Ar bindip
@@ -51,7 +51,7 @@ runs on a server machine to service
.Tn NFS
requests from client machines.
At least one
-.Nm nfsd
+.Nm
must be running for a machine to operate as a server.
.Pp
Unless otherwise specified, four servers for
@@ -118,7 +118,7 @@ RFC1094 and
.%T "NFS: Network File System Version 3 Protocol Specification" .
.Pp
If
-.Nm nfsd
+.Nm
detects that
.Tn NFS
is not loaded in the running kernel, it will attempt
@@ -131,11 +131,11 @@ by way of
If this fails, or no
.Tn NFS
KLD is available,
-.Nm nfsd
+.Nm
will exit with an error.
.Pp
If
-.Nm nfsd
+.Nm
is to be run on a host with multiple interfaces or interface aliases, use
of the
.Fl h
@@ -148,7 +148,7 @@ would then be used to block nfs-related packets that come in on the outside
interface.
.Pp
The
-.Nm nfsd
+.Nm
utility exits 0 on success, and >0 if an error occurs.
.Sh SEE ALSO
.Xr nfsstat 1 ,
@@ -160,6 +160,6 @@ utility exits 0 on success, and >0 if an error occurs.
.Xr ipfw 8
.Sh HISTORY
The
-.Nm nfsd
+.Nm
utility first appeared in
.Bx 4.4 .
diff --git a/usr.sbin/nologin/nologin.8 b/usr.sbin/nologin/nologin.8
index 74463a2..0c25a1c 100644
--- a/usr.sbin/nologin/nologin.8
+++ b/usr.sbin/nologin/nologin.8
@@ -39,7 +39,7 @@
.Nm nologin
.Nd politely refuse a login
.Sh SYNOPSIS
-.Nm nologin
+.Nm
.Sh DESCRIPTION
.Nm Nologin
displays a message that an account is not available and
OpenPOWER on IntegriCloud