Fix a bunch of man pages to stop abusing the .Nm macro, along

with some other minor fixes for some problems I noticed
while making these changes.

Pointed out by:	bde

28 files changed, 127 insertions, 138 deletions

diff --git a/share/man/man4/ch.4 b/share/man/man4/ch.4
index f6a79c695afa..d521b6a5b170 100644
--- a/share/man/man4/ch.4
+++ b/share/man/man4/ch.4
@@ -31,8 +31,8 @@
 .Nm ch
 .Nd scsi media-changer (juke box) driver
 .Sh SYNOPSIS
-.Nm device ch
-.Nm device ch1 target 4 lun 0
+.Cd device ch
+.Cd device ch1 target 4 lun 0
 .Sh DESCRIPTION
 The
 .Xr ch
diff --git a/share/man/man4/cy.4 b/share/man/man4/cy.4
index f1b438cfac56..ac69b830d3ad 100644
--- a/share/man/man4/cy.4
+++ b/share/man/man4/cy.4
@@ -42,8 +42,7 @@
 .Os FreeBSD
 .Sh NAME
 .Nm cy
-.Nd
-Cyclades Cyclom-8Y and Cyclom-16Y serial driver
+.Nd Cyclades Cyclom-8Y and Cyclom-16Y serial driver
 .Sh SYNOPSIS
 .Cd "device cy0 at isa? tty irq 10 iomem 0xd4000 iosiz 0x2000 vector cyintr
 .Cd "device cy1 at isa? tty irq 11 iomem 0xd6000 iosiz 0x2000 vector cyintr
@@ -122,7 +121,7 @@ initial termios states suitable for your setup.
 The lock termios state acts as flags to disable changing
 the termios state.  E.g., to lock a flag variable such as
 CRTSCTS, use
-.Nm stty crtscts
+.Em "stty crtscts"
 on the lock-state device.  Speeds and special characters
 may be locked by setting the corresponding value in the lock-state
 device to any nonzero value.
diff --git a/share/man/man4/ed.4 b/share/man/man4/ed.4
index 1de117b1c460..116ea54fd2a1 100644
--- a/share/man/man4/ed.4
+++ b/share/man/man4/ed.4
@@ -35,8 +35,7 @@
 .Os FreeBSD
 .Sh NAME
 .Nm ed
-.Nd
-high performance ethernet device driver
+.Nd high performance ethernet device driver
 .Sh SYNOPSIS
 .Cd "device ed0 at isa? port 0x280 net irq 5 iomem 0xd8000 vector edintr"
 .Cd "device ed1 at isa? port 0x300 net irq 5 iomem 0xd8000 vector edintr"
@@ -59,12 +58,12 @@ the IEEE 802.3 CSMA ethernet is possible.
 In addition to the standard port and irq specifications, the
 .Nm
 driver also supports a number of
-.Nm flags
+.Em flags
 which can force 8/16bit mode, enable/disable multi-buffering, and select the default
 interface type (AUI/BNC, and for cards with twisted pair, AUI/10BaseT).
 .Pp
 The
-.Nm flags
+.Em flags
 are a bit field, and are summerized as follows:
 .Pp
 .Bl -hang -offset indent
@@ -90,9 +89,9 @@ reduce receiver lossage.
 .El
 .Pp
 When using a 3c503 card, the AUI connection may be selected by specifying the
-.Nm link2
+.Em link2
 option to
-.Nm ifconfig
+.Xr ifconfig 8
 (BNC is the default).
 .Sh DIAGNOSTICS
 .Bl -diag
@@ -106,7 +105,7 @@ driver found that it could not clear the card's shared memory. This is most comm
 caused by a BIOS extension ROM being configured in the same address space as the
 ethernet card's shared memory. Either find the offending card and change its BIOS
 ROM to be at an address that doesn't conflict, or change the
-.Nm iomem
+.Em iomem
 option in the kernel config file so that the card's shared memory is mapped at a
 non-conflicting address.
 .It "ed%d: Invalid irq configuration (%d) must be 2-5 for 3c503."
@@ -148,9 +147,9 @@ dropped packets during heavy network traffic.
 .Pp
 16bit Compex cards identify themselves as being 8bit. While these cards will
 work in 8bit mode, much higher performance can be acheived by specifying
-.Nm flags 0x04
+.Em "flags 0x04"
 (force 16bit mode) in your kernel config file. In addition, you should also specify
-.Nm iosize 16384
+.Em "iosize 16384"
 to take advantage of the extra 8k of shared memory that 16bit mode provides.
 .Sh BUGS
 The
