We have to undo the changes to the 3rd party code, because it makes

upgrading those components hell.

Tip of the day: Don't commit without confirmation.

18 files changed, 52 insertions, 32 deletions

diff --git a/usr.sbin/afs/fs/fs.1 b/usr.sbin/afs/fs/fs.1
index 0844743f1ca..6c9a361c1e0 100644
--- a/usr.sbin/afs/fs/fs.1
+++ b/usr.sbin/afs/fs/fs.1
@@ -5,7 +5,7 @@
 .Nm fs
 .Nd Manage AFS directorys
 .Sh SYNOPSIS
-.Nm fs
+.Nm
 .Op Ar command
 .Op Ar args
 .Sh DESCRIPTION
diff --git a/usr.sbin/afs/pts/pts.1 b/usr.sbin/afs/pts/pts.1
index c3b49477292..a2f65867cd0 100644
--- a/usr.sbin/afs/pts/pts.1
+++ b/usr.sbin/afs/pts/pts.1
@@ -243,6 +243,7 @@ implemented yet.
 .Bd -filled -offset indent -compact
 This command has not been implemented yet.
 .Ed
+.Pp
 .Sh SEE ALSO
 .Xr afsd 8 ,
 .Xr fs 1 ,
diff --git a/usr.sbin/afs/src/appl/afsutils/aklog.1 b/usr.sbin/afs/src/appl/afsutils/aklog.1
index fdcb1494672..e69ba897790 100644
--- a/usr.sbin/afs/src/appl/afsutils/aklog.1
+++ b/usr.sbin/afs/src/appl/afsutils/aklog.1
@@ -1,4 +1,4 @@
-.\" $Id: aklog.1,v 1.2 2001/07/20 19:09:46 mpech Exp $
+.\" $Id: aklog.1,v 1.3 2001/07/25 10:04:57 mpech Exp $
 .Dd Aug 06, 2000
 .Dt AKLOG SECTION
 .Os Arla
@@ -7,7 +7,7 @@
 .Nd
 Fetches tokens from your ticket-file.
 .Sh SYNOPSIS
-.Nm aklog
+.Nm
 .Op Fl cell Ar <cell name>
 .Op Fl createuser Ar <cell name>
 .Op Fl debug Ar <cell name>
diff --git a/usr.sbin/afs/src/appl/afsutils/klog.1 b/usr.sbin/afs/src/appl/afsutils/klog.1
index a0aa382cb18..e69e6f7c8d2 100644
--- a/usr.sbin/afs/src/appl/afsutils/klog.1
+++ b/usr.sbin/afs/src/appl/afsutils/klog.1
@@ -1,4 +1,4 @@
-.\" $Id: klog.1,v 1.2 2001/07/20 19:09:46 mpech Exp $
+.\" $Id: klog.1,v 1.3 2001/07/25 10:04:57 mpech Exp $
 .\"
 .Dd July 7, 1999
 .Dt KLOG 1
@@ -8,7 +8,7 @@
 .Nd
 A program to get AFS tokens and possibly other things
 .Sh SYNOPSIS
-.Nm klog
+.Nm
 .Op Fl principal Ar Kerberos principal
 .Op Fl cell Ar AFS cell
 .Op Fl lifetime Ar token lifetime in hrs:min:sec
diff --git a/usr.sbin/afs/src/appl/afsutils/tokens.1 b/usr.sbin/afs/src/appl/afsutils/tokens.1
index 022d87d8401..4739a78d75f 100644
--- a/usr.sbin/afs/src/appl/afsutils/tokens.1
+++ b/usr.sbin/afs/src/appl/afsutils/tokens.1
@@ -1,4 +1,4 @@
-.\" $Id: tokens.1,v 1.2 2001/07/20 19:09:46 mpech Exp $
+.\" $Id: tokens.1,v 1.3 2001/07/25 10:04:57 mpech Exp $
 .\"
 .Dd July 7, 1999
 .Dt TOKENS 1
@@ -8,7 +8,7 @@
 .Nd
 lists all AFS tokens in your current PAG.
 .Sh SYNOPSIS
-.Nm tokens
+.Nm
 .Op Fl athena
 .Op Fl verbose, v
 .Sh DESCRIPTION
