more wacky macro fixing;

9 files changed, 46 insertions, 44 deletions

diff --git a/usr.sbin/apm/apm.8 b/usr.sbin/apm/apm.8
index f97eb0cea35..49abf0a9823 100644
--- a/usr.sbin/apm/apm.8
+++ b/usr.sbin/apm/apm.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: apm.8,v 1.34 2009/10/22 15:02:12 sobrado Exp $
+.\"	$OpenBSD: apm.8,v 1.35 2010/09/19 21:59:23 jmc Exp $
 .\"
 .\" Copyright (c) 1996 John T. Kohl
 .\" All rights reserved.
@@ -26,7 +26,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: October 22 2009 $
+.Dd $Mdocdate: September 19 2010 $
 .Dt APM 8
 .Os
 .Sh NAME
@@ -36,7 +36,6 @@
 .Nm zzz
 .Op Fl Sz
 .Op Fl f Ar sockname
-.Br
 .Nm apm
 .Op Fl AabCHLlmPSvz
 .Op Fl f Ar sockname
diff --git a/usr.sbin/cron/crontab.5 b/usr.sbin/cron/crontab.5
index 50aa5628c4f..3616abfa084 100644
--- a/usr.sbin/cron/crontab.5
+++ b/usr.sbin/cron/crontab.5
@@ -17,9 +17,9 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
 .\" OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $OpenBSD: crontab.5,v 1.21 2007/05/31 19:20:23 jmc Exp $
+.\" $OpenBSD: crontab.5,v 1.22 2010/09/19 21:59:23 jmc Exp $
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: September 19 2010 $
 .Dt CRONTAB 5
 .Os
 .Sh NAME
@@ -159,7 +159,7 @@ mail is sent to the user so named.
 If
 .Ev MAILTO
 is defined but empty