diff --git a/share/man/man4/fpa.4 b/share/man/man4/fpa.4
index 35bb3a7af5a7..a106b8e02ae1 100644
--- a/share/man/man4/fpa.4
+++ b/share/man/man4/fpa.4
@@ -6,7 +6,6 @@
 .\"
 .Dd March 13, 1995
 .Dt FPA 4 i386
-.Dt FEA 4 i386
 .Os FreeBSD
 .Sh NAME
 .Nm fpa ,
diff --git a/share/man/man4/ip.4 b/share/man/man4/ip.4
index 467fcca91806..0ec296119d61 100644
--- a/share/man/man4/ip.4
+++ b/share/man/man4/ip.4
@@ -145,18 +145,18 @@ use the default range of values, normally
 through
 .Dv IPPORT_RESERVED .
 This is adjustable through the sysctl setting:
-.Nm net.inet.ip.portrange.first
+.Sy net.inet.ip.portrange.first
 and
-.Nm net.inet.ip.portrange.last .
+.Sy net.inet.ip.portrange.last .
 .It Dv IP_PORTRANGE_HIGH
 use a high range of values, normally
 .Dv IPPORT_HIFIRSTAUTO
 and
 .Dv IPPORT_HILASTAUTO .
 This is adjustable through the sysctl setting:
-.Nm net.inet.ip.portrange.hifirst
+.Sy net.inet.ip.portrange.hifirst
 and
-.Nm net.inet.ip.portrange.hilast .
+.Sy net.inet.ip.portrange.hilast .
 .It Dv IP_PORTRANGE_LOW
 use a low range of ports, which are normally restricted to
 privileged processes on
diff --git a/share/man/man4/man4.i386/ar.4 b/share/man/man4/man4.i386/ar.4
index 8c6d9216e308..7c79ad8ea849 100644
--- a/share/man/man4/man4.i386/ar.4
+++ b/share/man/man4/man4.i386/ar.4
@@ -54,10 +54,9 @@ bandwidth is usable with 486DX processors.
 The standard FreeBSD sppp code is used for the link level layer. The
 default protocol used is PPP. The Cisco HDLC protocol can be used by
 adding
-.Nm link2
+.Ar link2
 to
-.Nm ifconfig.
-.Pp
+.Xr ifconfig 8 .
 .Sh NUMBERING
 Only one line for each card is needed in the kernel configuration file.
 The first card's ports will be installed from ar0. The numbering of the
diff --git a/share/man/man4/man4.i386/cy.4 b/share/man/man4/man4.i386/cy.4
index f1b438cfac56..ac69b830d3ad 100644
--- a/share/man/man4/man4.i386/cy.4
+++ b/share/man/man4/man4.i386/cy.4
@@ -42,8 +42,7 @@
 .Os FreeBSD
 .Sh NAME
 .Nm cy
-.Nd
-Cyclades Cyclom-8Y and Cyclom-16Y serial driver
+.Nd Cyclades Cyclom-8Y and Cyclom-16Y serial driver
 .Sh SYNOPSIS
 .Cd "device cy0 at isa? tty irq 10 iomem 0xd4000 iosiz 0x2000 vector cyintr
 .Cd "device cy1 at isa? tty irq 11 iomem 0xd6000 iosiz 0x2000 vector cyintr
@@ -122,7 +121,7 @@ initial termios states suitable for your setup.
 The lock termios state acts as flags to disable changing
 the termios state.  E.g., to lock a flag variable such as
 CRTSCTS, use
-.Nm stty crtscts
+.Em "stty crtscts"
 on the lock-state device.  Speeds and special characters
 may be locked by setting the corresponding value in the lock-state
 device to any nonzero value.
diff --git a/share/man/man4/man4.i386/dgb.4 b/share/man/man4/man4.i386/dgb.4
index f8a475307430..573df33ed071 100644
--- a/share/man/man4/man4.i386/dgb.4
+++ b/share/man/man4/man4.i386/dgb.4
@@ -42,8 +42,7 @@
 .Os FreeBSD
 .Sh NAME
 .Nm dgb
-.Nd
-DigiBoard intelligent serial cards driver
+.Nd DigiBoard intelligent serial cards driver
 .Sh SYNOPSIS
 .Cd "options" \&"NDGBPORTS=8\&"
 .Cd "device dgb0 at isa? tty port 0x220 iomem 0xfc0000 iosiz ? flags 0x0
@@ -106,13 +105,13 @@ SLIP and PPP response.
 .Pp
 Each line in the kernel configuration file describes one card, not one port 
 as in the
-.Nm sio
+.Xr sio 4
 driver.
 .Pp
 The
-.Nm flags
+.Em flags
 keyword may be used on each
-.Nm device dgb
+.Em "device dgb"
 line in the kernel configuration file
 to change the pinout of the interface or to use new PC/Xe cards
 which can work with an 8K memory window in compatibility mode
