diff --git a/usr.sbin/acpi/acpiconf/acpiconf.8 b/usr.sbin/acpi/acpiconf/acpiconf.8
index 0860fe49034a..2d86c985291f 100644
--- a/usr.sbin/acpi/acpiconf/acpiconf.8
+++ b/usr.sbin/acpi/acpiconf/acpiconf.8
@@ -53,18 +53,18 @@ Displays a summary of available options.
 .It Fl s Ar type
 Enters the specified sleep mode.
 Recognized types are
-.Cm 1 
-(Only the CPU clock is stopped),
+.Cm 1
+(only the CPU clock is stopped),
 .Cm 2 ,
-.Cm 3 
-(The CPU context is lost and memory context is preserved),
-.Cm 4 
-(The CPU context is lost and memory context is stored to disk)
+.Cm 3
+(the CPU context is lost and memory context is preserved),
+.Cm 4
+(the CPU context is lost and memory context is stored to disk)
 and
-.Cm 5 
-(Soft off).
+.Cm 5
+(soft off).
 The supported states depend on BIOS implementation, including ACPI
-byte code(AML).
+byte code (AML).
 .El
 .Sh SEE ALSO
 .Xr acpi 4 ,
diff --git a/usr.sbin/adduser/adduser.8 b/usr.sbin/adduser/adduser.8
index 5d76ecad2347..3c4cef48e6a1 100644
--- a/usr.sbin/adduser/adduser.8
+++ b/usr.sbin/adduser/adduser.8
@@ -50,8 +50,8 @@
 .Sh DESCRIPTION
 The
 .Nm
-utility is a simple program for adding new users.  It checks
-the passwd, group and shell databases.
+utility is a simple program for adding new users.
+It checks the passwd, group and shell databases.
 It creates passwd/group entries,
 .Ev HOME
 directory, dotfiles and sends the new user a welcome message.
@@ -114,7 +114,8 @@ users into groups and having to muck with the umask when working in a shared
 area.
 .Pp
 I have been using this model for almost 10 years and found that it works
-for most situations, and has never gotten in the way.  (Rod Grimes)
+for most situations, and has never gotten in the way.
+(Rod Grimes)
 .Sh CONFIGURATION
 .Bl -enum
 .It
diff --git a/usr.sbin/burncd/burncd.8 b/usr.sbin/burncd/burncd.8
index 520ed9a2c925..7c251b318a93 100644
--- a/usr.sbin/burncd/burncd.8
+++ b/usr.sbin/burncd/burncd.8
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 4, 2001
+.Dd October 18, 2002
 .Os
 .Dt BURNCD 8
 .Sh NAME
@@ -54,7 +54,7 @@ burn the CD-R/RW in DAO (disk at once) mode.
 eject the media when done.
 .It Fl f Ar device
 set the device to use for the burning process.
-.It Fl F 
+.It Fl F
 force operation regardless of warnings.
 .It Fl l
 read a list of image files from filename.
@@ -69,7 +69,9 @@ quiet, do not print progress messages.
 .It Fl s Ar speed
 set the speed of the burner device.
 Defaults to 1.
-Specify "max" to use the drive's fastest speed.
+Specify
+.Dq Li max
+to use the drive's fastest speed.
 .It Fl t
 test write, do not actually write on the media.
 .It Fl v
@@ -95,9 +97,9 @@ Erase a CD-RW medium.
 This erases the entire media.
 Can take up to 1 hour to finish.
 .It Cm format dwd+rw
-Formats a DVD+RW media to the default max size and 2048byte blocks. This
-operation can take a long time to finish. Progress reporting is done
-during the process.
+Formats a DVD+RW media to the default max size and 2048 byte blocks.
+This operation can take a long time to finish.
+Progress reporting is done during the process.
 .It Cm fixate
 Fixate the medium so that the TOC is generated and the media can be used
 in an ordinary CD drive.
@@ -137,8 +139,8 @@ and
 .Pq Fl n
 modes.
 .It Cm dvdrw
-Set the write mode to write a DVD+RW from the follwing image. DVD's only
-have one track.
+Set the write mode to write a DVD+RW from the following image.
+DVDs only have one track.
 .It Ar file
 All other arguments are treated as filenames of images to write to the media,
 or in case the
