Prepare for mdoc(7)NG.

73 files changed, 294 insertions, 423 deletions

diff --git a/usr.sbin/adduser/adduser.8 b/usr.sbin/adduser/adduser.8
index de35bd3..254affe 100644
--- a/usr.sbin/adduser/adduser.8
+++ b/usr.sbin/adduser/adduser.8
@@ -83,7 +83,7 @@ you can define an alias in
 .It Sy fullname
 Firstname and surname. 
 The
-.Ql Pa \:
+.Ql Pa \&:
 character is not allowed.
 .It Sy shell
 Only valid shells from the shell database or sliplogin and pppd
@@ -183,6 +183,7 @@ on up.
 .It Sy -verbose,-v
 Many warnings, questions.
 Recommended for novice users.
+.El
 .Sh FORMATS
 .Bl -tag -width Ds -compact
 .Ql Pa #
diff --git a/usr.sbin/adduser/rmuser.8 b/usr.sbin/adduser/rmuser.8
index 3743fa4..f32f42a 100644
--- a/usr.sbin/adduser/rmuser.8
+++ b/usr.sbin/adduser/rmuser.8
@@ -116,6 +116,7 @@ command line if this option is used.
 Identifies the user to be removed; if not present,
 .Nm
 interactively asks for the user to be removed.
+.El
 .Sh FILES
 .Bl -tag -width /etc/master.passwd -compact
 .It Pa /etc/master.passwd
diff --git a/usr.sbin/apmd/apmd.8 b/usr.sbin/apmd/apmd.8
index d425bcc..9cc38ee 100644
--- a/usr.sbin/apmd/apmd.8
+++ b/usr.sbin/apmd/apmd.8
@@ -165,7 +165,7 @@ valid event names:
 .Nm
 is running:
 .Pp
-.Bl -tag -hang -width USERSUSPENDREQ -compact -offset indent
+.Bl -tag -width USERSUSPENDREQ -compact -offset indent
 .It STANDBYREQ
 .It USERSTANDBYREQ
 .It SUSPENDREQ
@@ -180,7 +180,7 @@ only zzz should be specified in the command list.
 .Nm
 after kernel handling:
 .Pp
-.Bl -tag -hang -width USERSUSPENDREQ -compact -offset indent
+.Bl -tag -width USERSUSPENDREQ -compact -offset indent
 .It NORMRESUME
 .It CRITRESUME
 .It STANDBYRESUME
diff --git a/usr.sbin/boot98cfg/boot98cfg.8 b/usr.sbin/boot98cfg/boot98cfg.8
index 4c30ac7..9d5d2b7 100644
--- a/usr.sbin/boot98cfg/boot98cfg.8
+++ b/usr.sbin/boot98cfg/boot98cfg.8
@@ -53,16 +53,16 @@ and
 .Sq HDD boot menu.
 The IPL occupies sector 0 of a disk and is followed by the partition
 table.  The IPL loads the HDD boot menu that starts from 0x400.
-
+.Pp
 The
 .Nm
 installs and makes backup copy of the IPL and the HDD boot menu; and
 allows changing the version number field in the sector 0.
-
+.Pp
 Note that the format command in NEC's OSs replaces the HDD boot menu
 with its own HDD boot menu when the version number field is smaller
 than that in the format command.
-
+.Pp
 The options are:
 .Bl -tag -width indent
 .It Fl B
diff --git a/usr.sbin/cdcontrol/cdcontrol.1 b/usr.sbin/cdcontrol/cdcontrol.1
index ce94ab8..84a4afc 100644
--- a/usr.sbin/cdcontrol/cdcontrol.1
+++ b/usr.sbin/cdcontrol/cdcontrol.1
@@ -56,7 +56,6 @@ Word
 .Em play
 can be omitted.
 .Bl -tag -width Cm
-
 .It Cm play Ar first_track Op Ar last_track
 Play from track 
 .Ar first_track
@@ -64,7 +63,6 @@ to track
 .Ar last_track .
 The first track has number 1.
 Can be omitted in all cases.
-
 .It Cm play Ar start_m:start_s.start_f Op Ar end_m:end_s.end_f
 Play from the absolute address
 (MSF) defined by 
@@ -82,97 +80,75 @@ in seconds and
 (frame number). Minutes are in the range 0-99.
 Seconds are in the range 0-59.
 Frame numbers are in the range 0-74.
-
 .It Cm play Op Ar #start_block Op length
 Play starting from the logical block
 .Ar start_block
 using
 .Ar length
 logical blocks.
-
 .It Cm pause
 Stop playing.
 Do not stop the disc.
-
 .It Cm resume
 Resume playing.
 Used after the 
 .Em pause
 command.
-
 .It Cm stop
 Stop the disc.
-
 .It Cm eject
 Eject the disc.
-
 .It Cm close
 Inject the disc.
-
 .It Cm volume Ar left_channel Ar right_channel
 Set the volume of left channel to 
 .Ar left_channel
 and the volume of right channel to 
 .Ar right_channel . 
 Allowed values are in the range 0-255. 
-
 .It Cm volume Ar mute
 Turn the sound off.
-
 .It Cm volume Ar mono
 Set the mono mode.
-
 .It Cm volume Ar stereo
 Set the stereo mode.
-
 .It Cm volume Ar left
 Play the left subtrack on both left and right channels.
-
 .It Cm volume Ar right
 Play the right subtrack on both left and right channels.
-
 .It Cm info
 Print the table of contents.
-
-.It Cm status 
+.It Cm status Xo
 .Op Ar audio | media | volume
-
+.Xc
 Print the information about the disc:
-
-.Nm audio
-the current playing status and position,
-
-.Nm media
-the current media catalog status,
-
-.Nm volume
+.Pp
+.Bl -tag -width "volume" -compact
+.It Ar audio
+the current playing status and position
+.It Ar media
+the current media catalog status
+.It Ar volume
 the current values of the volume for left and right channels.