@@ -122,13 +121,13 @@ only that all buffers will be mapped to the same memory address and switched as
 needed.
 .Pp
 The
-.Nm port
+.Em port
 value must be the same
 as the 
-.Nm port
+.Em port
 set on the card by jumpers.
 For PC/Xi cards the same rule is applicable to the
-.Nm iomem
+.Em iomem
 value.  It must be the same as the memory address set on the card
 by jumpers.
 .\"Some documentation gives the address as a ``paragraph'' or ``segment'';
@@ -137,7 +136,7 @@ by jumpers.
 For PC/Xe cards there is no need to use jumpers for this purpose.
 In fact there are no jumpers to do it.  Just
 write the address you want as the
-.Nm iomem
+.Em iomem
 value in kernel config file and the card will be programmed 
 to use this address.
 .Pp
@@ -196,7 +195,7 @@ initial termios states suitable for your setup.
 The lock termios state acts as flags to disable changing
 the termios state.  E.g., to lock a flag variable such as
 CRTSCTS, use
-.Nm stty crtscts
+.Em "stty crtscts"
 on the lock-state device.  Speeds and special characters
 may be locked by setting the corresponding value in the lock-state
 device to any nonzero value.
@@ -344,9 +343,9 @@ Problems in hardware.
 The
 .Nm
 driver is derived from the
-.Nm sio
+.Xr sio 4
 driver and the DigiBoard driver from 
-.Nm Linux 
+.Tn Linux 
 and is
 .Ud
 .Sh BUGS
diff --git a/share/man/man4/man4.i386/ed.4 b/share/man/man4/man4.i386/ed.4
index 1de117b1c460..116ea54fd2a1 100644
--- a/share/man/man4/man4.i386/ed.4
+++ b/share/man/man4/man4.i386/ed.4
@@ -35,8 +35,7 @@
 .Os FreeBSD
 .Sh NAME
 .Nm ed
-.Nd
-high performance ethernet device driver
+.Nd high performance ethernet device driver
 .Sh SYNOPSIS
 .Cd "device ed0 at isa? port 0x280 net irq 5 iomem 0xd8000 vector edintr"
 .Cd "device ed1 at isa? port 0x300 net irq 5 iomem 0xd8000 vector edintr"
@@ -59,12 +58,12 @@ the IEEE 802.3 CSMA ethernet is possible.
 In addition to the standard port and irq specifications, the
 .Nm
 driver also supports a number of
-.Nm flags
+.Em flags
 which can force 8/16bit mode, enable/disable multi-buffering, and select the default
 interface type (AUI/BNC, and for cards with twisted pair, AUI/10BaseT).
 .Pp
 The
-.Nm flags
+.Em flags
 are a bit field, and are summerized as follows:
 .Pp
 .Bl -hang -offset indent
@@ -90,9 +89,9 @@ reduce receiver lossage.
 .El
 .Pp
 When using a 3c503 card, the AUI connection may be selected by specifying the
-.Nm link2
+.Em link2
 option to
-.Nm ifconfig
+.Xr ifconfig 8
 (BNC is the default).
 .Sh DIAGNOSTICS
 .Bl -diag
@@ -106,7 +105,7 @@ driver found that it could not clear the card's shared memory. This is most comm
 caused by a BIOS extension ROM being configured in the same address space as the
 ethernet card's shared memory. Either find the offending card and change its BIOS
 ROM to be at an address that doesn't conflict, or change the
-.Nm iomem
+.Em iomem
 option in the kernel config file so that the card's shared memory is mapped at a
 non-conflicting address.
 .It "ed%d: Invalid irq configuration (%d) must be 2-5 for 3c503."
@@ -148,9 +147,9 @@ dropped packets during heavy network traffic.
 .Pp
 16bit Compex cards identify themselves as being 8bit. While these cards will
 work in 8bit mode, much higher performance can be acheived by specifying
-.Nm flags 0x04
+.Em "flags 0x04"
 (force 16bit mode) in your kernel config file. In addition, you should also specify
-.Nm iosize 16384
+.Em "iosize 16384"
 to take advantage of the extra 8k of shared memory that 16bit mode provides.
 .Sh BUGS
 The
diff --git a/share/man/man4/man4.i386/fe.4 b/share/man/man4/man4.i386/fe.4
index f84dc08d1c87..7d91d78410fc 100644
--- a/share/man/man4/man4.i386/fe.4
+++ b/share/man/man4/man4.i386/fe.4
@@ -187,14 +187,14 @@ 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.
 It is recommended not to use
-.Nm port ?
+.Em "port ?"
 when you experience some difficulties with hardware probe.
 .Pp
 Automatic IRQ detection feature of
 .Nm fe
 works reliably for FMV-180 series.
 It is recommended to use
