16 files changed, 26 insertions, 20 deletions

diff --git a/bin/df/df.1 b/bin/df/df.1
index eb94f00c4e6e..5effef83ff9f 100644
--- a/bin/df/df.1
+++ b/bin/df/df.1
@@ -40,7 +40,10 @@
 .Nd display free disk space
 .Sh SYNOPSIS
 .Nm df
-.Op Fl b | h | H | k | m | P
+.Oo
+.Fl b | h | H | k |
+.Fl m | P
+.Oc
 .Op Fl in
 .Op Fl t Ar type
 .Op Ar file | Ar filesystem ...
diff --git a/contrib/amd/amd/amd.8 b/contrib/amd/amd/amd.8
index f09fea9350df..aef79a2df97d 100644
--- a/contrib/amd/amd/amd.8
+++ b/contrib/amd/amd/amd.8
@@ -335,8 +335,8 @@ Department of Computing, Imperial College, London, UK.
 Department of Computer Science, Columbia University,
 New York, USA.
 .Pp
-.An Other authors and contributors to am-utils are listed in the
-.Nm AUTHORS 
+Other authors and contributors to am-utils are listed in the
+.Pa AUTHORS 
 file distributed with am-utils.
 .Sh HISTORY
 The
diff --git a/contrib/amd/scripts/amd.conf.5 b/contrib/amd/scripts/amd.conf.5
index 2142622a4585..d788c97a8569 100644
--- a/contrib/amd/scripts/amd.conf.5
+++ b/contrib/amd/scripts/amd.conf.5
@@ -678,8 +678,8 @@ Department of Computer Science, Columbia University, New York, USA.
 .An Jan-Simon Pendry Aq jsp@doc.ic.ac.uk ,
 Department of Computing, Imperial College, London, UK.
 .Pp
-.An Other Authors and contributers to am-utils are listed in the 
-.Nm AUTHORS
+Other authors and contributers to am-utils are listed in the 
+.Pa AUTHORS
 file distributed with am-utils.
 .Sh HISTORY
 The
diff --git a/lib/libc/stdlib/strtoul.3 b/lib/libc/stdlib/strtoul.3
index c22a5a6b3944..6670d55bcf7f 100644
--- a/lib/libc/stdlib/strtoul.3
+++ b/lib/libc/stdlib/strtoul.3
@@ -41,7 +41,7 @@
 .Os
 .Sh NAME
 .Nm strtoul, strtouq
-.Nd convert a string to an unsigned long or uquad_t integer
+.Nd "convert a string to an unsigned long or uquad_t integer"
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
diff --git a/lib/libc_r/man/pthread_cond_timedwait.3 b/lib/libc_r/man/pthread_cond_timedwait.3
index a5fa52b3a031..e80c2bfb99ac 100644
--- a/lib/libc_r/man/pthread_cond_timedwait.3
+++ b/lib/libc_r/man/pthread_cond_timedwait.3
@@ -32,7 +32,7 @@
 .Os BSD 4
 .Sh NAME
 .Nm pthread_cond_timedwait
-.Nd wait on a condition variable for a specific amount of time
+.Nd "wait on a condition variable for a specific amount of time"
 .Sh LIBRARY
 .Lb libc_r
 .Sh SYNOPSIS
diff --git a/lib/libutil/property.3 b/lib/libutil/property.3
index b23162f32821..22b6e9998535 100644
--- a/lib/libutil/property.3
+++ b/lib/libutil/property.3
@@ -32,7 +32,7 @@
 .Nm properties_read , 
 .Nm propery_find ,
 .Nm properties_free
-.Nd functions to allow creating simple property lists from ASCII file data.
+.Nd "functions to allow creating simple property lists from ASCII file data"
 .Sh LIBRARY
 .Lb libutil
 .Sh SYNOPSIS
diff --git a/share/man/man4/si.4 b/share/man/man4/si.4
index 8efe4a7baa00..cd16c8479cb9 100644
--- a/share/man/man4/si.4
+++ b/share/man/man4/si.4
@@ -4,7 +4,7 @@
 .Dt SI 4
 .Sh NAME
 .Nm si
-.Nd Driver for Specialix International SI/XIO or SX intelligent serial card.
+.Nd "driver for Specialix International SI/XIO or SX intelligent serial card"
 .Sh SYNOPSIS
 .Cd "device si0"
 .Cd "device si0 at isa? tty irq 12 iomem 0xd0000"
diff --git a/share/man/man4/termios.4 b/share/man/man4/termios.4
index dad0b6c8d3a5..8f6ce5105565 100644
--- a/share/man/man4/termios.4
+++ b/share/man/man4/termios.4
@@ -168,7 +168,8 @@ the process's group
 unless one of the
 following special cases apply:  If the reading process is ignoring or
 blocking the
-.Dv SIGTTIN signal, or if the process group of the reading
+.Dv SIGTTIN
+signal, or if the process group of the reading
 process is orphaned, the
 .Xr read 2
 returns -1 with
diff --git a/share/man/man9/VOP_ACCESS.9 b/share/man/man9/VOP_ACCESS.9
index d56e1ca8037d..7a4817b6cf13 100644
--- a/share/man/man9/VOP_ACCESS.9
+++ b/share/man/man9/VOP_ACCESS.9
@@ -34,7 +34,7 @@
 .Dt VOP_ACCESS 9
 .Sh NAME
 .Nm VOP_ACCESS
