Prepare for mdoc(7)NG.

55 files changed, 259 insertions, 211 deletions

diff --git a/usr.bin/ar/ar.1 b/usr.bin/ar/ar.1
index 894fd93..74ea6a9 100644
--- a/usr.bin/ar/ar.1
+++ b/usr.bin/ar/ar.1
@@ -44,11 +44,11 @@
 .Sh SYNOPSIS
 .Nm
 .Fl d
-.Op Fl \Tv
+.Op Fl \&Tv
 .Ar archive file ...
 .Nm
 .Fl m
-.Op Fl \Tv
+.Op Fl \&Tv
 .Ar archive file ...
 .Nm
 .Fl m
@@ -56,7 +56,7 @@
 .Ar position archive file ...
 .Nm
 .Fl p
-.Op Fl \Tv
+.Op Fl \&Tv
 .Ar archive [file ...]
 .Nm
 .Fl q
@@ -72,7 +72,7 @@
 .Ar position archive file ...
 .Nm
 .Fl t
-.Op Fl \Tv
+.Op Fl \&Tv
 .Ar archive [file ...]
 .Nm
 .Fl x
diff --git a/usr.bin/at/at.man b/usr.bin/at/at.man
index 0a14fcf..7a8e2c5 100644
--- a/usr.bin/at/at.man
+++ b/usr.bin/at/at.man
@@ -36,7 +36,7 @@
 .Op Fl mv
 .Op Ar time
 .Sh DESCRIPTION
-.Nm At
+.Nm \&At
 and
 .Nm batch
 read commands from standard input or a specified file which are to
@@ -56,7 +56,7 @@ drops below _LOADAVG_MX, or the value specified in the invocation of
 .Nm atrun .
 .El
 .Pp
-.Nm At
+.Nm \&At
 allows some moderately complex
 .Ar time
 specifications.  It accepts times of the form
@@ -225,6 +225,7 @@ shows completed but not yet deleted jobs in the queue; otherwise
 shows the time the job will be executed.
 .It Fl c
 Cat the jobs listed on the command line to standard output.
+.El
 .Sh FILES
 .Bl -tag -width _ATJOB_DIR/_LOCKFILE -compact
 .It Pa _ATJOB_DIR
@@ -258,7 +259,7 @@ in the environment variable
 .Ev LOGNAME .
 If that is undefined or empty, the current userid is assumed.
 .Pp
-.Nm At
+.Nm \&At
 and
 .Nm batch
 as presently implemented are not suitable when users are competing for
diff --git a/usr.bin/c89/c89.1 b/usr.bin/c89/c89.1
index 5efd4bd..ac6248a 100644
--- a/usr.bin/c89/c89.1
+++ b/usr.bin/c89/c89.1
@@ -35,16 +35,16 @@
 .Nm
 .Op Fl c
 .Op Fl D Ar name Ns Op Ar =value 
-.Op ...
+.Op ...\&
 .Op Fl E
 .Op Fl g
-.Op Fl I Ar directory ...
-.Op Fl L Ar directory ...
+.Op Fl I Ar directory ...\&
+.Op Fl L Ar directory ...\&
 .Op Fl o Ar outfile
 .Op Fl O
 .Op Fl s
-.Op Fl U Ar name ...
-.Ar operand ...
+.Op Fl U Ar name ...\&
+.Ar operand ...\&
 .Sh DESCRIPTION
 This is the name of the C language compiler as required by the
 .St -p1003.2
diff --git a/usr.bin/chflags/chflags.1 b/usr.bin/chflags/chflags.1
index 0c4fcf7..21fc219 100644
--- a/usr.bin/chflags/chflags.1
+++ b/usr.bin/chflags/chflags.1
@@ -80,28 +80,41 @@ in the files instead of just the files themselves.
 The flags are specified as an octal number or a comma separated list
 of keywords.
 The following keywords are currently defined:
-.Bd -literal -offset indent compact
-arch	set the archived flag (super-user only)
-opaque	set the opaque flag (owner or super-user only)
-nodump	set the nodump flag (owner or super-user only)
-sappnd	set the system append-only flag (super-user only)
-schg	set the system immutable flag (super-user only)
-sunlnk	set the system undeletable flag (super-user only)
-uappnd	set the user append-only flag (owner or super-user only)
-uchg	set the user immutable flag (owner or super-user only)
-uunlnk	set the user undeletable flag (owner or super-user only)
-archived, sappend, schange, simmutable, uappend, uchange, uimmutable,
-sunlink, uunlink
-	aliases for the above
-.Ed
+.Pp
+.Bl -tag -offset indent -width "opaque" -compact
+.It Ar arch
+set the archived flag (super-user only)
+.It Ar opaque
+set the opaque flag (owner or super-user only)
+.It Ar nodump
+set the nodump flag (owner or super-user only)
+.It Ar sappnd
+set the system append-only flag (super-user only)
+.It Ar schg
+set the system immutable flag (super-user only)
+.It Ar sunlnk
+set the system undeletable flag (super-user only)
+.It Ar uappnd
+set the user append-only flag (owner or super-user only)
+.It Ar uchg
+set the user immutable flag (owner or super-user only)
+.It Ar uunlnk
+set the user undeletable flag (owner or super-user only)
+.It Ar archived , sappend , schange , Xo
+.Ar simmutable , uappend , uchange , uimmutable ,
+.Ar sunlink , uunlink
+.Xc
+aliases for the above
+.El
 .Pp
 Putting the letters
-.Dq no
+.Dq Ar no
 before an option causes the flag to be turned off.
 For example:
-.Bd -literal -offset indent compact
-nouchg	the immutable bit should be cleared
-.Ed
+.Bl -tag -offset indent -width "nouchg"
+.It Ar nouchg
+the immutable bit should be cleared
+.El
 .Pp
 Symbolic links do not have flags, so unless the
 .Fl H
diff --git a/usr.bin/chpass/chpass.1 b/usr.bin/chpass/chpass.1
index 449269e..889efc7 100644
--- a/usr.bin/chpass/chpass.1
+++ b/usr.bin/chpass/chpass.1
@@ -80,7 +80,7 @@ entry, in the format specified by
 .Xr passwd 5 ,
 as an argument.
 This argument must be a colon
-.Pq Dq \:
+.Pq Dq \&:
 separated list of all the
 user database fields, although they may be empty.
 .It Fl p
diff --git a/usr.bin/cksum/cksum.1 b/usr.bin/cksum/cksum.1
index 02bdafa4..32f1621 100644
--- a/usr.bin/cksum/cksum.1
+++ b/usr.bin/cksum/cksum.1
@@ -178,7 +178,7 @@ article.
 .Rs
 .%T "Computation of Cyclic Redundancy Checks Via Table Lookup"
 .%A Dilip V. Sarwate