diff --git a/usr.sbin/afs/src/appl/afsutils/unlog.1 b/usr.sbin/afs/src/appl/afsutils/unlog.1
index d526ad573ce..2882db83b88 100644
--- a/usr.sbin/afs/src/appl/afsutils/unlog.1
+++ b/usr.sbin/afs/src/appl/afsutils/unlog.1
@@ -1,4 +1,4 @@
-.\" $Id: unlog.1,v 1.2 2001/07/20 19:09:46 mpech Exp $
+.\" $Id: unlog.1,v 1.3 2001/07/25 10:04:57 mpech Exp $
 .\"
 .Dd July 7, 1999
 .Dt UNLOG 1
@@ -8,7 +8,7 @@
 .Nd
 A program to destroy some or all of your AFS tokens
 .Sh SYNOPSIS
-.Nm unlog
+.Nm
 .Op Fl cell Ar cells...
 .Op Ar cells...
 .Op Fl help
diff --git a/usr.sbin/afs/src/appl/fs/fs.1 b/usr.sbin/afs/src/appl/fs/fs.1
index fc5ea2f9b7b..6857e40386e 100644
--- a/usr.sbin/afs/src/appl/fs/fs.1
+++ b/usr.sbin/afs/src/appl/fs/fs.1
@@ -1,5 +1,5 @@
-.\"     $OpenBSD: fs.1,v 1.2 2001/07/20 19:09:46 mpech Exp $
-.\"	$Id: fs.1,v 1.2 2001/07/20 19:09:46 mpech Exp $
+.\"     $OpenBSD: fs.1,v 1.3 2001/07/25 10:04:57 mpech Exp $
+.\"	$Id: fs.1,v 1.3 2001/07/25 10:04:57 mpech Exp $
 .Dd March 29, 2000
 .Dt FS 1
 .Os
@@ -7,7 +7,7 @@
 .Nm fs
 .Nd Manage AFS directorys
 .Sh SYNOPSIS
-.Nm fs
+.Nm
 .Op Ar command
 .Op Ar args
 .Sh DESCRIPTION
diff --git a/usr.sbin/afs/src/appl/pts/pts.1 b/usr.sbin/afs/src/appl/pts/pts.1
index 1ba7ee97eac..ed69def7891 100644
--- a/usr.sbin/afs/src/appl/pts/pts.1
+++ b/usr.sbin/afs/src/appl/pts/pts.1
@@ -1,5 +1,5 @@
-.\"     $OpenBSD: pts.1,v 1.2 2001/07/20 19:09:46 mpech Exp $
-.\"	$Id: pts.1,v 1.2 2001/07/20 19:09:46 mpech Exp $
+.\"     $OpenBSD: pts.1,v 1.3 2001/07/25 10:04:57 mpech Exp $
+.\"	$Id: pts.1,v 1.3 2001/07/25 10:04:57 mpech Exp $
 .Dd March 25, 2000
 .Dt PTS 1
 .Os
@@ -245,6 +245,7 @@ implemented yet.
 .Bd -filled -offset indent -compact
 This command has not been implemented yet.
 .Ed
+.Pp
 .Sh SEE ALSO
 .Xr afsd 8 ,
 .Xr fs 1 ,
diff --git a/usr.sbin/afs/src/appl/udebug/udebug.1 b/usr.sbin/afs/src/appl/udebug/udebug.1
index 35b663baaaa..12db791a070 100644
--- a/usr.sbin/afs/src/appl/udebug/udebug.1
+++ b/usr.sbin/afs/src/appl/udebug/udebug.1
@@ -1,5 +1,5 @@
 .\" Copyright (c) 2000 Kungliga Tekniska Högskolan
-.\" $Id: udebug.1,v 1.2 2001/07/20 19:09:46 mpech Exp $
+.\" $Id: udebug.1,v 1.3 2001/07/25 10:04:57 mpech Exp $
 .Dd Aug 06, 2000
 .Dt UDEBUG SECTION
 .Os Arla
@@ -9,7 +9,7 @@
 a tool to diagnose synchronization problems with ubik-database
 servers.
 .Sh SYNOPSIS
-.Nm udebug
+.Nm
 .Op Fl servers Ar servers ...
 .Op Fl port Ar port
 .Op Fl long