-.Nm irq ?
+.Em "irq ?"
 always for FMV-180.
 The hardware setting of IRQ is read
 from the configuration EEPROM on the adapter,
diff --git a/share/man/man4/man4.i386/io.4 b/share/man/man4/man4.i386/io.4
index 2fcc0d61776d..6d4aa2c24110 100644
--- a/share/man/man4/man4.i386/io.4
+++ b/share/man/man4/man4.i386/io.4
@@ -35,12 +35,12 @@
 .Nd I/O privilege file
 .Sh DESCRIPTION
 The special file
-.Nm /dev/io
+.Pa /dev/io
 is a controlled security hole that allows a process to gain I/O
 privileges
 .Pq which are normally reserved for kernel-internal code .
 Any process that holds a file descriptor on
-.Nm /dev/io
+.Pa /dev/io
 open will get its
 .Em IOPL
 bits in the flag register set, thus allowing it to perform direct
@@ -49,7 +49,7 @@ programs that handle some hardware directly.
 .Pp
 The entire access control is handled by the file access permissions
 of
-.Nm /dev/io ,
+.Pa /dev/io ,
 so care should be taken in granting rights for this device.  Note
 that even read/only access will grant the full I/O privileges.
 .Sh FILES
diff --git a/share/man/man4/man4.i386/lp.4 b/share/man/man4/man4.i386/lp.4
index 4c4223c8c58b..4a0bfbf1f0cd 100644
--- a/share/man/man4/man4.i386/lp.4
+++ b/share/man/man4/man4.i386/lp.4
@@ -73,7 +73,7 @@ device is active for printing and the network interface is inactive; however,
 once the corresponding
 .Nm
 device has been configured 'up' with
-.Nm ifconfig
+.Xr ifconfig 8
 printing is disabled until the network interface is configured 'down'.
 .Pp
 The communication protocol is selected by the
diff --git a/share/man/man4/man4.i386/meteor.4 b/share/man/man4/man4.i386/meteor.4
index 879e573dd5be..7d105ff140f0 100644
--- a/share/man/man4/man4.i386/meteor.4
+++ b/share/man/man4/man4.i386/meteor.4
@@ -10,12 +10,11 @@
 .Nm video meteor
 .Sh DESCRIPTION
 The
-.Xr meteor
+.Nm meteor
 driver provides support for a PCI
 .Em video
 capture. It allows the capture of 24 bit RGB, 16 bit RGB and 16 bit YUV 
 output formats.
-
 .Pp
 .Sh Meteor Driver Installation
 To use the Matrox Meteor card in your system, you need a computer
diff --git a/share/man/man4/man4.i386/npx.4 b/share/man/man4/man4.i386/npx.4
index 8f234cd2cc6d..6975f9e8e069 100644
--- a/share/man/man4/man4.i386/npx.4
+++ b/share/man/man4/man4.i386/npx.4
@@ -35,8 +35,7 @@
 .Os FreeBSD
 .Sh NAME
 .Nm npx
-.Nd
-Numeric Processing Extension coprocessor and emulator
+.Nd Numeric Processing Extension coprocessor and emulator
 .Sh SYNOPSIS
 .Cd "options MATH_EMULATE"
 .\" XXX this is awful hackery to get it to work right... -- cgd
@@ -48,11 +47,11 @@ driver enables the use of the system's Numeric Processing Extension
 coprocessor,
 if one is present.  Numeric processing extensions are present in
 systems with
-.Nm 486DX
+.Sy 486DX
 CPUs and in systems with
-.Nm 387
+.Sy 387
 or
-.Nm 487SX
+.Sy 487SX
 coprocessors.  The
 .Nm npx
 driver is required for proper system functioning regardless
diff --git a/share/man/man4/man4.i386/psm.4 b/share/man/man4/man4.i386/psm.4
index bf38eb7f6938..e02491daa99b 100644
--- a/share/man/man4/man4.i386/psm.4
+++ b/share/man/man4/man4.i386/psm.4
@@ -21,16 +21,16 @@ The
 .Nm
 driver provides support for the PS/2 mouse style pointing device.
 
-.Nm port \&"IO_KBD\&"
+.Em port \&"IO_KBD\&"
 and
-.Nm conflicts
+.Em conflicts
 are required, 
 as the PS/2 mouse port is located
 at the auxiliary port of the keyboard controller, thus, the 
 .Nm
 driver has to share the same I/O ports with the keyboard driver.
 Note also that there is currently no provision of changing the 
-.Nm irq
+.Em irq
 number.
 .Pp
 A series of data packets is read from the
