mdoc(7) police: overhaul.

Approved by:	re

15 files changed, 355 insertions, 268 deletions

diff --git a/share/man/man4/ahd.4 b/share/man/man4/ahd.4
index af64ba9..0ae0460 100644
--- a/share/man/man4/ahd.4
+++ b/share/man/man4/ahd.4
@@ -36,19 +36,29 @@
 .Nd Adaptec PCI/PCI-X Ultra320 SCSI host adapter driver
 .Sh SYNOPSIS
 For one or more PCI/PCI-X cards:
+.Bd -ragged -offset indent -compact
 .Cd device pci
 .Cd device ahd
+.Ed
 .Pp
-To compile in debugging code.
+To compile in debugging code:
+.Bd -ragged -offset indent -compact
 .Cd options AHD_DEBUG
 .Cd options AHD_DEBUG_OPTS=<bitmask of options>
 .Cd options AHD_REG_PRETTY_PRINT
+.Ed
 .Pp
 To configure one or more controllers to assume the target role:
+.Bd -ragged -offset indent -compact
 .Cd options AHD_TMODE_ENABLE=<bitmask of units>
+.Ed
 .Pp
-For one or more SCSI busses:
+For one or more
+.Tn SCSI
+busses:
+.Bd -ragged -offset indent -compact
 .Cd device scbus
+.Ed
 .Sh DESCRIPTION
 This driver provides access to the
 .Tn SCSI
@@ -61,51 +71,53 @@ These chips are found on many motherboards as well as the
 .Tn 29320
 and
 .Tn 39320
-Adaptec SCSI controller cards.
+Adaptec
+.Tn SCSI
+controller cards.
 .Pp
 Driver features include support for narrow and wide busses,
 fast, ultra, ultra2, ultra160, and ultra320 synchronous transfers,
 packetized transfers, tagged queueing, 512 SCB's, and target mode.
 .Pp
 The
-.Dq Dv AHD_DEBUG_OPTS
+.Dv AHD_DEBUG_OPTS
 option is used to control which diagnostic messages are printed to the
 console when
-.Dq Dv AHD_DEBUG
-is enabled.  Logically 'or' the following bits together:
-.Pp
-.Bd -ragged -offset indent
-.Bl -column "Value " Function
-.Em "Value   Function"
-0x0001  Show miscellanious information
-0x0002  Show sense data
-0x0004  Show Serial EEPROM contents
-0x0008  Show bus termination settings
-0x0010  Show host memory usage
-0x0020  Show SCSI protocol messages
-0x0040  Show mode pointer of the chip register window
-0x0080  Show selection timeouts
-0x0100  Show FIFO usage messages
-0x0200  Show Queue Full status
-0x0400  Show SCB queue status
-0x0800  Show inbound packet information
-0x1000  Show S/G list information
-0x2000  Enable extra diagnostic code in the firmware
+.Dv AHD_DEBUG
+is enabled.
+Logically OR the following bits together:
+.Bl -column -offset indent Value Function
+.Em "Value	Function"
+0x0001	Show miscellanious information
+0x0002	Show sense data
+0x0004	Show Serial EEPROM contents
+0x0008	Show bus termination settings
+0x0010	Show host memory usage
+0x0020	Show SCSI protocol messages
+0x0040	Show mode pointer of the chip register window
+0x0080	Show selection timeouts
+0x0100	Show FIFO usage messages
+0x0200	Show Queue Full status
+0x0400	Show SCB queue status
+0x0800	Show inbound packet information
+0x1000	Show S/G list information
+0x2000	Enable extra diagnostic code in the firmware
 .El
-.Ed
 .Pp
 The
-.Dq Dv AHD_REG_PRETTY_PRINT
+.Dv AHD_REG_PRETTY_PRINT
 option compiles in support for human-readable bit definitions for each register
-that is printed by the debugging code.  However, it also bloats the compiled
+that is printed by the debugging code.
+However, it also bloats the compiled
 size of the driver by approximately 215KB.
 .Pp
 Individual controllers may be configured to operate in the target role
 through the
-.Dq Dv AHD_TMODE_ENABLE
-configuration option.  The value assigned to this option should be a bitmap
+.Dv AHD_TMODE_ENABLE
+configuration option.
+The value assigned to this option should be a bitmap
 of all units where target mode is desired.
-For example, a value of 0x25, would enable target mode on units 0, 2, and 5.
+For example, a value of 0x25 would enable target mode on units 0, 2, and 5.
 Note that target mode is only supoprted for ultra160 speeds and below.
 .Pp
 Per target configuration performed in the
@@ -116,13 +128,13 @@ This includes synchronous/asynchronous transfers,
 maximum synchronous negotiation rate,
 wide transfers,
 disconnection,
-and the host adapter's SCSI ID.
-.Pp
+and the host adapter's
+.Tn SCSI
+ID.
 .Sh BUGS
 The current generation of 79xx chips do not support target mode in Ultra320
 mode.
 Target mode in general has not been well tested in this driver.
-.Pp
 .Sh SEE ALSO
 .Xr ahc 4 ,
 .Xr cd 4 ,
diff --git a/share/man/man4/atapicam.4 b/share/man/man4/atapicam.4
index 4d7d8c5..7691398 100644
--- a/share/man/man4/atapicam.4
+++ b/share/man/man4/atapicam.4
@@ -38,59 +38,64 @@
 .Sh DESCRIPTION
 The ATAPI/CAM module allows ATAPI devices (CD-ROM, CD-RW, DVD drives,
 floppy drives such as Iomega Zip, tape drives) to be accessed through
-the SCSI subsystem (CAM). 
+the SCSI subsystem,
+.Xr cam 4 .
 .Pp
