diff --git a/share/man/man4/bba.4 b/share/man/man4/bba.4
index b41ea124785b..264c9ea4b551 100644
--- a/share/man/man4/bba.4
+++ b/share/man/man4/bba.4
@@ -1,4 +1,4 @@
-.\" $NetBSD: bba.4,v 1.1 2000/05/03 22:56:56 augustss Exp $
+.\" $NetBSD: bba.4,v 1.2 2001/09/11 17:54:20 wiz Exp $
 .\"
 .\" Copyright (c) 2000 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -22,7 +22,7 @@
 .\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 .\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 
+.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
 .\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 .\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 .\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
diff --git a/share/man/man4/bha.4 b/share/man/man4/bha.4
index 0b8a0cc3f4c3..f6d52e91ab1c 100644
--- a/share/man/man4/bha.4
+++ b/share/man/man4/bha.4
@@ -1,4 +1,4 @@
-.\"	$NetBSD: bha.4,v 1.10 1999/12/17 16:23:21 abs Exp $
+.\"	$NetBSD: bha.4,v 1.11 2001/09/11 17:54:20 wiz Exp $
 .\"
 .\" Copyright (c) 1994 James A. Jegers
 .\" All rights reserved.
@@ -10,7 +10,7 @@
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. The name of the author may not be used to endorse or promote products
 .\"    derived from this software without specific prior written permission
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 .\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
@@ -44,9 +44,24 @@ adapters:
 .Pp
 .Bl -tag -width -offset indent -compact
 .It Tn Buslogic ISA BT-445
-.It Tn Buslogic EISA BT-74x 
+.It Tn Buslogic EISA BT-74x
 .It Tn Buslogic PCI BT-9[45][68]
 .El
+.Sh SEE ALSO
+.Xr cd 4 ,
+.Xr ch 4 ,
+.Xr intro 4 ,
+.Xr scsi 4 ,
+.Xr sd 4 ,
+.Xr st 4
+.Sh HISTORY
+In
+.Nx 1.2
+and earlier, this driver was named
+.Nm bt
+but was renamed to
+.Nm bha
+in later releases.
 .Sh BUGS
 The
 .Tn Buslogic
@@ -58,18 +73,3 @@ BT-445S has a problem in early hardware and firmware revisions
 which prevents proper operation on a system with more than 16MB of RAM.
 Hardware revision D and firmware revision 3.37 should be considered minimum
 requirements for using this board on systems configured in this manner.
-.Sh SEE ALSO
-.Xr intro 4 ,
-.Xr scsi 4 ,
-.Xr sd 4 ,
-.Xr st 4 ,
-.Xr cd 4 ,
-.Xr ch 4  
-.Sh HISTORY
-In
-.Nx 1.2
-and earlier, this driver was named
-.Nm bt
-but was renamed to
-.Nm bha
-in later releases.
diff --git a/share/man/man4/bktr.4 b/share/man/man4/bktr.4
index 20e4efdb07dd..8858988ff477 100644
--- a/share/man/man4/bktr.4
+++ b/share/man/man4/bktr.4
@@ -1,4 +1,4 @@
-.\" $NetBSD: bktr.4,v 1.5 2001/09/11 00:08:25 wiz Exp $
+.\" $NetBSD: bktr.4,v 1.6 2001/09/11 17:54:20 wiz Exp $
 .\"
 .\" Copyright (c) 2000 Thomas Klausner
 .\" 	All rights reserved.
@@ -43,7 +43,6 @@
 .\" The following options have no effect:
 .\" .Cd options BKTR_430_FX_MODE
 .\" .Cd options BKTR_SIS_VIA_MODE
-.Pp
 .Sh DESCRIPTION
 This driver supports video capture (frame grabber) and TV tuner cards
 based on the
@@ -196,6 +195,13 @@ teletext interface device
 .Xr pci 4 ,
 .Pa pkgsrc/audio/xmradio ,
 .Pa pkgsrc/graphics/fxtv
+.Sh HISTORY
+The
+.Nm
+driver appeared in
+.Fx 2.2
+and
+.Nx 1.5 .
 .Sh AUTHORS
 The
 .Nm
@@ -205,10 +211,3 @@ and is now maintained by Roger Hardiman.
 .Nx
 porting was done by Bernd Ernesti, Berndt Josef Wulf, Matthias
 Scheler, and Thomas Klausner.