-.Pq Ev MAILTO \&= Sq ,
+.Pq Ev MAILTO \&= \(oq\(cq ,
 no
 mail will be sent.
 Otherwise mail is sent to the owner of the
diff --git a/usr.sbin/mtrace/mtrace.8 b/usr.sbin/mtrace/mtrace.8
index 80ecb0eabff..ce1ec267c54 100644
--- a/usr.sbin/mtrace/mtrace.8
+++ b/usr.sbin/mtrace/mtrace.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mtrace.8,v 1.16 2010/03/26 19:30:40 jmc Exp $
+.\"	$OpenBSD: mtrace.8,v 1.17 2010/09/19 21:59:23 jmc Exp $
 .\"	$NetBSD: mtrace.8,v 1.4 1995/12/10 10:57:11 mycroft Exp $
 .\"
 .\" Copyright (c) 1993, 1998-2001.
@@ -66,7 +66,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 26 2010 $
+.Dd $Mdocdate: September 19 2010 $
 .Dt MTRACE 8
 .Os
 .Sh NAME
@@ -240,7 +240,7 @@ problems.
 .Ss Finding the Last-Hop Router
 The trace query must be sent to the multicast router which is the
 last hop on the path from the
-.Ae source
+.Ar source
 to the
 .Ar receiver .
 If the
@@ -330,9 +330,9 @@ The output of
 is in two sections.
 The first section is a short listing of the hops in the order they are
 queried, that is, in the reverse of the order from the
-.Ae source
+.Ar source
 to the
-.Ae receiver .
+.Ar receiver .
 For each hop, a line is printed showing the hop number (counted
 negatively to indicate that this is the reverse path); the multicast
 routing protocol (DVMRP, MOSPF, PIM, etc.); the threshold required to
diff --git a/usr.sbin/pppd/pppd.8 b/usr.sbin/pppd/pppd.8
index 6d22165e250..41bc8e9b723 100644
--- a/usr.sbin/pppd/pppd.8
+++ b/usr.sbin/pppd/pppd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pppd.8,v 1.36 2010/03/26 19:30:40 jmc Exp $
+.\" $OpenBSD: pppd.8,v 1.37 2010/09/19 21:59:23 jmc Exp $
 .\" Id: pppd.8,v 1.27 1998/03/31 04:31:08 paulus Exp $
 .\"
 .\" Copyright (c) 1993-2003 Paul Mackerras <paulus@samba.org>
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: March 26 2010 $
+.Dd $Mdocdate: September 19 2010 $
 .Dt PPPD 8
 .Os
 .Sh NAME
@@ -1079,8 +1079,7 @@ Typically, when using the
 .Cm login
 option, the secret in
 .Pa /etc/ppp/pap-secrets
-would be
-.Qq ,
+would be \(dq\(dq,
 which will match any password supplied by the peer.
 This avoids the need to have the same secret in two places.
 .Pp
diff --git a/usr.sbin/pstat/pstat.8 b/usr.sbin/pstat/pstat.8
index f434a11e006..7dd71a43eec 100644
--- a/usr.sbin/pstat/pstat.8
+++ b/usr.sbin/pstat/pstat.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pstat.8,v 1.42 2009/10/23 10:19:59 sobrado Exp $
+.\"	$OpenBSD: pstat.8,v 1.43 2010/09/19 21:59:23 jmc Exp $
 .\"	$NetBSD: pstat.8,v 1.9.4.1 1996/06/02 09:08:17 mrg Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993, 1994
@@ -30,7 +30,7 @@
 .\"
 .\"     from: @(#)pstat.8	8.4 (Berkeley) 4/19/94
 .\"
-.Dd $Mdocdate: October 23 2009 $
+.Dd $Mdocdate: September 19 2010 $
 .Dt PSTAT 8
 .Os
 .Sh NAME
@@ -224,11 +224,9 @@ Each group of vnodes corresponding
 to a particular filesystem is preceded by a two line header.
 The first line consists of the following:
 .Pp
-.Df I
 .No *** MOUNT Em fstype from
 on
 .Em on fsflags
-.De
 .Pp
 where
 .Em fstype
diff --git a/usr.sbin/rbootd/rbootd.8 b/usr.sbin/rbootd/rbootd.8
index dd28c8844ee..ee4cfb64d18 100644
--- a/usr.sbin/rbootd/rbootd.8
+++ b/usr.sbin/rbootd/rbootd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rbootd.8,v 1.11 2009/02/01 10:48:58 sobrado Exp $
+.\"	$OpenBSD: rbootd.8,v 1.12 2010/09/19 21:59:23 jmc Exp $
 .\"	$NetBSD: rbootd.8,v 1.3 1995/08/21 17:05:16 thorpej Exp $
 .\"
 .\" Copyright (c) 1988, 1992 The University of Utah and the Center
@@ -41,7 +41,7 @@
 .\" Utah Hdr: rbootd.man 3.1 92/07/06
 .\" Author: Jeff Forys, University of Utah CSS
 .\"
-.Dd $Mdocdate: February 1 2009 $
+.Dd $Mdocdate: September 19 2010 $
 .Dt RBOOTD 8
 .Os
 .Sh NAME
@@ -124,7 +124,7 @@ The following signals have the specified effect when sent to the server
 process using the
 .Xr kill 1
 command:
-.Bl -tag -width SIGUSR1 -offset -compact
+.Bl -tag -width SIGUSR1 -offset indent -compact
 .It SIGHUP
 Drop all active connections and reconfigure.
 .It SIGUSR1
diff --git a/usr.sbin/route6d/route6d.8 b/usr.sbin/route6d/route6d.8
index a216e200c9f..878684a2ebd 100644
--- a/usr.sbin/route6d/route6d.8
+++ b/usr.sbin/route6d/route6d.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: route6d.8,v 1.19 2010/03/04 20:01:37 krw Exp $
+.\"	$OpenBSD: route6d.8,v 1.20 2010/09/19 21:59:23 jmc Exp $
 .\"	$KAME: route6d.8,v 1.11 2002/06/02 15:00:30 itojun Exp $
 .\"
 .\" Copyright (c) 1996 WIDE Project. All rights reserved.
@@ -15,7 +15,7 @@
 .\" LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 .\" A PARTICULAR PURPOSE.
 .\"
-.Dd $Mdocdate: March 4 2010 $
+.Dd $Mdocdate: September 19 2010 $
 .Dt ROUTE6D 8
 .Os
 .Sh NAME
@@ -24,28 +24,35 @@
 .Sh SYNOPSIS
 .Nm route6d
 .Op Fl aDdhlnqSs
-.Oo Fl A Ar prefix
+.Oo
+.Fl A Ar prefix
 .Sm off
-.No / Ar preflen , if1
-.Op , Ar if2 , ... Oc
+.No / Ar preflen , if1\ \&
+.Op , Ar if2 , ...
+.Oc
 .Sm on
 .Bk -words
-.Oo Fl L Ar prefix
+.Oo
+.Fl L Ar prefix
 .Sm off
-.No / Ar preflen , if1
-.Op , Ar if2 , ... Oc
+.No / Ar preflen , if1\ \&
+.Op , Ar if2 , ...
+.Oc
 .Sm on
 .Ek
 .Oo
 .Fl N Ar if1
 .Sm off
-.Op , Ar if2 , ... Oc
+.Op , Ar if2 , ...
+.Oc
 .Sm on
 .Bk -words
-.Oo Fl O Ar prefix
+.Oo
+.Fl O Ar prefix
 .Sm off
-.No / Ar preflen , if1
-.Op , Ar if2 , ... Oc
+.No / Ar preflen , if1\ \&
+.Op , Ar if2 , ...
+.Oc
 .Sm on
 .Ek
 .Op Fl R Ar routelog
@@ -53,7 +60,8 @@
 .Oo
 .Fl T Ar if1
 .Sm off
-.Op , Ar if2 , ... Oc
+.Op , Ar if2 , ...
+.Oc
 .Sm on
 .Ek
 .Op Fl t Ar tag
diff --git a/usr.sbin/rtadvd/rtadvd.conf.5 b/usr.sbin/rtadvd/rtadvd.conf.5
index 9b07605a5c5..1315b52d4d0 100644
--- a/usr.sbin/rtadvd/rtadvd.conf.5
+++ b/usr.sbin/rtadvd/rtadvd.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rtadvd.conf.5,v 1.24 2010/03/26 19:30:40 jmc Exp $
+.\"	$OpenBSD: rtadvd.conf.5,v 1.25 2010/09/19 21:59:23 jmc Exp $
 .\"	$KAME: rtadvd.conf.5,v 1.46 2003/06/17 08:26:35 itojun Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 26 2010 $
+.Dd $Mdocdate: September 19 2010 $
 .Dt RTADVD.CONF 5
 .Os
 .Sh NAME
@@ -257,7 +257,7 @@ With the following configuration,
 overrides the router lifetime parameter for the
 .Li ne0
 interface.
-.Bd -literal -offset
+.Bd -literal -offset indent
 ne0:\e
 	:rltime#0:
 .Ed
@@ -269,7 +269,7 @@ The configuration must be used with the
 .Fl s
 option to
 .Xr rtadvd 8 .
-.Bd -literal -offset
+.Bd -literal -offset indent
 ef0:\e
 	:addr="2001:db8:ffff:1000::":prefixlen#64:
 .Ed
@@ -277,7 +277,7 @@ ef0:\e
 The following example presents the default values in an explicit manner.
 The configuration is provided just for reference purposes;
 YOU DO NOT NEED TO HAVE IT AT ALL.
-.Bd -literal -offset
+.Bd -literal -offset indent
 default:\e
 	:chlim#64:raflags#0:rltime#1800:rtime#0:retrans#0:\e
 	:pinfoflags="la":vltime#2592000:pltime#604800:mtu#0:
diff --git a/usr.sbin/user/usermgmt.conf.5 b/usr.sbin/user/usermgmt.conf.5
index 6a513f13ba3..c6559e84d7f 100644
--- a/usr.sbin/user/usermgmt.conf.5
+++ b/usr.sbin/user/usermgmt.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: usermgmt.conf.5,v 1.10 2009/01/21 16:56:03 sobrado Exp $
+.\" $OpenBSD: usermgmt.conf.5,v 1.11 2010/09/19 21:59:23 jmc Exp $
 .\" $NetBSD: usermgmt.conf.5,v 1.3 2002/10/02 13:49:11 grant Exp $
 .\"
 .\" Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,11 +30,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: January 21 2009 $
+.Dd $Mdocdate: September 19 2010 $
 .Dt USERMGMT.CONF 5
 .Os
-.\" turn off hyphenation
-.hym 999
 .Sh NAME
 .Nm usermgmt.conf
 .Nd user management tools configuration file