-.Nm ata
+.Xr ata 4
 and
-.Nm scbus
+.Xr scbus 4
 must be configured in the kernel as well.
 The SCSI target drivers
-.Pq Nm cd , Nm da , No or Nm st
+.Xr ( cd 4 ,
+.Xr da 4 ,
+or
+.Xr st 4 )
 can then be used to access the devices.
-The generic passthrough device
-.Nm pass
+The generic passthrough device,
+.Xr pass 4 ,
 can also be used to send SCSI commands directly
 to the devices through the CAM API.
 .Pp
 A separate CAM bus is created for each ATA bus in the system.
-On each of these buses, target id 0 is assigned to the master
-device, and id 1 is assigned to the slave
-.Pq provided they are ATAPI devices .
+On each of these buses, target ID 0 is assigned to the master
+device, and ID 1 is assigned to the slave
+(provided they are ATAPI devices).
 .Sh IMPLEMENTATION NOTES
 Some SCSI commands are intercepted by the driver, and undergo special
 processing in order to work around limitations of ATAPI devices.
 Such limitations can be consequences of the ATAPI specification.
 For example, ATAPI devices do not implement the 6-byte versions
 of
-.Nm MODE_SELECT ,
-.Nm MODE_SENSE ,
-.Nm READ ,
+.Dv MODE_SELECT , MODE_SENSE , READ ,
 or
-.Nm WRITE .
+.Dv WRITE .
 They can also be common bugs, such as hanging when queried for
 extended
-.Nm INQUIRY
+.Dv INQUIRY
 information.
 .Sh EXAMPLES
-.Dl device atapicam
-.Dl device scbus
-.Dl device cd
-.Dl device pass
+.Bd -literal -offset indent
+device atapicam
+device scbus
+device cd
+device pass
+.Ed
 .Pp
 Add the
 .Nm
 driver to the kernel.
 .Pp
-.Dl camcontrol devlist
+.Dl "camcontrol devlist"
 .Pp
 Print the list of all devices available through CAM.
 .Pp
-.Dl mount -t cd9660 /dev/cd0c /mnt
+.Dl "mount -t cd9660 /dev/cd0c /mnt"
 .Pp
 Mount a CD-ROM from an ATAPI CD-ROM drive
-.Pq the command above assumes that the ATAPI drive is the only CD-ROM unit .
+(the command above assumes that the ATAPI drive is the only CD-ROM unit).
 .Sh SEE ALSO
 .Xr ata 4 ,
+.Xr cam 4 ,
 .Xr scsi 4 ,
 .Xr atacontrol 8 ,
 .Xr camcontrol 8
@@ -100,15 +105,15 @@ The ATAPI/CAM driver first appeared in
 and
 .Fx 5.0 .
 .Sh AUTHORS
-.An -nosplit
 The ATAPI/CAM driver was written by
 .An Thomas Quinot Aq thomas@FreeBSD.org .
 .Sh BUGS
-.Pp
 .Nm
 and ATAPI-specific target drivers
-.Pq Nm acd , Nm ast , No and Nm afd
+.Xr ( acd 4 ,
+.Xr ast 4 ,
+and
+.Xr afd 4 )
 can be configured in the same kernel.
 Simultaneous access to the same device through the SCSI generic drivers
 and the ATAPI-specific drivers may cause problems and is strongly discouraged.
-
diff --git a/share/man/man4/crypto.4 b/share/man/man4/crypto.4
index 5471134..f1a7ff6 100644
--- a/share/man/man4/crypto.4
+++ b/share/man/man4/crypto.4
@@ -1,5 +1,4 @@
 .\"	$OpenBSD: crypto.4,v 1.4 2002/09/12 07:15:03 deraadt Exp $
-.\"	$FreeBSD$
 .\"
 .\" Copyright (c) 2001 Theo de Raadt
 .\" All rights reserved.
@@ -27,6 +26,8 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
+.\" $FreeBSD$
+.\"
 .Dd October 3, 2002
 .Dt CRYPTO 4
 .Os
@@ -34,7 +35,7 @@
 .Nm crypto
 .Nd hardware crypto access driver
 .Sh SYNOPSIS
-.Nm device crypto
+.Cd device crypto
 .Sh DESCRIPTION
 The
 .Nm
@@ -50,15 +51,15 @@ submit transactions, and get results.
 If
 .Ar count
 given in the specification, and is greater than 0, a maximum of one
-.Nm crypto
+.Nm
 device is created.
 .Pp
 The following
 .Xr ioctl 2
 calls apply only to the
-.Nm crypto
+.Nm
 devices:
-.Bl -tag -width CIOCGSESSION
+.Bl -tag -width ".Dv CIOCGSESSION"
 .It Dv CIOCGSESSION
 Setup a new crypto session for a new type of operation.
 .It Dv CIOCFSESSION
@@ -66,36 +67,34 @@ Free a previously established session.
 .It Dv CIOCCRYPT
 Perform a crypto operation against a previously setup session.
 .El
-.Pp
 .Sh FEATURES
 Depending on hardware being present, the following symmetric and
 assymetric cryptographic features are potentially available from
 .Pa /dev/crypto :
 .Pp