-.Sh HISTORY
-The
-.Nm
-driver appeared in
-.Fx 2.2
-and
-.Nx 1.5 .
diff --git a/share/man/man4/boca.4 b/share/man/man4/boca.4
index 7411af987bd0..754f65098e9b 100644
--- a/share/man/man4/boca.4
+++ b/share/man/man4/boca.4
@@ -1,4 +1,4 @@
-.\"	$NetBSD: boca.4,v 1.3 1999/03/16 01:19:15 garbled Exp $
+.\"	$NetBSD: boca.4,v 1.4 2001/09/11 17:54:20 wiz Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -45,7 +45,6 @@
 .Nd
 multiplexing serial communications interface
 .Sh SYNOPSIS
-.Pp
 For 4-port BB1004 boards:
 .Pp
 .Cd "boca0 at isa? port 0x100 irq 5"
@@ -102,7 +101,7 @@ communications interfaces.
 .Pp
 Each
 .Nm
-device is the master device for up to eight 
+device is the master device for up to eight
 .Nm com
 devices.  The kernel configuration specifies these
 .Nm com
diff --git a/share/man/man4/bpf.4 b/share/man/man4/bpf.4
index dfe7ca94e0f5..b6f90403ff10 100644
--- a/share/man/man4/bpf.4
+++ b/share/man/man4/bpf.4
@@ -1,6 +1,6 @@
 .\" -*- nroff -*-
 .\"
-.\"	$NetBSD: bpf.4,v 1.14 2001/05/19 17:23:39 jdolecek Exp $
+.\"	$NetBSD: bpf.4,v 1.15 2001/09/11 17:54:20 wiz Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1992, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -362,7 +362,7 @@ instruction.
 Each instruction performs some action on the pseudo-machine state,
 which consists of an accumulator, index register, scratch memory store,
 and implicit program counter.
-
+.Pp
 The following structure defines the instruction format:
 .Bd -literal -offset indent
 struct bpf_insn {
@@ -412,25 +412,25 @@ These instructions copy a value into the accumulator.  The type of the
 source operand is specified by an
 .Dq addressing mode
 and can be a constant
-.No ( Ns Sy BBPF_IMM Ns ),
+.No ( Ns Sy BBPF_IMM Ns ) ,
 packet data at a fixed offset
-.No ( Ns Sy BPF_ABS Ns ),
+.No ( Ns Sy BPF_ABS Ns ) ,
 packet data at a variable offset
-.No ( Ns Sy BPF_IND Ns ),
+.No ( Ns Sy BPF_IND Ns ) ,
 the packet length
-.No ( Ns Sy BPF_LEN Ns ),
+.No ( Ns Sy BPF_LEN Ns ) ,
 or a word in the scratch memory store
-.No ( Ns Sy BPF_MEM Ns ).
+.No ( Ns Sy BPF_MEM Ns ) .
 For
 .Sy BPF_IND
 and
 .Sy BPF_ABS ,
 the data size must be specified as a word
-.No ( Ns Sy BPF_W Ns ),
+.No ( Ns Sy BPF_W Ns ) ,
 halfword
-.No ( Ns Sy BPF_H Ns ),
+.No ( Ns Sy BPF_H Ns ) ,
 or byte
-.No ( Ns Sy BPF_B Ns ).
+.No ( Ns Sy BPF_B Ns ) .
 The semantics of all the recognized BPF_LD instructions follow.
 .Bl -column "BPF_LD+BPF_W+BPF_ABS" "A <- P[k:4]" -width -offset indent
 .It Sy BPF_LD+BPF_W+BPF_ABS Ta A <- P[k:4]
@@ -473,7 +473,7 @@ index register or constant, and store the result back in the accumulator.
 For binary operations, a source mode is required
 .No ( Ns Sy BPF_K
 or
-.Sy BPF_X Ns ).
+.Sy BPF_X Ns ) .
 .Bl -column "BPF_ALU+BPF_ADD+BPF_K" "A <- A + k" -width -offset indent
 .It Sy BPF_ALU+BPF_ADD+BPF_K Ta A <- A + k
 .It Li Sy BPF_ALU+BPF_SUB+BPF_K Ta A <- A - k
@@ -498,7 +498,7 @@ The jump instructions alter flow of control.  Conditional jumps
 compare the accumulator against a constant
 .No ( Ns Sy BPF_K Ns )
 or the index register
-.No ( Ns Sy BPF_X Ns ).
+.No ( Ns Sy BPF_X Ns ) .
 If the result is true (or non-zero),
 the true branch is taken, otherwise the false branch is taken.
 Jump offsets are encoded in 8 bits so the longest jump is 256 instructions.