diff --git a/share/man/man4/man4.i386/si.4 b/share/man/man4/man4.i386/si.4
index 12c8ca9eeb38..c9a129fd343d 100644
--- a/share/man/man4/man4.i386/si.4
+++ b/share/man/man4/man4.i386/si.4
@@ -7,7 +7,7 @@
 .Nm si
 .Nd Driver for Specialix International SI/XIO 8-32 port intelligent serial card.
 .Sh SYNOPSIS
-.Nm "device si0 at isa? tty irq 12 iomem 0xd0000 vector siintr"
+.Cd "device si0 at isa? tty irq 12 iomem 0xd0000 vector siintr"
 .Sh DESCRIPTION
 The Specialix SI and XIO hardware makes up an 8 to 32 port RS-232 serial
 multiplexor.
@@ -136,16 +136,16 @@ locked termios state devices
 .Sh HISTORY
 This driver is loosely based on driver code originating at Specialix, which
 was ported to run on BSDI by
-.Nm Andy Rutter <andy@specialix.co.uk> .
+.Sy Andy Rutter <andy@specialix.co.uk> .
 The System V driver source is/was available by ftp from
-.Nm ftp.specialix.co.uk .
+.Sy ftp.specialix.co.uk .
 .Pp
 This driver is not supported by Specialix International. 
 .Sh AUTHORS
-.Nm Peter Wemm <peter@freebsd.org>
+.Sy Peter Wemm <peter@freebsd.org>
 obtained the code from Andy Rutter and ported it to FreeBSD, with a large
 amount of invalueable assistance from
-.Nm Bruce Evans <bde@zeta.org.au>
+.Sy Bruce Evans <bde@zeta.org.au>
 .Pp
 Man page by Peter Wemm.
 .Sh BUGS
diff --git a/share/man/man4/man4.i386/sio.4 b/share/man/man4/man4.i386/sio.4
index b9001d3bd3b4..c2770a865aa9 100644
--- a/share/man/man4/man4.i386/sio.4
+++ b/share/man/man4/man4.i386/sio.4
@@ -126,13 +126,13 @@ To work, the control and status registers for a group, if any,
 must be mapped to the scratch register (register 7)
 of a port in the group.
 Such a port is called a
-.Nm master
+.Em master
 port.
 .Pp
 The
-.Nm flags
+.Em flags
 keyword may be used on each
-.Nm device sio
+.Em device sio
 line in the kernel configuration file
 to silence the probe
 or to disable the FIFO on 16550A UARTs
@@ -142,32 +142,32 @@ since the driver automatically adjusts the receiver
 FIFO trigger level for low latency and high efficiency.
 .Pp
 The
-.Nm flags
+.Em flags
 keyword
-.Nm must
+.Em must
 be used for all ports that are part of an IRQ sharing group.
 One bit specifies IRQ sharing; another bit specifies whether the port does
-.Nm not
+.Em not
 require AST/4 compatible initialization.
 The minor number of the device corresponding a master port
 for the group is encoded as a bitfield in the high byte.
 The same master port must be specified for all ports in a group.
 .Pp
 The
-.Nm irq
+.Em irq
 and
-.Nm vector
+.Em vector
 specifications must be given for master ports
 and for ports that are not part of an IRQ sharing group,
 and not for other ports.
 .Pp
 In the synopsis,
-.Nm flags 0x701
+.Em flags 0x701
 means that the 8th port (sio7) is the master
 port, and that the port is on a multiport card with shared IRQs
 and an AST/4 compatible IRQ control register.
 .Pp
-.Nm flags 0xb05
+.Em flags 0xb05
 means that the 12th port (sio11) is the master
 port, and that the port is on a multiport card with shared IRQs
 and no special IRQ control register.
@@ -218,7 +218,7 @@ initial termios states suitable for your setup.
 The lock termios state acts as flags to disable changing
 the termios state.  E.g., to lock a flag variable such as
 CRTSCTS, use
-.Nm stty crtscts
+.Em stty crtscts
 on the lock-state device.  Speeds and special characters
 may be locked by setting the corresponding value in the lock-state
 device to any nonzero value.
@@ -290,8 +290,8 @@ and some has been lost.
 The
 .Nm
 driver is derived from the
-.Nm HP9000/300
-.Nm dca
+.Tn HP9000/300
+.Xr dca 4
 driver and is
 .Ud
 .Sh BUGS
@@ -305,13 +305,13 @@ implementations of the chip with non-functional FIFO hardware.
 .Pp
 The constants which define the locations
 of the various serial ports are holdovers from
-.Nm DOS .
+.Tn DOS .
 As shown, hex addresses can be and for clarity probably should be used instead.
 .Pp
 Note that on the AST/4 the card's dipswitches should
-.Nm not
+.Em not
 be set to use interrupt sharing. AST/4-like interrupt sharing is only used when