-
+.El
 .It Cm cdid
 Display the serial number of the cd using the method used by the
 cddb (http://www.cddb.org/) project.
-
 .It Cm help
 Print the list of available commands.
-
 .It Cm debug Ar on
 Enable the debugging mode of the CD device driver.
-
 .It Cm debug Ar off
 Disable the driver debugging mode.
-
 .It Cm reset
 Perform the hardware reset of the device.
-
 .It Cm set Ar msf
 Set minute-second-frame ioctl mode (default).
-
 .It Cm set Ar lba
 Set LBA ioctl mode.
-
 .It Cm quit
 Quit the program.
-
+.El
 .Sh FILES
 .Bl -tag -width /dev/mcd0c -compact
 .It Pa /dev/cd0c
diff --git a/usr.sbin/ctm/ctm/ctm.1 b/usr.sbin/ctm/ctm/ctm.1
index dcfadb5..69539ca 100644
--- a/usr.sbin/ctm/ctm/ctm.1
+++ b/usr.sbin/ctm/ctm/ctm.1
@@ -35,16 +35,14 @@ was originally
 .Dq Cvs Through eMail ,
 but now instead it seems more fitting to call it
 .Dq Current Through eMail .
-
+.Pp
 .Nm Ctm
 is now meant to be the definitive way to make and apply a delta between
 two versions of a directory tree.
-
+.Pp
 There are two parts to this, making the delta and applying it.  These are two
 entirely different things.
-
 .Ss Usage
-
 To apply a CTM delta, you pass it to the
 .Nm
 command.  You can pass a CTM delta on stdin, or you can give the
@@ -53,12 +51,12 @@ easier for your self, since the program can accept gzip'ed files and
 since it will not have to make a temporary copy of your file.  You can
 specify multiple deltas at one time, they will be processed one at a
 time.  Deltas that are already applied will be ignored.
-
+.Pp
 The
 .Nm
 command runs in a number of passes.  It will process the entire
 input file in each pass, before commencing with the next pass.
-
+.Pp
 Before working on a file
 .Ar name
 .Nm
@@ -67,16 +65,16 @@ first checks for the existence of the file
 If this file exists,
 .Nm
 works on it instead.
-
+.Pp
 Pass 1 will verify that the input file is OK.  The syntax, the data
 and the global MD5 checksum will be checked.  If any of these fail,
 .Nm
 will simply reject the input file.
-
+.Pp
 Pass 2 will validate that the directory tree is in the state expected by
 the CTM delta.  This is done by looking for files and directories which
 should/should not exist and by checking the MD5 checksums of files.  
-
+.Pp
 If a
 .Ar backup-file
 had been specified using the 
@@ -88,9 +86,9 @@ to this file using the archiver command specified by the
 .Fl t
 option.  The default archiver command is
 .Nm "tar -rf %s -T -" .
-
+.Pp
 Pass 3 will actually apply the delta. 
-
+.Pp
 The list of files that would be modified by
 .Nm
 is subject to filtering regular expressions specified
@@ -107,24 +105,20 @@ options are applied in order of appearance on the command line.  The last
 filter that matched a given file name determines whether the file would be 
 operated on or left alone by
 .Nm .
-
+.Pp
 .Nm Ctm
 will extract the file hierarchy below its working directory.  Absolute
 filenames or filenames containing references through
-.Sq \&.
+.Sq Pa .\&
 and
-.Sq \&.\&.
+.Sq Pa ..\&
 are explicitly prohibited as a security measure.
-
 .Ss Options
-
-.Bl -tag -width indent -compact
-
+.Bl -tag -width indent
 .It Fl b Ar basedir
 Prepend the path
 .Ar basedir
 to every filename.
-
 .It Fl B Ar backup-file
 Backup all files that would be modified by this CTM run to
 .Ar backup-file .
@@ -134,10 +128,8 @@ and
 .Fl x
 options, then the final set of files backed up are those that would be
 modified by CTM after the filters are applied.
-
 .It Fl c
 Check it out, don't do anything.
-
 .It Fl e Ar regular_expression
 Match each name in the CTM file against
 .Ar regular_expression ,
@@ -149,20 +141,17 @@ sequence number checks.  For example, the expression
 for example, will select the
 .Nm usr.sbin/ctm
 source directory and all pathnames under it. 
-
+.Pp
 Pathnames can be disabled from being considered by CTM using the 
 .Fl x
 option.
-
 .It Fl F
 Force.
-
 .It Fl k
 Keep files and directories and don't remove them even if the CTM file
 specifies they are to be removed.  If the
 .Fl B
 option is specified, these files and directories will not be backed up.
-
 .It Fl l
 List files that would be modified by this invocation of CTM and the
 actions that would be performed on them.  Use of the
@@ -177,11 +166,8 @@ and
 .Fl x
 options to determine which files would be modified by the given set of
 command line options.
-
-
 .It Fl q
 Tell us less.
-
 .It Fl t Ar tar-command
 Use
 .Ar tar-command
@@ -191,24 +177,18 @@ This option takes effect only if a backup file had been specified using the
 .Fl B
 option.  A %s in the tar command will be replaced by the name of the backup 
 file.
-
-
 .It Fl T Ar tmpdir
 Put temporary files under
 .Ar tmpdir .
-
 .It Fl u
 Set modification time of created and modified files to the CTM delta
 creation time.
-
 .It Fl v
 Tell us more.
-
 .It Fl V Ar level
 Tell us more.
 .Ar Level
 is the level of verbosity.
-
 .It Fl x Ar regular_expression
 Match each name in the CTM file against
 .Ar regular_expression
@@ -216,11 +196,10 @@ and if it matches, leave the file alone.  There may be any number of these
 options.  Use of this option disables the
 .Pa .ctm_status
 sequence number checks.   
-
+.Pp
 Pathnames can be selected for CTM's consideration using the
 .Fl e
 option.
-
 .El
 .Pp
 .Sh SECURITY
@@ -264,14 +243,12 @@ for more details on this.
 The same effect may be achieved with the
 .Fl T
 flag.
-
 .Sh FILES
-
 .Pa .ctm_status
 contains the sequence number of the last CTM delta applied.  Changing
 or removing this file will greatly confuse
 .Nm .
-
+.Pp
 Using the
 .Fl e
 and
@@ -279,23 +256,18 @@ and
 options can update a partial subset of the source tree and causes sources
 to be in an inconsistent state.  It is assumed that you know what you are
 doing when you use these options.
-
 .Sh EXAMPLES
-
 .Bd -literal
-
 cd ~cvs
 /usr/sbin/ctm ~ctm/cvs-*
-
 .Ed
-
+.Pp
 To extract and patch all sources under `lib'
 .Bd -literal
 cd ~/lib-srcs
 /usr/sbin/ctm -e '^lib' ~ctm/src-cur*
 .Ed
 .Sh DIAGNOSTICS
-
 Numerous messages, hopefully self-explanatory.  The
 .Dq noise level
 can be adjusted with the
@@ -304,29 +276,24 @@ can be adjusted with the
 and
 .Fl V
 options.
-
 .Sh SEE ALSO
 .Xr ctm_rmail 1 ,
 .Xr ctm 5
-
 .Sh HISTORY
-
 Initial trials were run during the work on
 .Fx 1.1.5 ,
 and many bugs and 
 methods were hashed out.
-
+.Pp
 The
 .Nm
 command appeared in
 .Fx 2.1 .
-
 .Sh AUTHORS
-
 The CTM system has been designed and implemented by
 .An Poul-Henning Kamp
 .Aq phk@FreeBSD.org .
-
+.Pp
 .An Joerg Wunsch
 .Aq joerg@FreeBSD.org
 wrote this man-page.
diff --git a/usr.sbin/ctm/ctm/ctm.5 b/usr.sbin/ctm/ctm/ctm.5
index f79e738..ac67d4f 100644
--- a/usr.sbin/ctm/ctm/ctm.5
+++ b/usr.sbin/ctm/ctm/ctm.5
@@ -18,29 +18,26 @@
 .Sh NAME
 .Nm ctm
 .Nd source code mirror system
-
 .Sh DESCRIPTION
 The
 .Nm
 transfers data in a specific file format, called a CTM delta.
-
+.Pp
 CTM deltas consist of control lines and data chunks.  Each control
 line starts with the letters
 .Dq CTM ,
 followed by a CTM statement and control data, and ends with a '\en'
 character.
-
+.Pp
 Data chunks always belong to the preceding control line, and the
 last field on that control line is the number of bytes in the data
 chunk.
 A trailing newline '\en' character follows each data chunk, this
 newline is not part of the chunk and isn't included in the count.
-
+.Pp
 The CTM statements are as follows.
 .Bl -tag -width indent
-
 .It _BEGIN Ar version name number timestamp prefix
-
 This is the overall begin of a CTM delta file.  The
 .Ar version
 field must match the program version
@@ -62,16 +59,12 @@ meaning this is a UTC timestamp
 The
 .Ar prefix
 field is currently not implemented.
-
 .It _END Ar md5
-
 This statement ends the CTM delta, the global
 .Ar md5
 checksum is matched against the MD5 checksum of the entire delta, up to 
 and including the space (0x20) character following ``_END''.
-
 .It \&FM Ar name uid gid mode md5 count
-
 Make the file
 .Ar name ,
 the original file had the uid
@@ -85,13 +78,11 @@ mode
 .Pq numerical, octal ,
 and the MD5 checksum
 .Ar md5 .
-
+.Pp
 The following
 .Ar count
 bytes data are the contents of the new file.
-
 .It \&FS Ar name uid gid mode md5before md5after count
-
 Substitute the contents of file
 .Ar name ,
 the original file had the new uid
@@ -107,31 +98,25 @@ the old MD5 checksum
 .Ar md5before ,
 and the new MD5 checksum
 .Ar md5after .
-
+.Pp
 The following
 .Ar count
 bytes data are the contents of the new file.
-
+.Pp
 File substitution is used if the commands to edit a file would exceed
 the total file length, so substituting it is more efficient.
-
 .It \&FN Ar name uid gid mode md5before md5after count
-
 Edit the file
 .Ar name .
 The arguments are as above, but the data sections contains an
 .Xr diff 1
 -n script which should be applied to the file in question.
-
 .It \&FR Ar name md5
-
 Remove the file
 .Ar name ,
 which must match the MD5 checksum
 .Ar md5 .
-
 .It \&AS Ar name uid gid mode
-
 The original file
 .Ar name
 changed its owner to
@@ -140,9 +125,7 @@ its group to
 .Ar gid ,
 and/or its mode to
 .Ar mode .
-
 .It \&DM Ar name uid gid mode
-
 The directory
 .Ar name
 is to be created, it had originally the owner
@@ -151,23 +134,16 @@ group
 .Ar gid ,
 and mode
 .Ar mode .
-
 .It \&DR Ar name
-
 The directory
 .Ar name
 is to be removed.
-
 .El
-
 .Sh EXAMPLES
-
 In the following example, long lines have been folded to make them
 printable
 .Pq marked by backslashes .
-
 .Bd -literal
-
 CTM_BEGIN 2.0 cvs-cur 485 19950324214652Z .
 CTMFR src/sys/gnu/i386/isa/scd.c,v 5225f13aa3c7e458f9dd0d4bb637b18d
 CTMFR src/sys/gnu/i386/isa/scdreg.h,v e5af42b8a06f2c8030b93a7d71afb223
@@ -185,30 +161,23 @@ ache        95/03/24 09:59:50
   Log:
 [...]
 CTM_END 74ddd298d76215ae45a077a4b6a74e9c
-
 .Ed
-
 .Sh SEE ALSO
-
 .Xr ctm 1 ,
 .Xr ctm_rmail 1 ,
 .Xr ed 1
-
 .Sh HISTORY
-
 Initial trials ran during the
 .Fx 1.1.5 ,
 and many bugs and 
 methods were hashed out.
 The CTM system has been made publicly available in
 .Fx 2.1 .
-
 .Sh AUTHORS
-
 The CTM system has been designed and implemented by
 .An Poul-Henning Kamp
 .Aq phk@FreeBSD.org .
-
+.Pp
 .An Joerg Wunsch
 .Aq joerg@FreeBSD.org
 wrote this man-page.
diff --git a/usr.sbin/ctm/ctm_rmail/ctm_rmail.1 b/usr.sbin/ctm/ctm_rmail/ctm_rmail.1
index a873c50..678e44c 100644
--- a/usr.sbin/ctm/ctm_rmail/ctm_rmail.1
+++ b/usr.sbin/ctm/ctm_rmail/ctm_rmail.1
@@ -417,8 +417,7 @@ Completed deltas.
 .It Pa BASEDIR/.ctm_status
 File containing the name and number of the next delta to be applied to this
 source tree.
-.\" This next request is for sections 1, 6, 7 & 8 only
-.\"     (command return values (to shell) and fprintf/stderr type diagnostics)
+.El
 .Sh DIAGNOSTICS
 .Nm ctm_smail ,
 .Nm ctm_dequeue
diff --git a/usr.sbin/elf2exe/elf2exe.8 b/usr.sbin/elf2exe/elf2exe.8
index 6f9349b..2f6cf55 100644
--- a/usr.sbin/elf2exe/elf2exe.8
+++ b/usr.sbin/elf2exe/elf2exe.8
@@ -35,7 +35,7 @@ The command prints a list of sections found in the ELF executable and the
 section sizes and offsets of the output file for diagnostic purposes.
 .Pp
 Given an object file 
-.B src.o
+.Pa src.o
 the following two commands will create a binary for ARCS:
 .Dl ld \-o a.out \-M \-N \-Ttext 0x80900000 src.o\c
 .Dl elf2exe a.out a.exe\c
diff --git a/usr.sbin/extattrctl/extattrctl.8 b/usr.sbin/extattrctl/extattrctl.8
index e1f5c7e..bc1bacf 100644
--- a/usr.sbin/extattrctl/extattrctl.8
+++ b/usr.sbin/extattrctl/extattrctl.8
@@ -122,6 +122,7 @@ on the file system identified by
 The file system must have attributes started on it, and the attribute
 most have been enabled using
 .Cm enable .
+.El
 .Sh EXAMPLES
 .Pp
 .Dl extattrctl start /
diff --git a/usr.sbin/fdformat/fdformat.1 b/usr.sbin/fdformat/fdformat.1
index 0224d0e5..bc46b30 100644
--- a/usr.sbin/fdformat/fdformat.1
+++ b/usr.sbin/fdformat/fdformat.1
@@ -107,7 +107,7 @@ Fill byte.
 Number of steps per track.
 An alternate method to specify the geometry data to write to the floppy disk.
 .El
-
+.Pp
 If the
 .Fl q
 flag has not been specified, the user is asked for a confirmation
diff --git a/usr.sbin/i4b/g711conv/g711conv.1 b/usr.sbin/i4b/g711conv/g711conv.1
index ac1c3d2..b711587 100644
--- a/usr.sbin/i4b/g711conv/g711conv.1
+++ b/usr.sbin/i4b/g711conv/g711conv.1
@@ -62,13 +62,11 @@ Print the resulting conversion tables (as C-source) to stdout instead of
 doing the actual conversion.
 .El
 .Pp
-
 .Sh STANDARDS
 A-Law and u-Law conversions are specified in ITU Recommendation G.711.
 .Pp
 The reference implementation done by Sun Microsystems, Inc. is available
 from http://www.itu.int/itudoc/itu-t/rec/g/g700-799/refimpl.txt
-
 .Sh EXAMPLES
 The command:
 .Bd -literal -offset indent
@@ -85,7 +83,6 @@ cat max_headroom.ul | g711conv -u -R > /dev/i4btel0
 converts the u-law coded voice of Max Headroom to A-law, reverses the
 bits of the result and moves that to an active isdn4bsd telephone connection.
 .Pp
-
 .Sh AUTHORS
 The
 .Nm
@@ -93,4 +90,3 @@ utility and this manpage were written by
 .An Hellmuth Michaelis Aq hm@kts.org
 based on the G.711 conversion reference code written by Sun Microsystems, 
 Inc. and code contributed to isdn4bsd by Stefan Bethke.
-
diff --git a/usr.sbin/i4b/isdnd/isdnd.8 b/usr.sbin/i4b/isdnd/isdnd.8
index 8d82d47..dc243c3 100644
--- a/usr.sbin/i4b/isdnd/isdnd.8
+++ b/usr.sbin/i4b/isdnd/isdnd.8
@@ -330,23 +330,20 @@ by the kernel sending the
 .Em I4B_DISCONNECT_IND
 message and the CDID corresponding to the call is no longer valid.
 .Pp
-
 .Sh SIGNALS
-
 Sending a HUP signal to 
 .Nm
 causes all open connections to be terminated and the configuration file is
 reread.
 In case aliasfile handling was enabled, the aliasfile is also
 reread.
-
+.Pp
 Sending a USR1 signal to 
 .Nm
 causes the accounting file and the logfile (if logging to a file is used 
 instead of logging via the 
 .Xr syslog 3
 facility) to be closed and reopened to make logfile rotation possible.
-
 .Sh ENVIRONMENT
 The following environment variables affect the execution of
 .Nm :
@@ -357,39 +354,29 @@ See
 .Xr environ 7
 for more information.
 .El
-
 .Sh FILES
-.Bl -tag -width /etc/isdn/isdnd.rates -compact
+.Bl -tag -width /etc/isdn/isdnd.rates
 .It Pa /dev/i4b
 The device-file used to communicate with the kernel ISDN driver subsystem.
-
 .It Pa /var/log/messages
 A record of the actions in case of syslogd logging support.
-
 .It Pa /var/log/isdnd.acct
 The default accounting information filename (if accounting is configured).
-
 .It Pa /var/log/isdnd.log
 The default logging filename (if logging to a file is configured).
-
 .It Pa /var/run/isdnd.pid
 The process id of the isdn daemon (also known as "lockfile" to isdnd, preventing multiple invocations of it).
-
 .It Pa /usr/local/lib/isdn
 .It Pa /etc/isdn
 The directory where isdnd expects some supplementary data files and programs
 for telephone answering support.
-
 .It Pa /etc/isdn/isdnd.rc
 The default runtime configuration file.
-
 .It Pa /etc/isdn/isdnd.rates
 The default unit charging rates specification file.
-
 .It Pa /etc/isdn/isdntel.alias
 The default table (if aliasing is enabled) to convert phone number to caller's name.
 .El
-
 .Sh EXAMPLES
 For a first try, the following command should be used to start
 .Nm
@@ -413,11 +400,8 @@ will start
 with reasonable debugging messages enabled, full-screen mode of operation, 
 full-screen display redirected to /dev/ttyv03 and using a termcap entry
 for vt100 on this display.
-
 .Sh DIAGNOSTICS
 Exit status is 0 on success, 1 on error.
-.Pp
-
 .Sh SEE ALSO
 .Xr syslogd 8 ,
 .Xr isdntrace 8 ,
@@ -427,10 +411,8 @@ Exit status is 0 on success, 1 on error.
 .Xr i4bisppp 4 ,
 .Xr i4bipr 4
 .Xr i4bing 4
-
 .Sh BUGS
 Still one or more left.
-
 .Sh AUTHORS
 The
 .Nm
diff --git a/usr.sbin/i4b/isdnd/isdnd.acct.5 b/usr.sbin/i4b/isdnd/isdnd.acct.5
index 437b133..f48cb88 100644
--- a/usr.sbin/i4b/isdnd/isdnd.acct.5
+++ b/usr.sbin/i4b/isdnd/isdnd.acct.5
@@ -86,7 +86,6 @@ is the number of seconds the connection lasted.
 and
 .Em OUTBYTES
 is the (optional) number of bytes that were transferred.
-
 .Sh FILES
 .Bl -tag -width /var/log/isdnd.acct -compact
 .It Pa /var/log/isdnd.acct
@@ -94,19 +93,15 @@ The default accounting information file for the
 .Nm isdnd
 ISDN daemon.
 .El
-
 .Sh EXAMPLES
 This is a typical accounting line:
 .Pp
 .Dl 12.06.97 10:41:37 - 12.06.97 10:45:18 GROGGY 2 (65) (4711/1147)
-
 .Sh SEE ALSO
 .Xr isdnd 8 ,
 .Xr isdnd.rc 5
-
 .Sh AUTHORS
 The 
 .Xr isdnd 8
 daemon and this manual page were written by 
 .An Hellmuth Michaelis Aq hm@kts.org .
-
diff --git a/usr.sbin/i4b/isdnd/isdnd.rc.5 b/usr.sbin/i4b/isdnd/isdnd.rc.5
index c938e5c..85f392b 100644
--- a/usr.sbin/i4b/isdnd/isdnd.rc.5
+++ b/usr.sbin/i4b/isdnd/isdnd.rc.5
@@ -180,7 +180,7 @@ The
 .Em monitor 
 specification may either be:
 .Pp
-.Bl -tag -width Ds -compact -offset
+.Bl -tag -width Ds -compact
 .It Ar the name of a local (UNIX-domain) socket
 this MUST start with a "/", example: /var/run/isdn-monitor
 .It Ar a dotted-quad host specification
@@ -198,7 +198,7 @@ This keyword specifies the access rights for a previously used
 keyword.
 The supported access rights are:
 .Pp
-.Bl -tag -width Ds -compact -offset
+.Bl -tag -width Ds -compact
 .It Ar fullcmd
 .It Ar restrictedcmd
 .It Ar channelstate
@@ -288,7 +288,7 @@ controller is connected to.
 The following parameters are currently
 supported:
 .Pp
-.Bl -tag -width calledback -compact -offset
+.Bl -tag -width calledback -compact
 .It Ar dss1
 The DSS1 or so-called "Euro-ISDN" D-channel protocol according to
 ITU Recommendations Q.921 and Q.931.
@@ -328,7 +328,7 @@ The B channel layer 1 protocol used for this connection.
 The keyword is mandatory.
 The currently configurable values are:
 .Pp
-.Bl -tag -width Ds -compact -offset
+.Bl -tag -width Ds -compact
 .It Ar hdlc
 HDLC framing.
 .It Ar raw
@@ -402,7 +402,7 @@ Used to specify what to do when an incoming connection request is received.
 The keyword is mandatory.
 The currently supported parameters are:
 .Pp
-.Bl -tag -width calledback -compact -offset
+.Bl -tag -width calledback -compact
 .It Ar accept
 Accept an incoming call.
 .It Ar reject
@@ -419,7 +419,7 @@ This keyword is used to configure what type of dialout mode is used.
 The keyword is mandatory.
 The currently supported parameters are:
 .Pp
-.Bl -tag -width Ds -compact -offset
+.Bl -tag -width Ds -compact
 .It Ar normal
 Normal behavior, call the remote site which is supposed to accept the call.
 .It Ar calledback
@@ -446,7 +446,7 @@ The keyword is optional, the default is
 .Pp
 The currently supported parameters are:
 .Pp
-.Bl -tag -width Ds -compact -offset
+.Bl -tag -width Ds -compact
 .It Ar inout
 Normal behavior, connection establishment is possible from remote and local.
 .It Ar in
@@ -487,7 +487,7 @@ The algorithm used to determine when to hang up an outgoing call when the
 line becomes idle.
 The current algorithms are:
 .Pp
-.Bl -tag -width calledback -compact -offset
+.Bl -tag -width calledback -compact
 .It Ar fix-unit-size
 idle algorithm which assumes fixed sized changing units during the whole call.
 .It Ar var-unit-size
@@ -607,7 +607,7 @@ The local site expects the authentity of the remote site to be proved by
 the specified method. 
 The supported methods are:
 .Pp
-.Bl -tag -width Ds -compact -offset
+.Bl -tag -width Ds -compact
 .It Ar none
 Do not require the other side to authenticate.
 Typical uses are dial-out to an ISP 
@@ -655,7 +655,7 @@ PPP interface.
 The authentication method required by the remote site.
 The currently supported parameters are:
 .Pp
-.Bl -tag -width Ds -compact -offset
+.Bl -tag -width Ds -compact
 .It Ar none
 The remote site does not expect or support authentication.
 .It Ar chap
@@ -703,7 +703,7 @@ is used to specify the dialout behavior in case more than one outgoing
 number is specified.
 The currently supported parameters are:
 .Pp
-.Bl -tag -width Ds -compact -offset
+.Bl -tag -width Ds -compact
 .It Ar first
 For every new (non-retry) call setup, start with the first number.
 .It Ar last
@@ -748,7 +748,7 @@ This keyword is used to specify from which source
 takes the unitlength for short-hold mode.
 The currently configurable values are:
 .Pp
-.Bl -tag -width Ds -compact -offset
+.Bl -tag -width Ds -compact
 .It Ar none
 Then unitlength is not specified anywhere. 
 .It Ar cmdl
@@ -773,7 +773,7 @@ data to the user-land.
 The keyword is mandatory.
 This keyword accepts the following parameters:
 .Pp
-.Bl -tag -width Ds -compact -offset
+.Bl -tag -width Ds -compact
 .It Ar ipr
 This parameter configures a raw HDLC IP over ISDN interface.
 .It Ar isp
@@ -814,7 +814,7 @@ daytime range specification in the form hh:mm-hh:mm.
 The weekdays are specified as numbers from 0 to 6 and the number 7 for 
 holidays:
 .Pp
-.Bl -tag -width Ds -compact -offset
+.Bl -tag -width Ds -compact
 .It Ar 0
 Sunday
 .It Ar 1
@@ -834,7 +834,7 @@ a Holiday
 .El
 .Pp
 The following examples describe the "T-ISDN xxl" tariff of the german Telekom:
-.Bl -tag -width Ds -compact -offset
+.Bl -tag -width Ds -compact
 .It Ar 1,2,3,4,5,6,09:00-18:00
 Monday through Saturday, daytime 9:00 to 18:00
 .It Ar 1,2,3,4,5,6,18:00-9:00
@@ -847,7 +847,7 @@ The use of this keyword is optional.
 .El
 .El
 .Sh IDLETIME CALCULATION AND SHORT-HOLD MODE
-.Bl -tag -width incoming calls
+.Bl -tag -width "incoming calls
 .It Li incoming calls
 It is assumed that the calling side knows most about charging structures and
 such and as a consequence only the keyword
@@ -865,7 +865,7 @@ is used as a last resort and is therefore set much higher than a charging
 unit time: typical values are one to five minutes.
 .It Li outgoing calls
 Outgoing call disconnect time can be setup in one of three ways:
-.Bl -tag -width shorthold mode
+.Bl -tag -width "shorthold mode
 .It Li simple mode
 For simple mode, the 
 .Em idle-algorithm-outgoing
diff --git a/usr.sbin/i4b/isdndebug/isdndebug.8 b/usr.sbin/i4b/isdndebug/isdndebug.8
index 3012e98..09711b3 100644
--- a/usr.sbin/i4b/isdndebug/isdndebug.8
+++ b/usr.sbin/i4b/isdndebug/isdndebug.8
@@ -95,7 +95,6 @@ Reset the Q.921 (D-channel layer 2) frame receive/transmit statistics to zero.
 .Pp
 .Sh FILES
 /dev/i4bctl
-
 .Sh EXAMPLES
 The command:
 .Bd -literal -offset indent
@@ -103,7 +102,6 @@ isdndebug -g
 .Ed
 .Pp
 displays the current debugging level for all ISDN layers
-
 .Sh AUTHORS
 The
 .Nm
diff --git a/usr.sbin/i4b/isdnphone/isdnphone.8 b/usr.sbin/i4b/isdnphone/isdnphone.8
index 4587947..518a9d6 100644
--- a/usr.sbin/i4b/isdnphone/isdnphone.8
+++ b/usr.sbin/i4b/isdnphone/isdnphone.8
@@ -57,7 +57,7 @@ hang up a possibly open telefone connection on the selected interface.
 dial the specified number on the selected interface.
 .It Fl u
 Set the unit number to specify the interface used.
-.Pp
+.El
 .Sh FILES
 /dev/i4bteld<n>
 .Sh EXAMPLES
diff --git a/usr.sbin/i4b/isdntel/isdntel.8 b/usr.sbin/i4b/isdntel/isdntel.8
index 068c45c..caad7fc 100644
--- a/usr.sbin/i4b/isdntel/isdntel.8
+++ b/usr.sbin/i4b/isdntel/isdntel.8
@@ -74,7 +74,7 @@ as the command string to execute for playing a voice message to some audio
 output facility. The characters
 .Em %s
 are replaced by the currently selected filename. The default string is
-.Em cat %s | alaw2ulaw >/dev/audio
+.Dq Li cat %s \&| alaw2ulaw >/dev/audio .
 .It Fl t
 The value for
 .Ar timeout
@@ -87,10 +87,8 @@ The screen output should be obvious. If in doubt, consult the source.
 .Xr isdnd 8
 .Xr isdnd.rc 5
 .Xr i4btel 4
-
 .Sh BUGS
 Still two or more left.
-
 .Sh AUTHORS
 The
 .Nm
diff --git a/usr.sbin/i4b/isdntest/isdntest.8 b/usr.sbin/i4b/isdntest/isdntest.8
index e4f8180..778bf43 100644
--- a/usr.sbin/i4b/isdntest/isdntest.8
+++ b/usr.sbin/i4b/isdntest/isdntest.8
@@ -83,7 +83,6 @@ enhances it as a real self test and setup-verification tool!
 .Nm Isdntest 
 does almost no error checking and error recovery, so unexpected
 hangs or crashes may occur.
-
 .Sh EXAMPLES
 For the following example, it is assumed that a machine with isdn4bsd 
 installed is connected to an S0 bus and that one of the valid MSN's (MSN = Multiple Subscriber Number
@@ -103,8 +102,9 @@ and disconnect after 5 seconds.
 has to be finished by the user by entering Control-C.
 .Pp
 .Sh FILES
-/dev/i4b
-
+.Bl -tag -width indent
+.It Pa /dev/i4b
+.El
 .Sh AUTHORS
 The
 .Nm
diff --git a/usr.sbin/i4b/man/i4btrc.4 b/usr.sbin/i4b/man/i4btrc.4
index 15ab4a8..1de2cfbb 100644
--- a/usr.sbin/i4b/man/i4btrc.4
+++ b/usr.sbin/i4b/man/i4btrc.4
@@ -33,7 +33,7 @@
 .Os
 .Sh NAME
 .Nm i4btrc
-.Nd isdn4bsd ISDN interface driver for D and B channel tracing
+.Nd "isdn4bsd ISDN interface driver for D and B channel tracing
 .Sh FreeBSD SYNOPSIS
 .Cd pseudo-device \&"i4btrc\&" Op count
 .Sh NetBSD SYNOPSIS
diff --git a/usr.sbin/i4b/man/isic.4 b/usr.sbin/i4b/man/isic.4
index b2baef5..15bd32c 100644
--- a/usr.sbin/i4b/man/isic.4
+++ b/usr.sbin/i4b/man/isic.4
@@ -35,7 +35,6 @@
 .Nm isic
 .Nd isdn4bsd Siemens ISDN Chipset device driver
 .Sh FreeBSD SYNOPSIS (FreeBSD >= 4.0)
-.Br
 .Pp
 Asuscom ISDNLink 128K (ISA PnP):
 .Cd options \&"ASUSCOM_IPAC\&"
@@ -185,7 +184,7 @@ of larger FIFO buffers) is also supported.
 .Pp
 .Sh SUPPORTED CARDS
 .Pp
-.Bl -tag -width Ds -compact -offset
+.Bl -tag -width Ds -compact
 .It Ar Teles S0/8, Dr. Neuhaus Niccy 1008, Creatix ISDN-S0/8
 .Pp
 The required (optional for NetBSD)
diff --git a/usr.sbin/i4b/man/iwic.4 b/usr.sbin/i4b/man/iwic.4
index eda5f87..a4d7269 100644
--- a/usr.sbin/i4b/man/iwic.4
+++ b/usr.sbin/i4b/man/iwic.4
@@ -49,7 +49,7 @@ based on the Winbond W6692 chip.
 .Pp
 .Sh SUPPORTED CARDS
 .Pp
-.Bl -tag -width Ds -compact -offset
+.Bl -tag -width Ds -compact
 .It Ar ASUSCOM P-IN100-ST-D
 .Pp
 .It Ar Dynalink IS64PPH
diff --git a/usr.sbin/inetd/inetd.8 b/usr.sbin/inetd/inetd.8
index bbaf4f6..7a4c03b 100644
--- a/usr.sbin/inetd/inetd.8
+++ b/usr.sbin/inetd/inetd.8
@@ -706,7 +706,7 @@ Important error messages and their explanations are:
 .Bl -ohang -compact
 .It Xo
 .Ar service Ns / Ns Ar protocol
-.No " server failing (looping), service terminated."
+.No "server failing (looping), service terminated."
 .Xc
 The number of requests for the specified service in the past minute
 exceeded the limit.
diff --git a/usr.sbin/iostat/iostat.8 b/usr.sbin/iostat/iostat.8
index c81c6ae..f43389f 100644
--- a/usr.sbin/iostat/iostat.8
+++ b/usr.sbin/iostat/iostat.8
@@ -70,7 +70,7 @@
 statistics
 .Sh SYNOPSIS
 .Nm
-.Op Fl CdhKIoT?
+.Op Fl CdhKIoT?\&
 .Op Fl c Ar count
 .Op Fl M Ar core
 .Op Fl n Ar devs
@@ -141,10 +141,10 @@ miliseconds per seek are displayed.
 .It Fl t
 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
@@ -174,7 +174,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
@@ -184,7 +184,7 @@ Any other device interface
 .El
 .Pp
 .It passthrough:
-.Bl -tag -width 123456789 -compact
+.Bl -tag -width 9n -compact
 .It pass
 Passthrough devices
 .El
@@ -217,7 +217,7 @@ seconds between each display.
 If no repeat
 .Ar count
 is specified, the default is infinity.
-.It Fl ?
+.It Fl ?\&
 Display a usage statement and exit.
 .El
 .Pp
diff --git a/usr.sbin/kbdcontrol/kbdcontrol.1 b/usr.sbin/kbdcontrol/kbdcontrol.1
index 6c5fabc0..a84652d 100644
--- a/usr.sbin/kbdcontrol/kbdcontrol.1
+++ b/usr.sbin/kbdcontrol/kbdcontrol.1
@@ -173,6 +173,7 @@ for details.
 .Bl -tag -width /usr/share/syscons/keymaps/foo_bar -compact
 .It Pa /usr/share/syscons/keymaps/*
 keyboard map files
+.El
 .Sh EXAMPLES
 The following command will load the keyboard map file
 .Pa /usr/share/syscons/keymaps/ru.koi8-r.kbd .
diff --git a/usr.sbin/kbdmap/kbdmap.1 b/usr.sbin/kbdmap/kbdmap.1
index ee15ab0..a1f8b18 100644
--- a/usr.sbin/kbdmap/kbdmap.1
+++ b/usr.sbin/kbdmap/kbdmap.1
@@ -23,7 +23,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
-
 .Dd March 25, 1995
 .Dt KBDMAP 1
 .Os FreeBSD
@@ -96,8 +95,8 @@ Show currently supported languages and exit.
 More warnings.
 .El
 .Sh ENVIRONMENT
-.Bl -tag -width /etc/master.passwdxx -compact
-.Ev LANG	
+.Bl -tag -width LANG -compact
+.It Ev LANG
 preferred language
 .El
 .Sh FILES
diff --git a/usr.sbin/keyadmin/keyadmin.8 b/usr.sbin/keyadmin/keyadmin.8
index b14b199..d4331a6 100644
--- a/usr.sbin/keyadmin/keyadmin.8
+++ b/usr.sbin/keyadmin/keyadmin.8
@@ -164,7 +164,6 @@ particular command.
 .Pp
 Erase all entries in the kernel security association table.
 .El
-
 .Pp
 The following values for
 .Ar command
@@ -216,7 +215,6 @@ An EOF will also end interaction with
 .Xr route 4 ,
 .Xr gated 8 ,
 .Xr routed 8
-
 .Sh HISTORY
 The
 .Nm
diff --git a/usr.sbin/lpr/lp/lp.1 b/usr.sbin/lpr/lp/lp.1
index 3109697..c81d70f 100644
--- a/usr.sbin/lpr/lp/lp.1
+++ b/usr.sbin/lpr/lp/lp.1
@@ -47,7 +47,7 @@
 .Op Fl n Ar num
 .Op Ar name ...
 .Sh DESCRIPTION
-.Nm Lp
+.Nm \&Lp
 is a front-end to the print spooler as required by the
 .St -p1003.2
 specification.  It effectively invokes
diff --git a/usr.sbin/lpr/lpc/lpc.8 b/usr.sbin/lpr/lpc/lpc.8
index c99631c..e24d4b5 100644
--- a/usr.sbin/lpr/lpc/lpc.8
+++ b/usr.sbin/lpr/lpc/lpc.8
@@ -147,6 +147,7 @@ Place the jobs in the order listed at the top of the printer queue.
 Enable everything and start a new printer daemon.
 Undoes the effects of
 .Ic down .
+.El
 .Sh FILES
 .Bl -tag -width /var/spool/*/lockx -compact
 .It Pa /etc/printcap
diff --git a/usr.sbin/lpr/lpd/lpd.8 b/usr.sbin/lpr/lpd/lpd.8
index 0c48f7c..aeb569e 100644
--- a/usr.sbin/lpr/lpd/lpd.8
+++ b/usr.sbin/lpr/lpd/lpd.8
@@ -105,7 +105,7 @@ or
 Second, if the
 .Li rs
 capability is specified in the
-.Xr printcap
+.Xr printcap 5
 entry for the printer being accessed,
 .Em lpr
 requests will only be honored for those users with accounts on the
diff --git a/usr.sbin/lpr/lpq/lpq.1 b/usr.sbin/lpr/lpq/lpq.1
index ad53033..dc3317a 100644
--- a/usr.sbin/lpr/lpq/lpq.1
+++ b/usr.sbin/lpr/lpq/lpq.1
@@ -43,8 +43,8 @@
 .Op Fl a
 .Op Fl l
 .Op Fl P Ns Ar printer
-.Op  job # ...
-.Op  user ...
+.Op  job # ...\&
+.Op  user ...\&
 .Sh DESCRIPTION
 .Nm Lpq
 examines the spooling area used by
diff --git a/usr.sbin/lpr/lpr/printcap.5 b/usr.sbin/lpr/lpr/printcap.5
index 667f6c7..2533d45 100644
--- a/usr.sbin/lpr/lpr/printcap.5
+++ b/usr.sbin/lpr/lpr/printcap.5
@@ -72,7 +72,7 @@ Refer to
 .Xr termcap 5
 for a description of the file layout.
 .Bl -column Namexxx Typexx "/var/spool/lpdxxxxx"
-.Sy Name	Type	Default	Description
+.Sy "Name	Type	Default	Description
 .It "af	str" Ta Dv NULL Ta No "name of accounting file"
 .It "br	num	none	if lp is a tty, set the baud rate"
 .Pf ( Xr ioctl 2
diff --git a/usr.sbin/lpr/lprm/lprm.1 b/usr.sbin/lpr/lprm/lprm.1
index 84ddd76..ff3fac9 100644
--- a/usr.sbin/lpr/lprm/lprm.1
+++ b/usr.sbin/lpr/lprm/lprm.1
@@ -42,8 +42,8 @@
 .Nm
 .Op Fl P Ns Ar printer
 .Op Fl
-.Op job # ...
-.Op Ar user ...
+.Op job # ...\&
+.Op Ar user ...\&
 .Sh DESCRIPTION
 .Nm Lprm
 will remove a job, or jobs, from a printer's spool queue.
diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8
index 95f233b..932eba7 100644
--- a/usr.sbin/mergemaster/mergemaster.8
+++ b/usr.sbin/mergemaster/mergemaster.8
@@ -253,9 +253,8 @@ comparison, use:
 .Pp
 .Dl # mergemaster -sw 110
 .Sh FILES
-.Bl -tag -width $HOME/.mergemasterrc -compact
-.Pa $HOME/.mergemasterrc
-.Pp
+.Bl -ohang
+.It Pa $HOME/.mergemasterrc
 .Nm
 will . (source) this file if it exists.
 Command line options
@@ -305,8 +304,8 @@ with all values commented out:
 # and/or after the script has finished its work
 #MM_PRE_COMPARE_SCRIPT=
 #MM_EXIT_SCRIPT=
-
 .Ed
+.El
 .Sh SEE ALSO
 .Xr cvs 1 ,
 .Xr diff 1 ,
diff --git a/usr.sbin/mrouted/mrouted.8 b/usr.sbin/mrouted/mrouted.8
index 3606a71..0420266 100644
--- a/usr.sbin/mrouted/mrouted.8
+++ b/usr.sbin/mrouted/mrouted.8
@@ -129,6 +129,7 @@ Upon startup,
 .Nm
 writes its pid to the file
 .Pa /var/run/mrouted.pid .
+.El
 .Sh CONFIGURATION
 .Nm Mrouted 
 automatically configures itself to forward on all multicast-capable
@@ -253,7 +254,7 @@ or
 A remote hostname may only be used if
 it maps to a single IP address.
 A tunnel must be configured on both routers before it can be used.
-
+.Pp
 Be careful that the unicast route to the remote address goes out the
 interface specified by the
 .Ar "local-addr|ifname"
@@ -284,7 +285,7 @@ to be forwarded to the given interface or tunnel.  It is used to control the
 scope of multicast datagrams.  (The TTL of forwarded packets is only compared
 to the threshold, it is not decremented by the threshold.  Every multicast
 router decrements the TTL by exactly 1.)  The default threshold is 1.
-
+.Pp
 In general, all multicast routers
 connected to a particular subnet or tunnel should
 use the same metric and threshold for that subnet or tunnel.
@@ -345,7 +346,7 @@ Only one of
 or
 .Li deny
 commands may be used on a given interface.
-
+.Pp
 The list of routes follows the
 .Li accept
 or
@@ -361,7 +362,7 @@ denys only the default route.  The default route may also be specified
 with the
 .Li default
 keyword.
-
+.Pp
 The
 .Ar bidir
 keyword enables bidirectional route filtering; the filter will be applied
diff --git a/usr.sbin/mrouted/mtrace.8 b/usr.sbin/mrouted/mtrace.8
index 22e862a..94ef20b 100644
--- a/usr.sbin/mrouted/mtrace.8
+++ b/usr.sbin/mrouted/mtrace.8
@@ -209,7 +209,7 @@ Set the time to wait for a trace response to
 seconds (default 3 seconds).
 .El
 .Sh USAGE
-.Ss How It Works
+.Ss "How It Works"
 The technique used by the
 .Nm traceroute
 tool to trace unicast network paths will not work for IP multicast
@@ -488,7 +488,9 @@ in no response because there was a node running an old version of
 .Nm mrouted
 that did not implement the multicast traceroute function, so
 .Nm
-switched to hop-by-hop mode.  The \*(lqOutput pruned\*(rq error code
+switched to hop-by-hop mode.  The
+.Dq Output pruned
+error code
 indicates that traffic for group 224.2.143.24 would not be forwarded.
 .Pp
 .Bd -literal
diff --git a/usr.sbin/mtest/mtest.8 b/usr.sbin/mtest/mtest.8
index cf67915..e988e8e 100644
--- a/usr.sbin/mtest/mtest.8
+++ b/usr.sbin/mtest/mtest.8
@@ -43,7 +43,7 @@ Set or reset ALLMULTI mode on interface
 .It Ic p Ar ifname Ar 1/0
 Set or reset promiscuous mode on interface
 .Ar ifname .
-.It Ic ?
+.It Ic ?\&
 List legal commands.
 .It Ic q
 Quit the program.
diff --git a/usr.sbin/mtree/mtree.8 b/usr.sbin/mtree/mtree.8
index fc6fef5..04bac92 100644
--- a/usr.sbin/mtree/mtree.8
+++ b/usr.sbin/mtree/mtree.8
@@ -273,7 +273,7 @@ Specifying a directory will cause subsequent files to be searched
 for in that directory hierarchy.
 Which brings us to the last type of line in a specification: a line
 containing only the string
-.Dq Pa \&..
+.Dq Pa ..\&
 causes the current directory
 path to ascend one level.
 .Pp
diff --git a/usr.sbin/ntp/doc/ntpdc.8 b/usr.sbin/ntp/doc/ntpdc.8
index 47111bc..290252e 100644
--- a/usr.sbin/ntp/doc/ntpdc.8
+++ b/usr.sbin/ntp/doc/ntpdc.8
@@ -136,15 +136,15 @@ program itself and do not result in
 NTP mode 7 requests being sent to a server.
 These are described following:
 .Bl -tag -width indent
-.It Ic ? Op Ar command_keyword
+.It Ic ?\& Op Ar command_keyword
 .It Ic help Op Ar command_keyword
 A
-.Ic ?
+.Ic ?\&
 by itself will print a list of all the command keywords
 known to this incarnation of
 .Nm .
 A
-.Ic ?
+.Ic ?\&
 followed by a command keyword will print function and
 usage information about the command.
 This command is probably a better
diff --git a/usr.sbin/ntp/doc/ntpq.8 b/usr.sbin/ntp/doc/ntpq.8
index ff325ed..d9b168d 100644
--- a/usr.sbin/ntp/doc/ntpq.8
+++ b/usr.sbin/ntp/doc/ntpq.8
@@ -108,15 +108,15 @@ program itself and do not result in NTP mode 6 requests being sent to a
 server.
 These are described following.
 .Bl -tag -width indent
-.It Ic ? Op Ar command_keyword
+.It Ic ?\& Op Ar command_keyword
 .It Ic help Op Ar command_keyword
 A
-.Ic ?
+.Ic ?\&
 by itself will print a list of all the command keywords
 known to this incarnation of
 .Nm .
 A
-.Ic ?
+.Ic ?\&
 followed by a command keyword will print function and
 usage information about the command.
 This command is probably a better
diff --git a/usr.sbin/pccard/pccardd/pccardd.8 b/usr.sbin/pccard/pccardd/pccardd.8
index 38cb6f6..70348ec 100644
--- a/usr.sbin/pccard/pccardd/pccardd.8
+++ b/usr.sbin/pccard/pccardd/pccardd.8
@@ -153,7 +153,7 @@ and lists the PC-CARD cards recognized by
 .Nm ,
 and the kernel drivers and devices that are used to
 interface to the card.
-.Pp
+.El
 .Sh FILES
 .Bl -tag -width /etc/defaults/pccard.conf -compact
 .It Pa /etc/defaults/pccard.conf
diff --git a/usr.sbin/pcvt/ispcvt/ispcvt.8 b/usr.sbin/pcvt/ispcvt/ispcvt.8
index 44cd75e..274a61f 100644
--- a/usr.sbin/pcvt/ispcvt/ispcvt.8
+++ b/usr.sbin/pcvt/ispcvt/ispcvt.8
@@ -72,6 +72,7 @@ Specifying
 with the
 .Fl c
 option gives a verbose listing of the compile-time options.
+.El
 .Sh DIAGNOSTICS
 .Bl -tag -width Ds -compact
 .Pp
diff --git a/usr.sbin/pcvt/kcon/kcon.1 b/usr.sbin/pcvt/kcon/kcon.1
index 900f81e..398cb64 100644
--- a/usr.sbin/pcvt/kcon/kcon.1
+++ b/usr.sbin/pcvt/kcon/kcon.1
@@ -93,12 +93,14 @@ To be used in conjunction with the
 .Fl l
 option.
 This is the default behaviour.
+.El
 .Sh FILES
 .Bl -tag -width /usr/share/misc/keycap.pcvt -compact
 .It Pa /usr/share/misc/keycap.pcvt
 Keyboard capabilities data base file if nothing else was chosen during installation.
 .It Pa /dev/console
 Keyboard raw device.
+.El
 .Sh SEE ALSO
 .Xr keycap 3 ,
 .Xr keycap 5
diff --git a/usr.sbin/pcvt/keycap/man5/keycap.5 b/usr.sbin/pcvt/keycap/man5/keycap.5
index 06d06ee..4de2765 100644
--- a/usr.sbin/pcvt/keycap/man5/keycap.5
+++ b/usr.sbin/pcvt/keycap/man5/keycap.5
@@ -63,10 +63,10 @@ upper case and blanks for readability.
 .Sh CAPABILITIES
 .Pp
 .Bl -column indent indent
-.Sy Name	Type	Description
+.Sy "Name	Type	Description
 .It "de	bool	Resets Keyboard mapping to compiled-in default"
 .It "D<n>	bool	Disables key <n> completely"
-
+.It "
 .It "m<n>	num	specify key numbers for ALT keys 
 .It "l<n>	num	specify key numbers for ALTGR keys
 .It "h<n>	num	specify key numbers for SHIFT keys
@@ -75,19 +75,18 @@ upper case and blanks for readability.
 .It "sh<n>	num	specify key number for the SHIFT LOCK key
 .It "nl<n>	num	specify key number for the NUM LOCK key
 .It "sc<n>	num	specify key number for the SCROLL LOCK key
-
+.It "
 .It "K<n>	str	bind a string to a unshifted (normal) key
 .It "S<n>	str	bind a string to a shifted key
 .It "C<n>	str	bind a string to a control key
 .It "A<n>	str	bind a string to a altgr key
-
+.It "
 .It "tc	str	Entry of similar map \- must be last."
 .El
-
+.Pp
 Parameter <n> describing the key number can have values from 1 to 128.
-
+.Pp
 A string parameter may have up to 15 characters.
-
 .Pp
 .Ss A Sample Entry
 The following entry, which describes a test entry, is among the very
@@ -99,7 +98,6 @@ file as of this writing.
 tt\||test\||Test entry which swaps y and z:\e
 	:K22=z:S22=Z:C22=\e032:\e
 	:K46=y:S46=Y:C46=\e031:
-
 .Ed
 .Pp
 Entries may continue onto multiple lines by giving a \e as the last
@@ -118,15 +116,15 @@ File containing keyboard mapping descriptions.
 The entry
 .Dq Li l1#60
 sets the keynumber for the ALTGR key to 60.
-
+.Pp
 The entry
 .Dq Li K100=hugo
 binds the string 'hugo' to the key number 100.
-
+.Pp
 The entry
 .Dq Li K100=^D
 binds the control character EOT (0x04) to the key number 100.
-
+.Pp
 The entry
 .Dq Li K100=\e000
 binds the control character NUL (0x00) to the key number 100.
diff --git a/usr.sbin/pcvt/scon/scon.1 b/usr.sbin/pcvt/scon/scon.1
index 42f79e1..15a7cf7 100644
--- a/usr.sbin/pcvt/scon/scon.1
+++ b/usr.sbin/pcvt/scon/scon.1
@@ -134,14 +134,12 @@ Naturally, option
 .Fl p
 is available only for VGA boards.
 Three flavors are available.
-
+.Pp
 If used with argument
 .Dq Ar default ,
 this flag will restore the default palette
-.Po
-as installed by VGA ROM BIOS after hardware reset
-.Pc .
-
+(as installed by VGA ROM BIOS after hardware reset).
+.Pp
 If used with argument
 .Dq Ar list ,
 the current VGA DAC palette entries are listed.
@@ -150,7 +148,7 @@ the table index, values for red, green, and blue, and if there's a
 known name for this entry, the color name.
 Trailing empty table
 slots (RGB values all zero) are omitted.
-
+.Pp
 Otherwise, four comma-separated arguments are expected.
 The first
 denotes the number of palette entry to be modified.
@@ -200,7 +198,7 @@ region is reset and the cursor is placed in the home position.
 The command
 .Dq Li scon Fl H s Ar 28
 places the current screen into HP mode and sets the screen size to 28x80.
-
+.Pp
 Invoking
 .Do
 .Li scon Fl p
diff --git a/usr.sbin/pcvt/vgaio/vgaio.8 b/usr.sbin/pcvt/vgaio/vgaio.8
index 87af495..87e498a 100644
--- a/usr.sbin/pcvt/vgaio/vgaio.8
+++ b/usr.sbin/pcvt/vgaio/vgaio.8
@@ -52,12 +52,10 @@ silly,
 .Nm
 cares of all the things necessary and allows the user to access the
 registers of several register groups with their symbolic names.
-
 .Ss Options
 .Bl -tag -width 10n -offset indent
 .It Fl d
 Turn on the grammar parser debugger.
-
 .El
 .Ss Command language
 The command language of
@@ -67,11 +65,11 @@ Commands are executed
 line by line as they are entered.
 Each line may contain any number of
 semicolon-separated input/output commands.
-
+.Pp
 Symbolic register names look like:
-
-.D1 Ao Em reggroup Ac Ao Em regnumber Ac
-
+.Pp
+.D1 Ao Em reggroup Ac Aq Em regnumber
+.Pp
 with
 .Aq Em regnumber
 being any hexadecimal number
@@ -93,52 +91,46 @@ standing for the
 or
 .Em Timing sequencer ,
 respectively.
-
+.Pp
 An input instruction has the form
-
-.D1 Ao Em regname Ac ?
-
+.Pp
+.D1 Ao Em regname Ac \&?
+.Pp
 and will cause
 .Nm
 to output a line like
-
 .Bd -ragged -offset indent
-.Ao Em regname Ac \& = 0x Ns
-.Aq Em number
+.Aq Em regname
+.No = 0x Ns Aq Em number
 .Ed
-
+.Pp
 An output instruction looks like
-
 .Bd -ragged -offset indent
 .Ao Em regname Ac =
 .Aq Em number
 .Ed
-
+.Pp
 Spaces or Tabs between the
 .Aq Em reggroup ,
 the
 .Aq Em regnumber ,
 or any of the other tokens are ignored.
 They are not required anyway.
-
+.Pp
 The 
 .Dq Em mi
 needs a single unused argument to satisfy the syntax :-) (-hm).
-
-
 .Ss Access control
 The caller must have uid 0 in order to gain the required access to
 the IO registers.
-
 .Sh HISTORY
 This program is considered
 .Dq hackware .
 It has been developed in order to simplify the process of developing other
 software that needs to program the Video Graphics Array.
-
+.Pp
 Remember, to use this program, your kernel has to be compiled with XSERVER
-being defined !
-
+being defined!
 .Sh AUTHORS
 The program has been contributed by
 .An J\(:org Wunsch ,
diff --git a/usr.sbin/pim6dd/pim6dd.conf.5 b/usr.sbin/pim6dd/pim6dd.conf.5
index bbfc661..56c8750 100644
--- a/usr.sbin/pim6dd/pim6dd.conf.5
+++ b/usr.sbin/pim6dd/pim6dd.conf.5
@@ -34,7 +34,7 @@
 .Os
 .Sh NAME
 .Nm pim6dd.conf
-.Nd config file for pim6dd, PIM for IPv6 dense mode daemon
+.Nd "config file for pim6dd, PIM for IPv6 dense mode daemon
 .\"
 .Sh DESCRIPTION
 The file describes how the
diff --git a/usr.sbin/pim6sd/pim6sd.conf.5 b/usr.sbin/pim6sd/pim6sd.conf.5
index c17813a..cc7766e 100644
--- a/usr.sbin/pim6sd/pim6sd.conf.5
+++ b/usr.sbin/pim6sd/pim6sd.conf.5
@@ -59,7 +59,7 @@ are comments.
 .Pp
 The following statements can be specified in the configuration file.
 .Pp
-.Bl -tag -width Ds -compact
+.Bl -tag -width Ds
 .It Xo
 .Ic log
 .Ar option...
@@ -294,7 +294,7 @@ specifies the threshold in bits per second, and
 .Ic interval
 specifies the interval of checking the rate in seconds.
 The default values are 50000 and 20, respectively.
-\"
+.\"
 .It Xo
 .Ic switch_data_threshold Ic rate Ar rate Ic interval Ar interval;
 .Xc
diff --git a/usr.sbin/pkg_install/add/pkg_add.1 b/usr.sbin/pkg_install/add/pkg_add.1
index b85b528..15f0ea9 100644
--- a/usr.sbin/pkg_install/add/pkg_add.1
+++ b/usr.sbin/pkg_install/add/pkg_add.1
@@ -64,7 +64,6 @@ directives, and/or use the
 .Xr pkg_info 1
 command to examine the package file.
 .Ef
-
 .Sh OPTIONS
 The following command line arguments are supported:
 .Bl -tag -width indent
@@ -211,7 +210,7 @@ ftp.
 is fairly simple.  It extracts each package's "packing list"
 into a special staging directory, parses it,
 and then runs through the following sequence to fully extract the contents:
-.Bl -enum -indent indent
+.Bl -enum
 .It
 Check if the package is already recorded as installed.  If so,
 terminate installation.
@@ -263,13 +262,13 @@ arguments:
 .Ar pkg-name
 .Ar PRE-INSTALL
 .Ed
-
+.Pp
 where
 .Ar pkg-name
 is the name of the package in question and
 .Ar PRE-INSTALL
 is a keyword denoting this as the preinstallation phase.
-
+.Pp
 .Cm Note:
 The
 .Ar PRE-INSTALL
@@ -326,7 +325,7 @@ where
 is the name of the package in question and
 .Ar POST-INSTALL
 is a keyword denoting this as the post-installation phase.
-
+.Pp
 .Cm Note:
 The
 .Ar POST-INSTALL
@@ -336,8 +335,8 @@ are given during package creation time (using the
 and 
 .Cm Fl I
 flags to 
-.Xr pkg_create 1 ).
-
+.Xr pkg_create 1 ) .
+.Pp
 Reasoning behind passing keywords such as
 .Ar POST-INSTALL
 and
diff --git a/usr.sbin/pkg_install/create/pkg_create.1 b/usr.sbin/pkg_install/create/pkg_create.1
index 65b570f..c739060 100644
--- a/usr.sbin/pkg_install/create/pkg_create.1
+++ b/usr.sbin/pkg_install/create/pkg_create.1
@@ -115,7 +115,7 @@ program (or shell script).  It will be invoked automatically when the
 package is later installed.
 It will be passed the package's name as the
 first argument.
-
+.Pp
 .Cm Note:
 if the
 .Cm Fl I
@@ -156,7 +156,7 @@ program (or shell script).  It will be invoked automatically when the
 package is later (if ever) de-installed.
 It will be passed the package's
 name as the first argument.
-
+.Pp
 .Cm Note:
 if the
 .Cm Fl K
@@ -175,7 +175,6 @@ executable program (or shell script).  It will be invoked automatically when
 the package is later de-installed.
 It will be passed the package's name as
 the first argument.
-
 .It Fl r Ar rscript
 Set
 .Ar rscript
@@ -298,12 +297,12 @@ and the last extracted file was
 .It Cm "%F"
 Expands to the last filename extracted (as specified), in the example case
 .Pa bin/emacs
-.It Cm "%D"
+.It Cm "\&%D"
 Expand to the current directory prefix, as set with
 .Cm @cwd ,
 in the example case
 .Pa /usr/local .
-.It Cm "%B"
+.It Cm "\&%B"
 Expand to the
 .Dq basename
 of the fully qualified filename, that
@@ -315,7 +314,7 @@ Expand to the
 filename
 part of the fully qualified name, or
 the converse of
-.Cm %B ,
+.Cm \&%B ,
 being in the example case,
 .Pa emacs .
 .El
diff --git a/usr.sbin/pkg_install/delete/pkg_delete.1 b/usr.sbin/pkg_install/delete/pkg_delete.1
index fb7f4b6..e50f57e 100644
--- a/usr.sbin/pkg_install/delete/pkg_delete.1
+++ b/usr.sbin/pkg_install/delete/pkg_delete.1
@@ -63,7 +63,6 @@ directives, and/or use the
 .Xr pkg_info 1
 command to examine the installed package control files.
 .Ef
-
 .Sh OPTIONS
 The following command line options are supported:
 .Bl -tag -width indent
@@ -96,8 +95,6 @@ the package.
 Force removal of the package, even if a dependency is recorded or the
 deinstall or require script fails.
 .El
-
-.Pp
 .Sh TECHNICAL DETAILS
 .Nm
 does pretty much what it says.  It examines installed package records in 
@@ -156,7 +153,7 @@ where
 is the name of the package in question and
 .Ar DEINSTALL
 is a keyword denoting this as the pre-deinstallation phase.
-
+.Pp
 .Cm Note:
 The
 .Ar DEINSTALL
@@ -176,7 +173,7 @@ all files are removed.  It is this script's responsibility to clean up any
 additional messy details around the package's installation, and leave the
 system (hopefully) in the same state that it was prior to the installation
 of the package.
-
+.Pp
 The
 .Nm post-deinstall
 script is called as:
@@ -190,7 +187,7 @@ where
 is the name of the package in question and
 .Ar POST-DEINSTALL
 is a keyword denoting this as the post-deinstallation phase.
-
+.Pp
 .Cm Note:
 The
 .Ar POST-DEINSTALL
@@ -201,14 +198,14 @@ and
 .Cm Fl K
 flags to 
 .Xr pkg_create 1 ).
-
+.Pp
 Reasoning behind passing keywords such as
 .Ar DEINSTALL
 and
 .Ar POST-DEINSTALL
 is that it lets you potentially write only one program/script that handles
 all aspects of installation and deletion.
-
+.Pp
 But experience has proved that this is a lot more difficult to maintain and
 is not as advantageous as having separate scripts that handle each aspect of
 installation and deinstallation.
@@ -233,6 +230,7 @@ specifies an alternative location for the installed package database.
 .Bl -tag -width /var/db/pkg -compact
 .It Pa /var/db/pkg
 Default location of the installed package database.
+.El
 .Sh SEE ALSO
 .Xr pkg_add 1 ,
 .Xr pkg_create 1 ,
diff --git a/usr.sbin/pkg_install/info/pkg_info.1 b/usr.sbin/pkg_install/info/pkg_info.1
index 1cb4fa9..b14081f 100644
--- a/usr.sbin/pkg_install/info/pkg_info.1
+++ b/usr.sbin/pkg_install/info/pkg_info.1
@@ -129,12 +129,14 @@ for
 .Xr mktemp 3
 to fill in with a unique ID.
 .Bd -filled -offset indent -compact
-Note:  This should really not be necessary with pkg_info,
+Note:  This should really not be necessary with
+.Nm ,
 since very little information is extracted from each package
 and one would have to have a very small 
 .Pa /tmp
 indeed to overflow it.
 .Ed
+.El
 .Sh TECHNICAL DETAILS
 Package info is either extracted from package files named on the
 command line, or from already installed package information
diff --git a/usr.sbin/pkg_install/version/pkg_version.1 b/usr.sbin/pkg_install/version/pkg_version.1
index 8f67290..f2dc15b 100644
--- a/usr.sbin/pkg_install/version/pkg_version.1
+++ b/usr.sbin/pkg_install/version/pkg_version.1
@@ -101,6 +101,7 @@ The installed package exists in the index but for some reason,
 .Nm
 was unable to compare the version number of the installed package
 with the corresponding entry in the index.
+.El
 .Sh OPTIONS
 .Nm 
 supports several command-line arguments:
diff --git a/usr.sbin/ppp/ppp.8 b/usr.sbin/ppp/ppp.8
index bb58003..fcf5e35 100644
--- a/usr.sbin/ppp/ppp.8
+++ b/usr.sbin/ppp/ppp.8
@@ -242,7 +242,7 @@ In direct mode,
 acts as server which accepts incoming
 .Em PPP
 connections on stdin/stdout.
-.It Supports PAP and CHAP (rfc 1994, 2433 and 2759) authentication.
+.It "Supports PAP and CHAP (rfc 1994, 2433 and 2759) authentication.
 With PAP or CHAP, it is possible to skip the Unix style
 .Xr login 1
 procedure, and use the
@@ -1609,7 +1609,7 @@ set filter
 .Ar name
 .Ar rule-no
 .Ar action
-.Op \&!
+.Op !\&
 .Oo
 .Op host
 .Ar src_addr Ns Op / Ns Ar width
@@ -1663,7 +1663,7 @@ the new rule number (rather than the next rule number).
 The
 .Ar action
 may optionally be followed with an exclamation mark
-.Pq Dq ! ,
+.Pq Dq \&! ,
 telling
 .Nm
 to reverse the sense of the following match.
@@ -2635,7 +2635,7 @@ Type
 is actually specified as
 .Dq PPP Magna-link Variable Resource Compression
 in
-.Pa rfc1975 Ns No !
+.Pa rfc1975 Ns !
 .Nm
 is capable of negotiating with
 .Nm pppd ,
@@ -3111,7 +3111,7 @@ is replaced with the interface address and
 is replaced with the interface destination (peer) address.
 .Pp
 If the
-.Ar add!
+.Ar add!\&
 command is used
 .Pq note the trailing Dq \&! ,
 then if the route already exists, it will be updated as with the
@@ -3372,7 +3372,7 @@ command below.
 This is replaced with the date on which
 .Nm
 was compiled.
-.It Li DNS0 No " & " Li DNS1
+.It Li DNS0 & DNS1
 These are replaced with the primary and secondary nameserver IP numbers.
 If nameservers are negotiated by IPCP, the values of these macros will change.
 .It Li ENDDISC
@@ -3467,7 +3467,7 @@ If
 .Dq ccp
 is specified, only the relevant compression layer is closed.
 If the
-.Dq \&!
+.Dq !\&
 is used, the compression layer will remain in the closed state, otherwise
 it will re-enter the STOPPED state, waiting for the peer to initiate
 further CCP negotiation.
@@ -3500,7 +3500,7 @@ is specified as
 the default route is deleted.
 .Pp
 If the
-.Ar delete!
+.Ar delete!\&
 command is used
 .Pq note the trailing Dq \&! ,
 .Nm
@@ -3575,7 +3575,7 @@ Instead of specifying
 can be used
 .Pq with no space between \&it and Ar addr .
 If the given address already exists, the command fails unless the
-.Dq \&!
+.Dq !\&
 is used - in which case the previous interface address entry is overwritten
 with the new one, allowing a change of netmask or peer address.
 .Pp
@@ -3606,15 +3606,15 @@ is not in the OPENED state and is not in
 mode, all interface addresses are deleted.
 .Pp
 .It iface delete Ns Xo
-.Op \&! Ns
-.No |rm Ns Op \&!
+.Op !\& Ns
+.No |rm Ns Op !\&
 .Ar addr
 .Xc
 This command deletes the given
 .Ar addr
 from the interface.
 If the
-.Dq \&!
+.Dq !\&
 is used, no error is given if the address isn't currently assigned to
 the interface (and no deletion takes place).
 .It iface show
@@ -3883,7 +3883,7 @@ This sets the authentication key (or password) used in client mode
 PAP or CHAP negotiation to the given value.
 It also specifies the
 password to be used in the dial or login scripts in place of the
-.Sq \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\P
+.Sq \eP
 sequence, preventing the actual password from being logged.
 If
 .Ar command
@@ -3908,7 +3908,7 @@ and
 values.
 .Pp
 If the
-.Dq \&!
+.Dq !\&
 is doubled up
 .Pq to Dq \&!! ,
 it is treated as a single literal
@@ -4130,7 +4130,7 @@ is specified,
 .Nm
 will expect the peer to specify the number.
 .It set cd Oo
-.No off| Ns Ar seconds Ns Op \&!
+.No off| Ns Ar seconds Ns Op !\&
 .Oc
 Normally,
 .Nm
@@ -4299,9 +4299,9 @@ be of the format
 .Op \&: Ns Ar provider Ns
 .Xc
 or be of the format
-.Ar host Ns No : Ns Ar port Ns Oo
-.No /tcp|udp
-.Oc .
+.Sm off
+.Ar host : port Op /tcp|udp .
+.Sm on
 .Pp
 If it begins with an exclamation mark, the rest of the device name is
 treated as a program name, and that program is executed when the device
@@ -4382,34 +4382,34 @@ It is possible to specify some special
 .Sq values
 in your chat script as follows:
 .Bd -unfilled -offset indent
-.It Li \\\\\\\\\\\\\\\\c
+.It Li \ec
 When used as the last character in a
 .Sq send
 string, this indicates that a newline should not be appended.
-.It Li \\\\\\\\\\\\\\\\d
+.It Li \ed
 When the chat script encounters this sequence, it delays two seconds.
-.It Li \\\\\\\\\\\\\\\\p
+.It Li \ep
 When the chat script encounters this sequence, it delays for one quarter of
 a second.
-.It Li \\\\\\\\\\\\\\\\n
+.It Li \en
 This is replaced with a newline character.
-.It Li \\\\\\\\\\\\\\\\r
+.It Li \er
 This is replaced with a carriage return character.
-.It Li \\\\\\\\\\\\\\\\s
+.It Li \es
 This is replaced with a space character.
-.It Li \\\\\\\\\\\\\\\\t
+.It Li \et
 This is replaced with a tab character.
-.It Li \\\\\\\\\\\\\\\\T
+.It Li \eT
 This is replaced by the current phone number (see
 .Dq set phone
 below).
-.It Li \\\\\\\\\\\\\\\\P
+.It Li \eP
 This is replaced by the current
 .Ar authkey
 value (see
 .Dq set authkey
 above).
-.It Li \\\\\\\\\\\\\\\\U
+.It Li \eU
 This is replaced by the current
 .Ar authname
 value (see
@@ -4432,7 +4432,7 @@ To do this, the first character of the expect or send string is an
 exclamation mark
 .Pq Dq \&! .
 If a literal exclamation mark is required, double it up to
-.Dq \&!!
+.Dq !!\&
 and it will be treated as a single literal
 .Dq \&! .
 When the command is executed, standard input and standard output are
@@ -4488,7 +4488,7 @@ important that the
 signs are escaped, otherwise this parser will see them as constituting
 an expect-send-expect sequence.
 When the
-.Dq \&!
+.Dq !\&
 character is seen, the execution parser reads the first command as three
 arguments, and then
 .Xr sh 1
@@ -4573,7 +4573,7 @@ It allows the user to specify a set of characters that will be
 as they travel across the link.
 .It set filter dial|alive|in|out Ar rule-no Xo
 .No permit|deny|clear| Ns Ar rule-no
-.Op \&!
+.Op !\&
 .Oo Op host
 .Ar src_addr Ns Op / Ns Ar width
 .Op Ar dst_addr Ns Op / Ns Ar width
@@ -5127,7 +5127,7 @@ delay will be effective, even after
 has been exceeded, so an immediate manual dial may appear to have
 done nothing.
 If an immediate dial is required, a
-.Dq \&!
+.Dq !\&
 should immediately follow the
 .Dq open
 keyword.
@@ -5409,11 +5409,11 @@ They are a good source of information.
 .It
 Use
 .Dq help ,
-.Dq nat ? ,
-.Dq enable ? ,
-.Dq set ?
+.Dq nat \&? ,
+.Dq enable \&? ,
+.Dq set ?\&
 and
-.Dq show ?
+.Dq show ?\&
 to get online information about what's available.
 .It
 The following URLs contain useful information:
diff --git a/usr.sbin/ppp/ppp.8.m4 b/usr.sbin/ppp/ppp.8.m4
index bb58003..fcf5e35 100644
--- a/usr.sbin/ppp/ppp.8.m4
+++ b/usr.sbin/ppp/ppp.8.m4
@@ -242,7 +242,7 @@ In direct mode,
 acts as server which accepts incoming
 .Em PPP
 connections on stdin/stdout.
-.It Supports PAP and CHAP (rfc 1994, 2433 and 2759) authentication.
+.It "Supports PAP and CHAP (rfc 1994, 2433 and 2759) authentication.
 With PAP or CHAP, it is possible to skip the Unix style
 .Xr login 1
 procedure, and use the
@@ -1609,7 +1609,7 @@ set filter
 .Ar name
 .Ar rule-no
 .Ar action
-.Op \&!
+.Op !\&
 .Oo
 .Op host
 .Ar src_addr Ns Op / Ns Ar width
@@ -1663,7 +1663,7 @@ the new rule number (rather than the next rule number).
 The
 .Ar action
 may optionally be followed with an exclamation mark
-.Pq Dq ! ,
+.Pq Dq \&! ,
 telling
 .Nm
 to reverse the sense of the following match.
@@ -2635,7 +2635,7 @@ Type
 is actually specified as
 .Dq PPP Magna-link Variable Resource Compression
 in
-.Pa rfc1975 Ns No !
+.Pa rfc1975 Ns !
 .Nm
 is capable of negotiating with
 .Nm pppd ,
@@ -3111,7 +3111,7 @@ is replaced with the interface address and
 is replaced with the interface destination (peer) address.
 .Pp
 If the
-.Ar add!
+.Ar add!\&
 command is used
 .Pq note the trailing Dq \&! ,
 then if the route already exists, it will be updated as with the
@@ -3372,7 +3372,7 @@ command below.
 This is replaced with the date on which
 .Nm
 was compiled.
-.It Li DNS0 No " & " Li DNS1
+.It Li DNS0 & DNS1
 These are replaced with the primary and secondary nameserver IP numbers.
 If nameservers are negotiated by IPCP, the values of these macros will change.
 .It Li ENDDISC
@@ -3467,7 +3467,7 @@ If
 .Dq ccp
 is specified, only the relevant compression layer is closed.
 If the
-.Dq \&!
+.Dq !\&
 is used, the compression layer will remain in the closed state, otherwise
 it will re-enter the STOPPED state, waiting for the peer to initiate
 further CCP negotiation.
@@ -3500,7 +3500,7 @@ is specified as
 the default route is deleted.
 .Pp
 If the
-.Ar delete!
+.Ar delete!\&
 command is used
 .Pq note the trailing Dq \&! ,
 .Nm
@@ -3575,7 +3575,7 @@ Instead of specifying
 can be used
 .Pq with no space between \&it and Ar addr .
 If the given address already exists, the command fails unless the
-.Dq \&!
+.Dq !\&
 is used - in which case the previous interface address entry is overwritten
 with the new one, allowing a change of netmask or peer address.
 .Pp
@@ -3606,15 +3606,15 @@ is not in the OPENED state and is not in
 mode, all interface addresses are deleted.
 .Pp
 .It iface delete Ns Xo
-.Op \&! Ns
-.No |rm Ns Op \&!
+.Op !\& Ns
+.No |rm Ns Op !\&
 .Ar addr
 .Xc
 This command deletes the given
 .Ar addr
 from the interface.
 If the
-.Dq \&!
+.Dq !\&
 is used, no error is given if the address isn't currently assigned to
 the interface (and no deletion takes place).
 .It iface show
@@ -3883,7 +3883,7 @@ This sets the authentication key (or password) used in client mode
 PAP or CHAP negotiation to the given value.
 It also specifies the
 password to be used in the dial or login scripts in place of the
-.Sq \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\P
+.Sq \eP
 sequence, preventing the actual password from being logged.
 If
 .Ar command
@@ -3908,7 +3908,7 @@ and
 values.
 .Pp
 If the
-.Dq \&!
+.Dq !\&
 is doubled up
 .Pq to Dq \&!! ,
 it is treated as a single literal
@@ -4130,7 +4130,7 @@ is specified,
 .Nm
 will expect the peer to specify the number.
 .It set cd Oo
-.No off| Ns Ar seconds Ns Op \&!
+.No off| Ns Ar seconds Ns Op !\&
 .Oc
 Normally,
 .Nm
@@ -4299,9 +4299,9 @@ be of the format
 .Op \&: Ns Ar provider Ns
 .Xc
 or be of the format
-.Ar host Ns No : Ns Ar port Ns Oo
-.No /tcp|udp
-.Oc .
+.Sm off
+.Ar host : port Op /tcp|udp .
+.Sm on
 .Pp
 If it begins with an exclamation mark, the rest of the device name is
 treated as a program name, and that program is executed when the device
@@ -4382,34 +4382,34 @@ It is possible to specify some special
 .Sq values
 in your chat script as follows:
 .Bd -unfilled -offset indent
-.It Li \\\\\\\\\\\\\\\\c
+.It Li \ec
 When used as the last character in a
 .Sq send
 string, this indicates that a newline should not be appended.
-.It Li \\\\\\\\\\\\\\\\d
+.It Li \ed
 When the chat script encounters this sequence, it delays two seconds.
-.It Li \\\\\\\\\\\\\\\\p
+.It Li \ep
 When the chat script encounters this sequence, it delays for one quarter of
 a second.
-.It Li \\\\\\\\\\\\\\\\n
+.It Li \en
 This is replaced with a newline character.
-.It Li \\\\\\\\\\\\\\\\r
+.It Li \er
 This is replaced with a carriage return character.
-.It Li \\\\\\\\\\\\\\\\s
+.It Li \es
 This is replaced with a space character.
-.It Li \\\\\\\\\\\\\\\\t
+.It Li \et
 This is replaced with a tab character.
-.It Li \\\\\\\\\\\\\\\\T
+.It Li \eT
 This is replaced by the current phone number (see
 .Dq set phone
 below).
-.It Li \\\\\\\\\\\\\\\\P
+.It Li \eP
 This is replaced by the current
 .Ar authkey
 value (see
 .Dq set authkey
 above).
-.It Li \\\\\\\\\\\\\\\\U
+.It Li \eU
 This is replaced by the current
 .Ar authname
 value (see
@@ -4432,7 +4432,7 @@ To do this, the first character of the expect or send string is an
 exclamation mark
 .Pq Dq \&! .
 If a literal exclamation mark is required, double it up to
-.Dq \&!!
+.Dq !!\&
 and it will be treated as a single literal
 .Dq \&! .
 When the command is executed, standard input and standard output are
@@ -4488,7 +4488,7 @@ important that the
 signs are escaped, otherwise this parser will see them as constituting
 an expect-send-expect sequence.
 When the
-.Dq \&!
+.Dq !\&
 character is seen, the execution parser reads the first command as three
 arguments, and then
 .Xr sh 1
@@ -4573,7 +4573,7 @@ It allows the user to specify a set of characters that will be
 as they travel across the link.
 .It set filter dial|alive|in|out Ar rule-no Xo
 .No permit|deny|clear| Ns Ar rule-no
-.Op \&!
+.Op !\&
 .Oo Op host
 .Ar src_addr Ns Op / Ns Ar width
 .Op Ar dst_addr Ns Op / Ns Ar width
@@ -5127,7 +5127,7 @@ delay will be effective, even after
 has been exceeded, so an immediate manual dial may appear to have
 done nothing.
 If an immediate dial is required, a
-.Dq \&!
+.Dq !\&
 should immediately follow the
 .Dq open
 keyword.
@@ -5409,11 +5409,11 @@ They are a good source of information.
 .It
 Use
 .Dq help ,
-.Dq nat ? ,
-.Dq enable ? ,
-.Dq set ?
+.Dq nat \&? ,
+.Dq enable \&? ,
+.Dq set ?\&
 and
-.Dq show ?
+.Dq show ?\&
 to get online information about what's available.
 .It
 The following URLs contain useful information:
diff --git a/usr.sbin/pstat/pstat.8 b/usr.sbin/pstat/pstat.8
index ed5e9c4..b6090a3 100644
--- a/usr.sbin/pstat/pstat.8
+++ b/usr.sbin/pstat/pstat.8
@@ -242,11 +242,11 @@ Print the active vnodes.  Each group of vnodes corresponding
 to a particular filesystem is preceded by a two line header.  The
 first line consists of the following:
 .Pp
-.Df I
+.Bd -filled -offset indent
 .No *** MOUNT Em fstype from 
 on
 .Em on fsflags
-.De
+.Ed
 .Pp
 where
 .Em fstype
@@ -261,7 +261,7 @@ the filesystem is mounted on; and
 is a list
 of optional flags applied to the mount (see
 .Xr mount 8 ) .
-.The second line is a header for the individual fields ,
+The second line is a header for the individual fields,
 the first part of which are fixed, and the second part are filesystem
 type specific.  The headers common to all vnodes are:
 .Bl -tag -width indent
@@ -379,8 +379,8 @@ default source of tables
 .Xr iostat 8 ,
 .Xr vmstat 8
 .Rs
-.Rt Tn UNIX Rt Implementation ,
-.Ra K. Thompson
+.%T UNIX Implementation
+.%A K. Thompson
 .Re
 .Sh BUGS
 Does not understand
diff --git a/usr.sbin/rarpd/rarpd.8 b/usr.sbin/rarpd/rarpd.8
index 67e191b..07593b9 100644
--- a/usr.sbin/rarpd/rarpd.8
+++ b/usr.sbin/rarpd/rarpd.8
@@ -43,7 +43,7 @@ and
 databases.
 If a host does not exist in both databases, the translation cannot
 proceed and a reply will not be sent.
-
+.Pp
 By default, a request is honored only if the server
 (i.e., the host that
 .Nm
@@ -62,13 +62,12 @@ exist.
 This requirement can be overridden with the
 .Fl s
 flag (see below).
-
+.Pp
 In normal operation, 
 .Nm
 forks a copy of itself and runs in
 the background.  Anomalies and errors are reported via 
 .Xr syslog 3 .
-
 .Pp
 The following options are available:
 .Bl -tag -width indent
diff --git a/usr.sbin/route6d/route6d.8 b/usr.sbin/route6d/route6d.8
index 89828be..851e867 100644
--- a/usr.sbin/route6d/route6d.8
+++ b/usr.sbin/route6d/route6d.8
@@ -27,19 +27,19 @@
 .Op Fl R Ar routelog
 .Ek
 .Bk -words
-.Op Fl A Ar prefix/preflen,if1[,if2...]
+.Op Fl A Ar prefix/preflen,if1[,if2...\&]
 .Ek
 .Bk -words
-.Op Fl L Ar prefix/preflen,if1[,if2...]
+.Op Fl L Ar prefix/preflen,if1[,if2...\&]
 .Ek
 .Bk -words
-.Op Fl N Ar if1[,if2...]
+.Op Fl N Ar if1[,if2...\&]
 .Ek
 .Bk -words
-.Op Fl O Ar prefix/preflen,if1[,if2...]
+.Op Fl O Ar prefix/preflen,if1[,if2...\&]
 .Ek
 .Bk -words
-.Op Fl T Ar if1[,if2...]
+.Op Fl T Ar if1[,if2...\&]
 .Ek
 .Bk -words
 .Op Fl t Ar tag
diff --git a/usr.sbin/rpc.statd/rpc.statd.8 b/usr.sbin/rpc.statd/rpc.statd.8
index 0b7cfdb..c715410 100644
--- a/usr.sbin/rpc.statd/rpc.statd.8
+++ b/usr.sbin/rpc.statd/rpc.statd.8
@@ -91,12 +91,12 @@ disappeared permanently (eg. catastrophic hardware failure), as opposed
 to transient failure of the host or an intermediate router.  At present,
 it will re-try notification attempts at frequent intervals for 10 minutes,
 then hourly, and finally gives up after 24 hours.
-
+.Pp
 The protocol requires that symmetric monitor requests are made to both
 the local and remote daemon in order to establish a monitored relationship.
 This is convenient for the NFS locking protocol, but probably reduces the
 usefulness of the monitoring system for other applications.
-
+.Pp
 The current implementation uses more than 1Kbyte per monitored host in
 the status file (and also in VM).  This may be inefficient for NFS servers
 with large numbers of clients.
diff --git a/usr.sbin/rrenumd/rrenumd.8 b/usr.sbin/rrenumd/rrenumd.8
index 7d118f9..42ea29d 100644
--- a/usr.sbin/rrenumd/rrenumd.8
+++ b/usr.sbin/rrenumd/rrenumd.8
@@ -74,9 +74,9 @@ Script mode.
 Configuration information is obtained from standard input.
 .It Fl c Ar conf_file
 Specify a configuration file where configuration information is kept.
+.El
 .Sh RETURN VALUES
 The program exits with 0 on success, and non-zero on failures.
-.El
 .Sh SEE ALSO
 .Xr daemon 3 ,
 .Xr rrenumd.conf 5
diff --git a/usr.sbin/rrenumd/rrenumd.conf.5 b/usr.sbin/rrenumd/rrenumd.conf.5
index 9fc9bf1..b118665 100644
--- a/usr.sbin/rrenumd/rrenumd.conf.5
+++ b/usr.sbin/rrenumd/rrenumd.conf.5
@@ -94,9 +94,8 @@ can be any combination of single or multiple numerical IPv6 addrs,
 or Full Qualified Domain Names.
 .Ar retrycmd
 has following syntax.
-
 .\"
-.Bl -tag -width Ds -compact
+.Bl -tag -width Ds
 .It Ic retry Ar retry-num
 .Ar retry-num
 specifies how many router renumbering messages are sent repeatedly.
@@ -249,8 +248,8 @@ dest ff05::2;
 
 add match-prefix fec0:0:0:: /48 use-prefix fec0:1:1:: /48 keeplen 16;
 .Ed
+.Pp
 .\"
-
 If your routers don't support IPv6 multicast forwarding,
 you'll need to specify each destination at
 .Cm dest
@@ -261,8 +260,8 @@ dest fec0:0:0:1:260:8ff:fe24:fb3a fec0:0:0:2:200:eff:fe2e:dfe1 fec0:0:0:3:5254:f
 
 add match-prefix fec0:0:0:: /48 use-prefix fec0:1:1:: /48 keeplen 16;
 .Ed
+.Pp
 .\"
-
 If you are going to do renumbering, then following procedure will be natural.
 .Bl -enum -offset indent
 .It
@@ -280,8 +279,8 @@ To make sure that they are deleted, send new router
 renumbering message, which specifies old prefixes as match
 prefix, and no use prefix.
 .El
+.Pp
 .\"
-
 The following configuration file will do 1 and 2.
 .\"
 .Bd -literal -offset indent
@@ -295,8 +294,8 @@ seqnum 1 {
 	change match-prefix fec0:1:1:: /48 use-prefix fec0:1:1:: /48 keeplen 16 vltime d7 pltime 0 rrf_decrvalid on rrf_decrprefd on;
 	};
 .Ed
+.Pp
 .\"
-
 And the following configuration file will do 3. (should be
 used for the router renumbering message to be sent 1 week
 afterward)
@@ -306,8 +305,8 @@ dest ff05::2;
 
 change match-prefix fec0:1:1:: /48;
 .Ed
+.Pp
 .\"
-
 In the above example, only
 .Cm add
 and
@@ -319,7 +318,6 @@ command.
 command is almost same with
 .Cm change
 command except that it deletes all pre-defined IPv6 global address.
-
 .Sh SEE ALSO
 .Xr rrenumd 8
 .Xr prefix 8
diff --git a/usr.sbin/spkrtest/spkrtest.8 b/usr.sbin/spkrtest/spkrtest.8
index 7febb85..774847c 100644
--- a/usr.sbin/spkrtest/spkrtest.8
+++ b/usr.sbin/spkrtest/spkrtest.8
@@ -23,30 +23,24 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
-
 .Dd July 23, 1995
 .Dt SPKRTEST 8
 .Os FreeBSD
-
 .Sh NAME
 .Nm spkrtest
 .Nd test script for the speaker driver
-
 .Sh DESCRIPTION
 .Nm Spkrtest
 is an easy to use test script for the speaker driver.
-
 .Sh FILES
 .Bl -tag -width /dev/speakerxx
 .It Pa /dev/speaker
 speaker device file
 .El
-
 .Sh SEE ALSO
 .Xr dialog 1 ,
 .Xr perl 1 ,
 .Xr spkr 4
-
 .Sh HISTORY
 The
 .Nm
diff --git a/usr.sbin/stallion/stlload/stlload.8 b/usr.sbin/stallion/stlload/stlload.8
index f855f52..3d7a44f 100644
--- a/usr.sbin/stallion/stlload/stlload.8
+++ b/usr.sbin/stallion/stlload/stlload.8
@@ -117,6 +117,7 @@ firmware code to EasyConnection 8/64 class boards
 firmware code to ONboard and Brumby class boards
 .It Pa /dev/staliomem?
 driver board control device
+.El
 .Sh SEE ALSO
 .Xr stl 4 ,
 .Xr stli 4 ,
diff --git a/usr.sbin/stallion/stlstats/stlstats.8 b/usr.sbin/stallion/stlstats/stlstats.8
index 56b24c7..9e77c26 100644
--- a/usr.sbin/stallion/stlstats/stlstats.8
+++ b/usr.sbin/stallion/stlstats/stlstats.8
@@ -128,6 +128,7 @@ immediately on start up.
 .Bl -tag -width /dev/staliomem0
 .It Pa /dev/staliomem0
 driver control device used for statistics collection
+.El
 .Sh SEE ALSO
 .Xr stl 4 ,
 .Xr stli 4 ,
diff --git a/usr.sbin/syslogd/syslogd.8 b/usr.sbin/syslogd/syslogd.8
index 91895d1..6e4611d 100644
--- a/usr.sbin/syslogd/syslogd.8
+++ b/usr.sbin/syslogd/syslogd.8
@@ -95,7 +95,7 @@ and
 If specified,
 .Ar service
 is the name or number of an UDP service (see
-.Xr services 5 ) Ns
+.Xr services 5 )
 the source packet must belong to.  A
 .Ar service
 of
diff --git a/usr.sbin/timed/timedc/timedc.8 b/usr.sbin/timed/timedc/timedc.8
index 42482d3..6e93279 100644
--- a/usr.sbin/timed/timedc/timedc.8
+++ b/usr.sbin/timed/timedc/timedc.8
@@ -40,9 +40,7 @@
 .Nd timed control program
 .Sh SYNOPSIS
 .Nm
-.Oo Ar command\ \&
-.Op Ar argument ...
-.Oc
+.Op Ar command Op Ar argument ...
 .Sh DESCRIPTION
 .Nm Timedc
 is used to control the operation of the
diff --git a/usr.sbin/usbd/usbd.8 b/usr.sbin/usbd/usbd.8
index d3cefab..9698b5e 100644
--- a/usr.sbin/usbd/usbd.8
+++ b/usr.sbin/usbd/usbd.8
@@ -121,10 +121,11 @@ more verbose.
 .Sh FILES
 .Bl -tag -width /etc/usbd.conf -compact
 .It Pa /etc/usbd.conf
-.It /dev/usb
-.It /dev/usb0
-.It /dev/usb1
-.It etc.
+.It Pa /dev/usb
+.It Pa /dev/usb0
+.It Pa /dev/usb1
+.It etc .
+.El
 .Sh SEE ALSO
 .Xr usb 4 ,
 .Xr usbd.conf 5
diff --git a/usr.sbin/usbd/usbd.conf.5 b/usr.sbin/usbd/usbd.conf.5
index 5132835..d3aa0b0 100644
--- a/usr.sbin/usbd/usbd.conf.5
+++ b/usr.sbin/usbd/usbd.conf.5
@@ -126,6 +126,7 @@ Commands to be executed when the action is matched:
 Shell command to execute when a device is attached.
 .It detach Ar string
 Shell command to execute when a device is detached.
+.El
 .Sh EXAMPLES
 A sample entry to rescan the SCSI bus on connection of a
 .Tn "Iomega USB Zip Drive" :
@@ -142,7 +143,7 @@ To start up moused for a newly attached mouse:
    device "Mouse"
       devname "ums[0-9]+"
       attach "/usr/sbin/moused -p /dev/${DEVNAME} -I /var/run/moused.${DEVNAME}.pid"
-.El
+.Ed
 .Sh FILES
 .Bl -tag -width /etc/pccard.conf -compact
 .It Pa /etc/usbd.conf
diff --git a/usr.sbin/vnconfig/vnconfig.8 b/usr.sbin/vnconfig/vnconfig.8
index f5f0f68..89b1b2f 100644
--- a/usr.sbin/vnconfig/vnconfig.8
+++ b/usr.sbin/vnconfig/vnconfig.8
@@ -46,8 +46,10 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl cdeguv
-.Op Fl s Ar option[,option...]
-.Op Fl r Ar option[,option...]
+.Oo Fl s Ar option Ns
+.Op , Ns Ar option Ns Ar ...\& Oc
+.Oo Fl r Ar option Ns
+.Op , Ns Ar option Ns Ar ...\& Oc
 .Op Fl S Ar value
 .Ar special_file Ar [regular_file]
 .Op Ar feature
diff --git a/usr.sbin/wlconfig/wlconfig.8 b/usr.sbin/wlconfig/wlconfig.8
index 625554d..02d7b41 100644
--- a/usr.sbin/wlconfig/wlconfig.8
+++ b/usr.sbin/wlconfig/wlconfig.8
@@ -36,7 +36,7 @@ arguments can be used to change the value of several parameters.
 Any number of 
 .Ar param value
 pairs may be supplied.
-.Bl -tag -width 15n -compat -offset indent
+.Bl -tag -width 15n -offset indent
 .It Va param
 .Va value
 .It irq
diff --git a/usr.sbin/yp_mkdb/yp_mkdb.8 b/usr.sbin/yp_mkdb/yp_mkdb.8
index 47c521c..7876269 100644
--- a/usr.sbin/yp_mkdb/yp_mkdb.8
+++ b/usr.sbin/yp_mkdb/yp_mkdb.8
@@ -190,12 +190,14 @@ By default,
 assumes that the local host is the NIS master; the
 .Fl m
 option is used to override this default.
+.El
 .Sh FILES
 .Bl -tag -width /var/yp/Makefile -compact
 .It Pa /var/yp/Makefile
 the Makefile that calls
 .Nm
 to build the NIS databases
+.El
 .Sh SEE ALSO
 .Xr db 3 ,
 .Xr ypserv 8
diff --git a/usr.sbin/ypserv/ypinit.8 b/usr.sbin/ypserv/ypinit.8
index 2260f49..0440942 100644
--- a/usr.sbin/ypserv/ypinit.8
+++ b/usr.sbin/ypserv/ypinit.8
@@ -132,6 +132,7 @@ server is added to a domain, its hostname must be added to the
 ypservers map so that
 .Xr yppush 8
 can propagate updates on the master to all of the slaves.
+.El
 .Sh FILES
 .Bl -tag -width /var/yp/master.passwd -compact
 .It Pa /etc/bootparams
diff --git a/usr.sbin/zic/zic.8 b/usr.sbin/zic/zic.8
index b908d7e..4bc115e 100644
--- a/usr.sbin/zic/zic.8
+++ b/usr.sbin/zic/zic.8
@@ -56,7 +56,7 @@ as local time.
 .Nm Zic
 will act as if the input contained a link line of the form
 .Bd -literal -offset indent
-Link	timezone		localtime
+.No "Link	timezone		localtime
 .Ed
 (Note that this action has no effect on
 .Fx ,
@@ -78,7 +78,7 @@ time zone environment variables.
 .Nm Zic
 will act as if the input contained a link line of the form
 .Bd -literal -offset indent
-Link	timezone		posixrules
+.No "Link	timezone		posixrules
 .Ed
 .It Fl u Ar user
 After creating each output file, change its owner to
@@ -113,9 +113,9 @@ Non-blank lines are expected to be of one of three types:
 rule lines, zone lines, and link lines.
 .Pp
 A rule line has the form:
-.Dl Rule	NAME	FROM	TO	TYPE	IN	ON		AT	SAVE	LETTER/S
+.Dl "Rule	NAME	FROM	TO	TYPE	IN	ON		AT	SAVE	LETTER/S
 For example:
-.Dl Rule	US	1967	1973	\-	Apr	lastSun	2:00	1:00	D
+.Dl "Rule	US	1967	1973	\-	Apr	lastSun	2:00	1:00	D
 .Pp
 The fields that make up a rule line are:
 .Bl -tag -width "LETTER/S" -offset indent
@@ -194,7 +194,7 @@ field.
 Give the time of day at which the rule takes effect.
 Recognized forms include:
 .Pp
-.Bl -tag -width "1:28:14" -offset indent -compact
+.Bl -tag -width "\&1:28:14" -offset indent -compact
 .It 2
 time in hours
 .It 2:00
@@ -253,9 +253,9 @@ the variable part is null.
 .El
 .Pp
 A zone line has the form:
-.Dl Zone	NAME	GMTOFF	RULES/SAVE	FORMAT	[UNTIL]
+.Dl "Zone	NAME	GMTOFF	RULES/SAVE	FORMAT	[UNTIL]
 For example:
-.Dl Zone	Australia/Adelaide	9:30	Aus	CST	1971 Oct 31 2:00
+.Dl "Zone	Australia/Adelaide	9:30	Aus	CST	1971 Oct 31 2:00
 The fields that make up a zone line are:
 .Bl -tag -width indent
 .It NAME
@@ -312,9 +312,9 @@ continuation.
 .El
 .Pp
 A link line has the form
-.Dl Link	LINK-FROM	LINK-TO
+.Dl "Link	LINK-FROM	LINK-TO
 For example:
-.Dl Link	Europe/Istanbul	Asia/Istanbul
+.Dl "Link	Europe/Istanbul	Asia/Istanbul
 The
 .Em LINK-FROM
 field should appear as the
@@ -328,9 +328,9 @@ Except for continuation lines,
 lines may appear in any order in the input.
 .Pp
 Lines in the file that describes leap seconds have the following form:
-.Dl Leap	YEAR	MONTH	DAY	HH:MM:SS	CORR	R/S
+.Dl "Leap	YEAR	MONTH	DAY	HH:MM:SS	CORR	R/S
 For example:
-.Dl Leap	1974	Dec	31	23:59:60	+	S
+.Dl "Leap	1974	Dec	31	23:59:60	+	S
 The
 .Em YEAR ,
 .Em MONTH ,