23 files changed, 34 insertions, 27 deletions
diff --git a/bin/df/df.1 b/bin/df/df.1
index 3e99fb5..e785321 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 ain
 .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 8a74ab5..fd4071b 100644
--- a/contrib/amd/amd/amd.8
+++ b/contrib/amd/amd/amd.8
@@ -334,8 +334,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 2142622..d788c97 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 c22a5a6..6670d55 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 a5fa52b..e80c2bf 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/libpthread/man/pthread_cond_timedwait.3 b/lib/libpthread/man/pthread_cond_timedwait.3
index a5fa52b..e80c2bf 100644
--- a/lib/libpthread/man/pthread_cond_timedwait.3
+++ b/lib/libpthread/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 b23162f..22b6e99 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/man3/pthread_cond_timedwait.3 b/share/man/man3/pthread_cond_timedwait.3
index a5fa52b..e80c2bf 100644
--- a/share/man/man3/pthread_cond_timedwait.3
+++ b/share/man/man3/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/share/man/man4/icmp6.4 b/share/man/man4/icmp6.4
index 4149bfb..c66ab30 100644
--- a/share/man/man4/icmp6.4
+++ b/share/man/man4/icmp6.4
@@ -179,7 +179,8 @@ and
 .Dv SETBLOCKALL ,
 let us specify that
 all
-.Tn ICMPv6 messages are passed to the application or that all
+.Tn ICMPv6
+messages are passed to the application or that all
 .Tn ICMPv6
 messages are blocked from being passed to the application.
 .Pp
diff --git a/share/man/man4/si.4 b/share/man/man4/si.4
index 428f5e1..a8bb878 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 si"
 .Cd "device si0 at isa? irq 12 iomem 0xd0000"
diff --git a/share/man/man4/termios.4 b/share/man/man4/termios.4
index 67e6804..78813a8 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/man7/security.7 b/share/man/man7/security.7
index 4dfc1ec..99f222a 100644
--- a/share/man/man7/security.7
+++ b/share/man/man7/security.7
@@ -106,7 +106,7 @@ may find a bug in a root-run server and be able to break root over a network
 connection to that server, or the attacker may know of a bug in an suid-root
 program that allows the attacker to break root once he has broken into a 
 user's account.  If an attacker has found a way to break root on a machine,
-.Pa the attacker may not have a need to install a backdoor.
+the attacker may not have a need to install a backdoor.
 Many of the root holes found and closed to date involve a considerable amount
 of work by the hacker to cleanup after himself, so most hackers do install
 backdoors.  This gives you a convienient way to detect the hacker.  Making
diff --git a/share/man/man9/VOP_ACCESS.9 b/share/man/man9/VOP_ACCESS.9
index 7f9f3df..edf8141 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/VOP_LEASE.9 b/share/man/man9/VOP_LEASE.9
index 3e4981a..07d6853 100644
--- a/share/man/man9/VOP_LEASE.9
+++ b/share/man/man9/VOP_LEASE.9
@@ -33,7 +33,7 @@
 .Dt VOP_LEASE 9
 .Sh NAME
 .Nm VOP_LEASE
-.Nd Validates a vnode for a particular set of credentials and operation type
+.Nd "validate a vnode for a particular set of credentials and operation type"
 .Sh SYNOPSIS
 .Fd #include <sys/param.h>
 .Fd #include <sys/mount.h>
diff --git a/share/man/man9/devfs_remove_dev.9 b/share/man/man9/devfs_remove_dev.9
index 248e468..316d459 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 4b132fa..954772d 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_ordered
-.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 88f829a..6c50b6a 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 78e4054..29a18f0 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 020ac6c..485deb2 100644
--- a/usr.sbin/i4b/man/i4btrc.4
+++ b/usr.sbin/i4b/man/i4btrc.4
@@ -33,7 +33,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 87d4287..9b50e0d 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/pim6dd/pim6dd.conf.5 b/usr.sbin/pim6dd/pim6dd.conf.5
index d2e728a..82d7531 100644
--- a/usr.sbin/pim6dd/pim6dd.conf.5
+++ b/usr.sbin/pim6dd/pim6dd.conf.5
@@ -33,7 +33,7 @@
 .Os
 .Sh NAME
 .Nm pim6dd.conf
-.Nd config file for pim6dd, PIM for IPv6 dense mode daemon
+.Nd "config file for pim6dd, PIM for IPv6 dense mode daemon"
 .Sh DESCRIPTION
 The file describes how the
 .Nm pim6dd
diff --git a/usr.sbin/tcpdump/tcpslice/tcpslice.1 b/usr.sbin/tcpdump/tcpslice/tcpslice.1
index 36cc131..5232964 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
diff --git a/usr.sbin/traceroute6/traceroute6.8 b/usr.sbin/traceroute6/traceroute6.8
index cb6d762..575c86c 100644
--- a/usr.sbin/traceroute6/traceroute6.8
+++ b/usr.sbin/traceroute6/traceroute6.8
@@ -34,7 +34,7 @@
 .\"
 .Sh NAME
 .Nm traceroute6
-.Nd print the route IPv6 packets will take to the destination
+.Nd "print the route IPv6 packets will take to the destination"
 .\"
 .Sh SYNOPSIS
 .Nm