-.Nm multiple
+.Em multiple
 AST/4 cards are installed in the same system.  The sio driver does not
 support more than 1 AST/4 on one IRQ.
 .Pp
diff --git a/share/man/man4/man4.i386/sr.4 b/share/man/man4/man4.i386/sr.4
index 8b1f0520016c..36fbd7064ba1 100644
--- a/share/man/man4/man4.i386/sr.4
+++ b/share/man/man4/man4.i386/sr.4
@@ -35,8 +35,7 @@
 .Os
 .Sh NAME
 .Nm sr
-.Nd
-synchronous RISCom/N2 device driver.
+.Nd synchronous RISCom/N2 device driver.
 .Sh SYNOPSYS
 .Cd "device sr0 at isa? port 0x300 net irq 10 iomem 0xd0000 vector arintr"
 .Cd "device sr1 at isa? port 0x310 net irq 11 flags 0x1 iomem 0xd0000 vector arintr"
@@ -54,12 +53,12 @@ bandwidth is usable with 486DX processors.
 The standard FreeBSD sppp code is used for the link level layer. The
 default protocol used is PPP. The Cisco HDLC protocol can be used by
 adding
-.Nm link2
+.Em link2
 to
-.Nm ifconfig.
+.Xr ifconfig 8 .
 .Pp
 The
-.Nm flags
+.Em flags
 field is optional. If it isn't specified, the driver will
 assume the following:
 .Pp
@@ -70,7 +69,7 @@ the same clock as the receiver.
 .El
 .Pp
 The
-.Nm flags
+.Em flags
 are a bit field and can be used to force a different
 behaviour than the default.
 .Pp
diff --git a/share/man/man4/psm.4 b/share/man/man4/psm.4
index bf38eb7f6938..e02491daa99b 100644
--- a/share/man/man4/psm.4
+++ b/share/man/man4/psm.4
@@ -21,16 +21,16 @@ The
 .Nm
 driver provides support for the PS/2 mouse style pointing device.
 
-.Nm port \&"IO_KBD\&"
+.Em port \&"IO_KBD\&"
 and
-.Nm conflicts
+.Em conflicts
 are required, 
 as the PS/2 mouse port is located
 at the auxiliary port of the keyboard controller, thus, the 
 .Nm
 driver has to share the same I/O ports with the keyboard driver.
 Note also that there is currently no provision of changing the 
-.Nm irq
+.Em irq
 number.
 .Pp
 A series of data packets is read from the
diff --git a/share/man/man4/pty.4 b/share/man/man4/pty.4
index 83ae1593eef7..d50e6e502329 100644
--- a/share/man/man4/pty.4
+++ b/share/man/man4/pty.4
@@ -38,8 +38,7 @@
 .Nm pty
 .Nd pseudo terminal driver
 .Sh SYNOPSIS
-.Nm pseudo-device pty
-.Op Ar count
+.Cd "pseudo-device pty" Op Ar count
 .Sh DESCRIPTION
 The
 .Nm pty
diff --git a/share/man/man4/scsi.4 b/share/man/man4/scsi.4
index a4e3a4e579da..9db2d0c82aaa 100644
--- a/share/man/man4/scsi.4
+++ b/share/man/man4/scsi.4
@@ -31,15 +31,15 @@
 .Nm scsi
 .Nd scsi system
 .Sh SYNOPSIS
-.Nm controller scbus0
-.Nm controller scbus1 at ahc0
-.Nm controller scbus3 at ahc1 bus 0
-.Nm controller scbus2 at ahc1 bus 1
-.Nm device cd0
-.Nm device ch0
-.Nm disk sd0
-.Nm tape st0
-.Nm device ch1 at scbus0 target 4 unit 0
+.Cd "controller scbus0"
+.Cd "controller scbus1 at ahc0"
+.Cd "controller scbus3 at ahc1 bus 0"
+.Cd "controller scbus2 at ahc1 bus 1"
+.Cd "device cd0"
+.Cd "device ch0"
+.Cd "disk sd0"
+.Cd "tape st0"
+.Cd "device ch1 at scbus0 target 4 unit 0"
 .Sh DESCRIPTION
 The
 .Em scsi
diff --git a/share/man/man4/si.4 b/share/man/man4/si.4
index 12c8ca9eeb38..c9a129fd343d 100644
--- a/share/man/man4/si.4
+++ b/share/man/man4/si.4
@@ -7,7 +7,7 @@
 .Nm si
 .Nd Driver for Specialix International SI/XIO 8-32 port intelligent serial card.
 .Sh SYNOPSIS
-.Nm "device si0 at isa? tty irq 12 iomem 0xd0000 vector siintr"
+.Cd "device si0 at isa? tty irq 12 iomem 0xd0000 vector siintr"
 .Sh DESCRIPTION
 The Specialix SI and XIO hardware makes up an 8 to 32 port RS-232 serial
 multiplexor.