diff --git a/usr.sbin/cdcontrol/cdcontrol.1 b/usr.sbin/cdcontrol/cdcontrol.1
index 94214f944844..71216c5ca888 100644
--- a/usr.sbin/cdcontrol/cdcontrol.1
+++ b/usr.sbin/cdcontrol/cdcontrol.1
@@ -166,7 +166,9 @@ Set LBA ioctl mode.
 .It Ic speed Ar s
 Set the highest speed that the drive should use for reading data.
 The units are multiples of a single speed CDROM (150 KB/s).
-Specify "max" to use the drive's fastest speed.
+Specify
+.Dq Li max
+to use the drive's fastest speed.
 .It Ic quit
 Quit the program.
 .El
diff --git a/usr.sbin/edquota/edquota.8 b/usr.sbin/edquota/edquota.8
index 15ab449c10f2..6276abdac5a3 100644
--- a/usr.sbin/edquota/edquota.8
+++ b/usr.sbin/edquota/edquota.8
@@ -49,7 +49,10 @@
 .Ar username ...
 .Nm
 .Op Fl u
-.Fl e Ar fspath Ns Op : Ns Ar bslim Ns Op : Ns Ar bhlim Ns Op : Ns Ar islim Ns Op : Ns Ar ihlim
+.Fl e
+.Sm off
+.Ar fspath Op : Ar bslim Op : Ar bhlim Op : Ar islim Op : Ar ihlim
+.Sm on
 .Op Fl e Ar ...
 .Ar username ...
 .Nm
@@ -59,7 +62,10 @@
 .Ar groupname ...
 .Nm
 .Fl g
-.Fl e Ar fspath Ns Op : Ns Ar bslim Ns Op : Ns Ar bhlim Ns Op : Ns Ar islim Ns Op : Ns Ar ihlim
+.Fl e
+.Sm off
+.Ar fspath Op : Ar bslim Op : Ar bhlim Op : Ar islim Op : Ar ihlim
+.Sm on
 .Op Fl e Ar ...
 .Ar groupname ...
 .Nm
@@ -129,13 +135,15 @@ The uids in question do not have to be currently assigned in
 .Pa /etc/passwd .
 .Pp
 If one or more
-.Fl e Ar fspath Ns Op : Ns Ar bslim Ns Op : Ns Ar bhlim Ns Op : Ns Ar islim Ns Op : Ns Ar ihlim
+.Fl e
+.Sm off
+.Ar fspath Op : Ar bslim Op : Ar bhlim Op : Ar islim Op : Ar ihlim
+.Sm on
 options are specified,
 .Nm
 will non-interactively set quotas defined by
-.Ar bslim ,
-.Ar bhlim ,
-.Ar islim and
+.Ar bslim , bhlim , islim
+and
 .Ar ihlim
 on each particular filesystem referenced by
 .Ar fspath .
@@ -149,9 +157,8 @@ is soft limit on number of files and
 .Ar ihlim
 is hard limit on number of files.
 If any of the
-.Ar bslim ,
-.Ar bhlim ,
-.Ar islim and
+.Ar bslim , bhlim , islim
+and
 .Ar ihlim
 values are omitted, it is assumed to be zero, therefore
 indicating that no quota should be imposed.
diff --git a/usr.sbin/kbdmap/kbdmap.1 b/usr.sbin/kbdmap/kbdmap.1
index d3cc0946d19c..fdb5c5ebee7c 100644
--- a/usr.sbin/kbdmap/kbdmap.1
+++ b/usr.sbin/kbdmap/kbdmap.1
@@ -143,7 +143,7 @@ commands appeared in
 .Fx 2.1 .
 .Sh AUTHORS
 .An Wolfram Schneider
-.Aq wosch@FreeBSD.org 
+.Aq wosch@FreeBSD.org
 wrote the original Perl version.
 The current version was rewritten in C by
 .An Jonathan Belson
diff --git a/usr.sbin/lpr/lpc/lpc.8 b/usr.sbin/lpr/lpc/lpc.8
index a9ce4cbf70bc..2662ef19216f 100644
--- a/usr.sbin/lpr/lpc/lpc.8
+++ b/usr.sbin/lpr/lpc/lpc.8
@@ -63,7 +63,8 @@ spooling queues and printer daemons,
 .It
 change the status message for printer queues (the status message
 may be seen by users as part of the output of the
-.Xr lpq 1 utility).
+.Xr lpq 1
+utility).
 .El
 .Pp
 Without any arguments,
