38 files changed, 96 insertions, 95 deletions

diff --git a/sbin/adjkerntz/adjkerntz.8 b/sbin/adjkerntz/adjkerntz.8
index 512b4cc7210d..3635c66c3d70 100644
--- a/sbin/adjkerntz/adjkerntz.8
+++ b/sbin/adjkerntz/adjkerntz.8
@@ -150,6 +150,7 @@ not needed when
 or
 .Xr zic 8
 is used.
+.El
 .Sh FILES
 .Bl -tag -width /etc/wall_cmos_clock -compact
 .It Pa /etc/localtime
diff --git a/sbin/badsect/badsect.8 b/sbin/badsect/badsect.8
index a1e4924ce806..bcc199794b64 100644
--- a/sbin/badsect/badsect.8
+++ b/sbin/badsect/badsect.8
@@ -106,7 +106,7 @@ bad sector and whose name is the bad sector number.
 When it is discovered by 
 .Xr fsck 8
 it will ask
-.Dq Li "HOLD BAD BLOCK ?"
+.Dq Li "HOLD BAD BLOCK ?" .
 A positive response will cause 
 .Xr fsck 8
 to convert the inode to a regular file containing the bad block.
diff --git a/sbin/bsdlabel/bsdlabel.5 b/sbin/bsdlabel/bsdlabel.5
index 3583c5907ecc..fcd4b0d66b90 100644
--- a/sbin/bsdlabel/bsdlabel.5
+++ b/sbin/bsdlabel/bsdlabel.5
@@ -483,9 +483,9 @@ struct dos_partition {
     |    TYPE     |UNIT_2 | SLICE   |  MAJOR?       |  UNIT   |PART |
     -----------------------------------------------------------------
 */
-#define	dkmakeminor(unit, slice, part) \
-				(((slice) << 16) | (((unit) & 0x1e0) << 16) | \
-				(((unit) & 0x1f) << 3) | (part))
+#define	dkmakeminor(unit, slice, part) \e
+	(((slice) << 16) | (((unit) & 0x1e0) << 16) | \e
+	(((unit) & 0x1f) << 3) | (part))
 static __inline dev_t
 dkmodpart(dev_t dev, int part)
 {
diff --git a/sbin/camcontrol/camcontrol.8 b/sbin/camcontrol/camcontrol.8
index 3c899255c189..7038d2a4ed73 100644
--- a/sbin/camcontrol/camcontrol.8
+++ b/sbin/camcontrol/camcontrol.8
@@ -150,7 +150,7 @@ Novice users should stay away from this utility.
 .Nm
 has a number of primary functions, many of which support an optional
 device identifier.  A device identifier can take one of three forms:
-.Bl -tag -width 01234567890123
+.Bl -tag -width 14n
 .It deviceUNIT
 Specify a device name and unit number combination, like "da5" or "cd3".
 Note that character device node names (e.g. /dev/rsd0.ctl) are
@@ -184,19 +184,15 @@ override a specified bus:target or bus:target:lun, however.
 Most of the
 .Nm
 primary functions support these generic arguments:
-.Bl -tag -width 01234567890123
+.Bl -tag -width 14n
 .It Fl C Ar count
 SCSI command retry count.  In order for this to work, error recovery
-.Po
-.Fl E
-.Pc
+.Pq Fl E
 must be turned on.
 .It Fl E
 Instruct the kernel to perform generic SCSI error recovery for the given
 command.  This is needed in order for the retry count
-.Po
-.Fl C
-.Pc
+.Pq Fl C
 to be honored.  Other than retrying commands, the generic error recovery in
 the code will generally attempt to spin up drives that are not spinning.
 It may take some other actions, depending upon the sense code returned from
@@ -234,7 +230,7 @@ Send a SCSI inquiry command (0x12) to a device.  By default,
 will print out the standard inquiry data, device serial number, and
 transfer rate information.  The user can specify that only certain types of
 inquiry data be printed:
-.Bl -tag -width 1234
+.Bl -tag -width 4n
 .It Fl D
 Get the standard inquiry data.
 .It Fl S
@@ -270,7 +266,7 @@ on the system.
 Send the SCSI READ DEFECT DATA (10) command (0x37) to the given device, and
 print out any combination of: the total number of defects, the primary
 defect list (PLIST), and the grown defect list (GLIST).
-.Bl -tag -width 01234567890
+.Bl -tag -width 11n
 .It Fl f Ar format
 The three format options are:
 .Em block ,
@@ -314,7 +310,7 @@ environment variable.
 The
 .Ic modepage
 command takes several arguments:
-.Bl -tag -width 012345678901
+.Bl -tag -width 12n
 .It Fl d
 Disable block descriptors for mode sense.
 .It Fl b
@@ -364,7 +360,7 @@ SCSI device in question, you MUST specify either
 .Fl i
 or
 .Fl o .
-.Bl -tag -width 01234567890123456
+.Bl -tag -width 17n
 .It Fl c Ar cmd Op args
 This specifies the SCSI CDB.  CDBs may be 6, 10, 12 or 16 bytes.
 .It Fl i Ar len Ar fmt
@@ -389,7 +385,7 @@ busy printing messages and unable to service other requests quickly.
 The
 .Ic debug
 function takes a number of arguments:
-.Bl -tag -width 012345678901234567
+.Bl -tag -width 18n
 .It Fl I
 Enable CAM_DEBUG_INFO printfs.
 .It Fl T
@@ -417,7 +413,7 @@ prints out the "soft" maximum number of transactions that can be queued to
 the device in question.  For more detailed information, use the
 .Fl v
 argument described below.
-.Bl -tag -width 0123456
+.Bl -tag -width 7n
 .It Fl N Ar tags
 Set the number of tags for the given device.  This must be between the
 minimum and maximum number set in the kernel quirk table.  The default for
@@ -439,7 +435,7 @@ The verbose flag has special functionality for the
 argument.  It causes
 .Nm
 to print out the tagged queueing related fields of the XPT_GDEV_TYPE CCB:
-.Bl -tag -width 0123456789012
+.Bl -tag -width 13n
 .It dev_openings
 This is the amount of capacity for transactions queued to a given device.
 .It dev_active
@@ -494,7 +490,7 @@ setting negotiation parameters, even if the underlying controller supports
 negotiation changes.  Some controllers, such as the Advansys wide
 controllers, support enabling and disabling synchronous negotiation for
 a device, but do not support setting the synchronous negotiation rate.
-.Bl -tag -width 01234567890123456
+.Bl -tag -width 17n
 .It Fl a
 Attempt to make the negotiation settings take effect immediately by sending
 a Test Unit Ready command to the device.
@@ -570,7 +566,7 @@ and
 .Fl y
 arguments can be useful for scripts.
 .Pp
-.Bl -tag -width 123456
+.Bl -tag -width 6n
 .It Fl q
 Be quiet, don't print any status messages.  This option will not disable
 the questions, however.  To disable questions, use the
@@ -742,9 +738,7 @@ call in
 .Nm
 bails out when it sees the second argument to
 .Fl c
-.Po
-0x00
-.Pc ,
+.Pq 0x00 ,
 above.  Fixing this behavior would take some gross code, or changes to the
 .Xr getopt 3
 interface.  The best way to circumvent this problem is to always make sure
diff --git a/sbin/comcontrol/comcontrol.8 b/sbin/comcontrol/comcontrol.8
index c39928b79810..4a09a16373f0 100644
--- a/sbin/comcontrol/comcontrol.8
+++ b/sbin/comcontrol/comcontrol.8
@@ -53,6 +53,7 @@ startup script.
 dialin devices, hardwired terminals
 .It Pa /dev/cuaa?
 dialout devices
+.El
 .Sh AUTHORS
 .An Christopher G. Demetriou
 .Sh HISTORY
diff --git a/sbin/cxconfig/cxconfig.8 b/sbin/cxconfig/cxconfig.8
index 913e758897a8..63e0010a6745 100644
--- a/sbin/cxconfig/cxconfig.8
+++ b/sbin/cxconfig/cxconfig.8
@@ -317,7 +317,7 @@ ifconfig cx0 100.0.0.2 100.0.0.1 debug up
 .Ed
 .Sh FILES
 .Bl -tag -width /dev/cronyx -compact
-.Pa /dev/cronyx
+.It Pa /dev/cronyx
 the special device file for adapter options management
 .El
 .Sh SEE ALSO
diff --git a/sbin/disklabel/disklabel.5 b/sbin/disklabel/disklabel.5
index 3583c5907ecc..fcd4b0d66b90 100644
--- a/sbin/disklabel/disklabel.5
+++ b/sbin/disklabel/disklabel.5
@@ -483,9 +483,9 @@ struct dos_partition {
     |    TYPE     |UNIT_2 | SLICE   |  MAJOR?       |  UNIT   |PART |
     -----------------------------------------------------------------
 */
-#define	dkmakeminor(unit, slice, part) \
-				(((slice) << 16) | (((unit) & 0x1e0) << 16) | \
-				(((unit) & 0x1f) << 3) | (part))
+#define	dkmakeminor(unit, slice, part) \e
+	(((slice) << 16) | (((unit) & 0x1e0) << 16) | \e
+	(((unit) & 0x1f) << 3) | (part))
 static __inline dev_t
 dkmodpart(dev_t dev, int part)
 {
diff --git a/sbin/dump/dump.8 b/sbin/dump/dump.8
index 855288c7300f..58dbfb8b661f 100644
--- a/sbin/dump/dump.8
+++ b/sbin/dump/dump.8
@@ -54,7 +54,7 @@
 .Nm
 .Op Fl W Li \&| Fl w
 .Pp
-.in -\n(iSu
+.in \" XXX
 (The
 .Bx 4.3
 option syntax is implemented for backward compatibility, but
@@ -123,7 +123,7 @@ of 8000 bpi, and a length of 1700 feet.
 Honor the user
 .Dq nodump
 flag
-.Dp Dv UF_NODUMP
+.Pq Dv UF_NODUMP
 only for dumps at or above the given
 .Ar level .
 The default honor level is 1,
diff --git a/sbin/fdisk/fdisk.8 b/sbin/fdisk/fdisk.8
index 68b009cac242..00dc7c729087 100644
--- a/sbin/fdisk/fdisk.8
+++ b/sbin/fdisk/fdisk.8
@@ -135,7 +135,6 @@ being found responding.
 .Pp
 When called with no arguments, it prints the sector 0 partition table.
 An example follows:
-
 .Bd -literal
 	******* Working on device /dev/rwd0 *******
 	parameters extracted from in-core disklabel are:
diff --git a/sbin/fdisk_pc98/fdisk.8 b/sbin/fdisk_pc98/fdisk.8
index bc8b94622066..ee909258487a 100644
--- a/sbin/fdisk_pc98/fdisk.8
+++ b/sbin/fdisk_pc98/fdisk.8
@@ -137,7 +137,6 @@ being found responding.
 .Pp
 When called with no arguments, it prints the sector 0 partition table.
 An example follows:
-
 .Bd -literal
 	******* Working on device /dev/rda0 *******
 	parameters extracted from in-core disklabel are:
diff --git a/sbin/fsck/fsck.8 b/sbin/fsck/fsck.8
index f25be2ba42eb..a358007e7e58 100644
--- a/sbin/fsck/fsck.8
+++ b/sbin/fsck/fsck.8
@@ -30,7 +30,7 @@
 .\"
 .Dd September 23, 1996
 .Dt FSCK 8
-.Os NetBSD 1
+.Os
 .Sh NAME
 .Nm fsck
 .Nd file system consistency check and interactive repair
diff --git a/sbin/fsck_ffs/fsck_ffs.8 b/sbin/fsck_ffs/fsck_ffs.8
index 1cb1699aea99..3ebf01125685 100644
--- a/sbin/fsck_ffs/fsck_ffs.8
+++ b/sbin/fsck_ffs/fsck_ffs.8
@@ -243,8 +243,9 @@ then a default list of filesystems is read from
 the file
 .Pa /etc/fstab .
 .Pp
-.Bl -enum -indent indent -compact
 Inconsistencies checked are as follows:
+.Pp
+.Bl -enum -compact
 .It
 Blocks claimed by more than one inode or the free map.
 .It
@@ -253,7 +254,7 @@ Blocks claimed by an inode outside the range of the filesystem.
 Incorrect link counts.
 .It
 Size checks:
-.Bl -item -indent indent -compact
+.Bl -item -offset indent -compact
 .It 
 Directory size not a multiple of DIRBLKSIZ.
 .It
@@ -265,7 +266,7 @@ Bad inode format.
 Blocks not accounted for anywhere.
 .It
 Directory checks:
-.Bl -item -indent indent -compact
+.Bl -item -offset indent -compact
 .It 
 File pointing to unallocated inode.
 .It
@@ -278,7 +279,7 @@ or having the wrong inode number.
 .El
 .It
 Super Block checks:
-.Bl -item -indent indent -compact
+.Bl -item -offset indent -compact
 .It 
 More blocks for inodes than there are in the filesystem.
 .It
diff --git a/sbin/fsck_ifs/fsck_ifs.8 b/sbin/fsck_ifs/fsck_ifs.8
index 1cb1699aea99..3ebf01125685 100644
--- a/sbin/fsck_ifs/fsck_ifs.8
+++ b/sbin/fsck_ifs/fsck_ifs.8
@@ -243,8 +243,9 @@ then a default list of filesystems is read from
 the file
 .Pa /etc/fstab .
 .Pp
-.Bl -enum -indent indent -compact
 Inconsistencies checked are as follows:
+.Pp
+.Bl -enum -compact
 .It
 Blocks claimed by more than one inode or the free map.
 .It
@@ -253,7 +254,7 @@ Blocks claimed by an inode outside the range of the filesystem.
 Incorrect link counts.
 .It
 Size checks:
-.Bl -item -indent indent -compact
+.Bl -item -offset indent -compact
 .It 
 Directory size not a multiple of DIRBLKSIZ.
 .It
@@ -265,7 +266,7 @@ Bad inode format.
 Blocks not accounted for anywhere.
 .It
 Directory checks:
-.Bl -item -indent indent -compact
+.Bl -item -offset indent -compact
 .It 
 File pointing to unallocated inode.
 .It
@@ -278,7 +279,7 @@ or having the wrong inode number.
 .El
 .It
 Super Block checks:
-.Bl -item -indent indent -compact
+.Bl -item -offset indent -compact
 .It 
 More blocks for inodes than there are in the filesystem.
 .It
diff --git a/sbin/fsirand/fsirand.8 b/sbin/fsirand/fsirand.8
index 6d9764f6da36..4bef0b3b77b3 100644
--- a/sbin/fsirand/fsirand.8
+++ b/sbin/fsirand/fsirand.8
@@ -84,6 +84,7 @@ is not marked as clean.
 .It Fl p
 Print the current generation numbers for all inodes instead of
 generating new ones.
+.El
 .Sh CAVEATS
 Since
 .Nm
diff --git a/sbin/i386/cxconfig/cxconfig.8 b/sbin/i386/cxconfig/cxconfig.8
index 913e758897a8..63e0010a6745 100644
--- a/sbin/i386/cxconfig/cxconfig.8
+++ b/sbin/i386/cxconfig/cxconfig.8
@@ -317,7 +317,7 @@ ifconfig cx0 100.0.0.2 100.0.0.1 debug up
 .Ed
 .Sh FILES
 .Bl -tag -width /dev/cronyx -compact
-.Pa /dev/cronyx
+.It Pa /dev/cronyx
 the special device file for adapter options management
 .El
 .Sh SEE ALSO
diff --git a/sbin/i386/fdisk/fdisk.8 b/sbin/i386/fdisk/fdisk.8
index 68b009cac242..00dc7c729087 100644
--- a/sbin/i386/fdisk/fdisk.8
+++ b/sbin/i386/fdisk/fdisk.8
@@ -135,7 +135,6 @@ being found responding.
 .Pp
 When called with no arguments, it prints the sector 0 partition table.
 An example follows:
-
 .Bd -literal
 	******* Working on device /dev/rwd0 *******
 	parameters extracted from in-core disklabel are:
diff --git a/sbin/ip6fw/ip6fw.8 b/sbin/ip6fw/ip6fw.8
index 7aaf2ca58eec..d24470b8d58a 100644
--- a/sbin/ip6fw/ip6fw.8
+++ b/sbin/ip6fw/ip6fw.8
@@ -123,7 +123,7 @@ Try to resolve addresses and service names in output.
 .El
 .Pp
 .Ar action :
-.Bl -hang -offset flag -width 1234567890123456
+.Bl -hang -offset flag -width 16n
 .It Ar allow
 Allow packets that match rule.
 The search terminates.
@@ -191,7 +191,7 @@ through the
 interface.
 .Pp
 .Ar proto :
-.Bl -hang -offset flag -width 1234567890123456
+.Bl -hang -offset flag -width 16n
 .It Ar ipv6
 All packets match.
 The alias
@@ -220,7 +220,7 @@ and
 The
 .Em <address/prefixlen>
 may be specified as:
-.Bl -hang -offset flag -width 1234567890123456
+.Bl -hang -offset flag -width 16n
 .It Ar ipv6no
 An ipv6number of the form
 .Li fec0::1:2:3:4.
@@ -270,7 +270,7 @@ keyword indicates the rule should only match outgoing packets.
 To match packets going through a certain interface, specify
 the interface using
 .Ar via :
-.Bl -hang -offset flag -width 1234567890123456
+.Bl -hang -offset flag -width 16n
 .It Ar via ifX
 Packet must be going through interface
 .Ar ifX.
@@ -328,7 +328,7 @@ the local host have no transmit interface.
 .Pp
 Additional
 .Ar options :
-.Bl -hang -offset flag -width 1234567890123456
+.Bl -hang -offset flag -width 16n
 .It frag
 Matches if the packet is a fragment and this is not the first fragment
 of the datagram.
@@ -361,7 +361,7 @@ The supported IPv6 options are:
 (destination options header).
 The absence of a particular option may be denoted
 with a
-.Dq !
+.Dq \&!
 .Em (not working yet).
 .It established
 Matches packets that have the RST or ACK bits set.
@@ -383,7 +383,7 @@ and
 .Ar urg .
 The absence of a particular flag may be denoted
 with a
-.Dq ! .
+.Dq \&! .
 A rule which contains a
 .Ar tcpflags
 specification can never match a fragmented packet which has
@@ -399,7 +399,7 @@ or individual types separated by commas.
 .Sh CHECKLIST
 Here are some important points to consider when designing your
 rules:
-.Bl -bullet -hang -offset flag
+.Bl -bullet -offset flag
 .It
 Remember that you filter both packets going in and out.
 Most connections need packets going in both directions.
diff --git a/sbin/ipfw/ipfw.8 b/sbin/ipfw/ipfw.8
index c03dd09800b9..b68d558522c8 100644
--- a/sbin/ipfw/ipfw.8
+++ b/sbin/ipfw/ipfw.8
@@ -662,7 +662,7 @@ The supported IP types of service are:
 .Pq Dv IPTOS_CE .
 The absence of a particular type may be denoted
 with a
-.Ql ! .
+.Ql \&! .
 .It Cm iplen Ar len
 Match if the total length of a packet, including header and data, is
 .Ar len
@@ -696,7 +696,7 @@ The supported IP options are:
 (timestamp).
 The absence of a particular option may be denoted
 with a
-.Ql ! .
+.Ql \&! .
 .It Cm tcpseq Ar seq
 TCP packets only.
 Match if the TCP header sequence number field is set to
@@ -721,7 +721,7 @@ and
 .Cm urg .
 The absence of a particular flag may be denoted
 with a
-.Ql ! .
+.Ql \&! .
 A rule which contains a
 .Cm tcpflags
 specification can never match a fragmented packet which has
@@ -760,7 +760,7 @@ The supported TCP options are:
 (rfc1644 t/tcp connection count).
 The absence of a particular option may be denoted
 with a
-.Ql ! .
+.Ql \&! .
 .It Cm icmptypes Ar types
 ICMP packets only.
 Match if the ICMP type is in the list
diff --git a/sbin/kldload/kldload.8 b/sbin/kldload/kldload.8
index 520a35eb1fe3..80d2eb2e54cf 100644
--- a/sbin/kldload/kldload.8
+++ b/sbin/kldload/kldload.8
@@ -51,6 +51,7 @@ Be more verbose.
 .Bl -tag -width /boot/kernel -compact
 .It Pa /boot/kernel
 directory containing loadable modules.  Modules must be have an extention of .ko
+.El
 .Sh DIAGNOSTICS
 The
 .Nm
diff --git a/sbin/ldconfig/ldconfig.8 b/sbin/ldconfig/ldconfig.8
index 307b0819ae5d..3702d32f813c 100644
--- a/sbin/ldconfig/ldconfig.8
+++ b/sbin/ldconfig/ldconfig.8
@@ -79,7 +79,7 @@ directories (or the order thereof) from the cache or to specify additional
 directories where shared libraries might be found.
 .Ev LD_LIBRARY_PATH
 is a
-.Sq \:
+.Sq \&:
 separated list of directory paths which are searched by
 the dynamic linker
 when it needs to load a shared library.
@@ -128,6 +128,7 @@ Do not scan the built-in system directory
 for shared libraries.
 .It Fl v
 Switch on verbose mode.
+.El
 .Sh Security
 Special care must be taken when loading shared libraries into the address
 space of
@@ -183,6 +184,7 @@ containing either
 .Ql OBJFORMAT=aout
 or
 .Ql OBJFORMAT=elf .
+.El
 .Sh SEE ALSO
 .Xr ld 1 ,
 .Xr link 5
diff --git a/sbin/mknod/mknod.8 b/sbin/mknod/mknod.8
index 8e76667a4439..cbbd8b056ab7 100644
--- a/sbin/mknod/mknod.8
+++ b/sbin/mknod/mknod.8
@@ -43,7 +43,7 @@
 .Ar name
 .Op Cm c | Cm b
 .Ar major minor
-.Op owner:group
+.Op Ar owner : Ns Ar group
 .Sh DESCRIPTION
 The
 .Nm
@@ -92,7 +92,7 @@ The minor device number tells the kernel which subunit
 the node corresponds to on the device; for example,
 a subunit may be a filesystem partition
 or a tty line.
-.It Ar "owner \: group"
+.It Ar owner : Ns Ar group
 The
 .Ar owner
 .Ar group
diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8
index 541cadff4959..8d4a1a1a3009 100644
--- a/sbin/mount/mount.8
+++ b/sbin/mount/mount.8
@@ -340,6 +340,7 @@ option.
 Verbose mode.
 .It Fl w
 The file system object is to be read and write.
+.El
 .Sh DIAGNOSTICS
 Various, most of them are self-explanatory.
 .Pp
diff --git a/sbin/mount_ifs/mount.8 b/sbin/mount_ifs/mount.8
index 02311ce3567f..64a689c3b25b 100644
--- a/sbin/mount_ifs/mount.8
+++ b/sbin/mount_ifs/mount.8
@@ -330,6 +330,7 @@ option.
 Verbose mode.
 .It Fl w
 The file system object is to be read and write.
+.El
 .Sh DIAGNOSTICS
 Various, most of them are self-explanatory.
 .Pp
diff --git a/sbin/mount_null/mount_null.8 b/sbin/mount_null/mount_null.8
index c2e7167f7a7c..19172652590e 100644
--- a/sbin/mount_null/mount_null.8
+++ b/sbin/mount_null/mount_null.8
@@ -232,15 +232,13 @@ is that vnode arguments must be manually mapped.
 UCLA Technical Report CSD-910056,
 .Em "Stackable Layers: an Architecture for File System Development" .
 .Sh BUGS
-
 THIS FILESYSTEM TYPE IS NOT YET FULLY SUPPORTED (READ: IT DOESN'T WORK) 
 AND USING IT MAY, IN FACT, DESTROY DATA ON YOUR SYSTEM.  USE AT YOUR
 OWN RISK.  BEWARE OF DOG.  SLIPPERY WHEN WET.
-
+.Pp
 This code also needs an owner in order to be less dangerous - serious
 hackers can apply by sending mail to hackers@freebsd.org and announcing
 their intent to take it over.
-
 .Sh HISTORY
 The
 .Nm
diff --git a/sbin/mount_nullfs/mount_nullfs.8 b/sbin/mount_nullfs/mount_nullfs.8
index c2e7167f7a7c..19172652590e 100644
--- a/sbin/mount_nullfs/mount_nullfs.8
+++ b/sbin/mount_nullfs/mount_nullfs.8
@@ -232,15 +232,13 @@ is that vnode arguments must be manually mapped.
 UCLA Technical Report CSD-910056,
 .Em "Stackable Layers: an Architecture for File System Development" .
 .Sh BUGS
-
 THIS FILESYSTEM TYPE IS NOT YET FULLY SUPPORTED (READ: IT DOESN'T WORK) 
 AND USING IT MAY, IN FACT, DESTROY DATA ON YOUR SYSTEM.  USE AT YOUR
 OWN RISK.  BEWARE OF DOG.  SLIPPERY WHEN WET.
-
+.Pp
 This code also needs an owner in order to be less dangerous - serious
 hackers can apply by sending mail to hackers@freebsd.org and announcing
 their intent to take it over.
-
 .Sh HISTORY
 The
 .Nm
diff --git a/sbin/mount_umap/mount_umap.8 b/sbin/mount_umap/mount_umap.8
index f0801d839a2b..f2c811a9ee8a 100644
--- a/sbin/mount_umap/mount_umap.8
+++ b/sbin/mount_umap/mount_umap.8
@@ -124,15 +124,13 @@ sophisticated.
 .Xr mount 8 ,
 .Xr mount_null 8
 .Sh BUGS
-
 THIS FILESYSTEM TYPE IS NOT YET FULLY SUPPORTED (READ: IT DOESN'T WORK) 
 AND USING IT MAY, IN FACT, DESTROY DATA ON YOUR SYSTEM.  USE AT YOUR
 OWN RISK.  BEWARE OF DOG.  SLIPPERY WHEN WET.
-
+.Pp
 This code also needs an owner in order to be less dangerous - serious
 hackers can apply by sending mail to hackers@freebsd.org and announcing
 their intent to take it over.
-
 .Sh HISTORY
 The
 .Nm
diff --git a/sbin/mount_umapfs/mount_umapfs.8 b/sbin/mount_umapfs/mount_umapfs.8
index f0801d839a2b..f2c811a9ee8a 100644
--- a/sbin/mount_umapfs/mount_umapfs.8
+++ b/sbin/mount_umapfs/mount_umapfs.8
@@ -124,15 +124,13 @@ sophisticated.
 .Xr mount 8 ,
 .Xr mount_null 8
 .Sh BUGS
-
 THIS FILESYSTEM TYPE IS NOT YET FULLY SUPPORTED (READ: IT DOESN'T WORK) 
 AND USING IT MAY, IN FACT, DESTROY DATA ON YOUR SYSTEM.  USE AT YOUR
 OWN RISK.  BEWARE OF DOG.  SLIPPERY WHEN WET.
-
+.Pp
 This code also needs an owner in order to be less dangerous - serious
 hackers can apply by sending mail to hackers@freebsd.org and announcing
 their intent to take it over.
-
 .Sh HISTORY
 The
 .Nm
diff --git a/sbin/mountd/exports.5 b/sbin/mountd/exports.5
index e2d332c62964..e1304bc95d1b 100644
--- a/sbin/mountd/exports.5
+++ b/sbin/mountd/exports.5
@@ -50,9 +50,10 @@ file specifies remote mount points for the
 mount protocol per the
 .Tn NFS
 server specification; see
-.%T "Network File System Protocol Specification \\*(tNRFC\\*(sP 1094, Appendix A"
-and
-.%T "NFS: Network File System Version 3 Specification, Appendix I" .
+.%T "Network File System Protocol Specification" ,
+RFC1094, Appendix A and
+.%T "NFS: Network File System Version 3 Specification" ,
+Appendix I.
 .Pp
 Each line in the file
 (other than comment lines that begin with a #)
diff --git a/sbin/newfs_msdos/newfs_msdos.8 b/sbin/newfs_msdos/newfs_msdos.8
index c2943e6ec6af..e55554c7f593 100644
--- a/sbin/newfs_msdos/newfs_msdos.8
+++ b/sbin/newfs_msdos/newfs_msdos.8
@@ -154,15 +154,20 @@ struct bsxbpb {
 };
 .Ed
 .Sh EXAMPLES
-
-	newfs_msdos /dev/ad0s1
-
-Create a file system, using default parameters, on /dev/ad0s1.
-
-	newfs_msdos -f 1440 -L foo fd0
-
-Create a standard 1.44M file system, with volume label "foo", on
-/dev/fd0.
+.Bd -literal -offset indent
+newfs_msdos /dev/ad0s1
+.Ed
+.Pp
+Create a file system, using default parameters, on
+.Pa /dev/ad0s1 .
+.Bd -literal -offset indent
+newfs_msdos -f 1440 -L foo fd0
+.Ed
+.Pp
+Create a standard 1.44M file system, with volume label
+.Ar foo ,
+on
+.Pa /dev/fd0 .
 .Sh SEE ALSO
 .Xr disktab 5 ,
 .Xr disklabel 8 ,
diff --git a/sbin/nos-tun/nos-tun.8 b/sbin/nos-tun/nos-tun.8
index 1121088446d5..7b7d5dfd5664 100644
--- a/sbin/nos-tun/nos-tun.8
+++ b/sbin/nos-tun/nos-tun.8
@@ -65,12 +65,12 @@ address set on the remote end.
 This end, a
 .Fx
 box on address 192.168.59.34:
-.Bd -literal -offset indent 4m 
+.Bd -literal -offset indent
 nos-tun -t /dev/tun0 -s 192.168.61.1 -d 192.168.61.2 192.168.56.45
 .Ed
 .Pp
 Remote cisco on address 192.168.56.45:
-.Bd -literal -offset indent 4m 
+.Bd -literal -offset indent
 interface tunnel 0
 ip address 192.168.61.2 255.255.255.252
 tunnel mode nos
diff --git a/sbin/pc98/fdisk/fdisk.8 b/sbin/pc98/fdisk/fdisk.8
index bc8b94622066..ee909258487a 100644
--- a/sbin/pc98/fdisk/fdisk.8
+++ b/sbin/pc98/fdisk/fdisk.8
@@ -137,7 +137,6 @@ being found responding.
 .Pp
 When called with no arguments, it prints the sector 0 partition table.
 An example follows:
-
 .Bd -literal
 	******* Working on device /dev/rda0 *******
 	parameters extracted from in-core disklabel are:
diff --git a/sbin/ping/ping.8 b/sbin/ping/ping.8
index 02f492d385f9..33f7e756fd71 100644
--- a/sbin/ping/ping.8
+++ b/sbin/ping/ping.8
@@ -105,7 +105,7 @@ whichever is more.
 For every
 .Tn ECHO_REQUEST
 sent a period 
-.Dq \&.
+.Dq .\&
 is printed, while for every
 .Tn ECHO_REPLY
 received a backspace is printed.
diff --git a/sbin/ping6/ping6.8 b/sbin/ping6/ping6.8
index f9c25fc5a3eb..3baec345c502 100644
--- a/sbin/ping6/ping6.8
+++ b/sbin/ping6/ping6.8
@@ -78,7 +78,7 @@ packets to network hosts
 .Op Fl s Ar packetsize
 .Ek
 .Bk -words
-.Op Ar hops...
+.Op Ar hops...\&
 .Ek
 .Bk -words
 .Ar host
@@ -151,7 +151,7 @@ whichever is more.
 For every
 .Tn ECHO_REQUEST
 sent a period
-.Dq \&.
+.Dq .\&
 is printed, while for every
 .Tn ECHO_REPLY
 received a backspace is printed.
diff --git a/sbin/reboot/boot_i386.8 b/sbin/reboot/boot_i386.8
index c29ba7d08390..7f449bd16b10 100644
--- a/sbin/reboot/boot_i386.8
+++ b/sbin/reboot/boot_i386.8
@@ -267,7 +267,8 @@ When disk-related errors occur, these are reported by the second-stage
 bootstrap using the same error codes returned by the BIOS, for example
 .Dq Disk error 0x1 (lba=0x12345678) .
 Here is a partial list of these error codes:
-.Bl -tag -width "0x80" -compat
+.Pp
+.Bl -tag -width "0x80" -compact
 .It 0x1
 Invalid argument
 .It 0x2
diff --git a/sbin/restore/restore.8 b/sbin/restore/restore.8
index 54410369a00a..069ca405f7ab 100644
--- a/sbin/restore/restore.8
+++ b/sbin/restore/restore.8
@@ -73,7 +73,7 @@
 .Op Fl s Ar fileno
 .Op file ...
 .Pp
-.in -\n(iSu
+.in \" XXX
 (The
 .Bx 4.3
 option syntax is implemented for backward compatibility, but
diff --git a/sbin/routed/routed.8 b/sbin/routed/routed.8
index ed21687d3638..847b9f56708a 100644
--- a/sbin/routed/routed.8
+++ b/sbin/routed/routed.8
@@ -482,9 +482,9 @@ be forwarded.
 .Pp
 .Ar Value
 is the hop count to the destination host or network.
-.Ar " Host hname "
+.Cm Host Ar hname
 is equivalent to
-.Ar " net  nname/32 ".
+.Cm net Ar nname/32 .
 .Pp
 One of the keywords
 .Cm passive ,
diff --git a/sbin/startslip/startslip.1 b/sbin/startslip/startslip.1
index 7f2632ab5fbf..eec5ebd8cb3f 100644
--- a/sbin/startslip/startslip.1
+++ b/sbin/startslip/startslip.1
@@ -199,6 +199,7 @@ Default case is no uucp locking to satisfy such programs.
 .It Pa /var/run/startslip.<device>.pid
 pid stored here
 .It Pa /usr/share/examples/startslip/*
+.El
 .Sh SEE ALSO
 .Xr uustat 1 ,
 .Xr slattach 8 ,
diff --git a/usr.sbin/mountd/exports.5 b/usr.sbin/mountd/exports.5
index e2d332c62964..e1304bc95d1b 100644
--- a/usr.sbin/mountd/exports.5
+++ b/usr.sbin/mountd/exports.5
@@ -50,9 +50,10 @@ file specifies remote mount points for the
 mount protocol per the
 .Tn NFS
 server specification; see
-.%T "Network File System Protocol Specification \\*(tNRFC\\*(sP 1094, Appendix A"
-and
-.%T "NFS: Network File System Version 3 Specification, Appendix I" .
+.%T "Network File System Protocol Specification" ,
+RFC1094, Appendix A and
+.%T "NFS: Network File System Version 3 Specification" ,
+Appendix I.
 .Pp
 Each line in the file
 (other than comment lines that begin with a #)