Prepare for mdoc(7)NG.

142 files changed, 676 insertions, 655 deletions

diff --git a/lib/libc/compat-43/sigvec.2 b/lib/libc/compat-43/sigvec.2
index 1ec52ae..d73fa3f 100644
--- a/lib/libc/compat-43/sigvec.2
+++ b/lib/libc/compat-43/sigvec.2
@@ -138,13 +138,13 @@ The following is a list of all signals
 with names as in the include file
 .Aq Pa signal.h :
 .Bl -column SIGVTALARMXX "create core imagexxx"
-.It Sy "  NAME  " "	  Default Action  " "	              Description"
+.It Sy "NAME	Default Action	Description"
 .It Dv SIGHUP No "	terminate process" "	terminal line hangup"
 .It Dv SIGINT No "	terminate process" "	interrupt program"
 .It Dv SIGQUIT No "	create core image" "	quit program"
 .It Dv SIGILL No "	create core image" "	illegal instruction"
 .It Dv SIGTRAP No "	create core image" "	trace trap"
-.It Dv SIGABRT No "	create core image" Xr 	abort 3
+.It Dv SIGABRT No "	create core image" Ta Xr abort 3
 call (formerly
 .Dv SIGIOT )
 .It Dv SIGEMT No "	create core image" "	emulate instruction executed"
diff --git a/lib/libc/gen/confstr.3 b/lib/libc/gen/confstr.3
index 02f2746..8071f8e 100644
--- a/lib/libc/gen/confstr.3
+++ b/lib/libc/gen/confstr.3
@@ -79,7 +79,7 @@ The copied value is always null terminated.
 .Pp
 The available values are as follows:
 .Pp
-.Bl -tag -width "123456"
+.Bl -tag -width 6n
 .Pp
 .It Li _CS_PATH
 Return a value for the
@@ -119,6 +119,7 @@ In addition, the following errors may be reported:
 The value of the
 .Fa name
 argument is invalid.
+.El
 .Sh SEE ALSO
 .Xr sysctl 3
 .Sh HISTORY
diff --git a/lib/libc/gen/dlopen.3 b/lib/libc/gen/dlopen.3
index 242d5f4..634f160 100644
--- a/lib/libc/gen/dlopen.3
+++ b/lib/libc/gen/dlopen.3
@@ -283,4 +283,3 @@ retrieved via a call to
 .Xr ld 1 ,
 .Xr rtld 1 ,
 .Xr link 5
-
diff --git a/lib/libc/gen/fts.3 b/lib/libc/gen/fts.3
index 5e259ae..ccab5b6 100644
--- a/lib/libc/gen/fts.3
+++ b/lib/libc/gen/fts.3
@@ -164,9 +164,9 @@ This is an error return, and the
 field will be set to indicate what caused the error.
 .It Dv FTS_DOT
 A file named
-.Ql \&.
+.Ql .\&
 or