-.Bl -tag -compact -width CRYPTO_RIPEMD160_HMAC -offset indent
-.It CRYPTO_DES_CBC
-.It CRYPTO_3DES_CBC
-.It CRYPTO_BLF_CBC
-.It CRYPTO_CAST_CBC
-.It CRYPTO_SKIPJACK_CBC
-.It CRYPTO_MD5_HMAC
-.It CRYPTO_SHA1_HMAC
-.It CRYPTO_RIPEMD160_HMAC
-.It CRYPTO_MD5_KPDK
-.It CRYPTO_SHA1_KPDK
-.It CRYPTO_AES_CBC
-.It CRYPTO_ARC4
-.It CRYPTO_MD5
-.It CRYPTO_SHA1
-.It CRK_MOD_EXP
-.It CRK_MOD_EXP_CRT
-.It CRK_DSA_SIGN
-.It CRK_DSA_VERIFY
-.It CRK_DH_COMPUTE_KEY
+.Bl -tag -width ".Dv CRYPTO_RIPEMD160_HMAC" -offset indent -compact
+.It Dv CRYPTO_DES_CBC
+.It Dv CRYPTO_3DES_CBC
+.It Dv CRYPTO_BLF_CBC
+.It Dv CRYPTO_CAST_CBC
+.It Dv CRYPTO_SKIPJACK_CBC
+.It Dv CRYPTO_MD5_HMAC
+.It Dv CRYPTO_SHA1_HMAC
+.It Dv CRYPTO_RIPEMD160_HMAC
+.It Dv CRYPTO_MD5_KPDK
+.It Dv CRYPTO_SHA1_KPDK
+.It Dv CRYPTO_AES_CBC
+.It Dv CRYPTO_ARC4
+.It Dv CRYPTO_MD5
+.It Dv CRYPTO_SHA1
+.It Dv CRK_MOD_EXP
+.It Dv CRK_MOD_EXP_CRT
+.It Dv CRK_DSA_SIGN
+.It Dv CRK_DSA_VERIFY
+.It Dv CRK_DH_COMPUTE_KEY
 .El
-.Pp
 .Sh FILES
-.Bl -tag -width /dev/crypto -compact
+.Bl -tag -width ".Pa /dev/crypto" -compact
 .It Pa /dev/crypto
 crypto access device
 .El
@@ -107,7 +106,8 @@ crypto access device
 The
 .Nm
 driver first appeared in
-OpenBSD 3.0.
+.Ox 3.0 .
 The
 .Nm
-driver was imported to FreeBSD in 5.0.
+driver was imported to
+.Fx 5.0 .
diff --git a/share/man/man4/firewire.4 b/share/man/man4/firewire.4
index 5023f59..72c7cfe 100644
--- a/share/man/man4/firewire.4
+++ b/share/man/man4/firewire.4
@@ -28,7 +28,7 @@
 .\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
-.\" 
+.\"
 .\" $FreeBSD$
 .\"
 .Dd May 23, 2002
@@ -43,8 +43,8 @@
 .In dev/firewire/firewire.h
 .Sh DESCRIPTION
 .Fx
-provides machine-independent bus support and row drivers for
-.Tn firewire
+provides machine-independent bus support and raw drivers for
+.Nm
 interfaces.
 .Pp
 The
@@ -55,29 +55,34 @@ The controller attaches to a physical bus
 (like
 .Xr pci 4 ) .
 The
-.Tn firewire
-bus attaches to the controller. And the additional driver can be
-attached to the bus.
+.Nm
+bus attaches to the controller.
+And the additional driver can be attached to the bus.
 .Pp
 Up to 63 devices, including the host itself, can be attached to
-a firewire bus. The root node is dynamically assigned with PHY
-device function. Also, the other firewire bus specific parameters
-e.g. node id, cycle master, isochronous resource manager and bus
+a
+.Nm
+bus.
+The root node is dynamically assigned with PHY device function.
+Also, the other
+.Nm
+bus specific parameters,
+e.g., node ID, cycle master, isochronous resource manager and bus
 manager, are dynamically assigned, after bus rest is initiated.
-On firewire bus, every device is identified with EUI 64 address.
-
-.Pp
-.El
+On
+.Nm
+bus, every device is identified with EUI 64 address.
 .Sh SEE ALSO
 .Xr fwohci 4 ,
 .Xr pci 4 ,
-.Xr sbp 4 ,
+.Xr sbp 4
 .Sh HISTORY
 The
 .Nm
 driver first appeared in
 .Fx 5.0 .
 .Sh AUTHORS
+.An -nosplit
 The
 .Nm
 driver was written by
diff --git a/share/man/man4/fwe.4 b/share/man/man4/fwe.4
index d61b627..c2d7c12 100644
--- a/share/man/man4/fwe.4
+++ b/share/man/man4/fwe.4
@@ -21,7 +21,7 @@
 .\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
-.\" 
+.\"
 .\" $FreeBSD$
 .\"
 .\"
@@ -30,7 +30,7 @@
 .Os
 .Sh NAME
 .Nm fwe
-.Nd Ethernet Emulation Driver for FireWire
+.Nd Ethernet emulation driver for FireWire
 .Sh SYNOPSIS
 .Cd "device fwe"
 .Cd "device firewire"
@@ -38,25 +38,33 @@
 .Sh DESCRIPTION
 The
 .Nm
-driver provides non-standard ethernet emulation over FireWire(IEEE1394).
+driver provides non-standard ethernet emulation over FireWire (IEEE 1394).
 .Pp
-.Nm firewire
-and 
-.Nm fwohci
+.Xr firewire 4
+and
+.Xr fwohci 4
 must be configured in the kernel as well.
 .Pp
-This driver exploits asynchronous stream over IEEE1394 to carry Ethernet
-frames. The stream channel can be specified by
-.Nm sysctl(8)
-(hw.firewire.fwe.stream_ch).
+This driver exploits asynchronous stream over IEEE 1394 to carry Ethernet
+frames.
+The stream channel can be specified by
+the
+.Va hw.firewire.fwe.stream_ch
+.Xr sysctl 8 .
 .Pp