-.%J "Communications of the \\*(tNACM\\*(sP"
+.%J "Communications of the" Tn ACM
 .%D "August 1988"
 .Re
 .Sh STANDARDS
diff --git a/usr.bin/doscmd/doscmd.1 b/usr.bin/doscmd/doscmd.1
index 72b2489..d5e968f 100644
--- a/usr.bin/doscmd/doscmd.1
+++ b/usr.bin/doscmd/doscmd.1
@@ -536,6 +536,7 @@ to your
 or
 .Pa ${HOME}/.xinitrc
 to let the X server find it.
+.El
 .Sh FILE TRANSLATION
 .Nm Doscmd
 translates
diff --git a/usr.bin/ee/ee.1 b/usr.bin/ee/ee.1
index 7c0402d..4d76028 100644
--- a/usr.bin/ee/ee.1
+++ b/usr.bin/ee/ee.1
@@ -547,6 +547,7 @@ may be too slow for slower systems.
 .It Pa /usr/share/misc/init.ee
 .It Pa $HOME/.init.ee
 .It Pa .init.ee
+.El
 .Sh AUTHORS
 The software 
 .Nm
diff --git a/usr.bin/find/find.1 b/usr.bin/find/find.1
index 7d7e1f4..7e57809 100644
--- a/usr.bin/find/find.1
+++ b/usr.bin/find/find.1
@@ -45,7 +45,7 @@
 .Op Fl H | Fl L | Fl P
 .Op Fl Xdsx
 .Op Fl f Ar pathname
-.Op Ar pathname ...
+.Op Ar pathname ...\&
 .Ar expression
 .Sh DESCRIPTION
 .Nm Find
@@ -328,9 +328,13 @@ If the mode is octal, only bits 07777
 .Dv S_IRWXO )
 of the file's mode bits participate
 in the comparison.
-If the mode is preceded by a dash (``\-''), this primary evaluates to true
+If the mode is preceded by a dash
+.Pq Dq - ,
+this primary evaluates to true
 if at least all of the bits in the mode are set in the file's mode bits.
-If the mode is preceded by a plus (``\+''), this primary evaluates to true
+If the mode is preceded by a plus
+.Pq Dq + ,
+this primary evaluates to true
 if any of the bits in the mode are set in the file's mode bits.
 Otherwise, this primary evaluates to true if
 the bits in the mode exactly match the file's mode bits.
@@ -417,7 +421,10 @@ is treated as a user id.
 .El
 .Pp
 All primaries which take a numeric argument allow the number to be
-preceded by a plus sign (``+'') or a minus sign (``\-'').
+preceded by a plus sign
+.Pq Dq +
+or a minus sign
+.Pq Dq - .
 A preceding plus sign means ``more than n'', a preceding minus sign means
 ``less than n'' and neither means ``exactly n'' .
 .Sh OPERATORS
diff --git a/usr.bin/finger/finger.1 b/usr.bin/finger/finger.1
index d88bf46..ecd5d09c 100644
--- a/usr.bin/finger/finger.1
+++ b/usr.bin/finger/finger.1
@@ -41,8 +41,8 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl lmpshoT
-.Op Ar user ...
-.Op Ar user@host ...
+.Op Ar user ...\&
+.Op Ar user@host ...\&
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/usr.bin/from/from.1 b/usr.bin/from/from.1
index 9e9317e..5a04d41 100644
--- a/usr.bin/from/from.1
+++ b/usr.bin/from/from.1
@@ -81,6 +81,7 @@ mailbox, is examined instead of the invoker's own mailbox.
 .It Ev MAIL
 If set, the location of the invoker's mailbox.  Otherwise, the default
 in /var/mail is used.