@@ -92,9 +93,7 @@ then disable printing (preventing new daemons from being started by
 .Xr lpr 1 )
 for the specified printers.
 .Pp
-.It Ic bottomq Ar printer Xo
-.Op Ar jobspec ...
-.Xc
+.It Ic bottomq Ar printer Op Ar jobspec ...
 Take the specified jobs in the order specified and move them to the
 bottom of the printer queue.
 Each
@@ -199,9 +198,7 @@ command is a privileged command, while the
 .Ic tclean
 command is not restricted.
 .Pp
-.It Ic topq Ar printer Xo
-.Op Ar jobspec ...
-.Xc
+.It Ic topq Ar printer Op Ar jobspec ...
 Take the specified jobs in the order specified and move them to the
 top of the printer queue.
 Each
@@ -230,29 +227,35 @@ can be:
 .Bl -bullet
 .It
 a single job number, which will match all jobs in the printer's queue
-which have the same job number.  Eg:
+which have the same job number.
+Eg:
 .Ar 17 ,
 .It
 a range of job numbers, which will match all jobs with a number between
-the starting and ending job numbers, inclusive.  Eg:
+the starting and ending job numbers, inclusive.
+Eg:
 .Ar 21-32 ,
 .It
 a specific userid, which will match all jobs which were sent by that
-user.  Eg:
+user.
+Eg:
 .Ar jones ,
 .It
 a host name, when prefixed by an `@', which will match all jobs in
-the queue which were sent from the given host.  Eg:
+the queue which were sent from the given host.
+Eg:
 .Ar @freebsd.org ,
 .It
 a job range and a userid, separated by a `:', which will match all jobs
-which both match the job range and were sent by the specified user.  Eg:
+which both match the job range and were sent by the specified user.
+Eg:
 .Ar jones:17
 or
 .Ar 21-32:jones ,
 .It
 a job range and/or a userid, followed by a host name, which will match
-all jobs which match all the specified criteria.  Eg:
+all jobs which match all the specified criteria.
+Eg:
 .Ar jones@freebsd.org
 or
 .Ar 21-32@freebsd.org
diff --git a/usr.sbin/memcontrol/memcontrol.8 b/usr.sbin/memcontrol/memcontrol.8
index f9d24a83ff69..ad0e5330671b 100644
--- a/usr.sbin/memcontrol/memcontrol.8
+++ b/usr.sbin/memcontrol/memcontrol.8
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 28, 1999
+.Dd September 15, 2002
 .Dt MEMCONTROL 8
 .Os
 .Sh NAME
@@ -32,22 +32,19 @@
 .Nd "control system cache behaviour with respect to memory"
 .Sh SYNOPSIS
 .Nm
-.Ar list
+.Cm list
 .Op Fl a
-.Pp
 .Nm
-.Ar set
+.Cm set
 .Fl b Ar base
 .Fl l Ar length
 .Fl o Ar owner
 .Ar attribute
-.Pp
 .Nm
-.Ar clear
+.Cm clear
 .Fl o Ar owner
-.Pp
 .Nm
-.Ar clear
+.Cm clear
 .Fl b Ar base
 .Fl l Ar length
 .Sh DESCRIPTION
@@ -62,52 +59,50 @@ provides an interface to this facility, allowing CPU cache behavior to
 be altered for ranges of system physical memory.
 .Pp
 These ranges are typically power-of-2 aligned and sized, however the specific
-rules governing their layout vary between architectures.  The
+rules governing their layout vary between architectures.
+The
 .Nm
 utility does not attempt to enforce these rules, however the system will
 reject any attempt to set an illegal combination.
-.Bl -tag -width clear
-.It Ar list
+.Bl -tag -width ".Cm clear"
+.It Cm list
 List range slots.
-.Bl -tag -width xxxxxx
-.It Op Fl a
-List all range slots, even those that are inactive
+.Bl -tag -width indent
+.It Fl a
+List all range slots, even those that are inactive.
 .El
-.It Ar set
+.It Cm set
 Set memory range attributes.
-.Bl -tag -width xxxxxx
+.Bl -tag -width indent
 .It Fl b Ar base
-Memory range base address
+Memory range base address.
 .It Fl l Ar length