-This driver supports polling(4) as well if it's compiled with
-DEVICE_POLLING option.
+This driver supports
+.Xr polling 4
+as well if it is compiled with the
+.Dv DEVICE_POLLING
+option.
 .Sh HISTORY
-The fwe device driver first appeared in FreeBSD 5.0.
+The fwe device driver first appeared in
+.Fx 5.0 .
 .Sh BUGS
-This driver emulates ethernet very adhoc way and it doesn't reserve a stream channel using an isochronous manager.
-Note this driver uses very different protocol from RFC2734(IPv4 over IEEE 1394).
+This driver emulates ethernet very adhoc way and it does not reserve a
+stream channel using an isochronous manager.
+Note this driver uses very different protocol from RFC 2734
+(IPv4 over IEEE 1394).
 .Sh SEE ALSO
 .Xr arp 4 ,
 .Xr firewire 4 ,
@@ -67,11 +75,7 @@ Note this driver uses very different protocol from RFC2734(IPv4 over IEEE 1394).
 .Xr ifconfig 8 ,
 .Xr sysctl 8
 .Sh AUTHORS
-.An -nosplit
 The
 .Nm
-driver was written by
-.An Hidetoshi Shimokawa .
-.Pp
-This manual page was written by
+driver and this manual page were written by
 .An Hidetoshi Shimokawa .
diff --git a/share/man/man4/fwohci.4 b/share/man/man4/fwohci.4
index 4b1e54b..8d94162 100644
--- a/share/man/man4/fwohci.4
+++ b/share/man/man4/fwohci.4
@@ -28,17 +28,16 @@
 .\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
-.\" 
+.\"
 .\" $FreeBSD$
 .\"
 .\"
 .Dd April 10, 2000
 .Dt FWOHCI 4
-.Os FreeBSD
+.Os
 .Sh NAME
 .Nm fwohci
-.Nd
-OHCI firewire chipset device driver
+.Nd OHCI firewire chipset device driver
 .Sh SYNOPSIS
 .Cd "device fwohci"
 .Sh DESCRIPTION
@@ -47,16 +46,20 @@ The
 driver provides support for PCI firewire interface cards.
 The driver supports following OHCI chipsets.
 .Pp
-.Bl -tag -width xxxxxxxxxxxxxxxxxxxx
-.It uPD72861
-.It TI TSB12LV22,LV23,26 and TSB43AA22
-.It Sony CX3022
-.It VIA VT6306
-.It Ricoh R5C552
-.Pp
+.Bl -item
+.It
+uPD72861
+.It
+TI TSB12LV22,LV23,26 and TSB43AA22
+.It
+Sony CX3022
+.It
+VIA VT6306
+.It
+Ricoh R5C552
 .El
 .Sh SEE ALSO
-.Xr firewire 8 ,
+.Xr firewire 4 ,
 .Xr sbp 4
 .Sh HISTORY
 The
@@ -66,8 +69,5 @@ device driver first appeared in
 .Sh AUTHORS
 The
 .Nm
-device driver was written by
-.An Katsushi Kobayashi .
-.Pp
-This manual page was written by
+device driver and this manual page were written by
 .An Katsushi Kobayashi .
diff --git a/share/man/man4/gbde.4 b/share/man/man4/gbde.4
index 5fee66e..cdfeb7e 100644
--- a/share/man/man4/gbde.4
+++ b/share/man/man4/gbde.4
@@ -1,4 +1,4 @@
-.\" 
+.\"
 .\" Copyright (c) 2002 Poul-Henning Kamp
 .\" Copyright (c) 2002 Networks Associates Technology, Inc.
 .\" All rights reserved.
@@ -30,17 +30,16 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
-.\" 
+.\"
 .Dd October 19, 2002
 .Os
-.Dt gbde 4
+.Dt GBDE 4
 .Sh NAME
 .Nm gbde
-.Nd Geom Based Disk Encryption.
+.Nd Geom Based Disk Encryption
 .Sh SYNOPSIS
-.Cd options GEOM_BDE
+.Cd "options GEOM_BDE"
 .Sh NOTICE
-.Pp
 Please be aware that this code has not yet received much review
 and analysis by qualified cryptographers and therefore should be considered
 a slightly suspect experimental facility.
@@ -52,7 +51,6 @@ be prepared that
 .Xr restore 8
 based migrations may be called for in the future.
 .Sh DESCRIPTION
-.Pp
 The objective of this facility is to provide a high degree of
 denial of access to the contents of a
 .Dq cold
@@ -64,8 +62,8 @@ the storage device is actively attached and opened with a valid
 pass-phrase, this facility offers no protection or denial of access
 to the contents of the storage device.
 .Pp
-If on the other hand, the device is
-.Dq cold
+If, on the other hand, the device is
+.Dq cold ,
 it should present an formidable
 challenge for an attacker to gain access to the contents in the absence of
 a valid pass-phrase.
@@ -76,10 +74,11 @@ and only a valid pass-phrase will yield this access.
 When the pass-phrase is entered, it is hashed with SHA2 into a 512 bit
 .Dq key-material .
 This is a way of producing cryptographic usable keys from a typically
-all-ASCII pass-phrase of an unpredictable user-selected length.
+.No all- Ns Tn ASCII
+pass-phrase of an unpredictable user-selected length.
 .Ss First barrier: the location of the \&"lock-sector".
 During initialization, up to four independent but mutually aware
-.Dq lock-sectors
+.Dq lock
 sectors are written to the device in randomly chosen
 locations.
 These lock-sectors contain the 2048 random bit master-key and a number
@@ -104,7 +103,7 @@ The encoded bytestream is encrypted with 256bit AES in CBC mode.
 .Ss Third barrier: decryption of the sector key.
 For each sector, an MD5 hash over a
 .Dq salt
