mdoc(7) police: use the new features of the Nm macro.

123 files changed, 334 insertions, 326 deletions

diff --git a/share/man/man1/builtin.1 b/share/man/man1/builtin.1
index beef55a..06c8a99 100644
--- a/share/man/man1/builtin.1
+++ b/share/man/man1/builtin.1
@@ -126,7 +126,7 @@
 .Nm while
 .Nd shell builtin commands
 .Sh SYNOPSIS
-.Nm builtin
+.Nm
 .Op Fl options
 .Op Ar args ...
 .Sh DESCRIPTION
diff --git a/share/man/man3/assert.3 b/share/man/man3/assert.3
index eaf1f55..02f58cb 100644
--- a/share/man/man3/assert.3
+++ b/share/man/man3/assert.3
@@ -86,6 +86,6 @@ is false:
 .Xr abort 3
 .Sh HISTORY
 An
-.Nm assert
+.Nm
 macro appeared in
 .At v6 .
diff --git a/share/man/man3/end.3 b/share/man/man3/end.3
index 61bb112..00a4062 100644
--- a/share/man/man3/end.3
+++ b/share/man/man3/end.3
@@ -72,7 +72,7 @@ data segment.
 .Xr a.out 5
 .Sh HISTORY
 An
-.Nm end
+.Nm
 manual page appeared in
 .At v6 .
 .Sh BUGS
diff --git a/share/man/man3/intro.3 b/share/man/man3/intro.3
index 8c716b3..bc6e461 100644
--- a/share/man/man3/intro.3
+++ b/share/man/man3/intro.3
@@ -164,6 +164,6 @@ the math library compiled for profiling
 .\" .El
 .Sh HISTORY
 An
-.Nm intro
+.Nm
 manual appeared in
 .At v7 .
diff --git a/share/man/man3/stdarg.3 b/share/man/man3/stdarg.3
index 3bc512a..07a724d 100644
--- a/share/man/man3/stdarg.3
+++ b/share/man/man3/stdarg.3
@@ -191,13 +191,13 @@ file
 Unlike the
 .Em varargs
 macros, the
-.Nm stdarg
+.Nm
 macros do not permit programmers to
 code a function with no fixed arguments.
 This problem generates work mainly when converting
 .Em varargs
 code to
-.Nm stdarg
+.Nm
 code,
 but it also creates difficulties for variadic functions that
 wish to pass all of their arguments on to a function
diff --git a/share/man/man3/sysexits.3 b/share/man/man3/sysexits.3
index e2a5a83..424945b 100644
--- a/share/man/man3/sysexits.3
+++ b/share/man/man3/sysexits.3
@@ -41,7 +41,7 @@ it is not a good practice to call
 .Xr exit 3
 with arbitrary values to indicate a failure condition when ending
 a program.  Instead, the pre-defined exit codes from
-.Nm sysexits
+.Nm
 should be used, so the caller of the process can get a rough
 estimation about the failure class without looking up the source code.
 .Pp
@@ -120,7 +120,7 @@ parenthesis for easy reference.
 .Xr style 9
 .Sh HISTORY
 The
-.Nm sysexits
+.Nm
 file appeared somewhere after
 .Bx 4.3 .
 .Sh AUTHORS
diff --git a/share/man/man4/adv.4 b/share/man/man4/adv.4
index 63b55ba..b8fe8fc 100644
--- a/share/man/man4/adv.4
+++ b/share/man/man4/adv.4
@@ -161,7 +161,7 @@ resource allocation among devices.
 .Xr scsi 4
 .Sh AUTHORS
 The
-.Nm adv
+.Nm
 driver was ported by
 .An Justin T. Gibbs
 from the Linux driver
diff --git a/share/man/man4/bktr.4 b/share/man/man4/bktr.4
index 37c8030..918e6db 100644
--- a/share/man/man4/bktr.4
+++ b/share/man/man4/bktr.4
@@ -8,11 +8,11 @@
 .Nm brooktree
 .Nd video capture driver
 .Sh SYNOPSIS
-.Nm device bktr
+.Cd device bktr
 .Pp
-.Nm device iicbus
-.Nm device iicbb
-.Nm device smbus
+.Cd device iicbus
+.Cd device iicbb
+.Cd device smbus
 .Sh DESCRIPTION
 The
 .Nm bktr
diff --git a/share/man/man4/bpf.4 b/share/man/man4/bpf.4
index ff57584..805770b 100644
--- a/share/man/man4/bpf.4
+++ b/share/man/man4/bpf.4
@@ -60,7 +60,7 @@ will be set to
 .Er EBUSY .
 .Pp
 Associated with each open instance of a
-.Nm bpf
+.Nm
 file is a user-settable packet filter.
 Whenever a packet is received by an interface,
 all file descriptors listening on that interface apply their filter.
@@ -70,7 +70,7 @@ Reads from these files return the next group of packets
 that have matched the filter. 
 To improve performance, the buffer passed to read must be
 the same size as the buffers used internally by
-.Nm bpf .
+.Nm .
 This size is returned by the
 .Dv BIOCGBLEN
 ioctl (see below), and 
@@ -85,14 +85,14 @@ headers.  Currently, only Ethernet,
 and
 .Tn PPP
 drivers have been modified to interact with
-.Nm bpf .
+.Nm .
 .Pp
 Since packet data is in network byte order, applications should use the
 .Xr byteorder 3
 macros to extract multi-byte values.
 .Pp
 A packet can be sent out on the network by writing to a
-.Nm bpf
+.Nm
 file descriptor.  The writes are unbuffered, meaning only one
 packet can be processed per write.
 Currently, only writes to Ethernets and
diff --git a/share/man/man4/ccd.4 b/share/man/man4/ccd.4
index 0962fa0..17c6651 100644
--- a/share/man/man4/ccd.4
+++ b/share/man/man4/ccd.4
@@ -69,9 +69,9 @@ pseudo-device	ccd	4	# concatenated disk devices
 .Ed
 .Pp
 The count argument is how many
-.Nm ccds
+.Nm Ns 's
 memory is allocated for a boot time.  In this example, no more than 4
-.Nm ccds
+.Nm Ns s
 may be configured.  As of the
 .Fx 3.0
 release, you do not need to
@@ -81,19 +81,19 @@ module.  Simply running
 will load the module into the kernel.
 .Pp
 A
-.Nm ccd
+.Nm
 may be either serially concatenated or interleaved.  To serially
 concatenate the partitions, specify the interleave factor of 0.
 Note that mirroring may not be used with an interleave factor of 0.
 .Pp
 There is a run-time utility that is used for configuring
-.Nm ccds .
+.Nm Ns s .
 See
 .Xr ccdconfig 8
 for more information.
 .Ss The Interleave Factor
 If a
-.Nm ccd
+.Nm
 is interleaved correctly, a
 .Dq striping
 effect is achieved, which can increase sequential read/write
@@ -124,13 +124,13 @@ disk types.
 For random-access oriented workloads, such as news servers, a larger
 interleave factor (e.g., 65,536) is more desirable.  Note that there
 isn't much
-.Nm ccd
+.Nm
 can do to speed up applications that are seek-time limited.  Larger
 interleave factors will at least reduce the chance of having to seek
 two disk-heads to read one directory or a file.
 .Ss Disk Mirroring
 You can configure the
-.Nm ccd
+.Nm
 to
 .Dq mirror
 any even number of disks.  See
@@ -142,7 +142,7 @@ the mirror.  A read will be run to either side of the mirror depending
 on what the driver believes to be most optimal.  If the read fails,
 the driver will automatically attempt to read the same sector from the
 other side of the mirror.  Currently
-.Nm ccd
+.Nm
 uses a duel seek zone model to optimize reads for a multi-tasking load
 rather then a sequential load.
 .Pp
@@ -152,20 +152,20 @@ failure, you can use
 to recover the failed disk.
 .Pp
 Note that a one-disk
-.Nm ccd
+.Nm
 is not the same as the original partition.  In particular, this means
 if you have a filesystem on a two-disk mirrored
-.Nm ccd
+.Nm
 and one of the disks fail, you cannot mount and use the remaining
 partition as itself; you have to configure it as a one-disk
-.Nm ccd.
+.Nm .
 You cannot replace a disk in a mirrored
-.Nm ccd
+.Nm
 partition without first backing up the partition, then replacing the disk,
 then restoring the partition.
 .Sh WARNINGS
 If just one (or more) of the disks in a
-.Nm ccd
+.Nm
 fails, the entire
 file system will be lost unless you are mirroring the disks.
 .Pp
@@ -177,7 +177,7 @@ write error occurs, you should recover and regenerate the data as soon
 as possible.
 .Pp
 Changing the interleave or other parameters for a 
-.Nm ccd
+.Nm
 disk usually destroys whatever data previously existed on that disk.
 .Sh FILES
 /dev/{,r}ccd* - ccd device special files.
diff --git a/share/man/man4/cd.4 b/share/man/man4/cd.4
index 2c6dd44..e3cdd58 100644
--- a/share/man/man4/cd.4
+++ b/share/man/man4/cd.4
@@ -38,7 +38,7 @@
 .Cd options	"CHANGER_MAX_BUSY_SECONDS=11"
 .Sh DESCRIPTION
 The
-.Nm cd
+.Nm
 driver provides support for a 
 .Tn SCSI
 .Tn CD-ROM
@@ -388,7 +388,7 @@ player mechanism.  Each CD in the drive shows up as a seperate logical unit
 on the
 .Tn SCSI
 bus.  The
-.Nm cd
+.Nm
 driver automatically recognizes LUN-based changers, and routes commands for
 changers through an internal scheduler.  The scheduler prevents changer
 "thrashing", which is caused by sending commands to different LUNs in the
@@ -465,15 +465,15 @@ timeouts for different CD devices in the kernel config file would likely
 require modification of
 .Xr config 8
 to support the two timeouts when hardwiring
-.Nm cd
+.Nm
 devices.
 .Sh HISTORY
 This
-.Nm cd
+.Nm
 driver is based upon the
-.Nm cd
+.Nm
 driver written by Julian Elischer, which appeared in 386BSD 0.1.  The
 CAM version of the
-.Nm cd
+.Nm
 driver was written by Kenneth Merry and first appeared in
 .Fx 3.0 .
diff --git a/share/man/man4/cy.4 b/share/man/man4/cy.4
index ac072b4..5d5229d 100644
--- a/share/man/man4/cy.4
+++ b/share/man/man4/cy.4
@@ -59,7 +59,7 @@ Minor numbering:
 .Ed
 .Sh DESCRIPTION
 The
-.Nm cy
+.Nm
 driver provides support for Cirrus Logic CD1400-based
 .Tn EIA
 .Tn RS-232C
@@ -86,7 +86,7 @@ but when 4 lines are active in both directions its limit is about
 .\" It was copied from sio.4.  The only change was s/sio/cy/g.
 .Pp
 Serial ports controlled by the
-.Nm cy
+.Nm
 driver can be used for both `callin' and `callout'.
 For each port there is a callin device and a callout device.
 The minor number of the callout device is 128 higher
@@ -104,7 +104,7 @@ to work on general ports and need to open the port without waiting
 but are too stupid to do so.
 .Pp
 The
-.Nm cy
+.Nm
 driver also supports an initial-state and a lock-state control
 device for each of the callin and the callout "data" devices.
 The minor number of the initial-state device is 32 higher
diff --git a/share/man/man4/da.4 b/share/man/man4/da.4
index c989a3c..7ad4ddb 100644
--- a/share/man/man4/da.4
+++ b/share/man/man4/da.4
@@ -36,7 +36,7 @@
 .Cd device da1 at scbus0 target 4 unit 0
 .Sh DESCRIPTION
 The
-.Nm da
+.Nm
 driver provides support for all
 .Tn SCSI
 devices of the direct access class that are attached to the system
@@ -111,7 +111,7 @@ devices age write transactions to limit vulnerability to a few transactions
 recently reported as complete, but it is none-the-less recommended that
 systems with write cache enabled devices reside on an Uninterruptible
 Power Supply (UPS).  The
-.Nm da
+.Nm
 device driver ensures that the cache and media are synchronized upon
 final close of the device or an unexpected shutdown (panic) event.  This
 ensures that it is safe to disconnect power once the operating system
@@ -121,7 +121,7 @@ setting the
 (Write Cache Enable) bit in the caching control mode page.
 .Sh TAGGED QUEUING
 The
-.Nm da
+.Nm
 device driver will take full advantage of the SCSI feature known as tagged
 queuing.  Tagged queuing allows the device to process multiple transactions
 concurrently, often re-ordering them to reduce the number and length of
@@ -143,7 +143,7 @@ via the
 utility.
 .Sh KERNEL CONFIGURATION
 It is only necessary to explicitly configure one
-.Nm da
+.Nm
 device; data structures are dynamically allocated as disks are found
 on the
 .Tn SCSI
diff --git a/share/man/man4/dummynet.4 b/share/man/man4/dummynet.4
index 0d94b02..419a49d 100644
--- a/share/man/man4/dummynet.4
+++ b/share/man/man4/dummynet.4
@@ -23,10 +23,10 @@ In its current implementation,
 packet selection is done with the
 .Nm ipfw
 program, by means of
-.Nm ``pipe''
+.Dq pipe
 rules.
 A dummynet
-.Nm pipe
+.Em pipe
 is characterized by a bandwidth, delay, queue size, and loss
 rate, which can be configured with the
 .Nm ipfw
@@ -97,7 +97,7 @@ destination, or passed again through the
 .Nm ipfw
 rules, starting from the one after the matching rule.
 .Pp
