12 files changed, 21 insertions, 35 deletions
diff --git a/lib/libc/gen/popen.3 b/lib/libc/gen/popen.3
index bfb635093854..035bf1485dab 100644
--- a/lib/libc/gen/popen.3
+++ b/lib/libc/gen/popen.3
@@ -196,7 +196,6 @@ and a
 .Fn pclose
 function appeared in
 .At v7 .
-.br
+.Pp
 Bidirectional functionality was added in
-.Tn FreeBSD
-2.2.6.
+.Fx 2.2.6 .
diff --git a/lib/libc/gen/sysctl.3 b/lib/libc/gen/sysctl.3
index 2752042c8a23..8b5897058b20 100644
--- a/lib/libc/gen/sysctl.3
+++ b/lib/libc/gen/sysctl.3
@@ -238,7 +238,6 @@ The machine class.
 The machine model
 .It Li HW_NCPU
 The number of cpus.
-.ne 1i
 .It Li HW_BYTEORDER
 The byteorder (4,321, or 1,234).
 .It Li HW_PHYSMEM
@@ -294,7 +293,6 @@ information.
 .It KERN\_VERSION	string	no
 .It KERN\_VNODE	struct vnode	no
 .El
-.ne 1i
 .Pp
 .Bl -tag -width "123456"
 .It Li KERN_ARGMAX
@@ -411,7 +409,6 @@ describing destination of calls and their counts.
 .It Li GPROF_GMONPARAM
 Structure giving the sizes of the above arrays.
 .El
-.ne 1i
 .It Li KERN_QUANTUM
 The maximum period of time, in microseconds, for which a process is allowed
 to run without being preempted if other processes are in the run queue.
@@ -481,7 +478,6 @@ Get or set various global information about the IPv4
 The third level name is the protocol.
 The fourth level name is the variable name.
 The currently defined protocols and names are:
-.ne 1i
 .Bl -column ProtocolXX VariableXX TypeXX ChangeableXX
 .It Pa Protocol	Variable	Type	Changeable
 .It icmp	bmcastecho	integer	yes
@@ -617,7 +613,6 @@ The version of POSIX 1003.2 with which the system attempts to comply.
 .It Li USER_RE_DUP_MAX
 The maximum number of repeated occurrences of a regular expression
 permitted when using interval notation.
-.ne 1i
 .It Li USER_STREAM_MAX
 The minimum maximum number of streams that a process may have open
 at any one time.
diff --git a/lib/libc/gen/timezone.3 b/lib/libc/gen/timezone.3
index f50782734fb1..a30cb978f91d 100644
--- a/lib/libc/gen/timezone.3
+++ b/lib/libc/gen/timezone.3
@@ -44,12 +44,12 @@
 .Ft char *
 .Fn timezone "int zone" "int dst"
 .Sh DESCRIPTION
-.ft B
+.Bf Sy
 This interface is for compatibility only; it is impossible to reliably
 map timezone's arguments to a time zone abbreviation.
 See
 .Xr ctime 3 .
-.ft P
+.Ef
 .Pp
 The
 .Fn timezone
diff --git a/lib/libc/net/getservent.3 b/lib/libc/net/getservent.3
index f7c1dcb8ddda..06b2d5044be2 100644
--- a/lib/libc/net/getservent.3
+++ b/lib/libc/net/getservent.3
@@ -128,7 +128,6 @@ is encountered.
 If a protocol name is also supplied (non-
 .Dv NULL ) , 
 searches must also match the protocol.
-.ne 1i
 .Sh FILES
 .Bl -tag -width /etc/services -compact
 .It Pa /etc/services
diff --git a/lib/libc/stdio/printf.3 b/lib/libc/stdio/printf.3
index 088e9e38a13b..c64038f7ff38 100644
--- a/lib/libc/stdio/printf.3
+++ b/lib/libc/stdio/printf.3
@@ -558,7 +558,6 @@ a field; if the result of a conversion is wider than the field width, the
 field is expanded to contain the conversion result.
 .Pp
 .Sh EXAMPLES