-from the lock-sector and the sector number is used to 
+from the lock-sector and the sector number is used to
 .Dq cherry-pick
 a subset of the master key,
 which hashed together with the sector offset through MD5 produces the
@@ -152,7 +151,9 @@ attacker,
 and a number of scenarios can be imagined where undue pressure will be
 applied to an individual to divulge the pass-phrase.
 .Pp
-A "Blackening" feature provides a way for the user, given a moment of
+A
+.Dq Blackening
+feature provides a way for the user, given a moment of
 opportunity, to destroy the master-key in such a way that the pass-phrase
 will be acknowledged as good but access to the data will still be
 denied.
@@ -162,12 +163,13 @@ watching silicon sublimate the author humbly offers this analogy to the
 keying scheme for a protected device:
 .Pp
 Imagine an installation with a vault with walls of several hundred meters
-thick solid steel.  This vault can only be feasibly accessed using the
+thick solid steel.
+This vault can only be feasibly accessed using the
 single key, which has a complexity comparable to a number with 600 digits.
 .Pp
-This key exists in four copies, each of which is stored in one of 
+This key exists in four copies, each of which is stored in one of
 four small safes, each of which can be opened
-with unique key which has a complexity comparable to a 80 digit
+with unique key which has a complexity comparable to an 80 digit
 number.
 .Pp
 In addition to the masterkey, each of the four safes also contains
@@ -178,7 +180,7 @@ are practically impossible to detect when they are closed.
 Finally, each safe contains four switches which are wired to a bar
 of dynamite inside each of the four safes.
 .Pp
-In addition to this, a keyholder after opening his key-safe is 
+In addition to this, a keyholder after opening his key-safe is
 also able to install a copy of the master-key and re-key any of
 key-safes (including his own).
 .Pp
@@ -222,7 +224,7 @@ some kind of structure or identifying byte sequences.
 Certain file formats like ELF contain multiple distinct sections, and it
 would be possible to locate things just right in such a way that a device
 contains a partition with a filesystem with a large executable,
-.Dq ( "a backup copy of my kernel" )
+.Pq Dq "a backup copy of my kernel"
 where a non-loaded ELF section is laid out
 consecutively on the device and thereby could be used to contain a
 .Nm
@@ -231,7 +233,6 @@ encrypted device.
 Apart from the ability to instruct
 .Nm
 which those sectors are, no support is provided for creating such a setup.
-.Pp
 .Ss Deployment suggestions
 For personal use, it may be wise to make a backup copy of the masterkey
 or use one of the four keys as a backup.
@@ -242,18 +243,18 @@ For company or institutional use, it is strongly advised to make a copy
 of the master-key and put it under whatever protection you have at your
 means.
 If you fail to do this, a disgruntled employee can deny you access to
-the data 
-.Dq by accident.
+the data
+.Dq "by accident" .
 (The employee can still intentionally deny access by applying another
-encryption scheme to the data, but that problem has no technical solution).
+encryption scheme to the data, but that problem has no technical solution.)
 .Ss Cryptographic strength
 This section lists the specific components which contribute to the cryptographic
 strength of
 .Nm .
 .Pp
-The payload is encrypted with AES in CBC mode using a 128 bit random 
+The payload is encrypted with AES in CBC mode using a 128 bit random
 single-use key
-.Dq ( "the skey" ) .
+.Pq Dq "the skey" .
 AES is well documented.
 .Pp
 No IV is used in the encryption of the sectors, the assumption being
@@ -267,12 +268,12 @@ which is believed to do a respectable job at producing unpredictable bytes.
 The skey is stored on the device in a location which can be derived from
 the location of the encrypted payload data.
 The stored copy is encrypted with AES in CBC mode using a 128 bit key
-.Dq ( "the kkey" )
+.Pq Dq "the kkey"
 derived
 from a subset of the master key chosen by the output of an MD5 hash
 over a 16 byte random bit static salt and the sector offset.
 Up to 6.25% of the masterkey (16 bytes out of 2048 bits) will be selected
-and hashed though MD5 with the sector offset to generate the kkey.
+and hashed through MD5 with the sector offset to generate the kkey.
 .Pp
 Up to four copies of the master-key and associated geometry information
 is stored on the device in static randomly chosen sectors.
@@ -286,16 +287,21 @@ The key-material is derived from the user-entered pass-phrase using
 .Pp
 No chain is stronger than its weakest link, which usually is poor pass-phrases.
 .Sh SEE ALSO
-.Xr gbde 8 .
+.Xr gbde 8
 .Rs
 .%A Poul-Henning Kamp
 .%T "Making sure data is lost: Spook-strength encryption of on-disk data"
 .%R "Refereed paper, NORDU2003 conference"
 .Re
 .Sh HISTORY
-This software was developed for the FreeBSD Project by Poul-Henning Kamp
-and NAI Labs, the Security Research Division of Network Associates, Inc.
-under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
+This software was developed for the
+.Fx
+Project by
+.An Poul-Henning Kamp
+and NAI Labs, the Security Research Division of Network Associates, Inc.\&
+under DARPA/SPAWAR contract N66001-01-C-8035
+.Pq Dq CBOSS ,
+as part of the
 DARPA CHATS research program.
 .Sh AUTHORS
 .An "Poul-Henning Kamp" Aq phk@FreeBSD.org
diff --git a/share/man/man4/hifn.4 b/share/man/man4/hifn.4
index 539d2e8..c752796 100644
--- a/share/man/man4/hifn.4
+++ b/share/man/man4/hifn.4
@@ -1,5 +1,4 @@
 .\"	$OpenBSD: hifn.4,v 1.32 2002/09/26 07:55:40 miod Exp $