-.Nm dummynet
+.Nm
 performs its task once per timer tick.
 The granularity of operation is
 thus controlled by the kernel option
@@ -118,7 +118,7 @@ operation.
 .Sh KERNEL OPTIONS
 The following options in the kernel configuration file are related
 to
-.Nm dummynet
+.Nm
 operation:
 .Bd -literal
   IPFIREWALL               - enable ipfirewall (required for dummynet).
diff --git a/share/man/man4/ed.4 b/share/man/man4/ed.4
index 133eac1..896f415 100644
--- a/share/man/man4/ed.4
+++ b/share/man/man4/ed.4
@@ -40,7 +40,7 @@
 .Cd "device ed"
 .Sh DESCRIPTION
 The
-.Nm ed
+.Nm
 driver provides support for 8 and 16bit ethernet cards that are based on
 the National Semiconductor DS8390 and similar NICs manufactured by other companies.
 .Pp
@@ -108,7 +108,7 @@ The irq number that was specified in the kernel config file (and then compiled
 into the kernel) differs from the irq that has been set on the interface card.
 .It "ed%d: failed to clear shared memory at %x - check configuration."
 When the card was probed at system boot time, the
-.Nm ed
+.Nm
 driver found that it could not clear the card's shared memory.
 This is most commonly
 caused by a BIOS extension ROM being configured in the same address space as the
@@ -174,7 +174,7 @@ In addition, you should also specify
 to take advantage of the extra 8k of shared memory that 16bit mode provides.
 .Sh BUGS
 The
-.Nm ed
+.Nm
 driver is a bit too aggressive about resetting the card whenever any bad
 packets are received.
 As a result, it may throw out some good packets which
@@ -186,7 +186,7 @@ have been received but not yet transfered from the card to main memory.
 .Xr ifconfig 8
 .Sh HISTORY
 The
-.Nm ed
+.Nm
 device driver first appeared in
 .Fx 1.0 .
 .Sh AUTHORS
diff --git a/share/man/man4/fpa.4 b/share/man/man4/fpa.4
index 6b434e7..aede167 100644
--- a/share/man/man4/fpa.4
+++ b/share/man/man4/fpa.4
@@ -20,7 +20,7 @@ only:
 .Cd "pseudo-device fddi"
 .Sh DESCRIPTION
 The
-.Nm fpa
+.Nm
 and
 .Nm fea
 device driver provides support for the DEC DEFPA PCI FDDI Controller and
@@ -50,7 +50,7 @@ processing.
 .Xr ifconfig 8
 .Sh AUTHORS
 The
-.Nm fpa
+.Nm
 and
 .Nm fea
 device driver and manual page was written by
diff --git a/share/man/man4/gif.4 b/share/man/man4/gif.4
index e10dc90..3d97e7f 100644
--- a/share/man/man4/gif.4
+++ b/share/man/man4/gif.4
@@ -48,7 +48,7 @@ The behavior of
 is mainly based on RFC1933 IPv6-over-IPv4 configured tunnel.
 .Pp
 To use
-.Nm gif ,
+.Nm ,
 administrator needs to configure protocol and addresses used for the outer
 header.
 This can be done by using
@@ -108,9 +108,9 @@ can be configured to implement multi-destination tunnel.
 With
 .Dv IFF_LINK0 ,
 it is able to configure egress point to IPv4 wildcard address
-.Pq Nm 0.0.0.0
+.Pq Li 0.0.0.0
 or IPv6 unspecified address
-.Pq Nm 0::0 .
+.Pq Li 0::0 .
 In this case, destination address for the outer IP header is
 determined based on the routing table setup.
 Therefore, one
@@ -121,7 +121,7 @@ Also,
 will accept tunneled traffic from any outer source address.
 .Pp
 When finding a
-.Nm gif
+.Nm
 interface from the inbound tunneled traffic,
 bidirectional mode interface is preferred than multi-destination mode interface.
 For example, if you have the following three
diff --git a/share/man/man4/ifmib.4 b/share/man/man4/ifmib.4
index ca80a10..c170937 100644
--- a/share/man/man4/ifmib.4
+++ b/share/man/man4/ifmib.4
@@ -42,7 +42,7 @@
 .Fd #include <net/if_mib.h>
 .Sh DESCRIPTION
 The
-.Nm ifmib
+.Nm
 facility is an application of the
 .Xr sysctl 3
 interface to provide management information about network interfaces
diff --git a/share/man/man4/inet6.4 b/share/man/man4/inet6.4
index cbb5f73..3ba609e 100644
--- a/share/man/man4/inet6.4
+++ b/share/man/man4/inet6.4
@@ -189,7 +189,7 @@ and
 are common to
 .Xr inet 4
 and
-.Nm inet6 .
+.Nm .
 A raw interface to
 .Tn IPv6
 is available
@@ -548,4 +548,4 @@ Users are suggested to implement
 code as much as possible, as you will need to support both
 .Xr inet 4
 and
-.Nm inet6 .
+.Nm .
diff --git a/share/man/man4/ipsec.4 b/share/man/man4/ipsec.4
index 2935953..8288aa0 100644
--- a/share/man/man4/ipsec.4
+++ b/share/man/man4/ipsec.4
@@ -249,7 +249,7 @@ Some of the protocols, like
 or
 .Xr icmp6 4 ,
 may behave differently with
-.Nm ipsec .
+.Nm .
 This is because
 .Nm
 can prevent
diff --git a/share/man/man4/kame.4 b/share/man/man4/kame.4
index dca3d9d..fa68201 100644
--- a/share/man/man4/kame.4
+++ b/share/man/man4/kame.4
@@ -35,7 +35,7 @@
 .Nm KAME
 .Nd introduction and roadmap to KAME IPv6 software package
 .Sh DESCRIPTION
-.Nm KAME
+.Nm
 software package is a result of joint work of several IPv6 researchers
 in Japan, to provide reference implementation of IPv6 to
 Berkeley Software Distribution