-.Nd check access permissions of a file or Unix domain socket
+.Nd "check access permissions of a file or Unix domain socket"
 .Sh SYNOPSIS
 .Fd #include <sys/param.h>
 .Fd #include <sys/vnode.h>
diff --git a/share/man/man9/devfs_remove_dev.9 b/share/man/man9/devfs_remove_dev.9
index 248e468cfef4..316d45923658 100644
--- a/share/man/man9/devfs_remove_dev.9
+++ b/share/man/man9/devfs_remove_dev.9
@@ -36,7 +36,7 @@
 .Dt DEVFS_REMOVE_DEV 9
 .Sh NAME
 .Nm devfs_remove_dev
-.Nd  remove all references to a devfs device node and delete the node.
+.Nd "remove all references to a devfs device node and delete the node"
 .Sh SYNOPSIS
 .Fd #include <sys/types.h>
 .Fd #include <sys/devfsext.h>
diff --git a/share/man/man9/device_add_child.9 b/share/man/man9/device_add_child.9
index de4ef9f71108..224a60d56774 100644
--- a/share/man/man9/device_add_child.9
+++ b/share/man/man9/device_add_child.9
@@ -34,7 +34,7 @@
 .Sh NAME
 .Nm device_add_child ,
 .Nm device_add_child_after
-.Nd add a new device as a child of an existing device
+.Nd "add a new device as a child of an existing device"
 .Sh SYNOPSIS
 .Fd #include <sys/param.h>
 .Fd #include <sys/bus.h>
diff --git a/share/man/man9/vput.9 b/share/man/man9/vput.9
index 88f829aaa3db..6c50b6a7b303 100644
--- a/share/man/man9/vput.9
+++ b/share/man/man9/vput.9
@@ -33,7 +33,7 @@
 .Dt VPUT 9
 .Sh NAME
 .Nm vput
-.Nd decrement the use count for a vnode and unlock it
+.Nd "decrement the use count for a vnode and unlock it"
 .Sh SYNOPSIS
 .Fd #include <sys/param.h>
 .Fd #include <sys/vnode.h>
diff --git a/usr.bin/ipcrm/ipcrm.1 b/usr.bin/ipcrm/ipcrm.1
index 78e4054a02fc..29a18f0cbc19 100644
--- a/usr.bin/ipcrm/ipcrm.1
+++ b/usr.bin/ipcrm/ipcrm.1
@@ -28,8 +28,7 @@
 .Os
 .Sh NAME
 .Nm ipcrm
-.Nd remove the specified message queues, semaphore sets, and shared memory
-segments
+.Nd "remove the specified message queues, semaphore sets, and shared segments"
 .Sh SYNOPSIS
 .Nm
 .Op Fl q Ar msqid
diff --git a/usr.sbin/i4b/man/i4btrc.4 b/usr.sbin/i4b/man/i4btrc.4
index 78e5317e6615..5f91ac7a7971 100644
--- a/usr.sbin/i4b/man/i4btrc.4
+++ b/usr.sbin/i4b/man/i4btrc.4
@@ -31,7 +31,7 @@
 .Os
 .Sh NAME
 .Nm i4btrc
-.Nd isdn4bsd ISDN interface driver for D and B channel tracing
+.Nd "isdn4bsd ISDN interface driver for D and B channel tracing"
 .Sh FreeBSD SYNOPSIS
 .Cd pseudo-device \&"i4btrc\&" Op count
 .Sh NetBSD SYNOPSIS
diff --git a/usr.sbin/kbdcontrol/kbdcontrol.1 b/usr.sbin/kbdcontrol/kbdcontrol.1
index 87d4287be7b5..9b50e0da0f41 100644
--- a/usr.sbin/kbdcontrol/kbdcontrol.1
+++ b/usr.sbin/kbdcontrol/kbdcontrol.1
@@ -65,9 +65,11 @@ is preceded by the word
 the bell will not be rung when the ringing process is in the background vty.
 .It Fl r Ar delay.repeat | Ar speed
 Set keyboard
-.Ar delay (250, 500, 750, 1000)
+.Ar delay
+(250, 500, 750, 1000)
 and
-.Ar repeat (34, 38, 42, 46, 50, 55, 59, 63, 68, 76, 84, 92, 100, 110, 118, 126, 
+.Ar repeat
+(34, 38, 42, 46, 50, 55, 59, 63, 68, 76, 84, 92, 100, 110, 118, 126, 
 136, 152, 168, 184, 200, 220, 236, 252, 272, 304, 336, 368, 400, 440,
 472, 504)
 rates, or if a
diff --git a/usr.sbin/tcpdump/tcpslice/tcpslice.1 b/usr.sbin/tcpdump/tcpslice/tcpslice.1
index 36cc13139a91..52329647edb9 100644
--- a/usr.sbin/tcpdump/tcpslice/tcpslice.1
+++ b/usr.sbin/tcpdump/tcpslice/tcpslice.1
@@ -241,7 +241,8 @@ to rummage through its input files.
 .Nm Tcpslice
 refuses to write to its output if it is a terminal
 (as indicated by
-.Xr isatty 3 ). This is not a bug but a feature,
+.Xr isatty 3 ) .
+This is not a bug but a feature,
 to prevent it from spraying binary data to the user's terminal.
 Note that this means you must either redirect
 .Pa stdout