-.\"	$FreeBSD$
 .\"
 .\" Copyright (c) 2000 Theo de Raadt
 .\" All rights reserved.
@@ -27,6 +26,8 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
+.\" $FreeBSD$
+.\"
 .Dd October 3, 2002
 .Dt HIFN 4
 .Os
@@ -34,7 +35,7 @@
 .Nm hifn
 .Nd Hifn 7751/7951/7811 crypto accelerator
 .Sh SYNOPSIS
-.Nm device hifn
+.Cd device hifn
 .Sh DESCRIPTION
 The
 .Nm
@@ -96,7 +97,7 @@ to the driver, but all vendors currently just use the obvious ID which is
 .Xr random 4 ,
 .Xr crypto 9
 .Sh CAVEATS
-The Hifn 9751 shares the same PCI id.
+The Hifn 9751 shares the same PCI ID.
 This chip is basically a 7751, but with the cryptographic functions missing.
 Instead, the 9751 is only capable of doing compression.
 Since we do not currently attempt to use any of these chips to do
@@ -105,7 +106,8 @@ compression, the 9751-based cards are not useful.
 The
 .Nm
 device driver appeared in
-OpenBSD 2.7.
+.Ox 2.7 .
 The
 .Nm
-device driver was imported to FreeBSD in 5.0.
+device driver was imported to
+.Fx 5.0 .
diff --git a/share/man/man4/pccbb.4 b/share/man/man4/pccbb.4
index 90eecef..a288a2e 100644
--- a/share/man/man4/pccbb.4
+++ b/share/man/man4/pccbb.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\" $FreeBSD$
 .\"
 .Dd July 9, 2002
 .Dt PCCBB 4
@@ -41,45 +41,79 @@ driver implements the Yenta specification for CardBus bridges.
 .Pp
 The following PCI cardbus and pcmcia bridges are supported:
 .Pp
-.Bl -tag -width "Intel i82365SL Step A" -compact
-.It Cirrus Logic PD6832
-.It Cirrus Logic PD6833
-.It Cirrus Logic PD6834
+.Bl -item -compact
+.It
+Cirrus Logic PD6832
+.It
+Cirrus Logic PD6833
+.It
+Cirrus Logic PD6834
+.Pp
+.It
+O2micro OZ6812
+.It
+O2micro OZ6832
+.It
+O2micro OZ6833
+.It
+O2micro OZ6836
+.It
+O2micro OZ6860
+.It
+O2micro OZ6872
+.El
 .Pp
-.It O2micro OZ6812
-.It O2micro OZ6832
-.It O2micro OZ6833
-.It O2micro OZ6836
-.It O2micro OZ6860
-.It O2micro OZ6872
 O2 Micro chips may be poorly supported because the author does not
 have good access to machines with one of these bridges in it.
 .Pp
-.It Ricoh RL4C475
-.It Ricoh RL4C476
-.It Ricoh RL4C477
-.It Ricoh RL4C478
+.Bl -item -compact
+.It
+Ricoh RL4C475
+.It
+Ricoh RL4C476
+.It
+Ricoh RL4C477
+.It
+Ricoh RL4C478
 .Pp
-.It TI PCI-1031
-.It TI PCI-1130
-.It TI PCI-1131
-.It TI PCI-1211
-.It TI PCI-1220
-.It TI PCI-1221
-.It TI PCI-1225
-.It TI PCI-1250
-.It TI PCI-1251
-.It TI PCI-1251B
-.It TI PCI-1410
-.It TI PCI-1420
-.It TI PCI-1450
-.It TI PCI-1451
-.It TI PCI-4451
+.It
+TI PCI-1031
+.It
+TI PCI-1130
+.It
+TI PCI-1131
+.It
+TI PCI-1211
+.It
+TI PCI-1220
+.It
+TI PCI-1221
+.It
+TI PCI-1225
+.It
+TI PCI-1250
+.It
+TI PCI-1251
+.It
+TI PCI-1251B
+.It
+TI PCI-1410
+.It
+TI PCI-1420
+.It
+TI PCI-1450
+.It
+TI PCI-1451
+.It
+TI PCI-4451
 .Pp
-.It Toshiba ToPIC95
-.It Toshiba ToPIC97
-.It Toshiba ToPIC100
+.It
+Toshiba ToPIC95
+.It
+Toshiba ToPIC97
+.It
+Toshiba ToPIC100
 .El
 .Sh SEE ALSO
 .Xr cardbus 4 ,
-.Xr pccard 4 .
+.Xr pccard 4
diff --git a/share/man/man4/pst.4 b/share/man/man4/pst.4
index 6da90b8..d513da8 100644
--- a/share/man/man4/pst.4
+++ b/share/man/man4/pst.4
@@ -30,32 +30,28 @@
 .Os
 .Sh NAME
 .Nm pst
-.Nd Device driver for Promise Supertrak SX6000
+.Nd device driver for Promise Supertrak SX6000
 .Sh SYNOPSIS
-Include this line in the kernel config file:
 .Cd device pst
-.Pp
 .Sh DESCRIPTION
 This driver is for the Promise Supertrak SX6000 ATA hardware RAID controller.
-It supports (in hardware) RAID levels 0, 1, 0+1, 3, 5 and JBOD on up to 
-6 ATA disk drives, including automatic rebuild and hotswap, and supports 
+It supports (in hardware) RAID levels 0, 1, 0+1, 3, 5 and JBOD on up to
+6 ATA disk drives, including automatic rebuild and hotswap, and supports
 signalling disk status on LED's on Promise Superswap disk enclosures.
 The Supertrak lines of controllers does not support non-disk devices.