@@ -142,7 +142,7 @@ Please read the following files in the directories
 and
 .Pa /usr/share/examples/IPv6
 to get a basic idea of (and installation methods for
-.Nm Ns .
+.Nm .
 You also can check out the IPv6 and IPsec chapters in the
 .Fx
 handbook.
diff --git a/share/man/man4/kld.4 b/share/man/man4/kld.4
index ed38f29..41c1ace 100644
--- a/share/man/man4/kld.4
+++ b/share/man/man4/kld.4
@@ -91,7 +91,7 @@ system.
 .It Em "Device Driver modules"
 New block and character device
 drivers may be loaded into the system with
-.Nm KLD .
+.Nm .
 The major problem with loading
 a device driver is that the driver's
 device nodes must exist for the
diff --git a/share/man/man4/lp.4 b/share/man/man4/lp.4
index 9885b49..6dc0012 100644
--- a/share/man/man4/lp.4
+++ b/share/man/man4/lp.4
@@ -41,7 +41,8 @@
 .Nm lp
 .Nd printer port Internet Protocol driver
 .Sh SYNOPSIS
-.Nm ifconfig lp0
+.Nm ifconfig
+.Ar lp0
 .Ar myaddress hisaddress
 .Op Fl link0
 .Pp
@@ -64,7 +65,7 @@ device which is probed and has an interrupt assigned, a corresponding
 device is created.
 .Pp
 Configuring an
-.Nm lp
+.Nm
 device with
 .Xr ifconfig 8
 causes the corresponding
diff --git a/share/man/man4/man4.i386/aic.4 b/share/man/man4/man4.i386/aic.4
index fdb4417..2d4de95 100644
--- a/share/man/man4/man4.i386/aic.4
+++ b/share/man/man4/man4.i386/aic.4
@@ -33,7 +33,7 @@
 .Cd "device aic0 at isa? port 0x340 irq 11"
 .Sh DESCRIPTION
 The
-.Nm aic
+.Nm
 driver provides support for the Adaptec AIC-6260 and AIC-6360 SCSI
 controller chips.  This includes the Adaptec 152x and the Creative
 Labs SoundBlaster SCSI host adapter.
diff --git a/share/man/man4/man4.i386/apm.4 b/share/man/man4/man4.i386/apm.4
index a6a5685..ddce25e 100644
--- a/share/man/man4/man4.i386/apm.4
+++ b/share/man/man4/man4.i386/apm.4
@@ -20,33 +20,33 @@
 .Sh SYNOPSIS
 .Cd device apm0 at nexus?
 .Sh DESCRIPTION
-.Nm apm
+.Nm
 is an interface to the Intel / Microsoft APM (Advanced Power Management) BIOS
 on laptop PCs.
 .Pp
-.Nm apm
+.Nm
 provides the following power management functions.
 .Bl -enum -offset indent
 .It
 When the system wakes up from suspended mode, 
-.Nm apm
+.Nm
 adjusts the system clock to RTC.
 .It 
 When the system wakes up from suspended mode, 
-.Nm apm
+.Nm
 passes a message to 
 .Xr syslogd 8
 comprising of system wakeup time and elapsed time during suspended mode.
 .It
-.Nm apm
+.Nm
 slows CPU clock when there are no system activities (runnable processes, 
 interrupts, etc.).  This function is available only on systems whose APM 
 supports CPU idling.
 .It
-.Nm apm
+.Nm
 exports an application interface as a character device.  Applications
 can control APM, or retrieve APM status information via this interface.
-.Nm apm
+.Nm
 exports the following interfaces.  These symbols are defined in
 .Dq Pa /usr/include/machine/apm_bios.h.
 .Bl -tag -width 4n -offset indent
@@ -79,13 +79,13 @@ does not execute HLT in
 .Dq Pa Idle CPU.
 On some implementations that do not support CPU clock slowdown, APM 
 might not execute HLT.
-.Nm apm
+.Nm
 disables
 .Sy APMIO_NOTHALTCPU
 operation on such machines. 
 .Pp
 The current version of
-.Nm apm
+.Nm
 does not call
 .Dq Pa Idle CPU
 from the kernel context switch routine if clock slowdown is not supported, 
@@ -96,7 +96,7 @@ no need to use these two operations in most cases.
 These interfaces are used by
 .Xr apm 8 .
 .It
-.Nm apm
+.Nm
 polls APM events and handles the following events.
 .Bl -column PMEV_POWERSTATECHANGEXXX "suspend system xxxxx" 
 .It Sy "Name                  " "Action          " "Description"
@@ -123,7 +123,7 @@ We are very interested in getting this code working, so please send you
 observations of any anomalous behavior to us.
 .Pp
 When 
-.Nm apm
+.Nm
 is active, calling the BIOS setup routine by using hot-keys, 
 may cause serious trouble when resuming the system.
 BIOS setup programs should be called during bootstrap, or from DOS.
diff --git a/share/man/man4/man4.i386/ar.4 b/share/man/man4/man4.i386/ar.4
index ce320b8..bb4a1e6 100644
--- a/share/man/man4/man4.i386/ar.4
+++ b/share/man/man4/man4.i386/ar.4
@@ -41,7 +41,7 @@ synchronous Digi/Arnet device driver.
 .Cd "pseudo-device sppp"
 .Sh DESCRIPTION
 The
-.Nm ar
+.Nm
 driver supports the Digi/Arnet SYNC/570i ISA and PCI cards that is based on the
 HD64570 chip.
 Both the 2 and 4 port cards are supported and auto detected.
@@ -114,12 +114,12 @@ Please report bugs to
 .Xr ifconfig 8
 .Sh HISTORY
 The
-.Nm ar
+.Nm
 device driver first appeared in
 .Fx 2.2 .
 .Sh AUTHORS
 The
-.Nm ar
+.Nm
 device driver was written by
 .An John Hay Aq jhay@FreeBSD.org .
 Netgraph support was added by
diff --git a/share/man/man4/man4.i386/cs.4 b/share/man/man4/man4.i386/cs.4
index 3d0da14..d75153c 100644
--- a/share/man/man4/man4.i386/cs.4
+++ b/share/man/man4/man4.i386/cs.4
@@ -38,9 +38,11 @@
 The
 .Nm
 driver provides support for ISA ethernet adapters based on the 
-.Nm Crystal Semiconductor CS8900 and CS8920
+.Tn Crystal Semiconductor CS8900
+and
+.Tn CS8920
 NICs.  These devices are used on the 
-.Nm IBM EtherJet ISA 
+.Tn IBM EtherJet ISA 
 adapters and in many embedded applications where the high integration, small 
 size and low cost of the CS89x0 family compensate for their drawbacks.
 .Pp
@@ -51,9 +53,9 @@ or from the card.  Parameters specified in the configuration entry will be
 used if present; the card may be soft-configured so these may be any valid
 value.  Adapters based on the CS8920 normally offer PnP configuration and the driver
 will detect the 
-.Nm IBM EtherJet 
+.Tn IBM EtherJet 
 and the 
-.Nm CSC6040 
+.Tn CSC6040 
 adapters automatically.
 .Pp
 Note that the CS8900 is limited to 4 IRQ values; these are normally implemented
diff --git a/share/man/man4/man4.i386/cy.4 b/share/man/man4/man4.i386/cy.4
index ac072b4..5d5229d 100644
--- a/share/man/man4/man4.i386/cy.4
+++ b/share/man/man4/man4.i386/cy.4
@@ -59,7 +59,7 @@ Minor numbering:
 .Ed
 .Sh DESCRIPTION
 The
-.Nm cy
+.Nm
 driver provides support for Cirrus Logic CD1400-based
 .Tn EIA
 .Tn RS-232C
@@ -86,7 +86,7 @@ but when 4 lines are active in both directions its limit is about
 .\" It was copied from sio.4.  The only change was s/sio/cy/g.
 .Pp
 Serial ports controlled by the
-.Nm cy
+.Nm
 driver can be used for both `callin' and `callout'.
 For each port there is a callin device and a callout device.
 The minor number of the callout device is 128 higher
@@ -104,7 +104,7 @@ to work on general ports and need to open the port without waiting
 but are too stupid to do so.
 .Pp
 The
-.Nm cy
+.Nm
 driver also supports an initial-state and a lock-state control
 device for each of the callin and the callout "data" devices.
 The minor number of the initial-state device is 32 higher
diff --git a/share/man/man4/man4.i386/dgb.4 b/share/man/man4/man4.i386/dgb.4
index 29003f0..f4803d2 100644
--- a/share/man/man4/man4.i386/dgb.4
+++ b/share/man/man4/man4.i386/dgb.4
@@ -84,7 +84,7 @@ Device numbering:
                \fBPPPPP\fRort number
 .Sh DESCRIPTION
 The
-.Nm dgb
+.Nm
 driver provides support for DigiBoard PC/Xe and PC/Xi series intelligent
 serial multiport cards with asynchronous interfaces based on the
 .Tn EIA
@@ -166,7 +166,7 @@ Then the DigiBoard's address space can be set to this ``hole''.
 .\" It was copied from sio.4.  The only changes were s/sio/dgb/g.
 .Pp
 Serial ports controlled by the
-.Nm dgb
+.Nm
 driver can be used for both `callin' and `callout'.
 For each port there is a callin device and a callout device.
 The minor number of the callout device is 128 higher
@@ -184,7 +184,7 @@ to work on general ports and need to open the port without waiting
 but are too stupid to do so.
 .Pp
 The
-.Nm dgb
+.Nm
 driver also supports an initial-state and a lock-state control
 device for each of the callin and the callout "data" devices.
 The minor number of the initial-state device is 32 higher
diff --git a/share/man/man4/man4.i386/fe.4 b/share/man/man4/man4.i386/fe.4
index 30bb2b8..63f1919 100644
--- a/share/man/man4/man4.i386/fe.4
+++ b/share/man/man4/man4.i386/fe.4
@@ -31,7 +31,7 @@
 .Cd "device fe0 at isa? port 0x300 irq ?"
 .Sh DESCRIPTION
 The
-.Nm fe
+.Nm
 is a network device driver
 for Ethernet adapters based on Fujitsu MB86960A, MB86965A,
 or other compatible chips.
@@ -119,7 +119,7 @@ on DLCR6 settings.
 .El
 .Sh OPTIONS
 The
-.Nm fe
+.Nm
 driver has some private options,
 which can be specified with an
 .Dq option
@@ -173,7 +173,7 @@ are logged under this setting.
 .El
 .Sh FEATURES SPECIFIC TO HARDWARE MODELS
 The
-.Nm fe
+.Nm
 driver has some features and limitations
 which depend on adapter hardware models.
 The following is a summary of such dependency.
@@ -182,7 +182,7 @@ Both automatic IRQ detection and automatic I/O port address detection
 is available with these adapters.
 .Pp
 Automatic I/O port address detection feature of
-.Nm fe
+.Nm
 works mostly fine for FMV-180 series.
 It works even if there are two or more FMV-180s in a system.
 However, some combination of other adapters may confuse the driver.
@@ -191,7 +191,7 @@ It is recommended not to use
 when you experience some difficulties with hardware probe.
 .Pp
 Automatic IRQ detection feature of
-.Nm fe
+.Nm
 works reliably for FMV-180 series.
 It is recommended to use
 .Em "irq ?"
@@ -213,7 +213,7 @@ is not recommended.
 .Pp
 Automatic IRQ detection is also available with some limitation.
 The
-.Nm fe
+.Nm
 driver
 tries to get IRQ setting from the configuration EEPROM on the board,
 if
@@ -232,7 +232,7 @@ Differences between AT1700 series and RE2000 series
 or minor models in those series are not recognized.
 .Ss Fujitsu MBH10302 PC card
 The
-.Nm fe
+.Nm
 driver supports Fujitsu MBH10302 and compatible PC cards.
 It requires the PC card (PCMCIA) support package.
 .Sh SEE ALSO
@@ -247,7 +247,7 @@ It requires the PC card (PCMCIA) support package.
 Following are major known bugs:
 .Pp
 Statistics on the number of collisions maintained by the
-.Nm fe
+.Nm
 driver is not accurate;
 the
 .Fi i
@@ -266,7 +266,7 @@ they are never be tested and must have a lot of bugs.
 .Sh AUTHORS, COPYRIGHT AND DISCLAIMER
 .Pp
 The
-.Nm fe
+.Nm
 driver was originally written and contributed by
 .An M. Sekiguchi Aq seki@sysrap.cs.fujitsu.co.jp ,
 following the
@@ -274,7 +274,7 @@ following the
 driver written by
 .An David Greenman .
 PC card support in
-.Nm fe
+.Nm
 is written by
 .An Hidetoshi Kimura Aq h-kimura@tokyo.se.fujitsu.co.jp .
 This manual page was written by
diff --git a/share/man/man4/man4.i386/gsc.4 b/share/man/man4/man4.i386/gsc.4
index 7737ac2..ab453cd 100644
--- a/share/man/man4/man4.i386/gsc.4
+++ b/share/man/man4/man4.i386/gsc.4
@@ -63,7 +63,7 @@ output
 .Pp
 .Sh DESCRIPTION
 The
-.Nm gsc
+.Nm
 character device driver currently handles only the
 Genius GS-4500 handy scanner.
 It operates in pure DMA modes, although
@@ -126,7 +126,7 @@ Even though, I
 do not know of tools which produce a graymap from a halftone bitmap.
 .Pp
 The ioctl requests that are served by
-.Nm gsc
+.Nm
 are listed below.
 There is a utility, called
 .Xr sgsc 1 ,
diff --git a/share/man/man4/man4.i386/ie.4 b/share/man/man4/man4.i386/ie.4
index fa31570..20e3e02 100644
--- a/share/man/man4/man4.i386/ie.4
+++ b/share/man/man4/man4.i386/ie.4
@@ -15,7 +15,7 @@ ethernet device driver
 .Cd "device ie0 at isa? port 0x360 irq 7 iomem 0xd0000"
 .Sh DESCRIPTION
 The
-.Nm ie
+.Nm
 driver provides support for 8 and 16bit ISA ethernet cards that are based on
 the Intel i82586 chip.
 It supports the AT&T Starlan 10 and Starlan Fiber, 
diff --git a/share/man/man4/man4.i386/io.4 b/share/man/man4/man4.i386/io.4
index 904fc77..4f6289d 100644
--- a/share/man/man4/man4.i386/io.4
+++ b/share/man/man4/man4.i386/io.4
@@ -60,6 +60,6 @@ that even read/only access will grant the full I/O privileges.
 .Xr mem 4
 .Sh HISTORY
 The
-.Nm io
+.Nm
 file appeared in
 .Fx 1.0 .
diff --git a/share/man/man4/man4.i386/matcd.4 b/share/man/man4/man4.i386/matcd.4
index 6bbd700..a1a0d09 100644
--- a/share/man/man4/man4.i386/matcd.4
+++ b/share/man/man4/man4.i386/matcd.4
@@ -100,7 +100,7 @@
 .Pp
 .Sh DESCRIPTION
 The
-.Nm matcd
+.Nm
 driver controls the CR-562-x and CR-563-x CD-ROM drives made by
 Matsushita-Kotobuki Electronics Industries, or Matsushita for short.
 These CD-ROM drives have been sold under the Panasonic (which is a trade
@@ -113,7 +113,7 @@ a sound card.
 
 .Sh DRIVER CONFIGURATION
 The
-.Nm matcd
+.Nm
 driver supports up to four host interfaces with up to four drives on each
 interface.  Audio activity may occur on all drives simultaneously.  Data
 read operations are limited to one drive per host interface at any instant.
@@ -145,12 +145,12 @@ up to four drives on a single host interface.  It is also not necessary to
 have four drives on a single interface before adding a second interface.
 
 By default,
-.Nm matcd
+.Nm
 searches for the CD-ROM host interface adapters by using a table of known I/O
 ports on Creative host adapters (see \fIoptions.h\fR).  Although this
 is very flexible, it can cause problems when your system has other devices
 that are located at the I/O ports that 
-.Nm matcd 
+.Nm
 is checking for CD-ROM host interfaces.  In addition, checking multiple
 locations can cause the boot process to take longer than it could.
 .if t .bp
@@ -164,7 +164,7 @@ change where the kernel looks for the hardware by using the -c option at
 the kernel boot prompt.  This will load the kernel and then give you the
 opportunity to change settings for any of the devices included the kernel.
 For example, to change the I/O port for
-.Nm matcd
+.Nm
 adapter zero to 0x340, you would type
 
 	config> port matcd0c 0x340
@@ -176,7 +176,7 @@ like this:
 	device  matcd0  at  isa?  port  0x230
 
 With this change, the
-.Nm matcd
+.Nm
 driver will only look at I/O port 0x230 for the first CD-ROM host interface
 and will not disturb any other I/O ports.
 
@@ -185,7 +185,7 @@ to configure and recompile the kernel, install it and reboot for the
 changes to take effect.
 .Sh SUPPORTED HARDWARE
 At this time, there are only two known drive models that work with the
-.Nm matcd
+.Nm
 driver:
 .Bl -tag -width CR-123-X -compact -offset indent
 .br
@@ -200,10 +200,10 @@ also has the FCC, VDE, CSA and RU certification marks.
 Both of these drive models have motorized trays.  There is also a custom
 version of these drives that does not have the volume control or headphone
 jack (seen on some Tandy computers), but this drive also works with
-.Nm matcd.
+.Nm .
 
 The Matsushita CR-522-x and CR-523-x CD-ROM drive is not usable with 
-.Nm matcd.
+.Nm .
 The CR-522 and CR-523 can also be identified from the front as it
 requires a CD-caddy.
 
@@ -212,7 +212,7 @@ Drives with IDE interfaces must use an IDE driver.
 The TEAC CD-55 4X CD-ROM drive also uses the Creative/Panasonic interface
 but the TEAC drive is \fInot\fR compatible with the Matsushita CR-56x drives.  
 The TEAC drive cannot be used with 
-.Nm matcd.
+.Nm .
 .if t .sp
 .if n .bp
 The most common source of host interface adapters for the Panasonic drives
@@ -222,7 +222,7 @@ of the newer cards provide the appropriate interface, sometimes labeled as
 the "Creative/Panasonic" interface.
 
 The following host interface adapters are known to work with the
-.Nm matcd
+.Nm
 driver:
 .Bl -tag -width LONGNAME -compact -offset indent
 .It Creative
@@ -261,14 +261,14 @@ must be reconfigured to locate these adapters.
 It is important to understand that some manufacturers have a different
 host interface implementation.  If you have a board that won't communicate
 with the drives under MS-DOS using the genuine Creative Labs drivers, then
-.Nm matcd
+.Nm
 may not work with that host adapter.
 .br
 .if t .bp
 .if n .sp
 .Sh SUPPORTED OPERATIONS
 The
-.Nm matcd
+.Nm
 driver supports block and character access.  Partition "a" returns
 2048-byte User Data blocks from data CDs.  Partition "c" returns the full
 2352-byte Frames from any type of CD, including audio CDs.  (Partition
@@ -278,7 +278,7 @@ No other partitions are supported.
 The 
 .Nm matcdl
 devices work the same as the normal
-.Nm matcd
+.Nm
 devices except that the drive trays are locked and
 remain locked until all of the devs on that drive are closed.
 .if n .bp
@@ -354,7 +354,7 @@ report the capabilities of the drive and driver.
 The
 .Fn ioctl
 commands defined above are the only ones that the
-.Nm matcd
+.Nm
 driver supports. 
 .bp
 .Sh FILES
@@ -367,7 +367,7 @@ is used to access 2352-byte frames on a CD-ROM disc
 recorded in any format.
 .It Pa /usr/src/sys/i386/isa/matcd/*
 Source code and compilation options for 
-.Nm matcd.
+.Nm .
 .El
 
 The file \fIoptions.h\fR contains all of the compilation options.
@@ -406,7 +406,7 @@ Program and Documentation are Copyright 1994, 1995,
 All rights reserved.  
 .Sh HISTORY
 The
-.Nm matcd
+.Nm
 driver appeared in
 .Fx 2.0.5 .
 
diff --git a/share/man/man4/man4.i386/mcd.4 b/share/man/man4/man4.i386/mcd.4
index fd65713..6798fa0 100644
--- a/share/man/man4/man4.i386/mcd.4
+++ b/share/man/man4/man4.i386/mcd.4
@@ -36,7 +36,7 @@
 .Cd "device mcd0 at isa? port 0x300 irq 10"
 .Sh DESCRIPTION
 The
-.Nm mcd
+.Nm
 driver provides a data and audio interface to the Mitsumi-brand CD-ROM
 player.
 The CD-ROM player must be interfaced to the ISA bus through
@@ -46,7 +46,7 @@ boards supported are the LU002S, LU005S, the FX001 and the quite
 common FX001D.
 .Pp
 The
-.Nm mcd
+.Nm
 driver responds to disk-specific
 .Fn ioctl
 commands, namely the
@@ -61,7 +61,7 @@ Other disk-specific
 commands will return an error.
 .Pp
 The
-.Nm mcd
+.Nm
 driver also responds to special CD-ROM
 .Fn ioctl
 commands.
@@ -98,18 +98,18 @@ command).
 stops any play and resets the Mitsumi controller board
 .It CDIOCSETDEBUG
 cause the kernel to print debug messages to the console about the
-.Nm mcd
+.Nm
 driver
 .It CDIOCCLRDEBUG
 cause the kernel to quit printing debug messages about the
-.Nm mcd
+.Nm
 driver
 .El
 .Pp
 The
 .Fn ioctl
 commands defined above are the only ones that the
-.Nm mcd
+.Nm
 driver supports.
 There are other CD-ROM related
 .Fn ioctl
@@ -130,7 +130,7 @@ accesses raw device.
 .El
 .Sh NOTES
 The character-mode devices for the
-.Nm mcd
+.Nm
 driver should only be used for accessing the audio features of the
 CD-ROM player as the performance on data is abysmal.
 .Pp
@@ -155,6 +155,6 @@ and
 .An Jordan K. Hubbard .
 .Sh HISTORY
 An
-.Nm mcd
+.Nm
 driver appeared in
 .Fx 1.0 .
diff --git a/share/man/man4/man4.i386/meteor.4 b/share/man/man4/man4.i386/meteor.4
index 8adb5b7..7af8285 100644
--- a/share/man/man4/man4.i386/meteor.4
+++ b/share/man/man4/man4.i386/meteor.4
@@ -13,7 +13,7 @@
 .Nm video meteor
 .Sh DESCRIPTION
 The
-.Nm meteor
+.Nm
 driver provides support for a PCI
 .Em video
 capture.
diff --git a/share/man/man4/man4.i386/npx.4 b/share/man/man4/man4.i386/npx.4
index adc849e..34a8d13 100644
--- a/share/man/man4/man4.i386/npx.4
+++ b/share/man/man4/man4.i386/npx.4
@@ -47,7 +47,7 @@ or
 .\" What the heck does he mean? - cracauer
 .Sh DESCRIPTION
 The
-.Nm npx
+.Nm
 driver enables the use of the system's Numeric Processing Extension
 coprocessor,
 if one is present.  Numeric processing extensions are present in
@@ -58,7 +58,7 @@ CPUs and in systems with
 or
 .Sy 487SX
 coprocessors.  The
-.Nm npx
+.Nm
 driver is required for proper system functioning regardless
 of whether or not a NPX is present.
 .Pp
diff --git a/share/man/man4/man4.i386/perfmon.4 b/share/man/man4/man4.i386/perfmon.4
index f7430ce..17203d0 100644
--- a/share/man/man4/man4.i386/perfmon.4
+++ b/share/man/man4/man4.i386/perfmon.4
@@ -39,7 +39,7 @@
 .Cd options PERFMON
 .Sh DESCRIPTION
 The
-.Nm perfmon
+.Nm
 driver provides access to the internal performance-monitoring
 capabilities of the
 .Tn Intel
diff --git a/share/man/man4/man4.i386/scd.4 b/share/man/man4/man4.i386/scd.4
index c7c6269..fd5ba71 100644
--- a/share/man/man4/man4.i386/scd.4
+++ b/share/man/man4/man4.i386/scd.4
@@ -36,7 +36,7 @@
 .Cd "device scd0 at isa? port 0x230"
 .Sh DESCRIPTION
 The
-.Nm scd
+.Nm
 driver provides a data interface to the Sony CDU31 and CDU33A CD-ROM
 drives.  The drive must be hooked to a Sony proprietary interface
 card or a compatible clone.
@@ -59,6 +59,6 @@ and
 .An Brian Moore .
 .Sh HISTORY
 The
-.Nm scd
+.Nm
 driver first appeared in
 .Fx 2.0.5 .
diff --git a/share/man/man4/man4.i386/sr.4 b/share/man/man4/man4.i386/sr.4
index 22c3dd9..d5be009 100644
--- a/share/man/man4/man4.i386/sr.4
+++ b/share/man/man4/man4.i386/sr.4
@@ -43,7 +43,7 @@
 .Cd "pseudo-device sppp"
 .Sh DESCRIPTION
 The
-.Nm sr
+.Nm
 driver supports the RISCom/N2 ISA cards and the WANic 400/405 PCI cards
 that is based on the HD64570 chip.
 .Pp
@@ -140,7 +140,7 @@ The code can probably stand some optimizing.
 .Xr lsdev 8
 .Sh AUTHORS
 The
-.Nm sr
+.Nm
 device driver was written by
 .An John Hay Aq jhay@FreeBSD.org
 Netgraph support was added by
diff --git a/share/man/man4/man4.i386/vx.4 b/share/man/man4/man4.i386/vx.4
index e3db805..ee70b2d 100644
--- a/share/man/man4/man4.i386/vx.4
+++ b/share/man/man4/man4.i386/vx.4
@@ -41,7 +41,7 @@ PCI Ethernet device driver
 .Cd "device vx"
 .Sh DESCRIPTION
 The
-.Nm vx
+.Nm
 driver provides support for the 3Com 3c590 and 3c595 EtherLink III and Fast
 EtherLink III PCI Ethernet cards in 10 Mbps mode.  The medium selection
 can be influenced by the following link flags to the
@@ -76,12 +76,12 @@ only polled-mode I/O and does not make use of the bus-mastering capability
 of the cards.
 .Sh BUGS
 The
-.Nm vx
+.Nm
 driver is known not to reset the adapter correctly following a warm boot
 on some systems.
 .Pp
 The
-.Nm vx
+.Nm
 driver has not been exhaustively tested with all the models of cards that it
 claims to support.
 .Sh SEE ALSO
@@ -91,7 +91,7 @@ claims to support.
 .Xr ifconfig 8
 .Sh HISTORY
 The
-.Nm vx
+.Nm
 device driver first appeared in
 .Fx 2.1 .
 It was derived from the
@@ -99,7 +99,7 @@ It was derived from the
 driver, from which it inherits most of its limitations.
 .Sh AUTHORS
 The
-.Nm vx
+.Nm
 device driver and this manual page were written by
 .An Fred Gray Aq fgray@rice.edu ,
 based on the work of
diff --git a/share/man/man4/man4.i386/wl.4 b/share/man/man4/man4.i386/wl.4
index 405dfe3..900f4d9 100644
--- a/share/man/man4/man4.i386/wl.4
+++ b/share/man/man4/man4.i386/wl.4
@@ -39,7 +39,7 @@
 .Cd "device wl0 at isa? port 0x300 irq 5"
 .Sh DESCRIPTION
 The
-.Nm wl
+.Nm
 driver controls a radio lan card system made originally by
 NCR, then ATT, now Lucent.  The system is spread-spectrum radio
 at around 915 mhz (or 2.4 ghz).  With the supplied omni-directional antennae,
@@ -134,7 +134,7 @@ due to delays in the configuration code.
 .Xr http://www.wavelan.com
 .Sh HISTORY
 The
-.Nm wl
+.Nm
 driver was written by
 .An Anders Klemets
 (thousands of years ago?) and
diff --git a/share/man/man4/man4.i386/wt.4 b/share/man/man4/man4.i386/wt.4
index c43744a..2d4134c 100644
--- a/share/man/man4/man4.i386/wt.4
+++ b/share/man/man4/man4.i386/wt.4
@@ -34,7 +34,7 @@ Archive/Wangtek cartridge tape driver
 .Cd "device wt0 at isa? port 0x300 irq 5 drq 1"
 .Sh DESCRIPTION
 The
-.Nm wt 
+.Nm
 driver provides support for the following Archive and Wangtek boards:
 .Pp
 .Bl -tag -width -offset indent -compact
diff --git a/share/man/man4/mem.4 b/share/man/man4/mem.4
index b3acf9f..be34199 100644
--- a/share/man/man4/mem.4
+++ b/share/man/man4/mem.4
@@ -186,7 +186,7 @@ Busy range attributes are not yet managed correctly.
 .Xr memcontrol 8
 .Sh HISTORY
 The
-.Nm mem ,
+.Nm ,
 .Nm kmem
 files appeared in
 .At v6 .
diff --git a/share/man/man4/mtio.4 b/share/man/man4/mtio.4
index 585ce25..b5cc6cf 100644
--- a/share/man/man4/mtio.4
+++ b/share/man/man4/mtio.4
@@ -304,7 +304,7 @@ union mterrstat {
 .Xr sa 4
 .Sh HISTORY
 The
-.Nm mtio
+.Nm
 manual appeared in
 .Bx 4.2 .
 An i386 version first appeared in
diff --git a/share/man/man4/netgraph.4 b/share/man/man4/netgraph.4
index df267b5..da16776 100644
--- a/share/man/man4/netgraph.4
+++ b/share/man/man4/netgraph.4
@@ -270,7 +270,7 @@ which is both a netgraph node and a
 BSD socket in the protocol family
 .Dv PF_NETGRAPH .
 Socket nodes allow user processes to participate in
-.Nm Ns .
+.Nm .
 Other nodes communicate with socket nodes using the usual methods, and the
 node hides the fact that it is also passing information to and from a
 cooperating user process.
diff --git a/share/man/man4/ng_ether.4 b/share/man/man4/ng_ether.4
index 411895c..aff026c 100644
--- a/share/man/man4/ng_ether.4
+++ b/share/man/man4/ng_ether.4
@@ -44,7 +44,7 @@
 .Fd #include <netgraph/ng_ether.h>
 .Sh DESCRIPTION
 The
-.Nm ng_ether
+.Nm
 netgraph node type allows Ethernet interfaces to interact with
 the
 .Xr netgraph 4 
diff --git a/share/man/man4/null.4 b/share/man/man4/null.4
index 7a1d17f..20e888aa 100644
--- a/share/man/man4/null.4
+++ b/share/man/man4/null.4
@@ -45,7 +45,7 @@ device accepts and reads data as any ordinary (and willing)
 file \-
 but throws it away.
 The length of the
-.Nm null
+.Nm
 device is always zero.
 .Sh FILES
 .Bl -tag -width /dev/null
diff --git a/share/man/man4/pass.4 b/share/man/man4/pass.4
index c12b7c3..0baadeb 100644
--- a/share/man/man4/pass.4
+++ b/share/man/man4/pass.4
@@ -38,19 +38,19 @@
 .Cd device pass2 at scbus0 target 3 unit 0
 .Sh DESCRIPTION
 The
-.Nm pass
+.Nm
 driver provides a way for userland applications to issue CAM CCBs to the
 kernel. 
 .Pp
 Since the
-.Nm pass
+.Nm
 driver allows direct access to the CAM subsystem, system administrators
 should exercise caution when granting access to this driver.  If used
 improperly, this driver can allow userland applications to crash a machine
 or cause data loss.
 .Pp
 The
-.Nm pass
+.Nm
 driver attaches to every
 .Tn SCSI
 device found in the system.
@@ -60,9 +60,9 @@ devices, and allows the user to access devices which have no
 "standard" peripheral driver associated with them.
 .Sh KERNEL CONFIGURATION
 It is only necessary to configure one
-.Nm pass
+.Nm
 device in the kernel;
-.Nm pass
+.Nm
 devices are automatically allocated as
 .Tn SCSI
 devices are found.
@@ -81,7 +81,7 @@ impossible to service them through the passthrough interface.
 This ioctl takes an XPT_GDEVLIST CCB, and returns the passthrough device
 corresponding to the device in question.  Although this ioctl is available
 through the
-.Nm pass
+.Nm
 driver, it is of limited use, since the caller must already know that
 the device in question is a passthrough device if they're issuing this
 ioctl.  It is probably more useful to issue this ioctl through the
@@ -92,7 +92,7 @@ device.
 .Bl -tag -width 01234567890 -compact
 .It Pa /dev/pass Ns Ar n
 Character device nodes for the
-.Nm pass
+.Nm
 driver.  There should be one of these for each device accessed through the
 CAM subsystem.
 .El
diff --git a/share/man/man4/pci.4 b/share/man/man4/pci.4
index 0a499cd..a1d119a 100644
--- a/share/man/man4/pci.4
+++ b/share/man/man4/pci.4
@@ -34,7 +34,7 @@
 .Cd device pci
 .Sh DESCRIPTION
 The
-.Nm pci
+.Nm
 driver provides a way for userland programs to read and write
 .Tn PCI
 configuration registers.  It also provides a way for userland programs to
@@ -45,17 +45,17 @@ devices, or all
 devices that match various patterns.
 .Pp
 Since the
-.Nm pci
+.Nm
 driver provides a write interface for
 .Tn PCI
 configuration registers, system administrators should exercise caution when
 granting access to the
-.Nm pci
+.Nm
 device.  If used improperly, this driver can allow userland applications to
 crash a machine or cause data loss.
 .Sh KERNEL CONFIGURATION
 It is only necessary to specify one
-.Nm pci
+.Nm
 controller in the kernel.  Additional
 .Tn PCI
 busses are handled automatically as they are encountered.
@@ -63,7 +63,7 @@ busses are handled automatically as they are encountered.
 The following
 .Xr ioctl 2
 calls are supported by the
-.Nm pci
+.Nm
 driver.  They are defined in the header file
 .Aq Pa sys/pciio.h .
 .Bl -tag -width 012345678901234
@@ -265,7 +265,7 @@ configuration registers.
 .Bl -tag -width 01234567890 -compact
 .It Pa /dev/pci
 Character device for the
-.Nm pci
+.Nm
 driver.
 .El
 .Sh DIAGNOSTICS
@@ -274,7 +274,7 @@ None.
 .Xr pciconf 8
 .Sh HISTORY
 The
-.Nm pci
+.Nm
 driver (not the kernel's
 .Tn PCI
 support code) first appeared in
diff --git a/share/man/man4/pcvt.4 b/share/man/man4/pcvt.4
index c7f5c36..fd6f46e 100644
--- a/share/man/man4/pcvt.4
+++ b/share/man/man4/pcvt.4
@@ -48,7 +48,7 @@
 .Sh DESCRIPTION
 .Ss Overview
 The
-.Nm pcvt
+.Nm
 driver provides a virtual screen handling system.
 Probably most important is an emulation of a wide range
 of DEC
@@ -59,7 +59,7 @@ See
 for a detailed description.
 .Pp
 The
-.Nm pcvt
+.Nm
 driver requires the keyboard driver
 .Nm atkbd
 to be also configured in the kernel.
@@ -135,7 +135,7 @@ and
 it is possible to scroll the screen back and forward.
 .Ss Configuration
 The
-.Nm pcvt
+.Nm
 console driver is available for the Intel-based
 .Fx
 operating system.
@@ -177,7 +177,7 @@ See the files
 and
 .Pa Keyboard.HP
 in the
-.Nm pcvt
+.Nm
 documentation directory for a full description.
 .It No
 Default: off
@@ -247,7 +247,7 @@ The functionality described below may be accessed via
 .Xr ioctl 2
 system calls with a file descriptor opened on a device node
 related to the
-.Nm pcvt
+.Nm
 driver.
 To make use of them, a program should contain the following line:
 .Pp
@@ -320,7 +320,7 @@ LED flags.
 .Em Keyboard remapping
 .Pp
 One important feature of the
-.Nm pcvt
+.Nm
 driver is its ability to overload the built in key definition.
 .Pp
 .Bl -tag -width 20n -offset indent -compact
@@ -651,7 +651,7 @@ struct pcvtinfo {
 .Em Screen saver
 .Pp
 Depending on the configuration of a
-.Nm pcvt
+.Nm
 driver, their might be a simple screen saver available.
 It is controlled
 by the command
@@ -672,7 +672,7 @@ option
 .Pp
 .Em Compatibility commands for USL-style VT's
 .Pp
-.Nm pcvt
+.Nm
 supports a subset of the USL-style commands used to control
 the virtual terminal interface.
 This feature is mainly intended to allow
@@ -693,18 +693,18 @@ function calls
 .It Pa /dev/ttyv?
 .It Pa /dev/console
 Device nodes to access the
-.Nm pcvt
+.Nm
 driver
 .It Pa i386/isa/pcvt/pcvt_conf.h
 .Pq relative to the kernel source tree
 Documents the various compile-time options to tailor
-.Nm pcvt .
+.Nm .
 .Sh HISTORY
 The
-.Nm pcvt
+.Nm
 driver has been developed for and contributed to 386BSD 0.1.
 Since then
-.Nm pcvt
+.Nm
 has become a standard part of
 .Fx ,
 .Nx
@@ -712,7 +712,7 @@ and
 OpenBSD.
 Since
 .Fx 5.0 ,
-.Nm pcvt
+.Nm
 is
 .Fx
 specific with support for
diff --git a/share/man/man4/ppp.4 b/share/man/man4/ppp.4
index d33e77e..4015ff6 100644
--- a/share/man/man4/ppp.4
+++ b/share/man/man4/ppp.4
@@ -44,11 +44,11 @@
 .Cd "pseudo-device ppp" Op Ar count
 .Sh DESCRIPTION
 The
-.Nm ppp
+.Nm
 interface allows serial lines to be used as network interfaces using the
 .Em point-to-point
 protocol.  The
-.Nm ppp
+.Nm
 interface can use various types of compression and has many features over
 the
 .Xr sl 4
diff --git a/share/man/man4/pty.4 b/share/man/man4/pty.4
index 70f3480..bef7fb6 100644
--- a/share/man/man4/pty.4
+++ b/share/man/man4/pty.4
@@ -42,7 +42,7 @@
 .Cd "pseudo-device pty"
 .Sh DESCRIPTION
 The
-.Nm pty
+.Nm
 driver provides support for a device-pair termed a
 .Em pseudo terminal .
 A pseudo terminal is a pair of character devices, a
diff --git a/share/man/man4/sa.4 b/share/man/man4/sa.4
index 4e4fdc0..649dc72 100644
--- a/share/man/man4/sa.4
+++ b/share/man/man4/sa.4
@@ -36,7 +36,7 @@
 .Cd device sa1 at scbus0 target 4 unit 0
 .Sh DESCRIPTION
 The
-.Nm sa
+.Nm
 driver provides support for all
 .Tn SCSI
 devices of the sequential access class that are attached to the system
@@ -168,7 +168,7 @@ block devices.  This has not been determined yet, and they are treated
 as separate behaviors by the driver at this time.)
 .Sh IOCTLS
 The
-.Nm sa
+.Nm
 driver supports all of the ioctls of
 .Xr mtio 4 .
 .Sh FILES
@@ -211,7 +211,7 @@ None.
 .Xr scsi 4
 .Sh HISTORY
 The
-.Nm sa
+.Nm
 driver was written for the
 .Tn CAM
 .Tn SCSI
diff --git a/share/man/man4/sd.4 b/share/man/man4/sd.4
index ff7af7f..3807b66 100644
--- a/share/man/man4/sd.4
+++ b/share/man/man4/sd.4
@@ -33,7 +33,7 @@
 .Nd SCSI disk driver
 .Sh DESCRIPTION
 The
-.Nm sd
+.Nm
 driver has been replaced by the 
 .Xr da 4
 driver.
diff --git a/share/man/man4/ses.4 b/share/man/man4/ses.4
index b518471..aa41885 100644
--- a/share/man/man4/ses.4
+++ b/share/man/man4/ses.4
@@ -35,7 +35,7 @@
 .Cd device ses
 .Sh DESCRIPTION
 The
-.Nm ses
+.Nm
 driver provides support for all
 .Tn SCSI
 devices of the environmental services class that are attached to the system
@@ -56,7 +56,7 @@ before a
 SCSI Environmental Services device can be configured.
 .Sh KERNEL CONFIGURATION
 It is only necessary to explicitly configure one
-.Nm ses
+.Nm
 device; data structures are dynamically allocated as devices are found
 on the
 .Tn SCSI
diff --git a/share/man/man4/sio.4 b/share/man/man4/sio.4
index c857141..4f7848d 100644
--- a/share/man/man4/sio.4
+++ b/share/man/man4/sio.4
@@ -105,7 +105,7 @@ Minor numbering:
 .Ed
 .Sh DESCRIPTION
 The
-.Nm sio
+.Nm
 driver provides support for NS8250-, NS16450-, NS16550 and NS16550A-based
 .Tn EIA
 .Tn RS-232C
@@ -194,7 +194,7 @@ Choose a port containing an IRQ status register for forwards compatibility,
 and the highest possible port for consistency.
 .Pp
 Serial ports controlled by the
-.Nm sio
+.Nm
 driver can be used for both `callin' and `callout'.
 For each port there is a callin device and a callout device.
 The minor number of the callout device is 128 higher
@@ -212,7 +212,7 @@ to work on general ports and need to open the port without waiting
 but are too stupid to do so.
 .Pp
 The
-.Nm sio
+.Nm
 driver also supports an initial-state and a lock-state control
 device for each of the callin and the callout "data" devices.
 The minor number of the initial-state device is 32 higher
diff --git a/share/man/man4/sl.4 b/share/man/man4/sl.4
index b4bb231..58f9846 100644
--- a/share/man/man4/sl.4
+++ b/share/man/man4/sl.4
@@ -44,11 +44,11 @@
 .Cd "pseudo-device sl" Op Ar count
 .Sh DESCRIPTION
 The
-.Nm sl
+.Nm
 interface allows serial lines to be used as network interfaces using the
 .Em slip
 protocol.  The
-.Nm sl
+.Nm
 interface can use Van Jacobson TCP header compression and ICMP filtering.
 This is arranged by using the various link-level flags to the
 .Xr ifconfig 8
diff --git a/share/man/man4/smp.4 b/share/man/man4/smp.4
index 4bae004..4946293 100644
--- a/share/man/man4/smp.4
+++ b/share/man/man4/smp.4
@@ -30,7 +30,7 @@
 .Nm SMP
 .Nd description of the FreeBSD Symmetric MultiProcessor kernel.
 .Sh SYNOPSIS
-.Nm SMP
+.Nm
 .Sh DESCRIPTION
 The
 .Nm 
diff --git a/share/man/man4/snp.4 b/share/man/man4/snp.4
index 082a649..7fde378 100644
--- a/share/man/man4/snp.4
+++ b/share/man/man4/snp.4
@@ -20,9 +20,9 @@
 and watch activities on it.
 
 To associate a given
-.Nm snp
+.Nm
 device with a tty to be observed,  open the
-.Nm snp
+.Nm
 device and then use the SNPSTTY ioctl.
 The argument passed to the IOCTL is the address of a variable of type
 dev_t.
@@ -31,7 +31,7 @@ the snp device from a tty.
 .Pp
 The SNPGTTY ioctl returns information about the current tty attached to
 the open
-.Nm snp
+.Nm
 device.
 .Pp
 The FIONREAD ioctl returns a positive value equal to the number of characters
@@ -43,7 +43,7 @@ device overflow occured, device detached.
 .It Dv SNP_TTYCLOSE
 tty not attached.
 .It Dv SNP_DETACH
-.Nm snp
+.Nm
 device has been detached by user or tty device has been closed
 and detached.
 .Sh SEE ALSO
@@ -52,7 +52,7 @@ and detached.
 .Xr watch 8
 .Sh RESTRICTIONS
 Only the superuser may access the
-.Nm snp
+.Nm
 devices.
 .Sh BUGS
 While in line mode, user input can't be seen.
@@ -61,6 +61,6 @@ No signals may be sent to the observed tty.
 .An Ugen J.S. Antsilevich Aq ugen@NetVision.net.il
 .Sh HISTORY
 The
-.Nm snp
+.Nm
 device first appeared in
 .Fx 2.1 .
diff --git a/share/man/man4/st.4 b/share/man/man4/st.4
index 39f5242..a654c37 100644
--- a/share/man/man4/st.4
+++ b/share/man/man4/st.4
@@ -33,7 +33,7 @@
 .Nd SCSI tape driver
 .Sh DESCRIPTION
 The
-.Nm st
+.Nm
 driver has been replaced by the 
 .Xr sa 4
 driver.
diff --git a/share/man/man4/stf.4 b/share/man/man4/stf.4
index 5341d76..e9299bf 100644
--- a/share/man/man4/stf.4
+++ b/share/man/man4/stf.4
@@ -67,7 +67,7 @@ valid 6to4 address needs to be configured to the interface.
 .Dq A valid 6to4 address
 is an address which has the following properties.
 If any of the following properties are not satisfied,
-.Nm stf
+.Nm
 raises runtime error on packet transmission.
 Read the specification for more details.
 .Bl -bullet
diff --git a/share/man/man4/syncer.4 b/share/man/man4/syncer.4
index 95f2246..8d4b104 100644
--- a/share/man/man4/syncer.4
+++ b/share/man/man4/syncer.4
@@ -31,7 +31,7 @@
 .Nm syncer
 .Nd filesystem synchronizer kernel process
 .Sh SYNOPSIS
-.Nm syncer
+.Nm
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/tap.4 b/share/man/man4/tap.4
index 2208475..cbd4b75 100644
--- a/share/man/man4/tap.4
+++ b/share/man/man4/tap.4
@@ -11,25 +11,25 @@
 .Cd pseudo-device tap
 .Sh DESCRIPTION
 The
-.Nm tap
+.Nm
 interface is a software loopback mechanism that can be loosely
 described as the network interface analog of the
 .Xr pty 4 ,
 that is,
-.Nm tap
+.Nm
 does for network interfaces what the
 .Nm pty
 driver does for terminals.
 .Pp
 The
-.Nm tap
+.Nm
 driver, like the
 .Nm pty
 driver, provides two interfaces: an interface like the usual facility
 it is simulating
 .Po
 an Ethernet network interface in the case of
-.Nm tap ,
+.Nm ,
 or a terminal for
 .Nm pty
 .Pc ,
@@ -200,11 +200,11 @@ device is not open, output frames are thrown away rather than
 letting them pile up.
 .Pp
 The 
-.Nm tap
+.Nm
 device is also can be used with the VMware port as a replacement
 for the old VMnet device driver. The driver uses the minor number
 to select between
-.Nm tap
+.Nm
 and
 .Nm vmnet
 devices. VMnet minor numbers begin at
diff --git a/share/man/man4/termios.4 b/share/man/man4/termios.4
index 777d33e..c78aa6c 100644
--- a/share/man/man4/termios.4
+++ b/share/man/man4/termios.4
@@ -1091,7 +1091,7 @@ is set, the receiver is enabled.  Otherwise, no character is
 received. 
 Not all hardware supports this bit.  In fact, this flag
 is pretty silly and if it were not part of the
-.Nm termios
+.Nm
 specification
 it would be omitted.
 .Pp
diff --git a/share/man/man4/tun.4 b/share/man/man4/tun.4
index 19b199a..e9d2238 100644
--- a/share/man/man4/tun.4
+++ b/share/man/man4/tun.4
@@ -12,25 +12,25 @@
 .Cd pseudo-device tun
 .Sh DESCRIPTION
 The
-.Nm tun
+.Nm
 interface is a software loopback mechanism that can be loosely
 described as the network interface analog of the
 .Xr pty 4 ,
 that is,
-.Nm tun
+.Nm
 does for network interfaces what the
 .Nm pty
 driver does for terminals.
 .Pp
 The
-.Nm tun
+.Nm
 driver, like the
 .Nm pty
 driver, provides two interfaces: an interface like the usual facility
 it is simulating
 .Po
 a network interface in the case of
-.Nm tun ,
+.Nm ,
 or a terminal for
 .Nm pty
 .Pc ,
diff --git a/share/man/man4/ukbd.4 b/share/man/man4/ukbd.4
index f1bc65f..359e526 100644
--- a/share/man/man4/ukbd.4
+++ b/share/man/man4/ukbd.4
@@ -142,7 +142,7 @@ device ukbd
 .Ed
 .Pp
 Add the
-.Nm ukbd
+.Nm
 driver to the kernel.
 .Sh SEE ALSO
 .Xr kbdcontrol 1 ,
@@ -154,7 +154,7 @@ driver to the kernel.
 .\".Sh HISTORY
 .Sh AUTHORS
 The
-.Nm ukbd
+.Nm
 driver was written by
 .An Lennart Augustsson Aq augustss@cs.chalmers.se
 for
diff --git a/share/man/man4/umass.4 b/share/man/man4/umass.4
index 72b1d3b..aa40edb 100644
--- a/share/man/man4/umass.4
+++ b/share/man/man4/umass.4
@@ -69,7 +69,7 @@ SCSI drives,
 .Dl device pass
 .Pp
 Add the
-.Nm umass
+.Nm
 driver to the kernel.
 .Pp
 .Dl camcontrol rescan 0
@@ -102,7 +102,7 @@ Create a new FAT type filesystem.
 .\".Sh HISTORY
 .Sh AUTHORS
 The
-.Nm umass
+.Nm
 driver was written by
 .An MAEKAWA Masahide Aq bishop@rr.iij4u.or.jp
 and
diff --git a/share/man/man4/ums.4 b/share/man/man4/ums.4
index 2b8fe96..8f08d93 100644
--- a/share/man/man4/ums.4
+++ b/share/man/man4/ums.4
@@ -67,7 +67,7 @@ blocking device node
 .Dl device ums
 .Pp
 Add the
-.Nm ums
+.Nm
 driver to the kernel.
 .Pp
 .Dl moused -p /dev/ums0 -t auto
@@ -108,7 +108,7 @@ For XFree86 3.3.1 the entry should be:
 .\".Sh HISTORY
 .Sh AUTHORS
 The
-.Nm ums
+.Nm
 driver was written by
 .An Lennart Augustsson Aq augustss@cs.chalmers.se
 for
diff --git a/share/man/man4/uscanner.4 b/share/man/man4/uscanner.4
index ed35135..85761e0 100644
--- a/share/man/man4/uscanner.4
+++ b/share/man/man4/uscanner.4
@@ -117,7 +117,7 @@ must be configured in the kernel as well.
 .\".Sh HISTORY
 .Sh AUTHORS
 The
-.Nm uscanner
+.Nm
 driver was written by
 .An Nick Hibma Aq n_hibma@FreeBSD.org .
 .Pp
diff --git a/share/man/man4/vinum.4 b/share/man/man4/vinum.4
index 54eca9b..203ed6e 100644
--- a/share/man/man4/vinum.4
+++ b/share/man/man4/vinum.4
@@ -165,7 +165,7 @@ pseudo-device	vinum
 .Pp
 .Ss DEBUG OPTIONS
 The current version of
-.Nm vinum ,
+.Nm ,
 both the kernel module and the user program
 .Xr vinum 8 ,
 include significant debugging support.  It is not recommended to remove
@@ -204,10 +204,10 @@ is part of the base
 .Fx
 system.  It does not require installation.
 To start it, start the
-.Nm vinum
+.Nm
 program, which will load the kld if it is not already present.
 Before using
-.Nm vinum ,
+.Nm ,
 it must be configured.  See
 .Xr vinum 8
 for information on how to create a
@@ -229,7 +229,8 @@ at boot time.
 If
 .Nm
 is loaded as a kld (the recommended way), the
-.Nm vinum Ar stop
+.Nm
+.Ar stop
 command will unload it.  You can also do this with the
 .Nm kldunload
 command.
@@ -982,14 +983,15 @@ the
 .Ss Reporting problems with Vinum
 .Pp
 If you find any bugs in
-.Nm vinum ,
+.Nm ,
 please report them to Greg Lehey <grog@lemis.com>.  Supply the following
 information:
 .Pp
 .Bl -bullet
 .It
 The output of the
-.Nm vinum list
+.Nm
+.Cm list
 command.
 .It
 Any messages printed in
@@ -1003,7 +1005,7 @@ If you have a panic, a stack trace as described above.
 .Sh AUTHORS
 .An Greg Lehey Aq grog@lemis.com .
 .Sh HISTORY
-.Nm vinum
+.Nm
 first appeared in
 .Fx 3.0 .
 The RAID-5 component of
diff --git a/share/man/man4/vn.4 b/share/man/man4/vn.4
index 8b09045..47b9f9c 100644
--- a/share/man/man4/vn.4
+++ b/share/man/man4/vn.4
@@ -59,7 +59,7 @@ how to properly configure disks and pseudo-devices in a kernel
 configuration file.
 .Pp
 In order to compile in support for the
-.Nm vn ,
+.Nm ,
 you must add a line similar
 to the following to your kernel configuration file:
 .Bd -unfilled -offset indent
@@ -71,7 +71,7 @@ may also exist as a kernel module to be automatically loaded into the
 system when you run the vnconfig command for the first time.
 .Pp
 There is a run-time utility that is used for configuring
-.Nm vn Ns 's .
+.Nm Ns 's .
 See
 .Xr vnconfig 8
 for more information.
diff --git a/share/man/man4/worm.4 b/share/man/man4/worm.4
index 8eb706d..83b9a1e 100644
--- a/share/man/man4/worm.4
+++ b/share/man/man4/worm.4
@@ -44,7 +44,7 @@
 None.
 .Sh DESCRIPTION
 The
-.Nm worm
+.Nm
 driver was provided under
 .Fx
 releases prior to
diff --git a/share/man/man4/xpt.4 b/share/man/man4/xpt.4
index fafba6f..9fd4fd3 100644
--- a/share/man/man4/xpt.4
+++ b/share/man/man4/xpt.4
@@ -37,19 +37,19 @@
 None.
 .Sh DESCRIPTION
 The
-.Nm xpt
+.Nm
 driver provides a way for userland applications to issue certain CAM CCBs
 to the kernel. 
 .Pp
 Since the
-.Nm xpt
+.Nm
 driver allows direct access to the CAM subsystem, system administrators
 should exercise caution when granting access to this driver.  If used
 improperly, this driver can allow userland applications to crash a machine
 or cause data loss.
 .Sh KERNEL CONFIGURATION
 There is no kernel configuration required for the
-.Nm xpt
+.Nm
 driver.  It is enabled when
 .Tn SCSI
 support is enabled in the kernel.  There is one instance of the xpt driver
@@ -86,7 +86,7 @@ corresponding to the device in question.
 .Bl -tag -width 01234567890 -compact
 .It Pa /dev/xpt0
 Character device node for the
-.Nm xpt
+.Nm
 driver. 
 .El
 .Sh DIAGNOSTICS
diff --git a/share/man/man4/yp.4 b/share/man/man4/yp.4
index 5d04497..5d60884 100644
--- a/share/man/man4/yp.4
+++ b/share/man/man4/yp.4
@@ -35,7 +35,7 @@
 .Nm yp
 .Nd description of the YP/NIS system
 .Sh SYNOPSIS
-.Nm yp
+.Nm
 .Sh DESCRIPTION
 The
 .Nm YP
diff --git a/share/man/man5/core.5 b/share/man/man5/core.5
index 0b287e1..5dc298d 100644
--- a/share/man/man5/core.5
+++ b/share/man/man5/core.5
@@ -127,6 +127,6 @@ command can be used:
 .Xr sysctl 8
 .Sh HISTORY
 A
-.Nm core
+.Nm
 file format appeared in
 .At v6 .
diff --git a/share/man/man5/devfs.5 b/share/man/man5/devfs.5
index 7344508..69500c4 100644
--- a/share/man/man5/devfs.5
+++ b/share/man/man5/devfs.5
@@ -48,7 +48,7 @@
 devfs	/devs	devfs rw 0 0
 .Sh DESCRIPTION
 The device file system, or
-.Nm devfs ,
+.Nm ,
 provides access to kernel's device 
 namespace in the global filesystem namespace.
 The conventional mount point is
diff --git a/share/man/man5/disktab.5 b/share/man/man5/disktab.5
index 4423b0f..1be240c 100644
--- a/share/man/man5/disktab.5
+++ b/share/man/man5/disktab.5
@@ -53,7 +53,7 @@ The format is patterned
 after the
 .Xr termcap 5
 terminal data base.  Entries in 
-.Nm disktab
+.Nm
 consist of a number of `:' separated fields.  The
 first entry for each disk gives the names which are
 known for the disk, separated by `|' characters.  The
diff --git a/share/man/man5/ethers.5 b/share/man/man5/ethers.5
index 54e104d..aaa665d 100644
--- a/share/man/man5/ethers.5
+++ b/share/man/man5/ethers.5
@@ -38,7 +38,7 @@
 .Nd ethernet address database
 .Sh DESCRIPTION
 The
-.Nm ethers
+.Nm
 database contains information regarding known 48-bit ethernet addresses
 of hosts on an Internetwork.
 The data is stored in a file called
@@ -90,7 +90,7 @@ structure, and a hostname stored as a character string.
 .Bl -tag -width /etc/services -compact
 .It Pa /etc/ethers
 The
-.Nm ethers
+.Nm
 file resides in
 .Pa /etc .
 .El
@@ -99,5 +99,5 @@ file resides in
 .Xr yp 4
 .Sh HISTORY
 The
-.Nm ethers
+.Nm
 format is based on the format used in SunOS 4.1.x.
diff --git a/share/man/man5/fbtab.5 b/share/man/man5/fbtab.5
index 7abacb9..e01f2f0 100644
--- a/share/man/man5/fbtab.5
+++ b/share/man/man5/fbtab.5
@@ -9,7 +9,7 @@
 .Nd change device protection upon login
 .Sh DESCRIPTION
 The
-.Nm fbtab
+.Nm
 file contains a number of lines specifying a device together with a list
 of devices with associated protections. 
 Comments start with a # and extend to the end of the line.
@@ -33,7 +33,7 @@ and gid arguments.
 .Bl -tag -width /etc/fbtab -compact
 .It Pa /etc/fbtab
 The
-.Nm fbtab
+.Nm
 file resides in
 .Pa /etc .
 .El
diff --git a/share/man/man5/fdesc.5 b/share/man/man5/fdesc.5
index 7e9ff0d..2af50dd 100644
--- a/share/man/man5/fdesc.5
+++ b/share/man/man5/fdesc.5
@@ -48,7 +48,7 @@
 fdesc	/dev/fd	fdesc rw 0 0
 .Sh DESCRIPTION
 The file-descriptor file system, or
-.Nm fdesc ,
+.Nm ,
 provides access to the per-process file descriptor
 namespace in the global filesystem namespace.
 The conventional mount point is
diff --git a/share/man/man5/fdescfs.5 b/share/man/man5/fdescfs.5
index 7e9ff0d..2af50dd 100644
--- a/share/man/man5/fdescfs.5
+++ b/share/man/man5/fdescfs.5
@@ -48,7 +48,7 @@
 fdesc	/dev/fd	fdesc rw 0 0
 .Sh DESCRIPTION
 The file-descriptor file system, or
-.Nm fdesc ,
+.Nm ,
 provides access to the per-process file descriptor
 namespace in the global filesystem namespace.
 The conventional mount point is
diff --git a/share/man/man5/fstab.5 b/share/man/man5/fstab.5
index 1627771..2b490aa 100644
--- a/share/man/man5/fstab.5
+++ b/share/man/man5/fstab.5
@@ -42,24 +42,24 @@
 .Fd #include <fstab.h>
 .Sh DESCRIPTION
 The file
-.Nm fstab
+.Nm
 contains descriptive information about the various file
 systems.
-.Nm fstab
+.Nm
 is only read by programs, and not written;
 it is the duty of the system administrator to properly create 
 and maintain this file.
 Each filesystem is described on a separate line;
 fields on each line are separated by tabs or spaces.
 The order of records in
-.Nm fstab
+.Nm
 is important because
 .Xr fsck 8 ,
 .Xr mount 8 ,
 and
 .Xr umount 8
 sequentially iterate through
-.Nm fstab
+.Nm
 doing their thing.
 .Pp
 The first field,
@@ -240,7 +240,7 @@ and
 .Bl -tag -width /etc/fstab -compact
 .It Pa /etc/fstab
 The file
-.Nm fstab
+.Nm
 resides in
 .Pa /etc .
 .El
diff --git a/share/man/man5/group.5 b/share/man/man5/group.5
index c9023a4..44e2849 100644
--- a/share/man/man5/group.5
+++ b/share/man/man5/group.5
@@ -151,7 +151,7 @@ may still have this limits.
 The
 .Xr passwd 1
 command does not change the
-.Nm group
+.Nm
 passwords.
 .Sh HISTORY
 A
diff --git a/share/man/man5/hosts.5 b/share/man/man5/hosts.5
index 3708958..058e8c4 100644
--- a/share/man/man5/hosts.5
+++ b/share/man/man5/hosts.5
@@ -40,7 +40,7 @@
 .Nd host name data base
 .Sh DESCRIPTION
 The
-.Nm hosts
+.Nm
 file contains information regarding
 the known hosts on the network.
 It can be used in conjunction with DNS, and the NIS
@@ -95,7 +95,7 @@ or comment character.
 .Bl -tag -width /etc/hosts -compact
 .It Pa /etc/hosts
 The
-.Nm hosts
+.Nm
 file resides in
 .Pa /etc .
 .El
diff --git a/share/man/man5/hosts.equiv.5 b/share/man/man5/hosts.equiv.5
index 90ab7b7..5a84d8a 100644
--- a/share/man/man5/hosts.equiv.5
+++ b/share/man/man5/hosts.equiv.5
@@ -40,7 +40,7 @@
 .Nd trusted remote host name and user data base
 .Sh DESCRIPTION
 The
-.Nm hosts.equiv
+.Nm
 and
 .Nm .rhosts
 files contain information regarding
@@ -119,7 +119,7 @@ except users from netgroup
 .Bl -tag -width /etc/hosts.equivxxx -compact
 .It Pa /etc/hosts.equiv
 The
-.Nm hosts.equiv
+.Nm
 file resides in
 .Pa /etc .
 .It Pa $HOME/.rhosts
diff --git a/share/man/man5/hosts.lpd.5 b/share/man/man5/hosts.lpd.5
index d252d60..e5041fa 100644
--- a/share/man/man5/hosts.lpd.5
+++ b/share/man/man5/hosts.lpd.5
@@ -39,7 +39,7 @@
 .Nd trusted hosts that may use local print services
 .Sh DESCRIPTION
 The
-.Nm hosts.lpd
+.Nm
 file contains a list of hostnames or IP addresses
 that are allowed to use your local print services.
 List every hostname or IP address on a line itself.
@@ -47,7 +47,7 @@ List every hostname or IP address on a line itself.
 .Bl -tag -width /etc/hosts.lpdxxxxx -compact
 .It Pa /etc/hosts.lpd
 The
-.Nm hosts.lpd
+.Nm
 file resides in
 .Pa /etc .
 .Sh SEE ALSO
diff --git a/share/man/man5/intro.5 b/share/man/man5/intro.5
index a500306..87ed18b 100644
--- a/share/man/man5/intro.5
+++ b/share/man/man5/intro.5
@@ -50,6 +50,6 @@ location of most system configuration files
 .El
 .Sh HISTORY
 The
-.Nm intro
+.Nm
 section manual page appeared in
 .Fx 2.2 .
diff --git a/share/man/man5/kernfs.5 b/share/man/man5/kernfs.5
index 1976f13..b4244d6 100644
--- a/share/man/man5/kernfs.5
+++ b/share/man/man5/kernfs.5
@@ -42,7 +42,7 @@ kern		/kern	kernfs	rw 0 0
 .Ed
 .Sh DESCRIPTION
 The kernel file system, or
-.Nm kernfs ,
+.Nm ,
 provides access to information on the currently running kernel.
 It is normally mounted on
 .Pa /kern .
@@ -105,7 +105,7 @@ is also available from
 .Bl -tag -width /kern/XXXXXXX
 .It Pa /kern
 normal mount point for the
-.Nm kernfs .
+.Nm .
 .El
 .Sh SEE ALSO
 .Xr sysctl 3 ,
diff --git a/share/man/man5/linprocfs.5 b/share/man/man5/linprocfs.5
index 0653934..4f2df68 100644
--- a/share/man/man5/linprocfs.5
+++ b/share/man/man5/linprocfs.5
@@ -14,7 +14,7 @@ linproc		/compat/linux/proc	linprocfs	rw 0 0
 .Ed
 .Sh DESCRIPTION
 The Linux process file system, or
-.Nm linprocfs ,
+.Nm ,
 emulates a subset of Linux' process file system and is required for
 the complete operation of some Linux binaries.
 .Pp
@@ -52,7 +52,7 @@ group.
 .Bl -tag -width /compat/linux/proc/self/XXXXXXX -compact
 .It Pa /compat/linux/proc
 normal mount point for the
-.Nm linprocfs .
+.Nm .
 .It Pa /compat/linux/proc/cpuinfo
 CPU vendor and model information in human-readable form.
 .It Pa /compat/linux/proc/meminfo
diff --git a/share/man/man5/networks.5 b/share/man/man5/networks.5
index 6bd1285..cb91b41 100644
--- a/share/man/man5/networks.5
+++ b/share/man/man5/networks.5
@@ -40,7 +40,7 @@
 .Nd network name data base
 .Sh DESCRIPTION
 The
-.Nm networks
+.Nm
 file contains information regarding
 the known networks which comprise the
 .Tn DARPA
@@ -74,7 +74,7 @@ delimiter, newline, or comment character.
 .Bl -tag -width /etc/networks -compact
 .It Pa /etc/networks
 The
-.Nm networks
+.Nm
 file resides in
 .Pa /etc .
 .El
diff --git a/share/man/man5/nsswitch.conf.5 b/share/man/man5/nsswitch.conf.5
index ca281c8..7734707 100644
--- a/share/man/man5/nsswitch.conf.5
+++ b/share/man/man5/nsswitch.conf.5
@@ -50,7 +50,7 @@ containing information regarding hosts, users (passwords), groups, etc.
 Each database comes from a source (such as local files, DNS, and
 .Tn NIS ) ,
 and the order to look up the sources is specified in
-.Nm nsswitch.conf .
+.Nm .
 .Pp
 Each entry in 
 .Nm
@@ -199,7 +199,7 @@ To ensure compatibility with previous and current implementations, the
 source must appear alone for a given database.
 .Ss Default source lists
 If, for any reason,
-.Nm nsswitch.conf
+.Nm
 doesn't exist, or it has missing or corrupt entries,
 .Xr nsdispatch 3
 will default to an entry of
diff --git a/share/man/man5/passwd.5 b/share/man/man5/passwd.5
index 671d42b..7b49790 100644
--- a/share/man/man5/passwd.5
+++ b/share/man/man5/passwd.5
@@ -44,7 +44,7 @@
 .Nd format of the password file
 .Sh DESCRIPTION
 The
-.Nm passwd
+.Nm
 files are the local source of password information.
 They can be used in conjunction with the Hesiod domains
 .Sq passwd 
diff --git a/share/man/man5/periodic.conf.5 b/share/man/man5/periodic.conf.5
index aefa233..0c9fafe 100644
--- a/share/man/man5/periodic.conf.5
+++ b/share/man/man5/periodic.conf.5
@@ -33,7 +33,7 @@
 .Nd periodic job configuration information.
 .Sh DESCRIPTION
 The file
-.Nm periodic.conf
+.Nm
 contains a description of how daily, weekly and montly system maintenance
 jobs should run.
 It resides in the
diff --git a/share/man/man5/procfs.5 b/share/man/man5/procfs.5
index 06812b1..62141aa 100644
--- a/share/man/man5/procfs.5
+++ b/share/man/man5/procfs.5
@@ -14,7 +14,7 @@ proc		/proc	procfs	rw 0 0
 .Ed
 .Sh DESCRIPTION
 The process file system, or
-.Nm procfs ,
+.Nm ,
 implements a view of the system process table inside the file system.
 It is normally mounted on
 .Pa /proc ,
@@ -202,7 +202,7 @@ group.
 .Bl -tag -width /proc/curproc/XXXXXXX -compact
 .It Pa /proc
 normal mount point for the
-.Nm procfs .
+.Nm .
 .It Pa /proc/pid
 directory containing process information for process 
 .Pa pid .
diff --git a/share/man/man5/protocols.5 b/share/man/man5/protocols.5
index 4756025..4ffab0f 100644
--- a/share/man/man5/protocols.5
+++ b/share/man/man5/protocols.5
@@ -40,7 +40,7 @@
 .Nd protocol name data base
 .Sh DESCRIPTION
 The
-.Nm protocols
+.Nm
 file contains information regarding the known protocols used in the
 .Tn DARPA
 Internet.  For each protocol a single line should be present
@@ -63,7 +63,7 @@ or comment character.
 .Bl -tag -width /etc/protocols -compact
 .It Pa /etc/protocols
 The
-.Nm protocols
+.Nm
 file resides in
 .Pa /etc .
 .El
diff --git a/share/man/man5/remote.5 b/share/man/man5/remote.5
index 0f89a7c..261687f 100644
--- a/share/man/man5/remote.5
+++ b/share/man/man5/remote.5
@@ -186,7 +186,7 @@ arpavax|ax:\e
 .Bl -tag -width /etc/remote -compact
 .It Pa /etc/remote
 The
-.Nm remote
+.Nm
 host description file
 resides in
 .Pa /etc .
diff --git a/share/man/man5/services.5 b/share/man/man5/services.5
index e0d9e2c..a4a31b3 100644
--- a/share/man/man5/services.5
+++ b/share/man/man5/services.5
@@ -40,7 +40,7 @@
 .Nd service name data base
 .Sh DESCRIPTION
 The
-.Nm services
+.Nm
 file contains information regarding
 the known services available in the
 Internet.
@@ -78,7 +78,7 @@ at the location where the ``+'' appears.
 .Bl -tag -width /etc/services -compact
 .It Pa /etc/services
 The
-.Nm services
+.Nm
 file resides in
 .Pa /etc .
 .El
diff --git a/share/man/man5/shells.5 b/share/man/man5/shells.5
index 70626ad..d01cdce 100644
--- a/share/man/man5/shells.5
+++ b/share/man/man5/shells.5
@@ -40,7 +40,7 @@
 .Nd shell database
 .Sh DESCRIPTION
 The
-.Nm shells
+.Nm
 file contains a list of the shells on the system.
 For each shell a single line should be present, consisting of the
 shell's path, relative to root.
@@ -53,7 +53,7 @@ Blank lines are also ignored.
 .Bl -tag -width /etc/shells -compact
 .It Pa /etc/shells
 The
-.Nm shells
+.Nm
 file resides in
 .Pa /etc .
 .El
diff --git a/share/man/man5/stab.5 b/share/man/man5/stab.5
index 29d2836..b3f9e99 100644
--- a/share/man/man5/stab.5
+++ b/share/man/man5/stab.5
@@ -217,6 +217,6 @@ compiled files:
 More basic types are needed.
 .Sh HISTORY
 The
-.Nm stab
+.Nm
 file appeared in
 .Bx 4.0 .
diff --git a/share/man/man5/utmp.5 b/share/man/man5/utmp.5
index 8a9c4b7..ca0d4fd 100644
--- a/share/man/man5/utmp.5
+++ b/share/man/man5/utmp.5
@@ -48,7 +48,7 @@ The file
 .Aq Pa utmp.h
 declares the structures used to record information about current
 users in the file
-.Nm utmp ,
+.Nm ,
 logins and logouts in the file
 .Nm wtmp ,
 and last logins in the file
@@ -110,14 +110,14 @@ record is written,
 .\" .Xr libutil 3
 .\" routine
 the file
-.Nm utmp
+.Nm
 is opened and the
 .Fa utmp
 record for the user inserted.
 This record remains there until
 the user logs out at which time it is deleted.
 The
-.Nm utmp
+.Nm
 file is used by the programs
 .Xr rwho 1 ,
 .Xr users 1 ,
@@ -188,13 +188,16 @@ indicates the new time.
 .Bl -tag -width /var/log/lastlog -compact
 .It Pa /var/run/utmp
 The
-.Nm utmp file.
+.Nm
+file.
 .It Pa /var/log/wtmp
 The
-.Nm wtmp file.
+.Nm wtmp
+file.
 .It Pa /var/log/lastlog
 The
-.Nm lastlog file.
+.Nm lastlog
+file.
 .El
 .Sh SEE ALSO
 .Xr last 1 ,
@@ -205,7 +208,7 @@ The
 .Xr init 8
 .Sh HISTORY
 A
-.Nm utmp
+.Nm
 and
 .Nm wtmp
 file format appeared in
diff --git a/share/man/man6/intro.6 b/share/man/man6/intro.6
index 8b77f26..db541b6 100644
--- a/share/man/man6/intro.6
+++ b/share/man/man6/intro.6
@@ -63,6 +63,6 @@ games tutorials
 .El
 .Sh HISTORY
 The
-.Nm intro
+.Nm
 section manual page appeared in
 .Fx 2.2 .
diff --git a/share/man/man7/ascii.7 b/share/man/man7/ascii.7
index 7bfbe2b..74ff250 100644
--- a/share/man/man7/ascii.7
+++ b/share/man/man7/ascii.7
@@ -112,6 +112,6 @@ set:
 .El
 .Sh HISTORY
 An
-.Nm ascii
+.Nm
 manual page appeared in
 .At v7 .
diff --git a/share/man/man7/environ.7 b/share/man/man7/environ.7
index 856c932..44bfda7 100644
--- a/share/man/man7/environ.7
+++ b/share/man/man7/environ.7
@@ -199,6 +199,6 @@ unless you know what you are doing.
 .Xr termcap 5
 .Sh HISTORY
 The
-.Nm environ
+.Nm
 manual page appeared in
 .Bx 4.2 .
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index 73d3b6f..4126cec 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -688,6 +688,6 @@ the NIS maps
 .Xr fsck 8
 .Sh HISTORY
 A
-.Nm hier
+.Nm
 manual page appeared in
 .At v7 .
diff --git a/share/man/man7/intro.7 b/share/man/man7/intro.7
index b1bbd27..a5138ad 100644
--- a/share/man/man7/intro.7
+++ b/share/man/man7/intro.7
@@ -42,6 +42,6 @@
 This section contains miscellaneous documentation.
 .Sh HISTORY
 The
-.Nm intro
+.Nm
 section manual page appeared in
 .Bx 4.2 .
diff --git a/share/man/man8/crash.8 b/share/man/man8/crash.8
index 6fc1a10..30666a1 100644
--- a/share/man/man8/crash.8
+++ b/share/man/man8/crash.8
@@ -211,6 +211,6 @@ handbook (http://www.FreeBSD.org).
 .Xr savecore 8
 .Sh HISTORY
 A
-.Nm crash
+.Nm
 man page first appeared in
 .Fx 2.2 .
diff --git a/share/man/man8/intro.8 b/share/man/man8/intro.8
index 9b03f28..e848e04 100644
--- a/share/man/man8/intro.8
+++ b/share/man/man8/intro.8
@@ -67,6 +67,6 @@ should be consulted to understand how to interpret system
 crash dumps.
 .Sh HISTORY
 The
-.Nm intro
+.Nm
 section manual page appeared in
 .Bx 4.2 .
diff --git a/share/man/man8/picobsd.8 b/share/man/man8/picobsd.8
index 3f2795a..bb92953 100644
--- a/share/man/man8/picobsd.8
+++ b/share/man/man8/picobsd.8
@@ -112,7 +112,7 @@ and
 Each directory contains a configuration file with a name starting with
 .Pa PICOBSD .
 When building a custom
-.Nm PicoBSD ,
+.Nm ,
 it is important to review this file carefully.  The smallest possible kernel
 occupies about 600 kB after compression, and it is easy to have a kernel as
 large as 900 kB.  It is probably not possible to build a first
@@ -183,7 +183,7 @@ dynamic libraries, so the programs must be static.
 .\" .Sh ERRORS
 .Sh BOOTING PicoBSD
 To boot
-.Nm PicoBSD ,
+.Nm ,
 insert the floppy and reset the machine.  The boot procedure is similar to the
 standard
 .Fx
@@ -221,7 +221,7 @@ so if you run out of memory, unpredictable things can happen.
 .Pp
 If you have a disk driver and a disk with a swap partition on it, and the swap
 partition does not contain a dump you want to keep, you can use this swap with
-.Nm PicoBSD .
+.Nm .
 Use the
 .Xr swapon 8
 command.
@@ -244,7 +244,7 @@ Man page and Makefiles created by
 .An Greg Lehey Aq grog@lemis.com .
 .Sh BUGS
 In order to build 
-.Nm PicoBSD ,
+.Nm ,
 the kernel of the system on which it is built must have the
 .Nm vn
 driver installed.  
@@ -289,4 +289,4 @@ configurations do not build.
 There appears to be no way to get
 .Nm Emacs
 to run on
-.Nm PicoBSD .
+.Nm .
diff --git a/share/man/man8/rc.8 b/share/man/man8/rc.8
index 8cbe28d..877d880 100644
--- a/share/man/man8/rc.8
+++ b/share/man/man8/rc.8
@@ -39,7 +39,7 @@
 .Nm rc
 .Nd command scripts for auto\-reboot and daemon startup
 .Sh SYNOPSIS
-.Nm rc
+.Nm
 .Nm rc.conf
 .Nm rc.conf.local
 .Nm rc.d
@@ -139,11 +139,11 @@ is the command script which contains any necessary commands
 to be executed as the system is shut down.
 .Pp
 When an automatic reboot is in progress,
-.Nm rc
+.Nm
 is invoked with the argument
 .Em autoboot .
 The first portion of
-.Nm rc
+.Nm
 runs an
 .Xr fsck 8
 with option
@@ -152,13 +152,13 @@ to ``preen'' all the disks of minor inconsistencies resulting
 from the last system shutdown and to check for serious inconsistencies
 caused by hardware or software failure.
 If this auto-check and repair succeeds, then the second part of
-.Nm rc
+.Nm
 is run.
 .Pp
 The second part of
-.Nm rc ,
+.Nm ,
 which is run after an auto-reboot succeeds and also if
-.Nm rc
+.Nm
 is invoked when a single user shell terminates (see
 .Xr init 8 ) ,
 starts all the daemons on the system, preserves editor files
@@ -213,7 +213,7 @@ runs architecture specific programs.
 .Pp
 .Nm Rc.local
 is executed after the scripts above, but before the rest of the
-.Nm rc
+.Nm
 file is completed.
 In a default installation
 .Nm rc.local
diff --git a/share/man/man8/yp.8 b/share/man/man8/yp.8
index 5d04497..5d60884 100644
--- a/share/man/man8/yp.8
+++ b/share/man/man8/yp.8
@@ -35,7 +35,7 @@
 .Nm yp
 .Nd description of the YP/NIS system
 .Sh SYNOPSIS
-.Nm yp
+.Nm
 .Sh DESCRIPTION
 The
 .Nm YP
diff --git a/share/man/man9/at_exit.9 b/share/man/man9/at_exit.9
index b9edc58..9bb0103 100644
--- a/share/man/man9/at_exit.9
+++ b/share/man/man9/at_exit.9
@@ -43,7 +43,7 @@
 .Fn rm_at_exit "exitlist_fn func"
 .Sh DESCRIPTION
 The
-.Nm at_exit
+.Nm
 facility allows a kernel module to ensure that it is notified
 at any process exit.
 The function
diff --git a/share/man/man9/at_fork.9 b/share/man/man9/at_fork.9
index 8d6c624..24e7429 100644
--- a/share/man/man9/at_fork.9
+++ b/share/man/man9/at_fork.9
@@ -43,7 +43,7 @@
 .Fn rm_at_fork "forklist_fn func"
 .Sh DESCRIPTION
 The
-.Nm at_fork
+.Nm
 facility allows a kernel module to ensure that it is notified
 at any process fork.
 The function
diff --git a/share/man/man9/cd.9 b/share/man/man9/cd.9
index 2f6bc4b..f30ddf1 100644
--- a/share/man/man9/cd.9
+++ b/share/man/man9/cd.9
@@ -59,7 +59,7 @@ for more information on how to add quirk entries.
 This flag tell the driver not to probe the drive at attach time to see if
 there is a disk in the drive and find out what size it is.  This flag is
 currently unimplemented in the CAM
-.Nm cd
+.Nm
 driver.
 .It Dv CD_Q_BCD_TRACKS
 This flag is for broken drives that return the track numbers in packed BCD
diff --git a/share/man/man9/devfs_add_devswf.9 b/share/man/man9/devfs_add_devswf.9
index 489b948..11de088 100644
--- a/share/man/man9/devfs_add_devswf.9
+++ b/share/man/man9/devfs_add_devswf.9
@@ -40,7 +40,7 @@
 .Fn devfs_add_devswf "void *devsw" "int minor" "int chrblk" "uid_t uid" "gid_t gid" "int perms" "char *fmt" ...
 .Sh DESCRIPTION
 The call that adds an entry into devfs is
-.Nm devfs_add_devswf .
+.Nm .
 .Pp
 Its arguments are:
 .Bl -tag -width 8X
diff --git a/share/man/man9/devstat.9 b/share/man/man9/devstat.9
index 550903d..d416a5d 100644
--- a/share/man/man9/devstat.9
+++ b/share/man/man9/devstat.9
@@ -72,7 +72,7 @@ statistics, as its name implies.  The idea is to keep reasonably detailed
 statistics while utilizing a minimum amount of CPU time to record them.
 Thus, no statistical calculations are actually performed in the kernel
 portion of the
-.Nm devstat
+.Nm
 code. Instead, that is left for user programs to handle.
 .Pp
 .Fn devstat_add_entry
@@ -108,7 +108,7 @@ for a complete list of types.
 .It priority
 The device priority.  The priority is used to determine how devices are
 sorted within 
-.Nm devstat's
+.Nm devstat Ns 's
 list of devices.  Devices are sorted first by priority (highest to lowest),
 and then by attach order.  See below for a complete list of available
 priorities.
@@ -251,7 +251,7 @@ driver.  See below for a complete list of device types.
 .It priority
 This is the priority.  This is the first parameter used to determine where
 to insert a device in the
-.Nm devstat
+.Nm
 list.  The second parameter is attach order.  See below for a list of
 available priorities.
 .El
@@ -296,7 +296,7 @@ typedef enum {
 .Pp
 Devices have a priority associated with them, which controls roughly where
 they are placed in the
-.Nm devstat
+.Nm
 list.  The priorities are as follows:
 .Bd -literal -offset indent
 typedef enum {
diff --git a/share/man/man9/intro.9 b/share/man/man9/intro.9
index 56f6bfb..d58f5b6 100644
--- a/share/man/man9/intro.9
+++ b/share/man/man9/intro.9
@@ -104,6 +104,6 @@ The fewer the better.
 .Xr style 9
 .Sh HISTORY
 The
-.Nm intro
+.Nm
 section manual page appeared in
 .Fx 2.2 .
diff --git a/share/man/man9/microtime.9 b/share/man/man9/microtime.9
index bd0505c..e99d22f 100644
--- a/share/man/man9/microtime.9
+++ b/share/man/man9/microtime.9
@@ -86,7 +86,7 @@ execution time.
 .Xr tvtohz 9
 .Sh HISTORY
 The
-.Nm microtime
+.Nm
 and
 .Nm nanotime
 functions first appeared in
diff --git a/share/man/man9/posix4.9 b/share/man/man9/posix4.9
index fb3a6b8..ede4cf3 100644
--- a/share/man/man9/posix4.9
+++ b/share/man/man9/posix4.9
@@ -125,6 +125,6 @@ is a config option to build in POSIX.1B support in the kernel.
 .\" .Sh SEE ALSO
 .Sh HISTORY
 The
-.Nm posix1b
+.Nm
 section manual page appeared in
 .Fx 3.0 .
diff --git a/share/man/man9/rtalloc.9 b/share/man/man9/rtalloc.9
index db0d4b4..785d01c 100644
--- a/share/man/man9/rtalloc.9
+++ b/share/man/man9/rtalloc.9
@@ -60,7 +60,7 @@ When a route with the flag
 or
 .Dv RTF_PRCLONING
 is retrieved, and the action of those flags is not masked, the
-.Nm rtalloc
+.Nm
 facility automatically generates a new route using information in the
 old route as a template, and in the case of
 .Dv RTF_CLONING ,
@@ -179,7 +179,7 @@ value
 .Xr rtentry 9
 .Sh HISTORY
 The
-.Nm rtalloc
+.Nm
 facility first appeared in
 .Bx 4.2 ,
 although with much different internals.  The
diff --git a/share/man/man9/rtentry.9 b/share/man/man9/rtentry.9
index 0b334c5..da3abb5 100644
--- a/share/man/man9/rtentry.9
+++ b/share/man/man9/rtentry.9
@@ -262,7 +262,7 @@ Empty space available for protocol-specific information.
 .Xr rtalloc 9
 .Sh HISTORY
 The
-.Nm rtentry
+.Nm
 structure first appeared in
 .Bx 4.2 .
 The radix-tree representation of the routing table and the
diff --git a/share/man/man9/sleep.9 b/share/man/man9/sleep.9
index e414257..4fc430d 100644
--- a/share/man/man9/sleep.9
+++ b/share/man/man9/sleep.9
@@ -236,7 +236,7 @@ appeared in a very early version of Unix.
 appeared in
 .Bx 4.4 .
 .Pp
-.Nm Asleep/await 
+.Nm Asleep Ns / Ns Nm await 
 first appeared in
 .Fx 3.0
 and is designed to shift the burden of blocking
diff --git a/share/termcap/termcap.5 b/share/termcap/termcap.5
index 3dbcd89..0004c50 100644
--- a/share/termcap/termcap.5
+++ b/share/termcap/termcap.5
@@ -78,7 +78,7 @@ by giving a set of capabilities that they have and by describing
 how operations are performed.
 Padding requirements and initialization sequences
 are included in
-.Nm Ns .
+.Nm .
 .Pp
 Entries in
 .Nm
@@ -1248,7 +1248,7 @@ and the starting and ending columns in memory, in that order.
 .Xr terminfo
 capability is described for completeness.
 It is unlikely that any
-.Nm Ns \- Ns using
+.Nm Ns \-using
 program will support it.)
 .Pp
 If the terminal can retain display memory above the screen, then the
@@ -1266,7 +1266,7 @@ may bring down non-blank lines.
 .Ss Insert/Delete Character
 There are two basic kinds of intelligent terminals with respect to
 insert/delete character that can be described using
-.Nm Ns .
+.Nm .
 The most common insert/delete character operations affect only the characters
 on the current line and shift characters off the end of the line rigidly.
 Other terminals, such as the Concept\-100 and the Perkin Elmer Owl, make
@@ -1667,7 +1667,7 @@ the display for cursor addressing to work properly.
 This is also used for the Tektronix 4025, where
 .Sy \&ti
 sets the command character to be the one used by
-.Nm Ns .
+.Nm .
 .Pp
 Other capabilities
 include
@@ -1881,7 +1881,7 @@ the number of times to repeat it.
 (This is a
 .Xr terminfo
 feature that is unlikely to be supported by a program that uses
-.Nm Ns . )
+.Nm . )
 .Pp
 If the terminal has a settable command character, such as the
 Tektronix 4025, this can be indicated with