-Length of memory range in bytes, power of 2
+Length of memory range in bytes, power of 2.
 .It Fl o Ar owner
-Text identifier for this setting (7 char max)
+Text identifier for this setting (7 char max).
 .It Ar attribute
 Attributes applied to this range; combinations of
-.Ar force ,
-.Ar uncacheable ,
-.Ar write-combine ,
-.Ar write-through ,
-.Ar write-back ,
-.Ar write-protect
+.Cm force , uncacheable , write-combine , write-through , write-back ,
+and
+.Cm write-protect .
 .El
-.It Ar clear
+.It Cm clear
 Clear memory range attributes.
 Ranges may be cleared by owner or by
 base/length combination.
 .Pp
 To clear based on ownership:
-.Bl -tag -width xxxxxx
+.Bl -tag -width indent
 .It Fl o Ar owner
-All ranges with this owner will be cleared
+All ranges with this owner will be cleared.
 .El
 .Pp
 To clear based on the base/length combination:
-.Bl -tag -width xxxxxx
+.Bl -tag -width indent
 .It Fl b Ar base
-Memory range base address
+Memory range base address.
 .It Fl l Ar length
-Length of memory range in bytes, power of 2
+Length of memory range in bytes, power of 2.
 .El
 .Pp
 Base and length must exactly match an existing range.
diff --git a/usr.sbin/newsyslog/newsyslog.8 b/usr.sbin/newsyslog/newsyslog.8
index 1671a23474fe..f55986b20895 100644
--- a/usr.sbin/newsyslog/newsyslog.8
+++ b/usr.sbin/newsyslog/newsyslog.8
@@ -293,7 +293,7 @@ flag means that the specified
 .Ar logfile_name
 is a shell pattern, which instructs the
 .Nm
-to archive all filenames matchins this pattern using the same
+to archive all filenames matching this pattern using the same
 options.
 See
 .Xr glob 3
diff --git a/usr.sbin/syslogd/syslog.conf.5 b/usr.sbin/syslogd/syslog.conf.5
index 099b9cb0fc0c..ff99a5f26b53 100644
--- a/usr.sbin/syslogd/syslog.conf.5
+++ b/usr.sbin/syslogd/syslog.conf.5
@@ -85,7 +85,7 @@ are encoded as a
 a period
 .Pq Dq \&. ,
 an optional set of comparison flags
-.Pq Bo ! Bc Bq <=> ,
+.Pq Oo \&! Oc Op <=> ,
 and a
 .Em level ,
 with no intervening white-space.
@@ -124,7 +124,7 @@ level equal or greater than
 .Em level
 will be logged.
 Comparison flags beginning with
-.Do ! Dc
+.Dq Li \&!
 will have their logical sense inverted.
 Thus
 .Dq !=info
diff --git a/usr.sbin/syslogd/syslogd.8 b/usr.sbin/syslogd/syslogd.8
index f79084694f34..8a480a830aa3 100644
--- a/usr.sbin/syslogd/syslogd.8
+++ b/usr.sbin/syslogd/syslogd.8
@@ -237,7 +237,7 @@ see
 The
 .Nm
 utility reads messages from the
-.Tn UNIX
+.Ux
 domain socket
 .Pa /var/run/log ,
 from an Internet domain socket specified in
@@ -279,7 +279,7 @@ configuration file
 default process ID file
 .It Pa /var/run/log
 name of the
-.Tn UNIX
+.Ux
 domain datagram log socket
 .It Pa /dev/klog
 kernel log device
diff --git a/usr.sbin/wicontrol/wicontrol.8 b/usr.sbin/wicontrol/wicontrol.8
index 8c7a09a7ec36..c300c9794629 100644
--- a/usr.sbin/wicontrol/wicontrol.8
+++ b/usr.sbin/wicontrol/wicontrol.8
@@ -315,8 +315,11 @@ string or 26 hex digits in addition to the formats supported by the
 Silver cards.
 .Pp
 For maximum portability, hex keys are recommended;
-the mapping of text keys to WEP encryption is usually driver-specific.   
-In particular, the Windows drivers do this mapping differently to FreeBSD.
+the mapping of text keys to WEP encryption is usually driver-specific.
+In particular, the
+.Tn Windows
+drivers do this mapping differently to
+.Fx .
 .Pp
 Note: Both 128-bit and 64-bit WEP encryption have been broken.
 See the