@@ -526,7 +526,7 @@ value of zero indicates that the packet should be ignored.
 The return value is either a constant
 .No ( Ns Sy BPF_K Ns )
 or the accumulator
-.No ( Ns Sy BPF_A Ns ).
+.No ( Ns Sy BPF_A Ns ) .
 .Bl -column "BPF_RET+BPF_A" "accept A bytes" -width -offset indent
 .It Sy BPF_RET+BPF_A Ta accept A bytes
 .It Li Sy BPF_RET+BPF_K Ta accept k bytes
@@ -548,7 +548,8 @@ array initializers:
 .Sy BPF_STMT Ns (opcode, operand)
 .Sy BPF_JUMP Ns (opcode, operand, true_offset, false_offset)
 .Ed
-.Pp
+.Sh FILES
+/dev/bpf0, /dev/bpf1, ...
 .Sh EXAMPLES
 The following filter is taken from the Reverse ARP Daemon.  It accepts
 only Reverse ARP requests.
@@ -611,13 +612,22 @@ struct bpf_insn insns[] = {
 .Xr signal 3 ,
 .Xr tcpdump 8
 .Rs
-.%T "The BSD Packet Filter: A New Architecture for User-level Packet Capture".
-.%A McCanne, S. and Jacobson V.
+.%T "The BSD Packet Filter: A New Architecture for User-level Packet Capture"
+.%A S. McCanne
+.%A V. Jacobson
 .%J Proceedings of the 1993 Winter USENIX
-.%C Technical Conference, San Diego, CA.
+.%C Technical Conference, San Diego, CA
 .Re
-.Sh FILES
-/dev/bpf0, /dev/bpf1, ...
+.Sh HISTORY
+The Enet packet filter was created in 1980 by Mike Accetta and
+Rick Rashid at Carnegie-Mellon University.  Jeffrey Mogul, at
+Stanford, ported the code to BSD and continued its development from
+1983 on.  Since then, it has evolved into the Ultrix Packet Filter
+at DEC, a STREAMS NIT module under SunOS 4.1, and BPF.
+.Sh AUTHORS
+Steven McCanne, of Lawrence Berkeley Laboratory, implemented BPF in
+Summer 1990.  The design was in collaboration with Van Jacobson,
+also of Lawrence Berkeley Laboratory.
 .Sh BUGS
 The read buffer must be of a fixed size (returned by the
 .Dv BIOCGBLEN
@@ -642,13 +652,3 @@ and the
 are misguided features.
 This functionality can be emulated with non-blocking mode and
 .Xr select 2 .
-.Sh HISTORY
-The Enet packet filter was created in 1980 by Mike Accetta and
-Rick Rashid at Carnegie-Mellon University.  Jeffrey Mogul, at
-Stanford, ported the code to BSD and continued its development from
-1983 on.  Since then, it has evolved into the Ultrix Packet Filter
-at DEC, a STREAMS NIT module under SunOS 4.1, and BPF.
-.Sh AUTHORS
-Steven McCanne, of Lawrence Berkeley Laboratory, implemented BPF in
-Summer 1990.  The design was in collaboration with Van Jacobson,
-also of Lawrence Berkeley Laboratory.
diff --git a/share/man/man4/bridge.4 b/share/man/man4/bridge.4
index d378615a860a..d2612da6387c 100644
--- a/share/man/man4/bridge.4
+++ b/share/man/man4/bridge.4
@@ -1,4 +1,4 @@
-.\"	$NetBSD: bridge.4,v 1.1 2001/08/17 22:20:35 thorpej Exp $
+.\"	$NetBSD: bridge.4,v 1.2 2001/09/11 17:54:20 wiz Exp $
 .\"
 .\" Copyright 2001 Wasabi Systems, Inc.
 .\" All rights reserved.
@@ -32,7 +32,7 @@
 .\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
-.\" 
+.\"
 .Dd August 17, 2001
 .Dt BRIDGE 4
 .Os
@@ -76,6 +76,11 @@ The
 .Nm
 driver implements the IEEE 802.1D Spanning Tree protocol (STP).  Spanning
 Tree is used to detect and remove loops in a network topology.
+.Sh HISTORY
+The
+.Nm
+driver first appeared in
+.Nx 1.6 .
 .Sh AUTHORS
 The
 .Nm bridge
@@ -90,11 +95,6 @@ This version of the
 driver has been heavily modified from the original version by
 .An Jason R. Thorpe
 .Aq thorpej@wasabisystems.com .
-.Sh HISTORY
-The
-.Nm
-driver first appeared in
-.Nx 1.6 .
 .Sh BUGS
 The
 .Nm