-.Pp
 .Sh NOTES
 The
 .Nm
 driver does not support manipulating the RAID from the OS, RAID's need
-to be setup from the onboard BIOS. However hot swap, hot spare, and
+to be setup from the onboard BIOS.
+However hot swap, hot spare, and
 automatic rebuilds are supported without reboot.
-.Pp
 .Sh HISTORY
 The
 .Nm
 driver first appeared in
 .Fx 4.7 .
 .Sh AUTHORS
-.An -nosplit
 The
 .Nm
 driver and man page was written by
diff --git a/share/man/man4/sbp.4 b/share/man/man4/sbp.4
index e779e11..774194e 100644
--- a/share/man/man4/sbp.4
+++ b/share/man/man4/sbp.4
@@ -28,9 +28,8 @@
 .\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
-.\" 
-.\" $FreeBSD$
 .\"
+.\" $FreeBSD$
 .\"
 .Dd May 20, 2002
 .Dt SBP 4
@@ -43,36 +42,40 @@
 .Sh DESCRIPTION
 The
 .Nm
-driver provides support for SBP-2 devices that attach to the firewire (IEEE1394)
+driver provides support for SBP-2 devices that attach to the firewire
+(IEEE 1394)
 port.
-Verified are
+Verified are:
 .Pp
-.Bl -tag -compact -width xxxxxx
-.It Apple Macintosh G4 (target mode)
-.It Apple iPod 
+.Bl -item -compact
+.It
+Apple Macintosh G4 (target mode)
+.It
+Apple iPod
 .El
 .Pp
-.Nm firewire
-and 
-.Nm fwohci
+.Xr firewire 4
+and
+.Xr fwohci 4
 must be configured in the kernel as well.
 Last but not least, support for
 SCSI drives,
-.Nm da
+.Xr da 4 .
 .Sh EXAMPLES
-.Dl device sbp
-.Dl device scbus
-.Dl device da
-.Dl device pass
+.Bd -literal -offset indent
+device sbp
+device scbus
+device da
+device pass
+.Ed
 .Pp
 Add the
 .Nm
 driver to the kernel.
 .Pp
-.Dl camcontrol rescan 0
+.Dl "camcontrol rescan 0"
 .Pp
 Rescan a SCSI drive that was added after boot.
-.\".Sh HISTORY
 .Sh AUTHORS
 .An -nosplit
 The
diff --git a/share/man/man4/targ.4 b/share/man/man4/targ.4
index 30bfeff..d2bd3aa 100644
--- a/share/man/man4/targ.4
+++ b/share/man/man4/targ.4
@@ -25,7 +25,7 @@
 .\" $FreeBSD$
 .\"
 .Dd November 15, 2002
-.Dt targ 4
+.Dt TARG 4
 .Os
 .Sh NAME
 .Nm targ
@@ -36,23 +36,25 @@
 The
 .Nm
 driver provides an interface for usermode programs to emulate SCSI target