@@ -136,16 +136,16 @@ locked termios state devices
 .Sh HISTORY
 This driver is loosely based on driver code originating at Specialix, which
 was ported to run on BSDI by
-.Nm Andy Rutter <andy@specialix.co.uk> .
+.Sy Andy Rutter <andy@specialix.co.uk> .
 The System V driver source is/was available by ftp from
-.Nm ftp.specialix.co.uk .
+.Sy ftp.specialix.co.uk .
 .Pp
 This driver is not supported by Specialix International. 
 .Sh AUTHORS
-.Nm Peter Wemm <peter@freebsd.org>
+.Sy Peter Wemm <peter@freebsd.org>
 obtained the code from Andy Rutter and ported it to FreeBSD, with a large
 amount of invalueable assistance from
-.Nm Bruce Evans <bde@zeta.org.au>
+.Sy Bruce Evans <bde@zeta.org.au>
 .Pp
 Man page by Peter Wemm.
 .Sh BUGS
diff --git a/share/man/man4/sio.4 b/share/man/man4/sio.4
index b9001d3bd3b4..c2770a865aa9 100644
--- a/share/man/man4/sio.4
+++ b/share/man/man4/sio.4
@@ -126,13 +126,13 @@ To work, the control and status registers for a group, if any,
 must be mapped to the scratch register (register 7)
 of a port in the group.
 Such a port is called a
-.Nm master
+.Em master
 port.
 .Pp
 The
-.Nm flags
+.Em flags
 keyword may be used on each
-.Nm device sio
+.Em device sio
 line in the kernel configuration file
 to silence the probe
 or to disable the FIFO on 16550A UARTs
@@ -142,32 +142,32 @@ since the driver automatically adjusts the receiver
 FIFO trigger level for low latency and high efficiency.
 .Pp
 The
-.Nm flags
+.Em flags
 keyword
-.Nm must
+.Em must
 be used for all ports that are part of an IRQ sharing group.
 One bit specifies IRQ sharing; another bit specifies whether the port does
-.Nm not
+.Em not
 require AST/4 compatible initialization.
 The minor number of the device corresponding a master port
 for the group is encoded as a bitfield in the high byte.
 The same master port must be specified for all ports in a group.
 .Pp
 The
-.Nm irq
+.Em irq
 and
-.Nm vector
+.Em vector
 specifications must be given for master ports
 and for ports that are not part of an IRQ sharing group,
 and not for other ports.
 .Pp
 In the synopsis,
-.Nm flags 0x701
+.Em flags 0x701
 means that the 8th port (sio7) is the master
 port, and that the port is on a multiport card with shared IRQs
 and an AST/4 compatible IRQ control register.
 .Pp
-.Nm flags 0xb05
+.Em flags 0xb05
 means that the 12th port (sio11) is the master
 port, and that the port is on a multiport card with shared IRQs
 and no special IRQ control register.
@@ -218,7 +218,7 @@ initial termios states suitable for your setup.
 The lock termios state acts as flags to disable changing
 the termios state.  E.g., to lock a flag variable such as
 CRTSCTS, use
-.Nm stty crtscts
+.Em stty crtscts
 on the lock-state device.  Speeds and special characters
 may be locked by setting the corresponding value in the lock-state
 device to any nonzero value.
@@ -290,8 +290,8 @@ and some has been lost.
 The
 .Nm
 driver is derived from the
-.Nm HP9000/300
-.Nm dca
+.Tn HP9000/300
+.Xr dca 4
 driver and is
 .Ud
 .Sh BUGS
@@ -305,13 +305,13 @@ implementations of the chip with non-functional FIFO hardware.
 .Pp
 The constants which define the locations
 of the various serial ports are holdovers from
-.Nm DOS .
+.Tn DOS .
 As shown, hex addresses can be and for clarity probably should be used instead.
 .Pp
 Note that on the AST/4 the card's dipswitches should
-.Nm not
+.Em not
 be set to use interrupt sharing. AST/4-like interrupt sharing is only used when
-.Nm multiple
+.Em multiple
 AST/4 cards are installed in the same system.  The sio driver does not
 support more than 1 AST/4 on one IRQ.
 .Pp
diff --git a/share/man/man4/su.4 b/share/man/man4/su.4
index dcb454099da1..ea6c6abf34a1 100644
--- a/share/man/man4/su.4
+++ b/share/man/man4/su.4
@@ -31,7 +31,7 @@
 .Nm su
 .Nd scsi user-level driver
 .Sh SYNOPSIS
-.Nm device-driver su
+.Cd "device-driver su"
 .Sh DESCRIPTION
 The
 .Nm su
