mdoc(7) police: split punctuation characters + misc fixes.

257 files changed, 1901 insertions, 1388 deletions

diff --git a/bin/df/df.1 b/bin/df/df.1
index 7cf8f84..4bbe1b3 100644
--- a/bin/df/df.1
+++ b/bin/df/df.1
@@ -46,7 +46,7 @@
 .Oc
 .Op Fl ain
 .Op Fl t Ar type
-.Op Ar file | Ar filesystem ...
+.Op Ar file | filesystem ...
 .Sh DESCRIPTION
 .Nm Df
 displays statistics about the amount of free disk space on the specified
diff --git a/bin/echo/echo.1 b/bin/echo/echo.1
index a5a1674..d427529 100644
--- a/bin/echo/echo.1
+++ b/bin/echo/echo.1
@@ -44,19 +44,24 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl n
-.Op "string ..."
+.Op Ar string ...
 .Sh DESCRIPTION
 The
 .Nm
-utility writes any specified operands, separated by single blank (`` '')
-characters and followed by a newline (``\en'') character, to the standard
+utility writes any specified operands, separated by single blank
+.Pq Ql "\ "
+characters and followed by a newline
+.Pq Ql \en
+character, to the standard
 output.
 .Pp
 The following option is available:
 .Bl -tag -width flag
 .It Fl n
 Do not print the trailing newline character.  This may also be
-achieved by appending `\ec' to the end of the string, as is done
+achieved by appending
+.Ql \ec
+to the end of the string, as is done
 by iBCS2 compatible systems.
 .El
 .Pp
diff --git a/bin/ed/ed.1 b/bin/ed/ed.1
index c2dca36..8017236 100644
--- a/bin/ed/ed.1
+++ b/bin/ed/ed.1
@@ -104,8 +104,9 @@ character command and possibly additional parameters; i.e.,
 commands have the structure:
 .Pp
 .Sm off
-.Xo Op "address\ "  Op ,address
-.No command Op parameters
+.Xo
+.Op Ar address Op , Ar address
+.Ar command Op Ar parameters
 .Xc
 .Sm on
 .Pp
@@ -185,7 +186,7 @@ of addresses is given where
 .Em "n\ >\ 2" ,
 then the corresponding range is determined by the last two addresses in
 the
-.Em n Ns -tuple.
+.Em n Ns -tuple .
 If only one address is expected, then the last address is used.
 .Pp
 Each address in a comma-delimited range is interpreted relative to the
diff --git a/bin/ls/ls.1 b/bin/ls/ls.1
index 8f4a5d5..8a99c40 100644
--- a/bin/ls/ls.1
+++ b/bin/ls/ls.1
@@ -217,7 +217,7 @@ options all override each other; the last one specified determines
 the format used for non-printable characters.
 .Pp
 The
-.Fl H,
+.Fl H ,
 .Fl L
 and
 .Fl P
@@ -431,7 +431,7 @@ for more information.
 .It Ev LSCOLORS
 The value of this variable describes what color to use for which
 attribute when colors are enabled with
-.Ev CLICOLOR.
+.Ev CLICOLOR .
 This string is a concatenation of pairs of the format
 .Sy fb ,
 where
diff --git a/bin/pax/pax.1 b/bin/pax/pax.1
index 3ed19ce..10b7bb7 100644
--- a/bin/pax/pax.1
+++ b/bin/pax/pax.1
@@ -198,7 +198,7 @@ options specifies which of the following functional modes
 will operate under:
 .Em list , read , write ,
 and
-.Em copy.
+.Em copy .
 .Bl -tag -width 6n
 .It <none>
 .Em List .
@@ -208,7 +208,7 @@ will write to
 a table of contents of the members of the archive file read from
 .Dv standard input ,
 whose pathnames match the specified
-.Ar patterns.
+.Ar patterns .
 The table of contents contains one filename per line
 and is written using single line buffering.
 .It Fl r
@@ -217,7 +217,7 @@ and is written using single line buffering.
 extracts the members of the archive file read from the
 .Dv standard input ,
 with pathnames matching the specified 
-.Ar patterns.
+.Ar patterns .
 The archive format and blocking is automatically determined on input.
 When an extracted file is a directory, the entire file hierarchy
 rooted at that directory is extracted.
@@ -811,7 +811,7 @@ The default
 .Ar limit
 is a small positive number of retries.
 .Pp
-.Em Warning: 
+.Em Warning :
 Using this option with
 .Li NONE
 should be used with extreme caution as
@@ -1045,7 +1045,7 @@ option, a file is not considered selected unless it is newer
 than the file to which it is compared.
 .Sh EXAMPLES
 The command:
-.Dl pax -w -f /dev/rst0 .\ 
+.Dl "pax -w -f /dev/rst0 ."
 copies the contents of the current directory to the device
 .Pa /dev/rst0 .
 .Pp
diff --git a/bin/ps/ps.1 b/bin/ps/ps.1
index dc1f251..cc800b9 100644
--- a/bin/ps/ps.1
+++ b/bin/ps/ps.1
@@ -148,7 +148,7 @@ Display information about processes attached to the specified terminal
 device.
 .It Fl U
 Display the processes belonging to the specified
-.Tn username Ns No (s).
+.Ar username Ns (s) .
 .It Fl u
 Display information associated with the following keywords:
 user, pid, %cpu, %mem, vsz, rss, tt, state, start, time and command.
diff --git a/bin/sh/sh.1 b/bin/sh/sh.1
index cc4b436..28e71db 100644
--- a/bin/sh/sh.1
+++ b/bin/sh/sh.1
@@ -1276,9 +1276,9 @@ these, a builtin version of the
 .Xr printf 1
 command is provided for efficiency.
 .Bl -tag -width Ds
-.It Ic :
+.It Ic \&:
 A null command that returns a 0 (true) exit value.
-.It Ic . Ar file
+.It Ic \&. Ar file
 The commands in the specified file are read and executed by the shell.
 If
 .Ar file
@@ -1290,9 +1290,11 @@ for the file.  If it is not found in the
 .Ev PATH ,
 it is sought in the current working directory.
 .It Ic alias Op Ar name ...
-.It Ic alias Op Ar name=string ...
+.It Ic alias Xo
+.Op Ar name Ns = Ns Ar string ...
+.Xc
 If
-.Ar name=string
+.Ar name Ns = Ns Ar string
 is specified, the shell defines the alias
 .Ar name
 with value
@@ -1515,7 +1517,8 @@ Re-execute the command without invoking an editor.
 Select the commands to list or edit.
 The number of previous commands that can be accessed
 are determined by the value of the
-.Ev HISTSIZE variable.
+.Ev HISTSIZE
+variable.
 The value of
 .Ar first
 or
diff --git a/bin/stty/stty.1 b/bin/stty/stty.1
index 6ff4b0d..97eb436 100644
--- a/bin/stty/stty.1
+++ b/bin/stty/stty.1
@@ -448,7 +448,7 @@ The terminal size is recorded as having
 columns.
 .It Cm cols Ar number
 is an alias for
-.Cm columns.
+.Cm columns .
 .It Cm rows Ar number
 The terminal size is recorded as having
 .Ar number
diff --git a/gnu/lib/libdialog/dialog.3 b/gnu/lib/libdialog/dialog.3
index 876c673..a4473fb 100644
--- a/gnu/lib/libdialog/dialog.3
+++ b/gnu/lib/libdialog/dialog.3
@@ -78,7 +78,18 @@
 .Ft "int"
 .Fn dialog_textbox "unsigned char *title" "unsigned char *prompt" "int height" "int width"
 .Ft "int"
-.Fn dialog_menu "unsigned char *title" "unsigned char *prompt" "int height" "int width" "int menu_height" "int item_no" "void *itptr" "unsigned char *result, int *ch, int *sc"
+.Fo dialog_menu
+.Fa "unsigned char *title"
+.Fa "unsigned char *prompt"
+.Fa "int height"
+.Fa "int width"
+.Fa "int menu_height"
+.Fa "int item_no"
+.Fa "void *itptr"
+.Fa "unsigned char *result"
+.Fa "int *ch"
+.Fa "int *sc"
+.Fc
 .Ft "int"
 .Fn dialog_checklist "unsigned char *title" "unsigned char *prompt" "int height" "int width" "int m_height" "int item_no" "void *itptr" "unsigned char *result"
 .Ft "int"
@@ -341,7 +352,7 @@ integer representing the number of
 structures pointed to by
 .Va itptr
 (which should be of type
-.Va dialogMenuItem "*" ),
+.Vt dialogMenuItem "*" ) ,
 one structure per item.  In the new interface, the
 .Va result
 variable is used as a simple boolean (not a pointer) and should be NULL if
diff --git a/gnu/usr.bin/ld/ld.1 b/gnu/usr.bin/ld/ld.1
index 10eda4d..f6add79 100644
--- a/gnu/usr.bin/ld/ld.1
+++ b/gnu/usr.bin/ld/ld.1
@@ -90,15 +90,14 @@ Specifies that linking against dynamic libraries can take place. If a library
 specifier of the form -lx appears on the command line,
 .Nm
 searches for a library of the from libx.so.n.m
-.Po see the \&
+(see the
 .Fl l
-option
-.Pc
+option)
 according to the search rules in effect. If such a file can not be
 found a traditional archive is looked for.
 This options can appear anywhere on the command line and is complementary
 to
-.Fl B Ns Ar static.
+.Fl B Ns Ar static .
 .It Fl B Ns Ar forcedynamic
 This is similar to
 .Fl B Ns Ar dynamic
@@ -143,7 +142,7 @@ Force allocation of commons even producing relocatable output.
 Force alias definitions of procedure calls in non-PIC code. Useful to
 obtain shareable code in the presence of run-time relocations as such
 calls will be re-directed through the Procedure Linkage Table (see
-.Xr link 5)
+.Xr link 5 )
 .It Fl e Ar entry-symbol
 Specifies the entry symbol for an executable.
 .It Fl f
@@ -161,12 +160,12 @@ output. If the
 .Fl B Ns Ar dynamic
 option is in effect, a shared library of the
 form lib<spec>.so.m.n
-.Po where \&
+(where
 .Em m
 is the major, and
 .Em n
-is the minor version number, respectively
-.Pc is searched for first. The
+is the minor version number, respectively)
+is searched for first. The
 library with the highest version found in the search path is selected.
 If no shared library is found or the
 .Fl B Ns Ar static
@@ -187,22 +186,20 @@ Produce a
 output file.
 .It Fl nostdlib
 Do not search the built-in path
-.Po
-usually
-.Dq /usr/lib
-.Pc
+(usually
+.Dq /usr/lib )
 for
 .Fl l
 specified libraries.
 .It Fl O Ar filename
 Specifies the name of the output file.
 The file is created as
-.Ar filename .tmp
+.Ar filename Ns Pa .tmp
 and when output is complete renamed to
 .Ar filename .
 .It Fl o Ar filename
 Specifies the name of the output file. Defaults to
-.Dq a.out.
+.Dq Pa a.out .
 .It Fl Q
 Produce a
 .Dv QMAGIC
diff --git a/gnu/usr.bin/ld/ld.1aout b/gnu/usr.bin/ld/ld.1aout
index 7fbbd5d..ddd4899 100644
--- a/gnu/usr.bin/ld/ld.1aout
+++ b/gnu/usr.bin/ld/ld.1aout
@@ -63,7 +63,7 @@ combines the object and archive files given on the command line into a new
 object file. The output object file is either an executable program, a
 shared object suitable for loading at run-time, or an object file that can
 once again be processed by
-.Nm ld.
+.Nm .
 Object files and archives are processed in the order given on the command line.
 .Pp
 The options are as follows:
@@ -74,12 +74,12 @@ The the symbol-file is taken as a base for link-editing the object files
 on the command line.
 .It Fl assert Ar keyword
 This option is here mainly for compatibility with SunOS
-.Nm ld .
+.Nm .
 Most conditions which would cause a Sun assertion to fail will
 currently always cause error or warning messages from
-.Nm ld .
+.Nm .
 The only keyword implemented by
-.Nm ld
+.Nm
 is
 .Nm pure-text ,
 which generates a warning if a position independent object is being
@@ -88,22 +88,21 @@ independent.
 .It Fl B Ns Ar dynamic
 Specifies that linking against dynamic libraries can take place. If a library
 specifier of the form -lx appears on the command line,
-.Nm ld
+.Nm
 searches for a library of the from libx.so.n.m
-.Po see the \&
+(see the
 .Fl l
-option
-.Pc
+option)
 according to the search rules in effect. If such a file can not be
 found a traditional archive is looked for.
 This options can appear anywhere on the command line and is complementary
 to
-.Fl B Ns Ar static.
+.Fl B Ns Ar static .
 .It Fl B Ns Ar forcedynamic
 This is similar to
 .Fl B Ns Ar dynamic
 except that if no dynamic libraries are linked against,
-.Nm ld
+.Nm
 will still produce a dynamic executable.  This is useful for programs
 which are static but still need to load dynamic objects at runtime.
 .It Fl B Ns Ar static
@@ -143,7 +142,7 @@ Force allocation of commons even producing relocatable output.
 Force alias definitions of procedure calls in non-PIC code. Useful to
 obtain shareable code in the presence of run-time relocations as such
 calls will be re-directed through the Procedure Linkage Table (see
-.Xr link 5)
+.Xr link 5 )
 .It Fl e Ar entry-symbol
 Specifies the entry symbol for an executable.
 .It Fl f
@@ -161,12 +160,12 @@ output. If the
 .Fl B Ns Ar dynamic
 option is in effect, a shared library of the
 form lib<spec>.so.m.n
-.Po where \&
+(where
 .Em m
 is the major, and
 .Em n
-is the minor version number, respectively
-.Pc is searched for first. The
+is the minor version number, respectively)
+is searched for first. The
 library with the highest version found in the search path is selected.
 If no shared library is found or the
 .Fl B Ns Ar static
@@ -187,29 +186,27 @@ Produce a
 output file.
 .It Fl nostdlib
 Do not search the built-in path
-.Po
-usually
-.Dq /usr/lib
-.Pc
+(usually
+.Dq /usr/lib )
 for
 .Fl l
 specified libraries.
 .It Fl O Ar filename
 Specifies the name of the output file.
 The file is created as
-.Ar filename .tmp
+.Ar filename Ns Pa .tmp
 and when output is complete renamed to
 .Ar filename .
 .It Fl o Ar filename
 Specifies the name of the output file. Defaults to
-.Dq a.out.
+.Dq Pa a.out .
 .It Fl Q
 Produce a
 .Dv QMAGIC
 (FreeBSD/BSDi-i386) output file.  This is the default.
 .It Fl r
 Produce relocatable object file, suitable for another pass through
-.Nm ld.
+.Nm .
 .It Fl R
 Record the given path within the executable for run-time library search.
 This only applies to dynamically linked executables.
@@ -273,7 +270,7 @@ options and preceding the built-in path.
 .Sh CAVEATS
 An entry point must now explicitly be given if the output is intended to be
 a normal executable program. This was not the case for the previous version of
-.Nm ld .
+.Nm .
 .Sh BUGS
 Shared objects are not properly checked for undefined symbols.
 .Pp
@@ -282,7 +279,7 @@ Cascading of shared object defeats the
 option.
 .Pp
 All shared objects presented to
-.Nm ld
+.Nm
 are marked for run-time loading in the output file, even if no symbols
 are needed from them.
 .Sh HISTORY
diff --git a/gnu/usr.bin/man/catman/catman.1 b/gnu/usr.bin/man/catman/catman.1
index 8bf80e6..88d7733 100644
--- a/gnu/usr.bin/man/catman/catman.1
+++ b/gnu/usr.bin/man/catman/catman.1
@@ -39,7 +39,7 @@
 .Op Fl p | Fl print
 .Op Fl r | Fl remove
 .Op Fl v | Fl verbose
-.Op Ar directories...
+.Op Ar directories ...
 .Sh DESCRIPTION 
 .Nm Catman
 format man pages to ASCII.  It's like typing
diff --git a/gnu/usr.bin/man/makewhatis/makewhatis.1 b/gnu/usr.bin/man/makewhatis/makewhatis.1
index 2e3011a..1032b34 100644
--- a/gnu/usr.bin/man/makewhatis/makewhatis.1
+++ b/gnu/usr.bin/man/makewhatis/makewhatis.1
@@ -80,7 +80,7 @@ Write all output to
 .Ar file
 instead of
 .Pa dirname/whatis Ns .
-.It Fl v, Fl verbose
+.It Fl v , Fl verbose
 Issue more warnings
 .Pq to stderr .
 For every parsed man page write a single char:
diff --git a/gnu/usr.bin/tar/tar.1 b/gnu/usr.bin/tar/tar.1
index 03df4eb..ca62490 100644
--- a/gnu/usr.bin/tar/tar.1
+++ b/gnu/usr.bin/tar/tar.1
@@ -14,7 +14,7 @@
 .Nd "tape archiver; manipulate ""tar"" archive files"
 .Sh SYNOPSIS
 .Nm
-.Op [-] Ns Ar bundled-options Ar Args
+.Op Oo Fl Oc Ns Ar bundled-options Ar Args
 .Op Ar gnu-style-flags
 .Op Ar filenames | Fl C Ar directory-name
 .Ar ...
@@ -312,7 +312,7 @@ Unlink files before creating them.
 Lists files written to archive with
 .Fl -create
 or extracted with
-.Fl -extract;
+.Fl -extract ;
 lists file protection information along with file names with
 .Fl -list .
 .It Fl V Ar volume-name
diff --git a/lib/libc/gen/dlopen.3 b/lib/libc/gen/dlopen.3
index 634f160..f9c1084 100644
--- a/lib/libc/gen/dlopen.3
+++ b/lib/libc/gen/dlopen.3
@@ -36,7 +36,7 @@
 .Os FreeBSD
 .Dt DLOPEN 3
 .Sh NAME
-.Nm dlopen, dlsym, dlerror, dlclose
+.Nm dlopen , dlsym , dlerror , dlclose
 .Nd programmatic interface to the dynamic linker
 .Sh LIBRARY
 .Lb libc
diff --git a/lib/libc/gen/fts.3 b/lib/libc/gen/fts.3
index ccab5b6..b453ef0 100644
--- a/lib/libc/gen/fts.3
+++ b/lib/libc/gen/fts.3
@@ -341,7 +341,7 @@ are attempted.
 The
 .Fa fts_name
 field is always
-.Dv NUL Ns -terminated.
+.Dv NUL Ns -terminated .
 .Sh FTS_OPEN
 The
 .Fn fts_open
diff --git a/lib/libc/gen/getcap.3 b/lib/libc/gen/getcap.3
index 974cf7f..2d86caf 100644
--- a/lib/libc/gen/getcap.3
+++ b/lib/libc/gen/getcap.3
@@ -84,13 +84,13 @@ from the database specified by the
 terminated file array
 .Fa db_array
 and returns a pointer to a
-.Xr malloc Ns \&'d
+.Xr malloc 3 Ns \&'d
 copy of it in
 .Fa buf .
 The
 .Fn cgetent
 function will first look for files ending in
-.Nm .db
+.Pa .db
 (see
 .Xr cap_mkdb 1 )
 before accessing the ASCII file.
@@ -103,7 +103,7 @@ must be retained through all subsequent calls to
 and
 .Fn cgetustr ,
 but may then be
-.Xr free 3 Ns \&'d.
+.Xr free 3 Ns \&'d .
 On success 0 is returned, 1 if the returned
 record contains an unresolved
 .Nm tc
@@ -200,7 +200,7 @@ from the capability record pointed to by
 A pointer to a decoded,
 .Dv NUL
 terminated,
-.Xr malloc Ns \&'d
+.Xr malloc 3 Ns \&'d
 copy of the string is returned in the
 .Ft char *
 pointed to by
@@ -241,7 +241,7 @@ or
 call.  If there is no such previous call, the first record in the database is
 returned.
 Each record is returned in a
-.Xr malloc Ns \&'d
+.Xr malloc 3 Ns \&'d
 copy pointed to by
 .Fa buf .
 .Ic Tc
@@ -416,21 +416,27 @@ and
 .Bl -column "nameXnumber"
 .Sm off
 .It Em name No \&# Em number Ta numeric
+.Sm on
 capability
 .Em name
 has value
 .Em number
+.Sm off
 .It Em name No = Em string Ta "string capability"
+.Sm on
 .Em name
 has value
 .Em string
+.Sm off
 .It Em name No \&#@ Ta "the numeric capability"
+.Sm on
 .Em name
 does not exist
+.Sm off
 .It Em name No \&=@ Ta "the string capability"
+.Sm on
 .Em name
 does not exist
-.Sm on
 .El
 .Pp
 Numeric capability values may be given in one of three numeric bases.
diff --git a/lib/libc/gen/getcwd.3 b/lib/libc/gen/getcwd.3
index 27d37e6..4e08fab 100644
--- a/lib/libc/gen/getcwd.3
+++ b/lib/libc/gen/getcwd.3
@@ -66,7 +66,7 @@ is
 .Dv NULL ,
 space is allocated as necessary to store the pathname.
 This space may later be
-.Xr free 3 Ns 'd.
+.Xr free 3 Ns 'd .
 .Pp
 The function
 .Fn getwd
@@ -89,7 +89,7 @@ These routines have traditionally been used by programs to save the
 name of a working directory for the purpose of returning to it.
 A much faster and less error-prone method of accomplishing this is to
 open the current directory
-.Pq Ql \&.
+.Pq Ql .\&
 and use the
 .Xr fchdir 2
 function to return.
diff --git a/lib/libc/gen/getpwent.3 b/lib/libc/gen/getpwent.3
index 1e66b69..e41054c 100644
--- a/lib/libc/gen/getpwent.3
+++ b/lib/libc/gen/getpwent.3
@@ -178,7 +178,7 @@ The
 .Fn getpwent ,
 .Fn getpwnam ,
 .Fn getpwuid ,
-.Fn setpwent,
+.Fn setpwent ,
 and
 .Fn endpwent
 functions appeared in
diff --git a/lib/libc/gen/glob.3 b/lib/libc/gen/glob.3
index 4383994..760103b 100644
--- a/lib/libc/gen/glob.3
+++ b/lib/libc/gen/glob.3
@@ -269,7 +269,7 @@ is
 .Pf non- Dv NULL ,
 .Fn glob
 calls
-.Fa (*errfunc)(path, errno) .
+.Fa \*(lp*errfunc\*(rp Ns ( Fa path , errno ) .
 This may be unintuitive: a pattern like
 .Ql */Makefile
 will try to
@@ -374,7 +374,7 @@ An attempt to allocate memory failed.
 The scan was stopped because an error was encountered and either
 .Dv GLOB_ERR
 was set or
-.Fa (*errfunc)()
+.Fa \*(lp*errfunc\*(rp\*(lp\*(rp
 returned non-zero.
 .El
 .Pp
@@ -409,13 +409,13 @@ function is expected to be
 .St -p1003.2
 compatible with the exception
 that the flags
-.Dv GLOB_ALTDIRFUNC,
-.Dv GLOB_BRACE
-.Dv GLOB_MAGCHAR,
-.Dv GLOB_NOMAGIC,
-.Dv GLOB_QUOTE,
+.Dv GLOB_ALTDIRFUNC ,
+.Dv GLOB_BRACE ,
+.Dv GLOB_MAGCHAR ,
+.Dv GLOB_NOMAGIC ,
+.Dv GLOB_QUOTE ,
 and
-.Dv GLOB_TILDE,
+.Dv GLOB_TILDE ,
 and the fields
 .Fa gl_matchc
 and
diff --git a/lib/libc/gen/msgget.3 b/lib/libc/gen/msgget.3
index 91a61e0..6d22141 100644
--- a/lib/libc/gen/msgget.3
+++ b/lib/libc/gen/msgget.3
@@ -60,7 +60,7 @@ or
 does not have a message queue identifier associated with it, and the
 .Dv IPC_CREAT
 bit is set in
-.Fa msgflg.
+.Fa msgflg .
 .Pp
 If a new message queue is created, the data structure associated with it (the
 .Va msqid_ds
diff --git a/lib/libc/gen/sysctl.3 b/lib/libc/gen/sysctl.3
index c4c39fd..82f1b74 100644
--- a/lib/libc/gen/sysctl.3
+++ b/lib/libc/gen/sysctl.3
@@ -186,7 +186,7 @@ The next and subsequent levels down are found in the include files
 listed here, and described in separate sections below.
 .Pp
 .Bl -column CTLXMACHDEPXXX "Next level namesXXXXXX" -offset indent
-.It Sy Pa "Name	Next level names	Description"
+.It Sy "Name	Next level names	Description"
 .It "CTL\_DEBUG	sys/sysctl.h	Debugging"
 .It "CTL\_VFS	sys/mount.h	Filesystem"
 .It "CTL\_HW	sys/sysctl.h	Generic CPU, I/O"
@@ -272,7 +272,7 @@ is detailed below.
 The changeable column shows whether a process with appropriate
 privilege may change the value.
 .Bl -column "Second level nameXXXXXX" integerXXX -offset indent
-.It Sy Pa "Second level name	Type	Changeable"
+.It Sy "Second level name	Type	Changeable"
 .It "HW\_MACHINE	string	no"
 .It "HW\_MODEL	string	no"
 .It "HW\_NCPU	integer	no"
@@ -318,7 +318,7 @@ system vnodes, the open file entries, routing table entries,
 virtual memory statistics, load average history, and clock rate
 information.
 .Bl -column "KERNXMAXFILESPERPROCXXX" "struct clockrateXXX" -offset indent
-.It Sy Pa "Second level name	Type	Changeable"
+.It Sy "Second level name	Type	Changeable"
 .It "KERN\_ARGMAX	integer	no"
 .It "KERN\_BOOTFILE	string	yes"
 .It "KERN\_BOOTTIME	struct timeval	no"
@@ -424,7 +424,7 @@ structures is returned,
 whose size depends on the current number of such objects in the system.
 The third and fourth level names are as follows:
 .Bl -column "Third level nameXXXXXX" "Fourth level is:XXXXXX" -offset indent
-.It Pa "Third level name	Fourth level is:"
+.It "Third level name	Fourth level is:"
 .It "KERN\_PROC\_ALL	None"
 .It "KERN\_PROC\_PID	A process ID"
 .It "KERN\_PROC\_PGRP	A process group"
@@ -439,7 +439,7 @@ follow each other.
 The total size of array is returned.
 It is also possible for a process to set its own process title this way.
 .Bl -column "Third level nameXXXXXX" "Fourth level is:XXXXXX" -offset indent
-.It Pa "Third level name	Fourth level is:"
+.It Sy "Third level name	Fourth level is:"
 .It "KERN\_PROC\_ARGS	A process ID"
 .El
 .It Li KERN_PROF
@@ -453,7 +453,7 @@ is detailed below.
 The changeable column shows whether a process with appropriate
 privilege may change the value.
 .Bl -column "GPROFXGMONPARAMXXX" "struct gmonparamXXX" -offset indent
-.It Sy Pa "Third level name	Type	Changeable"
+.It Sy "Third level name	Type	Changeable"
 .It "GPROF\_STATE	integer	yes"
 .It "GPROF\_COUNT	u_short[\|]	yes"
 .It "GPROF\_FROMS	u_short[\|]	yes"
@@ -503,7 +503,7 @@ followed by the vnode itself
 The set of variables defined is architecture dependent.
 The following variables are defined for the i386 architecture.
 .Bl -column "CONSOLE_DEVICEXXX" "struct bootinfoXXX" -offset indent
-.It Sy Pa "Second level name	Type	Changeable"
+.It Sy "Second level name	Type	Changeable"
 .It Li "CPU_CONSDEV	dev_t	no"
 .It Li "CPU_ADJKERNTZ	int	yes"
 .It Li "CPU_DISRTCSET	int	yes"
@@ -516,7 +516,7 @@ is detailed below.
 The changeable column shows whether a process with appropriate
 privilege may change the value.
 .Bl -column "Second level nameXXXXXX" "routing messagesXXX" -offset indent
-.It Sy Pa "Second level name	Type	Changeable"
+.It Sy "Second level name	Type	Changeable"
 .It "PF\_ROUTE	routing messages	no"
 .It "PF\_INET	IPv4 values	yes"
 .It "PF\_INET6	IPv6 values	yes"
@@ -535,7 +535,7 @@ The fourth level name is an address family, which may be set to 0 to
 select all address families.
 The fifth and sixth level names are as follows:
 .Bl -column "Fifth level nameXXXXXX" "Sixth level is:XXX" -offset indent
-.It Pa "Fifth level name	Sixth level is:"
+.It Sy "Fifth level name	Sixth level is:"
 .It "NET\_RT\_FLAGS	rtflags"
 .It "NET\_RT\_DUMP	None"
 .It "NET\_RT\_IFLIST	None"
@@ -547,7 +547,7 @@ The third level name is the protocol.
 The fourth level name is the variable name.
 The currently defined protocols and names are:
 .Bl -column ProtocolXX VariableXX TypeXX ChangeableXX
-.It Pa "Protocol	Variable	Type	Changeable"
+.It Sy "Protocol	Variable	Type	Changeable"
 .It "icmp	bmcastecho	integer	yes"
 .It "icmp	maskrepl	integer	yes"
 .It "ip	forwarding	integer	yes"
@@ -598,7 +598,7 @@ is detailed below.
 The changeable column shows whether a process with appropriate
 privilege may change the value.
 .Bl -column "USER_COLL_WEIGHTS_MAXXXX" "integerXXX" -offset indent
-.It Sy Pa "Second level name	Type	Changeable"
+.It Sy "Second level name	Type	Changeable"
 .It "USER\_BC\_BASE\_MAX	integer	no"
 .It "USER\_BC\_DIM\_MAX	integer	no"
 .It "USER\_BC\_SCALE\_MAX	integer	no"
@@ -694,7 +694,7 @@ is detailed below.
 The changeable column shows whether a process with appropriate
 privilege may change the value.
 .Bl -column "Second level nameXXXXXX" "struct loadavgXXX" -offset indent
-.It Sy Pa "Second level name	Type	Changeable"
+.It Sy "Second level name	Type	Changeable"
 .It "VM\_LOADAVG	struct loadavg	no"
 .It "VM\_METER	struct vmtotal	no"
 .It "VM\_PAGEOUT\_ALGORITHM	integer	yes"
diff --git a/lib/libc/gen/syslog.3 b/lib/libc/gen/syslog.3
index 7ee51bb..e392a87 100644
--- a/lib/libc/gen/syslog.3
+++ b/lib/libc/gen/syslog.3
@@ -146,7 +146,7 @@ If
 cannot pass the message to
 .Xr syslogd 8
 it will attempt to write the message to the console
-.Pq Dq Pa /dev/console.
+.Pq Dq Pa /dev/console .
 .It Dv LOG_NDELAY
 Open the connection to
 .Xr syslogd 8
diff --git a/lib/libc/gen/tcsetattr.3 b/lib/libc/gen/tcsetattr.3
index d2bf500..58de728 100644
--- a/lib/libc/gen/tcsetattr.3
+++ b/lib/libc/gen/tcsetattr.3
@@ -184,7 +184,7 @@ The
 .Fn cfmakeraw
 function sets the flags stored in the termios structure to a state disabling
 all input and output processing, giving a
-.Dq raw I/O path.
+.Dq raw I/O path .
 It should be noted that there is no function to reverse this effect.
 This is because there are a variety of processing options that could be
 re-enabled and the correct method is for an application to snapshot the
diff --git a/lib/libc/gen/ttyname.3 b/lib/libc/gen/ttyname.3
index 5648c30..9141dfc 100644
--- a/lib/libc/gen/ttyname.3
+++ b/lib/libc/gen/ttyname.3
@@ -62,7 +62,7 @@ and named
 .Pa /dev/tty Ns Em xx
 and for which an entry exists
 in the initialization file
-.Pa /etc/ttys.
+.Pa /etc/ttys .
 (See
 .Xr ttys 5 . )
 .Pp
diff --git a/lib/libc/gen/tzset.3 b/lib/libc/gen/tzset.3
index d763e07..5ae5ec0 100644
--- a/lib/libc/gen/tzset.3
+++ b/lib/libc/gen/tzset.3
@@ -116,13 +116,11 @@ When
 is used directly as a specification of the time conversion information,
 it must have the following syntax (spaces inserted for clarity):
 .Bd -filled -offset indent
-.Em std offset Bo
-.Em dst Bo
-.Em offset
-.Bc
+.Em std offset
 .Bo
-.No , Em rule
-.Bc
+.Em dst
+.Bq Em offset
+.Bq , Em rule
 .Bc
 .Ed
 .Pp
@@ -156,13 +154,13 @@ Indicates the value one must add to the local time to arrive at
 Coordinated Universal Time.  The
 .Em offset
 has the form:
-.Bd -unfilled -offset indent
+.Bd -ragged -offset indent
+.Sm off
 .Em hh Bo
-.Pf \&: Em mm
-.Bo
-.Pf \&: Em ss
-.Bc
+.Em : mm
+.Bq Em : ss
 .Bc
+.Sm on
 .Ed
 .Pp
 The minutes
diff --git a/lib/libc/gen/uname.3 b/lib/libc/gen/uname.3
index 2c72472..0ad18d8 100644
--- a/lib/libc/gen/uname.3
+++ b/lib/libc/gen/uname.3
@@ -52,9 +52,9 @@ the current system into the structure referenced by
 .Fa name .
 .Pp
 The
-.Li utsname
+.Vt utsname
 structure is defined in the
-.Li <sys/utsname.h>
+.Aq Pa sys/utsname.h
 header file, and contains the following members:
 .Bl -tag -width nodenameXXXX -offset indent
 .It sysname
diff --git a/lib/libc/gen/vis.3 b/lib/libc/gen/vis.3
index 118941b..105e1f9 100644
--- a/lib/libc/gen/vis.3
+++ b/lib/libc/gen/vis.3
@@ -100,7 +100,7 @@ characters from
 .Fa src
 (this
 is useful for encoding a block of data that may contain
-.Dv NUL Ns 's).
+.Dv NUL Ns 's ) .
 Both forms
 .Dv NUL
 terminate
diff --git a/lib/libc/locale/mbrune.3 b/lib/libc/locale/mbrune.3
index 1e68ae5..680b01e 100644
--- a/lib/libc/locale/mbrune.3
+++ b/lib/libc/locale/mbrune.3
@@ -98,7 +98,7 @@ The
 function locates the first occurrence of the null-terminated string
 .Fa pattern
 in the null-terminated string
-.Fa string.
+.Fa string .
 If
 .Fa pattern
 is the empty string,
diff --git a/lib/libc/locale/multibyte.3 b/lib/libc/locale/multibyte.3
index cf4093c..dff599d 100644
--- a/lib/libc/locale/multibyte.3
+++ b/lib/libc/locale/multibyte.3
@@ -150,7 +150,7 @@ function converts a multibyte character
 .Fa mbchar
 into a wide character and stores the result
 in the object pointed to by
-.Fa wcharp.
+.Fa wcharp .
 Up to
 .Fa nbytes
 bytes are examined.
diff --git a/lib/libc/locale/rune.3 b/lib/libc/locale/rune.3
index 087ef4c..a945274 100644
--- a/lib/libc/locale/rune.3
+++ b/lib/libc/locale/rune.3
@@ -159,7 +159,7 @@ is not
 .Dv NULL ,
 .Fa *result
 will be set to
-.Dv NULL.
+.Dv NULL .
 In all cases, 
 .Fn sputrune
 will return the number of bytes which would be needed to store
@@ -266,7 +266,7 @@ These functions first appeared in
 The
 .Fn setrunelocale
 function and the other non-ANSI rune functions were inspired by
-.Nm Plan 9 from Bell Labs
+.Sy "Plan 9 from Bell Labs"
 as a much more sane alternative to the ANSI multibyte and
 wide character support.
 .\"They were conceived at the San Diego 1993 Summer USENIX conference by
diff --git a/lib/libc/locale/utf2.4 b/lib/libc/locale/utf2.4
index 3734dba..35eb3ad 100644
--- a/lib/libc/locale/utf2.4
+++ b/lib/libc/locale/utf2.4
@@ -49,7 +49,7 @@ The
 .Nm UTF2
 encoding is based on a proposed X-Open multibyte
 \s-1FSS-UCS-TF\s+1 (File System Safe Universal Character Set Transformation Format) encoding as used in
-.Nm Plan 9 from Bell Labs.
+.Sy "Plan 9 from Bell Labs" .
 Although it is capable of representing more than 16 bits,
 the current implementation is limited to 16 bits as defined by the
 Unicode Standard.
diff --git a/lib/libc/locale/utf2.5 b/lib/libc/locale/utf2.5
index 3734dba..35eb3ad 100644
--- a/lib/libc/locale/utf2.5
+++ b/lib/libc/locale/utf2.5
@@ -49,7 +49,7 @@ The
 .Nm UTF2
 encoding is based on a proposed X-Open multibyte
 \s-1FSS-UCS-TF\s+1 (File System Safe Universal Character Set Transformation Format) encoding as used in
-.Nm Plan 9 from Bell Labs.
+.Sy "Plan 9 from Bell Labs" .
 Although it is capable of representing more than 16 bits,
 the current implementation is limited to 16 bits as defined by the
 Unicode Standard.
diff --git a/lib/libc/net/if_indextoname.3 b/lib/libc/net/if_indextoname.3
index a0d4beb..adf82cb 100644
--- a/lib/libc/net/if_indextoname.3
+++ b/lib/libc/net/if_indextoname.3
@@ -57,11 +57,9 @@
 .Fn if_freenameindex "struct if_nameindex *ptr"
 .Sh DESCRIPTION
 The functions map interface index to readable interface name
-.Po
-such as
-.Li ``lo0''
-.Pc
-, and vice versa.
+(such as
+.Dq Li lo0 ) ,
+and vice versa.
 .Pp
 .Fn if_nametoindex
 converts readable interface name to interface index
@@ -76,13 +74,11 @@ argument must point to a buffer of at least
 .Dv IF_NAMESIZE
 bytes into which the interface name corresponding to the specified index is
 returned.
-.Po
-.Dv IF_NAMESIZE
+.Dv ( IF_NAMESIZE
 is also defined in
-.Li <net/if.h>
+.Aq Pa net/if.h
 and its value includes a terminating null byte at the end of the
-interface name.
-.Pc
+interface name.)
 This pointer is also the return value of the function.
 If there is no interface corresponding to the specified index,
 .Dv NULL
@@ -94,7 +90,7 @@ returns an array of
 structures.
 .Fa if_nametoindex
 is also defined in
-.Li <net/if.h> ,
+.Aq Pa net/if.h ,
 and is as follows:
 .Bd -literal -offset
 struct if_nameindex {
diff --git a/lib/libc/net/inet6_option_space.3 b/lib/libc/net/inet6_option_space.3
index 63cbfa5..8236548 100644
--- a/lib/libc/net/inet6_option_space.3
+++ b/lib/libc/net/inet6_option_space.3
@@ -81,17 +81,13 @@ ancillary data, including the
 .Li cmsghdr
 structure at the beginning,
 and any padding at the end
-.Po
-to make its size a multiple of 8 bytes
-.Pc .
+(to make its size a multiple of 8 bytes).
 The argument is the size of the structure defining the option,
 which must include any pad bytes at the beginning
-.Po
-the value
+(the value
 .Li y
 in the alignment term
-.Dq Li xn + y
-.Pc ,
+.Dq Li "xn + y" ) ,
 the type byte, the length byte, and the option data.
 .Pp
 Note: If multiple options are stored in a single ancillary data
@@ -181,17 +177,16 @@ before calling this function.
 The option type must have a value from
 .Li 2
 to
-.Li 255 , inclusive.
-.Po
-.Li 0
+.Li 255 ,
+inclusive.
+.Li ( 0
 and
 .Li 1
 are reserved for the
 .Li Pad1
 and
 .Li PadN
-options, respectively.
-.Pc
+options, respectively.)
 .Pp
 The option data length must have a value between
 .Li 0
@@ -249,12 +244,10 @@ initialized by
 is the value of the option data length byte for this option.
 This value is required as an argument to allow the function to
 determine if padding must be appended at the end of the option.
-.Po
-The
+(The
 .Fn inet6_option_append
 function does not need a data length argument
-since the option data length must already be stored by the caller.
-.Pc
+since the option data length must already be stored by the caller.)
 .Pp
 .Fa multx
 is the value
@@ -289,10 +282,8 @@ and
 .Fa *tptrp
 points to
 the 8-bit option type field
-.Po
-which is followed by the 8-bit option
-data length, followed by the option data
-.Pc .
+(which is followed by the 8-bit option
+data length, followed by the option data).
 If no more options remain
 to be processed, the return value is
 .Li -1
@@ -407,7 +398,8 @@ on an error.
 .Pp
 .Fn inet6_option_alloc
 returns
-.Dv NULL on an error.
+.Dv NULL
+on an error.
 .Pp
 On errors,
 .Fn inet6_option_next
diff --git a/lib/libc/net/inet6_rthdr_space.3 b/lib/libc/net/inet6_rthdr_space.3
index 26e5c35..2c3fd9c 100644
--- a/lib/libc/net/inet6_rthdr_space.3
+++ b/lib/libc/net/inet6_rthdr_space.3
@@ -212,10 +212,8 @@ When implemented, this should behave as follows.
 .Pp
 This function takes a Routing header that was received as ancillary
 data
-.Po
-pointed to by the first argument,
-.Fa in
-.Pc
+(pointed to by the first argument,
+.Fa in )
 and writes a new Routing
 header that sends datagrams along the reverse of that route.
 Both
@@ -238,10 +236,8 @@ The return value of the function is -1 upon an error.
 .Ss inet6_rthdr_getaddr
 This function returns a pointer to the IPv6 address specified by
 .Fa index
-.Po
-which must have a value between 1 and the value returned by
-.Fn inet6_rthdr_segments
-.Pc
+(which must have a value between 1 and the value returned by
+.Fn inet6_rthdr_segments )
 in the Routing header described by
 .Fa cmsg .
 An
@@ -255,11 +251,9 @@ Upon an error the return value of the function is
 .Ss inet6_rthdr_getflags
 This function returns the flags value specified by
 .Fa index
-.Po
-which must
+(which must
 have a value between 0 and the value returned by
-.Fn inet6_rthdr_segments
-.Pc
+.Fn inet6_rthdr_segments )
 in the Routing header described by
 .Fa cmsg .
 For an IPv6 Type 0 Routing header the return value will be either
diff --git a/lib/libc/net/resolver.3 b/lib/libc/net/resolver.3
index dedcde1..1fb97f5 100644
--- a/lib/libc/net/resolver.3
+++ b/lib/libc/net/resolver.3
@@ -305,7 +305,8 @@ as the name is compressed.
 If
 .Em dnptr
 is
-.Dv NULL, names are not compressed.
+.Dv NULL ,
+names are not compressed.
 If
 .Fa lastdnptr
 is
diff --git a/lib/libc/stdio/printf.3 b/lib/libc/stdio/printf.3
index 308a1b4..ecf7f3a 100644
--- a/lib/libc/stdio/printf.3
+++ b/lib/libc/stdio/printf.3
@@ -86,7 +86,7 @@ as described below.
 and
 .Fn vprintf
 write output to
-.Em stdout,
+.Em stdout ,
 the standard output stream;
 .Fn fprintf
 and
diff --git a/lib/libc/stdio/stdio.3 b/lib/libc/stdio/stdio.3
index b4cd7da..657b308 100644
--- a/lib/libc/stdio/stdio.3
+++ b/lib/libc/stdio/stdio.3
@@ -42,9 +42,9 @@
 .Lb libc
 .Sh SYNOPSIS
 .Fd #include <stdio.h>
-.Fd FILE *stdin;
-.Fd FILE *stdout;
-.Fd FILE *stderr;
+.Vt FILE *stdin ;
+.Vt FILE *stdout ;
+.Vt FILE *stderr ;
 .Sh DESCRIPTION
 The standard
 .Tn I/O
@@ -179,9 +179,9 @@ without first removing their current definitions with
 .Dv FOPEN_MAX ,
 .Dv L_cuserid ,
 .Dv L_ctermid ,
-.Dv L_tmpnam,
+.Dv L_tmpnam ,
 .Dv NULL ,
-.Dv P_tmpdir,
+.Dv P_tmpdir ,
 .Dv SEEK_CUR ,
 .Dv SEEK_END ,
 .Dv SEEK_SET ,
diff --git a/lib/libc/stdlib/getenv.3 b/lib/libc/stdlib/getenv.3
index 4753dfb..d1122ef 100644
--- a/lib/libc/stdlib/getenv.3
+++ b/lib/libc/stdlib/getenv.3
@@ -89,7 +89,7 @@ If the variable
 .Ar name
 does not exist in the list,
 it is inserted with the given
-.Ar value.
+.Ar value .
 If the variable does exist, the argument
 .Ar overwrite
 is tested; if
diff --git a/lib/libc/stdlib/malloc.3 b/lib/libc/stdlib/malloc.3
index e9e4d20..bc1a272 100644
--- a/lib/libc/stdlib/malloc.3
+++ b/lib/libc/stdlib/malloc.3
@@ -40,7 +40,7 @@
 .Dt MALLOC 3
 .Os FreeBSD
 .Sh NAME
-.Nm malloc, calloc, realloc, free, reallocf
+.Nm malloc , calloc , realloc , free , reallocf
 .Nd general purpose memory allocation functions
 .Sh LIBRARY
 .Lb libc
@@ -59,7 +59,7 @@
 .Ft char *
 .Va _malloc_options
 .Ft void
-.Va (*_malloc_message)(char *p1, char *p2, char *p3, char *p4)
+.Fn \*(lp*_malloc_message\*(rp "char *p1" "char *p2" "char *p3" "char *p4"
 .Sh DESCRIPTION
 The
 .Fn malloc
diff --git a/lib/libc/stdlib/qsort.3 b/lib/libc/stdlib/qsort.3
index 15e1690..1192721 100644
--- a/lib/libc/stdlib/qsort.3
+++ b/lib/libc/stdlib/qsort.3
@@ -40,7 +40,7 @@
 .Dt QSORT 3
 .Os
 .Sh NAME
-.Nm qsort, heapsort, mergesort
+.Nm qsort , heapsort , mergesort
 .Nd sort functions
 .Sh LIBRARY
 .Lb libc
diff --git a/lib/libc/stdlib/strtol.3 b/lib/libc/stdlib/strtol.3
index efa4385..528b6d3 100644
--- a/lib/libc/stdlib/strtol.3
+++ b/lib/libc/stdlib/strtol.3
@@ -40,7 +40,7 @@
 .Dt STRTOL 3
 .Os
 .Sh NAME
-.Nm strtol, strtoq
+.Nm strtol , strtoq
 .Nd convert string value to a long or quad_t integer
 .Sh LIBRARY
 .Lb libc
diff --git a/lib/libc/stdlib/strtoul.3 b/lib/libc/stdlib/strtoul.3
index 1bde3e9..01c092f 100644
--- a/lib/libc/stdlib/strtoul.3
+++ b/lib/libc/stdlib/strtoul.3
@@ -40,7 +40,7 @@
 .Dt STRTOUL 3
 .Os
 .Sh NAME
-.Nm strtoul, strtouq
+.Nm strtoul , strtouq
 .Nd "convert a string to an unsigned long or uquad_t integer"
 .Sh LIBRARY
 .Lb libc
diff --git a/lib/libc/stdlib/tsearch.3 b/lib/libc/stdlib/tsearch.3
index 051eea4..a474a69 100644
--- a/lib/libc/stdlib/tsearch.3
+++ b/lib/libc/stdlib/tsearch.3
@@ -31,7 +31,7 @@
 .Dt TSEARCH 3
 .Os
 .Sh NAME
-.Nm tsearch, tfind, tdelete, twalk
+.Nm tsearch , tfind , tdelete , twalk
 .Nd manipulate binary search trees
 .Sh SYNOPSIS
 .Fd #include <search.h>
diff --git a/lib/libc/string/bstring.3 b/lib/libc/string/bstring.3
index c79eb94..873c785 100644
--- a/lib/libc/string/bstring.3
+++ b/lib/libc/string/bstring.3
@@ -45,7 +45,7 @@
 .Nm memchr ,
 .Nm memcmp ,
 .Nm memcpy ,
-.Nm memmove,
+.Nm memmove ,
 .Nm memset
 .Nd byte string operations
 .Sh LIBRARY
diff --git a/lib/libc/string/strcat.3 b/lib/libc/string/strcat.3
index 77fd0d27..fbb2996 100644
--- a/lib/libc/string/strcat.3
+++ b/lib/libc/string/strcat.3
@@ -74,7 +74,7 @@ appends not more than
 characters from
 .Fa append ,
 and then adds a terminating
-.Ql \e0.
+.Ql \e0 .
 .Sh RETURN VALUES
 The
 .Fn strcat
diff --git a/lib/libc/string/strerror.3 b/lib/libc/string/strerror.3
index 762f89d..1799c1c 100644
--- a/lib/libc/string/strerror.3
+++ b/lib/libc/string/strerror.3
@@ -95,7 +95,7 @@ If
 .Fa errnum
 is not a recognized error number,
 the error message string will contain
-.Dq Li "Unknown error:\0
+.Dq Li "Unknown error:\ "
 followed by the error number in decimal.
 .Pp
 The message strings can be accessed directly using the external
diff --git a/lib/libc/string/string.3 b/lib/libc/string/string.3
index 8a83a37..1131b6d 100644
--- a/lib/libc/string/string.3
+++ b/lib/libc/string/string.3
@@ -44,14 +44,14 @@
 .Nm strrchr ,
 .Nm strcmp ,
 .Nm strncmp ,
-.Nm strcasecmp,
+.Nm strcasecmp ,
 .Nm strncasecmp ,
 .Nm strcpy ,
 .Nm strncpy ,
 .Nm strerror ,
 .Nm strlen ,
 .Nm strpbrk ,
-.Nm strsep,
+.Nm strsep ,
 .Nm strspn ,
 .Nm strcspn ,
 .Nm strstr ,
diff --git a/lib/libc/string/strtok.3 b/lib/libc/string/strtok.3
index 5a3c907..ea28f94 100644
--- a/lib/libc/string/strtok.3
+++ b/lib/libc/string/strtok.3
@@ -54,7 +54,7 @@
 .Dt STRTOK 3
 .Os FreeBSD
 .Sh NAME
-.Nm strtok, strtok_r
+.Nm strtok , strtok_r
 .Nd string tokens
 .Sh LIBRARY
 .Lb libc
@@ -165,7 +165,9 @@ Since this implementation always alters the next starting point,
 such a sequence of calls would always return
 .Dv NULL .
 .Sh AUTHORS
-.An Wes Peters, Softweyr LLC: Aq wes@softweyr.com
+.An Wes Peters ,
+Softweyr LLC:
+.Aq wes@softweyr.com
 .Pp
 Based on the 
 .Fx 3.0
diff --git a/lib/libc/sys/aio_waitcomplete.2 b/lib/libc/sys/aio_waitcomplete.2
index 0e586d5..c554673 100644
--- a/lib/libc/sys/aio_waitcomplete.2
+++ b/lib/libc/sys/aio_waitcomplete.2
@@ -35,7 +35,7 @@
 .Sh SYNOPSIS
 .Fd #include <aio.h>
 .Ft int
-.Fn aio_waitcomplete "struct aiocb **iocbp, struct timespec *timeout"
+.Fn aio_waitcomplete "struct aiocb **iocbp" "struct timespec *timeout"
 .Sh DESCRIPTION
 The
 .Fn aio_waitcomplete
diff --git a/lib/libc/sys/brk.2 b/lib/libc/sys/brk.2
index 09072a4..7f40e34 100644
--- a/lib/libc/sys/brk.2
+++ b/lib/libc/sys/brk.2
@@ -99,11 +99,11 @@ beyond the
 value returned from a call to
 .Xr getrlimit 2 ,
 e.g.\&
-.Dq etext + rlp\(->rlim_max.
+.Dq Va etext No + Va rlp\->rlim_max .
 (See
 .Xr end 3
 for the definition of
-.Em etext ) .
+.Va etext ) .
 .Sh RETURN VALUES
 .Fn Brk
 returns 0 if successful;
diff --git a/lib/libc/sys/execve.2 b/lib/libc/sys/execve.2
index 0467118..32dd4d8 100644
--- a/lib/libc/sys/execve.2
+++ b/lib/libc/sys/execve.2
@@ -105,7 +105,7 @@ The argument
 is also a pointer to a null-terminated array of
 character pointers to null-terminated strings.
 A pointer to this array is normally stored in the global variable
-.Va environ.
+.Va environ .
 These strings pass information to the
 new process that is not directly an argument to the command (see
 .Xr environ 7 ) .
diff --git a/lib/libc/sys/fcntl.2 b/lib/libc/sys/fcntl.2
index 49522c7..0b2ec89 100644
--- a/lib/libc/sys/fcntl.2
+++ b/lib/libc/sys/fcntl.2
@@ -193,11 +193,11 @@ taken as a pointer to a
 (see above).
 .Dv F_SETLK
 is used to establish shared (or read) locks
-.Dv (F_RDLCK)
+.Pq Dv F_RDLCK
 or exclusive (or write) locks,
-.Dv (F_WRLCK) ,
+.Pq Dv F_WRLCK ,
 as well as remove either type of lock
-.Dv (F_UNLCK) .
+.Pq Dv F_UNLCK .
 If a shared or exclusive lock cannot be set,
 .Fn fcntl
 returns immediately with
@@ -392,11 +392,11 @@ The argument
 is
 .Dv F_SETLK ,
 the type of lock
-.Fa (l_type)
+.Pq Fa l_type
 is a shared lock
-.Dv (F_RDLCK)
+.Pq Dv F_RDLCK
 or exclusive lock
-.Dv (F_WRLCK) ,
+.Pq Dv F_WRLCK ,
 and the segment of a file to be locked is already
 exclusive-locked by another process;
 or the type is an exclusive lock and some portion of the
@@ -413,9 +413,9 @@ is
 or
 .Dv F_SETLKW ,
 the type of lock
-.Fa (l_type)
+.Pq Fa l_type
 is a shared lock
-.Dv (F_RDLCK) ,
+.Pq Dv F_RDLCK ,
 and
 .Fa fildes
 is not a valid file descriptor open for reading.
@@ -427,9 +427,9 @@ is
 or
 .Dv F_SETLKW ,
 the type of lock
-.Fa (l_type)
+.Pq Fa l_type
 is an exclusive lock
-.Dv (F_WRLCK) ,
+.Pq Dv F_WRLCK ,
 and
 .Fa fildes
 is not a valid file descriptor open for writing.
diff --git a/lib/libc/sys/fhopen.2 b/lib/libc/sys/fhopen.2
index 75af67f..dbe10a7 100644
--- a/lib/libc/sys/fhopen.2
+++ b/lib/libc/sys/fhopen.2
@@ -54,7 +54,7 @@
 .Fn fhstatfs "const fhandle_t *fhp" "struct statfs *buf"
 .Sh DESCRIPTION
 These functions provide a means to access a file given the file handle
-.Fa fhp.
+.Fa fhp .
 As this method bypasses directory access restrictions, these calls are
 restricted to the superuser.
 .Pp
diff --git a/lib/libc/sys/getdirentries.2 b/lib/libc/sys/getdirentries.2
index 4dab8a6..f883fec 100644
--- a/lib/libc/sys/getdirentries.2
+++ b/lib/libc/sys/getdirentries.2
@@ -137,7 +137,8 @@ Alternatively, the current position pointer may be set and retrieved by
 The current position pointer should only be set to a value returned by
 .Xr lseek 2 ,
 a value returned in the location pointed to by
-.Fa basep ( Ns Fn getdirentries
+.Fa basep
+.Pf ( Fn getdirentries
 only)
 or zero.
 .Sh IMPLEMENTATION NOTES
diff --git a/lib/libc/sys/getlogin.2 b/lib/libc/sys/getlogin.2
index a631bfb..4015da5 100644
--- a/lib/libc/sys/getlogin.2
+++ b/lib/libc/sys/getlogin.2
@@ -86,8 +86,8 @@ is normally used only when a new session is being created on behalf
 of the named user
 (for example, at login time, or when a remote shell is invoked).
 .Pp
-.Em NOTE:
-There is only one `login name' per `session .
+.Em NOTE :
+There is only one login name per session.
 .Pp
 It is
 .Em CRITICALLY
@@ -107,9 +107,9 @@ which is an ideal way of detaching from a controlling terminal and
 forking into the background.
 .Pp
 In particular, doing a
-.Fn ioctl ttyfd TIOCNOTTY ...
+.Fn ioctl ttyfd TIOCNOTTY ...\&
 or
-.Fn setpgrp ...
+.Fn setpgrp ...\&
 is
 .Em NOT
 sufficient.
diff --git a/lib/libc/sys/getsockopt.2 b/lib/libc/sys/getsockopt.2
index dd6ae3a..deb70b9 100644
--- a/lib/libc/sys/getsockopt.2
+++ b/lib/libc/sys/getsockopt.2
@@ -191,7 +191,8 @@ are queued on socket and a
 .Xr close 2
 is performed.
 If the socket promises reliable delivery of data and
-.Dv SO_LINGER is set,
+.Dv SO_LINGER
+is set,
 the system will block the process on the 
 .Xr close 2
 attempt until it is able to transmit the data or until it decides it
diff --git a/lib/libc/sys/kill.2 b/lib/libc/sys/kill.2
index 8ce5c71..5a7c05c 100644
--- a/lib/libc/sys/kill.2
+++ b/lib/libc/sys/kill.2
@@ -75,7 +75,7 @@ to any descendant of the current process.
 .It \&If Fa pid No \&is greater than zero :
 .Fa Sig
 is sent to the process whose ID is equal to
-.Fa pid.
+.Fa pid .
 .It \&If Fa pid No \&is zero :
 .Fa Sig
 is sent to all processes whose group ID is equal
diff --git a/lib/libc/sys/listen.2 b/lib/libc/sys/listen.2
index 11f8fd2..3a98629 100644
--- a/lib/libc/sys/listen.2
+++ b/lib/libc/sys/listen.2
@@ -60,7 +60,7 @@ The
 call applies only to sockets of type
 .Dv SOCK_STREAM
 or
-.Dv SOCK_SEQPACKET.
+.Dv SOCK_SEQPACKET .
 .Pp
 The
 .Fa backlog
@@ -76,15 +76,15 @@ the request may be ignored so that retries may succeed.
 The
 .Xr sysctl 3
 MIB variable
-.Dq Li kern.ipc.somaxconn
+.Dq Va kern.ipc.somaxconn
 specifies a hard limit on
 .Fa backlog ;
-if a  value greater than
-.Li kern.ipc.somaxconn
+if a value greater than
+.Va kern.ipc.somaxconn
 or less than zero is specified,
 .Fa backlog
 is silently forced to
-.Li kern.ipc.somaxconn .
+.Va kern.ipc.somaxconn .
 .Sh IMPLEMENTATION NOTES
 .Pp
 In the non-threaded library
diff --git a/lib/libc/sys/lseek.2 b/lib/libc/sys/lseek.2
index 5ca26cb..5cc0f22 100644
--- a/lib/libc/sys/lseek.2
+++ b/lib/libc/sys/lseek.2
@@ -53,7 +53,7 @@ to the
 argument
 .Fa offset
 according to the directive
-.Fa whence.
+.Fa whence .
 The argument
 .Fa fildes
 must be an open
diff --git a/lib/libc/sys/ptrace.2 b/lib/libc/sys/ptrace.2
index 708f9ac..c91b2d1 100644
--- a/lib/libc/sys/ptrace.2
+++ b/lib/libc/sys/ptrace.2
@@ -54,9 +54,7 @@ that the process expects to be traced by its parent.  All the other
 arguments are ignored.  (If the parent process does not expect to trace
 the child, it will probably be rather confused by the results; once the
 traced process stops, it cannot be made to continue except via
-.Eo \&
-.Fn ptrace
-.Ec \&.)
+.Fn ptrace . )
 When a process has used this request and calls
 .Xr execve 2
 or any of the routines built on it
@@ -69,7 +67,7 @@ Also, any setuid or setgid bits on the executable being executed will
 be ignored.
 .It Dv PT_READ_I , Dv PT_READ_D
 These requests read a single
-.Li int
+.Vt int
 of data from the traced process' address space.  Traditionally,
 .Fn ptrace
 has allowed for machines with distinct address spaces for instruction
@@ -99,12 +97,12 @@ except that they write rather than read.  The
 argument supplies the value to be written.
 .It Dv PT_READ_U
 This request reads an
-.Li int
+.Vt int
 from the traced process' user structure.  The
 .Fa addr
 argument specifies the location of the int relative to the base of the
 user structure; it will usually be an integer value cast to
-.Li caddr_t
+.Vt caddr_t
 either explicitly or via the presence of a prototype for
 .Eo \&
 .Fn ptrace
@@ -115,14 +113,14 @@ and
 .Dv PT_READ_D ,
 .Fa addr
 must be aligned on an
-.Li int
+.Vt int
 boundary.  The value read is returned as the return value from
 .Eo \&
 .Fn ptrace
 .Ec .
 .It Dv PT_WRITE_U
 This request writes an
-.Li int
+.Vt int
 into the traced process' user structure.
 .Fa addr
 specifies the offset, just as for
@@ -138,7 +136,9 @@ The traced process continues execution.
 .Fa addr
 is an address specifying the place where execution is to be resumed (a
 new value for the program counter), or
-.Li (caddr_t)1
+.Po
+.Vt caddr_t
+.Pc Ns 1
 to indicate that execution is to pick up where it left off.
 .Fa data
 provides a signal number to be delivered to the traced process as it
@@ -180,7 +180,9 @@ are:
 .Bl -tag -width 12n
 .It Dv PT_GETREGS
 This request reads the traced process' machine registers into the
-.Dq Li "struct reg"
+.Do
+.Vt "struct reg"
+.Dc
 (defined in
 .Aq Pa machine/reg.h )
 pointed to by
@@ -189,7 +191,9 @@ pointed to by
 This request is the converse of
 .Dv PT_GETREGS ;
 it loads the traced process' machine registers from the
-.Dq Li "struct reg"
+.Do
+.Vt "struct reg"
+.Dc
 (defined in
 .Aq Pa machine/reg.h )
 pointed to by
@@ -197,7 +201,9 @@ pointed to by
 .It Dv PT_GETFPREGS
 This request reads the traced process' floating-point registers into
 the
-.Dq Li "struct fpreg"
+.Do
+.Vt "struct fpreg"
+.Dc
 (defined in
 .Aq Pa machine/reg.h )
 pointed to by
@@ -206,7 +212,9 @@ pointed to by
 This request is the converse of
 .Dv PT_GETFPREGS ;
 it loads the traced process' floating-point registers from the
-.Dq Li "struct fpreg"
+.Do
+.Vt "struct fpreg"
+.Dc
 (defined in
 .Aq Pa machine/reg.h )
 pointed to by
@@ -214,7 +222,9 @@ pointed to by
 .It Dv PT_GETDBREGS
 This request reads the traced process' debug registers into
 the
-.Dq Li "struct dbreg"
+.Do
+.Vt "struct dbreg"
+.Dc
 (defined in
 .Aq Pa machine/reg.h )
 pointed to by
@@ -223,7 +233,9 @@ pointed to by
 This request is the converse of
 .Dv PT_GETDBREGS ;
 it loads the traced process' debug registers from the
-.Dq Li "struct dbreg"
+.Do
+.Vt "struct dbreg"
+.Dc
 (defined in
 .Aq Pa machine/reg.h )
 pointed to by
@@ -265,7 +277,7 @@ to
 or
 .Dv PT_WRITE_U
 was not
-.Li int Ns \&-aligned.
+.Vt int Ns \-aligned .
 .It
 The signal number (in
 .Fa data )
diff --git a/lib/libc/sys/recv.2 b/lib/libc/sys/recv.2
index 88d7a4a..1c543fd 100644
--- a/lib/libc/sys/recv.2
+++ b/lib/libc/sys/recv.2
@@ -210,7 +210,7 @@ Process credentials can also be passed as ancillary data for
 domain sockets using a
 .Fa cmsg_type
 of
-.Dv SCM_CREDS.
+.Dv SCM_CREDS .
 In this case,
 .Fa cmsg_data
 should be a structure of type
diff --git a/lib/libc/sys/semget.2 b/lib/libc/sys/semget.2
index cdcd964..dc22c0a 100644
--- a/lib/libc/sys/semget.2
+++ b/lib/libc/sys/semget.2
@@ -84,13 +84,13 @@ parameter:
 Read access for user.
 .It Dv SEM_A
 Alter access for user.
-.It Dv (SEM_R>>3)
+.It Dv ( SEM_R>>3 )
 Read access for group.
-.It Dv (SEM_A>>3)
+.It Dv ( SEM_A>>3 )
 Alter access for group.
-.It Dv (SEM_R>>6)
+.It Dv ( SEM_R>>6 )
 Read access for other.
-.It Dv (SEM_A>>6)
+.It Dv ( SEM_A>>6 )
 Alter access for other.
 .El
 .Pp
diff --git a/lib/libc/sys/shmget.2 b/lib/libc/sys/shmget.2
index 88d3b4a..05bc68c 100644
--- a/lib/libc/sys/shmget.2
+++ b/lib/libc/sys/shmget.2
@@ -82,13 +82,13 @@ parameter:
 Read access for user.
 .It Dv SHM_W
 Write access for user.
-.It Dv (SHM_R>>3)
+.It Dv ( SHM_R>>3 )
 Read access for group.
-.It Dv (SHM_W>>3)
+.It Dv ( SHM_W>>3 )
 Write access for group.
-.It Dv (SHM_R>>6)
+.It Dv ( SHM_R>>6 )
 Read access for other.
-.It Dv (SHM_W>>6)
+.It Dv ( SHM_W>>6 )
 Write access for other.
 .El
 .\"
diff --git a/lib/libc/sys/socket.2 b/lib/libc/sys/socket.2
index 1cf4616..7049bc1 100644
--- a/lib/libc/sys/socket.2
+++ b/lib/libc/sys/socket.2
@@ -168,7 +168,7 @@ and
 calls.
 (Some protocol families, such as the Internet family,
 support the notion of an
-.Dq implied connect,
+.Dq implied connect ,
 which permits data to be sent piggybacked onto a connect operation by
 using the
 .Xr sendto 2
diff --git a/lib/libc_r/man/pthread_cond_wait.3 b/lib/libc_r/man/pthread_cond_wait.3
index 9d70318..ccbf138 100644
--- a/lib/libc_r/man/pthread_cond_wait.3
+++ b/lib/libc_r/man/pthread_cond_wait.3
@@ -48,7 +48,8 @@ variable specified by
 and unblocks the mutex specified by
 .Fa mutex .
 The waiting thread unblocks only after another thread calls
-.Xr pthread_cond_signal 3 , or
+.Xr pthread_cond_signal 3 ,
+or
 .Xr pthread_cond_broadcast 3
 with the same condition variable, and the current thread requires the lock
 on
diff --git a/lib/libc_r/man/pthread_testcancel.3 b/lib/libc_r/man/pthread_testcancel.3
index c1bbc7d..c27c16d 100644
--- a/lib/libc_r/man/pthread_testcancel.3
+++ b/lib/libc_r/man/pthread_testcancel.3
@@ -195,5 +195,5 @@ conforms to ISO/IEC 9945-1 ANSI/IEEE
 Std 1003.1 Second Edition 1996-07-12.
 .Sh AUTHORS
 This man page was written by
-.An David Leonard <d@openbsd.org> 
+.An David Leonard Aq d@openbsd.org
 for the OpenBSD implementation of pthread_cancel.
diff --git a/lib/libcompat/4.3/lsearch.3 b/lib/libcompat/4.3/lsearch.3
index fe494f3..3e0ba94 100644
--- a/lib/libcompat/4.3/lsearch.3
+++ b/lib/libcompat/4.3/lsearch.3
@@ -37,7 +37,7 @@
 .Os
 .Sh NAME
 .Nm lsearch ,
-.Nm lfind,
+.Nm lfind
 .Nd linear searching routines
 .Sh LIBRARY
 .Lb libcompat
diff --git a/lib/libcompat/4.3/re_comp.3 b/lib/libcompat/4.3/re_comp.3
index 16f75cf..10cd0a8 100644
--- a/lib/libcompat/4.3/re_comp.3
+++ b/lib/libcompat/4.3/re_comp.3
@@ -91,7 +91,7 @@ and
 .Fn re_exec
 may have trailing or embedded newline characters; 
 they are terminated by
-.Dv NUL Ns s.
+.Dv NUL Ns s .
 The regular expressions recognized are described in the manual entry for 
 .Xr ed 1 ,
 given the above difference.
diff --git a/lib/libcompat/4.3/rexec.3 b/lib/libcompat/4.3/rexec.3
index 6101d1a..baa4601 100644
--- a/lib/libcompat/4.3/rexec.3
+++ b/lib/libcompat/4.3/rexec.3
@@ -74,7 +74,7 @@ specifies which well-known
 .Tn DARPA
 Internet port to use for
 the connection; the call
-.Ql getservbyname(\\*qexec\\*q, \\*qtcp\\*q)
+.Fn getservbyname \*qexec\*q \*qtcp\*q
 (see 
 .Xr getservent 3 )
 will return a pointer to a structure, which contains the
diff --git a/lib/libdevstat/devstat.3 b/lib/libdevstat/devstat.3
index 8b8ff14..67e06e8 100644
--- a/lib/libdevstat/devstat.3
+++ b/lib/libdevstat/devstat.3
@@ -518,7 +518,7 @@ The
 statistics system first appeared in
 .Fx 3.0 .
 .Sh AUTHORS
-.An Kenneth Merry Aq ken@FreeBSD.ORG
+.An Kenneth Merry Aq ken@FreeBSD.org
 .Sh BUGS
 There should probably be an interface to de-allocate memory allocated by
 .Fn getdevs ,
diff --git a/lib/libdisk/libdisk.3 b/lib/libdisk/libdisk.3
index db582ec..e097cba 100644
--- a/lib/libdisk/libdisk.3
+++ b/lib/libdisk/libdisk.3
@@ -66,7 +66,7 @@
 .Fd #include <sys/types.h>
 .Fd #include <libdisk.h>
 .Pp
-.Dv extern const char *chunk_n[];
+.Vt extern const char *chunk_n[] ;
 .Ft const char *
 .Fn slice_type_name "int type" "int subtype"
 .Ft struct disk *
diff --git a/lib/libedit/editline.3 b/lib/libedit/editline.3
index 8dfa4eb..e968818 100644
--- a/lib/libedit/editline.3
+++ b/lib/libedit/editline.3
@@ -198,7 +198,7 @@ Refer to
 .Xr editrc 5
 for more information.
 .Pp
-.Em NOTE:
+.Em NOTE :
 .Va argv[0]
 may be modified by
 .Fn el_parse .
@@ -348,7 +348,7 @@ Expecting further command input as arguments, do nothing visually.
 Refresh display.
 .It Dv CC_CURSOR
 Cursor moved, so update and perform
-.Dv CC_REFRESH.
+.Dv CC_REFRESH .
 .It Dv CC_REDISPLAY
 Redisplay entire input line.
 This is useful if a key binding outputs extra information.
@@ -420,8 +420,7 @@ Delete
 characters before the cursor.
 .It Fn el_data_set
 Set the user data to
-.Fa data
-.
+.Fa data .
 .It Fn el_data_get
 Get the user data.
 .El
diff --git a/lib/libftpio/ftpio.3 b/lib/libftpio/ftpio.3
index 6815992..6d12149 100644
--- a/lib/libftpio/ftpio.3
+++ b/lib/libftpio/ftpio.3
@@ -49,31 +49,31 @@
 .Ft FILE *
 .Fn ftpLogin "char *host" "char *user" "char *passwd" "int ftp_port" "int verbose" "int *retcode"
 .Ft int
-.Fn ftpChdir "FILE *stream, char *dirname"
+.Fn ftpChdir "FILE *stream" "char *dirname"
 .Ft int
 .Fn ftpErrno "FILE *stream"
 .Ft const char *
 .Fn ftpErrString "int errno"
 .Ft time_t
-.Fn ftpGetModtime "FILE *stream, char *file"
+.Fn ftpGetModtime "FILE *stream" "char *file"
 .Ft off_t
-.Fn ftpGetSize "FILE *stream, char *file"
+.Fn ftpGetSize "FILE *stream" "char *file"
 .Ft FILE *
-.Fn ftpGet "FILE *stream, char *file, off_t *seekto"
+.Fn ftpGet "FILE *stream" "char *file" "off_t *seekto"
 .Ft FILE *
-.Fn ftpPut "FILE *stream, char *file"
+.Fn ftpPut "FILE *stream" "char *file"
 .Ft int
 .Fn ftpAscii "FILE *stream"
 .Ft int
 .Fn ftpBinary "FILE *stream"
 .Ft int
-.Fn ftpPassive "FILE *stream, int status"
+.Fn ftpPassive "FILE *stream" "int status"
 .Ft void
-.Fn ftpVerbose "FILE *stream, int status"
+.Fn ftpVerbose "FILE *stream" "int status"
 .Ft FILE *
-.Fn ftpGetURL "char *url, char *user, char *passwd, int *retcode"
+.Fn ftpGetURL "char *url" "char *user" "char *passwd" "int *retcode"
 .Ft FILE *
-.Fn ftpPutURL "char *url, char *user, char *passwd, int *retcode"
+.Fn ftpPutURL "char *url" "char *user" "char *passwd" "int *retcode"
 .Ft int
 .Fn ftpLoginAf "char *host" "int af" "char *user" "char *passwd" "int ftp_port" "int verbose" "int *retcode"
 .Ft FILE *
@@ -86,7 +86,7 @@ These functions implement a high-level library for managing FTP connections.
 .Fn ftpLogin
 attempts to log in using the supplied
 .Fa user ,
-.Fa passwd,
+.Fa passwd ,
 .Fa ftp_port
 (if passed as 0,
 .Fa ftp_port
@@ -101,7 +101,7 @@ will have the error code returned by the foreign server.
 .Pp
 .Fn ftpChdir
 attempts to issue a server CD command to the directory named in
-.Fa dir.
+.Fa dir .
 On success, zero is returned.  On failure, the error code from the server.
 .Pp
 .Fn ftpErrno
diff --git a/lib/libipsec/ipsec_strerror.3 b/lib/libipsec/ipsec_strerror.3
index d0d3977..66ae950 100644
--- a/lib/libipsec/ipsec_strerror.3
+++ b/lib/libipsec/ipsec_strerror.3
@@ -44,8 +44,9 @@
 .Sh DESCRIPTION
 .Pa netinet6/ipsec.h
 declares
-.Pp
-.Dl extern int ipsec_errcode;
+.Bd -ragged -offset indent
+.Vt extern int ipsec_errcode ;
+.Ed
 .Pp
 which is used to pass error code from IPsec policy manipulation library
 to user program.
diff --git a/lib/libkvm/kvm_getfiles.3 b/lib/libkvm/kvm_getfiles.3
index 2ae572d..ec4df46 100644
--- a/lib/libkvm/kvm_getfiles.3
+++ b/lib/libkvm/kvm_getfiles.3
@@ -56,7 +56,7 @@
 .Sh DESCRIPTION
 .Fn kvm_getfiles
 returns a (sub-)set of the open files in the kernel indicated by
-.Fa kd.
+.Fa kd .
 The
 .Fa op
 and
diff --git a/lib/libkvm/kvm_getprocs.3 b/lib/libkvm/kvm_getprocs.3
index dea79f8..c823cf5 100644
--- a/lib/libkvm/kvm_getprocs.3
+++ b/lib/libkvm/kvm_getprocs.3
@@ -60,7 +60,7 @@
 .Sh DESCRIPTION
 .Fn kvm_getprocs
 returns a (sub-)set of active processes in the kernel indicated by
-.Fa kd.
+.Fa kd .
 The
 .Fa op
 and
diff --git a/lib/libkvm/kvm_getswapinfo.3 b/lib/libkvm/kvm_getswapinfo.3
index 9085661..5e41d3e 100644
--- a/lib/libkvm/kvm_getswapinfo.3
+++ b/lib/libkvm/kvm_getswapinfo.3
@@ -21,14 +21,25 @@
 .Sh DESCRIPTION
 The
 .Fn kvm_getswapinfo
-function fills an array of kvm_swap structures with swap summary
-information for each swap device, for up to maxswap - 1 devices.
-The number of devices, up to maxswap - 1, is returned.  A grand
-total of all swap devices ( including any devices that go beyond
-maxswap - 1 ) is returned in one additional array entry.  This
-entry is not counted in the return value.  Thus, if you specify
-a maxswap value of 1, the function will typically return the
-value 0 and the single kvm_swap structure will be filled with
+function fills an array of
+.Vt kvm_swap
+structures with swap summary
+information for each swap device, for up to
+.Fa maxswap
+\- 1 devices.
+The number of devices, up to
+.Fa maxswap
+\- 1, is returned.  A grand
+total of all swap devices (including any devices that go beyond
+.Fa maxswap
+\- 1) is returned in one additional array entry.  This
+entry is not counted in the return value.
+Thus, if you specify a
+.Fa maxswap
+value of 1, the function will typically return the
+value 0 and the single
+.Vt kvm_swap
+structure will be filled with
 the grand total over all swap devices.  The grand total is calculated
 from all available swap devices whether or not you made room 
 for them all in the array.
@@ -38,21 +49,36 @@ The flags argument is currently unused and must be passed as 0.
 .Pp
 If an error occurs, -1 is returned.
 .Pp
-Each swap partition and the grand total is summarized in the kvm_swap
+Each swap partition and the grand total is summarized in the
+.Vt kvm_swap
 structure.  This structure contains the following fields:
-.Bl -inset -width indent
-.It char ksw_devname[];
-.It int ksw_total;
-.It int ksw_used;
-.It int ksw_flags;
+.Pp
+.Bl -item -offset indent -compact
+.It
+.Va char ksw_devname[] ;
+.It
+.Va int ksw_total ;
+.It
+.Va int ksw_used ;
+.It
+.Va int ksw_flags ;
 .El
 .Pp
-Values are in PAGE_SIZE'd chunks ( see getpagesize() ).  ksw_flags contains
+Values are in
+.Dv PAGE_SIZE Ns 'd
+chunks (see
+.Xr getpagesize 3 ) .
+.Va ksw_flags
+contains
 a copy of the swap device flags.
 .Pp
 .Sh CACHING
 This function caches the nlist values for various kernel variables which
-it reuses in successive calls.  You may call the function with kd == NULL 
+it reuses in successive calls.
+You may call the function with
+.Fa kd
+==
+.Dv NULL 
 to clear the cache.
 .Sh DIAGNOSTICS
 If the load average was unobtainable, \-1 is returned; otherwise,
diff --git a/lib/libm/common_source/asin.3 b/lib/libm/common_source/asin.3
index a712e9c..ca8ffda 100644
--- a/lib/libm/common_source/asin.3
+++ b/lib/libm/common_source/asin.3
@@ -57,7 +57,7 @@ The
 .Fn asin
 function returns the arc sine in the range
 .Bk -words
-.Bq -\*(Pi/2, +\*(Pi/2
+.Bq -\*(Pi/2 , +\*(Pi/2
 .Ek
 radians.
 On the
diff --git a/lib/libm/common_source/exp.3 b/lib/libm/common_source/exp.3
index 71d58a5..09fc4fe 100644
--- a/lib/libm/common_source/exp.3
+++ b/lib/libm/common_source/exp.3
@@ -220,7 +220,8 @@ and
 .Em NaN
 (the reserved
 operand on a
-.Tn VAX ) .  Previous implementations of pow may
+.Tn VAX ) .
+Previous implementations of pow may
 have defined x**0 to be undefined in some or all of these
 cases.  Here are reasons for returning x**0 = 1 always:
 .Bl -enum -width indent
diff --git a/lib/libm/common_source/hypot.3 b/lib/libm/common_source/hypot.3
index 281ec0c..2f77bb0 100644
--- a/lib/libm/common_source/hypot.3
+++ b/lib/libm/common_source/hypot.3
@@ -45,7 +45,7 @@
 .Fd #include <math.h>
 .Ft double
 .Fn hypot "double x" "double y"
-.Fd struct {double x, y;} z;
+.Vt struct {double x, y;} z ;
 .Ft double
 .Fn cabs z
 .Sh DESCRIPTION
diff --git a/lib/libm/common_source/ieee.3 b/lib/libm/common_source/ieee.3
index 466a9a6..a14e7ef 100644
--- a/lib/libm/common_source/ieee.3
+++ b/lib/libm/common_source/ieee.3
@@ -68,7 +68,7 @@ function
 returns
 .Fa x
 with its sign changed to
-.Fa y Ns 's.
+.Fa y Ns 's .
 .Pp
 The
 .Fn drem
@@ -102,7 +102,7 @@ the remainder is computed exactly and
 .Sm on
 \*(Le
 .Sm off
-.Pf \\*(Ba Fa y No \\*(Ba/2.
+.Pf \\*(Ba Fa y No \\*(Ba/2 .
 .Sm on
 But
 .Fn drem x 0
@@ -218,7 +218,7 @@ return  \-1.7e38?
 .Pp
 .Tn IEEE
 754 currently specifies that
-.Fn logb "denormalized no."
+.Fn logb "denormalized no.\&"
 =
 .Fn logb "tiniest normalized no. > 0"
 but the consensus has changed to the specification in the new 
diff --git a/lib/libm/common_source/lgamma.3 b/lib/libm/common_source/lgamma.3
index cd55003..537b5b7 100644
--- a/lib/libm/common_source/lgamma.3
+++ b/lib/libm/common_source/lgamma.3
@@ -98,7 +98,7 @@ return appropriate values unless an argument is out of range.
 Overflow will occur for sufficiently large positive values, and
 non-positive integers.
 On the
-.Tn VAX,
+.Tn VAX ,
 the reserved operator is returned,
 and
 .Va errno
diff --git a/lib/libpthread/man/pthread_cond_wait.3 b/lib/libpthread/man/pthread_cond_wait.3
index 9d70318..ccbf138 100644
--- a/lib/libpthread/man/pthread_cond_wait.3
+++ b/lib/libpthread/man/pthread_cond_wait.3
@@ -48,7 +48,8 @@ variable specified by
 and unblocks the mutex specified by
 .Fa mutex .
 The waiting thread unblocks only after another thread calls
-.Xr pthread_cond_signal 3 , or
+.Xr pthread_cond_signal 3 ,
+or
 .Xr pthread_cond_broadcast 3
 with the same condition variable, and the current thread requires the lock
 on
diff --git a/lib/libpthread/man/pthread_testcancel.3 b/lib/libpthread/man/pthread_testcancel.3
index c1bbc7d..c27c16d 100644
--- a/lib/libpthread/man/pthread_testcancel.3
+++ b/lib/libpthread/man/pthread_testcancel.3
@@ -195,5 +195,5 @@ conforms to ISO/IEC 9945-1 ANSI/IEEE
 Std 1003.1 Second Edition 1996-07-12.
 .Sh AUTHORS
 This man page was written by
-.An David Leonard <d@openbsd.org> 
+.An David Leonard Aq d@openbsd.org
 for the OpenBSD implementation of pthread_cancel.
diff --git a/lib/libstand/libstand.3 b/lib/libstand/libstand.3
index 9e9a523..0305535 100644
--- a/lib/libstand/libstand.3
+++ b/lib/libstand/libstand.3
@@ -46,16 +46,25 @@ and
 .Xr bstring 3 .
 .Sh MEMORY ALLOCATION
 .Bl -hang -width 10n
-.It Fn "void *malloc" "size_t size"
+.It Xo
+.Ft "void *"
+.Fn malloc "size_t size"
+.Xc
 .Pp
 Allocate
 .Fa size
 bytes of memory from the heap using a best-fit algorithm.
-.It Fn "void free" "void *ptr"
+.It Xo
+.Ft void
+.Fn free "void *ptr"
+.Xc
 .Pp
 Free the allocated object at
 .Fa ptr .
-.It Fn "void setheap" "void *start" "void *limit"
+.It Xo
+.Ft void
+.Fn setheap "void *start" "void *limit"
+.Xc
 .Pp
 Initialise the heap.  This function must be called before calling
 .Fn alloc
@@ -65,7 +74,10 @@ and
 .Fa limit
 will be used for the heap; attempting to allocate beyond this will result
 in a panic.
-.It Fn "char *sbrk" "int junk"
+.It Xo
+.Ft "char *"
+.Fn sbrk "int junk"
+.Xc
 .Pp
 Provides the behaviour of
 .Fn sbrk 0 ,
@@ -79,17 +91,35 @@ A set of functions are provided for manipulating a flat variable space similar
 to the traditional shell-supported evironment.  Major enhancements are support
 for set/unset hook functions.
 .Bl -hang -width 10n
-.It Fn "char *getenv" "const char *name"
-.It Fn "int setenv" "const char *name" "char *value" "int overwrite"
-.It Fn "int putenv" "const char *string"
-.It Fn "int unsetenv" "const char *name"
+.It Xo
+.Ft "char *"
+.Fn getenv "const char *name"
+.Xc
+.It Xo
+.Ft int
+.Fn setenv "const char *name" "char *value" "int overwrite"
+.Xc
+.It Xo
+.Ft int
+.Fn putenv "const char *string"
+.Xc
+.It Xo
+.Ft int
+.Fn unsetenv "const char *name"
+.Xc
 .Pp
 These functions behave similarly to their standard library counterparts.
-.It Fn "struct env_var *env_getenv" "const char *name"
+.It Xo
+.Ft "struct env_var *"
+.Fn env_getenv "const char *name"
+.Xc
 .Pp
 Looks up a variable in the environment and returns its entire 
 data structure.
-.It Fn "int env_setenv" "const char *name" "int flags" "char *value" "ev_sethook_t sethook" "ev_unsethook_t unsethook"
+.It Xo
+.Ft int
+.Fn env_setenv "const char *name" "int flags" "char *value" "ev_sethook_t sethook" "ev_unsethook_t unsethook"
+.Xc
 .Pp
 Creates a new or sets an existing environment variable called
 .Fa name .
@@ -117,20 +147,41 @@ may be used to prevent a variable being unset.
 .El
 .Sh STANDARD LIBRARY SUPPORT
 .Bl -hang -width 10n
-.It Fn "int getopt" "int argc" "char * const *argv" "cont char *optstring"
-.It Fn "long strtol" "const char *nptr" "char **endptr" "int base"
-.It Fn "void srandom" "unsigned long seed"
-.It Fn "unsigned long random" "void"
-.It Fn "char *strerror" "int error"
+.It Xo
+.Ft int
+.Fn getopt "int argc" "char * const *argv" "cont char *optstring"
+.Xc
+.It Xo
+.Ft long
+.Fn strtol "const char *nptr" "char **endptr" "int base"
+.Xc
+.It Xo
+.Ft void
+.Fn srandom "unsigned long seed"
+.Xc
+.It Xo
+.Ft "unsigned long"
+.Fn random void
+.Xc
+.It Xo
+.Ft "char *"
+.Fn strerror "int error"
+.Xc
 .Pp
 Returns error messages for the subset of errno values supported by
 .Nm No .
-.It Fn "assert" "expression"
+.It Fn assert expression
 .Pp
 Requires
 .Fd #include <assert.h>
-.It Fn "int setjmp" "jmp_buf env"
-.It Fn "void longjmp" "jmp_buf env" "int val"
+.It Xo
+.Ft int
+.Fn setjmp "jmp_buf env"
+.Xc
+.It Xo
+.Ft void
+.Fn longjmp "jmp_buf env" "int val"
+.Xc
 .Pp
 Defined as
 .Fn _setjmp
@@ -141,12 +192,18 @@ respectively as there is no signal state to manipulate.  Requires
 .El
 .Sh CHARACTER I/O
 .Bl -hang -width 10n
-.It Fn "void gets" "char *buf"
+.It Xo
+.Ft void
+.Fn gets "char *buf"
+.Xc
 .Pp
 Read characters from the console into
 .Fa buf .
 All of the standard cautions apply to this function.
-.It Fn "void ngets" "char *buf" "size_t size"
+.It Xo
+.Ft void
+.Fn ngets "char *buf" "size_t size"
+.Xc
 .Pp
 Read at most
 .Fa size
@@ -156,7 +213,10 @@ If
 .Fa size
 is less than 1, the function's behaviour is as for
 .Fn gets .
-.It Fn "int fgetstr" "char *buf" "int size" "int fd"
+.It Xo
+.Ft int
+.Fn fgetstr "char *buf" "int size" "int fd"
+.Xc
 .Pp
 Read a line of at most
 .Fa size
@@ -166,10 +226,22 @@ Line terminating characters are stripped, and the buffer is always nul
 terminated.  Returns the number of characters in
 .Fa buf
 if successful, or -1 if a read error occurs.
-.It Fn "int printf" "const char *fmt" "..."
-.It Fn "void vprintf" "const char *fmt" "va_list ap"
-.It Fn "int sprintf" "char *buf" "const char *fmt" "..."
-.It Fn "void vsprintf" "char *buf" "const char *fmt" "va_list ap"
+.It Xo
+.Ft int
+.Fn printf "const char *fmt" "..."
+.Xc
+.It Xo
+.Ft void
+.Fn vprintf "const char *fmt" "va_list ap"
+.Xc
+.It Xo
+.Ft int
+.Fn sprintf "char *buf" "const char *fmt" "..."
+.Xc
+.It Xo
+.Ft void
+.Fn vsprintf "char *buf" "const char *fmt" "va_list ap"
+.Xc
 .Pp
 The *printf functions implement a subset of the standard
 .Fn printf
@@ -233,19 +305,49 @@ ptr,
 .El
 .Sh CHARACTER TESTS AND CONVERSIONS
 .Bl -hang -width 10n
-.It Fn "int isupper" "int c"
-.It Fn "int islower" "int c"
-.It Fn "int isspace" "int c"
-.It Fn "int isdigit" "int c"
-.It Fn "int isxdigit" "int c"
-.It Fn "int isascii" "int c"
-.It Fn "int isalpha" "int c"
-.It Fn "int toupper" "int c"
-.It Fn "int tolower" "int c"
+.It Xo
+.Ft int
+.Fn isupper "int c"
+.Xc
+.It Xo
+.Ft int
+.Fn islower "int c"
+.Xc
+.It Xo
+.Ft int
+.Fn isspace "int c"
+.Xc
+.It Xo
+.Ft int
+.Fn isdigit "int c"
+.Xc
+.It Xo
+.Ft int
+.Fn isxdigit "int c"
+.Xc
+.It Xo
+.Ft int
+.Fn isascii "int c"
+.Xc
+.It Xo
+.Ft int
+.Fn isalpha "int c"
+.Xc
+.It Xo
+.Ft int
+.Fn toupper "int c"
+.Xc
+.It Xo
+.Ft int
+.Fn tolower "int c"
+.Xc
 .El
 .Sh FILE I/O
 .Bl -hang -width 10n
-.It Fn "int open" "const char *path" "int flags"
+.It Xo
+.Ft int
+.Fn open "const char *path" "int flags"
+.Xc
 .Pp
 Similar to the behaviour as specified in
 .Xr open 2 ,
@@ -254,20 +356,41 @@ required.  The
 .Fa flags
 argument may be one of O_RDONLY, O_WRONLY and O_RDWR (although no filesystems
 currently support writing).
-.It Fn "int close" "int fd"
-.It Fn "void closeall" "void"
+.It Xo
+.Ft int
+.Fn close "int fd"
+.Xc
+.It Xo
+.Ft void
+.Fn closeall void
+.Xc
 .Pp
 Close all open files.
-.It Fn "ssize_t read" "int fd" "void *buf" "size_t len"
-.It Fn "ssize_t write" "int fd" "void *buf" "size_t len"
+.It Xo
+.Ft ssize_t
+.Fn read "int fd" "void *buf" "size_t len"
+.Xc
+.It Xo
+.Ft ssize_t
+.Fn write "int fd" "void *buf" "size_t len"
+.Xc
 .Pp
 (No filesystems currently support writing.)
-.It Fn "off_t lseek" "int fd" "off_t offset" "int whence"
+.It Xo
+.Ft off_t
+.Fn lseek "int fd" "off_t offset" "int whence"
+.Xc
 .Pp
 Files being automatically uncompressed during reading cannot seek backwards
 from the current point.
-.It Fn "int stat" "const char *path" "struct stat *sb"
-.It Fn "int fstat" "int fd" "struct stat *sb"
+.It Xo
+.Ft int
+.Fn stat "const char *path" "struct stat *sb"
+.Xc
+.It Xo
+.Ft int
+.Fn fstat "int fd" "struct stat *sb"
+.Xc
 .Pp
 The
 .Fn stat
@@ -285,15 +408,24 @@ filesystem always reports files having uid/gid of zero.
 .Nm
 supplies a simple internal pager to ease reading the output of large commands.
 .Bl -hang -width 10n
-.It Fn "void pager_open"
+.It Xo
+.Ft void
+.Fn pager_open
+.Xc
 .Pp
 Initialises the pager and tells it that the next line output will be the top of the
 display.  The environment variable LINES is consulted to determine the number of
 lines to be displayed before pausing.
-.It Fn "void pager_close" "void"
+.It Xo
+.Ft void
+.Fn pager_close void
+.Xc
 .Pp
 Closes the pager.
-.It Fn "void pager_output" "char *lines"
+.It Xo
+.Ft void
+.Fn pager_output "char *lines"
+.Xc
 .Pp
 Sends the lines in the nul-terminated buffer at
 .Fa lines
@@ -302,7 +434,10 @@ of lines being output (wrapped lines are not accounted for).
 .Fn pager_output
 will return zero when all of the lines have been output, or nonzero if the
 display was paused and the user elected to quit.
-.It Fn "int pager_file" "char *fname"
+.It Xo
+.Ft int
+.Fn pager_file "char *fname"
+.Xc
 .Pp
 Attempts to open and display the file
 .Fa fname .
@@ -310,7 +445,10 @@ Returns -1 on error, 0 at EOF, or 1 if the user elects to quit while reading.
 .El
 .Sh MISC
 .Bl -hang -width 10n
-.It Fn "void twiddle" "void"
+.It Xo
+.Ft void
+.Fn twiddle void
+.Xc
 .Pp
 Successive calls emit the characters in the sequence |,/,-,\\ followed by a 
 backspace in order to provide reassurance to the user.
@@ -356,16 +494,25 @@ returns.
 .Pp
 The consumer must provide the following support functions:
 .Bl -hang -width 10n
-.It Fn "int getchar" "void"
+.It Xo
+.Ft int
+.Fn getchar void
+.Xc
 .Pp
 Return a character from the console, used by
 .Fn gets ,
 .Fn ngets
 and pager functions.
-.It Fn "int ischar" "void"
+.It Xo
+.Ft int
+.Fn ischar void
+.Xc
 .Pp
 Returns nonzero if a character is waiting from the console.
-.It Fn "void putchar" "int"
+.It Xo
+.Ft void
+.Fn putchar int
+.Xc
 .Pp
 Write a character to the console, used by
 .Fn gets , 
@@ -375,7 +522,10 @@ Write a character to the console, used by
 and
 .Fn twiddle
 and thus by many other functions for debugging and informational output.
-.It Fn "int devopen" "struct open_file *of" "const char *name" "char **file"
+.It Xo
+.Ft int
+.Fn devopen "struct open_file *of" "const char *name" "char **file"
+.Xc
 .Pp
 Open the appropriate device for the file named in
 .Fa name ,
@@ -388,18 +538,24 @@ which does not refer to the device.  The
 field in 
 .Fa of
 will be set to point to the
-.Dv devsw
+.Vt devsw
 structure for the opened device if successful.  Device identifiers must
 always precede the path component, but may otherwise be arbitrarily formatted.
 Used by
 .Fn open
 and thus for all device-related I/O.
-.It Fn "int devclose" "struct open_file *of"
+.It Xo
+.Ft int
+.Fn devclose "struct open_file *of"
+.Xc
 Close the device allocated for
 .Fa of .
 The device driver itself will already have been called for the close; this call
 should clean up any allocation made by devopen only.
-.It Fn "void panic" "const char *msg" "..."
+.It Xo
+.Ft void
+.Fn panic "const char *msg" "..."
+.Xc
 .Pp
 Signal a fatal and unrecoverable error condition.  The
 .Fa msg ...
@@ -408,9 +564,10 @@ arguments are as for
 .El
 .Sh INTERNAL FILESYSTEMS
 Internal filesystems are enabled by the consumer exporting the array
-.Dv struct fs_ops *file_system[], which should be initialised with pointers
+.Vt struct fs_ops *file_system[] ,
+which should be initialised with pointers
 to
-.Dv struct fs_ops
+.Vt struct fs_ops
 structures.  The following filesystem handlers are supplied by
 .Nm No ,
 the consumer may supply other filesystems of their own:
@@ -433,7 +590,7 @@ appends
 .Li .gz
 to the end of the filename, and then tries to locate the file using the other
 filesystems.  Placement of this filesystem in the
-.Dv file_system[]
+.Va file_system[]
 array determines whether gzipped files will be opened in preference to non-gzipped
 files.  It is only possible to seek a gzipped file forwards, and
 .Fn stat
@@ -443,11 +600,11 @@ on gzipped files will report an invalid length.
 .El
 .Pp
 The array of
-.Dv struct fs_ops
+.Vt struct fs_ops
 pointers should be terminated with a NULL.
 .Sh DEVICES
 Devices are exported by the supporting code via the array
-.Dv struct devsw *devsw[]
+.Vt struct devsw *devsw[]
 which is a NULL terminated array of pointers to device switch structures.
 .Sh BUGS
 .Pp
diff --git a/lib/libutil/login_times.3 b/lib/libutil/login_times.3
index c097638..bdf66f3 100644
--- a/lib/libutil/login_times.3
+++ b/lib/libutil/login_times.3
@@ -133,7 +133,7 @@ of login_time_t objects, which is up to LC_MAXTIMES (64)
 elements in length, and terminated by an element with its
 .Ar lt_dow
 field set to
-.Em LTM_NONE.
+.Em LTM_NONE .
 .Sh RETURN VALUES
 .Fn parse_lt
 returns a filled in structure of type login_time_t containing the
diff --git a/lib/libutil/uucplock.3 b/lib/libutil/uucplock.3
index 24b891c..404834b 100644
--- a/lib/libutil/uucplock.3
+++ b/lib/libutil/uucplock.3
@@ -88,33 +88,33 @@ returns 0 on success and -1 on failure.
 .Fn uu_lock
 may return any of the following values:
 .Pp
-.Dv UU_LOCK_INUSE:
+.Dv UU_LOCK_INUSE :
 The lock is in use by another process.
 .Pp
-.Dv UU_LOCK_OK:
+.Dv UU_LOCK_OK :
 The lock was successfully created.
 .Pp
-.Dv UU_LOCK_OPEN_ERR:
+.Dv UU_LOCK_OPEN_ERR :
 The lock file could not be opened via
 .Xr open 2 .
 .Pp
-.Dv UU_LOCK_READ_ERR:
+.Dv UU_LOCK_READ_ERR :
 The lock file could not be read via
 .Xr read 2 .
 .Pp
-.Dv UU_LOCK_CREAT_ERR:
+.Dv UU_LOCK_CREAT_ERR :
 Can't create temporary lock file via
 .Xr creat 2 .
 .Pp
-.Dv UU_LOCK_WRITE_ERR:
+.Dv UU_LOCK_WRITE_ERR :
 The current process id could not be written to the lock file via a call to
 .Xr write 2 .
 .Pp
-.Dv UU_LOCK_LINK_ERR:
+.Dv UU_LOCK_LINK_ERR :
 Can't link temporary lock file via
 .Xr link 2 .
 .Pp
-.Dv UU_LOCK_TRY_ERR:
+.Dv UU_LOCK_TRY_ERR :
 Locking attempts are failed after 5 tries.
 .Pp
 If a value of
@@ -137,14 +137,14 @@ and
 .Fn uu_lock_txfr
 may return any of the following values:
 .Pp
-.Dv UU_LOCK_OK:
+.Dv UU_LOCK_OK :
 The transfer was successful.  The specified process now holds the device
 lock.
 .Pp
-.Dv UU_LOCK_OWNER_ERR:
+.Dv UU_LOCK_OWNER_ERR :
 The current process does not already own a lock on the specified device.
 .Pp
-.Dv UU_LOCK_WRITE_ERR:
+.Dv UU_LOCK_WRITE_ERR :
 The new process id could not be written to the lock file via a call to
 .Xr write 2 .
 .Sh ERRORS
diff --git a/lib/msun/man/asin.3 b/lib/msun/man/asin.3
index 1e4b2c1..b0728ee 100644
--- a/lib/msun/man/asin.3
+++ b/lib/msun/man/asin.3
@@ -62,7 +62,7 @@ and the
 .Fn asinf
 functions return the arc sine in the range
 .Bk -words
-.Bq -\*(Pi/2, +\*(Pi/2
+.Bq -\*(Pi/2 , +\*(Pi/2
 .Ek
 radians.
 On the
diff --git a/lib/msun/man/exp.3 b/lib/msun/man/exp.3
index 56e0cf8..e4cf9fb 100644
--- a/lib/msun/man/exp.3
+++ b/lib/msun/man/exp.3
@@ -99,7 +99,7 @@ The
 and the
 .Fn logf
 functions compute the value of the natural logarithm of argument 
-.Fa x.
+.Fa x .
 .Pp
 The
 .Fn log10
@@ -257,7 +257,8 @@ and
 .Em NaN
 (the reserved
 operand on a
-.Tn VAX ) .  Previous implementations of pow may
+.Tn VAX ) .
+Previous implementations of pow may
 have defined x**0 to be undefined in some or all of these
 cases.  Here are reasons for returning x**0 = 1 always:
 .Bl -enum -width indent
diff --git a/lib/msun/man/hypot.3 b/lib/msun/man/hypot.3
index c65064a..a139e39 100644
--- a/lib/msun/man/hypot.3
+++ b/lib/msun/man/hypot.3
@@ -47,10 +47,10 @@
 .Fn hypot "double x" "double y"
 .Ft float
 .Fn hypotf "float x" "float y"
-.Fd struct {double x, y;} z;
+.Vt struct {double x, y;} z ;
 .Ft double
 .Fn cabs z
-.Fd struct {float x, y;} z;
+.Vt struct {float x, y;} z ;
 .Ft float
 .Fn cabsf z
 .Sh DESCRIPTION
diff --git a/lib/msun/man/ieee.3 b/lib/msun/man/ieee.3
index a9cc695..2aed69f 100644
--- a/lib/msun/man/ieee.3
+++ b/lib/msun/man/ieee.3
@@ -85,7 +85,7 @@ and
 return
 .Fa x
 with its sign changed to
-.Fa y Ns 's.
+.Fa y Ns 's .
 .Pp
 .Fn finite
 and
@@ -157,7 +157,7 @@ the remainder is computed exactly and
 .Sm on
 \*(Le
 .Sm off
-.Pf \\*(Ba Fa y No \\*(Ba/2.
+.Pf \\*(Ba Fa y No \\*(Ba/2 .
 .Sm on
 But
 .Fn remainder x 0
diff --git a/lib/msun/man/lgamma.3 b/lib/msun/man/lgamma.3
index 333bf77..9800999 100644
--- a/lib/msun/man/lgamma.3
+++ b/lib/msun/man/lgamma.3
@@ -112,7 +112,7 @@ return appropriate values unless an argument is out of range.
 Overflow will occur for sufficiently large positive values, and
 non-positive integers.
 On the
-.Tn VAX,
+.Tn VAX ,
 the reserved operator is returned,
 and
 .Va errno
diff --git a/libexec/atrun/atrun.man b/libexec/atrun/atrun.man
index 8e58661..1dc7b6f 100644
--- a/libexec/atrun/atrun.man
+++ b/libexec/atrun/atrun.man
@@ -19,9 +19,10 @@ Root's
 file
 .Pa /etc/crontab
 has to contain the line
-.nf
+.Bd -literal
 */5     *       *       *       *       root    /usr/libexec/atrun
-.fi
+.Ed
+.Pp
 so that
 .Xr atrun 8
 gets invoked every five minutes.
diff --git a/libexec/bootpd/bootpd.8 b/libexec/bootpd/bootpd.8
index fa30a2e..82c7b40 100644
--- a/libexec/bootpd/bootpd.8
+++ b/libexec/bootpd/bootpd.8
@@ -32,7 +32,7 @@ RFC951, RFC1532, and RFC1533.
 .Nm Bootpgw
 implements a simple BOOTP gateway which can be used to forward
 requests and responses between clients on one subnet and a
-BOOTP server (i.e.
+BOOTP server (i.e.\&
 .Nm )
 on another subnet. While either
 .Nm
@@ -132,7 +132,7 @@ useful when client boot files are specified as relative pathnames, and
 .Nm
 needs to use the same current directory as the TFTP server
 (typically
-.Pa /tftpboot Ns ).
+.Pa /tftpboot ) .
 This option is not recognized by
 .Nm bootpgw .
 .It Fl i
@@ -189,7 +189,7 @@ the client has been waiting for at least three seconds.
 When
 .Nm
 is started it reads a configuration file, (normally
-.Pa /etc/bootptab Ns )
+.Pa /etc/bootptab )
 that initializes the internal database of known clients and client
 options.  This internal database is reloaded
 from the configuration file when
@@ -221,7 +221,7 @@ During initialization, both programs
 determine the UDP port numbers to be used by calling
 .Xr getservbyname 3
 (which normally uses
-.Pa /etc/services Ns ).
+.Pa /etc/services ) .
 Two service names (and port numbers) are used:
 .Pp
 .Dl bootps BOOTP Server listening port
diff --git a/libexec/bootpd/bootptab.5 b/libexec/bootpd/bootptab.5
index 30c9d09..b6fee66 100644
--- a/libexec/bootpd/bootptab.5
+++ b/libexec/bootpd/bootptab.5
@@ -33,7 +33,7 @@ default values used by other entries via the
 mechanism.  Most tags must be followed by an equals-sign
 and a value as above.  Some may also appear in a boolean form with no
 value (i.e.
-.Em :tg: Ns ).
+.Em :tg: ) .
 The currently recognized tags are:
 .Pp
 .Bl -tag -width xxx -compact
diff --git a/libexec/getty/gettytab.5 b/libexec/getty/gettytab.5
index 4094d38..e6e32e9 100644
--- a/libexec/getty/gettytab.5
+++ b/libexec/getty/gettytab.5
@@ -412,7 +412,7 @@ formfeed.
 half-second pause.
 .It \er
 carriage return.
-.It \eS, \es
+.It \eS , \es
 space character.
 .It \et
 tab.
diff --git a/libexec/rbootd/rbootd.8 b/libexec/rbootd/rbootd.8
index 8ef5d1f..254d853 100644
--- a/libexec/rbootd/rbootd.8
+++ b/libexec/rbootd/rbootd.8
@@ -135,15 +135,15 @@ Turn off debugging, do nothing if already off.
 .El
 .Sh "FILES"
 .Bl -tag -width /usr/libexec/rbootd -compact
-.It /dev/bpf#
+.It Pa /dev/bpf#
 packet-filter device
-.It /etc/rbootd.conf
+.It Pa /etc/rbootd.conf
 configuration file
-.It /tmp/rbootd.dbg
+.It Pa /tmp/rbootd.dbg
 debug output
-.It /usr/mdec/rbootd
+.It Pa /usr/mdec/rbootd
 directory containing boot files
-.It /var/run/rbootd.pid
+.It Pa /var/run/rbootd.pid
 process id
 .El
 .Sh SEE ALSO
diff --git a/libexec/rlogind/rlogind.8 b/libexec/rlogind/rlogind.8
index ba17817..887281f 100644
--- a/libexec/rlogind/rlogind.8
+++ b/libexec/rlogind/rlogind.8
@@ -183,9 +183,7 @@ by the server failed.
 .Bl -tag -width /etc/hostsxxxxxxxx -compact
 .It Pa /etc/hosts
 .It Pa /etc/hosts.equiv
-.Sm off
-.It Pa Ev $HOME /.rhosts
-.Sm on
+.It Ev $HOME Ns Pa /.rhosts
 .It Pa /var/run/nologin
 .El
 .Sh BUGS
diff --git a/libexec/rshd/rshd.8 b/libexec/rshd/rshd.8
index 7b11dd0..14328b6 100644
--- a/libexec/rshd/rshd.8
+++ b/libexec/rshd/rshd.8
@@ -234,9 +234,7 @@ and is not preceded by a flag byte.
 .It Pa /etc/hosts
 .It Pa /etc/hosts.equiv
 .It Pa /etc/login.conf
-.Sm off
-.It Pa Ev $HOME /.rhosts
-.Sm on
+.It Ev $HOME Ns Pa /.rhosts
 .It Pa /var/run/nologin
 .El
 .Sh BUGS
diff --git a/libexec/rtld-aout/rtld.1aout b/libexec/rtld-aout/rtld.1aout
index 5807a9d..6c2ca18 100644
--- a/libexec/rtld-aout/rtld.1aout
+++ b/libexec/rtld-aout/rtld.1aout
@@ -40,10 +40,8 @@
 is a self-contained, position independent program image providing run-time
 support for loading and link-editing shared objects into a process'
 address space. It uses the data structures
-.Po
-see
-.Xr link 5
-.Pc
+(see
+.Xr link 5 )
 contained within dynamically linked programs to determine which shared
 libraries are needed and loads them at a convenient virtual address
 using the
@@ -76,15 +74,13 @@ has relocated this symbol to a location other than 0,
 assumes the services of
 .Nm
 are needed
-.Po
-see
+(see
 .Xr link 5
-for details
-.Pc \&.
+for details).
 .Em crt0
 passes control to
-.Nm
-\&'s entry point before the program's
+.Nm Ns 's
+entry point before the program's
 .Fn main
 routine is called. Thus,
 .Nm
@@ -178,9 +174,8 @@ The following conversions can be used:
 .Bl -tag -width "xxxx"
 .It \&%a
 The main program's name
-.Po also known as
-.Dq __progname
-.Pc .
+(also known as
+.Dq __progname ) .
 .It \&%A
 The value of the environment variable
 .Ev LD_TRACE_LOADED_OBJECTS_PROGNAME
diff --git a/libexec/telnetd/telnetd.8 b/libexec/telnetd/telnetd.8
index cb920cc..95513e9 100644
--- a/libexec/telnetd/telnetd.8
+++ b/libexec/telnetd/telnetd.8
@@ -197,7 +197,7 @@ from
 to use when init starts login sessions.  The default
 .Dv ID
 is
-.Dv fe.
+.Dv fe .
 .It Fl k
 This option is only useful if
 .Nm
@@ -224,7 +224,7 @@ that do not support kludge linemode, but pass the heuristic
 (if they respond with
 .Dv WILL TIMING-MARK
 in response to a
-.Dv DO TIMING-MARK)
+.Dv DO TIMING-MARK )
 for kludge linemode support.
 .It Fl l
 Specify line mode. Try to force clients to use line-
@@ -249,12 +249,12 @@ be reached may be cleaned up.
 This option is only enabled when
 .Nm
 is compiled for
-.Dv UNICOS.
+.Dv UNICOS .
 It specifies an inclusive range of pseudo-terminal devices to
 use.  If the system has sysconf variable
 .Dv _SC_CRAY_NPTY
 configured, the default pty search range is 0 to
-.Dv _SC_CRAY_NPTY;
+.Dv _SC_CRAY_NPTY ;
 otherwise, the default range is 0 to 128.  Either
 .Ar lowpty
 or
@@ -409,7 +409,7 @@ Indicate that the client is willing to send a
 of the Network Virtual Terminal.
 .It "WILL SGA"
 Indicate that it will not be sending
-.Dv IAC GA,
+.Dv IAC GA ,
 go ahead, commands.
 .It "WILL STATUS"
 Indicate a willingness to send the client, upon
@@ -454,7 +454,7 @@ characters remotely.
 This is not really supported, but is sent to identify a 4.2BSD
 .Xr telnet 1
 client, which will improperly respond with
-.Dv WILL ECHO.
+.Dv WILL ECHO .
 If a
 .Dv WILL ECHO
 is received, a
@@ -466,7 +466,7 @@ name of the type of terminal that is attached
 to the client side of the connection.
 .It "DO SGA"
 Indicate that it does not need to receive
-.Dv IAC GA,
+.Dv IAC GA ,
 the go ahead command.
 .It "DO NAWS"
 Requests that the client inform the server when
@@ -495,9 +495,9 @@ Only sent if
 .Nm
 is compiled with support for both linemode and
 kludge linemode, and the client responded with
-.Dv WONT LINEMODE.
+.Dv WONT LINEMODE .
 If the client responds with
-.Dv WILL TM,
+.Dv WILL TM ,
 the it is assumed that the client supports
 kludge linemode.
 Note that the
diff --git a/sbin/badsect/badsect.8 b/sbin/badsect/badsect.8
index bcc1997..547d245e 100644
--- a/sbin/badsect/badsect.8
+++ b/sbin/badsect/badsect.8
@@ -106,7 +106,7 @@ bad sector and whose name is the bad sector number.
 When it is discovered by 
 .Xr fsck 8
 it will ask
-.Dq Li "HOLD BAD BLOCK ?" .
+.Dq Li "HOLD BAD BLOCK \&?" .
 A positive response will cause 
 .Xr fsck 8
 to convert the inode to a regular file containing the bad block.
diff --git a/sbin/bsdlabel/bsdlabel.8 b/sbin/bsdlabel/bsdlabel.8
index 7afe98b..fb16eab 100644
--- a/sbin/bsdlabel/bsdlabel.8
+++ b/sbin/bsdlabel/bsdlabel.8
@@ -182,7 +182,7 @@ auto
 The required arguments to
 .Nm
 are the drive to be labeled and the drive type as described in the
-.Pa disktab(5)
+.Xr disktab 5
 file.  The drive parameters and partitions are taken from that file.  If
 different disks of the same physical type are to have different partitions, it
 will be necessary to have separate disktab entries describing each, or to edit
@@ -301,7 +301,7 @@ are used to install bootstrap code.  If you are creating a
 .Dq dangerously-dedicated
 partition for compatibility with older PC systems,
 you generally want to specify the raw disk name such as
-.Pa da0.
+.Pa da0 .
 If you are creating a label within an existing DOS slice, you should specify
 the slice name such as
 .Pa da0s1 .
diff --git a/sbin/disklabel/disklabel.8 b/sbin/disklabel/disklabel.8
index 7afe98b..fb16eab 100644
--- a/sbin/disklabel/disklabel.8
+++ b/sbin/disklabel/disklabel.8
@@ -182,7 +182,7 @@ auto
 The required arguments to
 .Nm
 are the drive to be labeled and the drive type as described in the
-.Pa disktab(5)
+.Xr disktab 5
 file.  The drive parameters and partitions are taken from that file.  If
 different disks of the same physical type are to have different partitions, it
 will be necessary to have separate disktab entries describing each, or to edit
@@ -301,7 +301,7 @@ are used to install bootstrap code.  If you are creating a
 .Dq dangerously-dedicated
 partition for compatibility with older PC systems,
 you generally want to specify the raw disk name such as
-.Pa da0.
+.Pa da0 .
 If you are creating a label within an existing DOS slice, you should specify
 the slice name such as
 .Pa da0s1 .
diff --git a/sbin/fdisk/fdisk.8 b/sbin/fdisk/fdisk.8
index 00dc7c7..977ee49 100644
--- a/sbin/fdisk/fdisk.8
+++ b/sbin/fdisk/fdisk.8
@@ -80,7 +80,7 @@ is read.  See
 .Sx CONFIGURATION FILE ,
 below, for file syntax.
 .Pp
-.Em WARNING Ns :
+.Em WARNING :
 when
 .Fl f
 is used, you are not asked if you really want to write the partition
@@ -173,15 +173,15 @@ is used to label the partition.
 .Fx
 reserves the
 magic number 165 decimal (A5 in hex).
-.It Em "start and size"
+.It Em start No and Em size
 fields provide the start address
 and size of a partition in sectors.
 .It Em "flag 80"
 specifies that this is the active partition.
-.It Em "cyl, sector and head"
+.It Em cyl , sector No and Em head
 fields are used to specify the beginning address
 and end address for the partition.
-.It Em "Note:"
+.It Em Note :
 these numbers are calculated using BIOS's understanding of the disk geometry
 and saved in the bootblock.
 .El
@@ -213,7 +213,7 @@ will display it and ask if it is correct.
 will then proceed to the next entry.
 .Pp
 Getting the
-.Em cyl, sector,
+.Em cyl , sector ,
 and
 .Em head
 fields correct is tricky.
diff --git a/sbin/fdisk_pc98/fdisk.8 b/sbin/fdisk_pc98/fdisk.8
index ee90925..a9f251c 100644
--- a/sbin/fdisk_pc98/fdisk.8
+++ b/sbin/fdisk_pc98/fdisk.8
@@ -81,7 +81,7 @@ is read.  See
 .Sx CONFIGURATION FILE ,
 below, for file syntax.
 .Pp
-.Em WARNING Ns :
+.Em WARNING :
 when
 .Fl f
 is used, you are not asked if you really want to write the partition
@@ -199,17 +199,17 @@ is used to label the partition.
 .Fx
 reserves the
 magic number 148 decimal (94 in hex).
-.It Em "start and size"
+.It Em start No and Em size
 fields provide the start address
 and size of a partition in sectors.
 .\" !PC98 .It Em "flag 80"
 .\" specifies that this is the active partition.
-.It Em "cyl, sector and head"
+.It Em cyl , sector No and Em head
 fields are used to specify the beginning address
 and end address for the partition.
 .It Em "system Name"
 is the name of the partition.
-.It Em "Note:"
+.It Em Note :
 these numbers are calculated using BIOS's understanding of the disk geometry
 and saved in the bootblock.
 .El
@@ -241,7 +241,7 @@ will display it and ask if it is correct.
 will then proceed to the next entry.
 .Pp
 Getting the
-.Em cyl, sector,
+.Em cyl , sector ,
 and
 .Em head
 fields correct is tricky.
diff --git a/sbin/fsck/fsck.8 b/sbin/fsck/fsck.8
index edef23e..9c7055a 100644
--- a/sbin/fsck/fsck.8
+++ b/sbin/fsck/fsck.8
@@ -39,7 +39,7 @@
 .Op Fl dvplfyn
 .Op Fl l Ar maxparallel
 .Op Fl t Ar fstype 
-.Op Fl T Ar fstype:fsoptions 
+.Op Fl T Ar fstype : Ns Ar fsoptions 
 .Op Ar special | node ...
 .Sh DESCRIPTION
 The
@@ -106,7 +106,7 @@ Causes
 .Nm
 to assume yes
 as the answer to all operator questions.
-.It Fl T Ar fstype:fsoptions
+.It Fl T Ar fstype : Ns Ar fsoptions 
 List of comma separated file system specific options for the specified
 file system type, in the same format as
 .Xr mount 8 .
diff --git a/sbin/fsdb/fsdb.8 b/sbin/fsdb/fsdb.8
index f64b276..81f1dda 100644
--- a/sbin/fsdb/fsdb.8
+++ b/sbin/fsdb/fsdb.8
@@ -204,7 +204,7 @@ or
 .Va atimensec 
 field will be set to zero.
 .Pp
-.It Cm quit, Cm q, Cm exit, Em <EOF>
+.It Cm quit , q , exit , Em <EOF>
 Exit the program.
 .El
 .Sh SEE ALSO
diff --git a/sbin/i386/fdisk/fdisk.8 b/sbin/i386/fdisk/fdisk.8
index 00dc7c7..977ee49 100644
--- a/sbin/i386/fdisk/fdisk.8
+++ b/sbin/i386/fdisk/fdisk.8
@@ -80,7 +80,7 @@ is read.  See
 .Sx CONFIGURATION FILE ,
 below, for file syntax.
 .Pp
-.Em WARNING Ns :
+.Em WARNING :
 when
 .Fl f
 is used, you are not asked if you really want to write the partition
@@ -173,15 +173,15 @@ is used to label the partition.
 .Fx
 reserves the
 magic number 165 decimal (A5 in hex).
-.It Em "start and size"
+.It Em start No and Em size
 fields provide the start address
 and size of a partition in sectors.
 .It Em "flag 80"
 specifies that this is the active partition.
-.It Em "cyl, sector and head"
+.It Em cyl , sector No and Em head
 fields are used to specify the beginning address
 and end address for the partition.
-.It Em "Note:"
+.It Em Note :
 these numbers are calculated using BIOS's understanding of the disk geometry
 and saved in the bootblock.
 .El
@@ -213,7 +213,7 @@ will display it and ask if it is correct.
 will then proceed to the next entry.
 .Pp
 Getting the
-.Em cyl, sector,
+.Em cyl , sector ,
 and
 .Em head
 fields correct is tricky.
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index 490316b..e684d4a 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -139,7 +139,10 @@ The following parameters may be set with
 .Nm :
 .Bl -tag -width indent
 .It Cm add
-Another name for the ``alias'' parameter.  Introduced for compatibility
+Another name for the
+.Cm alias
+parameter.
+Introduced for compatibility
 with BSD/OS.
 .It Cm alias
 Establish an additional network address for this interface.
@@ -181,10 +184,15 @@ extra console error logging.
 .It Fl debug
 Disable driver dependent debugging code.
 .It Cm delete
-Another name for the ``-alias'' parameter.
+Another name for the
+.Fl alias
+parameter.
 .It Cm down
-Mark an interface ``down''.  When an interface is
-marked ``down'', the system will not attempt to
+Mark an interface
+.Dq down .
+When an interface is marked
+.Dq down ,
+the system will not attempt to
 transmit messages through that interface. 
 If possible, the interface will be reset to disable reception as well.
 This action does not automatically disable routes using the interface.
@@ -364,13 +372,18 @@ netmasks though
 .Fx
 implements it internally as a set of netmasks.
 .It Cm remove
-Another name for the ``-alias'' parameter.  Introduced for compatibility
+Another name for the
+.Fl alias
+parameter.
+Introduced for compatibility
 with BSD/OS.
 .It Cm phase
 The argument following this specifies the version (phase) of the 
 Appletalk network attached to the interface.
 Values of 1 or 2 are permitted.
-.It Cm link[0-2]
+.It Cm link Ns Xo
+.Op Cm 0 Ns - Ns Cm 2
+.Xc
 Enable special processing of the link level of the interface.
 These three options are interface specific in actual effect, however,
 they are in general used to select special modes of operation.
@@ -378,7 +391,9 @@ An example
 of this is to enable SLIP compression, or to select the connector type
 for some Ethernet cards.  Refer to the man page for the specific driver
 for more information.
-.It Fl link[0-2]
+.It Fl link Ns Xo
+.Op Cm 0 Ns - Ns Cm 2
+.Xc
 Disable special processing at the link level with the specified interface.
 .It Cm up
 Mark an interface
diff --git a/sbin/ip6fw/ip6fw.8 b/sbin/ip6fw/ip6fw.8
index d24470b..84c1216 100644
--- a/sbin/ip6fw/ip6fw.8
+++ b/sbin/ip6fw/ip6fw.8
@@ -161,7 +161,7 @@ TCP packets only.
 Discard packets that match this rule,
 and try to send a TCP reset (RST) notice.
 The search terminates
-.Em (not working yet) .
+.Em ( "not working yet" ) .
 .It Ar count
 Update counters for all packets that match rule.
 The search continues with the next rule.
@@ -223,10 +223,10 @@ may be specified as:
 .Bl -hang -offset flag -width 16n
 .It Ar ipv6no
 An ipv6number of the form
-.Li fec0::1:2:3:4.
+.Li fec0::1:2:3:4 .
 .It Ar ipv6no/prefixlen
 An ipv6number with a prefix length of the form
-.Li fec0::1:2:3:4/112.
+.Li fec0::1:2:3:4/112 .
 .El
 .Pp
 The sense of the match can be inverted by preceding an address with the
@@ -273,7 +273,7 @@ the interface using
 .Bl -hang -offset flag -width 16n
 .It Ar via ifX
 Packet must be going through interface
-.Ar ifX.
+.Ar ifX .
 .It Ar via if*
 Packet must be going through interface
 .Ar ifX ,
@@ -362,7 +362,7 @@ The supported IPv6 options are:
 The absence of a particular option may be denoted
 with a
 .Dq \&!
-.Em (not working yet).
+.Em ( "not working yet" ) .
 .It established
 Matches packets that have the RST or ACK bits set.
 TCP packets only.
@@ -418,7 +418,7 @@ firewalls.
 If you are logged in over a network, loading the KLD version of
 .Nm
 is probably not as straightforward as you would think
-.Em (not supported).
+.Em ( "not supported" ) .
 I recommend this command line:
 .Bd -literal -offset center
 kldload /modules/ip6fw_mod.o && \e
diff --git a/sbin/kget/kget.8 b/sbin/kget/kget.8
index 937da35..423414e 100644
--- a/sbin/kget/kget.8
+++ b/sbin/kget/kget.8
@@ -47,7 +47,7 @@ uses the
 .Xr sysctl 3
 interface to retrieve data from the kernel and requires that at least
 the
-.Ar machdep.uc_devlist
+.Va machdep.uc_devlist
 symbol be present.  If it's not, you may need to update your kernel
 before using this utility.
 .Pp
diff --git a/sbin/kldload/kldload.8 b/sbin/kldload/kldload.8
index 80d2eb2..da10b79 100644
--- a/sbin/kldload/kldload.8
+++ b/sbin/kldload/kldload.8
@@ -39,7 +39,7 @@
 The
 .Nm
 loads the file 
-.Ar filename.ko
+.Ar filename Ns Pa .ko
 into the kernel using the kernel linker.
 .Pp
 The following option is available:
diff --git a/sbin/ldconfig/ldconfig.8 b/sbin/ldconfig/ldconfig.8
index 3702d32..ac811d1 100644
--- a/sbin/ldconfig/ldconfig.8
+++ b/sbin/ldconfig/ldconfig.8
@@ -40,7 +40,7 @@
 .Op Fl aout | Fl elf
 .Op Fl Rimrsv
 .Op Fl f Ar hints_file
-.Op Ar directory | file Ar ...
+.Op Ar directory | Ar
 .Sh DESCRIPTION
 .Nm
 is used to prepare a set of
diff --git a/sbin/mknod/mknod.8 b/sbin/mknod/mknod.8
index cbbd8b0..694a348 100644
--- a/sbin/mknod/mknod.8
+++ b/sbin/mknod/mknod.8
@@ -82,7 +82,7 @@ major device number to use for a particular device, check the file
 to see if the device is known, or check
 the system dependent device configuration file:
 .Bd -filled -offset indent
-.Dq Pa /usr/src/sys/conf/device. Ns Em architecture
+.Dq Pa /usr/src/sys/conf/device. Ns Aq Ar architecture
 .Ed
 .Pp
 (for example
diff --git a/sbin/mount_nfs/mount_nfs.8 b/sbin/mount_nfs/mount_nfs.8
index 21a639f..40690d0 100644
--- a/sbin/mount_nfs/mount_nfs.8
+++ b/sbin/mount_nfs/mount_nfs.8
@@ -54,16 +54,17 @@
 .Op Fl t Ar timeout
 .Op Fl w Ar writesize
 .Op Fl x Ar retrans
-.Ar rhost:path node
+.Ar rhost : Ns Ar path node
 .Sh DESCRIPTION
 The
 .Nm
 command
 calls the
 .Xr mount 2
-system call to prepare and graft a remote nfs file system (rhost:path)
+system call to prepare and graft a remote nfs file system
+.Pq Ar rhost : Ns Ar path
 on to the file system tree at the point
-.Ar node.
+.Ar node .
 This command is normally executed by
 .Xr mount 8 .
 It implements the mount protocol as described in RFC 1094, Appendix A and
@@ -253,7 +254,7 @@ Same as
 .Fl s .
 .It tcp
 Same as
-.Fl T.
+.Fl T .
 .El
 .It Fl q
 Use the leasing extensions to the NFS Version 3 protocol
diff --git a/sbin/mount_nwfs/mount_nwfs.8 b/sbin/mount_nwfs/mount_nwfs.8
index 196dfe1..affbe4a 100644
--- a/sbin/mount_nwfs/mount_nwfs.8
+++ b/sbin/mount_nwfs/mount_nwfs.8
@@ -71,7 +71,7 @@ For native IP you will need also
 option.
 .It Fl U Ar user
 Name of user used in login sequence.
-.It Fl "[connection options]"
+.It Fl connection\ options
 See
 .Xr ncplogin 1
 for details.
@@ -100,7 +100,7 @@ Same as 'l' but file system tries to be case insensitive.
 May not work well.
 .It n
 No case conversion is performed. 
-.Em Warning!
+.Em Warning !
 Use this option with DOS name space only as a last resort,
 because creating a lower case name in the DOS name space
 can lead to unpredictable results.
@@ -159,7 +159,8 @@ See
 for details.
 If this option is omitted, connection permissions
 assumed the same as directory mode
-.Pf ( Fl d Ns ) option.
+.Pq Fl d
+option.
 .El
 .Sh FILES
 .Bl -tag -width /var/log/wtmp -compact
diff --git a/sbin/mountd/exports.5 b/sbin/mountd/exports.5
index 8c42a6f..8b16942 100644
--- a/sbin/mountd/exports.5
+++ b/sbin/mountd/exports.5
@@ -191,7 +191,7 @@ A
 .Sm on
 option can be used to specify a file whose handle will be returned if
 a directory is looked up using the public filehandle (
-.Tn WebNFS Ns ).
+.Tn WebNFS ) .
 This is to mimic the behavior of URLs.
 If no
 .Fl index
diff --git a/sbin/natd/natd.8 b/sbin/natd/natd.8
index 7a1f6de..5c7f771 100644
--- a/sbin/natd/natd.8
+++ b/sbin/natd/natd.8
@@ -225,7 +225,7 @@ to appear from the specified
 .Ar targetPORT Ns Oo , Ns
 .Ar targetIP Ns : Ns Xo
 .Ar targetPORT Ns Oo , Ns
-.Ar ...
+.Ar ...\&
 .Oc Oc
 .Xc
 .Xc
@@ -239,7 +239,7 @@ to appear from the specified
 .It Fl redirect_address Xo
 .Ar localIP Ns Oo , Ns
 .Ar localIP Ns Oo , Ns
-.Ar ...
+.Ar ...\&
 .Oc Oc
 .Ar publicIP
 .Xc
diff --git a/sbin/pc98/fdisk/fdisk.8 b/sbin/pc98/fdisk/fdisk.8
index ee90925..a9f251c 100644
--- a/sbin/pc98/fdisk/fdisk.8
+++ b/sbin/pc98/fdisk/fdisk.8
@@ -81,7 +81,7 @@ is read.  See
 .Sx CONFIGURATION FILE ,
 below, for file syntax.
 .Pp
-.Em WARNING Ns :
+.Em WARNING :
 when
 .Fl f
 is used, you are not asked if you really want to write the partition
@@ -199,17 +199,17 @@ is used to label the partition.
 .Fx
 reserves the
 magic number 148 decimal (94 in hex).
-.It Em "start and size"
+.It Em start No and Em size
 fields provide the start address
 and size of a partition in sectors.
 .\" !PC98 .It Em "flag 80"
 .\" specifies that this is the active partition.
-.It Em "cyl, sector and head"
+.It Em cyl , sector No and Em head
 fields are used to specify the beginning address
 and end address for the partition.
 .It Em "system Name"
 is the name of the partition.
-.It Em "Note:"
+.It Em Note :
 these numbers are calculated using BIOS's understanding of the disk geometry
 and saved in the bootblock.
 .El
@@ -241,7 +241,7 @@ will display it and ask if it is correct.
 will then proceed to the next entry.
 .Pp
 Getting the
-.Em cyl, sector,
+.Em cyl , sector ,
 and
 .Em head
 fields correct is tricky.
diff --git a/sbin/reboot/boot_i386.8 b/sbin/reboot/boot_i386.8
index 7f449bd..836401d 100644
--- a/sbin/reboot/boot_i386.8
+++ b/sbin/reboot/boot_i386.8
@@ -48,12 +48,12 @@
 .Nd
 system bootstrapping procedures
 .Sh DESCRIPTION
-.Sy Power fail and crash recovery.
+.Sy Power fail and crash recovery .
 Normally, the system will reboot itself at power-up or after crashes.
 An automatic consistency check of the file systems will be performed,
 and unless this fails, the system will resume multi-user operations.
 .Pp
-.Sy Cold starts.
+.Sy Cold starts .
 Most i386 PCs attempt to boot first from floppy disk drive 0 (sometimes
 known as drive A:) and, failing that, from hard disk drive 0 (sometimes
 known as drive C:, or as drive 0x80 to the BIOS).  Some BIOSes allow
@@ -73,18 +73,18 @@ either by specifying a kernel name in the boot block parameter
 file,
 .Pa /boot.config ,
 or by hitting a key during a brief pause (while one of the characters
-.Dv - ,
-.Dv \e ,
-.Dv \&| ,
+.Sy - ,
+.Sy \e ,
+.Sy \&| ,
 or
-.Dv /
+.Sy /
 is displayed) before
 .Xr loader 8
 is invoked.  Booting will also be attempted at stage two, if the
 third stage cannot be loaded.
 .Pp
 The remainder of this subsection deals only with the boot blocks.  The
-.Pa loader
+.Xr loader 8
 program is documented separately.
 .Pp
 After the boot blocks have been loaded,
@@ -104,26 +104,32 @@ This boot may be aborted by typing any character on the keyboard
 at the
 .Ql boot:
 prompt.  At this time, the following input will be accepted:
-.Bl -tag -width 10x
-.It \&?
+.Bl -tag -width indent
+.It Ic \&?
 Give a short listing of the files in the root directory of the default
 boot device, as a hint about available boot files.  (A
-.Dv \&?
+.Ic ?\&
 may also be specified as the last segment of a path, in which case
 the listing will be of the relevant subdirectory.)
 .Pp
-.It bios_drive:interface(unit,part) filename Op Fl aCcDdghPrsv
+.It Xo
+.Ar bios_drive : Ns Ar interface Ns Po
+.Ar unit , Ns Ar part Pc
+.Ar filename
+.Op Fl aCcDdghPrsv
+.Xc
 Specify boot file and flags.
-.Bl -tag -width 10x -compact
-.It bios_drive
+.Bl -tag -width indent
+.It Ar bios_drive
 The drive number as recognized by the BIOS. 
 0 for the first drive, 1 for the second drive, etc.
-.It interface
+.It Ar interface
 The type of controller to boot from.  Note that the controller is required
 to have BIOS support since the BIOS services are used to load the
 boot file image.
 .Pp
 The supported interfaces are:
+.Pp
 .Bl -tag -width "adXX" -compact
 .It ad
 ST506, IDE, ESDI, RLL disks on a WD100[2367] or lookalike
@@ -135,10 +141,10 @@ SCSI disk on any supported SCSI controller
 .\".It cd
 .\"boot from CDROM
 .El
-.It unit
+.It Ar unit
 The unit number of the drive on the interface being used.
 0 for the first drive, 1 for the second drive, etc.
-.It part
+.It Ar part
 The partition letter inside the BSD portion of the disk.  See
 .Xr disklabel 8 .
 By convention, only partition
@@ -149,13 +155,14 @@ any slice can be booted from, with the default being the active slice
 or, otherwise, the first
 .Fx
 slice.
-.It filename
+.It Ar filename
 The pathname of the file to boot (relative to the root directory
 on the specified partition).  Defaults to
 .Pa /kernel .
 Symbolic links are not supported (hard links are).
 .It Fl acCdDghPrsv
 Boot flags:
+.Pp
 .Bl -tag -width "-CXX" -compact
 .It Fl a
 during kernel initialization,
@@ -164,8 +171,9 @@ ask for the device to mount as as the root file system.
 boot from CDROM.
 .It Fl c
 run UserConfig to modify hardware parameters for the loaded
-kernel.  If the kernel was built with one of USERCONFIG,
-INTRO_USERCONFIG, VISUAL_USERCONFIG options,
+kernel.  If the kernel was built with one of
+.Dv USERCONFIG , INTRO_USERCONFIG , VISUAL_USERCONFIG
+options,
 remain in UserConfig regardless of any
 .Ic quit
 commands present in the script.
@@ -237,7 +245,7 @@ to set defaults.  Enter them in one line just as you type at the
 .Ql boot:
 prompt.
 .Sh FILES
-.Bl -tag -width /kernel.old.config -compact
+.Bl -tag -width /boot/loader -compact
 .It Pa /boot.config
 parameters for the boot blocks (optional)
 .It Pa /boot/boot1
@@ -291,7 +299,8 @@ Seek failed
 Timeout
 .El
 .Pp
-IMPORTANT NOTE: Because of limitations imposed by the conventional
+.Sy "IMPORTANT NOTE" :
+Because of limitations imposed by the conventional
 disk interface provided by the BIOS, all boot-related files and
 structures (including the kernel) that need to be accessed during the
 boot phase must reside on the disk at or below cylinder 1023 (as the
@@ -300,7 +309,9 @@ BIOS understands the geometry).  When a
 is reported by the second-stage bootstrap, it generally means that this
 requirement has not been adhered to.
 .Sh BUGS
-The disklabel format used by this version of
+The
+.Xr disklabel 5
+format used by this version of
 .Bx
 is quite
 different from that of other architectures.
diff --git a/sbin/startslip/startslip.1 b/sbin/startslip/startslip.1
index eec5ebd..ebdf42a 100644
--- a/sbin/startslip/startslip.1
+++ b/sbin/startslip/startslip.1
@@ -42,10 +42,10 @@
 .Nm
 .Op Fl d
 .Op Fl b Ar speed
-[
+.Oo
 .Fl s Ar string1
-.Op Fl s Ar string2 Op Ar ...
-]
+.Op Fl s Ar string2 Op Ar ...\&
+.Oc
 .Op Fl h
 .Op Fl l
 .Op Fl L
diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8
index 25aa7c1..9868eba 100644
--- a/sbin/sysctl/sysctl.8
+++ b/sbin/sysctl/sysctl.8
@@ -45,7 +45,7 @@
 .Nm
 .Op Fl bNn
 .Fl w
-.Ar name=value ...
+.Ar name Ns = Ns Ar value ...
 .Nm
 .Op Fl bNn
 .Fl aAX
@@ -87,7 +87,9 @@ set psize=`sysctl -n hw.pagesize`
 Force the value of the variable(s) to be output in raw, binary
 format.  No names are printed and no terminating newlines are output.
 This is mostly useful with a single variable.
-.It Fl w Ar name=value ...
+.It Fl w Xo
+.Ar name Ns = Ns Ar value ...
+.Xc
 Set the MIB
 .Ar name
 to the new
diff --git a/share/examples/mdoc/example.3 b/share/examples/mdoc/example.3
index d4d495c..a887b7a 100644
--- a/share/examples/mdoc/example.3
+++ b/share/examples/mdoc/example.3
@@ -65,7 +65,8 @@ may have one of the following values:
 .Bl -tag -width EXAMPLE_ONE
 .It Dv EXAMPLE_ONE
 First example of a defined variable.
-.Dv EXAMPLE_ONE is described below.
+.Dv EXAMPLE_ONE
+is described below.
 .It Dv EXAMPLE_TWO
 Second example.
 .El
diff --git a/share/man/man3/bitstring.3 b/share/man/man3/bitstring.3
index 242e640..89521d6 100644
--- a/share/man/man3/bitstring.3
+++ b/share/man/man3/bitstring.3
@@ -43,7 +43,7 @@
 .Nm bit_decl ,
 .Nm bit_ffs ,
 .Nm bit_nclear ,
-.Nm bit_nset,
+.Nm bit_nset ,
 .Nm bit_set ,
 .Nm bitstr_size ,
 .Nm bit_test
diff --git a/share/man/man3/intro.3 b/share/man/man3/intro.3
index bc6e461..954464f 100644
--- a/share/man/man3/intro.3
+++ b/share/man/man3/intro.3
@@ -71,7 +71,8 @@ to supply the loader flag
 .Fl l Ns Ar c
 for these functions.
 There are several `libraries' or groups of functions included inside of
-.Xr libc : the standard
+.Xr libc :
+the standard
 .Tn I/O
 routines,
 database routines,
@@ -80,11 +81,10 @@ string operators,
 character tests and character operators,
 des encryption routines,
 storage allocation, time functions, signal handling and more.
-.It Xo
-.Xr libcurses
-.Pf ( Fl l Ns Ar curses
-.Fl l Ns Ar termcap )
-.Xc
+.It Xr libcurses Po
+.Fl l Ns Ar curses
+.Fl l Ns Ar termcap
+.Pc
 Terminal independent screen management routines
 for two dimensional non-bitmap display terminals.
 (See
diff --git a/share/man/man3/pthread.3 b/share/man/man3/pthread.3
index 5287da2..b76ce73 100644
--- a/share/man/man3/pthread.3
+++ b/share/man/man3/pthread.3
@@ -64,142 +64,310 @@ Cleanup Routines
 .El
 .Sh THREAD ROUTINES
 .Bl -tag -width Er
-.It int Fn pthread_create "pthread_t *thread" "const pthread_attr_t *attr" "void *(*start_routine)(void *)" "void *arg"
+.It Xo
+.Ft int
+.Fn pthread_create "pthread_t *thread" "const pthread_attr_t *attr" "void *(*start_routine)(void *)" "void *arg"
+.Xc
 Creates a new thread of execution.
-.It int Fn pthread_detach "pthread_t thread"
+.It Xo
+.Ft int
+.Fn pthread_detach "pthread_t thread"
+.Xc
 Marks a thread for deletion.
-.It int Fn pthread_equal "pthread_t t1" "pthread_t t2"
+.It Xo
+.Ft int
+.Fn pthread_equal "pthread_t t1" "pthread_t t2"
+.Xc
 Compares two thread IDs.
-.It void Fn pthread_exit "void *value_ptr"
+.It Xo
+.Ft void
+.Fn pthread_exit "void *value_ptr"
+.Xc
 Terminates the calling thread.
-.It int Fn pthread_join "pthread_t thread" "void **value_ptr"
+.It Xo
+.Ft int
+.Fn pthread_join "pthread_t thread" "void **value_ptr"
+.Xc
 Causes the calling thread to wait for the termination of the specified thread.
-.It int Fn pthread_cancel "pthread_t thread"
+.It Xo
+.Ft int
+.Fn pthread_cancel "pthread_t thread"
+.Xc
 Cancels execution of a thread.
-.It int Fn pthread_once "pthread_once_t *once_control" "void (*init_routine)(void)"
+.It Xo
+.Ft int
+.Fn pthread_once "pthread_once_t *once_control" "void (*init_routine)(void)"
+.Xc
 Calls an initialization routine once.
-.It pthread_t Fn pthread_self void
+.It Xo
+.Ft pthread_t
+.Fn pthread_self void
+.Xc
 Returns the thread ID of the calling thread.
 .El
 .Sh ATTRIBUTE OBJECT ROUTINES
 .Bl -tag -width Er
-.It int Fn pthread_attr_destroy "pthread_attr_t *attr"
+.It Xo
+.Ft int
+.Fn pthread_attr_destroy "pthread_attr_t *attr"
+.Xc
 Destroy a thread attributes object.
-.It int Fn pthread_attr_getinheritsched "pthread_attr_t *attr" "int *inheritsched"
+.It Xo
+.Ft int
+.Fn pthread_attr_getinheritsched "pthread_attr_t *attr" "int *inheritsched"
+.Xc
 Get the inherit scheduling attribute from a thread attributes object.
-.It int Fn pthread_attr_getschedparam "pthread_attr_t *attr" "struct sched_param *param"
+.It Xo
+.Ft int
+.Fn pthread_attr_getschedparam "pthread_attr_t *attr" "struct sched_param *param"
+.Xc
 Get the scheduling parameter attribute from a thread attributes object.
-.It int Fn pthread_attr_getschedpolicy "pthread_attr_t *attr" "int *policy"
+.It Xo
+.Ft int
+.Fn pthread_attr_getschedpolicy "pthread_attr_t *attr" "int *policy"
+.Xc
 Get the scheduling policy attribute from a thread attributes object.
-.It int Fn pthread_attr_getscope "pthread_attr_t *attr" "int *contentionscope"
+.It Xo
+.Ft int
+.Fn pthread_attr_getscope "pthread_attr_t *attr" "int *contentionscope"
+.Xc
 Get the contention scope attribute from a thread attributes object.
-.It int Fn pthread_attr_getstacksize "pthread_attr_t *attr" "size_t *stacksize"
+.It Xo
+.Ft int
+.Fn pthread_attr_getstacksize "pthread_attr_t *attr" "size_t *stacksize"
+.Xc
 Get the stack size attribute from a thread attributes object.
-.It int Fn pthread_attr_getstackaddr "pthread_attr_t *attr" "void **stackaddr"
+.It Xo
+.Ft int
+.Fn pthread_attr_getstackaddr "pthread_attr_t *attr" "void **stackaddr"
+.Xc
 Get the stack address attribute from a thread attributes object.
-.It int Fn pthread_attr_getdetachstate "pthread_attr_t *attr" "int *detachstate"
+.It Xo
+.Ft int
+.Fn pthread_attr_getdetachstate "pthread_attr_t *attr" "int *detachstate"
+.Xc
 Get the detach state attribute from a thread attributes object.
-.It int Fn pthread_attr_init "pthread_attr_t *attr"
+.It Xo
+.Ft int
+.Fn pthread_attr_init "pthread_attr_t *attr"
+.Xc
 Initialize a thread attributes object with default values.
-.It int Fn pthread_attr_setinheritsched "pthread_attr_t *attr" "int inheritsched"
+.It Xo
+.Ft int
+.Fn pthread_attr_setinheritsched "pthread_attr_t *attr" "int inheritsched"
+.Xc
 Set the inherit scheduling attribute in a thread attributes object.
-.It int Fn pthread_attr_setschedparam "pthread_attr_t *attr" "struct sched_param *param"
+.It Xo
+.Ft int
+.Fn pthread_attr_setschedparam "pthread_attr_t *attr" "struct sched_param *param"
+.Xc
 Set the scheduling parameter attribute in a thread attributes object.
-.It int Fn pthread_attr_setschedpolicy "pthread_attr_t *attr" "int policy"
+.It Xo
+.Ft int
+.Fn pthread_attr_setschedpolicy "pthread_attr_t *attr" "int policy"
+.Xc
 Set the scheduling policy attribute in a thread attributes object.
-.It int Fn pthread_attr_setscope "pthread_attr_t *attr" "int contentionscope"
+.It Xo
+.Ft int
+.Fn pthread_attr_setscope "pthread_attr_t *attr" "int contentionscope"
+.Xc
 Set the contention scope attribute in a thread attributes object.
-.It int Fn pthread_attr_setstacksize "pthread_attr_t *attr" "size_t stacksize"
+.It Xo
+.Ft int
+.Fn pthread_attr_setstacksize "pthread_attr_t *attr" "size_t stacksize"
+.Xc
 Set the stack size attribute in a thread attributes object.
-.It int Fn pthread_attr_setstackaddr "pthread_attr_t *attr" "void *stackaddr"
+.It Xo
+.Ft int
+.Fn pthread_attr_setstackaddr "pthread_attr_t *attr" "void *stackaddr"
+.Xc
 Set the stack address attribute in a thread attributes object.
-.It int Fn pthread_attr_setdetachstate "pthread_attr_t *attr" "int detachstate"
+.It Xo
+.Ft int
+.Fn pthread_attr_setdetachstate "pthread_attr_t *attr" "int detachstate"
+.Xc
 Set the detach state in a thread attributes object.
 .El
 .Sh MUTEX ROUTINES
 .Bl -tag -width Er
-.It int Fn pthread_mutexattr_destroy "pthread_mutexattr_t *attr"
+.It Xo
+.Ft int
+.Fn pthread_mutexattr_destroy "pthread_mutexattr_t *attr"
+.Xc
 Destroy a mutex attributes object.
-.It int Fn pthread_mutexattr_init "pthread_mutexattr_t *attr"
+.It Xo
+.Ft int
+.Fn pthread_mutexattr_init "pthread_mutexattr_t *attr"
+.Xc
 Initialize a mutex attributes object with default values.
-.It int Fn pthread_mutex_destroy "pthread_mutex_t *mutex"
+.It Xo
+.Ft int
+.Fn pthread_mutex_destroy "pthread_mutex_t *mutex"
+.Xc
 Destroy a mutex.
-.It int Fn pthread_mutex_init "pthread_mutex_t *mutex" "const pthread_mutexattr_t *attr"
+.It Xo
+.Ft int
+.Fn pthread_mutex_init "pthread_mutex_t *mutex" "const pthread_mutexattr_t *attr"
+.Xc
 Initialize a mutex with specified attributes.
-.It int Fn pthread_mutex_lock "pthread_mutex_t *mutex"
+.It Xo
+.Ft int
+.Fn pthread_mutex_lock "pthread_mutex_t *mutex"
+.Xc
 Lock a mutex and block until it becomes available.
-.It int Fn pthread_mutex_trylock "pthread_mutex_t *mutex"
+.It Xo
+.Ft int
+.Fn pthread_mutex_trylock "pthread_mutex_t *mutex"
+.Xc
 Try to lock a mutex, but don't block if the mutex is locked by another thread,
 including the current thread.
-.It int Fn pthread_mutex_unlock "pthread_mutex_t *mutex"
+.It Xo
+.Ft int
+.Fn pthread_mutex_unlock "pthread_mutex_t *mutex"
+.Xc
 Unlock a mutex.
 .El
 .Sh CONDITION VARIABLE ROUTINES
 .Bl -tag -width Er
-.It int Fn pthread_condattr_init "pthread_condattr_t *attr"
+.It Xo
+.Ft int
+.Fn pthread_condattr_init "pthread_condattr_t *attr"
+.Xc
 Initialize a condition variable attributes object with default values.
-.It int Fn pthread_condattr_destroy "pthread_condattr_t *attr"
+.It Xo
+.Ft int
+.Fn pthread_condattr_destroy "pthread_condattr_t *attr"
+.Xc
 Destroy a condition variable attributes object.
-.It int Fn pthread_cond_broadcast "pthread_cond_t *cond"
+.It Xo
+.Ft int
+.Fn pthread_cond_broadcast "pthread_cond_t *cond"
+.Xc
 Unblock all threads currently blocked on the specified condition variable.
-.It int Fn pthread_cond_destroy "pthread_cond_t *cond"
+.It Xo
+.Ft int
+.Fn pthread_cond_destroy "pthread_cond_t *cond"
+.Xc
 Destroy a condition variable.
-.It int Fn pthread_cond_init "pthread_cond_t *cond" "const pthread_condattr_t *attr"
+.It Xo
+.Ft int
+.Fn pthread_cond_init "pthread_cond_t *cond" "const pthread_condattr_t *attr"
+.Xc
 Initialize a condition variable with specified attributes.
-.It int Fn pthread_cond_signal "pthread_cond_t *cond"
+.It Xo
+.Ft int
+.Fn pthread_cond_signal "pthread_cond_t *cond"
+.Xc
 Unblock at least one of the threads blocked on the specified condition variable.
-.It int Fn pthread_cond_timedwait "pthread_cond_t *cond" "pthread_mutex_t *mutex" "const struct timespec *abstime"
+.It Xo
+.Ft int
+.Fn pthread_cond_timedwait "pthread_cond_t *cond" "pthread_mutex_t *mutex" "const struct timespec *abstime"
+.Xc
 Wait no longer than the specified time for a condition and lock the specified mutex.
-.It int Fn pthread_cond_wait "pthread_cond_t *" "pthread_mutex_t *mutex"
+.It Xo
+.Ft int
+.Fn pthread_cond_wait "pthread_cond_t *" "pthread_mutex_t *mutex"
+.Xc
 Wait for a condition and lock the specified mutex.
 .El
 .Sh READ/WRITE LOCK ROUTINES
 .Bl -tag -width Er
-.It int Fn pthread_rwlock_destroy "pthread_rwlock_t *lock"
+.It Xo
+.Ft int
+.Fn pthread_rwlock_destroy "pthread_rwlock_t *lock"
+.Xc
 Destroy a read/write lock object.
-.It int Fn pthread_rwlock_init "pthread_rwlock_t *lock" "const pthread_rwlockattr_t *attr"
+.It Xo
+.Ft int
+.Fn pthread_rwlock_init "pthread_rwlock_t *lock" "const pthread_rwlockattr_t *attr"
+.Xc
 Initialize a read/write lock object.
-.It int Fn pthread_rwlock_rdlock "pthread_rwlock_t *lock"
+.It Xo
+.Ft int
+.Fn pthread_rwlock_rdlock "pthread_rwlock_t *lock"
+.Xc
 Lock a read/write lock for reading, blocking until the lock can be
 acquired.
-.It int Fn pthread_rwlock_tryrdlock "pthread_rwlock_t *lock"
+.It Xo
+.Ft int
+.Fn pthread_rwlock_tryrdlock "pthread_rwlock_t *lock"
+.Xc
 Attempt to lock a read/write lock for reading, without blocking if the
 lock is unavailable.
-.It int Fn pthread_rwlock_trywrlock "pthread_rwlock_t *lock"
+.It Xo
+.Ft int
+.Fn pthread_rwlock_trywrlock "pthread_rwlock_t *lock"
+.Xc
 Attempt to lock a read/write lock for writing, without blocking if the
 lock is unavailable.
-.It int Fn pthread_rwlock_unlock "pthread_rwlock_t *lock"
+.It Xo
+.Ft int
+.Fn pthread_rwlock_unlock "pthread_rwlock_t *lock"
+.Xc
 Unlock a read/write lock.
-.It int Fn pthread_rwlock_wrlock "pthread_rwlock_t *lock"
+.It Xo
+.Ft int
+.Fn pthread_rwlock_wrlock "pthread_rwlock_t *lock"
+.Xc
 Lock a read/write lock for writing, blocking until the lock can be
 acquired.
-.It int Fn pthread_rwlockattr_destroy "pthread_rwlockattr_t *attr"
+.It Xo
+.Ft int
+.Fn pthread_rwlockattr_destroy "pthread_rwlockattr_t *attr"
+.Xc
 Destroy a read/write lock attribute object.
-.It int Fn pthread_rwlockattr_getpshared "pthread_rwlockattr_t *attr" "int *pshared"
+.It Xo
+.Ft int
+.Fn pthread_rwlockattr_getpshared "pthread_rwlockattr_t *attr" "int *pshared"
+.Xc
 Retrieve the process shared setting for the read/write lock attribute
 object.
-.It int Fn pthread_rwlockattr_init "pthread_rwlockattr_t *attr"
+.It Xo
+.Ft int
+.Fn pthread_rwlockattr_init "pthread_rwlockattr_t *attr"
+.Xc
 Initialize a read/write lock attribute object.
-.It int Fn pthread_rwlockattr_setpshared "pthread_rwlockattr_t *attr" "int *pshared"
+.It Xo
+.Ft int
+.Fn pthread_rwlockattr_setpshared "pthread_rwlockattr_t *attr" "int *pshared"
+.Xc
 Set the process shared setting for the read/write lock attribute object.
 .El
 .Sh PER-THREAD CONTEXT ROUTINES
 .Bl -tag -width Er
-.It int Fn pthread_key_create "pthread_key_t *key" "void (*routine)(void *)"
+.It Xo
+.Ft int
+.Fn pthread_key_create "pthread_key_t *key" "void (*routine)(void *)"
+.Xc
 Create a thread-specific data key.
-.It int Fn pthread_key_delete "pthread_key_t key"
+.It Xo
+.Ft int
+.Fn pthread_key_delete "pthread_key_t key"
+.Xc
 Delete a thread-specific data key.
-.It void * Fn pthread_getspecific "pthread_key_t key" "void **value_ptr"
+.It Xo
+.Ft "void *"
+.Fn pthread_getspecific "pthread_key_t key" "void **value_ptr"
+.Xc
 Get the thread-specific value for the specified key.
-.It int Fn pthread_setspecific "pthread_key_t key" "const void *value_ptr"
+.It Xo
+.Ft int
+.Fn pthread_setspecific "pthread_key_t key" "const void *value_ptr"
+.Xc
 Set the thread-specific value for the specified key.
 .El
 .Sh CLEANUP ROUTINES
 .Bl -tag -width Er
-.It void Fn pthread_cleanup_pop "int execute"
+.It Xo
+.Ft void
+.Fn pthread_cleanup_pop "int execute"
+.Xc
 Remove the routine at the top of the calling thread's cancellation cleanup
 stack and optionally invoke it.
-.It void Fn pthread_cleanup_push "void (*routine)(void *)" "void *routine_arg"
+.It Xo
+.Ft void
+.Fn pthread_cleanup_push "void (*routine)(void *)" "void *routine_arg"
+.Xc
 Push the specified cancellation cleanup handler onto the calling thread's 
 cancellation stack.
 .El
diff --git a/share/man/man3/pthread_cond_wait.3 b/share/man/man3/pthread_cond_wait.3
index 9d70318..ccbf138 100644
--- a/share/man/man3/pthread_cond_wait.3
+++ b/share/man/man3/pthread_cond_wait.3
@@ -48,7 +48,8 @@ variable specified by
 and unblocks the mutex specified by
 .Fa mutex .
 The waiting thread unblocks only after another thread calls
-.Xr pthread_cond_signal 3 , or
+.Xr pthread_cond_signal 3 ,
+or
 .Xr pthread_cond_broadcast 3
 with the same condition variable, and the current thread requires the lock
 on
diff --git a/share/man/man3/pthread_testcancel.3 b/share/man/man3/pthread_testcancel.3
index c1bbc7d..c27c16d 100644
--- a/share/man/man3/pthread_testcancel.3
+++ b/share/man/man3/pthread_testcancel.3
@@ -195,5 +195,5 @@ conforms to ISO/IEC 9945-1 ANSI/IEEE
 Std 1003.1 Second Edition 1996-07-12.
 .Sh AUTHORS
 This man page was written by
-.An David Leonard <d@openbsd.org> 
+.An David Leonard Aq d@openbsd.org
 for the OpenBSD implementation of pthread_cancel.
diff --git a/share/man/man4/aac.4 b/share/man/man4/aac.4
index 6485c01..2987d12 100644
--- a/share/man/man4/aac.4
+++ b/share/man/man4/aac.4
@@ -106,7 +106,7 @@ to the driver.  These messages are printed on the system console,
 and are also queued for retrieval by a management application.
 .Sh SEE ALSO
 .Xr kld 4 ,
-.Xr linux 4,
+.Xr linux 4 ,
 .Xr kldload 8
 .Sh HISTORY
 The
diff --git a/share/man/man4/adw.4 b/share/man/man4/adw.4
index d633aea..d6aaf01 100644
--- a/share/man/man4/adw.4
+++ b/share/man/man4/adw.4
@@ -39,17 +39,17 @@ For one or more SCSI busses:
 This driver provides access to the 16bit
 .Tn SCSI
 bus connected to the Advanced Systems Products, Inc.
-.Tn ASC3550 Ultra,
+.Tn ASC3550 Ultra ,
 and
-.Tn ASC38C0800 Ultra2,
+.Tn ASC38C0800 Ultra2 ,
 SCSI Host Adapter chips.
 AdvanSys products incorporating these chips include the
-.Tn ABP[3]940UW,
-.Tn ABP950UW,
-.Tn ABP970UW,
-.Tn ABP3940U2W,
+.Tn ABP[3]940UW ,
+.Tn ABP950UW ,
+.Tn ABP970UW ,
+.Tn ABP3940U2W ,
 and
-.Tn ABP3950U2W.
+.Tn ABP3950U2W .
 Both chips support, synchronous transfers
 .Pq 20MHz and 40MHz max respectively ,
 16bit transfers, tagged queueing,
diff --git a/share/man/man4/ahc.4 b/share/man/man4/ahc.4
index ab97a9b..be13cde 100644
--- a/share/man/man4/ahc.4
+++ b/share/man/man4/ahc.4
@@ -53,55 +53,55 @@ For one or more SCSI busses:
 This driver provides access to the
 .Tn SCSI
 bus(es) connected to Adaptec
-.Tn AIC7770,
-.Tn AIC7850,
-.Tn AIC7860,
-.Tn AIC7870,
-.Tn AIC7880,
-.Tn AIC7890,
-.Tn AIC7891,
-.Tn AIC7892,
-.Tn AIC7895,
-.Tn AIC7896,
+.Tn AIC7770 ,
+.Tn AIC7850 ,
+.Tn AIC7860 ,
+.Tn AIC7870 ,
+.Tn AIC7880 ,
+.Tn AIC7890 ,
+.Tn AIC7891 ,
+.Tn AIC7892 ,
+.Tn AIC7895 ,
+.Tn AIC7896 ,
 .Tn AIC7897
 and
 .Tn AIC7899
 host adapter chips.
 These chips are found on many motherboards as well as the following
 Adaptec SCSI controller cards:
-.Tn 274X(W),
-.Tn 274X(T),
-.Tn 284X,
-.Tn 2910,
-.Tn 2915,
-.Tn 2920,
-.Tn 2930C,
-.Tn 2930U2,
-.Tn 2940,
-.Tn 2940U,
-.Tn 2940AU,
-.Tn 2940UW,
-.Tn 2940UW Dual,
-.Tn 2940UW Pro,
-.Tn 2940U2W,
-.Tn 2940U2B,
-.Tn 2950U2W,
-.Tn 2950U2B,
-.Tn 19160B,
-.Tn 29160B,
-.Tn 29160N,
-.Tn 3940,
-.Tn 3940U,
-.Tn 3940AU,
-.Tn 3940UW,
-.Tn 3940AUW,
-.Tn 3940U2W,
-.Tn 3950U2,
-.Tn 3960,
-.Tn 39160,
-.Tn 3985,
+.Tn 274X(W) ,
+.Tn 274X(T) ,
+.Tn 284X ,
+.Tn 2910 ,
+.Tn 2915 ,
+.Tn 2920 ,
+.Tn 2930C ,
+.Tn 2930U2 ,
+.Tn 2940 ,
+.Tn 2940U ,
+.Tn 2940AU ,
+.Tn 2940UW ,
+.Tn 2940UW Dual ,
+.Tn 2940UW Pro ,
+.Tn 2940U2W ,
+.Tn 2940U2B ,
+.Tn 2950U2W ,
+.Tn 2950U2B ,
+.Tn 19160B ,
+.Tn 29160B ,
+.Tn 29160N ,
+.Tn 3940 ,
+.Tn 3940U ,
+.Tn 3940AU ,
+.Tn 3940UW ,
+.Tn 3940AUW ,
+.Tn 3940U2W ,
+.Tn 3950U2 ,
+.Tn 3960 ,
+.Tn 39160 ,
+.Tn 3985 ,
 and
-.Tn 4944UW.
+.Tn 4944UW .
 .Pp
 Driver features include support for twin and wide busses,
 fast, ultra or ultra2 synchronous transfers depending on controller type,
diff --git a/share/man/man4/asr.4 b/share/man/man4/asr.4
index 960ceca..5c08341 100644
--- a/share/man/man4/asr.4
+++ b/share/man/man4/asr.4
@@ -10,8 +10,7 @@
 .Os FreeBSD
 .Sh NAME
 .Nm asr
-.Nd
-.Tn Driver for Adaptec I2O based SCSI host bus adapters.
+.Nd driver for Adaptec I2O based SCSI host bus adapters
 .Sh SYNOPSIS
 .Cd "device asr"
 .Sh DESCRIPTION
diff --git a/share/man/man4/atkbdc.4 b/share/man/man4/atkbdc.4
index eed2f39..1d00827 100644
--- a/share/man/man4/atkbdc.4
+++ b/share/man/man4/atkbdc.4
@@ -59,7 +59,7 @@ driver.
 They may be set in the kernel configuration file 
 .Pq see Xr config 8 .
 .Bl -tag -width MOUSE
-.It Em KBD_RESETDELAY=X, KBD_MAXWAIT=Y
+.It Em KBD_RESETDELAY=X , KBD_MAXWAIT=Y
 The keyboard driver
 .Nm atkbd
 and the pointing device driver
diff --git a/share/man/man4/awi.4 b/share/man/man4/awi.4
index 0f1b0b7..b3cee47 100644
--- a/share/man/man4/awi.4
+++ b/share/man/man4/awi.4
@@ -83,7 +83,7 @@ media type.  For each media type,
 .Em adhoc
 mediaopt can be used to indicate the driver to operate in adhoc mode.
 Also,
-.Em adhoc,flag0
+.Em adhoc , Ns Em flag0
 mediaopt can be used for
 .Xr wi 4
 compatible adhoc mode.
diff --git a/share/man/man4/bktr.4 b/share/man/man4/bktr.4
index 01787ad..6ad3338 100644
--- a/share/man/man4/bktr.4
+++ b/share/man/man4/bktr.4
@@ -23,7 +23,7 @@ capture and
 capture on low cost, high performance boards.  The driver based on
 the Matrox Meteor driver and uses the same API.  The bktr driver should support most video cards
 based on the
-.Em Brooktree Bt848/849/878/879 Video Capture Chip.
+.Em "Brooktree Bt848/849/878/879 Video Capture Chip" .
 The driver also supports 
 .Em FM Radio
 if the Tuner supports it.
diff --git a/share/man/man4/bpf.4 b/share/man/man4/bpf.4
index b0a9571..35b97c1 100644
--- a/share/man/man4/bpf.4
+++ b/share/man/man4/bpf.4
@@ -75,7 +75,7 @@ This size is returned by the
 .Dv BIOCGBLEN
 ioctl (see below), and 
 can be set with
-.Dv BIOCSBLEN.
+.Dv BIOCSBLEN .
 Note that an individual packet larger than this size is necessarily
 truncated.
 .Pp
@@ -250,7 +250,8 @@ is given by the
 .Li bf_len
 field.
 Also, the actions of
-.Dv BIOCFLUSH are performed.
+.Dv BIOCFLUSH
+are performed.
 See section
 .Sx "FILTER MACHINE"
 for an explanation of the filter language.
@@ -458,7 +459,7 @@ or a word in the scratch memory store
 For 
 .Dv BPF_IND
 and
-.Dv BPF_ABS,
+.Dv BPF_ABS ,
 the data size must be specified as a word
 .Pq Dv BPF_W ,
 halfword
diff --git a/share/man/man4/ccd.4 b/share/man/man4/ccd.4
index c60d461..09324d4 100644
--- a/share/man/man4/ccd.4
+++ b/share/man/man4/ccd.4
@@ -58,7 +58,7 @@ partitions of the disks
 .Pa should not
 be combined.  The kernel will only allow component partitions of type
 FS_BSDFFS (type
-.Dq 4.2BSD
+.Dq Bx 4.2
 as shown as
 .Xr disklabel 8 ) .
 .Pp
diff --git a/share/man/man4/ddb.4 b/share/man/man4/ddb.4
index ef53b3e..432b279 100644
--- a/share/man/man4/ddb.4
+++ b/share/man/man4/ddb.4
@@ -328,7 +328,7 @@ only print when the matching return is hit.
 .It Xo
 .No Cm trace Ns Op Cm /u
 .Op Ar frame
-.Op Ar ,count
+.Op , Ns Ar count
 .Xc
 Stack trace.  The
 .Li u
@@ -350,7 +350,7 @@ only if the machine dependent code supports it.
 .Ar addr
 .Ar value
 .Op Ar mask
-.Op Ar ,count
+.Op , Ns Ar count
 .Xc
 Search memory for
 .Ar value .
diff --git a/share/man/man4/ed.4 b/share/man/man4/ed.4
index 896f415..79462e9 100644
--- a/share/man/man4/ed.4
+++ b/share/man/man4/ed.4
@@ -88,7 +88,7 @@ This flag disables the use of multiple
 transmit buffers and may be necessary in rare cases where packets are sent out
 faster than a machine on the other end can handle (as evidenced by severe packet
 lossage). Some
-.No (non- Ns Fx
+.No ( non- Ns Fx
 :-)) machines have terrible ethernet performance
 and simply can't cope with 1100K+ data rates.
 Use of this flag also provides
diff --git a/share/man/man4/en.4 b/share/man/man4/en.4
index b62a691..366dabc 100644
--- a/share/man/man4/en.4
+++ b/share/man/man4/en.4
@@ -41,12 +41,12 @@ To enable the link use the following commands:
 .Dl	# ifconfig en0 128.252.200.2 netmask 0xffffff00 up
 .Dl	# route add -iface 128.252.200.1 -link en0:3.0.0.c9
 .Sh DIAGNOSTICS
-.Bl -diag
-.It	"en0 <Efficient Networks ENI-155p> rev 0 int a irq 5 on pci0:16"
-.It	"en0: ATM midway v0, board IDs 6.0, Utopia (pipelined), 512KB on-board RAM"
-.It	"en0: maximum DMA burst length = 64 bytes"
-.It	"en0: 7 32KB receive buffers, 8 32KB transmit buffers allocated"
-.El
+.Bd -literal
+en0 <Efficient Networks ENI-155p> rev 0 int a irq 5 on pci0:16
+en0: ATM midway v0, board IDs 6.0, Utopia (pipelined), 512KB on-board RAM
+en0: maximum DMA burst length = 64 bytes
+en0: 7 32KB receive buffers, 8 32KB transmit buffers allocated
+.Ed
 .Sh CAVEATS
 The driver extensively uses DMA on PCI.
 The first
diff --git a/share/man/man4/fdc.4 b/share/man/man4/fdc.4
index 88a3d1d..338b030 100644
--- a/share/man/man4/fdc.4
+++ b/share/man/man4/fdc.4
@@ -72,9 +72,9 @@ can be turned off using flags
 .Ql 0x4 .
 .Sh FILES
 .Bl -tag -width Pa -compact
-.It /dev/fd*
+.It Pa /dev/fd*
 floppy disk device nodes
-.It /dev/fd*.<size in kB>
+.It Pa /dev/fd*. Ns Ar "<size in kB>"
 floppy disk device nodes where the trailing number indicates the floppy 
 capacity 
 .It Pa /sys/i386/conf/GENERIC
diff --git a/share/man/man4/inet.4 b/share/man/man4/inet.4
index b1dc34f..13dae8f 100644
--- a/share/man/man4/inet.4
+++ b/share/man/man4/inet.4
@@ -157,7 +157,7 @@ All IP routes, except those with the
 flag and those to multicast destinations, have the
 .Dv RTF_PRCLONING
 flag forcibly enabled (they are thus said to be
-.Dq "protocol cloning" ).
+.Dq "protocol cloning" ) .
 .It
 When the last reference to an IP route is dropped, the route is
 examined to determine if it was created by cloning such a route.  If
diff --git a/share/man/man4/ip.4 b/share/man/man4/ip.4
index eeda4ce..cd37c7e 100644
--- a/share/man/man4/ip.4
+++ b/share/man/man4/ip.4
@@ -178,7 +178,7 @@ multicasting is supported only on
 sockets of type
 .Dv SOCK_DGRAM 
 and 
-.Dv SOCK_RAW,
+.Dv SOCK_RAW ,
 and only on networks where the interface
 driver supports multicasting.
 .Pp
@@ -366,7 +366,7 @@ ip->ip_off = offset;
 .Ed
 .Pp
 If the header source address is set to 
-.Dv INADDR_ANY,
+.Dv INADDR_ANY ,
 the kernel will choose an appropriate address.
 .Sh DIAGNOSTICS
 A socket operation may fail with one of the following errors returned:
diff --git a/share/man/man4/ipfirewall.4 b/share/man/man4/ipfirewall.4
index e53d487..679d16f 100644
--- a/share/man/man4/ipfirewall.4
+++ b/share/man/man4/ipfirewall.4
@@ -184,7 +184,7 @@ by
 It has been heavily modified and ported to
 .Fx
 by
-.Ar Ugen J.S.Antsilevich
+.An Ugen J.S. Antsilevich
 .Aq ugen@NetVision.net.il .
 .Pp
 Several enhancements added by
diff --git a/share/man/man4/man4.alpha/linux.4 b/share/man/man4/man4.alpha/linux.4
index 3aab977..9ff8a0d 100644
--- a/share/man/man4/man4.alpha/linux.4
+++ b/share/man/man4/man4.alpha/linux.4
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .Dd August 17, 2000
-.Dt LINUX 4 alpha
+.Dt LINUX 4 Alpha
 .Os
 .Sh NAME
 .Nm linux
diff --git a/share/man/man4/man4.alpha/osf1.4 b/share/man/man4/man4.alpha/osf1.4
index 7aa88bd..ec6e9a4 100644
--- a/share/man/man4/man4.alpha/osf1.4
+++ b/share/man/man4/man4.alpha/osf1.4
@@ -25,7 +25,7 @@
 .\" $FreeBSD$
 .\"
 .Dd November 13, 2000
-.Dt OSF/1 4 alpha
+.Dt OSF/1 4 Alpha
 .Os
 .Sh NAME
 .Nm osf1
diff --git a/share/man/man4/man4.i386/alpm.4 b/share/man/man4/man4.i386/alpm.4
index caf6bea..8fdfd06 100644
--- a/share/man/man4/man4.i386/alpm.4
+++ b/share/man/man4/man4.i386/alpm.4
@@ -35,7 +35,8 @@
 .Cd device alpm
 .Sh DESCRIPTION
 This driver provides access to the
-.Tn Aladdin 15x3 Power Management Unit. Currently, only smbus controller 
+.Tn Aladdin 15x3 Power Management Unit .
+Currently, only smbus controller 
 function is implemented.
 .Pp
 The embedded SMBus controller of the Aladdin chipset may give you access
diff --git a/share/man/man4/man4.i386/apm.4 b/share/man/man4/man4.i386/apm.4
index ddce25e..b301a2f 100644
--- a/share/man/man4/man4.i386/apm.4
+++ b/share/man/man4/man4.i386/apm.4
@@ -48,7 +48,7 @@ exports an application interface as a character device.  Applications
 can control APM, or retrieve APM status information via this interface.
 .Nm
 exports the following interfaces.  These symbols are defined in
-.Dq Pa /usr/include/machine/apm_bios.h.
+.Dq Pa /usr/include/machine/apm_bios.h .
 .Bl -tag -width 4n -offset indent
 .It Sy APMIO_SUSPEND
 Suspend system.
@@ -66,17 +66,17 @@ Get per battery information.
 Some APM implementations execute the HLT 
 .Pq Halt CPU until an interrupt occurs
 instruction in the
-.Dq Pa Idle CPU
+.Dq Em Idle CPU
 call, while others do not.  Thus enabling this may result in
 redundant HLT executions because
-.Dq Pa Idle CPU
+.Dq Em Idle CPU
 is called from the kernel context switch routine that inherently executes 
 HLT. This may reduce peak system performance.  
 .Pp
 Also the system hangs up if HLT instruction is disabled in the kernel 
 context switch routine, and if the APM implementation of the machine 
 does not execute HLT in
-.Dq Pa Idle CPU.
+.Dq Em Idle CPU .
 On some implementations that do not support CPU clock slowdown, APM 
 might not execute HLT.
 .Nm
@@ -87,7 +87,7 @@ operation on such machines.
 The current version of
 .Nm
 does not call
-.Dq Pa Idle CPU
+.Dq Em Idle CPU
 from the kernel context switch routine if clock slowdown is not supported, 
 and it executes HLT instruction by default.  Therefore, there is 
 no need to use these two operations in most cases.
diff --git a/share/man/man4/man4.i386/asr.4 b/share/man/man4/man4.i386/asr.4
index 960ceca..5c08341 100644
--- a/share/man/man4/man4.i386/asr.4
+++ b/share/man/man4/man4.i386/asr.4
@@ -10,8 +10,7 @@
 .Os FreeBSD
 .Sh NAME
 .Nm asr
-.Nd
-.Tn Driver for Adaptec I2O based SCSI host bus adapters.
+.Nd driver for Adaptec I2O based SCSI host bus adapters
 .Sh SYNOPSIS
 .Cd "device asr"
 .Sh DESCRIPTION
diff --git a/share/man/man4/man4.i386/en.4 b/share/man/man4/man4.i386/en.4
index b62a691..366dabc 100644
--- a/share/man/man4/man4.i386/en.4
+++ b/share/man/man4/man4.i386/en.4
@@ -41,12 +41,12 @@ To enable the link use the following commands:
 .Dl	# ifconfig en0 128.252.200.2 netmask 0xffffff00 up
 .Dl	# route add -iface 128.252.200.1 -link en0:3.0.0.c9
 .Sh DIAGNOSTICS
-.Bl -diag
-.It	"en0 <Efficient Networks ENI-155p> rev 0 int a irq 5 on pci0:16"
-.It	"en0: ATM midway v0, board IDs 6.0, Utopia (pipelined), 512KB on-board RAM"
-.It	"en0: maximum DMA burst length = 64 bytes"
-.It	"en0: 7 32KB receive buffers, 8 32KB transmit buffers allocated"
-.El
+.Bd -literal
+en0 <Efficient Networks ENI-155p> rev 0 int a irq 5 on pci0:16
+en0: ATM midway v0, board IDs 6.0, Utopia (pipelined), 512KB on-board RAM
+en0: maximum DMA burst length = 64 bytes
+en0: 7 32KB receive buffers, 8 32KB transmit buffers allocated
+.Ed
 .Sh CAVEATS
 The driver extensively uses DMA on PCI.
 The first
diff --git a/share/man/man4/man4.i386/pnp.4 b/share/man/man4/man4.i386/pnp.4
index 5f00620..fb4976f 100644
--- a/share/man/man4/man4.i386/pnp.4
+++ b/share/man/man4/man4.i386/pnp.4
@@ -46,7 +46,7 @@ configuration of PnP cards, and device drivers to fetch/modify
 parameters in the card's configuration space.
 .Pp
 The manual override mechanism requires the kernel to be compiled with
-.Cd options USERCONFIG.
+.Cd options USERCONFIG .
 In this case, the kernel keeps a table of fixed size (20 entries as a
 default) where configuration data are held for PnP devices.
 Each
diff --git a/share/man/man4/man4.i386/ray.4 b/share/man/man4/man4.i386/ray.4
index b3091f2..59d0172 100644
--- a/share/man/man4/man4.i386/ray.4
+++ b/share/man/man4/man4.i386/ray.4
@@ -199,7 +199,7 @@ option of
 A packet was ready for transmission but the NIC is not connected to a
 BSS.
 May occur when removing the PCCard.
-.It ray?: "cannot transmit - no network"
+.It "ray?: cannot transmit - no network"
 The wireless NIC has roamed from an access point and not connected with a new
 one yet.
 .It "ray?: cannot transmit - ECF busy"
diff --git a/share/man/man4/man4.i386/spkr.4 b/share/man/man4/man4.i386/spkr.4
index d5a7571..d83e897 100644
--- a/share/man/man4/man4.i386/spkr.4
+++ b/share/man/man4/man4.i386/spkr.4
@@ -140,7 +140,7 @@ sets quarter notes, etc.
 Pause (rest), with 
 .Sy n
 interpreted as for 
-.Ns Li L Sy n .
+.Li L Sy n .
 May be followed by
 sustain dots.  May also be written
 .Li ~ .
@@ -169,7 +169,7 @@ very fast	Prestissimo
 .It Li M[LNS]
 Set articulation.
 .Li MN
-.Ns No ( Li N
+.Li ( N
 for normal) is the default; the last 1/8th of
 the note's value is rest time.
 You can set
diff --git a/share/man/man4/man4.i386/tw.4 b/share/man/man4/man4.i386/tw.4
index d91ce6e..f00afdc 100644
--- a/share/man/man4/man4.i386/tw.4
+++ b/share/man/man4/man4.i386/tw.4
@@ -84,12 +84,10 @@ The driver produces a series of three
 character packets.  In each packet, the first character consists of flags,
 the second character is a four bit house code (0-15), and the third character
 is a five bit key/function code (0-31).  The flags are the following:
-.Bl -diag
-.It
+.Bd -literal
 #define TW_RCV_LOCAL	1  /* The packet arrived during a local transmission */
-.It
 #define TW_RCV_ERROR	2  /* An invalid/corrupted packet was received */
-.El
+.Ed
 .Pp
 The
 .Fn select
@@ -98,10 +96,8 @@ is data ready for reading.
 .Sh SEE ALSO
 .Xr xten 1 ,
 .Xr xtend 8
-.Bl -diag
-.It
+.Pp
 TW-523 documentation from X-10 Inc.
-.El
 .Sh FILES
 .Bl -tag -width /dev/tw
 .It Pa /dev/tw?
diff --git a/share/man/man4/man4.i386/wl.4 b/share/man/man4/man4.i386/wl.4
index 900f4d9..d43f822 100644
--- a/share/man/man4/man4.i386/wl.4
+++ b/share/man/man4/man4.i386/wl.4
@@ -131,7 +131,7 @@ due to delays in the configuration code.
 .Sh SEE ALSO
 .Xr sysctl 8 ,
 .Xr wlconfig 8 ,
-.Xr http://www.wavelan.com
+.Pa http://www.wavelan.com
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man4/mem.4 b/share/man/man4/mem.4
index 064cc69..1d56020 100644
--- a/share/man/man4/mem.4
+++ b/share/man/man4/mem.4
@@ -81,7 +81,7 @@ Declarations and data types are to be found in
 .Pp
 The specific attributes, and number of programmable ranges may vary between
 architectures.  The full set of supported attributes is:
-.Bl -tag -width 10
+.Bl -tag -width indent
 .It MDF_UNCACHEABLE
 The region is not cached.
 .It MDF_WRITECOMBINE
@@ -107,7 +107,7 @@ In addition to the region attributes listed above, the following flags
 may also be set in the
 .Fa mr_flags
 field:
-.Bl -tag -width 10
+.Bl -tag -width indent
 .It MDF_FIXBASE
 The region's base address cannot be changed.
 .It MDF_FIXLEN
@@ -178,7 +178,7 @@ enabled.
 .Sh BUGS
 Busy range attributes are not yet managed correctly.
 .Sh FILES
-.Bl -tag -width Pa -compact
+.Bl -tag -width /dev/kmem -compact
 .It Pa /dev/mem
 .It Pa /dev/kmem
 .El
diff --git a/share/man/man4/netgraph.4 b/share/man/man4/netgraph.4
index 0414b11..317dfa0 100644
--- a/share/man/man4/netgraph.4
+++ b/share/man/man4/netgraph.4
@@ -364,7 +364,8 @@ Two other methods are also supported by all nodes:
 .Bl -tag -width xxx
 .It Receive data message
 A
-.Em Netgraph queueable reqest item ,usually refered to as an 
+.Em Netgraph queueable reqest item ,
+usually refered to as an
 .Em item ,
 is recieved by the function.
 The item contains a pointer to an mbuf and metadata about the packet.
@@ -441,7 +442,7 @@ conformance with Frame Relay standards.
 The node may elect to nominate a different receive data function
 for data received on a particular hook, to simplify coding. It uses
 the 
-.Fn NG_HOOK_SET_RCVDATA "hook, fn"
+.Fn NG_HOOK_SET_RCVDATA hook fn
 macro to do this. The function receives the same arguments in every way
 other than it will receive all (and only) packets from that hook.
 .It Receive control message
@@ -468,7 +469,7 @@ The return address is retrieved from the
 using the
 .Fn NGI_RETADDR
 macro and is of type 
-.Em ng_ID_t.
+.Em ng_ID_t .
 All control messages and replies are
 allocated with
 .Fn malloc
@@ -491,7 +492,7 @@ the message out another hook to that on which it arrived.
 The node may elect to nominate a different receive message function
 for messages received on a particular hook, to simplify coding. It uses
 the 
-.Fn NG_HOOK_SET_RCVMSG "hook, fn"
+.Fn NG_HOOK_SET_RCVMSG hook fn
 macro to do this. The function receives the same arguments in every way
 other than it will receive all (and only) messages from that hook.
 .El
@@ -661,7 +662,7 @@ node ID
 Of type 
 .Em ng_ID_t ,
 This property can be retrieved using the macro 
-.Fn NG_NODE_ID "node".
+.Fn NG_NODE_ID "node" .
 .Pp
 .It
 node name
@@ -684,7 +685,7 @@ You may place anything of type
 .Em pointer
 here.
 Use the macros
-.Fn NG_NODE_SET_PRIVATE "node, value"
+.Fn NG_NODE_SET_PRIVATE node value
 and
 .Fn NG_NODE_PRIVATE "node"
 to set and retrieve this property.
@@ -702,10 +703,10 @@ hooks
 The node may have a number of hooks.
 A traversal method is provided to allow all the hooks to be
 tested for some condition.
-.Fn NG_NODE_FOREACH_HOOK "node, fn, arg, rethook"
+.Fn NG_NODE_FOREACH_HOOK node fn arg rethook
 where fn is a function that will be called for each hook
 with the form
-.Fn fn "hook, arg"
+.Fn fn hook arg
 and returning 0 to terminate the search. If the search is terminated, then 
 .Em rethook
 will be set to the hook at which the search was terminated.
@@ -727,7 +728,7 @@ You may place anything of type
 .Em pointer
 here.
 Use the macros
-.Fn NG_HOOK_SET_PRIVATE "hook, value"
+.Fn NG_HOOK_SET_PRIVATE hook value
 and
 .Fn NG_HOOK_PRIVATE "hook"
 to set and retrieve this property.
@@ -761,9 +762,9 @@ unless you have another reference still valid.
 Over-ride receive functions.
 .Pp
 The
-.Fn NG_HOOK_SET_RCVDATA "hook, fn"
+.Fn NG_HOOK_SET_RCVDATA hook fn
 and
-.Fn NG_HOOK_SET_RCVMSG "hook, fn"
+.Fn NG_HOOK_SET_RCVMSG hook fn
 macros can be used to set over-ride methods that will be used in preference
 to the generic receive data and reveive message functions. To unset these
 use the macros to set them to NULL. They will only be used for data and
@@ -1152,7 +1153,7 @@ It has 4 hooks:
 and
 .Dv right2left .
 Data entering from the right is passed to the left and duplicated on
-.Dv right2left,
+.Dv right2left ,
 and data entering from the left is passed to the right and
 duplicated on
 .Dv left2right .
@@ -1222,7 +1223,7 @@ A server and client side implememtation of PPPoE. Used in conjunction with
 either 
 .Xr ppp 8
 or the 
-.Em mpd port.
+.Em mpd port .
 .It BRIDGE
 This node, togther with the ethernet nodes allows a very flexible
 bridging system to be implemented.
diff --git a/share/man/man4/ng_one2many.4 b/share/man/man4/ng_one2many.4
index e3a8456..5ca0448 100644
--- a/share/man/man4/ng_one2many.4
+++ b/share/man/man4/ng_one2many.4
@@ -168,7 +168,7 @@ but also atomically clears the statistics for the link as well.
 This node shuts down upon receipt of a
 .Dv NGM_SHUTDOWN
 control message, or when all hooks have been disconnected.
-.Sh EXAMPLE
+.Sh EXAMPLES
 The following commands will set up Ethernet interfaces
 .Dv fxp0
 to deliver packets alternating over the physical interfaces
@@ -215,10 +215,12 @@ The
 node type was implemented in
 .Fx 4.2 .
 .Sh AUTHORS
-The one2many netgraph node (with round-robin algorithm) was written by
+.An -nosplit
+The
+.Nm one2many
+netgraph node (with round-robin algorithm) was written by
 .An Archie Cobbs
-.Aq archie@freebsd.org .
+.Aq archie@FreeBSD.org .
 The all algorithm was added by
 .An Rogier R. Mulhuijzen
 .Aq drwilco@drwilco.net .
-
diff --git a/share/man/man4/pcvt.4 b/share/man/man4/pcvt.4
index 315a2c3..6918d28 100644
--- a/share/man/man4/pcvt.4
+++ b/share/man/man4/pcvt.4
@@ -681,7 +681,7 @@ This feature is mainly intended to allow
 to switch between virtual screens even when
 running an X server.
 They are ugly with respect to the implied semantics
-.Pq i.\& e., they break Berkeley semantics.
+(i.e., they break Berkeley semantics).
 See the file
 .Pa i386/include/pcvt_ioctl.h
 for their documentation.
diff --git a/share/man/man4/ppbus.4 b/share/man/man4/ppbus.4
index f710801..fc0e8b6 100644
--- a/share/man/man4/ppbus.4
+++ b/share/man/man4/ppbus.4
@@ -68,7 +68,7 @@ and non-standard software:
 .Pp
 .Bl -column "Driver" -compact
 .It Em Driver Ta Em Description
-.It Sy vpo Ta "VPI0 parallel to Adaptec AIC-7110 SCSI controller driver."
+.It Sy vpo Ta "VPI0 parallel to Adaptec AIC-7110 SCSI controller driver" .
 It uses standard and non-standard parallel port accesses.
 .It Sy ppi Ta "Parallel port interface for general I/O"
 .It Sy pps Ta "Pulse per second Timing Interface"
diff --git a/share/man/man4/ppi.4 b/share/man/man4/ppi.4
index 336167a..1614729 100644
--- a/share/man/man4/ppi.4
+++ b/share/man/man4/ppi.4
@@ -57,27 +57,27 @@ calls.  Each command takes a single
 .Ft u_int8_t
 argument, transferring one byte of data.  The following commands are 
 available:
-.Bl -tag -width 10
-.It PPIGDATA, PPISDATA
+.Bl -tag -width indent
+.It Dv PPIGDATA , PPISDATA
 Get and set the contents of the data register.
-.It PPIGSTATUS, PPISSTATUS
+.It Dv PPIGSTATUS , PPISSTATUS
 Get and set the contents of the status register.
-.It PPIGCTRL, PPISCTRL
+.It Dv PPIGCTRL , PPISCTRL
 Get and set the contents of the control register.
 The following defines correspond to bits in this register.  Setting
 a bit in the control register drives the corresponding output low.
-.Bl -tag -width 10 -compact
-.It STROBE
-.It AUTOFEED
-.It nINIT
-.It SELECTIN
-.It PCD
+.Bl -tag -width indent -compact
+.It Dv STROBE
+.It Dv AUTOFEED
+.It Dv nINIT
+.It Dv SELECTIN
+.It Dv PCD
 .El
-.It PPIGEPP, PPISEPP
+.It Dv PPIGEPP , PPISEPP
 Get and set the contents of the EPP control register.
-.It PPIGECR, PPISECR
+.It Dv PPIGECR , PPISECR
 Get and set the contents of the ECP control register.
-.It PPIGFIFO, PPISFIFO
+.It Dv PPIGFIFO , PPISFIFO
 Read and write the ECP FIFO (8-bit operations only).
 .El
 .Sh EXAMPLES
diff --git a/share/man/man4/psm.4 b/share/man/man4/psm.4
index 01376f1..de5018d 100644
--- a/share/man/man4/psm.4
+++ b/share/man/man4/psm.4
@@ -194,7 +194,7 @@ driver.
 They may be set in the kernel configuration file 
 .Pq see Xr config 8 .
 .Bl -tag -width MOUSE
-.It Em KBD_RESETDELAY=X, KBD_MAXWAIT=Y
+.It Em KBD_RESETDELAY=X , KBD_MAXWAIT=Y
 The
 .Nm
 driver will attempt to reset the pointing device during the boot process.
@@ -215,7 +215,7 @@ The default values are
 and 5
 for
 .Fa Y .
-.It Em PSM_DEBUG=N, KBDIO_DEBUG=N
+.It Em PSM_DEBUG=N , KBDIO_DEBUG=N
 Sets the debug level to 
 .Fa N .
 The default debug level is zero.
diff --git a/share/man/man4/rl.4 b/share/man/man4/rl.4
index 8419c8e..7bf0642 100644
--- a/share/man/man4/rl.4
+++ b/share/man/man4/rl.4
@@ -93,7 +93,8 @@ The
 option can also be used to select either
 .Ar full-duplex
 or
-.Ar half-duplex modes.
+.Ar half-duplex
+modes.
 .It 100baseTX
 Set 100Mbps (fast ethernet) operation.
 The
diff --git a/share/man/man4/spkr.4 b/share/man/man4/spkr.4
index d5a7571..d83e897 100644
--- a/share/man/man4/spkr.4
+++ b/share/man/man4/spkr.4
@@ -140,7 +140,7 @@ sets quarter notes, etc.
 Pause (rest), with 
 .Sy n
 interpreted as for 
-.Ns Li L Sy n .
+.Li L Sy n .
 May be followed by
 sustain dots.  May also be written
 .Li ~ .
@@ -169,7 +169,7 @@ very fast	Prestissimo
 .It Li M[LNS]
 Set articulation.
 .Li MN
-.Ns No ( Li N
+.Li ( N
 for normal) is the default; the last 1/8th of
 the note's value is rest time.
 You can set
diff --git a/share/man/man4/splash.4 b/share/man/man4/splash.4
index 8f37403..3aa1150 100644
--- a/share/man/man4/splash.4
+++ b/share/man/man4/splash.4
@@ -160,15 +160,15 @@ section above.
 .\".Sh DRIVER CONFIGURATION
 .Sh FILES
 .Bl -tag -width /boot/kernel/splash_xxxx.ko -compact
-.It /boot/defaults/loader.conf
+.It Pa /boot/defaults/loader.conf
 boot loader configuration defaults
-.It /etc/rc.conf
+.It Pa /etc/rc.conf
 system configuration information
-.It /boot/kernel/splash_*.ko
+.It Pa /boot/kernel/splash_*.ko
 splash image decoder modules
-.It /boot/kernel/*_saver.ko
+.It Pa /boot/kernel/*_saver.ko
 screen saver modules
-.It /boot/kernel/vesa.ko
+.It Pa /boot/kernel/vesa.ko
 the VESA support module
 .El
 .Sh EXAMPLES
diff --git a/share/man/man4/sppp.4 b/share/man/man4/sppp.4
index 76e4c45..13ada10 100644
--- a/share/man/man4/sppp.4
+++ b/share/man/man4/sppp.4
@@ -124,7 +124,7 @@ value 0.0.0.1 which means that we don't care what address the remote
 side will use, as long as it is not 0.0.0.0.
 This is useful if your ISP has several dial-in
 servers.  You can of course
-.Ic route add something or other 0.0.0.1
+.Nm route Cm add Ar something_or_other 0.0.0.1
 and it will do exactly what you would want it to.
 .Pp
 The PAP and CHAP authentication protocols as described in RFC 1334,
diff --git a/share/man/man4/ste.4 b/share/man/man4/ste.4
index 5e30bc6..ca787f4 100644
--- a/share/man/man4/ste.4
+++ b/share/man/man4/ste.4
@@ -77,7 +77,8 @@ The
 option can also be used to select either
 .Ar full-duplex
 or
-.Ar half-duplex modes.
+.Ar half-duplex
+modes.
 .It 100baseTX
 Set 100Mbps (fast ethernet) operation.
 The
diff --git a/share/man/man4/sym.4 b/share/man/man4/sym.4
index a76ddcf..aa100a9 100644
--- a/share/man/man4/sym.4
+++ b/share/man/man4/sym.4
@@ -76,19 +76,19 @@ To control chip attachment balancing between the ncr driver and this driver
 .Cd options SYM_SETUP_LP_PROBE_MAP=<bit combination>
 .Sh DESCRIPTION
 This driver provides support for the Symbios/LSI Logic
-.Tn 53C810,
-.Tn 53C815,
-.Tn 53C825,
-.Tn 53C810A,
-.Tn 53C825A,
-.Tn 53C860,
-.Tn 53C875,
-.Tn 53C876,
-.Tn 53C895,
-.Tn 53C895A,
-.Tn 53C896,
-.Tn 53C897,
-.Tn 53C1510D,
+.Tn 53C810 ,
+.Tn 53C815 ,
+.Tn 53C825 ,
+.Tn 53C810A ,
+.Tn 53C825A ,
+.Tn 53C860 ,
+.Tn 53C875 ,
+.Tn 53C876 ,
+.Tn 53C895 ,
+.Tn 53C895A ,
+.Tn 53C896 ,
+.Tn 53C897 ,
+.Tn 53C1510D ,
 and
 .Tn 53C1010
 PCI SCSI controllers.
diff --git a/share/man/man4/sysmouse.4 b/share/man/man4/sysmouse.4
index 2c80033..ceb55a6 100644
--- a/share/man/man4/sysmouse.4
+++ b/share/man/man4/sysmouse.4
@@ -166,7 +166,7 @@ field holds the number of buttons detected by the driver.
 The
 .Dv iftype
 is always
-.Dv MOUSE_IF_SYSMOUSE.
+.Dv MOUSE_IF_SYSMOUSE .
 .Pp
 The
 .Dv type
diff --git a/share/man/man4/tap.4 b/share/man/man4/tap.4
index bac035a..b020349 100644
--- a/share/man/man4/tap.4
+++ b/share/man/man4/tap.4
@@ -51,11 +51,9 @@ and thus can be used with
 like any other Ethernet interface. When the system chooses to transmit
 an Ethernet frame on the network interface, the frame can be read from 
 the control device
-.Po
-it appears as
+(it appears as
 .Dq input
-there
-.Pc ;
+there);
 writing an Ethernet frame to the control device generates an input frame on
 the network interface, as if the
 .Pq non-existent
@@ -64,9 +62,7 @@ hardware had just received it.
 The Ethernet tunnel device, normally
 .Pa /dev/tap Ns Sy N ,
 is exclusive-open
-.Po
-it cannot be opened if it is already open
-.Pc
+(it cannot be opened if it is already open)
 and is restricted to the super-user.
 A
 .Fn read
@@ -121,11 +117,9 @@ value is or isn't zero
 .Pq Writes are always nonblocking .
 .It Dv FIOASYNC
 Turn asynchronous I/O for reads
-.Po
-i.e., generation of
+(i.e., generation of
 .Dv SIGIO
-when data is available to be read
-.Pc
+when data is available to be read)
 off or on, according as the argument
 .Va int Ns 's
 value is or isn't zero.
@@ -152,12 +146,10 @@ address of the
 .Dq remote
 side. This command is used by the VMware port and expected to be executed on
 descriptor, associated with control device
-.Po
-usually
+(usually
 .Pa /dev/vmnet Ns Sy N 
 or
-.Pa /dev/tap Ns Sy N 
-.Pc .
+.Pa /dev/tap Ns Sy N ) .
 The
 .Va buffer ,
 which is passed as the argument, is expected to have enough space to store
@@ -189,10 +181,9 @@ writes are always non-blocking.
 .Pp
 On the last close of the data device, the interface is
 brought down
-.Po
-as if with  
-.Dq ifconfig tap Ns Sy N No down
-.Pc unless the devices is a VMnet device.
+(as if with  
+.Dq ifconfig tap Ns Sy N No down )
+unless the devices is a VMnet device.
 All queued frames are thrown away. If the interface is up when the data 
 device is not open, output frames are thrown away rather than 
 letting them pile up.
diff --git a/share/man/man4/termios.4 b/share/man/man4/termios.4
index 2cf0c4b..f632b4c 100644
--- a/share/man/man4/termios.4
+++ b/share/man/man4/termios.4
@@ -47,7 +47,8 @@ supported on tty asynchronous communication ports.
 When a terminal file is opened, it normally causes the process to wait
 until a connection is established.  For most hardware, the presence
 of a connection is indicated by the assertion of the hardware
-.Dv CARRIER line.
+.Dv CARRIER
+line.
 If the termios structure associated with the terminal file has the
 .Dv CLOCAL
 flag set in the cflag, or if the
@@ -323,7 +324,7 @@ characters (see the
 is received.
 This processing affects data in the input queue that has not yet been
 delimited by a newline
-.Dv NL,
+.Dv NL ,
 .Dv EOF ,
 or
 .Dv EOL
@@ -631,7 +632,7 @@ system and are not a part of 1003.1 termios.
 Secondary
 .Dv EOL
 character.  Same function as
-.Dv EOL.
+.Dv EOL .
 .It Dv WERASE
 Special character on input and is recognized if the
 .Dv ICANON
@@ -705,7 +706,7 @@ Special Control Characters.
 Special
 character functions associated with changeable special control characters
 can be disabled individually by setting their value to
-.Dv {_POSIX_VDISABLE};
+.Dv {_POSIX_VDISABLE} ;
 see
 .Sx "Special Control Characters" .
 .Pp
@@ -989,7 +990,7 @@ and are composed of the following masks:
 /* enable following output processing */
 .It Dv ONLCR
 /* map NL to CR-NL (ala
-.Dv CRMOD)
+.Dv CRMOD )
 */
 .It Dv OXTABS
 /* expand tabs to spaces */
@@ -1283,10 +1284,10 @@ If
 is set, canonical processing is enabled.  This enables the
 erase and kill edit functions, and the assembly of input characters into
 lines delimited by
-.Dv NL,
+.Dv NL ,
 .Dv EOF ,
 and
-.Dv EOL,
+.Dv EOL ,
 as described in
 .Sx "Canonical Mode Input Processing" .
 .Pp
diff --git a/share/man/man4/ti.4 b/share/man/man4/ti.4
index 2c05cd4..32379ce 100644
--- a/share/man/man4/ti.4
+++ b/share/man/man4/ti.4
@@ -131,7 +131,8 @@ The
 option can also be used to select either
 .Ar full-duplex
 or
-.Ar half-duplex modes.
+.Ar half-duplex
+modes.
 .It 100baseTX
 Set 100Mbps (fast ethernet) operation.
 The
diff --git a/share/man/man4/ttcp.4 b/share/man/man4/ttcp.4
index 7018f5c..5a61e58 100644
--- a/share/man/man4/ttcp.4
+++ b/share/man/man4/ttcp.4
@@ -118,7 +118,7 @@ and
 system calls to understand the notion of
 .Dq implied connect
 and
-.Dq send and shutdown.
+.Dq send and shutdown .
 To send the request in a transaction, the
 .Xr sendto 2
 system call is typically used, as in the following example:
diff --git a/share/man/man4/tty.4 b/share/man/man4/tty.4
index ed675b1..6310e69 100644
--- a/share/man/man4/tty.4
+++ b/share/man/man4/tty.4
@@ -162,7 +162,7 @@ file descriptor zero by the following code fragment:
 Change to the new line discipline pointed to by
 .Fa ldisc .
 The available line disciplines are listed in
-.Pa Aq sys/ttycom.h
+.Aq Pa sys/ttycom.h
 and currently are:
 .Pp
 .Bl -tag -width NETGRAPHDISC -compact
diff --git a/share/man/man4/tun.4 b/share/man/man4/tun.4
index 76fa90a..768bc35 100644
--- a/share/man/man4/tun.4
+++ b/share/man/man4/tun.4
@@ -28,12 +28,10 @@ driver, like the
 .Nm pty
 driver, provides two interfaces: an interface like the usual facility
 it is simulating
-.Po
-a network interface in the case of
+(a network interface in the case of
 .Nm ,
 or a terminal for
-.Nm pty
-.Pc ,
+.Nm pty ) ,
 and a character-special device
 .Dq control
 interface.
@@ -56,11 +54,9 @@ like any other interface.  At boot time, they are
 interfaces, but this can be changed; see the description of the control
 device, below.  When the system chooses to transmit a packet on the
 network interface, the packet can be read from the control device
-.Po
-it appears as
+(it appears as
 .Dq input
-there
-.Pc ;
+there);
 writing a packet to the control device generates an input
 packet on the network interface, as if the
 .Pq non-existent
@@ -69,9 +65,7 @@ hardware had just received it.
 The tunnel device, normally
 .Pa /dev/tun Ns Sy N ,
 is exclusive-open
-.Po
-it cannot be opened if it is already open
-.Pc
+(it cannot be opened if it is already open)
 and is restricted to the super-user.
 A
 .Fn read
@@ -79,10 +73,8 @@ call will return an error
 .Pq Er EHOSTDOWN
 if the interface is not
 .Dq ready
-.Po
-which means that the control device is open and the interface's
-address has been set
-.Pc .
+(which means that the control device is open and the interface's
+address has been set).
 Once the interface is ready,
 .Fn read
 will return a packet if one is available; if not, it will either block
@@ -197,11 +189,10 @@ value is or isn't zero
 .Pq Writes are always nonblocking .
 .It Dv FIOASYNC
 Turn asynchronous I/O for reads
-.Po
-i.e., generation of
+(i.e., generation of
 .Dv SIGIO
-when data is available to be read
-.Pc off or on, according as the argument
+when data is available to be read)
+off or on, according as the argument
 .Va int Ns 's
 value is or isn't zero.
 .It Dv FIONREAD
@@ -230,9 +221,8 @@ writes are always non-blocking.
 .Pp
 On the last close of the data device, by default, the interface is
 brought down
-.Po as if with
-.Dq ifconfig tun Ns Sy n No down
-.Pc .
+(as if with
+.Dq ifconfig tun Ns Sy n No down ) .
 All queued packets are thrown away.
 If the interface is up when the data device is not open
 output packets are always thrown away rather than letting
diff --git a/share/man/man4/vinum.4 b/share/man/man4/vinum.4
index 13eac04..0e215c1 100644
--- a/share/man/man4/vinum.4
+++ b/share/man/man4/vinum.4
@@ -799,9 +799,9 @@ sd name obj.p1.s3 drive drive4 plex obj.p1 state up len 204800b driveoffset 4098
 The first line contains the
 .Nm 
 label and must start with the text
-.Li IN VINO.
+.Li IN VINO .
 It also contains the name of the system.  The exact definition is contained in 
-.Pa /usr/src/sys/dev/vinum/vinumvar.h.
+.Pa /usr/src/sys/dev/vinum/vinumvar.h .
 The saved configuration starts in the middle of the line with the text
 .Li volume obj state up
 and starts in sector 9 of the disk.
@@ -904,7 +904,8 @@ To perform remote serial debugging,
 link 
 .Pa /var/crash/.gdbinit.serial
 to 
-.Pa /var/crash/.gdbinit and enter
+.Pa /var/crash/.gdbinit
+and enter
 .Bd -literal
 # cd /var/crash
 # gdb -k kernel.debug
diff --git a/share/man/man4/vr.4 b/share/man/man4/vr.4
index 1a771ab..a80ef4f 100644
--- a/share/man/man4/vr.4
+++ b/share/man/man4/vr.4
@@ -82,7 +82,8 @@ The
 option can also be used to select either
 .Ar full-duplex
 or
-.Ar half-duplex modes.
+.Ar half-duplex
+modes.
 .It 100baseTX
 Set 100Mbps (fast ethernet) operation.
 The
diff --git a/share/man/man4/wb.4 b/share/man/man4/wb.4
index 307ac58..d9f731c 100644
--- a/share/man/man4/wb.4
+++ b/share/man/man4/wb.4
@@ -82,7 +82,8 @@ The
 option can also be used to select either
 .Ar full-duplex
 or
-.Ar half-duplex modes.
+.Ar half-duplex
+modes.
 .It 100baseTX
 Set 100Mbps (fast ethernet) operation.
 The
diff --git a/share/man/man4/xl.4 b/share/man/man4/xl.4
index 3af07ef..78ba9e3 100644
--- a/share/man/man4/xl.4
+++ b/share/man/man4/xl.4
@@ -92,7 +92,8 @@ The
 option can also be used to select either
 .Ar full-duplex
 or
-.Ar half-duplex modes.
+.Ar half-duplex
+modes.
 .It 100baseTX
 Set 100Mbps (fast ethernet) operation.
 The
@@ -100,7 +101,8 @@ The
 option can also be used to select either
 .Ar full-duplex
 or
-.Ar half-duplex modes.
+.Ar half-duplex
+modes.
 .It 10base5/AUI
 Enable AUI transceiver (available only on COMBO cards).
 .It 10base2/BNC
diff --git a/share/man/man4/xpt.4 b/share/man/man4/xpt.4
index 39e3aa1..f41f334 100644
--- a/share/man/man4/xpt.4
+++ b/share/man/man4/xpt.4
@@ -100,4 +100,4 @@ None.
 The CAM transport layer driver first appeared in
 .Fx 3.0 .
 .Sh AUTHORS
-.An Kenneth Merry Aq ken@FreeBSD.ORG
+.An Kenneth Merry Aq ken@FreeBSD.org
diff --git a/share/man/man5/a.out.5 b/share/man/man5/a.out.5
index 1aa6e4c..a659ba7 100644
--- a/share/man/man5/a.out.5
+++ b/share/man/man5/a.out.5
@@ -103,14 +103,15 @@ The fields have the following functions:
 .It Fa a_midmag
 This field is stored in host byte-order.
 It has a number of sub-components accessed by the macros
-.Dv N_GETFLAG() ,
-.Dv N_GETMID() , and
-.Dv N_GETMAGIC() ,
+.Fn N_GETFLAG ,
+.Fn N_GETMID ,
+and
+.Fn N_GETMAGIC ,
 and set by the macro
-.Dv N_SETMAGIC().
+.Fn N_SETMAGIC .
 .Pp
 The macro
-.Dv N_GETFLAG()
+.Fn N_GETFLAG
 returns a few flags:
 .Bl -tag -width EX_DYNAMIC
 .It Dv EX_DYNAMIC
@@ -132,11 +133,11 @@ executable image (eg. a shared library), which is to be loaded into the
 process address space by the run-time link editor.
 .Pp
 The macro
-.Dv N_GETMID()
+.Fn N_GETMID
 returns the machine-id.
 This indicates which machine(s) the binary is intended to run on.
 .Pp
-.Dv N_GETMAGIC()
+.Fn N_GETMAGIC
 specifies the magic number, which uniquely identifies binary files
 and distinguishes different loading conventions.
 The field must contain one of the following values:
@@ -287,7 +288,7 @@ only occurs in shared objects.
 .It Fa r_copy
 If set, this relocation record identifies a symbol whose contents should
 be copied to the location given in
-.Fa r_address.
+.Fa r_address .
 The copying is done by the run-time link-editor from a suitable data
 item in a shared object.
 .El
diff --git a/share/man/man5/acct.5 b/share/man/man5/acct.5
index e2c3402..56cf727 100644
--- a/share/man/man5/acct.5
+++ b/share/man/man5/acct.5
@@ -92,7 +92,7 @@ the name of the executed file (at most ten characters of it)
 is saved in the field
 .Fa ac_comm
 and its status is saved by setting one of more of the following flags in
-.Fa ac_flag:
+.Fa ac_flag :
 .Dv AFORK ,
 .Dv ASU ,
 .Dv ACOMPAT ,
diff --git a/share/man/man5/elf.5 b/share/man/man5/elf.5
index 5502a81..36438bf 100644
--- a/share/man/man5/elf.5
+++ b/share/man/man5/elf.5
@@ -649,7 +649,7 @@ The
 system reserves indices between
 .Sy SHN_LORESERVE
 and
-.Sy SHN_HIRESERVE,
+.Sy SHN_HIRESERVE ,
 inclusive.
 The section header table does not contain entries for the
 reserved indices.
@@ -1191,18 +1191,25 @@ This value down to and including
 are reserved for processor-specific semantics.
 .Pp
 There are macros for packing and unpacking the binding and type fields:
+.Pp
 .Bl -tag -width "ELF32_ST_INFO(bind, type)" -compact
-.It Dv ELF32_ST_BIND(info)
+.It Xo
+.Fn ELF32_ST_BIND info
+.Xc
 or
-.Sy ELF64_ST_BIND(info)
+.Fn ELF64_ST_BIND info
 extract a binding from an st_info value.
-.It Dv ELF64_ST_TYPE(info)
+.It Xo
+.Fn ELF64_ST_TYPE info
+.Xc
 or
-.Sy ELF32_ST_TYPE(info)
+.Fn ELF32_ST_TYPE info
 extract a type from an st_info value.
-.It Dv ELF32_ST_INFO(bind, type)
+.It Xo
+.Fn ELF32_ST_INFO bind type
+.Xc
 or
-.Sy ELF64_ST_INFO(bind, type)
+.Fn ELF64_ST_INFO bind type
 convert a binding and a type into an st_info value.
 .El
 .El
diff --git a/share/man/man5/forward.5 b/share/man/man5/forward.5
index bb3dad6..28735b1 100644
--- a/share/man/man5/forward.5
+++ b/share/man/man5/forward.5
@@ -62,7 +62,7 @@ nobody@FreeBSD.org
 .Ed
 .Pp
 Mail would be forwarded to 
-.Ar nobody@FreeBSD.org
+.Aq nobody@FreeBSD.org
 and to the program
 .Pa /usr/bin/vacation
 with the single argument
diff --git a/share/man/man5/fs.5 b/share/man/man5/fs.5
index b47c25b..5280da0 100644
--- a/share/man/man5/fs.5
+++ b/share/man/man5/fs.5
@@ -313,7 +313,7 @@ defines the amount of space allocated in
 the super-block for this name.
 The limit on the amount of summary information per file system
 is defined by
-.Dv MAXCSBUFS.
+.Dv MAXCSBUFS .
 For a 4096 byte block size, it is currently parameterized for a
 maximum of two million cylinders.
 .Pp
@@ -325,7 +325,7 @@ These blocks are read in from
 .Fa fs_cssize )
 in addition to the super-block.
 .Pp
-.Sy N.B.:
+.Sy N.B. :
 .Fn sizeof "struct csum"
 must be a power of two in order for
 the
diff --git a/share/man/man5/link.5 b/share/man/man5/link.5
index 2106230..48f9388 100644
--- a/share/man/man5/link.5
+++ b/share/man/man5/link.5
@@ -75,7 +75,7 @@ through the .size assembler directive.
 PIC code differs from conventional code
 in that it accesses data variables through an indirection table, the
 Global Offset Table, by convention accessible by the reserved name
-.Em _GLOBAL_OFFSET_TABLE_.
+.Dv _GLOBAL_OFFSET_TABLE_ .
 The exact mechanism used for this is machine dependent, usually a machine
 register is reserved for the purpose.
 The rational behind this construct
@@ -105,7 +105,7 @@ If this symbol is non-zero, it points at a data structure from
 which the location of the necessary relocation- and symbol information can
 be derived.
 This is most notably used by the start-up module,
-.Em crt0.
+.Em crt0 .
 The _DYNAMIC structure is conventionally located at the start of the data
 segment of the image to which it pertains.
 .Pp
@@ -138,11 +138,11 @@ The current version numbers understood by
 and 
 .Xr ld.so 1
 are
-.Em LD_VERSION_SUN (3),
+.Em LD_VERSION_SUN (3) ,
 which is used by the
 .Tn SunOS
 4.x releases, and
-.Em LD_VERSION_BSD (8),
+.Em LD_VERSION_BSD (8) ,
 which has been in use since
 .Fx 1.1 .
 .It Fa d_un
@@ -214,7 +214,7 @@ The number of buckets in
 .Fa sdt_hash
 .It Fa sdt_strings
 The location of the symbol string table that goes with
-.Fa sdt_nzlist.
+.Fa sdt_nzlist .
 .It Fa sdt_str_sz
 The size of the string table.
 .It Fa sdt_text_sz
@@ -262,7 +262,7 @@ see also
 .Xr ldconfig 8
 .Pc
 for a shared object matching
-.Em lib\&<sod_name>\&.so.n.m.
+.Em lib\&<sod_name>\&.so.n.m .
 If not set,
 .Fa sod_name
 should point at a full path name for the desired shared object.
@@ -325,7 +325,7 @@ An array of these lives in the shared object's
 text segment and is addressed by the
 .Fa sdt_nzlist
 field of
-.Fa section_dispatch_table.
+.Fa section_dispatch_table .
 .Bd -literal -offset indent
 struct nzlist {
 	struct nlist	nlist;
@@ -449,7 +449,7 @@ The address were a breakpoint will be set by the run-time linker to
 divert control to the debugger.
 This address is determined by the start-up
 module,
-.Em crt0.o,
+.Pa crt0.o ,
 to be some convenient place before the call to _main.
 .It Fa dd_bpt_shadow
 Contains the original instruction that was at
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index 7f74526..978af0e 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -339,7 +339,7 @@ Set this to build KerberosIV (KTH eBones).
 .It Va MAKE_KERBEROS5
 .Vt ( bool )
 Set this to build Kerberos5 (KTH Heimdal).
-.Em WARNING!
+.Em WARNING !
 This is still experimental code.
 If you need stable Kerberos5, use the
 port(s).
diff --git a/share/man/man5/nsswitch.conf.5 b/share/man/man5/nsswitch.conf.5
index 1e7deff..4f48708 100644
--- a/share/man/man5/nsswitch.conf.5
+++ b/share/man/man5/nsswitch.conf.5
@@ -62,13 +62,17 @@ Each criterion consists of one or more status codes, and actions to
 take if that status code occurs.
 .Ss Sources
 The following sources are implemented:
-.Bl -column "compat" -offset indent -compact
-.It Sy "Source	Description
-.It "files	Local files, such as"
+.Pp
+.Bl -tag -width Source -compact
+.It Sy Source
+.Sy Description
+.It files
+Local files, such as
 .Pa /etc/hosts ,
 and
 .Pa /etc/passwd .
-.It "dns	Internet Domain Name System."
+.It dns
+Internet Domain Name System.
 .Dq hosts
 and
 .Sq networks
@@ -77,8 +81,10 @@ use
 class entries, all other databases use
 .Sy HS
 class (Hesiod) entries.
-.It "nis	NIS (formerly YP)"
-.It "compat	support"
+.It nis
+NIS (formerly YP)
+.It compat
+support
 .Sq +/-
 in the
 .Dq passwd
@@ -89,34 +95,46 @@ If this is present, it must be the only source for that entry.
 .El
 .Ss Databases
 The following databases are used by the following C library functions:
-.Bl -column "networks" -offset indent -compact
-.It Sy "Database	Used by"
-.It "group	"
+.Pp
+.Bl -tag -width networks -compact
+.It Sy Database
+.Sy "Used by"
+.It group
 .Xr getgrent 3
-.It "hosts	"
+.It hosts
 .Xr gethostbyname 3
-.It "networks	"
+.It networks
 .Xr getnetbyname 3
-.It "passwd	"
+.It passwd
 .Xr getpwent 3
-.It "shells	"
+.It shells
 .Xr getusershell 3
 .El
 .Ss Status codes
 The following status codes are available:
-.Bl -column "tryagain" -offset indent -compact
-.It Sy "Status	Description"
-.It "success	The requested entry was found."
-.It "notfound	The entry is not present at this source."
-.It "tryagain	The source is busy, and may respond to retries."
-.It "unavail	The source is not responding, or entry is corrupt."
+.Pp
+.Bl -tag -width tryagain -compact
+.It Sy Status
+.Sy Description
+.It success
+The requested entry was found.
+.It notfound
+The entry is not present at this source.
+.It tryagain
+The source is busy, and may respond to retries.
+.It unavail
+The source is not responding, or entry is corrupt.
 .El
 .Ss Actions
 For each of the status codes, one of two actions is possible:
-.Bl -column "continue" -offset indent -compact
-.It Sy "Action	Description"
-.It "continue	Try the next source"
-.It "return	Return with the current result"
+.Pp
+.Bl -tag -width continue -compact
+.It Sy Action
+.Sy Description
+.It continue
+Try the next source
+.It return
+Return with the current result
 .El
 .Ss Format of file
 A
@@ -124,16 +142,22 @@ A
 description of the syntax of
 .Nm
 is:
-.Bl -column "<criterion>" -offset indent
-.It "<entry>	::="
+.Pp
+.Bl -tag -width <criterion> -compact
+.It <entry>
+::=
 <database> ":" [<source> [<criteria>]]*
-.It "<criteria>	::="
+.It <criteria>
+::=
 "[" <criterion>+ "]"
-.It "<criterion>	::="
+.It <criterion>
+::=
 <status> "=" <action>
-.It "<status>	::="
+.It <status>
+::=
 "success" | "notfound" | "unavail" | "tryagain"
-.It "<action>	::="
+.It <action>
+::=
 "return" | "continue"
 .El
 .Pp
@@ -206,13 +230,20 @@ will default to an entry of
 .Dq files
 for the requested database.
 Exceptions are:
-.Bl -column passwd_compat "dns files" -offset indent
-.It Sy "Database	Default source list"
-.It "group	compat"
-.It "group_compat	nis"
-.It "hosts	dns files"
-.It "passwd	compat"
-.It "passwd_compat	nis"
+.Pp
+.Bl -tag -width passwd_compat -compact
+.It Sy Database
+.Sy "Default source list"
+.It group
+compat
+.It group_compat
+nis
+.It hosts
+dns files
+.It passwd
+compat
+.It passwd_compat
+nis
 .El
 .Sh FILES
 .Bl -tag -width /etc/nsswitch.conf -compact
@@ -228,10 +259,14 @@ To lookup hosts in
 and then from the DNS, and lookup user information from
 .Tn NIS
 then files, use:
-.Bl -column "passwd:" -offset indent
-.It "hosts:	files dns"
-.It "passwd:	nis [notfound=return] files"
-.It "group:	nis [notfound=return] files"
+.Pp
+.Bl -tag -width passwd: -compact
+.It hosts:
+files dns
+.It passwd:
+nis [notfound=return] files
+.It group:
+nis [notfound=return] files
 .El
 .Pp
 The criteria
diff --git a/share/man/man5/passwd.5 b/share/man/man5/passwd.5
index 7b49790..23037cb 100644
--- a/share/man/man5/passwd.5
+++ b/share/man/man5/passwd.5
@@ -281,7 +281,7 @@ fields, the specified numbers will override the information retrieved
 from the Hesiod domain or the
 .Tn NIS
 maps. As well, if the
-.Ar gecos,
+.Ar gecos ,
 .Ar dir
 or
 .Ar shell
diff --git a/share/man/man5/periodic.conf.5 b/share/man/man5/periodic.conf.5
index 74a3937..20ff45c 100644
--- a/share/man/man5/periodic.conf.5
+++ b/share/man/man5/periodic.conf.5
@@ -333,7 +333,7 @@ if
 is set to
 .Dq YES
 in
-.Pa /etc/rc.conf ).
+.Pa /etc/rc.conf ) .
 .It Ar daily_status_mailq_enable
 (bool) Set to
 .Dq YES
diff --git a/share/man/man5/procfs.5 b/share/man/man5/procfs.5
index 68fe968..a67703d 100644
--- a/share/man/man5/procfs.5
+++ b/share/man/man5/procfs.5
@@ -142,7 +142,7 @@ process group id
 .It
 session id
 .It
-.Ar major,minor
+.Ar major , Ns Ar minor
 of the controlling terminal, or
 .Dv -1,-1
 if there is no controlling terminal.
diff --git a/share/man/man5/utmp.5 b/share/man/man5/utmp.5
index ca0d4fd..2ef38ef 100644
--- a/share/man/man5/utmp.5
+++ b/share/man/man5/utmp.5
@@ -91,7 +91,7 @@ Each time a user logs in, the
 program looks up the user's
 .Tn UID
 in the file
-.Nm lastlog.
+.Nm lastlog .
 If it is found, the timestamp of the last time the user logged
 in, the terminal line and the hostname
 are written to the standard output (unless the login is
@@ -179,7 +179,7 @@ is recorded in the field
 In the field
 .Fa ut_line ,
 the character
-.Ql \\*(Ba
+.Ql \&|
 indicates the time prior to the change, and the character
 .Ql \&{
 indicates the new time.
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index 7750fea..2ccc3fc 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -41,315 +41,315 @@
 .Sh DESCRIPTION
 A sketch of the filesystem hierarchy.
 .Bl -tag -width "/stand/"
-.It Li /
+.It Pa /
 root directory of the filesystem
-.It Li /bin/
+.It Pa /bin/
 user utilities fundamental to both single-user and multi-user environments
-.It Li /boot/
+.It Pa /boot/
 programs and configuration files used during operating system bootstrap
 .Pp
 .Bl -tag -width defaults/ -compact
-.It Li defaults/
+.It Pa defaults/
 default bootstrapping configuration files; see
 .Xr loader.conf 5
-.It Li kernel/
+.It Pa kernel/
 pure kernel executable (the operating system loaded into memory
 at boot time).  
-.It Li modules/
+.It Pa modules/
 third-part loadable kernel modules;
 see 
 .Xr kldstat 8 
 .El
-.It Li /dev/
+.It Pa /dev/
 block and character device files
 .Pp
 .Bl -tag -width MAKEDEV -compact
-.It Li MAKEDEV
+.It Pa MAKEDEV
 script for creating device files;
 see
 .Xr MAKEDEV 8
-.It Li fd/ 
+.It Pa fd/ 
 file descriptor files;
 see
 .Xr \&fd 4
 .El
-.It Li /etc/
+.It Pa /etc/
 system configuration files and scripts 
 .Pp
 .Bl -tag -width "disklabels/" -compact
-.It Li defaults/
+.It Pa defaults/
 default system configuration files;
 see
 .Xr rc 8
-.It Li gnats/
+.It Pa gnats/
 gnats configuration files;
 see
 .Xr send-pr 1
-.It Li isdn/
+.It Pa isdn/
 isdn4bsd configuration files;
 see
 .Xr isdnd 8
-.It Li kerberosIV/ 
+.It Pa kerberosIV/ 
 configuration files for the kerberos version IV;
 see
 .Xr kerberos 1
-.It Li localtime
+.It Pa localtime
 local timezone information;
 see
 .Xr ctime 3
-.It Li mail/
+.It Pa mail/
 spam-filtering information
-.It Li mtree/ 
+.It Pa mtree/ 
 mtree configuration files;
 see
 .Xr mtree 8
-.It Li namedb/ 
+.It Pa namedb/ 
 named configuration files;
 see
 .Xr named 8
-.It Li periodic/
+.It Pa periodic/
 scripts that are run daily, weekly, and monthly, via
 .Xr cron 8 ;
 see
 .Xr periodic 8
-.It Li ppp/
+.It Pa ppp/
 ppp configuration files;
 see 
 .Xr ppp 8
-.It Li ssl/
+.It Pa ssl/
 OpenSSL configuration files
-.It Li uucp/
+.It Pa uucp/
 uucp configuration files;
 see
 .Xr uucp 1
 .El
-.It Li /mnt/
+.It Pa /mnt/
 empty directory commonly used by
 system administrators as a temporary mount point
-.It Li /proc/
+.It Pa /proc/
 process file system;
 see
 .Xr procfs 5 ,
 .Xr mount_procfs 8
-.It Li /root/
+.It Pa /root/
 root's HOME directory
-.It Li /sbin/
+.It Pa /sbin/
 system programs and administration utilities
 fundamental to both single-user and multi-user environments
-.It Li /stand/
+.It Pa /stand/
 programs used in a standalone environment
-.It Li /tmp/ 
+.It Pa /tmp/ 
 temporary files
-.It Li /usr/
+.It Pa /usr/
 contains the majority of user utilities and applications 
 .Pp
 .Bl -tag -width "libdata/" -compact
-.It Li bin/
+.It Pa bin/
 common utilities, programming tools, and applications 
-.It Li games/
+.It Pa games/
 useful and semi-frivolous programs
-.It Li include/
+.It Pa include/
 standard C include files
 .Pp
 .Bl -tag -width "kerberosIV/" -compact
-.It Li arpa/
+.It Pa arpa/
 C include files for Internet service protocols
-.It Li cam/
+.It Pa cam/
 C include files for the Common Access Methods Layer
 .Bl -tag -width "kerberosIV/" -compact
 .It scsi/
 The SCSI device on top of CAM
 .El
-.It Li dev/
+.It Pa dev/
 C include files for programming various
 .Fx
 devices
 .Bl -tag -width "kerberosIV/" -compact
-.It Li ppbus/
+.It Pa ppbus/
 The parallel port bus;
 see
 .Xr ppbus 4
-.It Li usb/
+.It Pa usb/
 The USB subsystem
 .El
-.It Li g++/
+.It Pa g++/
 GNU C++ include files
 .Bl -tag -width "kerberosIV/" -compact
-.It Li std/
+.It Pa std/
 GNU C++ libstdc++ include files
 .El
-.It Li isc/
+.It Pa isc/
 ISC utility library libisc include files
-.It Li isofs/
+.It Pa isofs/
 .Bl -tag -width "kerberosIV/" -compact
-.It Li cd9660/
+.It Pa cd9660/
 iso9660 filesystem
 .El
-.It Li kerberosIV/
+.It Pa kerberosIV/
 C include files for kerberos authentication package;
 see
 .Xr kerberos 1
-.It Li machine/
+.It Pa machine/
 machine-specific C include files
-.It Li msdosfs/
+.It Pa msdosfs/
 MS-DOS file system
-.It Li net/
+.It Pa net/
 misc network C include files
-.It Li netatalk/
+.It Pa netatalk/
 Appletalk protocol
-.It Li netatm/
+.It Pa netatm/
 ATM include files;
 see
 .Xr atm 8
-.It Li netinet/
+.It Pa netinet/
 C include files for Internet standard protocols;
 see
 .Xr inet 4
-.It Li netinet6/
+.It Pa netinet6/
 C include files for Internet protocol version 6;
 see
 .Xr inet6 4
-.It Li netipx/
+.It Pa netipx/
 IPX/SPX protocol stacks
-.It Li netkey/
+.It Pa netkey/
 kernel key-management service
-.It Li netns/
+.It Pa netns/
 Xerox NS protocols
-.It Li netnatm/
+.It Pa netnatm/
 NATM include files;
 see
 .Xr natm 4
-.It Li nfs/
+.It Pa nfs/
 C include files for NFS (Network File System)
-.It Li objc/
+.It Pa objc/
 Objective C include files
-.It Li openssl/
+.It Pa openssl/
 OpenSSL (Cryptography/SSL toolkit) headers
-.It Li pccard/
+.It Pa pccard/
 PC-CARD controllers
-.It Li posix4/
+.It Pa posix4/
 POSIX real-time extensions includes;
 see
 .Xr p1003_1b 9
-.It Li protocols/
+.It Pa protocols/
 C include files for Berkeley service protocols
-.It Li readline/
+.It Pa readline/
 get a line from a user, with editing;
 see
 .Xr readline 3
-.It Li rpc/
+.It Pa rpc/
 remote procedure calls;
 see
 .Xr rpc 3
-.It Li rpcsvc/
+.It Pa rpcsvc/
 definition of RPC service structures; see
 .Xr rpc 3
-.It Li security/
+.It Pa security/
 PAM; see
 .Xr pam 8
-.It Li ss/
+.It Pa ss/
 MIT SIPB
 .Sq subsystem
 library, part of Kerberos IV.
-.It Li sys/
+.It Pa sys/
 system C include files (kernel data structures)
-.\" .It Li tcl/
+.\" .It Pa tcl/
 .\" Tcl language;
 .\" see
 .\" .Xr Tcl n
 .\" .Bl -tag -width "kerberosIV/" -compact
-.\" .It Li generic/
+.\" .It Pa generic/
 .\" ???
-.\" .It Li unix/
+.\" .It Pa unix/
 .\" ???
 .\" .El
-.It Li ufs/
+.It Pa ufs/
 C include files for UFS (The U-word File System)
 .Bl -tag -width "kerberosIV/" -compact
-.It Li ffs/
+.It Pa ffs/
 Fast filesystem
-.It Li mfs/
+.It Pa mfs/
 memory file system;
 see
 .Xr mount_mfs 8
-.It Li ufs/
+.It Pa ufs/
 UFS filesystem
 .El
-.It Li vm/
+.It Pa vm/
 virtual memory;
 see 
 .Xr vmstat 8
 .El
 .Pp
-.It Li lib/
+.It Pa lib/
 archive libraries
 .Bl -tag -width Fl -compact
-.It Li aout/
+.It Pa aout/
 a.out archive libraries
-.It Li compat/
+.It Pa compat/
 shared libraries for compatibility
 .Bl -tag -width Fl -compact
-.It Li aout/
+.It Pa aout/
 a.out backward compatibility libraries
 .El
 .El
 .Pp
-.It Li libdata/
+.It Pa libdata/
 misc. utility data files
 .Bl -tag -width Fl -compact
-.It Li doscmd/
+.It Pa doscmd/
 files used by doscmd (drivers, fonts, etc.);
 see
 .Xr doscmd 1
 .Bl -tag -width 6n -compact
-.It Li fonts/
+.It Pa fonts/
 fonts used by doscmd
 .El
-.It Li gcc/
+.It Pa gcc/
 ???
-.It Li ldscripts/
+.It Pa ldscripts/
 linker scripts;
 see
 .Xr ld 1
-.It Li lint/
+.It Pa lint/
 various prebuilt lint libraries;
 see 
 .Xr lint 1
-.It Li msdosfs/
+.It Pa msdosfs/
 Character set conversion tables
-.It Li perl/
+.It Pa perl/
 .Bl -tag -width Fl -compact
-.It Li 5.00503/
+.It Pa 5.00503/
 contains Perl modules for Perl version 5.00503;
 see
 .Xr perl 1
 .El
-.It Li stallion/
+.It Pa stallion/
 holds the download firmware images
 .El
 .Pp
-.It Li libexec/
+.It Pa libexec/
 system daemons & system utilities (executed by other programs)
 .Bl -tag -width Fl -compact
-.It Li aout/
+.It Pa aout/
 utilities to manipulate a.out executables
-.It Li elf/
+.It Pa elf/
 utilities to manipulate ELF executables
-.It Li lpr/
+.It Pa lpr/
 utilities and filters for LP print system;
 see
 .Xr lpr 1
-.It Li sm.bin/
+.It Pa sm.bin/
 restricted shell for sendmail;
 see 
 .Xr smrsh 8
-.It Li uucp/
+.It Pa uucp/
 uucp utilities;
 see
 .Xr uucp 1
 .El
 .Pp
-.It Li local/
+.It Pa local/
 local executables, libraries, etc.
 Also used as the default destination for the
 .Fx
@@ -360,43 +360,43 @@ for /usr
 should be used.  Exceptions are the man directory (directly under local/
 rather than under local/share/), ports documentation (in share/doc/<port>/),
 and /usr/local/etc (mimics /etc).
-.It Li obj/
+.It Pa obj/
 architecture-specific target tree produced by building the /usr/src tree
-.It Li ports/
+.It Pa ports/
 The
 .Fx
 ports collection (optional).
-.It Li sbin/
+.It Pa sbin/
 system daemons & system utilities (executed by users)
-.It Li share/
+.It Pa share/
 architecture-independent files
 .Pp
 .Bl -tag -width "calendar/" -compact
-.It Li calendar/
+.It Pa calendar/
 a variety of pre-fab calendar files;
 see
 .Xr calendar 1
-.It Li dict/
+.It Pa dict/
 word lists;
 see
 .Xr look 1
 .Pp
 .Bl -tag -width Fl -compact
-.It Li words
+.It Pa words
 common words
-.It Li web2
+.It Pa web2
 words from Webster's 2nd International
-.It Li papers/
+.It Pa papers/
 reference databases;
 see
 .Xr refer 1
-.It Li special/
+.It Pa special/
 custom word lists;
 see
 .Xr spell 1
 .El
 .Pp
-.It Li doc/
+.It Pa doc/
 miscellaneous documentation;
 source for most of the printed
 .Bx
@@ -405,318 +405,318 @@ from the
 .Tn USENIX
 association)
 .Bl -tag -width Fl -compact
-.It Li FAQ/
+.It Pa FAQ/
 Frequently Asked Questions
-.It Li IPv6/
+.It Pa IPv6/
 implementation notes for IPv6
-.It Li bind/
+.It Pa bind/
 documents pertaining to BIND (the Berkeley Internet Name Domain)
-.It Li es/
+.It Pa es/
 Spanish translations of documents in /usr/share/doc
-.It Li handbook/
+.It Pa handbook/
 .Fx
 Handbook
-.It Li ja/
+.It Pa ja/
 Japanese translations of documents in /usr/share/doc
-.It Li ncurses/
+.It Pa ncurses/
 HTML documents pertaining to ncurses;
 see
 .Xr ncurses 3X
-.It Li ntp/
+.It Pa ntp/
 HTML documents pertaining to the Network Time Protocol
-.It Li papers/
+.It Pa papers/
 UNIX Papers
-.It Li psd/
+.It Pa psd/
 UNIX Programmer's Supplementary Documents
-.It Li ru/
+.It Pa ru/
 Russian translations of documents in /usr/share/doc
-.It Li smm/
+.It Pa smm/
 UNIX System Manager's Manual
-.It Li tutorials/
+.It Pa tutorials/
 .Fx
 tutorials
-.It Li usd/
+.It Pa usd/
 UNIX User's Supplementary Documents
-.It Li zh/
+.It Pa zh/
 Chinese translations of documents in /usr/share/doc
 .El
 .Pp
-.It Li examples/
+.It Pa examples/
 various examples for users and programmers
-.It Li games/
+.It Pa games/
 ASCII text files used by various games
-.It Li groff_font/
+.It Pa groff_font/
 device description file for device name
-.It Li info/
+.It Pa info/
 GNU Info hypertext system
-.It Li isdn/
+.It Pa isdn/
 ISDN
-.It Li libg++/
+.It Pa libg++/
 libg++'s genclass prototype/template class files
-.It Li locale/
+.It Pa locale/
 localization files;
 see
 .Xr setlocale 3
-.It Li man/
+.It Pa man/
 manual pages 
-.It Li me/
+.It Pa me/
 macros for use with the me macro package;
 see
 .Xr me 7
-.It Li misc/
+.It Pa misc/
 misc system-wide ASCII text files
 .Bl -tag -width Fl -compact
-.It Li fonts/
+.It Pa fonts/
 ???
-.It Li pcvtfonts/
+.It Pa pcvtfonts/
 pcvt fonts;
 see
 .Xr pcvt 4
-.It Li termcap
+.It Pa termcap
 terminal characteristics database;
 see
 .Xr termcap 5
 .El
-.It Li mk/
+.It Pa mk/
 templates for make;
 see
 .Xr make 1
-.It Li nls/
+.It Pa nls/
 national language support files;
 see 
 .Xr mklocale 1
-.It Li pcvt/
+.It Pa pcvt/
 pcvt documentation and etc examples;
 see
 .Xr pcvt 4
-.It Li perl/
+.It Pa perl/
 perl library files;
 see
 .Xr perl 1
-.It Li sendmail/ 
+.It Pa sendmail/ 
 sendmail configuration files;
 see
 .Xr sendmail 8
-.It Li skel/
+.It Pa skel/
 example . (dot) files for new accounts
-.It Li syscons/
+.It Pa syscons/
 files used by syscons;
 see
 .Xr syscons 4
 .Bl -tag -width "scrnmaps/xx" -compact
-.It Li fonts/
+.It Pa fonts/
 console fonts;
 see
 .Xr vidcontrol 1
 and
 .Xr vidfont 1
-.It Li keymaps/
+.It Pa keymaps/
 console keyboard maps;
 see
 .Xr kbdcontrol 1
 and
 .Xr kbdmap 1
-.It Li scrnmaps/
+.It Pa scrnmaps/
 console screen maps
 .El
-.It Li tabset/
+.It Pa tabset/
 tab description files for a variety of terminals; used in 
 the termcap file;
 see
 .Xr termcap 5
-.It Li tmac/
+.It Pa tmac/
 text processing macros;
 see
 .Xr nroff 1
 and 
 .Xr troff 1
-.It Li vi/
+.It Pa vi/
 localization support and utilities for
 .Xr vi 1
-.It Li zoneinfo/
+.It Pa zoneinfo/
 timezone configuration information;
 see
 .Xr tzfile 5
 .El
-.It Li src/
+.It Pa src/
 BSD, third-party, and/or local source files
 .Pp
 .Bl -tag -width "kerberosIV/" -compact
-.It Li bin/
+.It Pa bin/
 source code for files in /bin 
-.It Li contrib/
+.It Pa contrib/
 source code for contributed software
-.It Li crypto/
+.It Pa crypto/
 source code for contributed cryptography software
-.It Li etc/
+.It Pa etc/
 source code for files in /etc
-.It Li games/
+.It Pa games/
 source code for files in /usr/games
-.It Li gnu/
+.It Pa gnu/
 Utilities covered by the GNU General Public License
-.It Li include/
+.It Pa include/
 source code for files in /usr/include
-.It Li kerberosIV/
+.It Pa kerberosIV/
 source code for kerberos version IV
-.It Li lib/
+.It Pa lib/
 source code for files in /usr/lib
-.It Li libexec/
+.It Pa libexec/
 source code for files in /usr/libexec
-.It Li release/
+.It Pa release/
 files required to produce a
 .Fx 
 release
-.It Li sbin/
+.It Pa sbin/
 source code for files in /sbin
-.It Li secure/
+.It Pa secure/
 build directory for files in /usr/src/crypto
-.It Li share/
+.It Pa share/
 source for files in /usr/share
-.It Li sys/
+.It Pa sys/
 kernel source code
-.It Li tools/
+.It Pa tools/
 tools used for maintenance and testing of
 .Fx
-.It Li usr.bin/
+.It Pa usr.bin/
 source code for files in /usr/bin
-.It Li usr.sbin/
+.It Pa usr.sbin/
 source code for files in /usr/sbin
 .El
 .Pp
-.It Li X11R6/
+.It Pa X11R6/
 X11R6 distribution executables, libraries, etc (optional).
 .Bl -tag -width "include/" -compact
-.It Li bin/
+.It Pa bin/
 X11R6 binaries (servers, utilities, local packages/ports).
-.It Li etc/
+.It Pa etc/
 X11R6 configuration files and scripts.
-.It Li include/
+.It Pa include/
 X11R6 include files.
-.It Li lib/
+.It Pa lib/
 X11R6 libraries.
-.It Li man/
+.It Pa man/
 X11R6 manual pages.
-.It Li share/
+.It Pa share/
 architecture-independent files.
 .El
 .El
-.It Li /var/
+.It Pa /var/
 multi-purpose log, temporary, transient, and spool files
 .Pp
 .Bl -tag -width "preserve/" -compact
-.It Li account/ 
+.It Pa account/ 
 system accounting files
 .Pp
 .Bl -tag -width Fl -compact
-.It Li acct
+.It Pa acct
 execution accounting file;
 see
 .Xr acct 5
 .El
 .Pp
-.It Li at/
+.It Pa at/
 timed command scheduling files;
 see
 .Xr \&at 1
 .Bl -tag -width "preserve/" -compact
-.It Li jobs/
+.It Pa jobs/
 directory containing job files
-.It Li spool/
+.It Pa spool/
 directory containing output spool files 
 .El
 .Pp
-.It Li backups/
+.It Pa backups/
 misc. backup files
-.It Li crash/
+.It Pa crash/
 default directory to store kernel crash dumps; see
 .Xr crash 8
 and
 .Xr savecore 8
-.It Li cron/
+.It Pa cron/
 files used by cron;
 see
 .Xr cron 8
 .Bl -tag -width "preserve/" -compact
-.It Li tabs/
+.It Pa tabs/
 crontab files;
 see
 .Xr crontab 5
 .El
 .Pp
-.It Li db/ 
+.It Pa db/ 
 misc. automatically generated system-specific database files
-.It Li games/ 
+.It Pa games/ 
 misc. game status and score files
-.It Li log/ 
+.It Pa log/ 
 misc. system log files
 .Pp
 .Bl -tag -width Fl -compact
-.It Li wtmp
+.It Pa wtmp
 login/logout log;
 see
 .Xr wtmp 5
 .El
 .Pp
-.It Li mail/ 
+.It Pa mail/ 
 user mailbox files
-.It Li preserve/
+.It Pa preserve/
 temporary home of files preserved after an accidental death
 of an editor;
 see
 .Xr \&ex 1 
-.It Li msgs/
+.It Pa msgs/
 system messages database;
 see
 .Xr msgs 1
-.It Li quotas/ 
+.It Pa quotas/ 
 filesystem quota information files
-.It Li run/
+.It Pa run/
 system information files describing various info about
 system since it was booted
 .Pp
 .Bl -tag -width Fl -compact
-.It Li utmp
+.It Pa utmp
 database of current users;
 see
 .Xr utmp 5
 .El
 .Pp
-.It Li rwho/ 
+.It Pa rwho/ 
 rwho data files;
 see
 .Xr rwhod 8 ,
 .Xr rwho 1 ,
 and
 .Xr ruptime 1
-.It Li spool/ 
+.It Pa spool/ 
 misc. printer and mail system spooling directories
 .Pp
 .Bl -tag -width Fl -compact
-.It Li ftp/ 
+.It Pa ftp/ 
 commonly ~ftp; the anonymous ftp root directory
-.It Li mqueue/ 
+.It Pa mqueue/ 
 undelivered mail queue;
 see
 .Xr sendmail 8
-.It Li output/
+.It Pa output/
 line printer spooling directories
-.It Li secretmail/ 
+.It Pa secretmail/ 
 secretmail spool directory;
 see
 .Xr xget 1
-.It Li uucp/ 
+.It Pa uucp/ 
 uucp spool directory
-.It Li uucppublic/
+.It Pa uucppublic/
 commonly ~uucp; public uucp temporary directory
 .El
 .Pp
-.It Li tmp/ 
+.It Pa tmp/ 
 temporary files that are kept between system reboots
 .Bl -tag -width Fl -compact
-.It Li vi.recover/
+.It Pa vi.recover/
 the directory where recovery files are stored
 .El
-.It Li yp/
+.It Pa yp/
 the NIS maps
 .El
 .El
diff --git a/share/man/man7/security.7 b/share/man/man7/security.7
index b45f44c..d9f6536 100644
--- a/share/man/man7/security.7
+++ b/share/man/man7/security.7
@@ -679,7 +679,7 @@ machines.
 .Xr md5 1 ,
 .Xr netstat 1 ,
 .Xr ssh 1 ,
-.Xr openssl 1,
+.Xr openssl 1 ,
 .Xr xdm 1 ,
 .Xr group 5 ,
 .Xr ttys 5 ,
diff --git a/share/man/man7/style.perl.7 b/share/man/man7/style.perl.7
index 5b5ec5b..8d0f514 100644
--- a/share/man/man7/style.perl.7
+++ b/share/man/man7/style.perl.7
@@ -28,159 +28,166 @@
 .Dt STYLE.PERL 7
 .Os FreeBSD
 .Sh NAME
-.Nm style.perl 7
+.Nm style.perl
 .Nd "FreeBSD Perl source file style guide"
 .Sh DESCRIPTION
 This file specifies the preferred style for perl scripts in the
 .Fx
 source tree.
-.Bd -literal -offset 0i
- #
- # Style guide for Perl.  Based on the kernel style guide.
- #
+.Bd -literal
+#
+# Style guide for Perl.  Based on the kernel style guide.
+#
 
- #
- # VERY important single-line comments look like this.
- #
+#
+# VERY important single-line comments look like this.
+#
 
- # Most single-line comments look like this.
+# Most single-line comments look like this.
 
- # Multi-line comments look like this.  Make them real sentences.
- # Fill them so they look like real paragraphs.
+# Multi-line comments look like this.  Make them real sentences.
+# Fill them so they look like real paragraphs.
 .Ed
 .Pp
 All scripts should follow the copyright block at the start of the
 script with a comment block that describes what the script does.
-.Bd -literal -offset 0i
- #!/usr/bin/perl -w
+.Bd -literal
+#!/usr/bin/perl -w
 
- # COPYRIGHT
- # BLOCK
+# COPYRIGHT
+# BLOCK
 
- # This script processes an old kernel config file, which it gets on
- # stdin, and outputs a new style hints file to stdout.
+# This script processes an old kernel config file, which it gets on
+# stdin, and outputs a new style hints file to stdout.
 .Ed
+.Pp
 All scripts should use the
-.Fa strict
-module and run without warnings. For example:
-.Bd -literal -offset 0i
- #!/usr/bin/perl -w
+.Xr strict 3
+module and run without warnings.
+For example:
+.Bd -literal
+#!/usr/bin/perl -w
 
- # Copyright, description of what the script does, etc
+# Copyright, description of what the script does, etc
 
- use strict;
- ...
+use strict;
+\&...
 .Ed
 .Pp
-Where possible run the script with taint mode switched on.  This
-is documented in
+Where possible run the script with taint mode switched on.
+This is documented in
 .Xr perlsec 1 .
-.Bd -literal -offset 0i
- #!/usr/bin/perl -wT
+.Bd -literal
+#!/usr/bin/perl -wT
 .Ed
 .Pp
-The main program should be placed in a block labeled MAIN:.  This
+The main program should be placed in a block labeled MAIN:.
+This
 makes it easier to identify the entry point in a large perl script,
 and provides a scope for variables which are used in the main
 program but nowhere else.
-.Bd -literal -offset 0i
- MAIN:{
+.Bd -literal
+MAIN:{
 	print(foo("/usr/bin/man", "7", "style.perl"));
 	exit(0);
- }
+}
 .Ed
 .Pp
 All subroutines should be defined using argument prototypes as defined in
 .Xr perlsub 1 .
-.Bd -literal -offset 0i
- sub foo($@) {
+.Bd -literal
+sub foo($@) {
 	my $cmd = shift;
 	my @args = @_;
- }
+}
 .Ed
 .Pp
 All variables should be defined before use; this is enforced if operating
 under
-.Fa use strict .
+.Ic use Ar strict .
 .Pp
 Scope local variables should be defined using
-.Fa my
+.Ic my
 .Va $variable
 and not
-.Fa local
+.Ic local
 .Va $variable .
 The
-.Fa local
+.Ic local
 declaration should only be used when it is required, and not by
-default.  Lots of perl4 scripts use
-.Fa local
+default.
+Lots of perl4 scripts use
+.Ic local
 because the
-.Fa my
+.Ic my
 definition didn't exist prior to perl5.
 .Pp
 In most cases globals should be defined at the top of the code
 using a
-.Fa vars
+.Xr vars 3
 definition block:
-.Bd -literal -offset 0i
- use vars qw($globalscalar @globalarray %globalhash);
+.Bd -literal
+use vars qw($globalscalar @globalarray %globalhash);
 .Ed
 .Pp
 In some cases it may be appropriate to use
-.Fa my
+.Ic my
 statements at the top of the script as an alternative to using
-.Fa vars
+.Xr vars 3
 declarations.
 .Pp
 All variables should be commented.
-.Bd -literal -offset 0i
- sub foo($@) {
+.Bd -literal
+sub foo($@) {
 	my $cmd = shift;	# Command to run
 	my @args = @_;		# Arguments to $cmd
- }
+}
 .Ed
 .Pp
 Local variables should be separated from function arguments by a
 blank line:
-.Bd -literal -offset 0i
- sub foo($@) {
+.Bd -literal
+sub foo($@) {
 	my $cmd = shift;	# Command to run
 	my @args = @_;		# Arguments to command
 
 	my $pid;		# Child PID
 	local *PIPE;		# Pipe
 	my $output;		# Output from command
- }
+}
 .Ed
 .Pp
 Whenever possible code should be run through the code checker
 .Nm perl
-.Ar -wc
+.Fl wc
 .Ar script.pl
 or
 .Nm perl
-.Ar -wcT
+.Fl wcT
 .Ar script.pl
 and produce no warnings.
 .Pp
-Indentation is an 8 character tab.  Second level indents are four spaces.
-.Bd -literal -offset 0i
- while (cnt < 20) {
+Indentation is an 8 character tab.
+Second level indents are four spaces.
+.Bd -literal
+while (cnt < 20) {
 	z = a + really + long + statement + that + needs +
 	    two lines + gets + indented + four + spaces +
 	    on + the + second + and + subsequent + lines.
- }
+}
 .Ed
 .Pp
 Do not add whitespace at the end of a line, and only use tabs
-followed by spaces to form the indentation.  Do not use more spaces
+followed by spaces to form the indentation.
+Do not use more spaces
 than a tab will produce and do not use spaces in front of tabs.
 .Pp
-Opening braces should be at the end of the controlling line.  Else
+Opening braces should be at the end of the controlling line.
+Else
 and elsif belong on the same line as the closing brace for the
 previous if or elsif block:
-.Bd -literal -offset 0i
- sub foo($@) {
+.Bd -literal
+sub foo($@) {
 	my $cmd = shift;            # Command to run
 	my @args = @_;              # Arguments to command
 
@@ -205,23 +212,24 @@ previous if or elsif block:
 		die("$cmd returned exit code " . ($? >> 8) . "\\n");
 	}
 	return $output;
- }
+}
 .Ed
 .Pp
 Where possible scripts should use standard modules instead of
-rewriting the code inline.  It may be appropriate in some cases to
+rewriting the code inline.
+It may be appropriate in some cases to
 import a CPAN module into the base system to facilitate this.
 .Pp
 Use
-.Fa chomp
+.Ic chomp
 instead of
-.Fa chop
+.Ic chop
 where appropriate.
 .Pp
 Use
-.Fa unless
+.Ic unless
 instead of
-.Fa if (! ...\& )
+.Ic if Pq Cm \&! No ...\&
 where it improves readability.
 .Pp
 Where it doesn't conflict with this guide read
@@ -234,5 +242,5 @@ and adopt Larry Wall's style recommendations.
 .Sh HISTORY
 This man page is largely based on the
 .Xr style 9
-man-page in
+man page in
 .Fx .
diff --git a/share/man/man8/picobsd.8 b/share/man/man8/picobsd.8
index b85b714..da90cd2 100644
--- a/share/man/man8/picobsd.8
+++ b/share/man/man8/picobsd.8
@@ -108,7 +108,7 @@ is used, but the principle also applies to the subdirectories
 and 
 .Pa router .
 .Bl -hang
-.It Em Build the kernel.
+.It Em "Build the kernel" .
 Each directory contains a configuration file with a name starting with
 .Pa PICOBSD .
 When building a custom
@@ -118,19 +118,19 @@ occupies about 600 kB after compression, and it is easy to have a kernel as
 large as 900 kB.  It is probably not possible to build a first
 .Nm
 floppy with a kernel of 900 kB.
-.It Em Create the MFS image.
+.It Em "Create the MFS image" .
 The MFS image for the first floppy is created as a
 .Nm vnode
 file system which is subsequently mounted as
 .Pa /dev/vn0 
 on
 .Pa custom/mmnt .
-.It Em Create the crunched executables.
+.It Em "Create the crunched executables" .
 The executables for the first floppy are built in the directory
 .Pa crunch/crunch1/ .
 The contents of this executable are determined by the file
 .Pa crunch/crunch1/crunch.conf .
-.It Em Build the floppy image.
+.It Em "Build the floppy image" .
 A second file system image, which will later become the first floppy, is built
 and mounted as 
 .Pa /dev/vn1
@@ -145,7 +145,7 @@ if the latter directory exists.  This dual method allows specific files in
 .Pa floppy.tree/custom/ 
 to overlay files from 
 .Pa floppy.tree/ .
-.It Em Create the image for the second floppy.
+.It Em "Create the image for the second floppy" .
 Finally, the image for the second floppy is built.  There is only one file on
 this floppy, which will be copied to the MFS-relative directory 
 .Pa /bin
@@ -153,7 +153,7 @@ at boot time.  The contents are built in the directory
 .Pa crunch/crunch2/ .
 The contents of this executable are determined by the file
 .Pa crunch/crunch2/crunch.conf .
-.It Em Copy the data to the floppies.
+.It Em "Copy the data to the floppies" .
 The previous steps are performed by the
 .Nm make all
 step.
@@ -163,7 +163,7 @@ does not copy data to the floppy disks.  Instead, use
 for the first floppy, and
 .Nm make floppy2
 for the second disk.
-.It Em Create additional floppies.
+.It Em "Create additional floppies" .
 You can theoretically possible to read a large number of floppies into the MFS.
 Each additional floppy, including the second, is a gzipped tar file containing
 files relative to
diff --git a/share/man/man9/CONDSPLASSERT.9 b/share/man/man9/CONDSPLASSERT.9
index 24df198..7d54128 100644
--- a/share/man/man9/CONDSPLASSERT.9
+++ b/share/man/man9/CONDSPLASSERT.9
@@ -38,29 +38,31 @@
 .Cd options INVARIANT_SUPPORT
 .Fn CONDSPLASSERT condition level "const char *msg"
 .Sh DESCRIPTION
-.Sy This API is deprecated.
-.Sy Use mutexes to protect data structures instead.
-.Sy See
+.Bf -symbolic
+This API is deprecated.
+Use mutexes to protect data structures instead.
+See
 .Xr mutex 9
-.Sy for more information.
+for more information.
+.Ef
 .Pp
 In a kernel compiled with both "options INVARIANTS"
 and "options INVARIANT_SUPPORT",
 the
 .Fn CONDSPLASSERT
 macro compares the current spl level of the kernel with the spl
-.Ar level
+.Fa level
 specified in the macro
 .Fn CONDSPLASSERT
 if the specified condition is met.
 If the specified
-.Ar level
+.Fa level
 is not active
 .Fn CONDSPLASSERT
 calls the
 .Fn KASSERT
 macro with the
-.Ar msg,
+.Fa msg ,
 terminating the running system.
 .Pp
 In a kernel that does not have both "options INVARIANTS"
diff --git a/share/man/man9/SPLASSERT.9 b/share/man/man9/SPLASSERT.9
index 8396db1..e6a95bf 100644
--- a/share/man/man9/SPLASSERT.9
+++ b/share/man/man9/SPLASSERT.9
@@ -39,28 +39,30 @@
 .Cd options INVARIANT_SUPPORT
 .Fn SPLASSERT level "const char *msg"
 .Sh DESCRIPTION
-.Sy This API is deprecated.
-.Sy Use mutexes to protect data structures instead.
-.Sy See
+.Bf -symbolic
+This API is deprecated.
+Use mutexes to protect data structures instead.
+See
 .Xr mutex 9
-.Sy for more information.
+for more information.
+.Ef
 .Pp
 In a kernel compiled with both "options INVARIANTS"
 and "options INVARIANT_SUPPORT",
 the
 .Fn SPLASSERT
 macro compares the current spl level of the kernel with the spl
-.Ar level
+.Fa level
 specified in the macro
 .Fn SPLASSERT .
 If the specified
-.Ar level
+.Fa level
 is not active
 .Fn SPLASSERT
 calls the
 .Fn KASSERT
 macro with the
-.Ar msg,
+.Fa msg ,
 terminating the running system.
 .Pp
 In a kernel that does not have both "options INVARIANTS"
diff --git a/share/man/man9/VOP_ACCESS.9 b/share/man/man9/VOP_ACCESS.9
index edf8141..00b308c 100644
--- a/share/man/man9/VOP_ACCESS.9
+++ b/share/man/man9/VOP_ACCESS.9
@@ -60,8 +60,9 @@ The
 .Fa mode
 is a mask which can contain
 .Dv VREAD ,
-.Dv VWRITE or
-.Dv VEXEC.
+.Dv VWRITE
+or
+.Dv VEXEC .
 .Sh LOCKS
 The vnode will be locked on entry and should remain locked on return.
 .Sh RETURN VALUES
diff --git a/share/man/man9/devclass.9 b/share/man/man9/devclass.9
index 4f0eec6..8539e34 100644
--- a/share/man/man9/devclass.9
+++ b/share/man/man9/devclass.9
@@ -35,7 +35,7 @@
 .Nm devclass
 .Nd object representing a class of devices
 .Sh SYNOPSIS
-.Dv typedef struct devclass *devclass_t;
+.Vt typedef struct devclass *devclass_t ;
 .Sh DESCRIPTION
 .Pp
 The
diff --git a/share/man/man9/device.9 b/share/man/man9/device.9
index f1e502f..1cb1524 100644
--- a/share/man/man9/device.9
+++ b/share/man/man9/device.9
@@ -35,7 +35,7 @@
 .Nm device
 .Nd an abstract representation of a device
 .Sh SYNOPSIS
-.Dv typedef struct device *device_t;
+.Vt typedef struct device *device_t ;
 .Sh DESCRIPTION
 .Pp
 The device object represents a piece of hardware attached to the
diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9
index 1555538..71c38ee 100644
--- a/share/man/man9/ifnet.9
+++ b/share/man/man9/ifnet.9
@@ -89,35 +89,35 @@
 .\"
 .Ss "struct ifnet member functions"
 .Ft int
-.Fn (*if_output) "struct ifnet *ifp" "struct mbuf *m" "struct sockaddr *dst" "struct rtentry *rt"
+.Fn \*(lp*if_output\*(rp "struct ifnet *ifp" "struct mbuf *m" "struct sockaddr *dst" "struct rtentry *rt"
 .Ft void
-.Fn (*if_start) "struct ifnet *ifp"
+.Fn \*(lp*if_start\*(rp "struct ifnet *ifp"
 .Ft int
-.Fn (*if_dont) "struct ifnet *ifp"
+.Fn \*(lp*if_dont\*(rp "struct ifnet *ifp"
 .Ft int
-.Fn (*if_ioctl) "struct ifnet *ifp" "int cmd" "caddr_t data"
+.Fn \*(lp*if_ioctl\*(rp "struct ifnet *ifp" "int cmd" "caddr_t data"
 .Ft void
-.Fn (*if_watchdog) "struct ifnet *ifp"
+.Fn \*(lp*if_watchdog\*(rp "struct ifnet *ifp"
 .Ft int
-.Fn (*if_poll_recv) "struct ifnet *ifp" "int *quotap"
+.Fn \*(lp*if_poll_recv\*(rp "struct ifnet *ifp" "int *quotap"
 .Ft int
-.Fn (*if_poll_xmit) "struct ifnet *ifp" "int *quotap"
+.Fn \*(lp*if_poll_xmit\*(rp "struct ifnet *ifp" "int *quotap"
 .Ft void
-.Fn (*if_poll_inttrn) "struct ifnet *ifp"
+.Fn \*(lp*if_poll_inttrn\*(rp "struct ifnet *ifp"
 .Ft void
-.Fn (*if_poll_slowinput) "struct ifnet *ifp" "struct mbuf *m"
+.Fn \*(lp*if_poll_slowinput\*(rp "struct ifnet *ifp" "struct mbuf *m"
 .Ft void
-.Fn (*if_init) "void *if_softc"
+.Fn \*(lp*if_init\*(rp "void *if_softc"
 .Ft int
-.Fn (*if_resolvemulti) "struct ifnet *ifp" "struct sockaddr **retsa" "struct sockaddr *addr"
+.Fn \*(lp*if_resolvemulti\*(rp "struct ifnet *ifp" "struct sockaddr **retsa" "struct sockaddr *addr"
 .Ss "struct ifaddr member function"
 .Ft void
-.Fn (*ifa_rtrequest) "int cmd" "struct rtentry *rt" "struct sockaddr *dst"
+.Fn \*(lp*ifa_rtrequest\*(rp "int cmd" "struct rtentry *rt" "struct sockaddr *dst"
 .Ss "Global variables"
-.Fd extern struct ifnethead ifnet;
-.Fd extern struct ifaddr \&**ifnet_addrs;
-.Fd extern int if_index;
-.Fd extern int ifqmaxlen;
+.Vt extern struct ifnethead ifnet ;
+.Vt extern struct ifaddr \&**ifnet_addrs ;
+.Vt extern int if_index ;
+.Vt extern int ifqmaxlen ;
 .Sh DATA STRUCTURES
 The kernel mechanisms for handling network interfaces reside primarily
 in the
diff --git a/share/man/man9/mbuf.9 b/share/man/man9/mbuf.9
index 2374ee1..89f3d64 100644
--- a/share/man/man9/mbuf.9
+++ b/share/man/man9/mbuf.9
@@ -316,7 +316,7 @@ then if the reference count of the storage is not greater than 1.
 The
 .Dv M_RDONLY
 flag can be set in the mbuf's
-.Dv m_flags.
+.Dv m_flags .
 This can be achieved during setup of the external storage,
 by passing the
 .Dv M_RDONLY
@@ -366,7 +366,8 @@ must be less than
 or
 .Dv MHLEN ,
 depending on the
-.Dv M_PKTHDR flag setting.
+.Dv M_PKTHDR
+flag setting.
 .\"
 .It Fn m_pullup mbuf len
 Arrange that the first
diff --git a/share/man/man9/mi_switch.9 b/share/man/man9/mi_switch.9
index 3f66664..3482656 100644
--- a/share/man/man9/mi_switch.9
+++ b/share/man/man9/mi_switch.9
@@ -66,7 +66,8 @@ can be enumerated as follows:
 .Bl -enum -offset indent
 .It
 from within
-.Xr sleep 9 , and
+.Xr sleep 9
+and
 .Xr tsleep 9
 when the current process
 voluntarily relinquishes the CPU to wait for some resource to become
diff --git a/share/man/man9/microseq.9 b/share/man/man9/microseq.9
index dce4b2e..b92175d 100644
--- a/share/man/man9/microseq.9
+++ b/share/man/man9/microseq.9
@@ -287,7 +287,7 @@ the parameter to pass to the function call
 .El
 .Pp
 The C function shall be declared as a
-.Fd int(*)(void *p, char *ptr)
+.Ft int(*)(void *p, char *ptr) .
 The ptr parameter is the current position in the buffer currently scanned.
 .Pp
 Predefined macro: MS_C_CALL(func,param)
diff --git a/share/man/man9/panic.9 b/share/man/man9/panic.9
index 3b1ebf9..2f4c305 100644
--- a/share/man/man9/panic.9
+++ b/share/man/man9/panic.9
@@ -40,7 +40,7 @@
 .Sh SYNOPSIS
 .Fd #include <sys/param.h>
 .Ft void
-.Fn panic "const char *fmt, ..."
+.Fn panic "const char *fmt" ...
 .Sh DESCRIPTION
 The
 .Fn panic
diff --git a/share/man/man9/pfil.9 b/share/man/man9/pfil.9
index a0e9e82..05b8823 100644
--- a/share/man/man9/pfil.9
+++ b/share/man/man9/pfil.9
@@ -106,7 +106,7 @@ interface first appeared in
 The
 .Nm
 input and output lists were originally implemented as
-.Pa Aq sys/queue.h
+.Aq Pa sys/queue.h
 .Dv LIST
 structures;
 however this was changed in
diff --git a/share/man/man9/rtentry.9 b/share/man/man9/rtentry.9
index 5c75560..6b0eb9b 100644
--- a/share/man/man9/rtentry.9
+++ b/share/man/man9/rtentry.9
@@ -53,7 +53,9 @@ The basic structure a route is defined by
 .Dq Li struct rtentry ,
 which includes the following fields:
 .Bl -tag -offset indent -width 6n
-.It Li "struct radix_node rt_nodes[2];"
+.It Xo
+.Vt "struct radix_node rt_nodes[2]" ;
+.Xc
 Glue used by the radix-tree routines.  These members also include in
 their substructure the key (i.e., destination address) and mask used
 when the route was created.  The
@@ -64,7 +66,9 @@ macros can be used to extract this information (in the form of a
 .Dq Li "struct sockaddr *" )
 given a
 .Li "struct rtentry *" .
-.It Li "struct sockaddr *rt_gateway;"
+.It Xo
+.Vt "struct sockaddr *rt_gateway" ;
+.Xc
 The
 .Dq target
 of the route, which can either represent a destination in its own
@@ -72,7 +76,9 @@ right (some protocols will put a link-layer address here), or some
 intermediate stop on the way to that destination (if the
 .Dv RTF_GATEWAY
 flag is set).
-.It Li "long rt_refcnt;"
+.It Xo
+.Vt "long rt_refcnt" ;
+.Xc
 Route entries are reference-counted; this field indicates the number
 of external (to the radix tree) references.  If the
 .Dv RTF_UP
@@ -80,17 +86,25 @@ flag is not present, the
 .Fn rtfree
 function will delete the route from the radix tree when the last
 reference drops.
-.It Li "u_long rt_flags;"
+.It Xo
+.Vt "u_long rt_flags" ;
+.Xc
 See below.
-.It Li "struct ifnet *rt_ifp;"
-.It Li "struct ifaddr *rt_ifa;"
+.It Xo
+.Vt "struct ifnet *rt_ifp" ;
+.Xc
+.It Xo
+.Vt "struct ifaddr *rt_ifa" ;
+.Xc
 These two fields represent the
 .Dq answer ,
 as it were, to the question posed by a route lookup; that is, they
 name the interface and interface address to be used in sending a
 packet to the destination or set of destinations which this route
 represents.
-.It Li "struct sockaddr *rt_genmask;"
+.It Xo
+.Vt "struct sockaddr *rt_genmask" ;
+.Xc
 When the
 .Fn rtalloc
 family of functions performs a cloning operation as requested by the
@@ -100,7 +114,9 @@ or
 flag, this field is used as the mask for the new route which is
 inserted into the table.  If this field is a null pointer, then a host
 route is generated.
-.It Li "caddr_t rt_llinfo;"
+.It Xo
+.Vt "caddr_t rt_llinfo" ;
+.Xc
 When the
 .Dv RTF_LLINFO
 flag is set, this field contains information specific to the link
@@ -111,9 +127,13 @@ routine.)  Protocols such as
 .Xr arp 4
 use this field to reference per-destination state internal to that
 protocol.
-.It Li "struct rt_metrics rt_rmx;"
+.It Xo
+.Vt "struct rt_metrics rt_rmx" ;
+.Xc
 See below.
-.It Li "struct rtentry *rt_gwroute;"
+.It Xo
+.Vt "struct rtentry *rt_gwroute" ;
+.Xc
 This member is a reference to a route whose destination is
 .Li rt_gateway .
 It is only used for
@@ -121,7 +141,9 @@ It is only used for
 routes.
 .\" .It Dv "int (*rt_output)();"
 .\" See below.
-.It Dv "struct rtentry *rt_parent;"
+.It Xo
+.Vt "struct rtentry *rt_parent" ;
+.Xc
 A reference to the route from which this route was cloned, or a null
 pointer if this route was not generated by cloning.  See also the
 .Dv RTF_WASCLONED
@@ -213,21 +235,31 @@ Indicates that the destination is a multicast address.
 Every route has associated with it a set of metrics, defined by
 .Li struct rt_metrics :
 .Bl -tag -offset indent -width 6n
-.It Li "u_long rmx_locks;"
+.It Xo
+.Vt "u_long rmx_locks" ;
+.Xc
 Flag bits indicating which metrics the kernel is not permitted to
 dynamically modify.
-.It Li "u_long rmx_mtu;"
+.It Xo
+.Vt "u_long rmx_mtu" ;
+.Xc
 MTU for this path.
-.It Li "u_long rmx_hopcount;"
+.It Xo
+.Vt "u_long rmx_hopcount" ;
+.Xc
 Number of intermediate systems on the path to this destination.
-.It Li "u_long rmx_expire;"
+.It Xo
+.Vt "u_long rmx_expire" ;
+.Xc
 The time 
 (a la
 .Xr time 3 )
 at which this route should expire, or zero if it should never expire.
 It is the responsibility of individual protocol suites to ensure that routes
 are actually deleted once they expire.
-.It Li "u_long rmx_recvpipe;"
+.It Xo
+.Vt "u_long rmx_recvpipe" ;
+.Xc
 Nominally, the bandwidth-delay product for the path 
 .Em from
 the destination
@@ -235,24 +267,36 @@ the destination
 this system.  In practice, this value is used to set the size of the
 receive buffer (and thus the window in sliding-window protocols like
 .Tn TCP ) .
-.It Li "u_long rmx_sendpipe;"
+.It Xo
+.Vt "u_long rmx_sendpipe" ;
+.Xc
 As before, but in the opposite direction.
-.It Li "u_long rmx_ssthresh;"
+.It Xo
+.Vt "u_long rmx_ssthresh" ;
+.Xc
 The slow-start threshold used in
 .Tn TCP
 congestion-avoidance.
-.It Li "u_long rmx_rtt;"
+.It Xo
+.Vt "u_long rmx_rtt" ;
+.Xc
 The round-trip time to this destination, in units of
 .Dv RMX_RTTUNIT
 per second.
-.It Li "u_long rmx_rttvar;"
+.It Xo
+.Vt "u_long rmx_rttvar" ;
+.Xc
 The average deviation of the round-type time to this destination, in
 units of
 .Dv RMX_RTTUNIT
 per second.
-.It Li "u_long rmx_pksent;"
+.It Xo
+.Vt "u_long rmx_pksent" ;
+.Xc
 A count of packets successfully sent via this route.
-.It Li "u_long rmx_filler[4];"
+.It Xo
+.Vt "u_long rmx_filler[4]" ;
+.Xc
 .\" XXX badly named
 Empty space available for protocol-specific information.
 .El
diff --git a/share/man/man9/sleep.9 b/share/man/man9/sleep.9
index c4519d8..8a82350 100644
--- a/share/man/man9/sleep.9
+++ b/share/man/man9/sleep.9
@@ -254,4 +254,4 @@ This man page was written by
 and
 .Nm await
 were designed and written by
-.An Matthew Dillon.
+.An Matthew Dillon .
diff --git a/share/man/man9/spl.9 b/share/man/man9/spl.9
index 9abcaba..f7902d4 100644
--- a/share/man/man9/spl.9
+++ b/share/man/man9/spl.9
@@ -68,11 +68,13 @@
 .Ft void
 .Fn splx "intrmask_t ipl"
 .Sh DESCRIPTION
-.Sy This API is deprecated.
-.Sy Use mutexes to protect data structures instead.
-.Sy See
+.Bf -symbolic
+This API is deprecated.
+Use mutexes to protect data structures instead.
+See
 .Xr mutex 9
-.Sy for more information.
+for more information.
+.Ef
 .Pp
 The
 .Fn spl
diff --git a/share/man/man9/style.9 b/share/man/man9/style.9
index fc21355..59f2fbe 100644
--- a/share/man/man9/style.9
+++ b/share/man/man9/style.9
@@ -34,7 +34,7 @@
 This file specifies the preferred style for kernel source files in the
 .Fx
 source tree.  It is also a guide for preferred userland code style.
-.Bd -literal -offset 0i
+.Bd -literal
 /*
  * Style guide for the FreeBSD.  Based on KNF (Kernel Normal Form).
  */
@@ -55,12 +55,12 @@ Kernel include files (i.e. sys/*.h) come first; normally, you'll need
 <sys/types.h>
 OR <sys/param.h>, but not both!  <sys/types.h> includes <sys/cdefs.h>,
 and it's okay to depend on that.
-.Bd -literal -offset 0i
+.Bd -literal
 #include <sys/types.h>	/* Non-local includes in angle brackets. */
 .Ed
 .Pp
 If it's a network program, put the network include files next.
-.Bd -literal -offset 0i
+.Bd -literal
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/route.h>
@@ -70,18 +70,18 @@ If it's a network program, put the network include files next.
 .Pp
 Then there's a blank line, followed by the /usr include files.
 The /usr include files should be sorted!
-.Bd -literal -offset 0i
+.Bd -literal
 #include <stdio.h>
 .Ed
 .Pp
 Global pathnames are defined in /usr/include/paths.h.  Pathnames local
 to the program go in pathnames.h in the local directory.
-.Bd -literal -offset 0i
+.Bd -literal
 #include <paths.h>
 .Ed
 .Pp
 Then, there's a blank line, and the user include files.
-.Bd -literal -offset 0i
+.Bd -literal
 #include "pathnames.h"		/* Local includes in double quotes. */
 .Ed
 .Pp
@@ -121,7 +121,7 @@ statements.
 Any final statement-terminating semicolon should be
 supplied by the macro invocation rather than the macro, to make parsing easier
 for pretty-printers and editors.
-.Bd -literal -offset 0i
+.Bd -literal
 #define	MACRO(x, y) do {						\e
 	variable = (x) + (y);						\e
 	(y) += 2;							\e
@@ -129,7 +129,7 @@ for pretty-printers and editors.
 .Ed
 .Pp
 Enumeration values are all uppercase.
-.Bd -literal -offset 0i
+.Bd -literal
 enum enumtype { ONE, TWO } et;
 .Ed
 .Pp
@@ -145,7 +145,7 @@ Major structures should be declared at the top of the file in which they
 are used, or in separate header files if they are used in multiple
 source files.  Use of the structures should be by separate declarations
 and should be "extern" if they are declared in a header file.
-.Bd -literal -offset 0i
+.Bd -literal
 struct foo {
 	struct	foo *next;	/* List of active foo */
 	struct	mumble amumble;	/* Comment for mumble */
@@ -158,7 +158,7 @@ Use
 .Xr queue 3
 macros rather than rolling your own lists, whenever possible.  Thus,
 the previous example would be better written:
-.Bd -literal -offset 0i
+.Bd -literal
 #include <sys/queue.h>
 struct	foo {
 	LIST_ENTRY(foo)	link;	/* Queue macro glue for foo lists */
@@ -176,7 +176,7 @@ tag.  Avoid typedefs ending in
 .Dq Li \&_t ,
 except as specified in Standard C or by
 .Tn POSIX .
-.Bd -literal -offset 0i
+.Bd -literal
 /* Make the structure name match the typedef. */
 typedef struct _bar {
 	int	level;
@@ -209,7 +209,7 @@ to break precedents in the existing code and use the current style guidelines.
 .Pp
 The kernel has a name associated with parameter types, e.g., in the kernel
 use:
-.Bd -literal -offset 0i
+.Bd -literal
 void	function(int fd);
 .Ed
 .Pp
@@ -217,18 +217,18 @@ In header files visible to userland applications, prototypes that are
 visible must use either protected names or no names with the types.  It
 is preferable to use protected names.
 e.g., use:
-.Bd -literal -offset 0i
+.Bd -literal
 void	function(int);
 .Ed
 .Pp
 or:
-.Bd -literal -offset 0i
+.Bd -literal
 void	function(int _fd);
 .Ed
 .Pp
 Prototypes may have an extra space after a tab to enable function names
 to line up:
-.Bd -literal -offset 0i
+.Bd -literal
 static char	*function(int _arg, const char *_arg2, struct foo *_arg3,
 			  struct bar *_arg4);
 static void	 usage(void);
@@ -253,7 +253,7 @@ parts of the switch cascade.  Elements in a switch statement that
 cascade should have a FALLTHROUGH comment.  Numerical arguments
 should be checked for accuracy.  Code that cannot be reached should
 have a NOTREACHED comment.
-.Bd -literal -offset 0i
+.Bd -literal
 	while ((ch = getopt(argc, argv, "abn")) != -1)
 		switch (ch) {		/* Indent the switch. */
 		case 'a':		/* Don't indent the case. */
@@ -284,7 +284,7 @@ Space after keywords (if, while, for, return, switch).  No braces are
 used for control statements with zero or only a single statement unless that
 statement is more than a single line in which case they are permitted.
 Forever loops are done with for's, not while's.
-.Bd -literal -offset 0i
+.Bd -literal
 	for (p = buf; *p != '\e0'; ++p)
 		;	/* nothing */
 	for (;;)
@@ -304,7 +304,7 @@ Forever loops are done with for's, not while's.
 .Pp
 Parts of a for loop may be left empty.  Don't put declarations
 inside blocks unless the routine is unusually complicated.
-.Bd -literal -offset 0i
+.Bd -literal
 	for (; cnt < 15; cnt++) {
 		stmt1;
 		stmt2;
@@ -313,7 +313,7 @@ inside blocks unless the routine is unusually complicated.
 .Pp
 Indentation is an 8 character tab.
 Second level indents are four spaces.
-.Bd -literal -offset 0i
+.Bd -literal
 	while (cnt < 20)
 		z = a + really + long + statement + that + needs +
 		    two lines + gets + indented + four + spaces +
@@ -327,7 +327,7 @@ and do not use spaces in front of tabs.
 .Pp
 Closing and opening braces go on the same line as the else.
 Braces that aren't necessary may be left out.
-.Bd -literal -offset 0i
+.Bd -literal
 	if (test)
 		stmt;
 	else if (bar) {
@@ -347,7 +347,7 @@ or preceding
 or
 .Sq \&)
 characters.
-.Bd -literal -offset 0i
+.Bd -literal
 	if (error = function(a1, a2))
 		exit(error);
 .Ed
@@ -356,7 +356,7 @@ Unary operators don't require spaces, binary operators do.  Don't
 use parentheses unless they're required for precedence or unless the
 statement is confusing without them.  Remember that other people may
 confuse easier than you.  Do YOU understand the following?
-.Bd -literal -offset 0i
+.Bd -literal
 	a = b->c[0] + ~d == (e || f) || g && h ? i : j >> 1;
 	k = !(l & FLAGS);
 .Ed
@@ -364,7 +364,7 @@ confuse easier than you.  Do YOU understand the following?
 Exits should be 0 on success, or according to the predefined
 values in
 .Xr sysexits 3 .
-.Bd -literal -offset 0i
+.Bd -literal
 	exit(EX_OK);	/*
 			 * Avoid obvious comments such as
 			 * "Exit 0 on success."
@@ -374,7 +374,7 @@ values in
 .Pp
 The function type should be on a line by itself
 preceding the function.
-.Bd -literal -offset 0i
+.Bd -literal
 static char *
 function(int a1, int a2, float fl, int a4)
 {
@@ -389,7 +389,7 @@ keyword.
 Be careful to not obfuscate the code by initializing variables in
 the declarations.  Use this feature only thoughtfully.
 DO NOT use function calls in initializers!
-.Bd -literal -offset 0i
+.Bd -literal
 	struct foo one, *two;
 	double three;
 	int *four, five;
@@ -415,22 +415,22 @@ variadic args and is necessary for other args if the function prototype
 might not be in scope.)
 Test pointers
 against NULL, e.g., use:
-.Bd -literal -offset 0i
+.Bd -literal
 (p = f()) == NULL
 .Ed
 .Pp
 not:
-.Bd -literal -offset 0i
+.Bd -literal
 !(p = f())
 .Ed
 .Pp
 Don't use '!' for tests unless it's a boolean, e.g. use
-.Bd -literal -offset 0i
+.Bd -literal
 if (*p == '\e0')
 .Ed
 .Pp
 not
-.Bd -literal -offset 0i
+.Bd -literal
 if (!*p)
 .Ed
 .Pp
@@ -442,7 +442,7 @@ Use
 or
 .Xr warn 3 ,
 don't roll your own!
-.Bd -literal -offset 0i
+.Bd -literal
 	if ((four = malloc(sizeof(struct foo))) == NULL)
 		err(1, (char *)NULL);
 	if ((six = (int *)overflow()) == NULL)
@@ -452,7 +452,7 @@ don't roll your own!
 .Ed
 .Pp
 Old-style function declarations look like this:
-.Bd -literal -offset 0i
+.Bd -literal
 static char *
 function(a1, a2, fl, a4)
 	int a1, a2;	/* Declare ints, too, don't default them. */
@@ -464,7 +464,7 @@ function(a1, a2, fl, a4)
 Use ANSI function declarations unless you explicitly need K&R compatibility.
 .Pp
 Variable numbers of arguments should look like this.
-.Bd -literal -offset 0i
+.Bd -literal
 #include <stdarg.h>
 
 void
@@ -524,11 +524,11 @@ separates either-or options/arguments,
 and multiple options/arguments which are specified together are
 placed in a single set of brackets.
 .Pp
-.Bd -ragged -offset 0.3i
+.Bd -ragged -offset 4n
 "usage: f [-aDde] [-b b_arg] [-m m_arg] req1 req2 [opt1 [opt2]]\en"
 "usage: f [-a | -b] [-c [-dEe] [-n number]]\en"
 .Ed
-.Bd -literal -offset 0i
+.Bd -literal
 	(void)fprintf(stderr, "usage: f [-ab]\en");
 	exit(EX_USAGE);
 }
diff --git a/share/man/man9/sysctl_add_oid.9 b/share/man/man9/sysctl_add_oid.9
index 34acd76..6fa352a 100644
--- a/share/man/man9/sysctl_add_oid.9
+++ b/share/man/man9/sysctl_add_oid.9
@@ -367,7 +367,7 @@ any attempt to remove a node that contains any children
 will result in a
 .Er ENOTEMPTY
 error.
-.Em "WARNING: use recursive deletion with extreme caution!"
+.Em WARNING : "use recursive deletion with extreme caution" !
 Normally it should not be needed if contexts are used.
 Contexts take care of tracking inter-dependencies
 between users of the tree.
diff --git a/share/man/man9/time.9 b/share/man/man9/time.9
index 2f3153c2..6e0a6bc 100644
--- a/share/man/man9/time.9
+++ b/share/man/man9/time.9
@@ -111,7 +111,7 @@ function can be used to read the
 .Va time
 variable in an atomic manner.  There is no equivalent
 function for accessing
-.Va mono_time.
+.Va mono_time .
 The
 .Va boottime
 and
diff --git a/share/termcap/termcap.5 b/share/termcap/termcap.5
index 2d08aee..407a0d7 100644
--- a/share/termcap/termcap.5
+++ b/share/termcap/termcap.5
@@ -1131,7 +1131,7 @@ is safe to send.
 This turns out to be essential for the Ann Arbor 4080.)
 .Pp
 A final example is the Lear Siegler
-.Tn ADM Ns \-3a,
+.Tn ADM Ns \-3a ,
 which offsets row and column
 by a blank character, thus
 .Dq Li cm=\eE=%+ %+\ \& .
@@ -1245,7 +1245,7 @@ which all commands affect, it should be given as the parameterized string
 The four parameters are the starting and ending lines in memory
 and the starting and ending columns in memory, in that order.
 (This
-.Xr terminfo
+.Xr terminfo 5
 capability is described for completeness.
 It is unlikely that any
 .Nm Ns \-using
@@ -1468,7 +1468,7 @@ only those for which corresponding attribute commands exist.
 .Nm Ns \-using
 program will support this capability, which is defined for compatibility
 with
-.Xr terminfo . )
+.Xr terminfo 5 . )
 .Pp
 Terminals with the
 .Dq magic cookie
@@ -1480,7 +1480,7 @@ rather than maintaining extra attribute bits for each character cell,
 instead deposit special
 .Dq cookies ,
 or
-.Dq garbage characters ,,
+.Dq garbage characters ,
 when they receive mode-setting sequences,
 which affect the display algorithm.
 .Pp
@@ -1879,7 +1879,7 @@ this can be indicated with the parameterized string
 The first parameter is the character to be repeated and the second is
 the number of times to repeat it.
 (This is a
-.Xr terminfo
+.Xr terminfo 5
 feature that is unlikely to be supported by a program that uses
 .Nm . )
 .Pp
@@ -1998,7 +1998,7 @@ causes the string to be transmitted to the computer.
 Unfortunately, due to lack of a definition for string parameters in
 .Nm ,
 only
-.Xr terminfo
+.Xr terminfo 5
 supports these capabilities.
 .Ss Glitches and Braindamage
 Hazeltine terminals, which do not allow `~' characters to be displayed,
@@ -2116,7 +2116,7 @@ The
 .Nm
 functions
 were replaced by
-.Xr terminfo
+.Xr terminfo 5
 in
 .At V
 Release 2.0.
diff --git a/sys/boot/common/loader.8 b/sys/boot/common/loader.8
index 5b8d6e6..a3a51bc 100644
--- a/sys/boot/common/loader.8
+++ b/sys/boot/common/loader.8
@@ -153,7 +153,7 @@ if necessary.
 Any flags or arguments are passed to the kernel, but they
 must precede the kernel name, if a kernel name is provided.
 .Pp
-.Em WARNING:
+.Em WARNING :
 The behavior of this builtin is changed if
 .Xr loader.4th 8
 is loaded.
diff --git a/usr.bin/ar/ar.1 b/usr.bin/ar/ar.1
index 4834e7a..96db67b 100644
--- a/usr.bin/ar/ar.1
+++ b/usr.bin/ar/ar.1
@@ -57,7 +57,7 @@
 .Nm
 .Fl p
 .Op Fl \&Tv
-.Ar archive [file ...]
+.Ar archive Op Ar file ...
 .Nm
 .Fl q
 .Op Fl cTv
@@ -73,11 +73,11 @@
 .Nm
 .Fl t
 .Op Fl \&Tv
-.Ar archive [file ...]
+.Ar archive Op Ar file ...
 .Nm
 .Fl x
 .Op Fl ouTv
-.Ar archive [file ...]
+.Ar archive Op Ar file ...
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/usr.bin/ar/ar.1aout b/usr.bin/ar/ar.1aout
index 2e4ea05..c4a3c53 100644
--- a/usr.bin/ar/ar.1aout
+++ b/usr.bin/ar/ar.1aout
@@ -41,45 +41,45 @@
 .Nm ar
 .Nd create and maintain library archives
 .Sh SYNOPSIS
-.Nm ar
+.Nm
 .Fl d
 .Op Fl \&Tv
 .Ar archive file ...
-.Nm ar
+.Nm
 .Fl m
 .Op Fl \&Tv
 .Ar archive file ...
-.Nm ar
+.Nm
 .Fl m
 .Op Fl abiTv
 .Ar position archive file ...
-.Nm ar
+.Nm
 .Fl p
 .Op Fl \&Tv
-.Ar archive [file ...]
-.Nm ar
+.Ar archive Op Ar file ...
+.Nm
 .Fl q
 .Op Fl cTv
 .Ar archive file ...
-.Nm ar
+.Nm
 .Fl r
 .Op Fl cuTv
 .Ar archive file ...
-.Nm ar
+.Nm
 .Fl r
 .Op Fl abciuTv
 .Ar position archive file ...
-.Nm ar
+.Nm
 .Fl t
 .Op Fl \&Tv
-.Ar archive [file ...]
-.Nm ar
+.Ar archive Op Ar file ...
+.Nm
 .Fl x
 .Op Fl ouTv
-.Ar archive [file ...]
+.Ar archive Op Ar file ...
 .Sh DESCRIPTION
 The
-.Nm ar
+.Nm
 utility creates and maintains groups of files combined into an archive.
 Once an archive has been created, new files can be added and existing
 files can be extracted, deleted, or replaced.
@@ -98,7 +98,7 @@ on the command line to ``select'' archive files for an operation, only the
 file with a matching name will be selected.
 .Pp
 The normal use of
-.Nm ar
+.Nm
 is for the creation and maintenance of libraries suitable for use with
 the loader (see
 .Xr ld 1 )
@@ -131,7 +131,7 @@ is written to standard error.
 If the
 .Fl c
 option is specified,
-.Nm ar
+.Nm
 creates the archive silently.
 .It Fl d
 Delete the specified archive files.
@@ -218,14 +218,14 @@ When used with the
 or
 .Fl x
 options,
-.Nm ar
+.Nm
 gives a file-by-file description of the archive modification.
 This description consists of three, white-space separated fields: the
 option letter, a dash (``-'') and the file name.
 When used with the
 .Fl r
 option,
-.Nm ar
+.Nm
 displays the description as above, but the initial letter is an ``a'' if
 the file is added to the archive and an ``r'' if the file replaces a file
 already in the archive.
@@ -243,7 +243,7 @@ followed by two newline characters.
 When used with the
 .Fl t
 option,
-.Nm ar
+.Nm
 displays an ``ls -l'' style listing of information about the members of
 the archive.
 This listing consists of eight, white-space separated fields:
@@ -271,7 +271,7 @@ extracted file or the super-user.
 .El
 .Pp
 The
-.Nm ar
+.Nm
 utility exits 0 on success, and >0 if an error occurs.
 .Sh ENVIRONMENT
 .Bl -tag -width indent -compact
@@ -287,14 +287,14 @@ temporary file names
 .El
 .Sh COMPATIBILITY
 By default,
-.Nm ar
+.Nm
 writes archives that may be incompatible with historic archives, as
 the format used for storing archive members with names longer than
 fifteen characters has changed.
 This implementation of
-.Nm ar
+.Nm
 is backward compatible with previous versions of
-.Nm ar
+.Nm
 in that it can read and write (using the
 .Fl T
 option) historic archives.
@@ -307,7 +307,7 @@ See
 for more information.
 .Sh STANDARDS
 The
-.Nm ar
+.Nm
 utility is expected to offer a superset of the
 .St -p1003.2
 functionality.
diff --git a/usr.bin/at/at.man b/usr.bin/at/at.man
index 7a8e2c5..31a645e 100644
--- a/usr.bin/at/at.man
+++ b/usr.bin/at/at.man
@@ -108,11 +108,11 @@ and to run the job tomorrow by suffixing the time with
 .Em tomorrow .
 .Pp
 For example, to run a job at 4pm three days from now, you would do
-.Nm at 4pm + 3 days ,
+.Nm at Ar 4pm + 3 days ,
 to run a job at 10:00am on July 31, you would do
-.Nm at 10am Jul 31
+.Nm at Ar 10am Jul 31
 and to run a job at 1am tomorrow, you would do
-.Nm at 1am tomorrow.
+.Nm at Ar 1am tomorrow .
 .Pp
 For both
 .Nm
@@ -156,7 +156,7 @@ and
 If the file
 .Pa _PERM_PATH/at.allow
 exists, only usernames mentioned in it are allowed to use
-.Nm Ns .
+.Nm .
 .Pp
 If
 .Pa _PERM_PATH/at.allow
diff --git a/usr.bin/doscmd/doscmd.1 b/usr.bin/doscmd/doscmd.1
index d5e968f..3cfab68 100644
--- a/usr.bin/doscmd/doscmd.1
+++ b/usr.bin/doscmd/doscmd.1
@@ -49,7 +49,7 @@
 .Xc
 .Fl S Ar int
 .Fl U Ar int
-.Op Ar cmd [args ...]
+.Op Ar cmd Op Ar args ...
 .Sh DESCRIPTION
 .Nm Doscmd
 can either emulate a subset of DOS and run the
@@ -659,7 +659,7 @@ and has the commands fdisk, format and sys on it.  You should also
 copy the file redir.com onto the floppy by either mounting it
 with the msdos file system type or by using mtools
 (e.g.,
-.Li mwrite redir.com a: ).
+.Dq Li mwrite redir.com a: ) .
 .It 3
 run doscmd.
 .It 4
diff --git a/usr.bin/ee/ee.1 b/usr.bin/ee/ee.1
index 4d76028..956e879 100644
--- a/usr.bin/ee/ee.1
+++ b/usr.bin/ee/ee.1
@@ -267,7 +267,7 @@ Display a help screen, with all of the keyboard operations and commands.
 Pop up a menu for selecting whether to read a file, write to a file, or 
 save the current contents of the editor, as well as send the contents of 
 the editor to a print command (see the section
-.Sx "Initializing ee from a file" Ns ).
+.Sx "Initializing ee from a file" ) .
 .It redraw screen
 Provide a means to repaint the screen if the screen has been corrupted.
 .It settings
diff --git a/usr.bin/expand/expand.1 b/usr.bin/expand/expand.1
index ddd5f3f..93c62b1 100644
--- a/usr.bin/expand/expand.1
+++ b/usr.bin/expand/expand.1
@@ -42,7 +42,12 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl Ns Ar tabstop
-.Op Fl t Ar tab1,tab2,...,tabn
+.Oo
+.Fl t
+.Sm off
+.Ar tab1 , tab2 , ... , tabn
+.Sm on
+.Oc
 .Op Ar
 .Nm unexpand
 .Op Fl a
diff --git a/usr.bin/fetch/fetch.1 b/usr.bin/fetch/fetch.1
index 2158dec..3a3548b 100644
--- a/usr.bin/fetch/fetch.1
+++ b/usr.bin/fetch/fetch.1
@@ -165,7 +165,7 @@ ignored and the file is fetched unconditionally.
 Print the size in bytes of each requested file, without fetching it.
 .It Fl T Ar seconds
 Set timeout value to
-.Ar seconds.
+.Ar seconds .
 Overrides the environment variables
 .Ev FTP_TIMEOUT
 for FTP transfers or
diff --git a/usr.bin/file/file.1 b/usr.bin/file/file.1
index 99d6211..0bc0450 100644
--- a/usr.bin/file/file.1
+++ b/usr.bin/file/file.1
@@ -297,7 +297,7 @@ If your old
 command uses a magic file,
 keep the old magic file around for comparison purposes
 (rename it to 
-.Pa /usr/share/misc/magic.orig Ns ).
+.Pa /usr/share/misc/magic.orig ) .
 .Sh EXAMPLES
 .Bd -literal
 $ file file.c file /dev/hda
@@ -459,7 +459,7 @@ as first 5 chars of file) because they are not
 as good as other guesses (e.g.
 .Dq Newsgroups:
 versus
-.Dq Return-Path: Ns ).
+.Dq Return-Path: ) .
 Still, if the others don't pan out, it
 should be possible to use the first guess.
 .Pp
diff --git a/usr.bin/file/magic.5 b/usr.bin/file/magic.5
index cf6b02e..9afcfab 100644
--- a/usr.bin/file/magic.5
+++ b/usr.bin/file/magic.5
@@ -202,9 +202,9 @@ if one is not specified is long.
 Sometimes you do not know the exact offset as this depends on the length of
 preceding fields.
 You can specify an offset relative to the end of the
-last uplevel field (of course this may only be done for sublevel tests, i.e.
+last uplevel field (of course this may only be done for sublevel tests, i.e.\&
 test beginning with 
-.Em > Ns ).
+.Em > Ns ) .
 Such a relative offset is specified using
 .Em &
 as a prefix to the offset.
diff --git a/usr.bin/find/find.1 b/usr.bin/find/find.1
index 78ddcf5..ddd2666 100644
--- a/usr.bin/find/find.1
+++ b/usr.bin/find/find.1
@@ -305,8 +305,7 @@ Slashes (``/'') are treated as normal characters and do not have to be
 matched explicitly.
 .It Xo
 .Ic -perm
-.Op Fl
-.Ar mode
+.Oo Fl Oc Ns Ar mode
 .Xc
 The
 .Ar mode
diff --git a/usr.bin/hexdump/hexdump.1 b/usr.bin/hexdump/hexdump.1
index 1a67e5a..1169f80 100644
--- a/usr.bin/hexdump/hexdump.1
+++ b/usr.bin/hexdump/hexdump.1
@@ -47,7 +47,7 @@
 .Bk -words
 .Op Fl s Ar skip
 .Ek
-.Ar file  ...
+.Ar file ...
 .Nm hd
 .Op Fl bcdovx
 .Op Fl e Ar format_string
@@ -77,7 +77,7 @@ Display the input offset in hexadecimal, followed by sixteen
 space-separated, three column, space-filled, characters of input
 data per line.
 .It Fl C
-.Em Canonical hex+ASCII display.
+.Em Canonical hex+ASCII display .
 Display the input offset in hexadecimal, followed by sixteen
 space-separated, two column, hexadecimal bytes, followed by the
 same sixteen bytes in %_p format enclosed in ``|'' characters.
@@ -86,7 +86,7 @@ Calling the command
 .Nm hd
 implies this option.
 .It Fl d
-.Em Two-byte decimal display.
+.Em Two-byte decimal display .
 Display the input offset in hexadecimal, followed by eight
 space-separated, five column, zero-filled, two-byte units
 of input data, in unsigned decimal, per line.
@@ -102,7 +102,7 @@ Interpret only
 .Ar length
 bytes of input.
 .It Fl o
-.Em Two-byte octal display.
+.Em Two-byte octal display .
 Display the input offset in hexadecimal, followed by eight
 space-separated, six column, zero-filled, two byte quantities of
 input data, in octal, per line.
@@ -149,7 +149,7 @@ identical to the immediately preceding group of output lines (except
 for the input offsets), are replaced with a line comprised of a
 single asterisk.
 .It Fl x
-.Em Two-byte hexadecimal display.
+.Em Two-byte hexadecimal display .
 Display the input offset in hexadecimal, followed by eight, space
 separated, four column, zero-filled, two-byte quantities of input
 data, in hexadecimal, per line.
diff --git a/usr.bin/ipcrm/ipcrm.1 b/usr.bin/ipcrm/ipcrm.1
index 29a18f0..f7529c8 100644
--- a/usr.bin/ipcrm/ipcrm.1
+++ b/usr.bin/ipcrm/ipcrm.1
@@ -76,7 +76,6 @@ from the system.
 .Pp
 The identifiers and keys associated with these System V IPC objects can be
 determined by using
-.Xr ipcs 1
-.
+.Xr ipcs 1 .
 .Sh SEE ALSO
 .Xr ipcs 1
diff --git a/usr.bin/lam/lam.1 b/usr.bin/lam/lam.1
index 942edca..447ef4f 100644
--- a/usr.bin/lam/lam.1
+++ b/usr.bin/lam/lam.1
@@ -40,12 +40,12 @@
 .Nd laminate files
 .Sh SYNOPSIS
 .Nm
-.Op Fl f Ar min.max
+.Op Fl f Ar min . Ns Ar max
 .Op Fl s Ar sepstring
 .Op Fl t Ar c 
 .Ar file ...
 .Nm
-.Op Fl p Ar min.max
+.Op Fl p Ar min . Ns Ar max
 .Op Fl s Ar sepstring
 .Op Fl t Ar c 
 .Ar file ...
@@ -68,9 +68,9 @@ If the option letter is capitalized it affects all subsequent files
 until it appears again uncapitalized.
 The options are described below.
 .Bl -tag -width indent
-.It Fl f Ar min.max
+.It Fl f Ar min . Ns Ar max
 Print line fragments according to the format string
-.Ar min.max ,
+.Ar min . Ns Ar max ,
 where
 .Ar min
 is the minimum field width and
@@ -81,7 +81,7 @@ If
 begins with a zero, zeros will be added to make up the field width,
 and if it begins with a `\-', the fragment will be left-adjusted
 within the field.
-.It Fl p Ar min.max
+.It Fl p Ar min . Ns Ar max
 Like
 .Fl f ,
 but pad this file's field when end-of-file is reached
diff --git a/usr.bin/limits/limits.1 b/usr.bin/limits/limits.1
index cb13e2a..d7804e2 100644
--- a/usr.bin/limits/limits.1
+++ b/usr.bin/limits/limits.1
@@ -36,7 +36,7 @@
 .Op Fl SHB
 .Op Fl cdflmnstu Op val
 .Op Fl E
-.Op Ar name=value ...
+.Op Ar name Ns = Ns Ar value ...
 .Op Ar command
 .Nm
 .Op Fl U Ar user
@@ -48,7 +48,7 @@
 .Op Fl SHB
 .Op Fl cdflmnstu Op val
 .Op Fl E
-.Op Ar name=value ...
+.Op Ar name Ns = Ns Ar value ...
 .Op Ar command
 .Sh DESCRIPTION
 .Nm Limits
@@ -63,13 +63,13 @@ command are possible:
 .Bl -hang -width indent
 .It Nm
 .Op Ar limitflags
-.Op Ar name=value
+.Op Ar name Ns = Ns Ar value
 .Ar command
 .Pp
 This usage sets limits according to
 .Ar limitflags ,
 optionally sets environment variables given as
-.Ar name=value
+.Ar name Ns = Ns Ar value
 pairs, and then runs the specified command.
 .It Nm
 .Op Ar limitflags
@@ -109,7 +109,7 @@ emits 'limit' or 'ulimit' commands in the format understood by
 that shell.
 If the name of the shell cannot be determined, then the 'ulimit'
 format used by
-.Pa /bin/sh
+.Xr sh 1
 is used.
 .Pp
 This is very useful for setting limits used by scripts, or prior
@@ -328,7 +328,7 @@ filesystem must be installed
 and mounted for the shell to be correctly determined, and therefore
 output syntax correct for the running shell.
 The default output is valid for
-.Pa /bin/sh ,
+.Xr sh 1 ,
 so this means that any
 usage of
 .Nm
diff --git a/usr.bin/mail/mail.1 b/usr.bin/mail/mail.1
index 2f63da0..4585f3e 100644
--- a/usr.bin/mail/mail.1
+++ b/usr.bin/mail/mail.1
@@ -45,7 +45,10 @@
 .Op Fl c Ar cc-addr
 .Op Fl b Ar bcc-addr
 .Ar to-addr ...
-.Op \&- Ar sendmail-option ...
+.Oo
+.Fl
+.Ar sendmail-option ...
+.Oc
 .Nm
 .Op Fl iInNv
 .Fl f
@@ -419,7 +422,7 @@ Takes a list of messages and points the text editor at each one in
 turn.
 On return from the editor, the message is read back in.
 .It Ic exit
-.Pf ( Ic ex
+.Ic ( ex
 or
 .Ic x )
 Effects an immediate return to the Shell without
@@ -469,7 +472,7 @@ argument is given, the previous 18\-message group is printed.
 A synonym for
 .Ic \&?
 .It Ic hold
-.Pf ( Ic ho ,
+.Ic ( ho ,
 also
 .Ic preserve )
 Takes a message list and marks each
@@ -952,7 +955,7 @@ If set, will be used to initialize the Reply-To field for outgoing
 messages.
 .It Ev SHELL
 Pathname of the shell to use in the
-.Ic \&!
+.Ic !\&
 command and the
 .Ic \&~!
 escape.
@@ -1025,9 +1028,9 @@ default in /var/mail.
 .Bl -tag -width /usr/share/misc/mail.*help -compact
 .It Pa /var/mail/*
 Post office.
-.It ~/mbox
+.It Pa ~/mbox
 User's old mail.
-.It ~/.mailrc
+.It Pa ~/.mailrc
 File giving initial mail commands.
 .It Pa /tmp/R*
 Temporary files.
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index 081eec8..0f74282 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -941,20 +941,13 @@ is found.
 .Pp
 For loops are typically used to apply a set of rules to a list of files.
 The syntax of a for loop is:
-.Bl -tag -width Ds
-.It Xo
-.Ic \&.for
-.Ar variable
-.Ic in
-.Ar expression
-.Xc
-.It Xo
-<make-rules>
-.Xc
-.It Xo
-.Ic \&.endfor
-.Xc
+.Pp
+.Bl -tag -width indent -compact
+.It Ic .for Ar variable Ic in Ar expression
+.It <make-rules>
+.It Ic \&.endfor
 .El
+.Pp
 After the for
 .Ar expression
 is evaluated, it is split into words.
diff --git a/usr.bin/mklocale/mklocale.1 b/usr.bin/mklocale/mklocale.1
index e221609..de2a86f 100644
--- a/usr.bin/mklocale/mklocale.1
+++ b/usr.bin/mklocale/mklocale.1
@@ -59,7 +59,7 @@ utility reads a
 source file from standard input and produces a
 .Dv LC_CTYPE
 binary file on standard output suitable for placement in
-.Dv /usr/share/locale/\fIlanguage\fP/LC_CTYPE.
+.Pa /usr/share/locale/ Ns Ar language Ns Pa /LC_CTYPE .
 .Pp
 The format of
 .Ar src-file
@@ -189,12 +189,12 @@ through
 Defines the tolower mappings.
 .Dv RUNE2
 is the lower case representation of
-.Dv RUNE1.
+.Dv RUNE1 .
 .It Dv MAPUPPER
 Defines the toupper mappings.
 .Dv RUNE2
 is the upper case representation of
-.Dv RUNE1.
+.Dv RUNE1 .
 .It Dv TODIGIT
 Defines a map from runes to their digit value.
 .Dv RUNE2
diff --git a/usr.bin/msgs/msgs.1 b/usr.bin/msgs/msgs.1
index 189936c..bf5c28d 100644
--- a/usr.bin/msgs/msgs.1
+++ b/usr.bin/msgs/msgs.1
@@ -214,7 +214,7 @@ terminal type.
 .Bl -tag -width /var/msgs/* -compact
 .It Pa /var/msgs/*
 database
-.It ~/.msgsrc
+.It Pa ~/.msgsrc
 number of next message to be presented
 .El
 .Sh SEE ALSO
diff --git a/usr.bin/ncplogin/ncplogin.1 b/usr.bin/ncplogin/ncplogin.1
index d07b1ff..1c60600 100644
--- a/usr.bin/ncplogin/ncplogin.1
+++ b/usr.bin/ncplogin/ncplogin.1
@@ -74,7 +74,8 @@ The options are:
 .Bl -tag -width indent
 .It Fl S Ar server
 Specify the name of the
-.Tn NetWare server to connect to.
+.Tn NetWare
+server to connect to.
 This affect only
 .Tn IPX
 servers.
diff --git a/usr.bin/ncplogin/ncplogout.1 b/usr.bin/ncplogin/ncplogout.1
index 62d2312..590a305 100644
--- a/usr.bin/ncplogin/ncplogout.1
+++ b/usr.bin/ncplogin/ncplogout.1
@@ -51,6 +51,6 @@ utility first appeared in
 .Fx 4.0 .
 .Sh AUTHORS
 .An Boris Popov Aq bp@butya.kz ,
-.Aq bp@freebsd.org
+.Aq bp@FreeBSD.org
 .Sh BUGS
 Please report any bugs to the author.
diff --git a/usr.bin/netstat/netstat.1 b/usr.bin/netstat/netstat.1
index 8790172..2f4a02d 100644
--- a/usr.bin/netstat/netstat.1
+++ b/usr.bin/netstat/netstat.1
@@ -173,7 +173,7 @@ option is present, show per-interface statistics on the
 for the specfied
 .Ar address_family
 or
-.Ar protocol,
+.Ar protocol ,
 respectively.
 .It Fl i
 Show the state of interfaces which have been auto-configured
@@ -195,7 +195,7 @@ option is present, show per-interface statistics on all interfaces
 for the specfied
 .Ar address_family
 or
-.Ar protocol,
+.Ar protocol ,
 respectively.
 .It Fl L
 Show the size of the various listen queues.
diff --git a/usr.bin/nm/nm.1 b/usr.bin/nm/nm.1
index aa675f8..3179ad2 100644
--- a/usr.bin/nm/nm.1
+++ b/usr.bin/nm/nm.1
@@ -44,7 +44,7 @@
 .Op Ar
 .Sh DESCRIPTION
 The symbol table (name list) of each object in
-.Ar file(s)
+.Ar file Ns (s)
 is displayed.
 If a library (archive) is given,
 .Nm 
diff --git a/usr.bin/nm/nm.1aout b/usr.bin/nm/nm.1aout
index aa675f8..3179ad2 100644
--- a/usr.bin/nm/nm.1aout
+++ b/usr.bin/nm/nm.1aout
@@ -44,7 +44,7 @@
 .Op Ar
 .Sh DESCRIPTION
 The symbol table (name list) of each object in
-.Ar file(s)
+.Ar file Ns (s)
 is displayed.
 If a library (archive) is given,
 .Nm 
diff --git a/usr.bin/pr/pr.1 b/usr.bin/pr/pr.1
index f2fe693..a9902b4 100644
--- a/usr.bin/pr/pr.1
+++ b/usr.bin/pr/pr.1
@@ -163,7 +163,10 @@ An extra
 character is output following every
 .Em <newline>
 found in the input.
-.It Fl e Ar \&[char\&]\&[gap\&]
+.It Fl e Xo
+.Op Ar char Ns
+.Op Ar gap
+.Xc
 Expand each input
 .Em <tab>
 to the next greater column
@@ -197,7 +200,10 @@ Use the string
 to replace the
 .Ar file name
 in the header line.
-.It Fl i Ar \&[char\&]\&[gap\&]
+.It Fl i Xo
+.Op Ar char Ns
+.Op Ar gap
+.Xc
 In output, replace multiple
 .Em <space>s
 with
@@ -250,7 +256,10 @@ The options
 and
 .Fl i
 are assumed.
-.It Fl n Ar \&[char\&]\&[width\&]
+.It Fl n Xo
+.Op Ar char Ns
+.Op Ar width
+.Xc
 Provide
 .Ar width
 digit line numbering.
diff --git a/usr.bin/rdist/rdist.1 b/usr.bin/rdist/rdist.1
index ec65203..59498c2 100644
--- a/usr.bin/rdist/rdist.1
+++ b/usr.bin/rdist/rdist.1
@@ -51,7 +51,9 @@
 .Op Fl P Ar rshcmd
 .Fl c
 .Ar name ...\&
-.Oo login@ Oc Ns Ar host Ns Op :dest
+.Oo Ar login Ns @ Oc Ns Xo
+.Ar host Ns Op : Ns Ar dest
+.Xc
 .Sh DESCRIPTION
 .Nm Rdist
 is a program to maintain identical copies of files over multiple hosts.
@@ -110,7 +112,7 @@ The equivalent distfile is as follows.
 .Bd -filled -offset indent -compact
 .Pq Ar name ...\&
 .Li ->
-.Op Ar login@
+.Op Ar login Ns @
 .Ar host
 .Bd -filled -offset indent -compact
 .Li install
diff --git a/usr.bin/rlogin/rlogin.1 b/usr.bin/rlogin/rlogin.1
index b6c330d..e8a705d 100644
--- a/usr.bin/rlogin/rlogin.1
+++ b/usr.bin/rlogin/rlogin.1
@@ -220,10 +220,8 @@ Determines the user's terminal type.
 .It Pa /etc/hosts
 .It Pa /etc/hosts.equiv
 .It Pa /etc/auth.conf
-.Sm off
-.It Pa Ev $HOME /.rhosts
-.It Pa Ev $HOME /.klogin
-.Sm on
+.It Ev $HOME Ns Pa /.rhosts
+.It Ev $HOME Ns Pa /.klogin
 .El
 .Sh HISTORY
 The
diff --git a/usr.bin/systat/systat.1 b/usr.bin/systat/systat.1
index e812e1a..146bfa9 100644
--- a/usr.bin/systat/systat.1
+++ b/usr.bin/systat/systat.1
@@ -464,14 +464,20 @@ Display only the specified drives.  Multiple drives may be specified,
 separated by spaces.
 .It Cm drives
 Display a list of available devices.
-.It Cm match Ar type,if,pass Op Ar | ...
+.It Cm match Xo
+.Ar type , Ns Ar if , Ns Ar pass
+.Op | Ar ...
+.Xc
 Display devivces matching the given pattern.  The basic matching
 expressions are the same as those used in
 .Xr iostat 8
 with one difference.  Instead of specifying multiple
 .Fl t
 arguments which are then ORed together, the user instead specifys multiple
-matching expressions joined by the pipe ( | ) character.  The comma
+matching expressions joined by the pipe
+.Pq Ql \&|
+character.
+The comma
 separated arguments within each matching expression are ANDed together, and
 then the pipe separated matching expressions are ORed together.  Any
 device matching the combined expression will be displayed, if there is room
diff --git a/usr.bin/tconv/tconv.1 b/usr.bin/tconv/tconv.1
index c2b7830..559ae71 100644
--- a/usr.bin/tconv/tconv.1
+++ b/usr.bin/tconv/tconv.1
@@ -75,7 +75,7 @@ with the
 option in the
 .Ev TERMINFO
 environment variable, and in
-.Pa /usr/lib/terminfo Ns ),
+.Pa /usr/lib/terminfo ) ,
 otherwise
 .Nm
 will look in all available databases.
diff --git a/usr.bin/telnet/telnet.1 b/usr.bin/telnet/telnet.1
index b6e6b79..56bf056 100644
--- a/usr.bin/telnet/telnet.1
+++ b/usr.bin/telnet/telnet.1
@@ -108,7 +108,7 @@ as an IP address.
 .It Fl S Ar tos
 Sets the IP type-of-service (TOS) option for the telnet
 connection to the value
-.Ar tos,
+.Ar tos ,
 which can be a numeric TOS value
 or, on systems that support it, a symbolic
 TOS name found in the
@@ -334,12 +334,12 @@ command are:
 .It Ic disable Ar type
 Disables the specified type of authentication.  To
 obtain a list of available types, use the
-.Ic auth disable \&?
+.Ic auth disable ?\&
 command.
 .It Ic enable Ar type
 Enables the specified type of authentication.  To
 obtain a list of available types, use the
-.Ic auth enable \&?
+.Ic auth enable ?\&
 command.
 .It Ic status
 Lists the current status of the various types of
@@ -368,18 +368,22 @@ Valid arguments for the
 .Ic encrypt
 command are:
 .Bl -tag -width Ar
-.It Ic disable Ar type Ic [input|output]
+.It Ic disable Ar type Xo
+.Op Cm input | output
+.Xc
 Disables the specified type of encryption.  If you
 omit the input and output, both input and output
 are disabled.  To obtain a list of available
 types, use the
-.Ic encrypt disable \&?
+.Ic encrypt disable ?\&
 command.
-.It Ic enable Ar type Ic [input|output]
+.It Ic enable Ar type Xo
+.Op Cm input | output
+.Xc
 Enables the specified type of encryption.  If you
 omit input and output, both input and output are
 enabled.  To obtain a list of available types, use the
-.Ic encrypt enable \&?
+.Ic encrypt enable ?\&
 command.
 .It Ic input
 This is the same as the
@@ -397,18 +401,18 @@ command.
 This is the same as the
 .Ic encrypt stop output
 command.
-.It Ic start Ic [input|output]
+.It Ic start Op Cm input | output
 Attempts to start encryption.  If you omit
 .Ic input
 and
-.Ic output,
+.Ic output ,
 both input and output are enabled.  To
 obtain a list of available types, use the
-.Ic encrypt enable \&?
+.Ic encrypt enable ?\&
 command.
 .It Ic status
 Lists the current status of encryption.
-.It Ic stop Ic [input|output]
+.It Ic stop Op Cm input | output
 Stops encryption.  If you omit input and output,
 encryption is on both input and output.
 .It Ic type Ar type
@@ -419,7 +423,7 @@ or
 .Ic encrypt stop
 commands.
 .El
-.It Ic environ Ar arguments... 
+.It Ic environ Ar arguments ...
 The
 .Ic environ
 command is used to manipulate the
@@ -448,7 +452,7 @@ command are:
 Define the variable
 .Ar variable
 to have a value of
-.Ar value.
+.Ar value .
 Any variables defined by this command are automatically exported.
 The
 .Ar value
@@ -473,7 +477,7 @@ Those marked with a
 .Cm *
 will be sent automatically,
 other variables will only be sent if explicitly requested.
-.It Ic \&?
+.It Ic ?\&
 Prints out help information for the
 .Ic environ
 command.
@@ -553,7 +557,7 @@ option.
 This requires that the 
 .Dv LINEMODE
 option be enabled.
-.It Ic \&?
+.It Ic ?\&
 Prints out help information for the
 .Ic mode
 command.
@@ -561,8 +565,7 @@ command.
 .It Xo
 .Ic open Ar host
 .Op Fl l Ar user
-.Oo Op Fl
-.Ar port Oc
+.Op Oo Fl Oc Ns Ar port
 .Xc
 Open a connection to the named host.
 If no port number
@@ -722,10 +725,10 @@ command.
 can also be either
 .Ic help
 or
-.Ic \&?
+.Ic ?\&
 to print out help information, including
 a list of known symbolic names.
-.It Ic \&?
+.It Ic ?\&
 Prints out help information for the
 .Ic send
 command.
@@ -1029,7 +1032,7 @@ The initial value for the worderase character is taken to be
 the terminal's
 .Ic worderase
 character.
-.It Ic \&?
+.It Ic ?\&
 Displays the legal
 .Ic set
 .Pq Ic unset
@@ -1077,7 +1080,7 @@ The remote default characters are those of the remote system
 at the time when the 
 .Tn TELNET
 connection was established.
-.It Ic \&?
+.It Ic ?\&
 Prints out help information for the
 .Ic slc
 command.
@@ -1330,7 +1333,7 @@ skips the reading of the
 file in the users home
 directory when connections are opened.  The initial
 value for this toggle is
-.Dv FALSE.
+.Dv FALSE .
 .It Ic termdata
 Toggles the display of all terminal data (in hexadecimal format).
 The initial value for this toggle is
@@ -1343,10 +1346,10 @@ toggle is
 .Nm
 prints out a message each time encryption is enabled or
 disabled.  The initial value for this toggle is
-.Dv FALSE.
+.Dv FALSE .
 Note:  Because of export controls, data encryption
 is not supported outside of the United States and Canada.
-.It Ic \&?
+.It Ic ?\&
 Displays the legal
 .Ic toggle
 commands.
@@ -1362,7 +1365,7 @@ system.  If
 .Ar command
 is omitted, then an interactive
 subshell is invoked.
-.It Ic \&? Op Ar command 
+.It Ic ?\& Op Ar command 
 Get help.  With no arguments,
 .Nm
 prints a help summary.
diff --git a/usr.bin/tip/tip/modems.5 b/usr.bin/tip/tip/modems.5
index f8c1dd4..d77e38c 100644
--- a/usr.bin/tip/tip/modems.5
+++ b/usr.bin/tip/tip/modems.5
@@ -66,7 +66,7 @@ database.
 If the entry includes an "ACU" type capability (abbreviated at), 
 .Xr tip 1
 looks up the specified modem in 
-.Pa /etc/modems.
+.Pa /etc/modems .
 If a modem entry is found,
 the corresponding capabilities determine how 
 .Xr tip 1
@@ -115,7 +115,7 @@ issued to the modem.
 (bool)
 Use a fixed bit rate between the computer and the modem (DTE / DCE). The
 bit rate is specified in 
-.Pa /etc/remote.
+.Pa /etc/remote .
 .It Cm \&reset_command
 (str)
 AT command to reset the modem.
diff --git a/usr.bin/tip/tip/tip.1 b/usr.bin/tip/tip/tip.1
index 21191e1..355fab5 100644
--- a/usr.bin/tip/tip/tip.1
+++ b/usr.bin/tip/tip/tip.1
@@ -424,15 +424,15 @@ Global modem configuration data base.
 Global system descriptions.
 .It Pa /etc/phones
 Global phone number data base.
-.It ${REMOTE}
+.It Ev ${REMOTE}
 Private system descriptions.
-.It ${PHONES}
+.It Ev ${PHONES}
 Private phone numbers.
-.It ~/.tiprc
+.It Pa ~/.tiprc
 Initialization file.
 .It Pa tip.record
 Record file.
-.It /var/log/aculog
+.It Pa /var/log/aculog
 Line access log.
 .It Pa /var/spool/lock/LCK..*
 Lock file to avoid conflicts with
diff --git a/usr.bin/tr/tr.1 b/usr.bin/tr/tr.1
index ad55ca9..488ef73 100644
--- a/usr.bin/tr/tr.1
+++ b/usr.bin/tr/tr.1
@@ -256,7 +256,7 @@ the range is intended to map in another range, i.e. the command
 ``tr [a-z] [A-Z]'' will work as it will map the ``['' character in
 .Ar string1
 to the ``['' character in
-.Ar string2.
+.Ar string2 .
 However, if the shell script is deleting or squeezing characters as in
 the command ``tr -d [a-z]'', the characters ``['' and ``]'' will be 
 included in the deletion or compression list which would not have happened
diff --git a/usr.bin/vmstat/vmstat.8 b/usr.bin/vmstat/vmstat.8
index 920a227..83281c5 100644
--- a/usr.bin/vmstat/vmstat.8
+++ b/usr.bin/vmstat/vmstat.8
@@ -47,7 +47,12 @@
 .Op Fl N Ar system
 .Op Fl w Ar wait
 .Op Fl n Ar devs
-.Op Fl p Ar type,if,pass
+.Oo
+.Fl p
+.Sm off
+.Ar type , if , pass
+.Sm on
+.Oc
 .Op Ar disks
 .Sh DESCRIPTION
 .Nm Vmstat
diff --git a/usr.bin/window/window.1 b/usr.bin/window/window.1
index e48eed0..a61ad1c 100644
--- a/usr.bin/window/window.1
+++ b/usr.bin/window/window.1
@@ -197,7 +197,7 @@ where
 is any character.  In particular,
 .Ic ^^
 is
-.Li control\-^.
+.Li control\-^ .
 .Ar Escape
 is the escape key, or
 .Ic ^\&[ .
diff --git a/usr.bin/xlint/xlint/lint.1 b/usr.bin/xlint/xlint/lint.1
index e857d07..14c2fd1 100644
--- a/usr.bin/xlint/xlint/lint.1
+++ b/usr.bin/xlint/xlint/lint.1
@@ -184,7 +184,7 @@ Complain about unusual operations on
 and combinations of
 .Sy enum Ns -
 and
-.Sy integer Ns -Types.
+.Sy integer Ns -Types .
 .It Fl g
 Don't print warnings for some extensions of
 .Xr gcc 1
diff --git a/usr.bin/ypcat/ypcat.1 b/usr.bin/ypcat/ypcat.1
index 55fd45e..6c3e441 100644
--- a/usr.bin/ypcat/ypcat.1
+++ b/usr.bin/ypcat/ypcat.1
@@ -46,7 +46,7 @@
 prints out the values of all keys from the 
 .Tn YP
 database specified by
-.Ar mapname,
+.Ar mapname ,
 which may be a map name or a map nickname.
 .Pp
 The options are as follows:
diff --git a/usr.bin/ypmatch/ypmatch.1 b/usr.bin/ypmatch/ypmatch.1
index 4d069ad..bd59eef 100644
--- a/usr.bin/ypmatch/ypmatch.1
+++ b/usr.bin/ypmatch/ypmatch.1
@@ -47,7 +47,7 @@
 prints out the values of one or more keys from the 
 .Tn YP
 database specified by
-.Ar mapname,
+.Ar mapname ,
 which may be a map name or a map nickname.
 .Pp
 The options are as follows:
diff --git a/usr.sbin/mount_nwfs/mount_nwfs.8 b/usr.sbin/mount_nwfs/mount_nwfs.8
index 196dfe1..affbe4a 100644
--- a/usr.sbin/mount_nwfs/mount_nwfs.8
+++ b/usr.sbin/mount_nwfs/mount_nwfs.8
@@ -71,7 +71,7 @@ For native IP you will need also
 option.
 .It Fl U Ar user
 Name of user used in login sequence.
-.It Fl "[connection options]"
+.It Fl connection\ options
 See
 .Xr ncplogin 1
 for details.
@@ -100,7 +100,7 @@ Same as 'l' but file system tries to be case insensitive.
 May not work well.
 .It n
 No case conversion is performed. 
-.Em Warning!
+.Em Warning !
 Use this option with DOS name space only as a last resort,
 because creating a lower case name in the DOS name space
 can lead to unpredictable results.
@@ -159,7 +159,8 @@ See
 for details.
 If this option is omitted, connection permissions
 assumed the same as directory mode
-.Pf ( Fl d Ns ) option.
+.Pq Fl d
+option.
 .El
 .Sh FILES
 .Bl -tag -width /var/log/wtmp -compact
diff --git a/usr.sbin/mountd/exports.5 b/usr.sbin/mountd/exports.5
index 8c42a6f..8b16942 100644
--- a/usr.sbin/mountd/exports.5
+++ b/usr.sbin/mountd/exports.5
@@ -191,7 +191,7 @@ A
 .Sm on
 option can be used to specify a file whose handle will be returned if
 a directory is looked up using the public filehandle (
-.Tn WebNFS Ns ).
+.Tn WebNFS ) .
 This is to mimic the behavior of URLs.
 If no
 .Fl index