-devices.  A sample program that emulates a disk drive (similar to
+devices.
+A sample program that emulates a disk drive (similar to
 .Xr da 4 )
-can be found in /usr/share/examples/scsi_target.
+can be found in
+.Pa /usr/share/examples/scsi_target .
 .Pp
 The
 .Nm
 driver supplies control devices,
-.Pa /dev/targ0 , 
-.Pa /dev/targ1 , 
+.Pa /dev/targ0 ,
+.Pa /dev/targ1 ,
 etc.
 If a device is already in use, the open will fail and
 .Va errno
 will be set to
 .Er EBUSY .
 After opening the device, the file descriptor must be bound to a
-specific bus/target/lun and enabled to process CCBs using the
-.Pa TARGIOCENABLE
+specific bus/target/LUN and enabled to process CCBs using the
+.Dv TARGIOCENABLE
 ioctl.
 The process then uses
 .Xr write 2
@@ -60,18 +62,18 @@ to send CCBs to the SIM and
 .Xr poll 2
 or
 .Xr kqueue 2
-to see if responses are ready.  Pointers to completed CCBs are returned via
+to see if responses are ready.
+Pointers to completed CCBs are returned via
 .Xr read 2 .
 Any data transfers requested by the user CCBs are done via zero-copy IO.
-.Pp
 .Sh IOCTLS
 The following
 .Xr ioctl 2
 calls are defined in the header file
 .Aq Pa cam/scsi/scsi_targetio.h .
-.Bl -tag -width TARGIOCDISABLE
+.Bl -tag -width ".Dv TARGIOCDISABLE"
 .It Dv TARGIOCENABLE
-.Pq Li "struct ioc_enable_lun"
+.Pq Vt "struct ioc_enable_lun"
 Enable target mode on the LUN specified by the following structure:
 .Bd -literal -offset indent
 struct ioc_enable_lun {
@@ -83,27 +85,33 @@ struct ioc_enable_lun {
 };
 .Ed
 .Pp
-The selected path (bus), target, and lun must not already be in use or
+The selected path (bus), target, and LUN must not already be in use or
 .Er EADDRINUSE
 is returned.
-If grp6_len or grp7_len are non-zero, reception of vendor-specific commands
+If
+.Va grp6_len
+or
+.Va grp7_len
+are non-zero, reception of vendor-specific commands
 is enabled.
 .It Dv TARGIOCDISABLE
 Disable target mode and abort all pending CCBs.
-The CCBs may optionally be read as they complete.  
-.Pa TARGIOCENABLE
+The CCBs may optionally be read as they complete.
+.Dv TARGIOCENABLE
 can then be called to activate a different LUN.
 Multiple disable calls have no effect.
 The
 .Xr close 2
 system call automatically disables target mode if enabled.
 .It Dv TARGIOCDEBUG
-.Pq Li "int"
-Enables CAM_PERIPH debugging if the argument is non-zero, otherwise disables
+.Pq Vt int
+Enables
+.Dv CAM_PERIPH
+debugging if the argument is non-zero, otherwise disables
 it.
 .El
 .Sh FILES
-.Bl -tag -width /sys/cam/scsi/scsi_target.c -compact
+.Bl -tag -width ".Pa /sys/cam/scsi/scsi_target.c" -compact
 .It Aq Pa cam/scsi/scsi_targetio.h
 describes the usermode interface.
 .It Pa /sys/cam/scsi/scsi_target.c
@@ -112,7 +120,7 @@ is the driver source file.
 are the control devices.
 .El
 .Sh SEE ALSO
-.Xr /usr/share/examples/scsi_target ,
+.Pa /usr/share/examples/scsi_target ,
 .Xr scsi 4
 .Rs
 .%T "FreeBSD Target Information"
@@ -121,7 +129,8 @@ are the control devices.
 .Sh BUGS
 Currently, only the
 .Xr ahc 4
-driver fully supports target mode.  The
+driver fully supports target mode.
+The
 .Xr isp 4
 and
 .Xr sym 4
@@ -131,13 +140,15 @@ The
 .Xr ahc 4
 driver does not support tagged queuing in target mode.
 .Sh AUTHORS
+.An -nosplit
 The
 .Nm
 driver first appeared in
-.Fx 3.0 and was written by
+.Fx 3.0
+and was written by
 .An Justin T. Gibbs .
 It was rewritten
 for
-.Fx 5.0 
+.Fx 5.0
 by
 .An Nate Lawson Aq nate@root.org .
diff --git a/share/man/man4/ubsa.4 b/share/man/man4/ubsa.4
index 094b217..d967811 100644
--- a/share/man/man4/ubsa.4
+++ b/share/man/man4/ubsa.4
@@ -35,7 +35,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd Oct 7, 2002
+.Dd October 7, 2002
 .Dt UBSA 4
 .Os
 .Sh NAME
@@ -87,11 +87,12 @@ manual page was adopted from
 .Nx
 by
 .An Tom Rhodes Aq trhodes@FreeBSD.org
-in April 2002 and modified for ubsa driver by
+in April 2002 and modified for
+.Nm
+driver by
 .An Alexander Kabaev Aq kan@FreeBSD.org
 in October 2002.
 .Sh AUTHORS
-.An -nosplit
 The
 .Nm
 driver was written by
diff --git a/share/man/man4/ubsec.4 b/share/man/man4/ubsec.4
index 2ec4258..49f1354 100644
--- a/share/man/man4/ubsec.4
+++ b/share/man/man4/ubsec.4
@@ -1,5 +1,4 @@
 .\"	$OpenBSD: ubsec.4,v 1.18 2002/09/26 07:55:41 miod Exp $
-.\"	$FreeBSD$
 .\"
 .\" Copyright (c) 2000 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -30,6 +29,8 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
+.\" $FreeBSD$
+.\"
 .Dd October 3, 2002
 .Dt UBSEC 4
 .Os
@@ -37,14 +38,15 @@
 .Nm ubsec
 .Nd Broadcom and BlueSteel uBsec 5x0x crypto accelerator
 .Sh SYNOPSIS
-.Nm device ubsec
+.Cd device ubsec
 .Sh DESCRIPTION
 The
 .Nm
 driver supports cards containing any of the following chips:
-.Bl -tag -width "Broadcom BCM5821" -offset indent
+.Bl -tag -width "Broadcom BCM5822" -offset indent
 .It Bluesteel 5501
-The original chipset, no longer made.  This extremely rare unit
+The original chipset, no longer made.
+This extremely rare unit
 was not very fast, lacked a RNG, and had a number of other bugs.
 .It Bluesteel 5601
 A faster and fixed version of the original, with a random number
@@ -91,9 +93,10 @@ subsystem.
 The
 .Nm
 device driver appeared in
-OpenBSD 2.8.
+.Ox 2.8 .
 The
 .Nm
-device driver was imported to FreeBSD in 5.0.
+device driver was imported to
+.Fx 5.0 .
 .Sh BUGS
 The BCM5801 and BCM5802 have not actually been tested.
diff --git a/share/man/man4/uvisor.4 b/share/man/man4/uvisor.4
index 213ff1f..85fb049 100644
--- a/share/man/man4/uvisor.4
+++ b/share/man/man4/uvisor.4
@@ -1,5 +1,4 @@
 .\" $NetBSD: uvisor.4,v 1.3 2001/01/23 21:31:10 augustss Exp $
-.\" $FreeBSD$
 .\"
 .\" Copyright (c) 2000 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -35,6 +34,8 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
+.\" $FreeBSD$
+.\"
 .Dd March 10, 2000
 .Dt UVISOR 4
 .Os
@@ -61,8 +62,11 @@ The attach message describes the purpose of each port.
 .Pp
 The usual Pilot tools can be used to access the Visor on the HotSync port.
 .Sh BUGS
-The code to provide multiple ucom instances has not yet been ported
-from NetBSD. It's unclear whether this driver works in its
+The code to provide multiple
+.Xr ucom 4
+instances has not yet been ported from
+.Nx .
+It is unclear whether this driver works in its
 current state.
 .Sh SEE ALSO
 .Xr tty 4 ,
@@ -73,7 +77,8 @@ The
 .Nm
 driver was adopted from
 .Nx 1.5
-in August 2002.  This manual page was adopted from
+in August 2002.
+This manual page was adopted from
 .Nx
 by
 .An Tom Rhodes Aq trhodes@FreeBSD.org