-.br
 To print a date and time in the form `Sunday, July 3, 10:02',
 where
 .Em weekday
diff --git a/lib/libc/stdtime/strptime.3 b/lib/libc/stdtime/strptime.3
index bab8954e8d59..f04521998196 100644
--- a/lib/libc/stdtime/strptime.3
+++ b/lib/libc/stdtime/strptime.3
@@ -87,8 +87,7 @@ The
 function has been contributed by Powerdog Industries.
 .Pp
 This man page was written by
-.ie t J\(:org Wunsch.
-.el Joerg Wunsch.
+.An J\(:org Wunsch .
 .Sh HISTORY
 The
 .Fn strptime
diff --git a/lib/libc/stdtime/time2posix.3 b/lib/libc/stdtime/time2posix.3
index 8930c319ad77..edef39779ff8 100644
--- a/lib/libc/stdtime/time2posix.3
+++ b/lib/libc/stdtime/time2posix.3
@@ -87,21 +87,23 @@ and its conversion to,
 and back from,
 the POSIX representation over the leap second inserted at the end of June,
 1993.
-.ta \w'93/06/30 'u +\w'23:59:59 'u +\w'A+0 'u +\w'X=time2posix(T) 'u
-DATE	TIME	T	X=time2posix(T)	posix2time(X)
-93/06/30	23:59:59	A+0	B+0	A+0
-93/06/30	23:59:60	A+1	B+1	A+1 or A+2
-93/07/01	00:00:00	A+2	B+1	A+1 or A+2
-93/07/01	00:00:01	A+3	B+2	A+3
-
+.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
+.El
+.Pp
 A leap second deletion would look like...
-
-DATE	TIME	T	X=time2posix(T)	posix2time(X)
-??/06/30	23:59:58	A+0	B+0	A+0
-??/07/01	00:00:00	A+1	B+2	A+1
-??/07/01	00:00:01	A+2	B+3	A+2
+.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
+.El
 .Pp
-	[Note: posix2time(B+1) => A+0 or A+1]
+.D1 No "[Note: posix2time(B+1) => A+0 or A+1]"
 .Pp
 If leap-second support is not enabled,
 local time_t's and
diff --git a/lib/libc/string/strtok.3 b/lib/libc/string/strtok.3
index 57ef252278d6..ae0c21c20ad1 100644
--- a/lib/libc/string/strtok.3
+++ b/lib/libc/string/strtok.3
@@ -166,7 +166,7 @@ such a sequence of calls would always return
 .Dv NULL .
 .Sh AUTHORS
 .An Wes Peters, Softweyr LLC: Aq wes@softweyr.com
-.br
+.Pp
 Based on the 
 .Fx 3.0
 implementation.
diff --git a/lib/libc/sys/execve.2 b/lib/libc/sys/execve.2
index dffa6ae51d83..113e83be2b68 100644
--- a/lib/libc/sys/execve.2
+++ b/lib/libc/sys/execve.2
@@ -144,7 +144,6 @@ the effective user ID is recorded as the saved set-user-ID,
 and the effective group ID is recorded as the saved set-group-ID.
 These values may be used in changing the effective IDs later (see
 .Xr setuid 2 ) .
-.ne 1i
 .Pp
 The set-ID bits are not honored if the respective file system has the
 .Ar nosuid
@@ -242,7 +241,6 @@ permission, but has an invalid magic number in its header.
 .It Bq Er ETXTBSY
 The new process file is a pure procedure (shared text)
 file that is currently open for writing or reading by some process.
-.ne 1i
 .It Bq Er ENOMEM
 The new process requires more virtual memory than
 is allowed by the imposed maximum
diff --git a/lib/libc/sys/fcntl.2 b/lib/libc/sys/fcntl.2
index 07477409ad51..49522c77c414 100644
--- a/lib/libc/sys/fcntl.2
+++ b/lib/libc/sys/fcntl.2
@@ -157,7 +157,6 @@ upon availability of data to be read.
 .Pp
 Several commands are available for doing advisory file locking;
 they all operate on the following structure:
-.ne 7v
 .Bd -literal
 struct flock {
 	off_t	l_start;	/* starting offset */
diff --git a/lib/libc/sys/intro.2 b/lib/libc/sys/intro.2
index 5be9768775f5..e15afc0dacb4 100644
--- a/lib/libc/sys/intro.2
+++ b/lib/libc/sys/intro.2
@@ -391,7 +391,6 @@ entry failed because the user's quota of disk blocks was
 exhausted, or the allocation of an inode for a newly
 created file failed because the user's quota of inodes
 was exhausted.
-.ne 1i
 .It Er 70 ESTALE Em "Stale NFS file handle" .
 An attempt was made to access an open file (on an
 .Tn NFS
@@ -489,7 +488,6 @@ A session leader with a controlling terminal is a controlling process.
 .It Controlling terminal
 A terminal that is associated with a session is known as the controlling
 terminal for that session and its members.
-.ne 1i
 .It  "Terminal Process Group ID"
 A terminal may be acquired by a session leader as its controlling terminal.
 Once a terminal is associated with a session, any of the process groups
@@ -567,7 +565,6 @@ for the super-user.)
 A process is recognized as a
 .Em super-user
 process and is granted special privileges if its effective user ID is 0.
-.ne 1i
 .It  Special Processes
 The processes with process IDs of 0, 1, and 2 are special.
 Process 0 is the scheduler.  Process 1 is the initialization process
diff --git a/lib/libc/sys/link.2 b/lib/libc/sys/link.2
index 34c36dcaad80..7cabd2b15ac6 100644
--- a/lib/libc/sys/link.2
+++ b/lib/libc/sys/link.2
@@ -132,7 +132,6 @@ are on different file systems.
 The directory in which the entry for the new link is being placed
 cannot be extended because there is no space left on the file
 system containing the directory.
-.ne 3v
 .It Bq Er EDQUOT
 The directory in which the entry for the new link
 is being placed cannot be extended because the