19 files changed, 158 insertions, 148 deletions

diff --git a/lib/libc/gen/confstr.3 b/lib/libc/gen/confstr.3
index 6530f16ffde0..e0cb90822372 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 83850680b401..e661252c0a46 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 4489c03c5db9..9b977f837f9b 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 26b33bb2c371..244d13bec498 100644
--- a/lib/libc/gen/getcap.3
+++ b/lib/libc/gen/getcap.3
@@ -429,6 +429,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.
@@ -522,7 +523,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 4d6c59579a49..7f312fda7aa5 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 df7511e834f2..dd59d8a979ba 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 b2f2b80e0136..43839944b92f 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 1ca4612bcb44..a7c511de8802 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 9e446fa8481d..3e32b7e49690 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 5662c3962ee4..7d00311fdeb5 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 b7ba681d0126..d553b1e93220 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 f453ed8f26c9..4e1025029316 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 102a3e3ad71a..4bc1fd970331 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
@@ -122,7 +122,7 @@ The maximum number of repeated occurrences of a regular expression
 permitted when using interval notation.
 .It Li _SC_2_VERSION
 The version of POSIX 1003.2 with which the system attempts to comply.
-.It Li _SC_2_C_BIND	
+.It Li _SC_2_C_BIND
 Return 1 if the system's C-language development facilities support the
 C-Language Bindings Option, otherwise \-1.
 .It Li _SC_2_C_DEV
@@ -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 6169e260016a..197aefe354b8 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 .
@@ -369,13 +369,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
 .It Li KERN_PROF
 Return profiling information about the kernel.
@@ -388,16 +388,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.
@@ -438,12 +438,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
@@ -451,13 +451,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
@@ -470,10 +470,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
@@ -482,17 +482,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.
@@ -533,29 +533,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
@@ -629,21 +629,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 53c76dff35d8..4a27f6fd82cf 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 d76e4355a61f..d763e071c45c 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 62ff378acf9c..ebf452a28ec4 100644
--- a/lib/libc/gen/unvis.3
+++ b/lib/libc/gen/unvis.3
@@ -109,7 +109,7 @@ has several return codes that must be handled properly.  They are:
 .Bl -tag -width UNVIS_VALIDPUSH
 .It Li \&0 (zero)
 Another character is necessary; nothing has been recognized yet.
-.It Dv  UNVIS_VALID	
+.It Dv  UNVIS_VALID
 A valid character has been recognized and is available at the location
 pointed to by cp.
 .It Dv  UNVIS_VALIDPUSH
@@ -149,7 +149,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 68e7b7c9cd11..1d635fd5ad09 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 18c434445b47..3c40d0db222e 100644
--- a/lib/libc/gen/vis.3
+++ b/lib/libc/gen/vis.3
@@ -276,4 +276,3 @@ ambiguous and non-invertible.
 .Sh HISTORY
 These functions first appeared in
 .Bx 4.4 .
-