diff --git a/share/man/man4/uk.4 b/share/man/man4/uk.4
index 4a1fadf52c7e..a55c29128ede 100644
--- a/share/man/man4/uk.4
+++ b/share/man/man4/uk.4
@@ -31,7 +31,7 @@
 .Nm uk
 .Nd scsi user-level driver
 .Sh SYNOPSIS
-.Nm device uk
+.Cd "device uk"
 .Sh DESCRIPTION
 The
 .Nm uk
diff --git a/share/man/man4/yp.4 b/share/man/man4/yp.4
index ed5d5f8b8d67..2e6a2a4dbe1a 100644
--- a/share/man/man4/yp.4
+++ b/share/man/man4/yp.4
@@ -79,7 +79,7 @@ specified in
 .Pp
 NIS is an RPC-based client/server system that allows a group of
 machines within an NIS
-.Nm domain
+.Em domain
 to share a common set of configuration files. This permits a system
 administrator to set up NIS client systems with only minimal configuration
 data and add, remove or modify configuration data from a single location.
@@ -107,9 +107,9 @@ their NIS implementation on ndbm, and other vendors have simply licensed
 Sun's code rather than design their own implementation with a different
 database format). On these systems, the databases are generally split
 into
-.Nm .dir
+.Em .dir
 and
-.Nm .pag
+.Em .pag
 files which the ndbm code uses to hold separate parts of the hash
 database. The Berkeley DB hash method instead uses a single file for
 both pieces of information. This means that while you may have
@@ -227,7 +227,7 @@ command. The NIS Makefile (
 .Pa /var/yp/Makefile )
 will do this automatically if the administrator comments out the
 line which says
-.Nm NOPUSH=true
+.Em NOPUSH=true
 (NOPUSH is set to true by default because the default configuration is
 for a small network with only one NIS server). The
 .Xr yppush 8
@@ -347,7 +347,7 @@ and flags.)
 .Sh BUGS
 While FreeBSD now has both NIS client and server capabilities,
 it does not yet have support for
-.Nm ypupdated
+.Xr ypupdated 8
 or the
 .Fn yp_update
 function. Both of these require secure RPC, which FreeBSD doesn't
diff --git a/share/man/man7/mdoc.samples.7 b/share/man/man7/mdoc.samples.7
index 36bc09a90ba0..5ce5739b7eeb 100644
--- a/share/man/man7/mdoc.samples.7
+++ b/share/man/man7/mdoc.samples.7
@@ -445,12 +445,12 @@ in
 .Pp
 .Bd -literal -offset indent
 \&.\e" The following requests are required for all man pages.
-\&.Dd "Month day, year"
+\&.Dd Month day, year
 \&.Os OPERATING_SYSTEM [version/release]
 \&.Dt DOCUMENT_TITLE [section number] [volume]
 \&.Sh NAME
 \&.Nm name
-\&.Nm one line description of name
+\&.Nd one line description of name
 \&.Sh SYNOPSIS
 \&.Sh DESCRIPTION
 \&.\e" The following requests should be uncommented and
diff --git a/share/man/man8/yp.8 b/share/man/man8/yp.8
index ed5d5f8b8d67..2e6a2a4dbe1a 100644
--- a/share/man/man8/yp.8
+++ b/share/man/man8/yp.8
@@ -79,7 +79,7 @@ specified in
 .Pp
 NIS is an RPC-based client/server system that allows a group of
 machines within an NIS
-.Nm domain
+.Em domain
 to share a common set of configuration files. This permits a system
 administrator to set up NIS client systems with only minimal configuration
 data and add, remove or modify configuration data from a single location.
@@ -107,9 +107,9 @@ their NIS implementation on ndbm, and other vendors have simply licensed
 Sun's code rather than design their own implementation with a different
 database format). On these systems, the databases are generally split
 into
-.Nm .dir
+.Em .dir
 and
-.Nm .pag
+.Em .pag
 files which the ndbm code uses to hold separate parts of the hash
 database. The Berkeley DB hash method instead uses a single file for
 both pieces of information. This means that while you may have
@@ -227,7 +227,7 @@ command. The NIS Makefile (
 .Pa /var/yp/Makefile )
 will do this automatically if the administrator comments out the
 line which says
-.Nm NOPUSH=true
+.Em NOPUSH=true
 (NOPUSH is set to true by default because the default configuration is
 for a small network with only one NIS server). The
 .Xr yppush 8
@@ -347,7 +347,7 @@ and flags.)
 .Sh BUGS
 While FreeBSD now has both NIS client and server capabilities,
 it does not yet have support for
-.Nm ypupdated
+.Xr ypupdated 8
 or the
 .Fn yp_update
 function. Both of these require secure RPC, which FreeBSD doesn't