diff --git a/usr.sbin/afs/src/arlad/arlad.1 b/usr.sbin/afs/src/arlad/arlad.1
index e0dfaaa7d25..fd39b2b6e3d 100644
--- a/usr.sbin/afs/src/arlad/arlad.1
+++ b/usr.sbin/afs/src/arlad/arlad.1
@@ -1,5 +1,5 @@
-.\"     $OpenBSD: arlad.1,v 1.2 2001/07/20 19:09:46 mpech Exp $
-.\"	$Id: arlad.1,v 1.2 2001/07/20 19:09:46 mpech Exp $
+.\"     $OpenBSD: arlad.1,v 1.3 2001/07/25 10:04:57 mpech Exp $
+.\"	$Id: arlad.1,v 1.3 2001/07/25 10:04:57 mpech Exp $
 .Dd September 5, 1998
 .Dt ARLAD 1
 .Os
@@ -7,7 +7,7 @@
 .Nm arlad
 .Nd AFS cache manager for xfs
 .Sh SYNOPSIS
-.Nm arlad
+.Nm
 .Op Fl t | Fl -test
 .Oo Fl c Ar string \*(Ba Xo
 .Fl -conffile= Ns Ar string Oc
diff --git a/usr.sbin/afs/src/lib/roken/getarg.3 b/usr.sbin/afs/src/lib/roken/getarg.3
index 71781eb9d20..27d39eba463 100644
--- a/usr.sbin/afs/src/lib/roken/getarg.3
+++ b/usr.sbin/afs/src/lib/roken/getarg.3
@@ -1,5 +1,5 @@
 .\" Copyright (c) 1999 Kungliga Tekniska Högskolan
-.\" $Id: getarg.3,v 1.2 2001/07/20 19:09:47 mpech Exp $
+.\" $Id: getarg.3,v 1.3 2001/07/25 10:04:57 mpech Exp $
 .Dd September 24, 1999
 .Dt GETARG 3
 .Os ROKEN
@@ -233,6 +233,8 @@ and if you're really confused you can do it multiple times
 .Pf ( Fl -no-no-help= Ns Ar false ,
 or even 
 .Fl -no-no-help= Ns Ar maybe ) .
+
+.Pp
 .Sh EXAMPLE
 .Bd -literal
 #include <stdio.h>
diff --git a/usr.sbin/afs/src/rx/rxdebug.1 b/usr.sbin/afs/src/rx/rxdebug.1
index e0e51441fc0..18d568657e6 100644
--- a/usr.sbin/afs/src/rx/rxdebug.1
+++ b/usr.sbin/afs/src/rx/rxdebug.1
@@ -1,5 +1,5 @@
 .\" Copyright (c) 2000 Kungliga Tekniska Högskolan
-.\" $Id: rxdebug.1,v 1.2 2001/07/20 19:09:47 mpech Exp $
+.\" $Id: rxdebug.1,v 1.3 2001/07/25 10:04:57 mpech Exp $
 .Dd Aug 24, 2000
 .Dt SECTION
 .Nm rxdebug
@@ -9,7 +9,7 @@
 .Nd
 a tool to diagnose problems with rx.
 .Sh SYNOPSIS
-.Nm rxdebug
+.Nm
 .Op Fl port Ar port
 .Op Fl nodally
 .Op Fl allconnection
@@ -58,6 +58,7 @@ list of the servers to talk to.
 .Nm
 is used to diagnose a rx-implementation, what version the afs-client
 are running, why rx missbehavies, or if there are performance problems.
+.Pp
 .Sh EXAMPLES
 .Bd -literal
 datan# rxdebug -servers localhost -port 4711 -status -noconn
diff --git a/usr.sbin/altq/altqd/altq.conf.5 b/usr.sbin/altq/altqd/altq.conf.5
index 98f03f10af1..58820c4537d 100644
--- a/usr.sbin/altq/altqd/altq.conf.5
+++ b/usr.sbin/altq/altqd/altq.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: altq.conf.5,v 1.3 2001/07/20 19:09:47 mpech Exp $
+.\"	$OpenBSD: altq.conf.5,v 1.4 2001/07/25 10:04:56 mpech Exp $
 .\"	$KAME: altq.conf.5,v 1.8 2001/04/09 16:26:28 thorpej Exp $
 .\"
 .\" Copyright (C) 2000
@@ -49,6 +49,7 @@ HFSC (Hierarchical Fair Service Curve), PRIQ (Priority Queueing),
 RED (Random Early Detection), RIO (RED with IN/OUT),
 WFQ (Weighted Fair Queueing),
 and CDNR (Diffserv Traffic Conditioner) can be configured in this file.
+.Pp
 .Sh Interface Commands
 .Bl -tag -width interface -offset indent
 .It Nm interface
@@ -96,6 +97,7 @@ or
 If the interface has only traffic conditioners and no queueing
 discipline, sched_type can be omitted.
 .El
+.Pp
 .Sh Class Command
 .Bl -tag -width class -offset indent
 .It Nm class
@@ -139,6 +141,7 @@ class queue (experimental implementation).  ECN implies RED.
 .It Sy cleardscp
 Clear diffserv codepoint in the IP header.
 .El
+.Pp
 .Sh Filter Commands
 .Bl -tag -width filter -offset indent
 .It Nm filter
@@ -258,6 +261,7 @@ keyword can be used to specify the Security Parameter Index value for
 IPSec.
 .Pp
 When filter value 0 is used, it is taken as a wildcard.
+.Pp
 .Sh CBQ Commands
 CBQ (Class Based Queueing) achieves both partitioning and sharing of
 link bandwidth  by hierarchically structured classes.
@@ -423,6 +427,7 @@ enables RED/flow-valve (a.k.a. red-penalty-box) on this class queue.
 .It Sy cleardscp
 clears diffserv codepoint in the IP header.
 .El
+.Pp
 .Sh HFSC Commands
 HFSC (Hierarchical Fair Service Curve) supports both link-sharing and
 guaranteed real-time services.  H-FSC employs a service curve based QoS
@@ -558,6 +563,7 @@ enables RED/ECN on this class queue.
 .It Sy cleardscp
 clears diffserv codepoint in the IP header.
 .El
+.Pp
 .Sh PRIQ Commands
 PRIQ (Priority Queueing) implements a simple priority-based queueing.
 A higher priority class is always served first.
@@ -630,6 +636,7 @@ enables RED/ECN on this class queue.
 .It Sy cleardscp
 clears diffserv codepoint in the IP header.
 .El
+.Pp
 .Sh WFQ Commands
 WFQ (Weighted Fair Queueing) implements a weighted-round robin
 scheduler for a set of queue.
@@ -674,6 +681,7 @@ specifies a hashing policy by IP addresses and ports.
 specifies a hashing policy by IP source port number.  Default is
 .Sy dstaddr
 .El
+.Pp
 .Sh FIFOQ Commands
 FIFOQ (First-In First-Out Queueing) is a simple tail-drop FIFO queue.
 FIFOQ is the simplest possible implementation of a queueing discipline
@@ -704,6 +712,7 @@ for FIFOQ.
 The maxium queue size in number of packets.
 Default value is 50.
 .El
+.Pp
 .Sh RED Commands
 RED (Random Early Detection) is an implicit congestion notification
 mechanism that exercises packet dropping or packet marking
@@ -773,6 +782,7 @@ enables ECN.
 .It Sy flowvalve
 enables flowvalve.
 .El
+.Pp
 .Sh RIO Commands
 ALTQ/RIO has 3 drop precedence levels defined for the Assured
 Forwarding of DiffServ (RFC2597).
@@ -871,6 +881,7 @@ The inverse of the maximum drop probability for high drop precedence.
 .It Sy ecn
 enables ECN.
 .El
+.Pp
 .Sh BLUE Commands
 .Bl -tag -width interface -offset indent
 .It Nm interface
@@ -908,6 +919,7 @@ specifies the hold time in usec.
 .It Sy ecn
 enables ECN.
 .El
+.Pp
 .Sh CDNR Commands
 The
 .Sy conditioner
@@ -1036,6 +1048,7 @@ rate, and is specified in milli-second.  500 msec is ok for normal
 settings.
 .El
 .El
+.Pp
 .Sh EXAMPLES
 .nf
 
@@ -1153,6 +1166,7 @@ conditioner fxp0 af1x_cdnr <trtcm 3M 32K 10M 64K <mark 0x28><mark 0x30><mark 0x3
         filter fxp0 af1x_cdnr 0 0 192.168.0.178 0 0
 
 .fi
+.Pp
 .Sh SEE ALSO
 .Xr altqd 8
 .Sh BUGS
diff --git a/usr.sbin/altq/tbrconfig/tbrconfig.8 b/usr.sbin/altq/tbrconfig/tbrconfig.8
index 117d644303b..1167065f545 100644
--- a/usr.sbin/altq/tbrconfig/tbrconfig.8
+++ b/usr.sbin/altq/tbrconfig/tbrconfig.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tbrconfig.8,v 1.2 2001/07/20 19:09:47 mpech Exp $
+.\"	$OpenBSD: tbrconfig.8,v 1.3 2001/07/25 10:04:56 mpech Exp $
 .\"	$KAME: tbrconfig.8,v 1.2 2001/04/09 16:26:30 thorpej Exp $
 .\"
 .\" Copyright (C) 2000
@@ -34,7 +34,7 @@
 .Nd configure a token bucket regulator for an output queue
 .\"
 .Sh SYNOPSIS
-.Nm tbrconfig
+.Nm
 .Ar interface
 .Oo
 .Ar tokenrate
diff --git a/usr.sbin/faithd/faithd.8 b/usr.sbin/faithd/faithd.8
index bbd6a1b4ec1..a1d35cc8469 100644
--- a/usr.sbin/faithd/faithd.8
+++ b/usr.sbin/faithd/faithd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: faithd.8,v 1.18 2001/07/20 19:09:47 mpech Exp $
+.\"	$OpenBSD: faithd.8,v 1.19 2001/07/25 10:04:57 mpech Exp $
 .\"	$KAME: faithd.8,v 1.31 2001/06/30 00:57:01 itojun Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -35,7 +35,7 @@
 .Nm faithd
 .Nd FAITH IPv6/v4 translator daemon
 .Sh SYNOPSIS
-.Nm faithd
+.Nm
 .Op Fl dp
 .Op Fl f Ar configfile
 .Ar service
diff --git a/usr.sbin/rip6query/rip6query.8 b/usr.sbin/rip6query/rip6query.8
index 0e2e9232d90..18e64d5f9cf 100644
--- a/usr.sbin/rip6query/rip6query.8
+++ b/usr.sbin/rip6query/rip6query.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rip6query.8,v 1.4 2001/07/20 19:09:48 mpech Exp $
+.\"	$OpenBSD: rip6query.8,v 1.5 2001/07/25 10:04:57 mpech Exp $
 .\"
 .\" Copyright (C) 1998 and 1999 WIDE Project.
 .\" All rights reserved.
@@ -37,7 +37,7 @@
 .Nd RIPng debugging tool
 .\"
 .Sh SYNOPSIS
-.Nm rip6query
+.Nm
 .Op Fl I Ar interface
 .Ar destination
 .\"
diff --git a/usr.sbin/rtadvd/rtadvd.8 b/usr.sbin/rtadvd/rtadvd.8
index e98024b620c..dc6bbfce4b9 100644
--- a/usr.sbin/rtadvd/rtadvd.8
+++ b/usr.sbin/rtadvd/rtadvd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rtadvd.8,v 1.15 2001/07/20 19:09:48 mpech Exp $
+.\"	$OpenBSD: rtadvd.8,v 1.16 2001/07/25 10:04:57 mpech Exp $
 .\"	$KAME: rtadvd.8,v 1.17 2001/02/04 05:34:38 jinmei Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -35,7 +35,7 @@
 .Nm rtadvd
 .Nd router advertisement daemon
 .Sh SYNOPSIS
-.Nm rtadvd
+.Nm
 .Op Fl c Ar configfile
 .Op Fl dDfRs
 .Ar interface ...
diff --git a/usr.sbin/rtadvd/rtadvd.conf.5 b/usr.sbin/rtadvd/rtadvd.conf.5
index 1ad4adc417c..a47cbaa7851 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.14 2001/07/20 19:09:48 mpech Exp $
+.\"	$OpenBSD: rtadvd.conf.5,v 1.15 2001/07/25 10:04:57 mpech Exp $
 .\"	$KAME: rtadvd.conf.5,v 1.32 2001/01/19 05:32:05 jinmei Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,6 +61,7 @@ character.
 The comment marker is the
 .Sq \&#
 character.
+.Pp
 .Sh CAPABILITIES
 Capabilities describe the value to be filled into ICMPv6 router
 advertisement messages and to control