+.El
 .Sh FILES
 .Bl -tag -width /var/mail/* -compact
 .It Pa /var/mail/*
diff --git a/usr.bin/fstat/fstat.1 b/usr.bin/fstat/fstat.1
index c7034d1..6c46908 100644
--- a/usr.bin/fstat/fstat.1
+++ b/usr.bin/fstat/fstat.1
@@ -115,7 +115,7 @@ The process id.
 The file number in the per-process open file table or one of the following
 special names:
 .Pp
-.Bd -literal -ragged -offset indent -compact
+.Bd -literal -offset indent -compact
 text	- executable text inode
 wd 	- current working directory
 root	- root inode
diff --git a/usr.bin/ftp/ftp.1 b/usr.bin/ftp/ftp.1
index 4681b69..56c8fde7 100644
--- a/usr.bin/ftp/ftp.1
+++ b/usr.bin/ftp/ftp.1
@@ -1035,7 +1035,7 @@ if verbose is on, when a file transfer completes, statistics
 regarding the efficiency of the transfer are reported.
 By default,
 verbose is on.
-.It Ic ? Op Ar command
+.It Ic \&? Op Ar command
 A synonym for
 .Ic help .
 .El
diff --git a/usr.bin/gcore/gcore.1 b/usr.bin/gcore/gcore.1
index 933b6f3..a0c16e6 100644
--- a/usr.bin/gcore/gcore.1
+++ b/usr.bin/gcore/gcore.1
@@ -80,7 +80,6 @@ The core image.
 .It Pa /proc/<pid>/file
 The executable image.
 .El
-.Dp
 .Sh HISTORY
 .Nm Gcore
 appeared in
diff --git a/usr.bin/gprof/gprof.1 b/usr.bin/gprof/gprof.1
index b0cc359..2537fc7 100644
--- a/usr.bin/gprof/gprof.1
+++ b/usr.bin/gprof/gprof.1
@@ -216,7 +216,7 @@ file.
 Suppresses the printing of functions whose names are not visible to
 C programs.  For the ELF object format, this means names that
 contain the
-.Ql \&.
+.Ql .\&
 character.  For the a.out object format, it means names that do not
 begin with a
 .Ql _
diff --git a/usr.bin/hexdump/hexdump.1 b/usr.bin/hexdump/hexdump.1
index 1cb9e7e..1a67e5a 100644
--- a/usr.bin/hexdump/hexdump.1
+++ b/usr.bin/hexdump/hexdump.1
@@ -206,14 +206,14 @@ The single character escape sequences
 described in the C standard are supported:
 .Bd -ragged -offset indent -compact
 .Bl -column <alert_character>
-.It NUL	\e0
-.It <alert character>	\ea
-.It <backspace>	\eb
-.It <form-feed>	\ef
-.It <newline>	\en
-.It <carriage return>	\er
-.It <tab>	\et
-.It <vertical tab>	\ev
+.It "NUL	\e0
+.It "<alert character>	\ea
+.It "<backspace>	\eb
+.It "<form-feed>	\ef
+.It "<newline>	\en
+.It "<carriage return>	\er
+.It "<tab>	\et
+.It "<vertical tab>	\ev
 .El
 .Ed
 .El
@@ -252,12 +252,12 @@ displayed using the following, lower-case, names.
 Characters greater than 0xff, hexadecimal, are displayed as hexadecimal
 strings.
 .Bl -column \&000_nu \&001_so \&002_st \&003_et \&004_eo
-.It \&000\ nul\t001\ soh\t002\ stx\t003\ etx\t004\ eot\t005\ enq
-.It \&006\ ack\t007\ bel\t008\ bs\t009\ ht\t00A\ lf\t00B\ vt
-.It \&00C\ ff\t00D\ cr\t00E\ so\t00F\ si\t010\ dle\t011\ dc1
-.It \&012\ dc2\t013\ dc3\t014\ dc4\t015\ nak\t016\ syn\t017\ etb
-.It \&018\ can\t019\ em\t01A\ sub\t01B\ esc\t01C\ fs\t01D\ gs
-.It \&01E\ rs\t01F\ us\t0FF\ del
+.It "\&000\ nul\t001\ soh\t002\ stx\t003\ etx\t004\ eot\t005\ enq
+.It "\&006\ ack\t007\ bel\t008\ bs\t009\ ht\t00A\ lf\t00B\ vt
+.It "\&00C\ ff\t00D\ cr\t00E\ so\t00F\ si\t010\ dle\t011\ dc1
+.It "\&012\ dc2\t013\ dc3\t014\ dc4\t015\ nak\t016\ syn\t017\ etb
+.It "\&018\ can\t019\ em\t01A\ sub\t01B\ esc\t01C\ fs\t01D\ gs
+.It "\&01E\ rs\t01F\ us\t0FF\ del
 .El
 .El
 .Pp
diff --git a/usr.bin/jot/jot.1 b/usr.bin/jot/jot.1
index 9f587d30..a62e09a 100644
--- a/usr.bin/jot/jot.1
+++ b/usr.bin/jot/jot.1
@@ -195,7 +195,7 @@ The requested conversion format specifier for
 was not of the form
 .Dl %[#][ ][{+,-}][0-9]*[.[0-9]*]?
 where
-.Dq ?
+.Dq ?\&
 must be one of
 .Dl [l]{d,i,o,u,x}
 or
diff --git a/usr.bin/killall/killall.1 b/usr.bin/killall/killall.1
index e986a6f..0dd6e61 100644
--- a/usr.bin/killall/killall.1
+++ b/usr.bin/killall/killall.1
@@ -32,8 +32,8 @@
 .Nd kill processes by name
 .Sh SYNOPSIS
 .Nm
-.Op Fl d \&| Ns Fl v
-.Op Fl h \&| Ns Fl \&?
+.Op Fl d | v
+.Op Fl h | ?\&
 .Op Fl help
 .Op Fl l
 .Op Fl m
@@ -59,13 +59,13 @@ The super-user is allowed to kill any process.
 .Pp
 The options are as follows:
 .Bl -tag -width 10n -offset indent
-.It Fl d \&| Ns Fl v
+.It Fl d | v
 Be more verbose about what will be done.  For a single
 .Fl d
 option, a list of the processes that will be sent the signal will be
 printed, or a message indicating that no matching processes have been
 found.
-.It Fl h \&| Ns Fl \&?
+.It Fl h | ?\&
 .It Fl help
 Give a help on the command usage and exit.
 .It Fl l
diff --git a/usr.bin/lam/lam.1 b/usr.bin/lam/lam.1
index 6c17023..942edca 100644
--- a/usr.bin/lam/lam.1
+++ b/usr.bin/lam/lam.1
@@ -105,19 +105,19 @@ The command
 .Bd -literal
 lam file1 file2 file3 file4
 .Ed
-
+.Pp
 joins 4 files together along each line.
 To merge the lines from four different files use
 .Bd -literal
 lam file1 \-S "\\
 " file2 file3 file4
 .Ed
-
+.Pp
 Every 2 lines of a file may be joined on one line with
 .Bd -literal
 lam \- \- < file
 .Ed
-
+.Pp
 and a form letter with substitutions keyed by `@' can be done with
 .Bd -literal
 lam \-t @ letter changes
diff --git a/usr.bin/lastcomm/lastcomm.1 b/usr.bin/lastcomm/lastcomm.1
index 33248e2..3a7136f 100644
--- a/usr.bin/lastcomm/lastcomm.1
+++ b/usr.bin/lastcomm/lastcomm.1
@@ -42,9 +42,9 @@
 .Nm
 .Op Fl EScesu
 .Op Fl f Ar file
-.Op Ar command ...
-.Op Ar user ...
-.Op Ar terminal ...
+.Op Ar command ...\&
+.Op Ar user ...\&
+.Op Ar terminal ...\&
 .Sh DESCRIPTION
 .Nm Lastcomm
 gives information on previously executed commands.
diff --git a/usr.bin/locate/locate/locate.1 b/usr.bin/locate/locate/locate.1
index de95f6a..44a3693 100644
--- a/usr.bin/locate/locate/locate.1
+++ b/usr.bin/locate/locate/locate.1
@@ -57,11 +57,11 @@ of all files which are publicly accessible.
 Shell globbing and quoting characters
 .Po
 .Dq * ,
-.Dq ? ,
+.Dq \&? ,
 .Dq \e ,
-.Dq [
+.Dq \&[
 and
-.Dq \]
+.Dq \&]
 .Pc
 may be used in
 .Ar pattern  ,
@@ -78,7 +78,7 @@ As a special case, a pattern containing no globbing characters
 .Pq Dq foo
 is matched as though it were
 .Dq *foo* .
-
+.Pp
 Historically, locate store only characters between 32 and 127.  The
 current implementation store any character except newline
 .Pq Sq \en
@@ -88,9 +88,9 @@ The 8-bit character support doesn't waste extra space for
 plain ASCII file names.
 Characters less than 32 or greater than 127
 are stored in 2 bytes.
-
+.Pp
 The following options are available:
-.Bl -tag -width 10n indent
+.Bl -tag -width 10n
 .It Fl S
 Print some statistic about the database and exit.
 .It Fl c
@@ -105,24 +105,26 @@ options are allowed.  Each additional
 .Fl d
 option adds the specified database to the list
 of databases to be searched.
-
+.Pp
 The option
 .Ar database
 may be a colon-separated list of databases.
 A single colon is a reference
 to the default database.
-
+.Bd -literal
 $ locate -d $HOME/lib/mydb: foo
-
+.Ed
+.Pp
 will first search string
 .Dq foo
 in 
 .Pa $HOME/lib/mydb
 and then in 
 .Pa /var/db/locate.database .
-
+.Bd -literal
 $ locate -d $HOME/lib/mydb::/cdrom/locate.database foo
-
+.Ed
+.Pp
 will first search string
 .Dq foo
 in 
@@ -131,26 +133,29 @@ and then in
 .Pa /var/db/locate.database
 and then in 
 .Pa /cdrom/locate.database .
-
-
-.Do
+.Bd -literal
 $ locate -d db1 -d db2 -d db3 pattern
-.Dc
+.Ed
+.Pp
 is the same as
-
-.Dq $ locate -d db1:db2:db3 pattern
+.Bd -literal
+$ locate -d db1:db2:db3 pattern
+.Ed
+.Pp
 or 
-
+.Bd -literal
 .Dq $ locate -d db1:db2 -d db3 pattern . 
-
+.Ed
+.Pp
 If
 .Ar - 
 is given as the database name, standard input will be read instead.
 For example, you can compress your database 
 and use: 
-
+.Bd -literal
 $ zcat database.gz | locate -d - pattern
-
+.Ed
+.Pp
 This might be useful on machines with a fast CPU and little RAM and slow
 I/O. Note: you can only use 
 .Ar one
@@ -174,6 +179,7 @@ Use the
 .Xr stdio 3
 library instead of
 .Xr mmap 2 .
+.El
 .Sh FILES
 .Bl -tag -width /etc/periodic/weekly/310.locate -compact
 .It Pa /var/db/locate.database
@@ -215,7 +221,7 @@ typically only regenerated once a week by the
 script.  Use
 .Xr find 1
 to locate files that are of a more transitory nature.
-
+.Pp
 The
 .Nm
 database was built by user 
@@ -232,7 +238,7 @@ E.g. if your HOME directory is not world-readable, all your
 files are 
 .Ar not
 in the database.
-
+.Pp
 The
 .Nm
 database is not byte order independent.
@@ -248,7 +254,6 @@ machine
 (little endian)
 a locate database which was built on SunOS/sparc machine
 (big endian, net).
-
 .Sh HISTORY
 The
 .Nm
diff --git a/usr.bin/mail/mail.1 b/usr.bin/mail/mail.1
index bef3d40..5eea94b 100644
--- a/usr.bin/mail/mail.1
+++ b/usr.bin/mail/mail.1
@@ -502,7 +502,7 @@ ignored fields.
 Takes as argument login names and distribution group names and sends
 mail to those people.
 .It Ic more
-.Pq Ic \mo
+.Pq Ic \&mo
 Takes a list of messages and invokes the pager on that list.
 .It Ic mbox
 Indicate that a list of messages be sent to
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index 3775398..fcdeff1 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -277,13 +277,13 @@ is interrupted.
 .El
 .Pp
 Targets and sources may contain the shell wildcard expressions
-.Ql ? ,
+.Ql \&? ,
 .Ql * ,
 .Ql []
 and
 .Ql {} .
 The expressions
-.Ql ? ,
+.Ql \&? ,
 .Ql *
 and
 .Ql []
@@ -409,10 +409,10 @@ The name of the target; also known as
 .Pp
 The shorter forms
 .Ql Va @ ,
-.Ql Va ! ,
+.Ql Va \&! ,
 .Ql Va \&< ,
 .Ql Va \&% ,
-.Ql Va ? ,
+.Ql Va \&? ,
 .Ql Va \&> ,
 and
 .Ql Va *
@@ -595,7 +595,7 @@ Each modifier begins with a colon and one of the following
 special characters.
 The colon may be escaped with a backslash
 .Pq Ql \e .
-.Bl -tag -width Cm E\&
+.Bl -tag -width Cm
 .Sm off
 .It Cm C No \&/ Ar pattern Xo
 .No \&/ Ar replacement
@@ -634,7 +634,7 @@ Converts variable to lower-case letters.
 Select only those words that match the rest of the modifier.
 The standard shell wildcard characters
 .Pf ( Ql * ,
-.Ql ? ,
+.Ql \&? ,
 and
 .Ql Op )
 may
@@ -857,7 +857,7 @@ will only evaluate a conditional as far as is necessary to determine
 its value.
 Parentheses may be used to change the order of evaluation.
 The boolean operator
-.Ql Ic \&!
+.Ql Ic !\&
 may be used to logically negate an entire
 conditional.
 It is of higher precedence than
@@ -866,7 +866,7 @@ It is of higher precedence than
 The value of
 .Ar expression
 may be any of the following:
-.Bl -tag -width Ic defined
+.Bl -tag -width Ic
 .It Ic defined
 Takes a variable name as an argument and evaluates to true if the variable
 has been defined.
@@ -970,7 +970,7 @@ Comments begin with a hash
 character, anywhere but in a shell
 command line, and continue to the end of the line.
 .Sh SPECIAL SOURCES
-.Bl -tag -width Ic .IGNORE
+.Bl -tag -width Ic
 .It Ic .IGNORE
 Ignore any errors from the commands associated with this target, exactly
 as if they all were preceded by a dash
@@ -1027,7 +1027,7 @@ detected and targets that form loops will be silently ignored.
 .Sh "SPECIAL TARGETS"
 Special targets may not be included with other targets, i.e. they must be
 the only target specified.
-.Bl -tag -width Ic .BEGIN
+.Bl -tag -width Ic
 .It Ic .BEGIN
 Any command lines attached to this target are executed before anything
 else is done.
@@ -1154,6 +1154,7 @@ command in the file.
 Each source specifies a suffix to
 .Nm .
 If no sources are specified, any previous specified suffices are deleted.
+.El
 .Sh COMPATIBILITY
 Older versions of
 .Nm
diff --git a/usr.bin/mk_cmds/mk_cmds.1 b/usr.bin/mk_cmds/mk_cmds.1
index c7e89bb..7ffccde 100644
--- a/usr.bin/mk_cmds/mk_cmds.1
+++ b/usr.bin/mk_cmds/mk_cmds.1
@@ -74,6 +74,7 @@ Dont_option is one of the following:
 Do not list the command
 .It dont_summarize
 Do not list the command in the command summary
+.El
 .Sh EXAMPLES
 request ss_testfunction,
 .Qq This is the explanation for testfunction ,
diff --git a/usr.bin/mkdep/mkdep.1 b/usr.bin/mkdep/mkdep.1
index 0272102..c26d244 100644
--- a/usr.bin/mkdep/mkdep.1
+++ b/usr.bin/mkdep/mkdep.1
@@ -96,6 +96,7 @@ directly from its C module rather than using an intermediate
 module.
 This is useful for programs whose source is contained in a single
 module.
+.El
 .Sh ENVIRONMENT
 .Bl -tag -width MKDEP_CPP_OPTS
 .It Ev CC
diff --git a/usr.bin/mt/mt.1 b/usr.bin/mt/mt.1
index 2b79a44..1334e58 100644
--- a/usr.bin/mt/mt.1
+++ b/usr.bin/mt/mt.1
@@ -45,7 +45,7 @@
 .Ar command
 .Op Ar count
 .Sh DESCRIPTION
-.Nm Mt
+.Nm \&Mt
 is used to give commands to a magnetic tape drive.
 By default
 .Nm
@@ -190,7 +190,7 @@ Forward space to end of data, identical to
 Set compression mode.
 There are currently several possible values for the compression mode:
 .Pp
-.Bl -tag -width 123456789 -compact
+.Bl -tag -width 9n -compact
 .It off
 Turn compression off.
 .It on
@@ -226,7 +226,7 @@ does not exist;
 uses the device
 .Pa /dev/nsa0 .
 .Pp
-.Nm Mt
+.Nm \&Mt
 returns a 0 exit status when the operation(s) were successful,
 1 if the command was unrecognized, and 2 if an operation failed.
 .Pp
@@ -237,8 +237,8 @@ working draft, dated November 11, 1997.
 .Pp
 The different density codes are as follows:
 .Pp
-.Dl 0x0	default for device
-.Dl 0xE	reserved for ECMA
+.Dl "0x0	default for device
+.Dl "0xE	reserved for ECMA
 .Bd -literal -offset 3n
 Value  Width        Tracks    Density         Code Type Reference   Note
         mm    in              bpmm       bpi
@@ -281,7 +281,6 @@ Value  Width        Tracks    Density         Code Type Reference   Note
 0x2A
 0x2B   12.7  (0.5)    3          ?        ?     ?   C   X3.267       5
 .Ed
-
 .Bd -literal -offset 3n
 Code Description                                   Type Description
 ----------------                                   ----------------
@@ -293,7 +292,6 @@ MFM     Modified frequency modulation
 DDS     DAT data storage
 RLL     Run length limited
 .Ed
-
 .Bd -literal -offset 3n
 NOTES
 1. Serial recorded.
@@ -303,19 +301,19 @@ NOTES
 6. This is not an American National Standard.  The reference is based on
    an industry standard definition of the media format.
 .Ed
-
 .Sh ENVIRONMENT
 If the following environment variable exists, it is utilized by
 .Nm .
 .Bl -tag -width Fl
 .It Ev TAPE
-.Nm Mt
+.Nm \&Mt
 checks the
 .Ev TAPE
 environment variable if the
 argument
 .Ar tapename
 is not given.
+.El
 .Sh FILES
 .Bl -tag -width /dev/*rst[0-9]*xx -compact
 .It Pa /dev/*rwt*
diff --git a/usr.bin/ncplist/ncplist.1 b/usr.bin/ncplist/ncplist.1
index 38320b6..c333259 100644
--- a/usr.bin/ncplist/ncplist.1
+++ b/usr.bin/ncplist/ncplist.1
@@ -69,6 +69,7 @@ keeps description for each connection.
 See
 .Pa /usr/share/examples/nwclient/dot.nwfsrc
 for details.
+.El
 .Sh HISTORY
 The
 .Nm
diff --git a/usr.bin/ncplogin/ncplogin.1 b/usr.bin/ncplogin/ncplogin.1
index 58906df..d07b1ff 100644
--- a/usr.bin/ncplogin/ncplogin.1
+++ b/usr.bin/ncplogin/ncplogin.1
@@ -225,6 +225,7 @@ keeps static parameters for connections and other information
 See
 .Pa /usr/share/examples/nwclient/dot.nwfsrc
 for details.
+.El
 .Sh HISTORY
 The
 .Nm
diff --git a/usr.bin/nm/nm.1 b/usr.bin/nm/nm.1
index 1509f9f..aa675f8 100644
--- a/usr.bin/nm/nm.1
+++ b/usr.bin/nm/nm.1
@@ -140,6 +140,7 @@ Text Segment
 Undefined
 .It ?
 None of the above
+.El
 .Sh SEE ALSO
 .Xr ar 1 ,
 .Xr a.out 5 ,
diff --git a/usr.bin/objformat/objformat.1 b/usr.bin/objformat/objformat.1
index 74b67fc..a6d0d29 100644
--- a/usr.bin/objformat/objformat.1
+++ b/usr.bin/objformat/objformat.1
@@ -76,6 +76,7 @@ The default is
 .It Pa /etc/objformat
 If present, specifies the object file format to use.  Syntax is
 .Ql OBJFORMAT=xxx .
+.El
 .Sh SEE ALSO
 .Xr file 1 ,
 .Xr getobjformat 3
diff --git a/usr.bin/printenv/printenv.1 b/usr.bin/printenv/printenv.1
index 3e50e7a..a2912ef 100644
--- a/usr.bin/printenv/printenv.1
+++ b/usr.bin/printenv/printenv.1
@@ -46,7 +46,7 @@
 .Nm env
 .Op Fl
 .Op Fl i
-.Op Ar name=value ...
+.Op Ar name=value ...\&
 .Op Ar command
 .Sh DESCRIPTION
 .Nm Printenv
diff --git a/usr.bin/printf/printf.1 b/usr.bin/printf/printf.1
index 27440e2..5e6c940 100644
--- a/usr.bin/printf/printf.1
+++ b/usr.bin/printf/printf.1
@@ -86,7 +86,8 @@ Standard
 .Tn X3J11 .
 The characters and their meanings
 are as follows:
-.Bl -tag -width Ds -offset indent
+.Pp
+.Bl -tag -width Ds -offset indent -compact
 .It Cm \ea
 Write a <bell> character.
 .It Cm \eb
@@ -218,7 +219,9 @@ The
 .Ar argument
 is printed in the style
 .Cm e
-.`[-]d.ddd Ns \(+-dd\' 
+.Sm off
+.Sq Op - Ar d.ddd No \(+- Ar dd
+.Sm on
 where there
 is one digit before the decimal point and the number after is equal to
 the precision specification for the argument; when the precision is
diff --git a/usr.bin/rdist/rdist.1 b/usr.bin/rdist/rdist.1
index 902a7f9..2dce797 100644
--- a/usr.bin/rdist/rdist.1
+++ b/usr.bin/rdist/rdist.1
@@ -45,12 +45,12 @@
 .Op Fl f Ar distfile
 .Op Fl d Ar var=value
 .Op Fl m Ar host
-.Op Ar name ...
+.Op Ar name ...\&
 .Nm
 .Op Fl nqbRhivwyD
 .Op Fl P Ar rshcmd
 .Fl c
-.Ar name ...
+.Ar name ...\&
 .Oo login@ Oc Ns Ar host Ns Op :dest
 .Sh DESCRIPTION
 .Nm Rdist
@@ -98,7 +98,7 @@ using specific commands.
 .Pp
 Options specific to the second SYNOPSIS form:
 .Pp
-.Bl -tag -width Fl c
+.Bl -tag -width Fl
 .It Fl c
 Forces
 .Nm
@@ -108,7 +108,7 @@ to interpret the remaining arguments as a small
 The equivalent distfile is as follows.
 .Pp
 .Bd -filled -offset indent -compact
-.Pq Ar name ...
+.Pq Ar name ...\&
 .Li ->
 .Op Ar login@
 .Ar host
@@ -274,11 +274,11 @@ The command list consists of zero or more commands of the following
 format.
 .Bd -ragged -offset indent -compact
 .Bl -column except_patx pattern\ listx
-.It `install'	<options>	opt_dest_name `;'
-.It `notify'	<name list>	`;'
-.It `except'	<name list>	`;'
-.It `except_pat'	<pattern list>	`;'
-.It `special'	<name list>	string `;'
+.It "`install'	<options>	opt_dest_name `;'
+.It "`notify'	<name list>	`;'
+.It "`except'	<name list>	`;'
+.It "`except_pat'	<pattern list>	`;'
+.It "`special'	<name list>	string `;'
 .El
 .Ed
 .Pp
diff --git a/usr.bin/rs/rs.1 b/usr.bin/rs/rs.1
index f392f97..498382f 100644
--- a/usr.bin/rs/rs.1
+++ b/usr.bin/rs/rs.1
@@ -222,13 +222,16 @@ Finally, to sort a database by the first line of each 4-line field, try
 .Xr sort 1 ,
 .Xr vi 1
 .Sh BUGS
+.Bl -item
+.It
 Handles only two dimensional arrays.
-
+.It
 The algorithm currently reads the whole file into memory,
 so files that do not fit in memory will not be reshaped.
-
+.It
 Fields cannot be defined yet on character positions.
-
+.It
 Re-ordering of columns is not yet possible.
-
+.It
 There are too many options.
+.El
diff --git a/usr.bin/sasc/sasc.1 b/usr.bin/sasc/sasc.1
index c07cbd5..b8671ef 100644
--- a/usr.bin/sasc/sasc.1
+++ b/usr.bin/sasc/sasc.1
@@ -86,6 +86,7 @@ Set the internal dma buffer to be
 lines in size.
 .It Fl t Ar timeout Bq ASC_SBTIME
 Set the timeout time for reading one dma buffer.
+.El
 .Sh FILES
 .Bl -tag -width /var/rwho/whod.* -compact
 .It Pa /dev/asc0
diff --git a/usr.bin/sed/sed.1 b/usr.bin/sed/sed.1
index e24ff95..f344f9e 100644
--- a/usr.bin/sed/sed.1
+++ b/usr.bin/sed/sed.1
@@ -162,7 +162,7 @@ starts looking again for the first address.
 Editing commands can be applied to non-selected pattern spaces by use
 of the exclamation character
 .Po
-.Dq !
+.Dq \&!
 .Pc
 function.
 .Sh "Sed Regular Expressions"
@@ -247,7 +247,7 @@ The
 .Dq t ,
 .Dq w ,
 .Dq y ,
-.Dq ! ,
+.Dq \&! ,
 and
 .Dq \&:
 functions all accept additional arguments.
diff --git a/usr.bin/shar/shar.1 b/usr.bin/shar/shar.1
index 795d939..b078862 100644
--- a/usr.bin/shar/shar.1
+++ b/usr.bin/shar/shar.1
@@ -99,9 +99,9 @@ To recreate the program directory:
 .Bd -literal -offset indent
 mkdir ls
 cd ls
-...
+\&...
 <delete header lines and examine mailed archive>
-...
+\&...
 sh archive
 .Ed
 .Sh HISTORY
diff --git a/usr.bin/systat/systat.1 b/usr.bin/systat/systat.1
index 629e0c7..e812e1a 100644
--- a/usr.bin/systat/systat.1
+++ b/usr.bin/systat/systat.1
@@ -452,7 +452,7 @@ select a set of drives to report on, should your system have
 more drives configured than can normally be displayed on the
 screen.
 .Pp
-.Bl -tag -width Tx -compact
+.Bl -tag -width Ar -compact
 .It Cm ignore Op Ar drives
 Do not display information about the drives indicated.  Multiple
 drives may be specified, separated by spaces.
diff --git a/usr.bin/tcopy/tcopy.1 b/usr.bin/tcopy/tcopy.1
index 1794336..d4f4865 100644
--- a/usr.bin/tcopy/tcopy.1
+++ b/usr.bin/tcopy/tcopy.1
@@ -89,17 +89,19 @@ The
 command appeared in
 .Bx 4.3 .
 .Sh BUGS
+.Bl -item
+.It
 Writting an image of a tape to a file does not preserve much more than
 the raw data.
 Block size(s) and tape EOF marks are lost which would
 otherwise be preserved in a tape-to-tape copy.
-
+.It
 EOD is determined by two sequential EOF marks with no data between.
 There are old systems which typically wrote three EOF's between tape
 files.
 .Xr tcopy 1
 will erroneously stop copying early in this case.
-
+.It
 When using the copy/verify option \-c
 .Xr tcopy 1
 does not rewind the tapes prior to start.
@@ -107,3 +109,4 @@ A rewind is performed
 after writing prior to the verification stage.
 If one doesn't start
 at BOT then the comparison may not be of the intended data.
+.El
diff --git a/usr.bin/tip/tip/modems.5 b/usr.bin/tip/tip/modems.5
index ebe8cd0..f8c1dd4 100644
--- a/usr.bin/tip/tip/modems.5
+++ b/usr.bin/tip/tip/modems.5
@@ -80,7 +80,7 @@ for example, ``reset_command=ATZ\\r''.  A numeric capability is specified by
 .Em capability Ns Ar # Ns Em value ;
 for example, ``intercharacter_delay#50''.  A boolean capability is specified 
 by simply listing the capability.
-.Bl -tag -width intercharacter_delay indent
+.Bl -tag -width intercharacter_delay
 .It Cm \&dial_command
 (str)
 AT command used to dial remote system (typically, "ATDT")
@@ -123,6 +123,7 @@ AT command to reset the modem.
 (num)
 The time, expressed in milliseconds, required by the modem to complete
 a reset and return to a ready condition.
+.El
 .Sh FILES
 .Bl -tag -width /etc/modems -compact
 .It Pa /etc/modems
diff --git a/usr.bin/tput/tput.1 b/usr.bin/tput/tput.1
index 834f49e..9e22b13 100644
--- a/usr.bin/tput/tput.1
+++ b/usr.bin/tput/tput.1
@@ -108,6 +108,7 @@ Reset the terminal (the
 .Xr termcap
 .Dq rs
 sequence).
+.El
 .Sh DIAGNOSTICS
 The exit value of
 .Nm
diff --git a/usr.bin/tr/tr.1 b/usr.bin/tr/tr.1
index bffd871..ad55ca9 100644
--- a/usr.bin/tr/tr.1
+++ b/usr.bin/tr/tr.1
@@ -145,13 +145,13 @@ A backslash followed by certain special characters maps to special
 values.
 .Pp
 .Bl -column
-.It \ea	<alert character>
-.It \eb	<backspace>
-.It \ef	<form-feed>
-.It \en	<newline>
-.It \er	<carriage return>
-.It \et	<tab>
-.It \ev	<vertical tab>
+.It "\ea	<alert character>
+.It "\eb	<backspace>
+.It "\ef	<form-feed>
+.It "\en	<newline>
+.It "\er	<carriage return>
+.It "\et	<tab>
+.It "\ev	<vertical tab>
 .El
 .Pp
 A backslash followed by any other character maps to that character.
@@ -162,34 +162,34 @@ Represents all characters belonging to the defined character class.
 Class names are:
 .Pp
 .Bl -column
-.It alnum	<alphanumeric characters>
-.It alpha	<alphabetic characters>
-.It cntrl	<control characters>
-.It digit	<numeric characters>
-.It graph	<graphic characters>
-.It lower	<lower-case alphabetic characters>
-.It print	<printable characters>
-.It punct	<punctuation characters>
-.It space	<space characters>
-.It upper	<upper-case characters>
-.It xdigit	<hexadecimal characters>
+.It "alnum	<alphanumeric characters>
+.It "alpha	<alphabetic characters>
+.It "cntrl	<control characters>
+.It "digit	<numeric characters>
+.It "graph	<graphic characters>
+.It "lower	<lower-case alphabetic characters>
+.It "print	<printable characters>
+.It "punct	<punctuation characters>
+.It "space	<space characters>
+.It "upper	<upper-case characters>
+.It "xdigit	<hexadecimal characters>
 .El
 .Pp
-\." All classes may be used in
-\." .Ar string1 ,
-\." and in
-\." .Ar string2
-\." when both the
-\." .Fl d
-\." and
-\." .Fl s
-\." options are specified.
-\." Otherwise, only the classes ``upper'' and ``lower'' may be used in
-\." .Ar string2
-\." and then only when the corresponding class (``upper'' for ``lower''
-\." and vice-versa) is specified in the same relative position in
-\." .Ar string1 .
-\." .Pp
+.\" All classes may be used in
+.\" .Ar string1 ,
+.\" and in
+.\" .Ar string2
+.\" when both the
+.\" .Fl d
+.\" and
+.\" .Fl s
+.\" options are specified.
+.\" Otherwise, only the classes ``upper'' and ``lower'' may be used in
+.\" .Ar string2
+.\" and then only when the corresponding class (``upper'' for ``lower''
+.\" and vice-versa) is specified in the same relative position in
+.\" .Ar string1 .
+.\" .Pp
 With the exception of the ``upper'' and ``lower'' classes, characters
 in the classes are in unspecified order.
 In the ``upper'' and ``lower'' classes, characters are entered in
diff --git a/usr.bin/truss/truss.1 b/usr.bin/truss/truss.1
index d82f6ad..b744691 100644
--- a/usr.bin/truss/truss.1
+++ b/usr.bin/truss/truss.1
@@ -47,6 +47,7 @@ and trace the system calls of it.
 and
 .Ar command
 options are mutually exclusive.)
+.El
 .Sh EXAMPLES
 # Follow the system calls used in echoing "hello"
 .Dl $ truss /bin/echo hello
diff --git a/usr.bin/tset/tset.1 b/usr.bin/tset/tset.1
index c7e87d2..63bc658 100644
--- a/usr.bin/tset/tset.1
+++ b/usr.bin/tset/tset.1
@@ -268,7 +268,7 @@ means less than,
 .Dq Li \&@
 means equal to
 and
-.Dq Li \&!
+.Dq Li !\&
 inverts the sense of the test.
 The baud rate is specified as a number and is compared with the speed
 of the standard error output (which should be the control terminal).
diff --git a/usr.bin/uac/uac.1 b/usr.bin/uac/uac.1
index f06651c..479e404 100644
--- a/usr.bin/uac/uac.1
+++ b/usr.bin/uac/uac.1
@@ -46,18 +46,16 @@ signal.
 However, doing so does slow down the
 execution of the faulting process.
 At bootup, the DEC Alpha CPU defaults to printing 
-.Bl -tag -width indent
-.It pid Ar nnn Pq Ar <progname> Ns Xo
-.No : unaligned access: Xo
-.Va va Ns = Ns Ar 0xADDR Xo
-.Va pc Ns = Ns Ar 0xADDR Xo
-.Va ra Ns = Ns Ar 0xADDR Xo
-.Xc Va op Ns = Ns Ar ldl
-.Xc
-.Xc
-.Xc
-.Xc
-.El
+.Bd -ragged
+.Em pid
+.Ar nnn Pq Ar <progname> :
+unaligned access:
+.Em va Ns = Ns Ar 0xADDR
+.Em pc Ns = Ns Ar 0xADDR
+.Em ra Ns = Ns Ar 0xADDR
+.Em op Ns = Ns Ar ldl
+.Ed
+.Pp
 when a UA happens along with fixing it,
 so the faulting instruction can continue.
 UA handling settings are inherited by child process.
diff --git a/usr.bin/units/units.1 b/usr.bin/units/units.1
index a2532a9..52982c8 100644
--- a/usr.bin/units/units.1
+++ b/usr.bin/units/units.1
@@ -24,6 +24,7 @@ Print the version number.
 Allow a single unit conversion to be done directly from the command
 line.  The program will not print prompts.  It will print out the
 result of the single specified conversion.
+.El
 .Sh DESCRIPTION
 The
 .Nm
@@ -81,15 +82,15 @@ file includes definitions for most familiar units, abbreviations and
 metric prefixes.  Some constants of nature included are:
 .Pp
 .Bl -inset -offset indent -compact
-.It pi	ratio of circumference to diameter
-.It c	speed of light
-.It e	charge on an electron
-.It g	acceleration of gravity
-.It force	same as g
-.It mole	Avogadro's number
-.It water	pressure per unit height of water
-.It mercury	pressure per unit height of mercury
-.It au	astronomical unit
+.It "pi	ratio of circumference to diameter
+.It "c	speed of light
+.It "e	charge on an electron
+.It "g	acceleration of gravity
+.It "force	same as g
+.It "mole	Avogadro's number
+.It "water	pressure per unit height of water
+.It "mercury	pressure per unit height of mercury
+.It "au	astronomical unit
 .El
 .Pp
 The unit 'pound' is a unit of mass.  Compound names are run together
@@ -125,14 +126,14 @@ Here is an example of a short units file that defines some basic
 units.  
 .Pp
 .Bl -inset -offset indent -compact
-.It m	!a!
-.It sec	!b!
-.It micro-	1e-6
-.It minute	60 sec
-.It hour	60 min
-.It inch	0.0254 m
-.It ft	12 inches
-.It mile	5280 ft
+.It "m	!a!
+.It "sec	!b!
+.It "micro-	1e-6
+.It "minute	60 sec
+.It "hour	60 min
+.It "inch	0.0254 m
+.It "ft	12 inches
+.It "mile	5280 ft
 .El
 .Sh BUGS
 The effect of including a '/' in a prefix is surprising.
diff --git a/usr.bin/uuencode/uuencode.1 b/usr.bin/uuencode/uuencode.1
index 9e2ffcc..94348dc 100644
--- a/usr.bin/uuencode/uuencode.1
+++ b/usr.bin/uuencode/uuencode.1
@@ -98,6 +98,7 @@ By default
 .Nm uudecode 
 deletes any prefix ending with the last slash '/' for security
 purpose.
+.El
 .Sh EXAMPLES
 The following example packages up a source tree, compresses it,
 uuencodes it and mails it to a user on another system.
@@ -111,14 +112,14 @@ tree.
 tar cf \- src_tree \&| compress \&|
 uuencode src_tree.tar.Z \&| mail sys1!sys2!user
 .Ed
-
+.Pp
 The following example unpack all uuencode'd 
 files from your mailbox into your current working directory.
 .Pp
 .Bd -literal -offset indent -compact
 uudecode -c < $MAIL
 .Ed
-
+.Pp
 The following example extract a compress'ed tar
 archive from your mailbox
 .Pp
diff --git a/usr.bin/vgrind/vgrindefs.5 b/usr.bin/vgrind/vgrindefs.5
index cb78085..bf0a7b1 100644
--- a/usr.bin/vgrind/vgrindefs.5
+++ b/usr.bin/vgrind/vgrindefs.5
@@ -54,7 +54,7 @@ very similar to
 The following table names and describes each field.  
 .Pp
 .Bl -column Namexxx Tpexxx
-.Sy Name	Type	Description
+.It Sy "Name	Type	Description
 .It "ab	str	regular expression for the start of an alternate comment"
 .It "ae	str	regular expression for the end of an alternate comment"
 .It "pb	str	regular expression for start of a procedure"
diff --git a/usr.bin/vmstat/vmstat.8 b/usr.bin/vmstat/vmstat.8
index 9df1e94..f92881a 100644
--- a/usr.bin/vmstat/vmstat.8
+++ b/usr.bin/vmstat/vmstat.8
@@ -95,10 +95,10 @@ Change the maximum number of disks to display from the default of 2.
 .It Fl p
 Specify which types of devices to display.  There are three different
 categories of devices:
-
+.Pp
 .Bl -tag -width indent -compact
 .It device type:
-.Bl -tag -width 123456789 -compact
+.Bl -tag -width 9n -compact
 .It da 
 Direct Access devices
 .It sa
@@ -128,7 +128,7 @@ Floppy devices
 .El
 .Pp
 .It interface:
-.Bl -tag -width 123456789 -compact
+.Bl -tag -width 9n -compact
 .It IDE
 Integrated Drive Electronics devices
 .It SCSI
@@ -138,7 +138,7 @@ Any other device interface
 .El
 .Pp
 .It passthrough:
-.Bl -tag -width 123456789 -compact
+.Bl -tag -width 9n -compact
 .It pass
 Passthrough devices
 .El
@@ -204,7 +204,7 @@ seconds.
 .Bl -tag -width indent -compact
 .It avm
 active virtual pages
-.It fre	
+.It fre
 size of the free list
 .El
 .It page
diff --git a/usr.bin/w/w.1 b/usr.bin/w/w.1
index ffd692d..c7ff0d2 100644
--- a/usr.bin/w/w.1
+++ b/usr.bin/w/w.1
@@ -142,4 +142,4 @@ flags are no longer supported.
 The
 .Nm
 command appeared in
-.Ux 3.0 .
+.Bx 3.0 .
diff --git a/usr.bin/whereis/whereis.1 b/usr.bin/whereis/whereis.1
index 89341c1..4fec85d 100644
--- a/usr.bin/whereis/whereis.1
+++ b/usr.bin/whereis/whereis.1
@@ -56,7 +56,7 @@ components, any single trailing extension added by
 or
 .Xr compress 1 ,
 and the leading
-.Ql s.
+.Ql s.\&
 or trailing
 .Ql ,v
 from a source code control system.
diff --git a/usr.bin/window/window.1 b/usr.bin/window/window.1
index a4b95ce..e48eed0 100644
--- a/usr.bin/window/window.1
+++ b/usr.bin/window/window.1
@@ -229,7 +229,7 @@ escape is changed to some other character, that
 character takes the place of
 .Ic ^P
 here.
-.It Ic ?
+.It Ic \&?
 List a short summary of commands.
 .It Ic ^L
 Refresh the screen.
@@ -423,7 +423,7 @@ Returns the value of
 .Aq Va expr2 . 
 .It Xo
 .Aq Va expr1
-.Ic ?
+.Ic \&?
 .Aq Va expr2
 .Ic :
 .Aq Va expr3
@@ -924,6 +924,7 @@ The terminal type.  The standard name, found in the second name
 field of the terminal's
 .Ev TERMCAP
 entry, is used.
+.El
 .Sh ENVIRONMENT
 .Nm Window
 utilizes these environment variables:
diff --git a/usr.bin/xargs/xargs.1 b/usr.bin/xargs/xargs.1
index 3a4134c..3b993ec 100644
--- a/usr.bin/xargs/xargs.1
+++ b/usr.bin/xargs/xargs.1
@@ -71,7 +71,6 @@ is repeatedly executed until standard input is exhausted.
 .Pp
 Spaces, tabs and newlines may be embedded in arguments using single
 (``\ '\ '')
-.Ek
 or double (``"'') quotes or backslashes (``\e'').
 Single quotes escape all non-single quote characters, excluding newlines,
 up to the matching single quote.
diff --git a/usr.bin/xinstall/install.1 b/usr.bin/xinstall/install.1
index 98670df..c14754d 100644
--- a/usr.bin/xinstall/install.1
+++ b/usr.bin/xinstall/install.1
@@ -168,6 +168,7 @@ option is used, then temporary files named INS@XXXX,
 where XXXX is decided by
 .Xr mkstemp 3 ,
 are created in the target directory.
+.El
 .Sh SEE ALSO
 .Xr chflags 1 ,
 .Xr chgrp 1 ,
diff --git a/usr.bin/xlint/xlint/lint.1 b/usr.bin/xlint/xlint/lint.1
index 35400bb..2b158b9 100644
--- a/usr.bin/xlint/xlint/lint.1
+++ b/usr.bin/xlint/xlint/lint.1
@@ -514,6 +514,7 @@ programs
 various prebuilt lint libraries
 .It Pa /tmp/lint*
 temporaries
+.El
 .Sh SEE ALSO
 .Xr cc 1 ,
 .Xr cpp 1 ,