-.Ql ..
+.Ql ..\&
 which was not specified as a file name to
 .Fn fts_open
 (see
@@ -441,9 +441,9 @@ function.
 By default, unless they are specified as path arguments to
 .Fn fts_open ,
 any files named
-.Ql \&.
+.Ql .\&
 or
-.Ql ..
+.Ql ..\&
 encountered in the file hierarchy are ignored.
 This option causes the
 .Nm
diff --git a/lib/libc/gen/getcap.3 b/lib/libc/gen/getcap.3
index 304b801..974cf7f 100644
--- a/lib/libc/gen/getcap.3
+++ b/lib/libc/gen/getcap.3
@@ -430,6 +430,7 @@ does not exist
 .It Em name No \&=@ Ta "the string capability"
 .Em name
 does not exist
+.Sm on
 .El
 .Pp
 Numeric capability values may be given in one of three numeric bases.
@@ -526,7 +527,7 @@ No memory to allocate.
 Colons (`:') can't be used in names, types, or values.
 .Pp
 There are no checks for
-.Ic tc= name
+.Ic tc Ns = Ns Ic name
 loops in
 .Fn cgetent .
 .Pp
diff --git a/lib/libc/gen/getobjformat.3 b/lib/libc/gen/getobjformat.3
index 1d7c800..33240c8 100644
--- a/lib/libc/gen/getobjformat.3
+++ b/lib/libc/gen/getobjformat.3
@@ -112,11 +112,13 @@ If the environment variable
 is set, it overrides the default object file format.
 .Ev OBJFORMAT takes precedence over
 .Pa /etc/objformat .
+.El
 .Sh FILES
 .Bl -tag -width /etc/objformat -compact
 .It Pa /etc/objformat
 If present, specifies the object file format to use.  Syntax is
 .Ql OBJFORMAT=xxx .
+.El
 .Sh SEE ALSO
 .Xr objformat 1
 .Sh HISTORY
diff --git a/lib/libc/gen/getvfsbyname.3 b/lib/libc/gen/getvfsbyname.3
index df7511e..dd59d8a 100644
--- a/lib/libc/gen/getvfsbyname.3
+++ b/lib/libc/gen/getvfsbyname.3
@@ -83,6 +83,7 @@ pointer contains an invalid address.
 The
 .Fa name
 specifies a filesystem that is unknown or not configured in the kernel.
+.El
 .Sh SEE ALSO
 .Xr mount 2 ,
 .Xr sysctl 3 ,
diff --git a/lib/libc/gen/glob.3 b/lib/libc/gen/glob.3
index b2f2b80..4383994 100644
--- a/lib/libc/gen/glob.3
+++ b/lib/libc/gen/glob.3
@@ -86,7 +86,7 @@ and read permission on each directory of any filename component of
 .Fa pattern
 that contains any of the special characters
 .Ql * ,
-.Ql ?
+.Ql ?\&
 or
 .Ql [ .
 .Pp
diff --git a/lib/libc/gen/lockf.3 b/lib/libc/gen/lockf.3
index 1ca4612..a7c511d 100644
--- a/lib/libc/gen/lockf.3
+++ b/lib/libc/gen/lockf.3
@@ -247,6 +247,7 @@ or
 .Dv F_TLOCK ,
 and satisfying the lock or unlock request would result in the number
 of locked regions in the system exceeding a system-imposed limit.
+.El
 .Sh SEE ALSO
 .Xr fcntl 2 ,
 .Xr flock 2
diff --git a/lib/libc/gen/msgctl.3 b/lib/libc/gen/msgctl.3
index 7f948f2..20fb848 100644
--- a/lib/libc/gen/msgctl.3
+++ b/lib/libc/gen/msgctl.3
@@ -51,7 +51,7 @@ The
 system call performs some control operations on the message queue specified
 by
 .Fa msqid .
-
+.Pp
 Each message queue has a data structure associated with it, parts of which
 may be altered by
 .Fn msgctl
@@ -139,7 +139,6 @@ Values for
 that exceed the system limit (MSGMNB from
 .Aq Pa sys/msg.h )
 are silently truncated to that limit.
-
 .It Dv IPC_RMID
 Remove the message queue specified by
 .Fa msqid
@@ -151,7 +150,7 @@ or
 .Va msg_perm.uid
 values in the data structure associated with the queue can do this.
 .El
-
+.Pp
 The permission to read from or write to a message queue (see
 .Xr msgsnd 3
 and
@@ -188,7 +187,7 @@ the effective uid match either the
 or
 .Va msg_perm.cuid
 fields of the data structure associated with the message queue.
-
+.Pp
 An attempt is made to increase the value of
 .Va msg_qbytes
 through IPC_SET
@@ -199,7 +198,7 @@ and the caller has no read permission for this message queue.
 .It Bq Er EINVAL
 .Fa msqid
 is not a valid message queue identifier.
-
+.Pp
 .Va cmd
 is not a valid command.
 .It Bq Er EFAULT
diff --git a/lib/libc/gen/msgrcv.3 b/lib/libc/gen/msgrcv.3
index ce01a4c..bf8ccf8 100644
--- a/lib/libc/gen/msgrcv.3
+++ b/lib/libc/gen/msgrcv.3
@@ -147,6 +147,7 @@ is set to the current time.
 .It
 .Va msg_qnum
 is decremented by 1.
+.El
 .Sh RETURN VALUES
 Upon successful completion,
 .Fn msgrcv
@@ -191,6 +192,7 @@ and
 .Dv IPC_NOWAIT
 is set in
 .Fa msgflg .
+.El
 .Sh SEE ALSO
 .Xr msgctl 3 ,
 .Xr msgget 3 ,
diff --git a/lib/libc/gen/rand48.3 b/lib/libc/gen/rand48.3
index 0a9990b7..d42461b 100644
--- a/lib/libc/gen/rand48.3
+++ b/lib/libc/gen/rand48.3
@@ -1,4 +1,4 @@
-\" Copyright (c) 1993 Martin Birgmeier
+.\" Copyright (c) 1993 Martin Birgmeier
 .\" All rights reserved.
 .\"
 .\" You may redistribute unmodified or modified versions of this source
diff --git a/lib/libc/gen/signal.3 b/lib/libc/gen/signal.3
index f453ed8..4e10250 100644
--- a/lib/libc/gen/signal.3
+++ b/lib/libc/gen/signal.3
@@ -91,7 +91,7 @@ an interrupt.
 These signals are defined in the file
 .Aq Pa signal.h :
 .Bl -column SIGVTALARMXX "create core imagexxx"
-.It Sy Name	Default Action	Description
+.It Sy "Name	Default Action	Description"
 .It Dv SIGHUP Ta "terminate process" Ta "terminal line hangup"
 .It Dv SIGINT Ta "terminate process" Ta "interrupt program"
 .It Dv SIGQUIT Ta "create core image" Ta "quit program"
@@ -218,6 +218,7 @@ An attempt is made to ignore or supply a handler for
 .Dv SIGKILL
 or
 .Ev SIGSTOP .
+.El
 .Sh SEE ALSO
 .Xr kill 1 ,
 .Xr kill 2 ,
diff --git a/lib/libc/gen/sysconf.3 b/lib/libc/gen/sysconf.3
index dd4e427..4bc1fd9 100644
--- a/lib/libc/gen/sysconf.3
+++ b/lib/libc/gen/sysconf.3
@@ -63,7 +63,7 @@ Symbolic constants for each name value are found in the include file
 .Pp
 The available values are as follows:
 .Pp
-.Bl -tag -width "123456"
+.Bl -tag -width 6n
 .Pp
 .It Li _SC_ARG_MAX
 The maximum bytes of argument to
@@ -170,6 +170,7 @@ In addition, the following error may be reported:
 The value of the
 .Fa name
 argument is invalid.
+.El
 .Sh SEE ALSO
 .Xr sysctl 3
 .Sh BUGS
diff --git a/lib/libc/gen/sysctl.3 b/lib/libc/gen/sysctl.3
index 96eb9ec..b67d603 100644
--- a/lib/libc/gen/sysctl.3
+++ b/lib/libc/gen/sysctl.3
@@ -133,15 +133,15 @@ 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 CTL\_DEBUG	sys/sysctl.h	Debugging
-.It CTL\_VFS	sys/mount.h	Filesystem
-.It CTL\_HW	sys/sysctl.h	Generic CPU, I/O
-.It CTL\_KERN	sys/sysctl.h	High kernel limits
-.It CTL\_MACHDEP	sys/sysctl.h	Machine dependent
-.It CTL\_NET	sys/socket.h	Networking
-.It CTL\_USER	sys/sysctl.h	User-level
-.It CTL\_VM	vm/vm_param.h	Virtual memory
+.It Sy Pa "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"
+.It "CTL\_KERN	sys/sysctl.h	High kernel limits"
+.It "CTL\_MACHDEP	sys/sysctl.h	Machine dependent"
+.It "CTL\_NET	sys/socket.h	Networking"
+.It "CTL\_USER	sys/sysctl.h	User-level"
+.It "CTL\_VM	vm/vm_param.h	Virtual memory"
 .El
 .Pp
 For example, the following retrieves the maximum number of processes allowed
@@ -219,21 +219,21 @@ 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 HW\_MACHINE	string	no
-.It HW\_MODEL	string	no
-.It HW\_NCPU	integer	no
-.It HW\_BYTEORDER	integer	no
-.It HW\_PHYSMEM	integer	no
-.It HW\_USERMEM	integer	no
-.It HW\_PAGESIZE	integer	no
-.It HW\_FLOATINGPOINT	integer	no
-.It HW\_MACHINE\_ARCH	string	no
-.\".It HW\_DISKNAMES	integer	no
-.\".It HW\_DISKSTATS	integer	no
+.It Sy Pa "Second level name	Type	Changeable"
+.It "HW\_MACHINE	string	no"
+.It "HW\_MODEL	string	no"
+.It "HW\_NCPU	integer	no"
+.It "HW\_BYTEORDER	integer	no"
+.It "HW\_PHYSMEM	integer	no"
+.It "HW\_USERMEM	integer	no"
+.It "HW\_PAGESIZE	integer	no"
+.It "HW\_FLOATINGPOINT	integer	no"
+.It "HW\_MACHINE\_ARCH	string	no"
+.\".It "HW\_DISKNAMES	integer	no"
+.\".It "HW\_DISKSTATS	integer	no"
 .El
 .Pp
-.Bl -tag -width "123456"
+.Bl -tag -width 6n
 .It Li HW_MACHINE
 The machine class.
 .It Li HW_MODEL
@@ -265,38 +265,38 @@ 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 KERN\_ARGMAX	integer	no
-.It KERN\_BOOTFILE	string	yes
-.It KERN\_BOOTTIME	struct timeval	no
-.It KERN\_CLOCKRATE	struct clockinfo	no
-.It KERN\_FILE	struct file	no
-.It KERN\_HOSTID	integer	yes
-.It KERN\_HOSTNAME	string	yes
-.It KERN\_JOB\_CONTROL	integer	no
-.It KERN\_MAXFILES	integer	yes
-.It KERN\_MAXFILESPERPROC	integer	yes
-.It KERN\_MAXPROC	integer	no
-.It KERN\_MAXPROCPERUID	integer	yes
-.It KERN\_MAXVNODES	integer	yes
-.It KERN\_NGROUPS	integer	no
-.It KERN\_NISDOMAINNAME	string	yes
-.It KERN\_OSRELDATE	integer	no
-.It KERN\_OSRELEASE	string	no
-.It KERN\_OSREV	integer	no
-.It KERN\_OSTYPE	string	no
-.It KERN\_POSIX1	integer	no
-.It KERN\_PROC	struct proc	no
-.It KERN\_PROF	node	not applicable
-.It KERN\_QUANTUM	integer	yes
-.It KERN\_SAVED\_IDS	integer	no
-.It KERN\_SECURELVL	integer	raise only
-.It KERN\_UPDATEINTERVAL	integer	no
-.It KERN\_VERSION	string	no
-.It KERN\_VNODE	struct vnode	no
+.It Sy Pa "Second level name	Type	Changeable"
+.It "KERN\_ARGMAX	integer	no"
+.It "KERN\_BOOTFILE	string	yes"
+.It "KERN\_BOOTTIME	struct timeval	no"
+.It "KERN\_CLOCKRATE	struct clockinfo	no"
+.It "KERN\_FILE	struct file	no"
+.It "KERN\_HOSTID	integer	yes"
+.It "KERN\_HOSTNAME	string	yes"
+.It "KERN\_JOB\_CONTROL	integer	no"
+.It "KERN\_MAXFILES	integer	yes"
+.It "KERN\_MAXFILESPERPROC	integer	yes"
+.It "KERN\_MAXPROC	integer	no"
+.It "KERN\_MAXPROCPERUID	integer	yes"
+.It "KERN\_MAXVNODES	integer	yes"
+.It "KERN\_NGROUPS	integer	no"
+.It "KERN\_NISDOMAINNAME	string	yes"
+.It "KERN\_OSRELDATE	integer	no"
+.It "KERN\_OSRELEASE	string	no"
+.It "KERN\_OSREV	integer	no"
+.It "KERN\_OSTYPE	string	no"
+.It "KERN\_POSIX1	integer	no"
+.It "KERN\_PROC	struct proc	no"
+.It "KERN\_PROF	node	not applicable"
+.It "KERN\_QUANTUM	integer	yes"
+.It "KERN\_SAVED\_IDS	integer	no"
+.It "KERN\_SECURELVL	integer	raise only"
+.It "KERN\_UPDATEINTERVAL	integer	no"
+.It "KERN\_VERSION	string	no"
+.It "KERN\_VNODE	struct vnode	no"
 .El
 .Pp
-.Bl -tag -width "123456"
+.Bl -tag -width 6n
 .It Li KERN_ARGMAX
 The maximum bytes of argument to
 .Xr execve 2 .
@@ -371,13 +371,13 @@ 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 KERN\_PROC\_ALL	None
-.It KERN\_PROC\_PID	A process ID
-.It KERN\_PROC\_PGRP	A process group
-.It KERN\_PROC\_TTY	A tty device
-.It KERN\_PROC\_UID	A user ID
-.It KERN\_PROC\_RUID	A real user ID
+.It Pa "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"
+.It "KERN\_PROC\_TTY	A tty device"
+.It "KERN\_PROC\_UID	A user ID"
+.It "KERN\_PROC\_RUID	A real user ID"
 .El
 .Pp
 If the third level name is KERN_PROC_ARGS then the command line argument
@@ -386,8 +386,8 @@ 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 KERN\_PROC\_ARGS	A process ID
+.It Pa "Third level name	Fourth level is:"
+.It "KERN\_PROC\_ARGS	A process ID"
 .El
 .It Li KERN_PROF
 Return profiling information about the kernel.
@@ -400,16 +400,16 @@ 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 GPROF\_STATE	integer	yes
-.It GPROF\_COUNT	u_short[\|]	yes
-.It GPROF\_FROMS	u_short[\|]	yes
-.It GPROF\_TOS	struct tostruct	yes
-.It GPROF\_GMONPARAM	struct gmonparam	no
+.It Sy Pa "Third level name	Type	Changeable"
+.It "GPROF\_STATE	integer	yes"
+.It "GPROF\_COUNT	u_short[\|]	yes"
+.It "GPROF\_FROMS	u_short[\|]	yes"
+.It "GPROF\_TOS	struct tostruct	yes"
+.It "GPROF\_GMONPARAM	struct gmonparam	no"
 .El
 .Pp
 The variables are as follows:
-.Bl -tag -width "123456"
+.Bl -tag -width 6n
 .It Li GPROF_STATE
 Returns GMON_PROF_ON or GMON_PROF_OFF to show that profiling
 is running or stopped.
@@ -450,12 +450,12 @@ 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 Li CPU_CONSDEV	dev_t	no
-.It Li CPU_ADJKERNTZ	int	yes
-.It Li CPU_DISRTCSET	int	yes
-.It Li CPU_BOOTINFO	struct bootinfo	no
-.It Li CPU_WALLCLOCK	int	yes
+.It Sy Pa "Second level name	Type	Changeable"
+.It Li "CPU_CONSDEV	dev_t	no"
+.It Li "CPU_ADJKERNTZ	int	yes"
+.It Li "CPU_DISRTCSET	int	yes"
+.It Li "CPU_BOOTINFO	struct bootinfo	no"
+.It Li "CPU_WALLCLOCK	int	yes"
 .El
 .Ss CTL_NET
 The string and integer information available for the CTL_NET level
@@ -463,13 +463,13 @@ 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 PF\_ROUTE	routing messages	no
-.It PF\_INET	IPv4 values	yes
-.It PF\_INET6	IPv6 values	yes
+.It Sy Pa "Second level name	Type	Changeable"
+.It "PF\_ROUTE	routing messages	no"
+.It "PF\_INET	IPv4 values	yes"
+.It "PF\_INET6	IPv6 values	yes"
 .El
 .Pp
-.Bl -tag -width "123456"
+.Bl -tag -width 6n
 .It Li PF_ROUTE
 Return the entire routing table or a subset of it.
 The data is returned as a sequence of routing messages (see
@@ -482,10 +482,10 @@ 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 NET\_RT\_FLAGS	rtflags
-.It NET\_RT\_DUMP	None
-.It NET\_RT\_IFLIST	None
+.It Pa "Fifth level name	Sixth level is:"
+.It "NET\_RT\_FLAGS	rtflags"
+.It "NET\_RT\_DUMP	None"
+.It "NET\_RT\_IFLIST	None"
 .El
 .It Li PF_INET
 Get or set various global information about the IPv4
@@ -494,17 +494,17 @@ 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 icmp	bmcastecho	integer	yes
-.It icmp	maskrepl	integer	yes
-.It ip	forwarding	integer	yes
-.It ip	redirect	integer	yes
-.It ip	ttl	integer	yes
-.It udp	checksum	integer	yes
+.It Pa "Protocol	Variable	Type	Changeable"
+.It "icmp	bmcastecho	integer	yes"
+.It "icmp	maskrepl	integer	yes"
+.It "ip	forwarding	integer	yes"
+.It "ip	redirect	integer	yes"
+.It "ip	ttl	integer	yes"
+.It "udp	checksum	integer	yes"
 .El
 .Pp
 The variables are as follows:
-.Bl -tag -width "123456"
+.Bl -tag -width 6n
 .It Li icmp.bmcastecho
 Returns 1 if an ICMP echo request to a broadcast or multicast address is
 to be answered.
@@ -545,29 +545,29 @@ 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 USER\_BC\_BASE\_MAX	integer	no
-.It USER\_BC\_DIM\_MAX	integer	no
-.It USER\_BC\_SCALE\_MAX	integer	no
-.It USER\_BC\_STRING\_MAX	integer	no
-.It USER\_COLL\_WEIGHTS\_MAX	integer	no
-.It USER\_CS\_PATH	string	no
-.It USER\_EXPR\_NEST\_MAX	integer	no
-.It USER\_LINE\_MAX	integer	no
-.It USER\_POSIX2\_CHAR\_TERM	integer	no
-.It USER\_POSIX2\_C\_BIND	integer	no
-.It USER\_POSIX2\_C\_DEV	integer	no
-.It USER\_POSIX2\_FORT\_DEV	integer	no
-.It USER\_POSIX2\_FORT\_RUN	integer	no
-.It USER\_POSIX2\_LOCALEDEF	integer	no
-.It USER\_POSIX2\_SW\_DEV	integer	no
-.It USER\_POSIX2\_UPE	integer	no
-.It USER\_POSIX2\_VERSION	integer	no
-.It USER\_RE\_DUP\_MAX	integer	no
-.It USER\_STREAM\_MAX	integer	no
-.It USER\_TZNAME\_MAX	integer	no
+.It Sy Pa "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"
+.It "USER\_BC\_STRING\_MAX	integer	no"
+.It "USER\_COLL\_WEIGHTS\_MAX	integer	no"
+.It "USER\_CS\_PATH	string	no"
+.It "USER\_EXPR\_NEST\_MAX	integer	no"
+.It "USER\_LINE\_MAX	integer	no"
+.It "USER\_POSIX2\_CHAR\_TERM	integer	no"
+.It "USER\_POSIX2\_C\_BIND	integer	no"
+.It "USER\_POSIX2\_C\_DEV	integer	no"
+.It "USER\_POSIX2\_FORT\_DEV	integer	no"
+.It "USER\_POSIX2\_FORT\_RUN	integer	no"
+.It "USER\_POSIX2\_LOCALEDEF	integer	no"
+.It "USER\_POSIX2\_SW\_DEV	integer	no"
+.It "USER\_POSIX2\_UPE	integer	no"
+.It "USER\_POSIX2\_VERSION	integer	no"
+.It "USER\_RE\_DUP\_MAX	integer	no"
+.It "USER\_STREAM\_MAX	integer	no"
+.It "USER\_TZNAME\_MAX	integer	no"
 .El
-.Bl -tag -width "123456"
+.Bl -tag -width 6n
 .Pp
 .It Li USER_BC_BASE_MAX
 The maximum ibase/obase values in the
@@ -641,21 +641,21 @@ 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 VM\_LOADAVG	struct loadavg	no
-.It VM\_METER	struct vmtotal	no
-.It VM\_PAGEOUT\_ALGORITHM	integer	yes
-.It VM\_SWAPPING\_ENABLED	integer	maybe
-.It VM\_V\_CACHE\_MAX	integer	yes
-.It VM\_V\_CACHE\_MIN	integer	yes
-.It VM\_V\_FREE\_MIN	integer	yes
-.It VM\_V\_FREE\_RESERVED	integer	yes
-.It VM\_V\_FREE\_TARGET	integer	yes
-.It VM\_V\_INACTIVE\_TARGET	integer	yes
-.It VM\_V\_PAGEOUT\_FREE\_MIN	integer	yes
+.It Sy Pa "Second level name	Type	Changeable"
+.It "VM\_LOADAVG	struct loadavg	no"
+.It "VM\_METER	struct vmtotal	no"
+.It "VM\_PAGEOUT\_ALGORITHM	integer	yes"
+.It "VM\_SWAPPING\_ENABLED	integer	maybe"
+.It "VM\_V\_CACHE\_MAX	integer	yes"
+.It "VM\_V\_CACHE\_MIN	integer	yes"
+.It "VM\_V\_FREE\_MIN	integer	yes"
+.It "VM\_V\_FREE\_RESERVED	integer	yes"
+.It "VM\_V\_FREE\_TARGET	integer	yes"
+.It "VM\_V\_INACTIVE\_TARGET	integer	yes"
+.It "VM\_V\_PAGEOUT\_FREE\_MIN	integer	yes"
 .El
 .Pp
-.Bl -tag -width "123456"
+.Bl -tag -width 6n
 .It Li VM_LOADAVG
 Return the load average history.
 The returned data consists of a
diff --git a/lib/libc/gen/time.3 b/lib/libc/gen/time.3
index 53c76df..4a27f6f 100644
--- a/lib/libc/gen/time.3
+++ b/lib/libc/gen/time.3
@@ -78,6 +78,7 @@ The following error codes may be set in
 .Bl -tag -width Er
 .It Bq Er EFAULT
 An argument address referenced invalid memory.
+.El
 .Sh SEE ALSO
 .Xr gettimeofday 2 ,
 .Xr ctime 3
diff --git a/lib/libc/gen/tzset.3 b/lib/libc/gen/tzset.3
index d76e435..d763e07 100644
--- a/lib/libc/gen/tzset.3
+++ b/lib/libc/gen/tzset.3
@@ -79,7 +79,7 @@ is used (without leap second correction).
 If
 .Ev TZ
 appears in the environment and its value begins with a colon
-.Pq Ql \: ,
+.Pq Ql \&: ,
 the rest of its value is used as a pathname of a
 .Xr tzfile 5 Ns -format
 file from which to read the time conversion information.
@@ -140,7 +140,7 @@ is required; if
 is missing, then summer time does not apply in this locale.
 Upper and lowercase letters are explicitly allowed.  Any characters
 except a leading colon
-.Pq Ql \: ,
+.Pq Ql \&: ,
 digits, comma
 .Pq Ql \&, ,
 minus
@@ -287,7 +287,7 @@ values in
 .El
 .Pp
 For compatibility with System V Release 3.1, a semicolon
-.Pq Ql \;
+.Pq Ql \&;
 may be used to separate the
 .Em rule
 from the rest of the specification.
@@ -301,7 +301,8 @@ time zone directory
 rules for
 .Tn POSIX Ns -style
 .Tn TZ Ns 's
-.It Pa /usr/share/zoneinfo/GMT	for
+.It Pa /usr/share/zoneinfo/GMT
+for
 .Tn UTC
 leap seconds
 .El
diff --git a/lib/libc/gen/unvis.3 b/lib/libc/gen/unvis.3
index 74de5f8..1930209 100644
--- a/lib/libc/gen/unvis.3
+++ b/lib/libc/gen/unvis.3
@@ -173,7 +173,7 @@ again:
 		(void) putchar(out);
 		goto again;
 	case UNVIS_SYNBAD:
-		(void)fprintf(stderr, "bad sequence!\n");
+		(void)fprintf(stderr, "bad sequence!\en");
 	exit(1);
 	}
 }
diff --git a/lib/libc/gen/usleep.3 b/lib/libc/gen/usleep.3
index 6ec0b45..b47ea01 100644
--- a/lib/libc/gen/usleep.3
+++ b/lib/libc/gen/usleep.3
@@ -73,6 +73,7 @@ will fail if:
 .It Bq Er EINTR
 A signal was delivered to the process and its
 action was to invoke a signal-catching function.
+.El
 .Sh SEE ALSO
 .Xr nanosleep 2 ,
 .Xr sleep 3
diff --git a/lib/libc/gen/vis.3 b/lib/libc/gen/vis.3
index 8815d87..118941b 100644
--- a/lib/libc/gen/vis.3
+++ b/lib/libc/gen/vis.3
@@ -275,4 +275,3 @@ ambiguous and non-invertible.
 .Sh HISTORY
 These functions first appeared in
 .Bx 4.4 .
-
diff --git a/lib/libc/gmon/moncontrol.3 b/lib/libc/gmon/moncontrol.3
index 0359752..f0c9254 100644
--- a/lib/libc/gmon/moncontrol.3
+++ b/lib/libc/gmon/moncontrol.3
@@ -98,8 +98,9 @@ have their execution time measured.
 Profiling begins on return from
 .Fn monstartup .
 .Sh FILES
-.Bl -tag -width Pa -compact
-.It Pa progname.gmon	execution data file
+.Bl -tag -width progname.gmon -compact
+.It Pa progname.gmon
+execution data file
 .El
 .Sh SEE ALSO
 .Xr cc 1 ,
diff --git a/lib/libc/i386/sys/i386_vm86.2 b/lib/libc/i386/sys/i386_vm86.2
index 864ef3b..fd9c89e 100644
--- a/lib/libc/i386/sys/i386_vm86.2
+++ b/lib/libc/i386/sys/i386_vm86.2
@@ -93,6 +93,7 @@ will fail if:
 The kernel does not have vm86 support, or an invalid function was specified.
 .It Bq Er ENOMEM
 There is not enough memory to initialize the kernel data structures.
+.El
 .Sh AUTHORS
 This man page was written by
 .An Jonathan Lemon .
diff --git a/lib/libc/locale/isalnum.3 b/lib/libc/locale/isalnum.3
index 08a7e1b..dcf519e 100644
--- a/lib/libc/locale/isalnum.3
+++ b/lib/libc/locale/isalnum.3
@@ -69,19 +69,19 @@ In the ASCII character set, this includes the following characters
 (with their numeric values shown in octal):
 .Pp
 .Bl -column \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__
-.It \&060\ ``0'' \t061\ ``1'' \t062\ ``2'' \t063\ ``3'' \t064\ ``4''
-.It \&065\ ``5'' \t066\ ``6'' \t067\ ``7'' \t070\ ``8'' \t071\ ``9''
-.It \&101\ ``A'' \t102\ ``B'' \t103\ ``C'' \t104\ ``D'' \t105\ ``E''
-.It \&106\ ``F'' \t107\ ``G'' \t110\ ``H'' \t111\ ``I'' \t112\ ``J''
-.It \&113\ ``K'' \t114\ ``L'' \t115\ ``M'' \t116\ ``N'' \t117\ ``O''
-.It \&120\ ``P'' \t121\ ``Q'' \t122\ ``R'' \t123\ ``S'' \t124\ ``T''
-.It \&125\ ``U'' \t126\ ``V'' \t127\ ``W'' \t130\ ``X'' \t131\ ``Y''
-.It \&132\ ``Z'' \t141\ ``a'' \t142\ ``b'' \t143\ ``c'' \t144\ ``d''
-.It \&145\ ``e'' \t146\ ``f'' \t147\ ``g'' \t150\ ``h'' \t151\ ``i''
-.It \&152\ ``j'' \t153\ ``k'' \t154\ ``l'' \t155\ ``m'' \t156\ ``n''
-.It \&157\ ``o'' \t160\ ``p'' \t161\ ``q'' \t162\ ``r'' \t163\ ``s''
-.It \&164\ ``t'' \t165\ ``u'' \t166\ ``v'' \t167\ ``w'' \t170\ ``x''
-.It \&171\ ``y'' \t172\ ``z''
+.It "\&060\ ``0'' \t061\ ``1'' \t062\ ``2'' \t063\ ``3'' \t064\ ``4''"
+.It "\&065\ ``5'' \t066\ ``6'' \t067\ ``7'' \t070\ ``8'' \t071\ ``9''"
+.It "\&101\ ``A'' \t102\ ``B'' \t103\ ``C'' \t104\ ``D'' \t105\ ``E''"
+.It "\&106\ ``F'' \t107\ ``G'' \t110\ ``H'' \t111\ ``I'' \t112\ ``J''"
+.It "\&113\ ``K'' \t114\ ``L'' \t115\ ``M'' \t116\ ``N'' \t117\ ``O''"
+.It "\&120\ ``P'' \t121\ ``Q'' \t122\ ``R'' \t123\ ``S'' \t124\ ``T''"
+.It "\&125\ ``U'' \t126\ ``V'' \t127\ ``W'' \t130\ ``X'' \t131\ ``Y''"
+.It "\&132\ ``Z'' \t141\ ``a'' \t142\ ``b'' \t143\ ``c'' \t144\ ``d''"
+.It "\&145\ ``e'' \t146\ ``f'' \t147\ ``g'' \t150\ ``h'' \t151\ ``i''"
+.It "\&152\ ``j'' \t153\ ``k'' \t154\ ``l'' \t155\ ``m'' \t156\ ``n''"
+.It "\&157\ ``o'' \t160\ ``p'' \t161\ ``q'' \t162\ ``r'' \t163\ ``s''"
+.It "\&164\ ``t'' \t165\ ``u'' \t166\ ``v'' \t167\ ``w'' \t170\ ``x''"
+.It "\&171\ ``y'' \t172\ ``z''"
 .El
 .Sh RETURN VALUES
 The
diff --git a/lib/libc/locale/isalpha.3 b/lib/libc/locale/isalpha.3
index 0d0cd2d..3007d64 100644
--- a/lib/libc/locale/isalpha.3
+++ b/lib/libc/locale/isalpha.3
@@ -69,17 +69,17 @@ In the ASCII character set, this includes the following characters
 (with their numeric values shown in octal):
 .Pp
 .Bl -column \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__
-.It \&101\ ``A'' \t102\ ``B'' \t103\ ``C'' \t104\ ``D'' \t105\ ``E''
-.It \&106\ ``F'' \t107\ ``G'' \t110\ ``H'' \t111\ ``I'' \t112\ ``J''
-.It \&113\ ``K'' \t114\ ``L'' \t115\ ``M'' \t116\ ``N'' \t117\ ``O''
-.It \&120\ ``P'' \t121\ ``Q'' \t122\ ``R'' \t123\ ``S'' \t124\ ``T''
-.It \&125\ ``U'' \t126\ ``V'' \t127\ ``W'' \t130\ ``X'' \t131\ ``Y''
-.It \&132\ ``Z'' \t141\ ``a'' \t142\ ``b'' \t143\ ``c'' \t144\ ``d''
-.It \&145\ ``e'' \t146\ ``f'' \t147\ ``g'' \t150\ ``h'' \t151\ ``i''
-.It \&152\ ``j'' \t153\ ``k'' \t154\ ``l'' \t155\ ``m'' \t156\ ``n''
-.It \&157\ ``o'' \t160\ ``p'' \t161\ ``q'' \t162\ ``r'' \t163\ ``s''
-.It \&164\ ``t'' \t165\ ``u'' \t166\ ``v'' \t167\ ``w'' \t170\ ``x''
-.It \&171\ ``y'' \t172\ ``z''
+.It "\&101\ ``A'' \t102\ ``B'' \t103\ ``C'' \t104\ ``D'' \t105\ ``E''"
+.It "\&106\ ``F'' \t107\ ``G'' \t110\ ``H'' \t111\ ``I'' \t112\ ``J''"
+.It "\&113\ ``K'' \t114\ ``L'' \t115\ ``M'' \t116\ ``N'' \t117\ ``O''"
+.It "\&120\ ``P'' \t121\ ``Q'' \t122\ ``R'' \t123\ ``S'' \t124\ ``T''"
+.It "\&125\ ``U'' \t126\ ``V'' \t127\ ``W'' \t130\ ``X'' \t131\ ``Y''"
+.It "\&132\ ``Z'' \t141\ ``a'' \t142\ ``b'' \t143\ ``c'' \t144\ ``d''"
+.It "\&145\ ``e'' \t146\ ``f'' \t147\ ``g'' \t150\ ``h'' \t151\ ``i''"
+.It "\&152\ ``j'' \t153\ ``k'' \t154\ ``l'' \t155\ ``m'' \t156\ ``n''"
+.It "\&157\ ``o'' \t160\ ``p'' \t161\ ``q'' \t162\ ``r'' \t163\ ``s''"
+.It "\&164\ ``t'' \t165\ ``u'' \t166\ ``v'' \t167\ ``w'' \t170\ ``x''"
+.It "\&171\ ``y'' \t172\ ``z''"
 .El
 .Sh RETURN VALUES
 The
diff --git a/lib/libc/locale/iscntrl.3 b/lib/libc/locale/iscntrl.3
index cd7d17e..cf2d157 100644
--- a/lib/libc/locale/iscntrl.3
+++ b/lib/libc/locale/iscntrl.3
@@ -65,13 +65,13 @@ In the ASCII character set, this includes the following characters
 (with their numeric values shown in octal):
 .Pp
 .Bl -column \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__
-.It \&000\ nul \t001\ soh \t002\ stx \t003\ etx \t004\ eot
-.It \&005\ enq \t006\ ack \t007\ bel \t010\ bs \t011\ ht
-.It \&012\ nl \t013\ vt \t014\ np \t015\ cr \t016\ so
-.It \&017\ si \t020\ dle \t021\ dc1 \t022\ dc2 \t023\ dc3
-.It \&024\ dc4 \t025\ nak \t026\ syn \t027\ etb \t030\ can
-.It \&031\ em \t032\ sub \t033\ esc \t034\ fs \t035\ gs
-.It \&036\ rs \t037\ us \t177\ del
+.It "\&000\ nul \t001\ soh \t002\ stx \t003\ etx \t004\ eot"
+.It "\&005\ enq \t006\ ack \t007\ bel \t010\ bs \t011\ ht"
+.It "\&012\ nl \t013\ vt \t014\ np \t015\ cr \t016\ so"
+.It "\&017\ si \t020\ dle \t021\ dc1 \t022\ dc2 \t023\ dc3"
+.It "\&024\ dc4 \t025\ nak \t026\ syn \t027\ etb \t030\ can"
+.It "\&031\ em \t032\ sub \t033\ esc \t034\ fs \t035\ gs"
+.It "\&036\ rs \t037\ us \t177\ del"
 .El
 .Sh RETURN VALUES
 The
diff --git a/lib/libc/locale/isdigit.3 b/lib/libc/locale/isdigit.3
index 03cb69b..7cb8952 100644
--- a/lib/libc/locale/isdigit.3
+++ b/lib/libc/locale/isdigit.3
@@ -65,8 +65,8 @@ In the ASCII character set, this includes the following characters
 (with their numeric values shown in octal):
 .Pp
 .Bl -column \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__
-.It \&060\ ``0'' \t061\ ``1'' \t062\ ``2'' \t063\ ``3'' \t064\ ``4''
-.It \&065\ ``5'' \t066\ ``6'' \t067\ ``7'' \t070\ ``8'' \t071\ ``9''
+.It "\&060\ ``0'' \t061\ ``1'' \t062\ ``2'' \t063\ ``3'' \t064\ ``4''"
+.It "\&065\ ``5'' \t066\ ``6'' \t067\ ``7'' \t070\ ``8'' \t071\ ``9''"
 .El
 .Sh RETURN VALUES
 The
diff --git a/lib/libc/locale/isgraph.3 b/lib/libc/locale/isgraph.3
index b557a0f..0e5d341 100644
--- a/lib/libc/locale/isgraph.3
+++ b/lib/libc/locale/isgraph.3
@@ -65,25 +65,25 @@ In the ASCII character set, this includes the following characters
 (with their numeric values shown in octal):
 .Pp
 .Bl -column \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__
-.It \&041\ ``!'' \t042\ ``"'' \t043\ ``#'' \t044\ ``$'' \t045\ ``%''
-.It \&046\ ``&'' \t047\ ``''' \t050\ ``('' \t051\ ``)'' \t052\ ``*''
-.It \&053\ ``+'' \t054\ ``,'' \t055\ ``-'' \t056\ ``.'' \t057\ ``/''
-.It \&060\ ``0'' \t061\ ``1'' \t062\ ``2'' \t063\ ``3'' \t064\ ``4''
-.It \&065\ ``5'' \t066\ ``6'' \t067\ ``7'' \t070\ ``8'' \t071\ ``9''
-.It \&072\ ``:'' \t073\ ``;'' \t074\ ``<'' \t075\ ``='' \t076\ ``>''
-.It \&077\ ``?'' \t100\ ``@'' \t101\ ``A'' \t102\ ``B'' \t103\ ``C''
-.It \&104\ ``D'' \t105\ ``E'' \t106\ ``F'' \t107\ ``G'' \t110\ ``H''
-.It \&111\ ``I'' \t112\ ``J'' \t113\ ``K'' \t114\ ``L'' \t115\ ``M''
-.It \&116\ ``N'' \t117\ ``O'' \t120\ ``P'' \t121\ ``Q'' \t122\ ``R''
-.It \&123\ ``S'' \t124\ ``T'' \t125\ ``U'' \t126\ ``V'' \t127\ ``W''
-.It \&130\ ``X'' \t131\ ``Y'' \t132\ ``Z'' \t133\ ``['' \t134\ ``\e\|''
-.It \&135\ ``]'' \t136\ ``^'' \t137\ ``_'' \t140\ ```'' \t141\ ``a''
-.It \&142\ ``b'' \t143\ ``c'' \t144\ ``d'' \t145\ ``e'' \t146\ ``f''
-.It \&147\ ``g'' \t150\ ``h'' \t151\ ``i'' \t152\ ``j'' \t153\ ``k''
-.It \&154\ ``l'' \t155\ ``m'' \t156\ ``n'' \t157\ ``o'' \t160\ ``p''
-.It \&161\ ``q'' \t162\ ``r'' \t163\ ``s'' \t164\ ``t'' \t165\ ``u''
-.It \&166\ ``v'' \t167\ ``w'' \t170\ ``x'' \t171\ ``y'' \t172\ ``z''
-.It \&173\ ``{'' \t174\ ``|'' \t175\ ``}'' \t176\ ``~''
+.It "\&041\ ``!'' \t042\ ``""'' \t043\ ``#'' \t044\ ``$'' \t045\ ``%''"
+.It "\&046\ ``&'' \t047\ ``''' \t050\ ``('' \t051\ ``)'' \t052\ ``*''"
+.It "\&053\ ``+'' \t054\ ``,'' \t055\ ``-'' \t056\ ``.'' \t057\ ``/''"
+.It "\&060\ ``0'' \t061\ ``1'' \t062\ ``2'' \t063\ ``3'' \t064\ ``4''"
+.It "\&065\ ``5'' \t066\ ``6'' \t067\ ``7'' \t070\ ``8'' \t071\ ``9''"
+.It "\&072\ ``:'' \t073\ ``;'' \t074\ ``<'' \t075\ ``='' \t076\ ``>''"
+.It "\&077\ ``?'' \t100\ ``@'' \t101\ ``A'' \t102\ ``B'' \t103\ ``C''"
+.It "\&104\ ``D'' \t105\ ``E'' \t106\ ``F'' \t107\ ``G'' \t110\ ``H''"
+.It "\&111\ ``I'' \t112\ ``J'' \t113\ ``K'' \t114\ ``L'' \t115\ ``M''"
+.It "\&116\ ``N'' \t117\ ``O'' \t120\ ``P'' \t121\ ``Q'' \t122\ ``R''"
+.It "\&123\ ``S'' \t124\ ``T'' \t125\ ``U'' \t126\ ``V'' \t127\ ``W''"
+.It "\&130\ ``X'' \t131\ ``Y'' \t132\ ``Z'' \t133\ ``['' \t134\ ``\e\|''"
+.It "\&135\ ``]'' \t136\ ``^'' \t137\ ``_'' \t140\ ```'' \t141\ ``a''"
+.It "\&142\ ``b'' \t143\ ``c'' \t144\ ``d'' \t145\ ``e'' \t146\ ``f''"
+.It "\&147\ ``g'' \t150\ ``h'' \t151\ ``i'' \t152\ ``j'' \t153\ ``k''"
+.It "\&154\ ``l'' \t155\ ``m'' \t156\ ``n'' \t157\ ``o'' \t160\ ``p''"
+.It "\&161\ ``q'' \t162\ ``r'' \t163\ ``s'' \t164\ ``t'' \t165\ ``u''"
+.It "\&166\ ``v'' \t167\ ``w'' \t170\ ``x'' \t171\ ``y'' \t172\ ``z''"
+.It "\&173\ ``{'' \t174\ ``|'' \t175\ ``}'' \t176\ ``~''"
 .El
 .Sh RETURN VALUES
 The
diff --git a/lib/libc/locale/islower.3 b/lib/libc/locale/islower.3
index a93a1e8..255dfb4 100644
--- a/lib/libc/locale/islower.3
+++ b/lib/libc/locale/islower.3
@@ -65,12 +65,12 @@ In the ASCII character set, this includes the following characters
 (with their numeric values shown in octal):
 .Pp
 .Bl -column \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__
-.It \&141\ ``a'' \t142\ ``b'' \t143\ ``c'' \t144\ ``d'' \t145\ ``e''
-.It \&146\ ``f'' \t147\ ``g'' \t150\ ``h'' \t151\ ``i'' \t152\ ``j''
-.It \&153\ ``k'' \t154\ ``l'' \t155\ ``m'' \t156\ ``n'' \t157\ ``o''
-.It \&160\ ``p'' \t161\ ``q'' \t162\ ``r'' \t163\ ``s'' \t164\ ``t''
-.It \&165\ ``u'' \t166\ ``v'' \t167\ ``w'' \t170\ ``x'' \t171\ ``y''
-.It \&172\ ``z''
+.It "\&141\ ``a'' \t142\ ``b'' \t143\ ``c'' \t144\ ``d'' \t145\ ``e''"
+.It "\&146\ ``f'' \t147\ ``g'' \t150\ ``h'' \t151\ ``i'' \t152\ ``j''"
+.It "\&153\ ``k'' \t154\ ``l'' \t155\ ``m'' \t156\ ``n'' \t157\ ``o''"
+.It "\&160\ ``p'' \t161\ ``q'' \t162\ ``r'' \t163\ ``s'' \t164\ ``t''"
+.It "\&165\ ``u'' \t166\ ``v'' \t167\ ``w'' \t170\ ``x'' \t171\ ``y''"
+.It "\&172\ ``z''"
 .El
 .Sh RETURN VALUES
 The
diff --git a/lib/libc/locale/isprint.3 b/lib/libc/locale/isprint.3
index 4505b42..0a8849f 100644
--- a/lib/libc/locale/isprint.3
+++ b/lib/libc/locale/isprint.3
@@ -65,25 +65,25 @@ In the ASCII character set, this includes the following characters
 (with their numeric values shown in octal):
 .Pp
 .Bl -column \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__
-.It \&040\ sp \t041\ ``!'' \t042\ ``"'' \t043\ ``#'' \t044\ ``$''
-.It \&045\ ``%'' \t046\ ``&'' \t047\ ``''' \t050\ ``('' \t051\ ``)''
-.It \&052\ ``*'' \t053\ ``+'' \t054\ ``,'' \t055\ ``-'' \t056\ ``.''
-.It \&057\ ``/'' \t060\ ``0'' \t061\ ``1'' \t062\ ``2'' \t063\ ``3''
-.It \&064\ ``4'' \t065\ ``5'' \t066\ ``6'' \t067\ ``7'' \t070\ ``8''
-.It \&071\ ``9'' \t072\ ``:'' \t073\ ``;'' \t074\ ``<'' \t075\ ``=''
-.It \&076\ ``>'' \t077\ ``?'' \t100\ ``@'' \t101\ ``A'' \t102\ ``B''
-.It \&103\ ``C'' \t104\ ``D'' \t105\ ``E'' \t106\ ``F'' \t107\ ``G''
-.It \&110\ ``H'' \t111\ ``I'' \t112\ ``J'' \t113\ ``K'' \t114\ ``L''
-.It \&115\ ``M'' \t116\ ``N'' \t117\ ``O'' \t120\ ``P'' \t121\ ``Q''
-.It \&122\ ``R'' \t123\ ``S'' \t124\ ``T'' \t125\ ``U'' \t126\ ``V''
-.It \&127\ ``W'' \t130\ ``X'' \t131\ ``Y'' \t132\ ``Z'' \t133\ ``[''
-.It \&134\ ``\e\|'' \t135\ ``]'' \t136\ ``^'' \t137\ ``_'' \t140\ ```''
-.It \&141\ ``a'' \t142\ ``b'' \t143\ ``c'' \t144\ ``d'' \t145\ ``e''
-.It \&146\ ``f'' \t147\ ``g'' \t150\ ``h'' \t151\ ``i'' \t152\ ``j''
-.It \&153\ ``k'' \t154\ ``l'' \t155\ ``m'' \t156\ ``n'' \t157\ ``o''
-.It \&160\ ``p'' \t161\ ``q'' \t162\ ``r'' \t163\ ``s'' \t164\ ``t''
-.It \&165\ ``u'' \t166\ ``v'' \t167\ ``w'' \t170\ ``x'' \t171\ ``y''
-.It \&172\ ``z'' \t173\ ``{'' \t174\ ``|'' \t175\ ``}'' \t176\ ``~''
+.It "\&040\ sp \t041\ ``!'' \t042\ ``""'' \t043\ ``#'' \t044\ ``$''"
+.It "\&045\ ``%'' \t046\ ``&'' \t047\ ``''' \t050\ ``('' \t051\ ``)''"
+.It "\&052\ ``*'' \t053\ ``+'' \t054\ ``,'' \t055\ ``-'' \t056\ ``.''"
+.It "\&057\ ``/'' \t060\ ``0'' \t061\ ``1'' \t062\ ``2'' \t063\ ``3''"
+.It "\&064\ ``4'' \t065\ ``5'' \t066\ ``6'' \t067\ ``7'' \t070\ ``8''"
+.It "\&071\ ``9'' \t072\ ``:'' \t073\ ``;'' \t074\ ``<'' \t075\ ``=''"
+.It "\&076\ ``>'' \t077\ ``?'' \t100\ ``@'' \t101\ ``A'' \t102\ ``B''"
+.It "\&103\ ``C'' \t104\ ``D'' \t105\ ``E'' \t106\ ``F'' \t107\ ``G''"
+.It "\&110\ ``H'' \t111\ ``I'' \t112\ ``J'' \t113\ ``K'' \t114\ ``L''"
+.It "\&115\ ``M'' \t116\ ``N'' \t117\ ``O'' \t120\ ``P'' \t121\ ``Q''"
+.It "\&122\ ``R'' \t123\ ``S'' \t124\ ``T'' \t125\ ``U'' \t126\ ``V''"
+.It "\&127\ ``W'' \t130\ ``X'' \t131\ ``Y'' \t132\ ``Z'' \t133\ ``[''"
+.It "\&134\ ``\e\|'' \t135\ ``]'' \t136\ ``^'' \t137\ ``_'' \t140\ ```''"
+.It "\&141\ ``a'' \t142\ ``b'' \t143\ ``c'' \t144\ ``d'' \t145\ ``e''"
+.It "\&146\ ``f'' \t147\ ``g'' \t150\ ``h'' \t151\ ``i'' \t152\ ``j''"
+.It "\&153\ ``k'' \t154\ ``l'' \t155\ ``m'' \t156\ ``n'' \t157\ ``o''"
+.It "\&160\ ``p'' \t161\ ``q'' \t162\ ``r'' \t163\ ``s'' \t164\ ``t''"
+.It "\&165\ ``u'' \t166\ ``v'' \t167\ ``w'' \t170\ ``x'' \t171\ ``y''"
+.It "\&172\ ``z'' \t173\ ``{'' \t174\ ``|'' \t175\ ``}'' \t176\ ``~''"
 .El
 .Sh RETURN VALUES
 The
diff --git a/lib/libc/locale/ispunct.3 b/lib/libc/locale/ispunct.3
index 866a130..e3c8f3f 100644
--- a/lib/libc/locale/ispunct.3
+++ b/lib/libc/locale/ispunct.3
@@ -68,13 +68,13 @@ In the ASCII character set, this includes the following characters
 (with their numeric values shown in octal):
 .Pp
 .Bl -column \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__
-.It \&041\ ``!'' \t042\ ``"'' \t043\ ``#'' \t044\ ``$'' \t045\ ``%''
-.It \&046\ ``&'' \t047\ ``''' \t050\ ``('' \t051\ ``)'' \t052\ ``*''
-.It \&053\ ``+'' \t054\ ``,'' \t055\ ``-'' \t056\ ``.'' \t057\ ``/''
-.It \&072\ ``:'' \t073\ ``;'' \t074\ ``<'' \t075\ ``='' \t076\ ``>''
-.It \&077\ ``?'' \t100\ ``@'' \t133\ ``['' \t134\ ``\e\|'' \t135\ ``]''
-.It \&136\ ``^'' \t137\ ``_'' \t140\ ```'' \t173\ ``{'' \t174\ ``|''
-.It \&175\ ``}'' \t176\ ``~''
+.It "\&041\ ``!'' \t042\ ``""'' \t043\ ``#'' \t044\ ``$'' \t045\ ``%''"
+.It "\&046\ ``&'' \t047\ ``''' \t050\ ``('' \t051\ ``)'' \t052\ ``*''"
+.It "\&053\ ``+'' \t054\ ``,'' \t055\ ``-'' \t056\ ``.'' \t057\ ``/''"
+.It "\&072\ ``:'' \t073\ ``;'' \t074\ ``<'' \t075\ ``='' \t076\ ``>''"
+.It "\&077\ ``?'' \t100\ ``@'' \t133\ ``['' \t134\ ``\e\|'' \t135\ ``]''"
+.It "\&136\ ``^'' \t137\ ``_'' \t140\ ```'' \t173\ ``{'' \t174\ ``|''"
+.It "\&175\ ``}'' \t176\ ``~''"
 .El
 .Sh RETURN VALUES
 The
diff --git a/lib/libc/locale/isspace.3 b/lib/libc/locale/isspace.3
index 6a1a73e..fbedb53 100644
--- a/lib/libc/locale/isspace.3
+++ b/lib/libc/locale/isspace.3
@@ -65,8 +65,8 @@ In the ASCII character set, this includes the following characters
 (with their numeric values shown in octal):
 .Pp
 .Bl -column \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__
-.It \&011\ ht \t012\ nl \t013\ vt \t014\ np \t015\ cr
-.It \&040\ sp
+.It "\&011\ ht \t012\ nl \t013\ vt \t014\ np \t015\ cr"
+.It "\&040\ sp"
 .El
 .Sh RETURN VALUES
 The
diff --git a/lib/libc/locale/isupper.3 b/lib/libc/locale/isupper.3
index ad3f36b..2d186eb 100644
--- a/lib/libc/locale/isupper.3
+++ b/lib/libc/locale/isupper.3
@@ -65,12 +65,12 @@ In the ASCII character set, this includes the following characters
 (with their numeric values shown in octal):
 .Pp
 .Bl -column \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__
-.It \&101\ ``A'' \t102\ ``B'' \t103\ ``C'' \t104\ ``D'' \t105\ ``E''
-.It \&106\ ``F'' \t107\ ``G'' \t110\ ``H'' \t111\ ``I'' \t112\ ``J''
-.It \&113\ ``K'' \t114\ ``L'' \t115\ ``M'' \t116\ ``N'' \t117\ ``O''
-.It \&120\ ``P'' \t121\ ``Q'' \t122\ ``R'' \t123\ ``S'' \t124\ ``T''
-.It \&125\ ``U'' \t126\ ``V'' \t127\ ``W'' \t130\ ``X'' \t131\ ``Y''
-.It \&132\ ``Z''
+.It "\&101\ ``A'' \t102\ ``B'' \t103\ ``C'' \t104\ ``D'' \t105\ ``E''"
+.It "\&106\ ``F'' \t107\ ``G'' \t110\ ``H'' \t111\ ``I'' \t112\ ``J''"
+.It "\&113\ ``K'' \t114\ ``L'' \t115\ ``M'' \t116\ ``N'' \t117\ ``O''"
+.It "\&120\ ``P'' \t121\ ``Q'' \t122\ ``R'' \t123\ ``S'' \t124\ ``T''"
+.It "\&125\ ``U'' \t126\ ``V'' \t127\ ``W'' \t130\ ``X'' \t131\ ``Y''"
+.It "\&132\ ``Z''"
 .El
 .Sh RETURN VALUES
 The
diff --git a/lib/libc/locale/isxdigit.3 b/lib/libc/locale/isxdigit.3
index a33b48c..3c8c305 100644
--- a/lib/libc/locale/isxdigit.3
+++ b/lib/libc/locale/isxdigit.3
@@ -65,11 +65,11 @@ In the ASCII character set, this includes the following characters
 (with their numeric values shown in octal):
 .Pp
 .Bl -column \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__
-.It \&060\ ``0'' \t061\ ``1'' \t062\ ``2'' \t063\ ``3'' \t064\ ``4''
-.It \&065\ ``5'' \t066\ ``6'' \t067\ ``7'' \t070\ ``8'' \t071\ ``9''
-.It \&101\ ``A'' \t102\ ``B'' \t103\ ``C'' \t104\ ``D'' \t105\ ``E''
-.It \&106\ ``F'' \t141\ ``a'' \t142\ ``b'' \t143\ ``c'' \t144\ ``d''
-.It \&145\ ``e'' \t146\ ``f''
+.It "\&060\ ``0'' \t061\ ``1'' \t062\ ``2'' \t063\ ``3'' \t064\ ``4''"
+.It "\&065\ ``5'' \t066\ ``6'' \t067\ ``7'' \t070\ ``8'' \t071\ ``9''"
+.It "\&101\ ``A'' \t102\ ``B'' \t103\ ``C'' \t104\ ``D'' \t105\ ``E''"
+.It "\&106\ ``F'' \t141\ ``a'' \t142\ ``b'' \t143\ ``c'' \t144\ ``d''"
+.It "\&145\ ``e'' \t146\ ``f''"
 .El
 .Sh RETURN VALUES
 The
diff --git a/lib/libc/net/inet.3 b/lib/libc/net/inet.3
index b04d383..3159fef 100644
--- a/lib/libc/net/inet.3
+++ b/lib/libc/net/inet.3
@@ -79,7 +79,7 @@ and
 .Fn inet_network
 interpret character strings representing
 numbers expressed in the Internet standard
-.Ql \&.
+.Ql .\&
 notation.
 .Pp
 The
@@ -131,7 +131,7 @@ The routine
 takes an Internet address and returns an
 .Tn ASCII
 string representing the address in
-.Ql \&.
+.Ql .\&
 notation.  The routine
 .Fn inet_makeaddr
 takes an Internet network number and a local
@@ -150,7 +150,7 @@ All network numbers and local address parts are
 returned as machine format integer values.
 .Sh INTERNET ADDRESSES
 Values specified using the
-.Ql \&.
+.Ql .\&
 notation take one
 of the following forms:
 .Bd -literal -offset indent
@@ -195,7 +195,7 @@ rearrangement.
 All numbers supplied as
 .Dq parts
 in a
-.Ql  \&.
+.Ql .\&
 notation
 may be decimal, octal, or hexadecimal, as specified
 in the C language (i.e., a leading 0x or 0X implies
diff --git a/lib/libc/net/nsdispatch.3 b/lib/libc/net/nsdispatch.3
index bd6366e..93493a1 100644
--- a/lib/libc/net/nsdispatch.3
+++ b/lib/libc/net/nsdispatch.3
@@ -154,7 +154,7 @@ exists which contains a single default entry for
 for use by callers which don't require complicated default rules.
 .Ed
 .Pp
-.Va Sq ...
+.Va Sq ...\&
 are optional extra arguments, which
 are passed to the appropriate callback function as a variable argument
 list of the type
@@ -163,11 +163,11 @@ list of the type
 Whilst there is support for arbitrary sources, the following
 #defines for commonly implementated sources are available:
 .Bl -column NS_COMPAT COMPAT -offset indent
-.Sy #define	value
-.It NSSRC_FILES	"files"
-.It NSSRC_DNS	"dns"
-.It NSSRC_NIS	"nis"
-.It NSSRC_COMPAT	"compat"
+.It Sy "#define	value"
+.It "NSSRC_FILES	""files"""
+.It "NSSRC_DNS	""dns"""
+.It "NSSRC_NIS	""nis"""
+.It "NSSRC_COMPAT	""compat"""
 .El
 .Pp
 Refer to
@@ -178,11 +178,11 @@ for a complete description of what each source type is.
 The callback functions should return one of the following values
 depending upon status of the lookup:
 .Bl -column NS_NOTFOUND -offset indent
-.Sy "Return value"	Status code
-.It NS_SUCCESS	success
-.It NS_NOTFOUND	notfound
-.It NS_UNAVAIL	unavail
-.It NS_TRYAGAIN	tryagain
+.It Sy "Return value	Status code"
+.It "NS_SUCCESS	success"
+.It "NS_NOTFOUND	notfound"
+.It "NS_UNAVAIL	unavail"
+.It "NS_TRYAGAIN	tryagain"
 .El
 .Pp
 Refer to
diff --git a/lib/libc/net/resolver.3 b/lib/libc/net/resolver.3
index e1f3665..dedcde1 100644
--- a/lib/libc/net/resolver.3
+++ b/lib/libc/net/resolver.3
@@ -327,9 +327,9 @@ which is of size
 .Fa length .
 The size of compressed name is returned or \-1 if there was an error.
 .Sh FILES
-.Bl -tag -width Pa
-/etc/resolv.conf
-The configuration file
+.Bl -tag -width /etc/resolv.conf
+.It Pa /etc/resolv.conf
+The configuration file,
 see
 .Xr resolver 5 .
 .El
diff --git a/lib/libc/nls/catclose.3 b/lib/libc/nls/catclose.3
index 7405852..0ba5e40 100644
--- a/lib/libc/nls/catclose.3
+++ b/lib/libc/nls/catclose.3
@@ -67,4 +67,3 @@ The
 .Fn catclose
 function conforms to
 .St -xpg4 .
-
diff --git a/lib/libc/posix1e/acl.3 b/lib/libc/posix1e/acl.3
index 12dc9a6..74690fb 100644
--- a/lib/libc/posix1e/acl.3
+++ b/lib/libc/posix1e/acl.3
@@ -50,7 +50,7 @@ extensions defined that allow for alternative ACL semantics than the
 POSIX.1e semantics, such as AFS, NTFS, Coda, and NWFS semantics.  Where
 routines are non-standard, they are suffixed with _np to indicate that
 they are not portable.
-
+.Pp
 POSIX.1e describes a set of ACL manipulation routines to manage the
 contents of ACLs, as well as their relationships with files.  This
 manipulation library is not currently implemented in
@@ -68,73 +68,73 @@ and
 .Fn acl_to_text ,
 passed directly to and from the management routines.  In this manner,
 an application can remain safely unaware of the contents of ACLs.
-
+.Pp
 Available functions, sorted by behavior, include:
-
+.Pp
 .Fn acl_delete_def_file ,
 .Fn acl_delete_file_np ,
-.Fn acl_delete_fd_np 
-
+.Fn acl_delete_fd_np
+.Pp
 These functions are described in
 .Xr acl_delete 3 ,
 and may be used to delete ACLs from file system objects.
-
+.Pp
 .Fn acl_free
-
+.Pp
 This function is described in
 .Xr acl_free 3 ,
 and may be used to free userland working ACL storage.
-
+.Pp
 .Fn acl_from_text
-
+.Pp
 This function is described in
 .Xr acl_from_text 3 ,
 and may be used to convert a text-form ACL into working ACL state, if
 the ACL has POSIX.1e semantics.
-
+.Pp
 .Fn acl_get_file ,
 .Fn acl_get_fd ,
 .Fn acl_get_fd_np
-
+.Pp
 These functions are described in
 .Xr acl_get 3 ,
 and may be used to retrieve ACLs from file system objects.
-
+.Pp
 .Fn acl_init
-
+.Pp
 This function is described in
 .Xr acl_init 3 ,
 and may be used to allocate a fresh (empty) ACL structure.
-
+.Pp
 .Fn acl_dup
-
+.Pp
 This function is described in
 .Xr acl_dup 3 ,
 and may be used to duplicate an ACL structure.
-
+.Pp
 .Fn acl_set_file ,
 .Fn acl_set_fd ,
 .Fn acl_set_fd_np
-
+.Pp
 These functions are described in
 .Xr acl_set 3 ,
 and may be used to assign an ACL to a file system object.
-
+.Pp
 .Fn acl_to_text
-
+.Pp
 This function is described in
 .Xr acl_to_text 3 ,
 and may be used to generate a text-form of a POSIX.1e semantics ACL.
-
+.Pp
 .Fn acl_valid ,
 .Fn acl_valid_file_np ,
 .Fn acl_valid_fd_np
-
+.Pp
 Thee functions are described in
 .Xr acl_valid 3 ,
 and may be used to validate an ACL as correct POSIX.1e-semantics, or
 as appropriate for a particular file system object regardless of semantics.
-
+.Pp
 Documentation of the internal kernel interfaces backing these calls may
 be found in
 .Xr acl 9 .
diff --git a/lib/libc/posix1e/acl_delete.3 b/lib/libc/posix1e/acl_delete.3
index bcbc54b..9ab46db 100644
--- a/lib/libc/posix1e/acl_delete.3
+++ b/lib/libc/posix1e/acl_delete.3
@@ -91,7 +91,7 @@ argument points to an empty string.
 Insufficient memory available to fulfill request.
 .It Bq Er ENOTDIR
 A component of the path prefix is not a directory.
-
+.Pp
 Argument
 .Va path_p
 must be a directory, and is not.
diff --git a/lib/libc/posix1e/acl_dup.3 b/lib/libc/posix1e/acl_dup.3
index 1e98084..8ed7915 100644
--- a/lib/libc/posix1e/acl_dup.3
+++ b/lib/libc/posix1e/acl_dup.3
@@ -43,14 +43,14 @@ The
 .Fn acl_dup
 function returns a pointer to a copy of the ACL pointed to by the argument
 .Va acl .
-
+.Pp
 This function may cause memory to be allocated.  The caller should free any
 releasable memory, when the new ACL is no longer required, by calling
 .Xr acl_free 3
 with the
 .Va (void*)acl_t
 as an argument.
-
+.Pp
 Any existing ACL pointers that refer to the ACL referred to by
 .Va acl
 shall continue to refer to the ACL.
diff --git a/lib/libc/posix1e/acl_from_text.3 b/lib/libc/posix1e/acl_from_text.3
index 37bc421..41f36b8 100644
--- a/lib/libc/posix1e/acl_from_text.3
+++ b/lib/libc/posix1e/acl_from_text.3
@@ -45,7 +45,7 @@ function converts the text form of an ACL referred to by
 .Va buf_p
 into the internal working structure for ACLs, appropriate for applying to
 files or manipulating.
-
+.Pp
 This function may cause memory to be allocated.  The caller should free any
 releasable memory, when the new ACL is no longer required, by calling
 .Xr acl_free 3
diff --git a/lib/libc/posix1e/acl_get.3 b/lib/libc/posix1e/acl_get.3
index af523e4..ed017d7 100644
--- a/lib/libc/posix1e/acl_get.3
+++ b/lib/libc/posix1e/acl_get.3
@@ -62,14 +62,14 @@ from a file descriptor.
 is a non-portable form of
 .Fn acl_get_fd
 that allows the retrieval of any type of ACL from a file descriptor.
-
+.Pp
 This function may cause memory to be allocated.  The caller should free
 any releasable memory, when the new ACL is no longer required, by calling
 .Xr acl_free 3
 with the
 .Va (void *)acl_t
 as an argument.
-
+.Pp
 The ACL in the working storage is an independent copy of the ACL associated
 with the object referred to by
 .Va fd .
diff --git a/lib/libc/posix1e/acl_init.3 b/lib/libc/posix1e/acl_init.3
index 18e5118..f6c75fe 100644
--- a/lib/libc/posix1e/acl_init.3
+++ b/lib/libc/posix1e/acl_init.3
@@ -49,7 +49,7 @@ storage allocated to contain the ACL is freed by a call to
 .Xr acl_free 3 .
 When the area is first allocated, it shall contain an an ACL that contains
 no ACL entries.
-
+.Pp
 This function may cause memory to be allocated.  The caller should free any
 releasable memory, when the new ACL is no longer required, by calling
 .Xr acl_free 3
diff --git a/lib/libc/posix1e/acl_to_text.3 b/lib/libc/posix1e/acl_to_text.3
index cfc4acb..e49fdfa 100644
--- a/lib/libc/posix1e/acl_to_text.3
+++ b/lib/libc/posix1e/acl_to_text.3
@@ -51,7 +51,7 @@ including the NULL terminator) in the location pointed to by
 The format of the text string returned by
 .Fn acl_to_text
 shall be the POSIX.1e long ACL form.
-
+.Pp
 This function allocates any memory necessary to contain the string and
 returns a pointer to the string.  The caller should free any releasable
 memory, when the new string is no longer required, by calling
@@ -83,7 +83,7 @@ to the corresponding value:
 Argument
 .Va acl
 does not point to a valid ACL.
-
+.Pp
 The ACL denoted by
 .Va acl
 contains one or more improperly formed ACL entries, or for some other
@@ -112,7 +112,7 @@ and development continues.
 .An Robert N M Watson
 .Sh BUGS
 These features are not yet fully implemented.
-
+.Pp
 .Fn acl_from_text
 and
 .Fn acl_to_text
diff --git a/lib/libc/posix1e/acl_valid.3 b/lib/libc/posix1e/acl_valid.3
index e3f0537..aeae264 100644
--- a/lib/libc/posix1e/acl_valid.3
+++ b/lib/libc/posix1e/acl_valid.3
@@ -58,7 +58,7 @@ allow an ACL to be checked in the context of a specific acl type,
 .Va type ,
 and file system object.  In environments where additional ACL types are
 supported than just POSIX.1e, this makes more sense.
-
+.Pp
 For POSIX.1e semantics, the checks include:
 .Bd -literal -offset indent
 The three required entries (ACL_USER_OBJ, ACL_GROUP_OBJ,
@@ -67,14 +67,14 @@ the ACL contains any ACL_USER, ACL_GROUP, or any other
 implementation-defined entries in the file group class
 then one ACL_MASK entry shall also be required.  The ACL
 shall contain at most on ACL_MASK entry.
-
+.Pp
 The qualifier field shall be unique among all entries of
 the same POSIX.1e ACL facility defined tag type.  The 
 tag type field shall contain valid values including any
 implementation-defined values.  Validation of the values
 of the qualifier field is implementation-defined.
 .Ed
-
+.Pp
 The POSIX.1e
 .Fn acl_valid
 function may reorder the ACL for the purposes of verification; the
@@ -105,12 +105,12 @@ argument is not a valid file descriptor.
 Argument
 .Va acl
 does not point to a valid ACL.
-
+.Pp
 One or more of the required ACL entries is not present in
 .Va acl .
-
+.Pp
 The ACL contains entries that are not unique.
-
+.Pp
 The file system rejects the ACL based on fs-specific semantics issues.
 .It Bq Er ENAMETOOLONG
 A component of a pathname exceeded 255 characters, or an
diff --git a/lib/libc/posix1e/cap_dup.3 b/lib/libc/posix1e/cap_dup.3
index fdd4cad..2e874a5 100644
--- a/lib/libc/posix1e/cap_dup.3
+++ b/lib/libc/posix1e/cap_dup.3
@@ -52,7 +52,7 @@ the other in any way.
 This function may cause memory to be allocated.
 The caller should free any releasable memory, when the capability state in
 working storage is no longer required, by calling
-.Vn cap_free
+.Fn cap_free
 with the cap_t as an argument.
 .Sh IMPLEMENTATION NOTES
 FreeBSD's support for POSIX.1e interfaces and features is still under
diff --git a/lib/libc/posix1e/cap_free.3 b/lib/libc/posix1e/cap_free.3
index ed77355..d83f180 100644
--- a/lib/libc/posix1e/cap_free.3
+++ b/lib/libc/posix1e/cap_free.3
@@ -32,7 +32,7 @@
 .Os FreeBSD
 .Sh NAME
 .Nm cap_free
-.Nd Release Memory Allocated to a Capability State in Working Storage
+.Nd "Release Memory Allocated to a Capability State in Working Storage"
 .Sh SYNOPSIS
 .Fd #include <sys/types.h>
 .Fd #include <sys/capability.h>
diff --git a/lib/libc/posix1e/cap_init.3 b/lib/libc/posix1e/cap_init.3
index 47e4fe3..3e47c9f 100644
--- a/lib/libc/posix1e/cap_init.3
+++ b/lib/libc/posix1e/cap_init.3
@@ -49,7 +49,7 @@ implementation shall be cleared.
 This function may cause memory to be allocated.
 The caller should free any releasable memory, when the capability state in
 working storage is no longer required, by calling
-.Vn cap_free
+.Fn cap_free
 with the cap_t as an argument.
 .Sh IMPLEMENTATION NOTES
 FreeBSD's support for POSIX.1e interfaces and features is still under
diff --git a/lib/libc/posix1e/cap_to_text.3 b/lib/libc/posix1e/cap_to_text.3
index a3bd762..881af03 100644
--- a/lib/libc/posix1e/cap_to_text.3
+++ b/lib/libc/posix1e/cap_to_text.3
@@ -56,7 +56,7 @@ null terminator) in the location pointed to by
 The capability state in working storage idenfied by
 .Va cap_p
 shall be completely represented in the returned string.
-
+.Pp
 This function may cause memory to be allocated.
 The caller should free any releasable memory, when the capability state
 in working memory is no longer required, by calling
diff --git a/lib/libc/posix1e/posix1e.3 b/lib/libc/posix1e/posix1e.3
index 9a5afea..40de11d 100644
--- a/lib/libc/posix1e/posix1e.3
+++ b/lib/libc/posix1e/posix1e.3
@@ -44,7 +44,7 @@ it describes are now widely used despite inherent limitations.  Currently,
 only a few of the interfaces and features are implemented in
 .Fx ,
 although efforts are underway to complete the integration at this time.
-
+.Pp
 POSIX.1e describes five security extensions to the base POSIX.1 API:
 Access Control Lists (ACLs), Auditing, Capabilities, Mandatory Access
 Control, and Information Flow Labels.  Of these, the ACL interfaces are
@@ -53,7 +53,7 @@ currently included with
 Auditing, Capabilities, and Mandatory
 Access Control are in the wings, and Information Flow Labels are not on
 the calendar.
-
+.Pp
 POSIX.1e defines both syntax and semantics for these features, but fairly
 substantial changes are required to implement these features in the 
 operating system.  As shipped,
@@ -64,18 +64,17 @@ access to and manipulation of these ACLs, but support for ACLs is not
 provided by any file systems shipped in the base operating system.
 Available API calls relating to ACLs are described in detail in
 .Xr acl 3 .
-
+.Pp
 .Fx
 currently provides documentation and APIs for fine-grained capability
 support, but implementation is currently not included in the base
 system.  Documentation of these API calls is provided in
 .Xr cap 3 .
-
+.Pp
 Additional patches supporting POSIX.1e features are provided by the
 TrustedBSD project:
-
+.Pp
 http://www.trustedbsd.org
-
 .Sh IMPLEMENTATION NOTES
 .Fx Ns 's
 support for POSIX.1e interfaces and features is still under
diff --git a/lib/libc/regex/re_format.7 b/lib/libc/regex/re_format.7
index 9002398..ef28a51 100644
--- a/lib/libc/regex/re_format.7
+++ b/lib/libc/regex/re_format.7
@@ -94,7 +94,7 @@ An atom followed by
 .Ql \&+
 matches a sequence of 1 or more matches of the atom.
 An atom followed by
-.Ql \&?
+.Ql ?\&
 matches a sequence of 0 or 1 matches of the atom.
 .Pp
 A
@@ -146,7 +146,7 @@ an empty set of
 a
 .Em bracket expression
 (see below),
-.Ql \&.
+.Ql .\&
 (matching any single character),
 .Ql \&^
 (matching the null string at the beginning of a line),
@@ -210,9 +210,9 @@ To use a literal
 .Ql \&-
 as the first endpoint of a range,
 enclose it in
-.Ql [.
+.Ql [.\&
 and
-.Ql .]
+.Ql .]\&
 to make it a collating element (see below).
 With the exception of these and some combinations using
 .Ql \&[
@@ -224,9 +224,9 @@ Within a bracket expression, a collating element (a character,
 a multi-character sequence that collates as if it were a single character,
 or a collating-sequence name for either)
 enclosed in
-.Ql [.
+.Ql [.\&
 and
-.Ql .]
+.Ql .]\&
 stands for the
 sequence of characters of that collating element.
 The sequence is a single element of the bracket expression's list.
@@ -249,7 +249,7 @@ is an equivalence class, standing for the sequences of characters
 of all collating elements equivalent to that one, including itself.
 (If there are no other equivalent collating elements,
 the treatment is as if the enclosing delimiters were
-.Ql [.
+.Ql [.\&
 and
 .Ql .] . )
 For example, if
@@ -277,10 +277,10 @@ class.
 Standard character class names are:
 .Pp
 .Bl -column "alnum" "digit" "xdigit" -offset indent
-.It Em alnum	digit	punct
-.It Em alpha	graph	space
-.It Em blank	lower	upper
-.It Em cntrl	print	xdigit
+.It Em "alnum	digit	punct"
+.It Em "alpha	graph	space"
+.It Em "blank	lower	upper"
+.It Em "cntrl	print	xdigit"
 .El
 .Pp
 These stand for the character classes defined in
@@ -330,7 +330,7 @@ matches the three middle characters of
 matches all ten characters of
 .Ql weeknights ,
 when
-.Ql (.*).*
+.Ql (.*).*\&
 is matched against
 .Ql abc
 the parenthesized subexpression
@@ -375,7 +375,7 @@ is an ordinary character and there is no equivalent
 for its functionality.
 .Ql \&+
 and
-.Ql \&?
+.Ql ?\&
 are ordinary characters, and their functionality
 can be expressed using bounds
 .No ( Ql {1,}
diff --git a/lib/libc/rpc/rpc.5 b/lib/libc/rpc/rpc.5
index f9a6d93..8a45a99 100644
--- a/lib/libc/rpc/rpc.5
+++ b/lib/libc/rpc/rpc.5
@@ -30,7 +30,7 @@ A ``#'' indicates the beginning of a comment; characters up to the end of
 the line are not interpreted by routines which search the file.
 .Sh FILES
 .Bl -tag -compact -width /etc/rpc
-.Pa /etc/rpc
+.It Pa /etc/rpc
 .El
 .Sh "SEE ALSO"
 .Xr getrpcent 3
diff --git a/lib/libc/stdio/printf.3 b/lib/libc/stdio/printf.3
index c64038f..5ea5163 100644
--- a/lib/libc/stdio/printf.3
+++ b/lib/libc/stdio/printf.3
@@ -296,7 +296,7 @@ flag has been given) to fill out
 the field width.
 .It
 An optional precision, in the form of a period
-.Sq Cm \&.
+.Sq Cm .\&
 followed by an
 optional digit string.  If the digit string is omitted, the precision
 is taken as zero.  This gives the minimum number of digits to appear for
diff --git a/lib/libc/stdio/stdio.3 b/lib/libc/stdio/stdio.3
index e0b1659..b4cd7da 100644
--- a/lib/libc/stdio/stdio.3
+++ b/lib/libc/stdio/stdio.3
@@ -228,70 +228,70 @@ library conforms to
 .St -ansiC .
 .Sh LIST OF FUNCTIONS
 .Bl -column "Description"
-.Sy Function	Description
-asprintf	formatted output conversion
-clearerr	check and reset stream status
-fclose	close a stream
-fdopen	stream open functions
-feof	check and reset stream status
-ferror	check and reset stream status
-fflush	flush a stream
-fgetc	get next character or word from input stream
-fgetln	get a line from a stream
-fgetpos	reposition a stream
-fgets	get a line from a stream
-fileno	check and reset stream status
-fopen	stream open functions
-fprintf	formatted output conversion
-fpurge	flush a stream
-fputc	output a character or word to a stream
-fputs	output a line to a stream
-fread	binary stream input/output
-freopen	stream open functions
-fropen	open a stream
-fscanf	input format conversion
-fseek	reposition a stream
-fsetpos	reposition a stream
-ftell	reposition a stream
-funopen	open a stream
-fwopen	open a stream
-fwrite	binary stream input/output
-getc	get next character or word from input stream
-getchar	get next character or word from input stream
-gets	get a line from a stream
-getw	get next character or word from input stream
-mkdtemp	create unique temporary file
-mkstemp	create unique temporary file
-mktemp	create unique temporary file
-perror	system error messages
-printf	formatted output conversion
-putc	output a character or word to a stream
-putchar	output a character or word to a stream
-puts	output a line to a stream
-putw	output a character or word to a stream
-remove	remove directory entry
-rewind	reposition a stream
-scanf	input format conversion
-setbuf	stream buffering operations
-setbuffer	stream buffering operations
-setlinebuf	stream buffering operations
-setvbuf	stream buffering operations
-snprintf	formatted output conversion
-sprintf	formatted output conversion
-sscanf	input format conversion
-strerror	system error messages
-sys_errlist	system error messages
-sys_nerr	system error messages
-tempnam	temporary file routines
-tmpfile	temporary file routines
-tmpnam	temporary file routines
-ungetc	un-get character from input stream
-vasprintf	formatted output conversion
-vfprintf	formatted output conversion
-vfscanf	input format conversion
-vprintf	formatted output conversion
-vscanf	input format conversion
-vsnprintf	formatted output conversion
-vsprintf	formatted output conversion
-vsscanf	input format conversion
+.It Sy "Function	Description"
+.It "asprintf	formatted output conversion"
+.It "clearerr	check and reset stream status"
+.It "fclose	close a stream"
+.It "fdopen	stream open functions"
+.It "feof	check and reset stream status"
+.It "ferror	check and reset stream status"
+.It "fflush	flush a stream"
+.It "fgetc	get next character or word from input stream"
+.It "fgetln	get a line from a stream"
+.It "fgetpos	reposition a stream"
+.It "fgets	get a line from a stream"
+.It "fileno	check and reset stream status"
+.It "fopen	stream open functions"
+.It "fprintf	formatted output conversion"
+.It "fpurge	flush a stream"
+.It "fputc	output a character or word to a stream"
+.It "fputs	output a line to a stream"
+.It "fread	binary stream input/output"
+.It "freopen	stream open functions"
+.It "fropen	open a stream"
+.It "fscanf	input format conversion"
+.It "fseek	reposition a stream"
+.It "fsetpos	reposition a stream"
+.It "ftell	reposition a stream"
+.It "funopen	open a stream"
+.It "fwopen	open a stream"
+.It "fwrite	binary stream input/output"
+.It "getc	get next character or word from input stream"
+.It "getchar	get next character or word from input stream"
+.It "gets	get a line from a stream"
+.It "getw	get next character or word from input stream"
+.It "mkdtemp	create unique temporary file"
+.It "mkstemp	create unique temporary file"
+.It "mktemp	create unique temporary file"
+.It "perror	system error messages"
+.It "printf	formatted output conversion"
+.It "putc	output a character or word to a stream"
+.It "putchar	output a character or word to a stream"
+.It "puts	output a line to a stream"
+.It "putw	output a character or word to a stream"
+.It "remove	remove directory entry"
+.It "rewind	reposition a stream"
+.It "scanf	input format conversion"
+.It "setbuf	stream buffering operations"
+.It "setbuffer	stream buffering operations"
+.It "setlinebuf	stream buffering operations"
+.It "setvbuf	stream buffering operations"
+.It "snprintf	formatted output conversion"
+.It "sprintf	formatted output conversion"
+.It "sscanf	input format conversion"
+.It "strerror	system error messages"
+.It "sys_errlist	system error messages"
+.It "sys_nerr	system error messages"
+.It "tempnam	temporary file routines"
+.It "tmpfile	temporary file routines"
+.It "tmpnam	temporary file routines"
+.It "ungetc	un-get character from input stream"
+.It "vasprintf	formatted output conversion"
+.It "vfprintf	formatted output conversion"
+.It "vfscanf	input format conversion"
+.It "vprintf	formatted output conversion"
+.It "vscanf	input format conversion"
+.It "vsnprintf	formatted output conversion"
+.It "vsprintf	formatted output conversion"
+.It "vsscanf	input format conversion"
 .El
diff --git a/lib/libc/stdlib/getopt.3 b/lib/libc/stdlib/getopt.3
index d8beee2..f5c145f 100644
--- a/lib/libc/stdlib/getopt.3
+++ b/lib/libc/stdlib/getopt.3
@@ -125,7 +125,7 @@ The
 function
 returns \-1
 when the argument list is exhausted, or 
-.Ql ?
+.Ql ?\&
 if a non-recognized
 option is encountered.
 The interpretation of options in the argument list may be cancelled
@@ -147,7 +147,7 @@ or detects
 a missing option argument it writes an error message to the
 .Em stderr
 and returns
-.Ql ? .
+.Ql ?\& .
 Setting
 .Va opterr
 to a zero will disable these error messages.
diff --git a/lib/libc/stdlib/malloc.3 b/lib/libc/stdlib/malloc.3
index 0928f94..7568229 100644
--- a/lib/libc/stdlib/malloc.3
+++ b/lib/libc/stdlib/malloc.3
@@ -261,6 +261,7 @@ If the environment variable
 .Ev MALLOC_OPTIONS
 is set, the characters it contains will be interpreted as flags to the
 allocation functions.
+.El
 .Sh RETURN VALUES
 The
 .Fn malloc
@@ -428,6 +429,7 @@ An unknown option was specified.
 Even with the
 .Dq A
 option set, this warning is still only a warning.
+.El
 .Sh SEE ALSO
 .Xr brk 2 ,
 .Xr alloca 3 ,
diff --git a/lib/libc/stdlib/strtod.3 b/lib/libc/stdlib/strtod.3
index 6a2dc52..1d86a77 100644
--- a/lib/libc/stdlib/strtod.3
+++ b/lib/libc/stdlib/strtod.3
@@ -102,6 +102,7 @@ is stored in
 .Bl -tag -width Er
 .It Bq Er ERANGE
 Overflow or underflow occurred.
+.El
 .Sh SEE ALSO
 .Xr atof 3 ,
 .Xr atoi 3 ,
diff --git a/lib/libc/stdlib/strtol.3 b/lib/libc/stdlib/strtol.3
index 3107676..efa4385 100644
--- a/lib/libc/stdlib/strtol.3
+++ b/lib/libc/stdlib/strtol.3
@@ -49,7 +49,6 @@
 .Fd #include <limits.h>
 .Ft long
 .Fn strtol "const char *nptr" "char **endptr" "int base"
-
 .Fd #include <sys/types.h>
 .Fd #include <stdlib.h>
 .Fd #include <limits.h>
diff --git a/lib/libc/stdlib/strtoul.3 b/lib/libc/stdlib/strtoul.3
index 6670d55..1bde3e9 100644
--- a/lib/libc/stdlib/strtoul.3
+++ b/lib/libc/stdlib/strtoul.3
@@ -49,7 +49,6 @@
 .Fd #include <limits.h>
 .Ft unsigned long
 .Fn strtoul "const char *nptr" "char **endptr" "int base"
-
 .Fd #include <sys/types.h>
 .Fd #include <stdlib.h>
 .Fd #include <limits.h>
diff --git a/lib/libc/stdtime/strftime.3 b/lib/libc/stdtime/strftime.3
index e7e63d0..d4d4ebf 100644
--- a/lib/libc/stdtime/strftime.3
+++ b/lib/libc/stdtime/strftime.3
@@ -235,7 +235,7 @@ conforms to
 .St -ansiC
 with a lot of extensions including
 .Ql %C ,
-.Ql %D ,
+.Ql \&%D ,
 .Ql %E* ,
 .Ql %e ,
 .Ql %G ,
@@ -254,13 +254,12 @@ with a lot of extensions including
 .Ql \&%V ,
 .Ql %z ,
 .Ql %+ .
-
+.Pp
 The peculiar week number and year in the replacements of
 .Ql %G ,
 .Ql %g
 and
 .Ql \&%V
 are defined in ISO 8601: 1988.
-
 .Sh BUGS
 There is no conversion specification for the phase of the moon.
diff --git a/lib/libc/stdtime/strptime.3 b/lib/libc/stdtime/strptime.3
index f045219..0e06302 100644
--- a/lib/libc/stdtime/strptime.3
+++ b/lib/libc/stdtime/strptime.3
@@ -63,7 +63,7 @@ All conversion specifications are identical to those described in
 Two-digit year values, including formats
 .Fa %y
 and 
-.Fa %D ,
+.Fa \&%D ,
 are now interpreted as beginning at 1969 per POSIX requirements.
 Years 69-00 are interpreted in the 20th century (1969-2000), years
 01-68 in the 21st century (2001-2068).
diff --git a/lib/libc/stdtime/time2posix.3 b/lib/libc/stdtime/time2posix.3
index edef397..c64879b 100644
--- a/lib/libc/stdtime/time2posix.3
+++ b/lib/libc/stdtime/time2posix.3
@@ -88,19 +88,19 @@ and back from,
 the POSIX representation over the leap second inserted at the end of June,
 1993.
 .Bl -column "93/06/30" "23:59:59" "A+0" "X=time2posix(T)"
-.It Sy DATE	TIME	T	X=time2posix(T)	posix2time(X)
-.It 93/06/30	23:59:59	A+0	B+0	A+0
-.It 93/06/30	23:59:60	A+1	B+1	A+1 or A+2
-.It 93/07/01	00:00:00	A+2	B+1	A+1 or A+2
-.It 93/07/01	00:00:01	A+3	B+2	A+3
+.It Sy "DATE	TIME	T	X=time2posix(T)	posix2time(X)"
+.It "93/06/30	23:59:59	A+0	B+0	A+0"
+.It "93/06/30	23:59:60	A+1	B+1	A+1 or A+2"
+.It "93/07/01	00:00:00	A+2	B+1	A+1 or A+2"
+.It "93/07/01	00:00:01	A+3	B+2	A+3"
 .El
 .Pp
 A leap second deletion would look like...
 .Bl -column "??/06/30" "23:59:58" "A+0" "X=time2posix(T)"
-.It Sy DATE	TIME	T	X=time2posix(T)	posix2time(X)
-.It ??/06/30	23:59:58	A+0	B+0	A+0
-.It ??/07/01	00:00:00	A+1	B+2	A+1
-.It ??/07/01	00:00:01	A+2	B+3	A+2
+.It Sy "DATE	TIME	T	X=time2posix(T)	posix2time(X)"
+.It "??/06/30	23:59:58	A+0	B+0	A+0"
+.It "??/07/01	00:00:00	A+1	B+2	A+1"
+.It "??/07/01	00:00:01	A+2	B+3	A+2"
 .El
 .Pp
 .D1 No "[Note: posix2time(B+1) => A+0 or A+1]"
diff --git a/lib/libc/string/strlcpy.3 b/lib/libc/string/strlcpy.3
index 0f2be7c..bc20d45 100644
--- a/lib/libc/string/strlcpy.3
+++ b/lib/libc/string/strlcpy.3
@@ -105,7 +105,7 @@ The following code fragment illustrates the simple case:
 .Bd -literal -offset indent
 char *s, *p, buf[BUFSIZ];
 
-.Li ...
+\&...
 
 (void)strlcpy(buf, s, sizeof(buf));
 (void)strlcat(buf, p, sizeof(buf));
@@ -116,7 +116,7 @@ like the following might be used:
 .Bd -literal -offset indent
 char *dir, *file, pname[MAXPATHLEN];
 
-.Li ...
+\&...
 
 if (strlcpy(pname, dir, sizeof(pname)) >= sizeof(pname))
 	goto toolong;
@@ -130,7 +130,7 @@ speed things up a bit by using a copy instead on an append:
 char *dir, *file, pname[MAXPATHNAMELEN];
 size_t n;
 
-.Li ...
+\&...
 
 n = strlcpy(pname, dir, sizeof(pname));
 if (n >= sizeof(pname))
diff --git a/lib/libc/sys/brk.2 b/lib/libc/sys/brk.2
index b77fb02..09072a4 100644
--- a/lib/libc/sys/brk.2
+++ b/lib/libc/sys/brk.2
@@ -98,9 +98,9 @@ beyond the
 .Em rlim_max
 value returned from a call to
 .Xr getrlimit 2 ,
-e.g.
+e.g.\&
 .Dq etext + rlp\(->rlim_max.
-(see
+(See
 .Xr end 3
 for the definition of
 .Em etext ) .
diff --git a/lib/libc/sys/chflags.2 b/lib/libc/sys/chflags.2
index 4bdf3a0..b97bf95 100644
--- a/lib/libc/sys/chflags.2
+++ b/lib/libc/sys/chflags.2
@@ -144,7 +144,7 @@ will fail if:
 .It Bq Er EBADF
 The descriptor is not valid.
 .It Bq Er EINVAL
-.Fa Fd
+.Fa fd
 refers to a socket, not to a file.
 .It Bq Er EPERM
 The effective user ID does not match the owner of the file and
diff --git a/lib/libc/sys/chmod.2 b/lib/libc/sys/chmod.2
index f2e1d08..1957859 100644
--- a/lib/libc/sys/chmod.2
+++ b/lib/libc/sys/chmod.2
@@ -195,7 +195,7 @@ will fail if:
 .It Bq Er EBADF
 The descriptor is not valid.
 .It Bq Er EINVAL
-.Fa Fd
+.Fa fd
 refers to a socket, not to a file.
 .It Bq Er EROFS
 The file resides on a read-only file system.
diff --git a/lib/libc/sys/chown.2 b/lib/libc/sys/chown.2
index 4ce976c..1ae9bf9 100644
--- a/lib/libc/sys/chown.2
+++ b/lib/libc/sys/chown.2
@@ -127,10 +127,10 @@ An I/O error occurred while reading from or writing to the file system.
 will fail if:
 .Bl -tag -width Er
 .It Bq Er EBADF
-.Fa Fd
+.Fa fd
 does not refer to a valid descriptor.
 .It Bq Er EINVAL
-.Fa Fd
+.Fa fd
 refers to a socket, not a file.
 .It Bq Er EPERM
 The effective user ID is not the super-user.
diff --git a/lib/libc/sys/flock.2 b/lib/libc/sys/flock.2
index a86dfdd..4aa00fb 100644
--- a/lib/libc/sys/flock.2
+++ b/lib/libc/sys/flock.2
@@ -42,10 +42,10 @@
 .Lb libc
 .Sh SYNOPSIS
 .Fd #include <sys/file.h>
-.Fd #define	LOCK_SH		0x01		/* shared file lock */
-.Fd #define	LOCK_EX		0x02		/* exclusive file lock */
-.Fd #define	LOCK_NB		0x04		/* don't block when locking */
-.Fd #define	LOCK_UN		0x08		/* unlock file */
+.Fd "#define	LOCK_SH		0x01		/* shared file lock */"
+.Fd "#define	LOCK_EX		0x02		/* exclusive file lock */"
+.Fd "#define	LOCK_NB		0x04		/* don't block when locking */"
+.Fd "#define	LOCK_UN		0x08		/* unlock file */"
 .Ft int
 .Fn flock "int fd" "int operation"
 .Sh DESCRIPTION
diff --git a/lib/libc/sys/fsync.2 b/lib/libc/sys/fsync.2
index a2c696d..28d996c 100644
--- a/lib/libc/sys/fsync.2
+++ b/lib/libc/sys/fsync.2
@@ -87,10 +87,10 @@ The
 fails if:
 .Bl -tag -width Er
 .It Bq Er EBADF
-.Fa Fd
+.Fa fd
 is not a valid descriptor.
 .It Bq Er EINVAL
-.Fa Fd
+.Fa fd
 refers to a socket, not to a file.
 .It Bq Er EIO
 An I/O error occurred while reading from or writing to the file system.
diff --git a/lib/libc/sys/getitimer.2 b/lib/libc/sys/getitimer.2
index b16cbff..485c067 100644
--- a/lib/libc/sys/getitimer.2
+++ b/lib/libc/sys/getitimer.2
@@ -43,9 +43,9 @@
 .Lb libc
 .Sh SYNOPSIS
 .Fd #include <sys/time.h>
-.Fd #define ITIMER_REAL		0
-.Fd #define ITIMER_VIRTUAL	1
-.Fd #define ITIMER_PROF		2
+.Fd "#define ITIMER_REAL		0"
+.Fd "#define ITIMER_VIRTUAL	1"
+.Fd "#define ITIMER_PROF		2"
 .Ft int
 .Fn getitimer "int which" "struct itimerval *value"
 .Ft int
diff --git a/lib/libc/sys/getrusage.2 b/lib/libc/sys/getrusage.2
index b972c9e..9e44151 100644
--- a/lib/libc/sys/getrusage.2
+++ b/lib/libc/sys/getrusage.2
@@ -44,8 +44,8 @@
 .Fd #include <sys/types.h>
 .Fd #include <sys/time.h>
 .Fd #include <sys/resource.h>
-.Fd #define	RUSAGE_SELF	 0
-.Fd #define	RUSAGE_CHILDREN	-1
+.Fd "#define	RUSAGE_SELF	 0"
+.Fd "#define	RUSAGE_CHILDREN	-1"
 .Ft int
 .Fn getrusage "int who" "struct rusage *rusage"
 .Sh DESCRIPTION
@@ -93,7 +93,9 @@ of the process(es).
 .It Fa ru_maxrss
 the maximum resident set size utilized (in kilobytes).
 .It Fa ru_ixrss
-an \*(lqintegral\*(rq value indicating the amount of memory used
+an
+.Dq integral
+value indicating the amount of memory used
 by the text segment
 that was also shared among other processes.  This value is expressed
 in units of kilobytes * ticks-of-execution.
@@ -111,12 +113,16 @@ stack segment of a process (expressed in units of
 kilobytes * ticks-of-execution).
 .It Fa ru_minflt
 the number of page faults serviced without any I/O activity; here
-I/O activity is avoided by \*(lqreclaiming\*(rq a page frame from
+I/O activity is avoided by
+.Dq reclaiming
+a page frame from
 the list of pages awaiting reallocation.
 .It Fa ru_majflt
 the number of page faults serviced that required I/O activity.
 .It Fa ru_nswap
-the number of times a process was \*(lqswapped\*(rq out of main
+the number of times a process was
+.Dq swapped
+out of main
 memory.
 .It Fa ru_inblock
 the number of times the file system had to perform input.
diff --git a/lib/libc/sys/intro.2 b/lib/libc/sys/intro.2
index e15afc0..e25c5ba 100644
--- a/lib/libc/sys/intro.2
+++ b/lib/libc/sys/intro.2
@@ -375,9 +375,9 @@ A socket operation failed because the destination host was down.
 A socket operation was attempted to an unreachable host.
 .It Er 66 ENOTEMPTY Em "Directory not empty" .
 A directory with entries other than
-.Ql \&.
+.Ql .\&
 and
-.Ql \&..
+.Ql ..\&
 was supplied to a remove directory or rename call.
 .It Er 67 EPROCLIM Em "Too many processes" .
 .It Er 68 EUSERS Em "Too many users" .
@@ -451,6 +451,7 @@ The scheduled operation was canceled.
 While decoding a multibyte character the function came along an 
 invalid or an incomplete sequence of bytes or the given wide 
 character is invalid.
+.El
 .Sh DEFINITIONS
 .Bl -tag -width Ds
 .It  Process ID .
@@ -632,7 +633,7 @@ A directory is a special type of file that contains entries
 that are references to other files.
 Directory entries are called links.  By convention, a directory
 contains at least two links,
-.Ql \&.
+.Ql .\&
 and
 .Ql \&.. ,
 referred to as
@@ -692,7 +693,6 @@ but the permissions for ``other users'' allow access.
 .Pp
 Otherwise, permission is denied.
 .It  Sockets and Address Families
-.Pp
 A socket is an endpoint for communication between processes.
 Each socket has queues for sending and receiving data.
 .Pp
@@ -712,6 +712,7 @@ communications protocols.  Each protocol set supports addresses
 of a certain format.  An Address Family is the set of addresses
 for a specific group of protocols.  Each socket has an address
 chosen from the address family in which the socket was created.
+.El
 .Sh SEE ALSO
 .Xr intro 3 ,
 .Xr perror 3
diff --git a/lib/libc/sys/jail.2 b/lib/libc/sys/jail.2
index 9575288..874a8a6 100644
--- a/lib/libc/sys/jail.2
+++ b/lib/libc/sys/jail.2
@@ -52,7 +52,7 @@ from the inside of the prison.
 The
 .Dq Li ip_number
 can be set to the IP number assigned to the prison.
-.Sh PRISON ?
+.Sh PRISON\ ?
 Once a process has been put in a prison, it and its decendants cannot escape
 the prison.  It is not possible to add a process to a preexisting prison.
 .Pp
diff --git a/lib/libc/sys/kldfind.2 b/lib/libc/sys/kldfind.2
index c9e3d49..78cd3be 100644
--- a/lib/libc/sys/kldfind.2
+++ b/lib/libc/sys/kldfind.2
@@ -62,6 +62,7 @@ fails:
 The data required for this operation could not be read from the kernel space.
 .It Bq Er ENOENT
 The file specified is not loaded in the kernel.
+.El
 .Sh SEE ALSO
 .Xr kldfirstmod 2 ,
 .Xr kldload 2 ,
diff --git a/lib/libc/sys/kldfirstmod.2 b/lib/libc/sys/kldfirstmod.2
index d24b41f..1474f63 100644
--- a/lib/libc/sys/kldfirstmod.2
+++ b/lib/libc/sys/kldfirstmod.2
@@ -55,6 +55,7 @@ or 0 if there are no references.
 The kld file referenced by
 .Fa fileid
 was not found.
+.El
 .Sh SEE ALSO
 .Xr kldfind 2 ,
 .Xr kldload 2 ,
diff --git a/lib/libc/sys/kldload.2 b/lib/libc/sys/kldload.2
index ba6f13e..eb07468 100644
--- a/lib/libc/sys/kldload.2
+++ b/lib/libc/sys/kldload.2
@@ -69,6 +69,7 @@ The file was not found.
 The file format of
 .Fa file
 was unrecognized. 
+.El
 .Sh SEE ALSO
 .Xr kldfind 2 ,
 .Xr kldfirstmod 2 ,
diff --git a/lib/libc/sys/kldstat.2 b/lib/libc/sys/kldstat.2
index b5e2dd8..1187f69 100644
--- a/lib/libc/sys/kldstat.2
+++ b/lib/libc/sys/kldstat.2
@@ -77,6 +77,7 @@ The id of the file specified in
 The load address of the kld file.
 .It size
 The size of the file.
+.El
 .Sh RETURN VALUES
 The function
 .Fn kldstat
@@ -107,6 +108,7 @@ There was a problem copying one, some, or all of the fields into
 in the
 .Fn copyout
 function.
+.El
 .Sh SEE ALSO
 .Xr kldfind 2 ,
 .Xr kldfirstmod 2 ,
diff --git a/lib/libc/sys/kldunload.2 b/lib/libc/sys/kldunload.2
index 0e5554b..6ef3d3a 100644
--- a/lib/libc/sys/kldunload.2
+++ b/lib/libc/sys/kldunload.2
@@ -64,6 +64,7 @@ You don't have access to unlink the file from the kernel.
 The file was not found.
 .It Bq Er EBUSY
 You attempted to unload a file linked by the kernel.
+.El
 .Sh SEE ALSO
 .Xr kldfind 2 ,
 .Xr kldfirstmod 2 ,
diff --git a/lib/libc/sys/kqueue.2 b/lib/libc/sys/kqueue.2
index 5c9e5f8..69c70ca 100644
--- a/lib/libc/sys/kqueue.2
+++ b/lib/libc/sys/kqueue.2
@@ -192,13 +192,13 @@ Arguments may be passed to and from the filter via the
 and
 .Va data
 fields in the kevent structure.
-.Bl -tag
+.Bl -tag -width EVFILT_SIGNAL
 .It EVFILT_READ
 Takes a descriptor as the identifier, and returns whenever
 there is data available to read.
 The behavior of the filter is slightly different depending
 on the descriptor type.
-.Bl -tag
+.Bl -tag -width 2n
 .It Sockets
 Sockets which have previously been passed to
 .Fn listen
@@ -216,16 +216,12 @@ also sets EV_EOF in
 .Va flags .
 It is possible for EOF to be returned (indicating the connection is gone)
 while there is still data pending in the socket buffer.
-.El
-.Bl -tag
 .It Vnodes
 Returns when the file pointer is not at the end of file.
 .Va data
 contains the offset from current position to end of file,
 and may be negative.
-.El
-.Bl -tag
-.It Fifos, Pipes
+.It "Fifos, Pipes"
 Returns when the there is data to read;
 .Va data
 contains the number of bytes available.
@@ -236,8 +232,6 @@ This may be cleared by passing in EV_CLEAR, at which point the
 filter will resume waiting for data to become available before
 returning.
 .El
-.El
-.Bl -tag
 .It EVFILT_WRITE
 Takes a descriptor as the identifier, and returns whenever
 it is possible to write to the descriptor.  For sockets, pipes
@@ -247,8 +241,6 @@ will contain the amount of space remaining in the write buffer.
 The filter will set EV_EOF when the reader disconnects, and for
 the fifo case, this may be cleared by use of EV_CLEAR.
 Note that this filter is not supported for vnodes.
-.El
-.Bl -tag
 .It EVFILT_AIO
 A kevent structure is initialized, with
 .Va ident
@@ -264,8 +256,6 @@ returned by the aio_* function.
 The filter returns under the same conditions as aio_error.
 .Pp
 NOTE: this interface is unstable and subject to change.
-.El
-.Bl -tag
 .It EVFILT_VNODE
 Takes a file descriptor as the identifier and the events to watch for in 
 .Va fflags ,
@@ -290,8 +280,6 @@ The file referenced by the descriptor was renamed.
 On return,
 .Va fflags
 contains the events which triggered the filter.
-.El
-.Bl -tag
 .It EVFILT_PROC
 Takes the process ID to monitor as the identifier and the events to watch for 
 in
diff --git a/lib/libc/sys/ktrace.2 b/lib/libc/sys/ktrace.2
index cc45f91..db4c2d3 100644
--- a/lib/libc/sys/ktrace.2
+++ b/lib/libc/sys/ktrace.2
@@ -70,10 +70,12 @@ The
 parameter specifies the requested ktrace operation.
 The defined operations are:
 .Bl -column KTRFLAG_DESCENDXXX -offset indent
-.It KTROP_SET	Enable trace points specified in Fa trpoints .
-.It KTROP_CLEAR	Disable trace points specified in Fa trpoints .
-.It KTROP_CLEARFILE	Stop all tracing.
-.It KTRFLAG_DESCEND	The tracing change should apply to the
+.It "KTROP_SET	Enable trace points specified in"
+.Fa trpoints .
+.It "KTROP_CLEAR	Disable trace points specified in
+.Fa trpoints .
+.It "KTROP_CLEARFILE	Stop all tracing."
+.It "KTRFLAG_DESCEND	The tracing change should apply to the"
 specified process and all its current children.
 .El
 .Pp
@@ -82,14 +84,14 @@ The
 parameter specifies the trace points of interest.
 The defined trace points are:
 .Bl -column KTRFAC_SYSCALLXXX -offset indent
-.It KTRFAC_SYSCALL	Trace system calls.
-.It KTRFAC_SYSRET	Trace return values from system calls.
-.It KTRFAC_NAMEI	Trace name lookup operations.
-.It KTRFAC_GENIO	Trace all I/O (note that this option can
+.It "KTRFAC_SYSCALL	Trace system calls."
+.It "KTRFAC_SYSRET	Trace return values from system calls."
+.It "KTRFAC_NAMEI	Trace name lookup operations."
+.It "KTRFAC_GENIO	Trace all I/O (note that this option can"
 generate much output).
-.It KTRFAC_PSIG	Trace posted signals.
-.It KTRFAC_CSW	Trace context switch points.
-.It KTRFAC_INHERIT	Inherit tracing to future children.
+.It "KTRFAC_PSIG	Trace posted signals."
+.It "KTRFAC_CSW	Trace context switch points."
+.It "KTRFAC_INHERIT	Inherit tracing to future children."
 .El
 .Pp
 Each tracing event outputs a record composed of a generic header
diff --git a/lib/libc/sys/mmap.2 b/lib/libc/sys/mmap.2
index 7dc5520..a9472c8 100644
--- a/lib/libc/sys/mmap.2
+++ b/lib/libc/sys/mmap.2
@@ -261,7 +261,7 @@ parameters and
 .Fa fd
 was not open for writing.
 .It Bq Er EBADF
-.Fa Fd
+.Fa fd
 is not a valid open file descriptor.
 .It Bq Er EINVAL
 .Dv MAP_FIXED
@@ -293,6 +293,7 @@ parameter wasn't available, or the system has reached the per-process mmap
 limit specified in the vm.max_proc_mmap sysctl.
 .Dv MAP_ANON
 was specified and insufficient memory was available.
+.El
 .Sh "SEE ALSO"
 .Xr madvise 2 ,
 .Xr mincore 2 ,
diff --git a/lib/libc/sys/modfind.2 b/lib/libc/sys/modfind.2
index 8e83d9a..362a606 100644
--- a/lib/libc/sys/modfind.2
+++ b/lib/libc/sys/modfind.2
@@ -62,6 +62,7 @@ fails:
 The data required for this operation could not be read from the kernel space.
 .It Bq Er ENOENT
 The file specified is not loaded in the kernel.
+.El
 .Sh SEE ALSO
 .Xr kldfirstmod 2 ,
 .Xr kldload 2 ,
diff --git a/lib/libc/sys/modstat.2 b/lib/libc/sys/modstat.2
index e02279a..612ef2e 100644
--- a/lib/libc/sys/modstat.2
+++ b/lib/libc/sys/modstat.2
@@ -80,6 +80,7 @@ The id of the module specified in
 .Fa modid .
 .It data
 Module specific data.
+.El
 .Sh RETURN VALUES
 .Fn modstat
 seems to always return 0.
@@ -106,6 +107,7 @@ There was a problem copying one, some, or all of the fields into
 in the
 .Fn copyout
 function.
+.El
 .Sh SEE ALSO
 .Xr kldfind 2 ,
 .Xr kldfirstmod 2 ,
diff --git a/lib/libc/sys/msync.2 b/lib/libc/sys/msync.2
index ae4b2e9..f9a7199 100644
--- a/lib/libc/sys/msync.2
+++ b/lib/libc/sys/msync.2
@@ -91,6 +91,7 @@ was both MS_ASYNC and MS_INVALIDATE.
 Only one of these flags is allowed.
 .It Bq Er EIO
 An I/O error occurred while writing to the file system.
+.El
 .Sh SEE ALSO
 .Xr madvise 2 ,
 .Xr mincore 2 ,
diff --git a/lib/libc/sys/munmap.2 b/lib/libc/sys/munmap.2
index 264e13f..230ec4b 100644
--- a/lib/libc/sys/munmap.2
+++ b/lib/libc/sys/munmap.2
@@ -71,6 +71,7 @@ parameter was not page aligned, the
 parameter was negative, or
 some part of the region being unmapped is outside the
 valid address range for a process.
+.El
 .Sh "SEE ALSO"
 .Xr madvise 2 ,
 .Xr mincore 2 ,
diff --git a/lib/libc/sys/pathconf.2 b/lib/libc/sys/pathconf.2
index 25d30b3..51eaa11 100644
--- a/lib/libc/sys/pathconf.2
+++ b/lib/libc/sys/pathconf.2
@@ -75,7 +75,7 @@ Symbolic constants for each name value are found in the include file
 .Pp
 The available values are as follows:
 .Pp
-.Bl -tag -width "123456"
+.Bl -tag -width 6n
 .Pp
 .It Li _PC_LINK_MAX
 The maximum file link count.
diff --git a/lib/libc/sys/ptrace.2 b/lib/libc/sys/ptrace.2
index 44db9f8..708f9ac 100644
--- a/lib/libc/sys/ptrace.2
+++ b/lib/libc/sys/ptrace.2
@@ -309,6 +309,7 @@ on a process in violation of the requirements listed under
 .Dv PT_ATTACH
 above.
 .El
+.El
 .Sh SEE ALSO
 .Xr execve 2 ,
 .Xr sigaction 2 ,
diff --git a/lib/libc/sys/rename.2 b/lib/libc/sys/rename.2
index 8a94b4d..31678f5 100644
--- a/lib/libc/sys/rename.2
+++ b/lib/libc/sys/rename.2
@@ -184,7 +184,7 @@ points outside the process's allocated address space.
 is a parent directory of
 .Fa to ,
 or an attempt is made to rename
-.Ql \&.
+.Ql .\&
 or
 .Ql \&.. .
 .It Bq Er ENOTEMPTY
diff --git a/lib/libc/sys/rmdir.2 b/lib/libc/sys/rmdir.2
index a8b94fb..523bc21 100644
--- a/lib/libc/sys/rmdir.2
+++ b/lib/libc/sys/rmdir.2
@@ -51,7 +51,7 @@ whose name is given by
 .Fa path .
 The directory must not have any entries other
 than
-.Ql \&.
+.Ql .\&
 and
 .Ql \&.. .
 .Sh RETURN VALUES
@@ -72,9 +72,9 @@ The named directory does not exist.
 Too many symbolic links were encountered in translating the pathname.
 .It Bq Er ENOTEMPTY
 The named directory contains files other than
-.Ql \&.
+.Ql .\&
 and
-.Ql \&..
+.Ql ..\&
 in it.
 .It Bq Er EACCES
 Search permission is denied for a component of the path prefix.
diff --git a/lib/libc/sys/rtprio.2 b/lib/libc/sys/rtprio.2
index 51d3367..517d1dd 100644
--- a/lib/libc/sys/rtprio.2
+++ b/lib/libc/sys/rtprio.2
@@ -102,6 +102,7 @@ root is allowed to change the realtime priority of any process, and non-root
 may only change the idle priority of the current process.
 .It Bq Er ESRCH
 The specified process was not found.
+.El
 .Sh AUTHORS
 .An -nosplit
 The original author was
diff --git a/lib/libc/sys/sched_yield.2 b/lib/libc/sys/sched_yield.2
index 5189735..41f0af3 100644
--- a/lib/libc/sys/sched_yield.2
+++ b/lib/libc/sys/sched_yield.2
@@ -54,6 +54,7 @@ will be set to the corresponding value:
 .Bl -tag -width Er
 .It Bq Er ENOSYS
 The system is not configured to support this functionality.
+.El
 .Sh STANDARDS
 The
 .Fn sched_yield 
diff --git a/lib/libc/sys/semctl.2 b/lib/libc/sys/semctl.2
index 8184c09..6fa120b 100644
--- a/lib/libc/sys/semctl.2
+++ b/lib/libc/sys/semctl.2
@@ -174,6 +174,7 @@ the semaphore set's owner or creator.
 .It Bq Er EACCES
 Permission denied due to mismatch between operation and mode of
 semaphore set.
+.El
 .Sh SEE ALSO
 .Xr semget 2 ,
 .Xr semop 2
diff --git a/lib/libc/sys/semget.2 b/lib/libc/sys/semget.2
index f8175a4..cdcd964 100644
--- a/lib/libc/sys/semget.2
+++ b/lib/libc/sys/semget.2
@@ -134,6 +134,7 @@ The kernel could not allocate a
 No semaphore set was found corresponding to
 .Fa key ,
 and IPC_CREAT was not specified.
+.El
 .Sh SEE ALSO
 .Xr semctl 2 ,
 .Xr semop 2 ,
diff --git a/lib/libc/sys/semop.2 b/lib/libc/sys/semop.2
index 80498c9..faf0224 100644
--- a/lib/libc/sys/semop.2
+++ b/lib/libc/sys/semop.2
@@ -191,6 +191,7 @@ Too many operations were specified.
 .\"
 .Fa sem_num
 was not in the range of valid semaphores for the set.
+.El
 .Sh SEE ALSO
 .Xr semctl 2 ,
 .Xr semget 2
diff --git a/lib/libc/sys/setresuid.2 b/lib/libc/sys/setresuid.2
index d73f726..e6bae06 100644
--- a/lib/libc/sys/setresuid.2
+++ b/lib/libc/sys/setresuid.2
@@ -64,6 +64,7 @@ The calling process was not privileged
 and tried to change one or more IDs to a value
 which was not the current real ID, the current effective ID
 nor the current saved ID.
+.El
 .Sh SEE ALSO
 .Xr getegid 2 ,
 .Xr geteuid 2 ,
diff --git a/lib/libc/sys/shmat.2 b/lib/libc/sys/shmat.2
index 01cbc53..3140847 100644
--- a/lib/libc/sys/shmat.2
+++ b/lib/libc/sys/shmat.2
@@ -108,6 +108,7 @@ will fail if:
 .It Bq Er EINVAL
 .Fa addr
 does not point to a shared memory segment.
+.El
 .Sh "SEE ALSO"
 .Xr shmctl 2 ,
 .Xr shmget 2
diff --git a/lib/libc/sys/shmctl.2 b/lib/libc/sys/shmctl.2
index 22b08ff..9b5e876 100644
--- a/lib/libc/sys/shmctl.2
+++ b/lib/libc/sys/shmctl.2
@@ -132,6 +132,7 @@ the shared memory segment's owner or creator.
 .It Bq Er EACCES
 Permission denied due to mismatch between operation and mode of
 shared memory segment.
+.El
 .Sh "SEE ALSO"
 .Xr shmat 2 ,
 .Xr shmdt 2 ,
diff --git a/lib/libc/sys/shmget.2 b/lib/libc/sys/shmget.2
index a09099c..88d3b4a 100644
--- a/lib/libc/sys/shmget.2
+++ b/lib/libc/sys/shmget.2
@@ -133,7 +133,7 @@ IPC_CREAT and IPC_EXCL were specified, and a shared memory segment
 corresponding to
 .Fa key
 already exists.
-.Pp
+.El
 .Sh "SEE ALSO" 
 .Xr shmat 2 ,
 .Xr shmctl 2 ,
diff --git a/lib/libc/sys/sigaction.2 b/lib/libc/sys/sigaction.2
index 4fec421..d0889b4 100644
--- a/lib/libc/sys/sigaction.2
+++ b/lib/libc/sys/sigaction.2
@@ -265,13 +265,13 @@ The following is a list of all signals
 with names as in the include file
 .Aq Pa signal.h :
 .Bl -column SIGVTALARMXX "create core imagexxx"
-.It Sy "  NAME  " "	Default Action  " "	Description"
+.It Sy "NAME	Default Action	Description"
 .It Dv SIGHUP No "	terminate process" "	terminal line hangup"
 .It Dv SIGINT No "	terminate process" "	interrupt program"
 .It Dv SIGQUIT No "	create core image" "	quit program"
 .It Dv SIGILL No "	create core image" "	illegal instruction"
 .It Dv SIGTRAP No "	create core image" "	trace trap"
-.It Dv SIGABRT No "	create core image" Xr 	abort 3
+.It Dv SIGABRT No "	create core image" Ta Xr abort 3
 call (formerly
 .Dv SIGIOT )
 .It Dv SIGEMT No "	create core image" "	emulate instruction executed"
@@ -428,14 +428,14 @@ is set to indicated the reason.
 There are three possible prototypes the handler may match:
 .Bl -tag -offset indent -width short
 .It ANSI C:
-.Fd
-void handler(int);
+.Ft void
+.Fn handler int ;
 .It Traditional BSD style:
-.Fd
-void handler(int, int code, struct sigcontext *scp);
+.Ft void
+.Fn handler int "int code" "struct sigcontext *scp" ;
 .It POSIX SA_SIGINFO:
-.Fd
-void handler(int, siginfo_t *info, void *context);
+.Ft void
+.Fn handler int "siginfo_t *info" "void *context" ;
 .El
 .Pp
 The handler function should match the SA_SIGINFO prototype if the
diff --git a/lib/libc/sys/sigprocmask.2 b/lib/libc/sys/sigprocmask.2
index 2948c50..ff60beb 100644
--- a/lib/libc/sys/sigprocmask.2
+++ b/lib/libc/sys/sigprocmask.2
@@ -109,6 +109,7 @@ of the following occurs:
 .It Bq Er EINVAL
 .Fa how
 has a value other than those listed here.
+.El
 .Sh SEE ALSO
 .Xr kill 2 ,
 .Xr sigaction 2 ,
diff --git a/lib/libc/sys/socket.2 b/lib/libc/sys/socket.2
index 5e37c55..1cf4616 100644
--- a/lib/libc/sys/socket.2
+++ b/lib/libc/sys/socket.2
@@ -142,7 +142,9 @@ Normally only a single protocol exists to support a particular
 socket type within a given protocol family.  However, it is possible
 that many protocols may exist, in which case a particular protocol
 must be specified in this manner.  The protocol number to use is
-particular to the \*(lqcommunication domain\*(rq in which communication
+particular to the
+.Dq "communication domain"
+in which communication
 is to take place; see
 .Xr protocols 5 .
 .Pp
diff --git a/lib/libc/sys/socketpair.2 b/lib/libc/sys/socketpair.2
index c06d7ed..ae4c337 100644
--- a/lib/libc/sys/socketpair.2
+++ b/lib/libc/sys/socketpair.2
@@ -79,6 +79,7 @@ The address
 .Fa sv
 does not specify a valid part of the
 process address space.
+.El
 .Sh SEE ALSO
 .Xr pipe 2 ,
 .Xr read 2 ,
diff --git a/lib/libc/sys/statfs.2 b/lib/libc/sys/statfs.2
index faafea0..3f49d59 100644
--- a/lib/libc/sys/statfs.2
+++ b/lib/libc/sys/statfs.2
@@ -168,7 +168,7 @@ error occurred while reading from or writing to the file system.
 fails if one or more of the following are true:
 .Bl -tag -width Er
 .It Bq Er EBADF
-.Fa Fd
+.Fa fd
 is not a valid open file descriptor.
 .It Bq Er EFAULT
 .Fa Buf
diff --git a/lib/libc/sys/swapon.2 b/lib/libc/sys/swapon.2
index 99e4261..998d9a4 100644
--- a/lib/libc/sys/swapon.2
+++ b/lib/libc/sys/swapon.2
@@ -99,6 +99,7 @@ An I/O error occurred while opening the swap device.
 .It Bq Er EFAULT
 .Fa Special
 points outside the process's allocated address space.
+.El
 .Sh SEE ALSO
 .Xr config 8 ,
 .Xr swapon 8
diff --git a/lib/libc_r/man/pthread_condattr.3 b/lib/libc_r/man/pthread_condattr.3
index 6b8a983..d17d59e 100644
--- a/lib/libc_r/man/pthread_condattr.3
+++ b/lib/libc_r/man/pthread_condattr.3
@@ -74,6 +74,7 @@ will fail if:
 .It Bq Er EINVAL
 Invalid value for
 .Fa attr .
+.El
 .Sh SEE ALSO
 .Xr pthread_cond_init 3
 .Sh STANDARDS
diff --git a/lib/libcompat/4.1/cftime.3 b/lib/libcompat/4.1/cftime.3
index afefee3..ed771e2 100644
--- a/lib/libcompat/4.1/cftime.3
+++ b/lib/libcompat/4.1/cftime.3
@@ -68,7 +68,7 @@ overflow condition.
 Use
 .Xr strftime 3
 instead.
-
+.Pp
 .Fn Ascftime
 is almost identical with
 .Xr strftime 3 ,
@@ -80,7 +80,7 @@ parameter defaults to
 if a
 .Em NULL
 pointer is given.
-
+.Pp
 .Fn Cftime
 does the same job, but it first invokes
 .Xr localtime 3
@@ -89,7 +89,6 @@ in order to convert the given
 then also performs the conversions as requested by the
 .Fa format
 argument.
-
 .Sh RETURN VALUES
 The
 .Fn cftime
@@ -99,7 +98,6 @@ functions return the number of characters written to the output
 buffer
 .Fa s ,
 not counting the trailing null character.
-
 .Sh SEE ALSO
 .Xr localtime 3 ,
 .Xr strftime 3
diff --git a/lib/libcompat/4.1/getpw.3 b/lib/libcompat/4.1/getpw.3
index 17c4478..d270e3c 100644
--- a/lib/libcompat/4.1/getpw.3
+++ b/lib/libcompat/4.1/getpw.3
@@ -68,7 +68,7 @@ The
 function returns the zero if successful, otherwise 
 a non-zero if the entry does not exist.
 .Sh FILES
-.Bl -tag -width /etc/passwd - compact
+.Bl -tag -width /etc/passwd -compact
 .It Pa /etc/passwd
 .El
 .Sh SEE ALSO
@@ -83,7 +83,7 @@ function appeared in
 The area pointed to by
 .Fa buf
 must be large enough to hold the user name.
-
+.Pp
 All of the bugs from
 .Xr getpwent 3
 hold valid as well.
diff --git a/lib/libcompat/4.3/insque.3 b/lib/libcompat/4.3/insque.3
index bc8cc5c..e2adae1 100644
--- a/lib/libcompat/4.3/insque.3
+++ b/lib/libcompat/4.3/insque.3
@@ -49,7 +49,7 @@ struct qelem {
 	char	q_data[];
 };
 .Ed
-
+.Pp
 .Ft void
 .Fn insque "struct qelem *elem" "struct qelem *pred"
 .Ft void
diff --git a/lib/libcompat/4.4/cuserid.3 b/lib/libcompat/4.4/cuserid.3
index 4f53da7..e52c64b 100644
--- a/lib/libcompat/4.4/cuserid.3
+++ b/lib/libcompat/4.4/cuserid.3
@@ -63,14 +63,14 @@ for at least
 characters.
 The L_cuserid constant is defined in
 .Pa Aq stdio.h .
-
+.Pp
 If
 .Fa s
 is NULL, an internal array is used and its address will be returned.
 .Sh RETURN VALUES
 .Fn cuserid
 returns the address of an array in which the name has been stored.
-
+.Pp
 If the name associated with the effective UID of the current process
 could not be found, either a null pointer will be returned, or
 .Po
diff --git a/lib/libcrypt/crypt.3 b/lib/libcrypt/crypt.3
index 56b8c37..b6ee8ff 100644
--- a/lib/libcrypt/crypt.3
+++ b/lib/libcrypt/crypt.3
@@ -170,8 +170,8 @@ to 16 characters--because the length of the returned output is also limited
 .Pp
 Currently supported algorithms are:
 .Pp
-.Bl -tag -width 012345678 -compact -offset indent
-.It 1
+.Bl -enum -compact -offset indent
+.It
 MD5
 .El
 .Pp
diff --git a/lib/libdevstat/devstat.3 b/lib/libdevstat/devstat.3
index d5194c1..8b8ff14 100644
--- a/lib/libdevstat/devstat.3
+++ b/lib/libdevstat/devstat.3
@@ -341,7 +341,7 @@ Currently known match types include:
 .Pp
 .Bl -tag -width indent -compact
 .It device type:
-.Bl -tag -width 123456789 -compact
+.Bl -tag -width 9n -compact
 .It da 
 Direct Access devices
 .It sa
@@ -371,7 +371,7 @@ Floppy devices
 .El
 .Pp
 .It interface:
-.Bl -tag -width 123456789 -compact
+.Bl -tag -width 9n -compact
 .It IDE
 Integrated Drive Electronics devices
 .It SCSI
@@ -381,7 +381,7 @@ Any other device interface
 .El
 .Pp
 .It passthrough:
-.Bl -tag -width 123456789 -compact
+.Bl -tag -width 9n -compact
 .It pass
 Passthrough devices
 .El
diff --git a/lib/libdisk/libdisk.3 b/lib/libdisk/libdisk.3
index d77c039..db582ec 100644
--- a/lib/libdisk/libdisk.3
+++ b/lib/libdisk/libdisk.3
@@ -65,7 +65,7 @@
 .Sh SYNOPSIS
 .Fd #include <sys/types.h>
 .Fd #include <libdisk.h>
-
+.Pp
 .Dv extern const char *chunk_n[];
 .Ft const char *
 .Fn slice_type_name "int type" "int subtype"
diff --git a/lib/libftpio/ftpio.3 b/lib/libftpio/ftpio.3
index 8e1b86f..6815992 100644
--- a/lib/libftpio/ftpio.3
+++ b/lib/libftpio/ftpio.3
@@ -80,7 +80,6 @@
 .Fn ftpGetURLAf "char *url" "int af" "char *user" "char *passwd" "int *retcode"
 .Ft FILE *
 .Fn ftpPutURLAf "char *url" "int af" "char *user" "char *passwd" "int *retcode"
-
 .Sh DESCRIPTION
 These functions implement a high-level library for managing FTP connections.
 .Pp
@@ -206,7 +205,7 @@ are same as
 except that they are able to specify address family
 .Fa af .
 .Sh ENVIRONMENT
-.Bl -tag -width FTP_PASSIVE_MODE -offset 123
+.Bl -tag -width FTP_PASSIVE_MODE -offset 3n
 .It Ev FTP_TIMEOUT
 Maximum time, in seconds, to wait for a response
 from the peer before aborting an 
diff --git a/lib/libm/common_source/atan2.3 b/lib/libm/common_source/atan2.3
index bf4ddcd..0751124 100644
--- a/lib/libm/common_source/atan2.3
+++ b/lib/libm/common_source/atan2.3
@@ -90,7 +90,7 @@ if x = y = 0, or
 .Pf sign( Ar y Ns )*\\*(Pi/2 Ta
 if
 .Ar x
-= 0 \*(!=
+= 0 \(!=
 .Ar y .
 .El
 .Sh NOTES
diff --git a/lib/libm/common_source/infnan.3 b/lib/libm/common_source/infnan.3
index 7a2d6d3..1a1d651 100644
--- a/lib/libm/common_source/infnan.3
+++ b/lib/libm/common_source/infnan.3
@@ -127,22 +127,15 @@ revised
 .Fn infnan
 to return.  And a C program to
 implement that suggestion follows. 
-.sp 0.5
-.Bd -filled -offset indent
-.Bl -column "IEEE Signal" "IEEE Default" XXERANGE ERANGEXXorXXEDOM XXXXXX
-.It IEEE Signal	IEEE Default Ta
-.Fa iarg Ta
-.Va errno Ta
-.Fn infnan
-.It Invalid	\*(Na Ta
-.Er EDOM	EDOM	0
-.It Overflow	\(+-\*(If Ta
-.Er ERANGE	ERANGE Ta
-.Dv HUGE
-.It Div\-by\-0	\(+-Infinity Ta
-.Er \(+-ERANGE	ERANGE or EDOM	\(+-HUGE
-.It 	( Ns Dv HUGE No "= 1.7e38 ... nearly  2.0**127)"
+.Bl -column "IEEE Signal" "IEEE Default" XXERANGE ERANGEXXorXXEDOM
+.It "IEEE Signal	IEEE Default	" Fa iarg Ta Va errno Ta Fn infnan
+.It "Invalid	\*(Na	" Er "EDOM	EDOM	0"
+.It "Overflow	\(+-\*(If	" Er "ERANGE	ERANGE" Ta Dv HUGE
+.It "Div\-by\-0	\(+-Infinity	" Er "\(+-ERANGE	ERANGE or EDOM" Ta Dv \(+-HUGE
 .El
+.Bd -ragged -offset center -compact
+.Dv ( HUGE
+= 1.7e38 ... nearly 2.0**127)
 .Ed
 .Pp
 ALTERNATIVE
diff --git a/lib/libm/common_source/j0.3 b/lib/libm/common_source/j0.3
index c83fcc5..8fc32e8 100644
--- a/lib/libm/common_source/j0.3
+++ b/lib/libm/common_source/j0.3
@@ -75,7 +75,7 @@ real value
 the function
 .Fn jn
 computes the
-.Em Bessel function of the first kind of the integer order
+.Em "Bessel function of the first kind of the integer order"
 .Fa n
 for the real value
 .Fa x .
@@ -97,7 +97,7 @@ value
 the function
 .Fn yn
 computes the
-.Em Bessel function of the second kind for the integer order
+.Em "Bessel function of the second kind for the integer order"
 .Fa n
 for the positive 
 .Em integer
diff --git a/lib/libpam/modules/pam_radius/pam_radius.8 b/lib/libpam/modules/pam_radius/pam_radius.8
index 05f89ff..a36e66e 100644
--- a/lib/libpam/modules/pam_radius/pam_radius.8
+++ b/lib/libpam/modules/pam_radius/pam_radius.8
@@ -96,8 +96,9 @@ defined for
 .Pp
 If this option is omitted, and there is no username
 in the system databases equal to the supplied one (as determined by call to
-.Xr getpwnam 3 Ns ),
+.Xr getpwnam 3 ) ,
 the authentication will fail.
+.El
 .Sh FILES
 .Bl -tag -width /etc/radius.conf -compact
 .It Pa /etc/radius.conf
diff --git a/lib/libposix1e/acl.3 b/lib/libposix1e/acl.3
index 12dc9a6..74690fb 100644
--- a/lib/libposix1e/acl.3
+++ b/lib/libposix1e/acl.3
@@ -50,7 +50,7 @@ extensions defined that allow for alternative ACL semantics than the
 POSIX.1e semantics, such as AFS, NTFS, Coda, and NWFS semantics.  Where
 routines are non-standard, they are suffixed with _np to indicate that
 they are not portable.
-
+.Pp
 POSIX.1e describes a set of ACL manipulation routines to manage the
 contents of ACLs, as well as their relationships with files.  This
 manipulation library is not currently implemented in
@@ -68,73 +68,73 @@ and
 .Fn acl_to_text ,
 passed directly to and from the management routines.  In this manner,
 an application can remain safely unaware of the contents of ACLs.
-
+.Pp
 Available functions, sorted by behavior, include:
-
+.Pp
 .Fn acl_delete_def_file ,
 .Fn acl_delete_file_np ,
-.Fn acl_delete_fd_np 
-
+.Fn acl_delete_fd_np
+.Pp
 These functions are described in
 .Xr acl_delete 3 ,
 and may be used to delete ACLs from file system objects.
-
+.Pp
 .Fn acl_free
-
+.Pp
 This function is described in
 .Xr acl_free 3 ,
 and may be used to free userland working ACL storage.
-
+.Pp
 .Fn acl_from_text
-
+.Pp
 This function is described in
 .Xr acl_from_text 3 ,
 and may be used to convert a text-form ACL into working ACL state, if
 the ACL has POSIX.1e semantics.
-
+.Pp
 .Fn acl_get_file ,
 .Fn acl_get_fd ,
 .Fn acl_get_fd_np
-
+.Pp
 These functions are described in
 .Xr acl_get 3 ,
 and may be used to retrieve ACLs from file system objects.
-
+.Pp
 .Fn acl_init
-
+.Pp
 This function is described in
 .Xr acl_init 3 ,
 and may be used to allocate a fresh (empty) ACL structure.
-
+.Pp
 .Fn acl_dup
-
+.Pp
 This function is described in
 .Xr acl_dup 3 ,
 and may be used to duplicate an ACL structure.
-
+.Pp
 .Fn acl_set_file ,
 .Fn acl_set_fd ,
 .Fn acl_set_fd_np
-
+.Pp
 These functions are described in
 .Xr acl_set 3 ,
 and may be used to assign an ACL to a file system object.
-
+.Pp
 .Fn acl_to_text
-
+.Pp
 This function is described in
 .Xr acl_to_text 3 ,
 and may be used to generate a text-form of a POSIX.1e semantics ACL.
-
+.Pp
 .Fn acl_valid ,
 .Fn acl_valid_file_np ,
 .Fn acl_valid_fd_np
-
+.Pp
 Thee functions are described in
 .Xr acl_valid 3 ,
 and may be used to validate an ACL as correct POSIX.1e-semantics, or
 as appropriate for a particular file system object regardless of semantics.
-
+.Pp
 Documentation of the internal kernel interfaces backing these calls may
 be found in
 .Xr acl 9 .
diff --git a/lib/libposix1e/acl_delete.3 b/lib/libposix1e/acl_delete.3
index bcbc54b..9ab46db 100644
--- a/lib/libposix1e/acl_delete.3
+++ b/lib/libposix1e/acl_delete.3
@@ -91,7 +91,7 @@ argument points to an empty string.
 Insufficient memory available to fulfill request.
 .It Bq Er ENOTDIR
 A component of the path prefix is not a directory.
-
+.Pp
 Argument
 .Va path_p
 must be a directory, and is not.
diff --git a/lib/libposix1e/acl_dup.3 b/lib/libposix1e/acl_dup.3
index 1e98084..8ed7915 100644
--- a/lib/libposix1e/acl_dup.3
+++ b/lib/libposix1e/acl_dup.3
@@ -43,14 +43,14 @@ The
 .Fn acl_dup
 function returns a pointer to a copy of the ACL pointed to by the argument
 .Va acl .
-
+.Pp
 This function may cause memory to be allocated.  The caller should free any
 releasable memory, when the new ACL is no longer required, by calling
 .Xr acl_free 3
 with the
 .Va (void*)acl_t
 as an argument.
-
+.Pp
 Any existing ACL pointers that refer to the ACL referred to by
 .Va acl
 shall continue to refer to the ACL.
diff --git a/lib/libposix1e/acl_from_text.3 b/lib/libposix1e/acl_from_text.3
index 37bc421..41f36b8 100644
--- a/lib/libposix1e/acl_from_text.3
+++ b/lib/libposix1e/acl_from_text.3
@@ -45,7 +45,7 @@ function converts the text form of an ACL referred to by
 .Va buf_p
 into the internal working structure for ACLs, appropriate for applying to
 files or manipulating.
-
+.Pp
 This function may cause memory to be allocated.  The caller should free any
 releasable memory, when the new ACL is no longer required, by calling
 .Xr acl_free 3
diff --git a/lib/libposix1e/acl_get.3 b/lib/libposix1e/acl_get.3
index af523e4..ed017d7 100644
--- a/lib/libposix1e/acl_get.3
+++ b/lib/libposix1e/acl_get.3
@@ -62,14 +62,14 @@ from a file descriptor.
 is a non-portable form of
 .Fn acl_get_fd
 that allows the retrieval of any type of ACL from a file descriptor.
-
+.Pp
 This function may cause memory to be allocated.  The caller should free
 any releasable memory, when the new ACL is no longer required, by calling
 .Xr acl_free 3
 with the
 .Va (void *)acl_t
 as an argument.
-
+.Pp
 The ACL in the working storage is an independent copy of the ACL associated
 with the object referred to by
 .Va fd .
diff --git a/lib/libposix1e/acl_init.3 b/lib/libposix1e/acl_init.3
index 18e5118..f6c75fe 100644
--- a/lib/libposix1e/acl_init.3
+++ b/lib/libposix1e/acl_init.3
@@ -49,7 +49,7 @@ storage allocated to contain the ACL is freed by a call to
 .Xr acl_free 3 .
 When the area is first allocated, it shall contain an an ACL that contains
 no ACL entries.
-
+.Pp
 This function may cause memory to be allocated.  The caller should free any
 releasable memory, when the new ACL is no longer required, by calling
 .Xr acl_free 3
diff --git a/lib/libposix1e/acl_to_text.3 b/lib/libposix1e/acl_to_text.3
index cfc4acb..e49fdfa 100644
--- a/lib/libposix1e/acl_to_text.3
+++ b/lib/libposix1e/acl_to_text.3
@@ -51,7 +51,7 @@ including the NULL terminator) in the location pointed to by
 The format of the text string returned by
 .Fn acl_to_text
 shall be the POSIX.1e long ACL form.
-
+.Pp
 This function allocates any memory necessary to contain the string and
 returns a pointer to the string.  The caller should free any releasable
 memory, when the new string is no longer required, by calling
@@ -83,7 +83,7 @@ to the corresponding value:
 Argument
 .Va acl
 does not point to a valid ACL.
-
+.Pp
 The ACL denoted by
 .Va acl
 contains one or more improperly formed ACL entries, or for some other
@@ -112,7 +112,7 @@ and development continues.
 .An Robert N M Watson
 .Sh BUGS
 These features are not yet fully implemented.
-
+.Pp
 .Fn acl_from_text
 and
 .Fn acl_to_text
diff --git a/lib/libposix1e/acl_valid.3 b/lib/libposix1e/acl_valid.3
index e3f0537..aeae264 100644
--- a/lib/libposix1e/acl_valid.3
+++ b/lib/libposix1e/acl_valid.3
@@ -58,7 +58,7 @@ allow an ACL to be checked in the context of a specific acl type,
 .Va type ,
 and file system object.  In environments where additional ACL types are
 supported than just POSIX.1e, this makes more sense.
-
+.Pp
 For POSIX.1e semantics, the checks include:
 .Bd -literal -offset indent
 The three required entries (ACL_USER_OBJ, ACL_GROUP_OBJ,
@@ -67,14 +67,14 @@ the ACL contains any ACL_USER, ACL_GROUP, or any other
 implementation-defined entries in the file group class
 then one ACL_MASK entry shall also be required.  The ACL
 shall contain at most on ACL_MASK entry.
-
+.Pp
 The qualifier field shall be unique among all entries of
 the same POSIX.1e ACL facility defined tag type.  The 
 tag type field shall contain valid values including any
 implementation-defined values.  Validation of the values
 of the qualifier field is implementation-defined.
 .Ed
-
+.Pp
 The POSIX.1e
 .Fn acl_valid
 function may reorder the ACL for the purposes of verification; the
@@ -105,12 +105,12 @@ argument is not a valid file descriptor.
 Argument
 .Va acl
 does not point to a valid ACL.
-
+.Pp
 One or more of the required ACL entries is not present in
 .Va acl .
-
+.Pp
 The ACL contains entries that are not unique.
-
+.Pp
 The file system rejects the ACL based on fs-specific semantics issues.
 .It Bq Er ENAMETOOLONG
 A component of a pathname exceeded 255 characters, or an
diff --git a/lib/libposix1e/cap_dup.3 b/lib/libposix1e/cap_dup.3
index fdd4cad..2e874a5 100644
--- a/lib/libposix1e/cap_dup.3
+++ b/lib/libposix1e/cap_dup.3
@@ -52,7 +52,7 @@ the other in any way.
 This function may cause memory to be allocated.
 The caller should free any releasable memory, when the capability state in
 working storage is no longer required, by calling
-.Vn cap_free
+.Fn cap_free
 with the cap_t as an argument.
 .Sh IMPLEMENTATION NOTES
 FreeBSD's support for POSIX.1e interfaces and features is still under
diff --git a/lib/libposix1e/cap_free.3 b/lib/libposix1e/cap_free.3
index ed77355..d83f180 100644
--- a/lib/libposix1e/cap_free.3
+++ b/lib/libposix1e/cap_free.3
@@ -32,7 +32,7 @@
 .Os FreeBSD
 .Sh NAME
 .Nm cap_free
-.Nd Release Memory Allocated to a Capability State in Working Storage
+.Nd "Release Memory Allocated to a Capability State in Working Storage"
 .Sh SYNOPSIS
 .Fd #include <sys/types.h>
 .Fd #include <sys/capability.h>
diff --git a/lib/libposix1e/cap_init.3 b/lib/libposix1e/cap_init.3
index 47e4fe3..3e47c9f 100644
--- a/lib/libposix1e/cap_init.3
+++ b/lib/libposix1e/cap_init.3
@@ -49,7 +49,7 @@ implementation shall be cleared.
 This function may cause memory to be allocated.
 The caller should free any releasable memory, when the capability state in
 working storage is no longer required, by calling
-.Vn cap_free
+.Fn cap_free
 with the cap_t as an argument.
 .Sh IMPLEMENTATION NOTES
 FreeBSD's support for POSIX.1e interfaces and features is still under
diff --git a/lib/libposix1e/cap_to_text.3 b/lib/libposix1e/cap_to_text.3
index a3bd762..881af03 100644
--- a/lib/libposix1e/cap_to_text.3
+++ b/lib/libposix1e/cap_to_text.3
@@ -56,7 +56,7 @@ null terminator) in the location pointed to by
 The capability state in working storage idenfied by
 .Va cap_p
 shall be completely represented in the returned string.
-
+.Pp
 This function may cause memory to be allocated.
 The caller should free any releasable memory, when the capability state
 in working memory is no longer required, by calling
diff --git a/lib/libposix1e/posix1e.3 b/lib/libposix1e/posix1e.3
index 9a5afea..40de11d 100644
--- a/lib/libposix1e/posix1e.3
+++ b/lib/libposix1e/posix1e.3
@@ -44,7 +44,7 @@ it describes are now widely used despite inherent limitations.  Currently,
 only a few of the interfaces and features are implemented in
 .Fx ,
 although efforts are underway to complete the integration at this time.
-
+.Pp
 POSIX.1e describes five security extensions to the base POSIX.1 API:
 Access Control Lists (ACLs), Auditing, Capabilities, Mandatory Access
 Control, and Information Flow Labels.  Of these, the ACL interfaces are
@@ -53,7 +53,7 @@ currently included with
 Auditing, Capabilities, and Mandatory
 Access Control are in the wings, and Information Flow Labels are not on
 the calendar.
-
+.Pp
 POSIX.1e defines both syntax and semantics for these features, but fairly
 substantial changes are required to implement these features in the 
 operating system.  As shipped,
@@ -64,18 +64,17 @@ access to and manipulation of these ACLs, but support for ACLs is not
 provided by any file systems shipped in the base operating system.
 Available API calls relating to ACLs are described in detail in
 .Xr acl 3 .
-
+.Pp
 .Fx
 currently provides documentation and APIs for fine-grained capability
 support, but implementation is currently not included in the base
 system.  Documentation of these API calls is provided in
 .Xr cap 3 .
-
+.Pp
 Additional patches supporting POSIX.1e features are provided by the
 TrustedBSD project:
-
+.Pp
 http://www.trustedbsd.org
-
 .Sh IMPLEMENTATION NOTES
 .Fx Ns 's
 support for POSIX.1e interfaces and features is still under
diff --git a/lib/libpthread/man/pthread_condattr.3 b/lib/libpthread/man/pthread_condattr.3
index 6b8a983..d17d59e 100644
--- a/lib/libpthread/man/pthread_condattr.3
+++ b/lib/libpthread/man/pthread_condattr.3
@@ -74,6 +74,7 @@ will fail if:
 .It Bq Er EINVAL
 Invalid value for
 .Fa attr .
+.El
 .Sh SEE ALSO
 .Xr pthread_cond_init 3
 .Sh STANDARDS
diff --git a/lib/libradius/libradius.3 b/lib/libradius/libradius.3
index f8b48e2..56ee09d 100644
--- a/lib/libradius/libradius.3
+++ b/lib/libradius/libradius.3
@@ -371,7 +371,7 @@ without recording an error message.
 .Xr radius.conf 5
 .Rs
 .%A C. Rigney, et al
-.%T Remote Authentication Dial In User Service (RADIUS)
+.%T "Remote Authentication Dial In User Service (RADIUS)"
 .%O RFC 2138
 .Re
 .Rs
diff --git a/lib/libradius/radius.conf.5 b/lib/libradius/radius.conf.5
index 1f6ab0a..4ad3f8a 100644
--- a/lib/libradius/radius.conf.5
+++ b/lib/libradius/radius.conf.5
@@ -153,7 +153,7 @@ auth  192.168.27.81  $X*#..38947ax-+=
 .Xr libradius 3
 .Rs
 .%A C. Rigney, et al
-.%T Remote Authentication Dial In User Service (RADIUS)
+.%T "Remote Authentication Dial In User Service (RADIUS)"
 .%O RFC 2138
 .Re
 .Rs
diff --git a/lib/libstand/libstand.3 b/lib/libstand/libstand.3
index 204a88f..7cef82c 100644
--- a/lib/libstand/libstand.3
+++ b/lib/libstand/libstand.3
@@ -181,31 +181,31 @@ The
 .Li b
 conversion is provided to decode error registers.  Its usage is:
 .Pp
-.Bd -offset indent
+.Bd -ragged -offset indent
 printf( 
 .Qq reg=%b\en , 
 regval, 
 .Qq <base><arg>*
 );
 .Ed
-
+.Pp
 where <base> is the output expressed as a control character, eg. \e10 gives
 octal, \e20 gives hex.  Each <arg> is a sequence of characters, the first of
 which gives the bit number to be inspected (origin 1) and the next characters
 (up to a character less than 32) give the text to be displayed if the bit is set.
 Thus
 .Pp
-.Bd -offset indent
+.Bd -ragged -offset indent
 printf(
 .Qq reg=%b\en
 3
 .Qq \e10\e2BITTWO\e1BITONE\en
 );
 .Ed
-
+.Pp
 would give the output
 .Pp
-.Bd -offset indent
+.Bd -ragged -offset indent
 reg=3<BITTWO,BITONE>
 .Ed
 .Pp
@@ -213,15 +213,15 @@ The
 .Li D
 conversion provides a hexdump facility, eg.
 .Pp
-.Bd -offset indent -literal
+.Bd -ragged -offset indent
 printf(
 .Qq %6D ,
 ptr,
-.Qq \:
+.Qq \&:
 );  gives  
 .Qq XX:XX:XX:XX:XX:XX
 .Ed
-.Bd -offset indent -literal
+.Bd -ragged -offset indent
 printf(
 .Qq %*D ,
 len,
diff --git a/lib/libutil/auth.3 b/lib/libutil/auth.3
index 323d2f6..b575bcf 100644
--- a/lib/libutil/auth.3
+++ b/lib/libutil/auth.3
@@ -40,7 +40,6 @@
 .Ft char *
 .Fn auth_getval "const char *name"
 .Sh DESCRIPTION
-
 The function
 .Fn auth_getval
 returns the value assocated with the field called
diff --git a/lib/libutil/login.conf.5 b/lib/libutil/login.conf.5
index 281b4e1..6712947 100644
--- a/lib/libutil/login.conf.5
+++ b/lib/libutil/login.conf.5
@@ -151,17 +151,17 @@ notation may be used.
 .Pp
 .Sh RESOURCE LIMITS
 .Bl -column coredumpsize indent indent
-.Sy Name	Type	Notes	Description
-.It cputime	time		CPU usage limit.
-.It filesize	size		Maximum file size limit.
-.It datasize	size		Maximum data size limit.
-.It stacksize	size		Maximum stack size limit.
-.It coredumpsize	size		Maximum coredump size limit.
-.It memoryuse	size		Maximum of core memory use size limit.
-.It memorylocked	size		Maximum locked in core memory size limit.
-.It maxproc	number		Maximum number of processes.
-.It openfiles	number		Maximum number of open files per process.
-.It sbsize	size		Maximum permitted socketbuffer size.
+.It Sy "Name	Type	Notes	Description
+.It "cputime	time		CPU usage limit.
+.It "filesize	size		Maximum file size limit.
+.It "datasize	size		Maximum data size limit.
+.It "stacksize	size		Maximum stack size limit.
+.It "coredumpsize	size		Maximum coredump size limit.
+.It "memoryuse	size		Maximum of core memory use size limit.
+.It "memorylocked	size		Maximum locked in core memory size limit.
+.It "maxproc	number		Maximum number of processes.
+.It "openfiles	number		Maximum number of open files per process.
+.It "sbsize	size		Maximum permitted socketbuffer size.
 .El
 .Pp
 These resource limit entries actually specify both the maximum
@@ -174,60 +174,60 @@ The maximum and current limits may be specified individually by appending a
 .Pp
 .Sh ENVIRONMENT
 .Bl -column ignorenologin indent xbinxxusrxbin
-.Sy Name	Type	Notes	Description
-.It charset	string		Set $MM_CHARSET environment variable to the specified
+.It Sy "Name	Type	Notes	Description
+.It "charset	string		Set $MM_CHARSET environment variable to the specified
 value.
-.It hushlogin	bool	false	Same as having a ~/.hushlogin file.
-.It ignorenologin	bool	false	Login not prevented by nologin.
-.It lang	string		Set $LANG environment variable to the specified value.
-.It manpath	path		Default search path for manpages.
-.It nologin	file		If the file exists it will be displayed and
+.It "hushlogin	bool	false	Same as having a ~/.hushlogin file.
+.It "ignorenologin	bool	false	Login not prevented by nologin.
+.It "lang	string		Set $LANG environment variable to the specified value.
+.It "manpath	path		Default search path for manpages.
+.It "nologin	file		If the file exists it will be displayed and
 the login session will be terminated.
-.It path	path	/bin /usr/bin	Default search path.
-.It priority	number		Initial priority (nice) level.
-.It requirehome 	bool	false	Require a valid home directory to login.
-.It setenv	list		A comma-separated list of environment variables and
+.It "path	path	/bin /usr/bin	Default search path.
+.It "priority	number		Initial priority (nice) level.
+.It "requirehome 	bool	false	Require a valid home directory to login.
+.It "setenv	list		A comma-separated list of environment variables and
 values to which they are to be set.
-.It shell	prog		Session shell to execute rather than the
+.It "shell	prog		Session shell to execute rather than the
 shell specified in the passwd file.
 The SHELL environment variable will
 contain the shell specified in the password file.
-.It term	string		Default terminal type if not able to determine from
+.It "term	string		Default terminal type if not able to determine from
 other means.
-.It timezone	string		Default value of $TZ environment variable.
-.It umask	number	022	Initial umask. Should always have a leading 0 to
+.It "timezone	string		Default value of $TZ environment variable.
+.It "umask	number	022	Initial umask. Should always have a leading 0 to
 ensure octal interpretation.
-.It welcome	file	/etc/motd	File containing welcome message.
+.It "welcome	file	/etc/motd	File containing welcome message.
 .El
 .Pp
 .Sh AUTHENTICATION
 .Bl -column minpasswordlen indent indent
-.Sy Name	Type	Notes	Description
-.It minpasswordlen	number	6	The minimum length a local password may be.
-.It passwd_format	string	md5	The encryption format that new or
+.It Sy "Name	Type	Notes	Description
+.It "minpasswordlen	number	6	The minimum length a local password may be.
+.It "passwd_format	string	md5	The encryption format that new or
 changed passwords will use.
 Valid values include "md5" and "des".
 NIS clients using a
 .No non- Ns Fx
 NIS server should probably use "des".
-.\" .It approve	program 	Program to approve login.
-.It mixpasswordcase	bool	true	Whether
+.\" .It "approve	program 	Program to approve login.
+.It "mixpasswordcase	bool	true	Whether
 .Xr passwd 1
 will warn the user if an all lower case password is entered.
-.It copyright	file		File containing additional copyright information
-.\".It widepasswords	bool	false	Use the wide password format. The wide password
+.It "copyright	file		File containing additional copyright information
+.\".It "widepasswords	bool	false	Use the wide password format. The wide password
 .\" format allows up to 128 significant characters in the password.
-.It host.allow	list		List of remote host wildcards from which users in
+.It "host.allow	list		List of remote host wildcards from which users in
 the class may access.
-.It host.deny	list		List of remote host wildcards from which users in
+.It "host.deny	list		List of remote host wildcards from which users in
 the class may not access.
-.It times.allow 	list		List of time periods during which
+.It "times.allow 	list		List of time periods during which
 logins are allowed.
-.It times.deny	list		List of time periods during which logins are
+.It "times.deny	list		List of time periods during which logins are
 disallowed.
-.It ttys.allow	list		List of ttys and ttygroups which users
+.It "ttys.allow	list		List of ttys and ttygroups which users
 in the class may use for access.
-.It ttys.deny	list		List of ttys and ttygroups which users
+.It "ttys.deny	list		List of ttys and ttygroups which users
 in the class may not use for access.
 .El
 .Pp
@@ -317,38 +317,38 @@ If both lists are given and are non-empty, the user is restricted to those
 devices allowed by ttys.allow that are not available by ttys.deny.
 .Sh ACCOUNTING LIMITS
 .Bl -column host.accounted indent indent
-.Sy Name	Type	Notes	Description
-.It accounted	bool	false	Enable session time accounting for all users
+.It Sy "Name	Type	Notes	Description
+.It "accounted	bool	false	Enable session time accounting for all users
 in this class.
-.It autodelete	time		Time after expiry when account is auto-deleted.
-.It bootfull	bool	false	Enable 'boot only if ttygroup is full' strategy
+.It "autodelete	time		Time after expiry when account is auto-deleted.
+.It "bootfull	bool	false	Enable 'boot only if ttygroup is full' strategy
 when terminating sessions.
-.It daytime	time		Maximum login time per day.
-.It expireperiod	time		Time for expiry allocation.
-.It graceexpire 	time		Grace days for expired account.
-.It gracetime	time		Additional grace login time allowed.
-.It host.accounted	list		List of remote host wildcards from which
+.It "daytime	time		Maximum login time per day.
+.It "expireperiod	time		Time for expiry allocation.
+.It "graceexpire 	time		Grace days for expired account.
+.It "gracetime	time		Additional grace login time allowed.
+.It "host.accounted	list		List of remote host wildcards from which
 login sessions will be accounted.
-.It host.exempt 	list		List of remote host wildcards from which
+.It "host.exempt 	list		List of remote host wildcards from which
 login session accounting is exempted.
-.It idletime	time		Maximum idle time before logout.
-.It monthtime 	time		Maximum login time per month.
-.It passwordtime	time		Used by
+.It "idletime	time		Maximum idle time before logout.
+.It "monthtime 	time		Maximum login time per month.
+.It "passwordtime	time		Used by
 .Xr passwd 1
 to set next password expiry date.
-.It refreshtime 	time		New time allowed on account refresh.
-.It refreshperiod	str		How often account time is refreshed.
-.It sessiontime 	time		Maximum login time per session.
-.It sessionlimit	number		Maximum number of concurrent
+.It "refreshtime 	time		New time allowed on account refresh.
+.It "refreshperiod	str		How often account time is refreshed.
+.It "sessiontime 	time		Maximum login time per session.
+.It "sessionlimit	number		Maximum number of concurrent
 login sessions on ttys in any group.
-.It ttys.accounted	list		List of ttys and ttygroups for which
+.It "ttys.accounted	list		List of ttys and ttygroups for which
 login accounting is active.
-.It ttys.exempt	list		List of ttys and ttygroups for which login accounting
+.It "ttys.exempt	list		List of ttys and ttygroups for which login accounting
 is exempt.
-.It warnexpire	time		Advance notice for pending account expiry.
-.It warnpassword	time		Advance notice for pending password expiry.
-.It warntime	time		Advance notice for pending out-of-time.
-.It weektime	time		Maximum login time per week.
+.It "warnexpire	time		Advance notice for pending account expiry.
+.It "warnpassword	time		Advance notice for pending password expiry.
+.It "warntime	time		Advance notice for pending out-of-time.
+.It "weektime	time		Maximum login time per week.
 .El
 .Pp
 These fields are used by the time accounting system, which regulates,
diff --git a/lib/libutil/login_cap.3 b/lib/libutil/login_cap.3
index 71b19ee..a7a796a 100644
--- a/lib/libutil/login_cap.3
+++ b/lib/libutil/login_cap.3
@@ -370,7 +370,7 @@ The function accepts three parameters, the login_cap entry itself and
 two optional parameters, and authorisation type 'auth' and 'style', and
 applies these to determine the authorisation style that best suites
 these rules.
-.Bl -bullet -indent offset
+.Bl -bullet
 .It
 If 'auth' is neither NULL nor an empty string, look for a tag of type
 "auth-<auth>" in the capability record.
diff --git a/lib/libutil/realhostname_sa.3 b/lib/libutil/realhostname_sa.3
index 7ccff3c..730e3d5 100644
--- a/lib/libutil/realhostname_sa.3
+++ b/lib/libutil/realhostname_sa.3
@@ -127,4 +127,3 @@ now contains the numeric value of
 .Xr getaddrinfo 3 ,
 .Xr getnameinfo 3 ,
 .Xr realhostname 3
-
diff --git a/lib/libutil/trimdomain.3 b/lib/libutil/trimdomain.3
index fa27e14..b93ff05 100644
--- a/lib/libutil/trimdomain.3
+++ b/lib/libutil/trimdomain.3
@@ -63,18 +63,17 @@ is actually a
 .Dv DISPLAY
 specification of the form
 .Sm off
-.Ar host No . Ar domain No : Ns
-.Sm on
-.Ar \&nn Oo
-.No . Ns Ar \&nn
+.Ar host . domain : nn Oo .
+.Ar nn
 .Oc
+.Sm on
 and the domain name is the same as the local domain name,
 .Fn trimdomain
 will remove the embedded domain name, copying the screen and display
 numbers to the end of the base host name and resulting in
-.Ar host No : Ns Ar \&nn Oo
-.No . Ns Ar \&nn
-.Oc .
+.Sm off
+.Ar host : nn Op . Ar nn .
+.Sm on
 .Sh RETURN VALUES
 .Fn trimdomain
 does not return a value.
diff --git a/lib/libvgl/vgl.3 b/lib/libvgl/vgl.3
index 1cbb53f..a38746e 100644
--- a/lib/libvgl/vgl.3
+++ b/lib/libvgl/vgl.3
@@ -151,7 +151,7 @@ memory before switching to another virtual console, and restoring when the
 user switches back.
 This allows several graphic applications at once, but
 on different virtual consoles.
-
+.Pp
 Below is a short description of the various functions:
 .Pp
 .Fn VGLInit
diff --git a/lib/msun/man/atan2.3 b/lib/msun/man/atan2.3
index 36f1c0c..e13ce28 100644
--- a/lib/msun/man/atan2.3
+++ b/lib/msun/man/atan2.3
@@ -95,7 +95,7 @@ if x = y = 0, or
 .Pf sign( Ar y Ns )*\\*(Pi/2 Ta
 if
 .Ar x
-= 0 \*(!=
+= 0 \(!=
 .Ar y .
 .El
 .Sh NOTES
diff --git a/lib/msun/man/ieee_test.3 b/lib/msun/man/ieee_test.3
index 7ff2059..44578da 100644
--- a/lib/msun/man/ieee_test.3
+++ b/lib/msun/man/ieee_test.3
@@ -102,6 +102,5 @@ is 0, \*(Pm\*(If, or \*(Na.
 .Sh SEE ALSO
 .Xr ieee 3 ,
 .Xr math 3
-
 .Sh STANDARDS
 .St -ieee754