From: aaron <aaron@openbsd.org>
Date: Mon, 3 Apr 2000 21:19:35 +0000 (+0000)
Subject: Remove trailing whitespace.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=9e179f3c11b0b577e38af5a6931ddfd9b6c68dc7;p=openbsd

Remove trailing whitespace.
---

diff --git a/share/man/man4/ac97.4 b/share/man/man4/ac97.4
index 800eefd8195..561d9560322 100644
--- a/share/man/man4/ac97.4
+++ b/share/man/man4/ac97.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ac97.4,v 1.1 1999/10/06 18:57:45 csapuntz Exp $
+.\"	$OpenBSD: ac97.4,v 1.2 2000/04/03 21:19:35 aaron Exp $
 .Dd October 7, 1999
 .Dt AC97 4
 .Os
@@ -12,12 +12,12 @@ AC-97 codecs contain the analog-to-digital (A/D), digital-to-analog
 for the most part, do not talk to host busses like the PCI bus
 directly. Instead, they communicate through an interface chip, called
 the host controller. The Ensoniq AudioPCI 97 (see
-.Xr eap 4 
+.Xr eap 4
 ) is an example of such a host controller.
 .Pp
 Unlike many drivers, the
 .Nm
-driver does not appear in the configuration file. Instead, the driver 
+driver does not appear in the configuration file. Instead, the driver
 is automatically attached by the drivers that require it.
 .Sh SEE ALSO
 .Xr eap 4 .
diff --git a/share/man/man4/ahc.4 b/share/man/man4/ahc.4
index dbbc1b1577b..5ca57ffe007 100644
--- a/share/man/man4/ahc.4
+++ b/share/man/man4/ahc.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ahc.4,v 1.8 2000/03/22 03:17:04 smurph Exp $
+.\"	$OpenBSD: ahc.4,v 1.9 2000/04/03 21:19:35 aaron Exp $
 .\"	$NetBSD: ahc.4,v 1.1.2.1 1996/08/25 17:22:14 thorpej Exp $
 .\"
 .\" Copyright (c) 1995, 1996
@@ -121,20 +121,20 @@ is attempted.
 Most modern motherboards perform the initialization correctly and work fine
 with this option enabled.
 .Pp
-Per target configuration performed in the 
+Per target configuration performed in the
 .Tn SCSI-Select
 menu, accessible at boot
-in 
+in
 .No non- Ns Tn EISA
 models,
-or through an 
+or through an
 .Tn EISA
-configuration utility for 
+configuration utility for
 .Tn EISA
 models,
-is honored by this driver with the stipulation that the 
+is honored by this driver with the stipulation that the
 .Tn BIOS
-must be enabled for 
+must be enabled for
 .Tn EISA
 adaptors.  This includes synchronous/asynchronous transfers,
 maximum synchronous negotiation rate,
@@ -161,13 +161,13 @@ aic7770     10    EISA/VL    10MHz     16Bit     4    1
 aic7850     10    PCI/32     10MHz      8Bit     3
 aic7860     10    PCI/32     20MHz      8Bit     3
 aic7870     10    PCI/32     10MHz     16Bit    16
-aic7880     10    PCI/32     20MHz     16Bit    16 
+aic7880     10    PCI/32     20MHz     16Bit    16
 aic7890     20    PCI/32     40MHz     16Bit    16        3 4 5 6 7
 aic7891     20    PCI/64     40MHz     16Bit    16        3 4 5 6 7
 aic7895     15    PCI/32     20MHz     16Bit    16      2 3 4 5
 aic7896     20    PCI/32     40MHz     16Bit    16      2 3 4 5 6 7
 aic7897     20    PCI/64     40MHz     16Bit    16      2 3 4 5 6 7
-.El 
+.El
 .Pp
 .Bl -enum -compact
 .It
@@ -229,7 +229,7 @@ Some Quantum drives (at least the Empire 2100 and 1080s) will not run on an
 Rev B in synchronous mode at 10MHz.  Controllers with this problem have a
 42 MHz clock crystal on them and run slightly above 10MHz.  This confuses
 the drive and hangs the bus.  Setting a maximum synchronous negotiation rate
-of 8MHz in the 
+of 8MHz in the
 .Tn SCSI-Select
 utility
 will allow normal operation.
diff --git a/share/man/man4/an.4 b/share/man/man4/an.4
index 63d4a8590b9..7c8369c1c98 100644
--- a/share/man/man4/an.4
+++ b/share/man/man4/an.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: an.4,v 1.5 2000/04/03 19:34:19 deraadt Exp $
+.\"	$OpenBSD: an.4,v 1.6 2000/04/03 21:19:35 aaron Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 1999
 .\"	Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
@@ -41,7 +41,7 @@
 Aironet Communications 4500/4800 IEEE 802.11DS network adapter driver
 .Sh SYNOPSIS
 .Cd "an* at pcmcia? function ?"
-.Cd 
+.Cd
 .Sh DESCRIPTION
 The
 .Nm
@@ -111,7 +111,7 @@ command.
 .Sh SEE ALSO
 .Xr wi 4
 .Xr arp 4 ,
-.Xr netintro 4 , 
+.Xr netintro 4 ,
 .Xr ifconfig 8 ,
 .Xr ancontrol 8
 .Sh HISTORY
diff --git a/share/man/man4/atapiscsi.4 b/share/man/man4/atapiscsi.4
index b76db87e516..035ff31ee81 100644
--- a/share/man/man4/atapiscsi.4
+++ b/share/man/man4/atapiscsi.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: atapiscsi.4,v 1.4 1999/12/11 10:23:41 csapuntz Exp $
+.\"	$OpenBSD: atapiscsi.4,v 1.5 2000/04/03 21:19:35 aaron Exp $
 .\"
 .\" Copyright (c) 1999 Constantine Sapuntzakis.
 .\"
@@ -38,19 +38,19 @@
 .Cd "atapiscsi* at pciide? channel ?"
 .Cd "scsibus* at atapiscsi?"
 .Sh DESCRIPTION
-The 
+The
 .Nm
 driver supports ATAPI (also called IDE) devices such as CD-ROMs, ZIP
 drives, LS-120 floppy drives, and tape drives.  All ATAPI devices talk
-a subset of the SCSI protocol. 
+a subset of the SCSI protocol.
 .Pp
 The
 .Nm
 driver acts like a SCSI adapter.  Thus, the ATAPI devices connected to
-the system will appear as SCSI devices.  ATAPI CD-ROMs will appear 
+the system will appear as SCSI devices.  ATAPI CD-ROMs will appear
 as
 .Xr cd 4
-devices, ATAPI tape drives as 
+devices, ATAPI tape drives as
 .Xr st 4
 devices, and ATAPI floppies as
 .Xr sd 4
@@ -72,4 +72,4 @@ For now, we recommend you put the tape device on its own channel.
 .Xr wdc 4 ,
 .Xr cd 4 ,
 .Xr st 4 ,
-.Xr sd 4 
+.Xr sd 4
diff --git a/share/man/man4/aue.4 b/share/man/man4/aue.4
index 930f17137ca..e934590582a 100644
--- a/share/man/man4/aue.4
+++ b/share/man/man4/aue.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: aue.4,v 1.1 2000/03/29 00:27:05 aaron Exp $
+.\" $OpenBSD: aue.4,v 1.2 2000/04/03 21:19:36 aaron Exp $
 .\" $NetBSD: aue.4,v 1.3 2000/02/12 15:05:48 augustss Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 1999
@@ -135,7 +135,7 @@ The driver failed to allocate an mbuf for the receiver ring.
 .Xr arp 4 ,
 .Xr ifconfig 8 ,
 .Xr netintro 4 ,
-.Xr usb 4 
+.Xr usb 4
 .Rs
 .%T ADMtek AN986 data sheet
 .%O http://www.admtek.com.tw
diff --git a/share/man/man4/bpf.4 b/share/man/man4/bpf.4
index 51eb986c698..4f7b7e2098e 100644
--- a/share/man/man4/bpf.4
+++ b/share/man/man4/bpf.4
@@ -31,7 +31,7 @@ bpf \- Berkeley Packet Filter
 .B "pseudo-device bpfilter 16"
 .SH DESCRIPTION
 The Berkeley Packet Filter
-provides a raw interface to data link layers in a protocol 
+provides a raw interface to data link layers in a protocol
 independent fashion.
 All packets on the network, even those destined for other hosts,
 are accessible through this mechanism.
@@ -39,30 +39,30 @@ are accessible through this mechanism.
 The packet filter appears as a character special device,
 .I /dev/bpf0, /dev/bpf1,
 etc.
-After opening the device, the file descriptor must be bound to a 
+After opening the device, the file descriptor must be bound to a
 specific network interface with the BIOSETIF ioctl.
 A given interface can be shared be multiple listeners, and the filter
 underlying each descriptor will see an identical packet stream.
-The total number of open 
+The total number of open
 files is limited to the value given in the kernel configuration; the
 example given in the SYNOPSIS above sets the limit to 16.
 .PP
-A separate device file is required for each minor device.  
-If a file is in use, the open will fail and 
+A separate device file is required for each minor device.
+If a file is in use, the open will fail and
 .I errno
 will be set to EBUSY.
 .PP
 Associated with each open instance of a
 .I bpf
 file is a user-settable packet filter.
-Whenever a packet is received by an interface, 
+Whenever a packet is received by an interface,
 all file descriptors listening on that interface apply their filter.
 Each descriptor that accepts the packet receives its own copy.
 .PP
 Reads from these files return the next group of packets
 that have matched the filter.
 To improve performance, the buffer passed to read must be
-the same size as the buffers used internally by 
+the same size as the buffers used internally by
 .I bpf.
 This size is returned by the BIOCGBLEN ioctl (see below), and under
 BSD, can be set with BIOCSBLEN.
@@ -78,13 +78,13 @@ Since packet data is in network byte order, applications should use the
 .I byteorder(3n)
 macros to extract multi-byte values.
 .PP
-A packet can be sent out on the network by writing to a 
+A packet can be sent out on the network by writing to a
 .I bpf
 file descriptor.  The writes are unbuffered, meaning only one
 packet can be processed per write.
 Currently, only writes to Ethernets and SLIP links are supported.
 .SH IOCTLS
-The 
+The
 .I ioctl
 command codes below are defined in <net/bpf.h>.  All commands require
 these includes:
@@ -100,7 +100,7 @@ these includes:
 .ft R
 Additionally, BIOCGETIF and BIOCSETIF require \fB<net/if.h>\fR.
 
-The (third) argument to the 
+The (third) argument to the
 .I ioctl
 should be a pointer to the type indicated.
 .TP 10
@@ -110,7 +110,7 @@ Returns the required buffer length for reads on
 files.
 .TP 10
 .B BIOCSBLEN (u_int)
-Sets the buffer length for reads on 
+Sets the buffer length for reads on
 .I bpf
 files.  The buffer must be set before the file is attached to an interface
 with BIOCSETIF.
@@ -128,10 +128,10 @@ Forces the interface into promiscuous mode.
 All packets, not just those destined for the local host, are processed.
 Since more than one file can be listening on a given interface,
 a listener that opened its interface non-promiscuously may receive
-packets promiscuously.  This problem can be remedied with an 
+packets promiscuously.  This problem can be remedied with an
 appropriate filter.
 .IP
-The interface remains in promiscuous mode until all files listening 
+The interface remains in promiscuous mode until all files listening
 promiscuously are closed.
 .TP 10
 .B BIOCFLUSH
@@ -140,7 +140,7 @@ and resets the statistics that are returned by BIOCGSTATS.
 .TP 10
 .B BIOCGETIF (struct ifreq)
 Returns the name of the hardware interface that the file is listening on.
-The name is returned in the ifr_name field of 
+The name is returned in the ifr_name field of
 .I ifr.
 All other fields are undefined.
 .TP 10
@@ -149,14 +149,14 @@ Sets the hardware interface associated with the file.  This
 command must be performed before any packets can be read.
 The device is indicated by name using the
 .I ifr_name
-field of the 
+field of the
 .I ifreq.
 Additionally, performs the actions of BIOCFLUSH.
 .TP 10
 .B BIOCSRTIMEOUT, BIOCGRTIMEOUT (struct timeval)
 Set or get the read timeout parameter.
-The 
-.I timeval 
+The
+.I timeval
 specifies the length of time to wait before timing
 out on a read request.
 This parameter is initialized to zero by
@@ -184,14 +184,14 @@ the number of packets received by the descriptor since opened or reset
 and
 .TP
 .I bs_drop
-the number of packets which were accepted by the filter but dropped by the 
+the number of packets which were accepted by the filter but dropped by the
 kernel because of buffer overflows
 (i.e., the application's reads aren't keeping up with the packet traffic).
 .RE
 .TP 10
 .B BIOCIMMEDIATE (u_int)
 Enable or disable ``immediate mode'', based on the truth value of the argument.
-When immediate mode is enabled, reads return immediately upon packet 
+When immediate mode is enabled, reads return immediately upon packet
 reception.  Otherwise, a read will block until either the kernel buffer
 becomes full or a timeout occurs.
 This is useful for programs like
@@ -200,7 +200,7 @@ which must respond to messages in real time.
 The default for a new file is off.
 .TP 10
 .B BIOCSETF (struct bpf_program)
-Sets the filter program used by the kernel to discard uninteresting 
+Sets the filter program used by the kernel to discard uninteresting
 packets.  An array of instructions and its length is passed in using
 the following structure:
 .ft B
@@ -239,9 +239,9 @@ struct bpf_version {
 .fi
 .ft R
 .IP
-The current version numbers are given by 
+The current version numbers are given by
 .B BPF_MAJOR_VERSION
-and 
+and
 .B BPF_MINOR_VERSION
 from <net/bpf.h>.
 An incompatible filter
@@ -286,7 +286,7 @@ The signal may be changed via BIOCSRSIG.
 Set or get the process or process group (if negative) that should receive SIGIO
 when packets are available.  The signal may be changed using BIOCSRSIG (see above).
 .SH BPF HEADER
-The following structure is prepended to each packet returned by 
+The following structure is prepended to each packet returned by
 .I read(2):
 .in 15
 .ft B
@@ -320,14 +320,14 @@ The length of the BPF header, which may not be equal to
 .I sizeof(struct bpf_hdr).
 .RE
 .PP
-The 
+The
 .I bh_hdrlen
 field exists to account for
 padding between the header and the link level protocol.
 The purpose here is to guarantee proper alignment of the packet
-data structures, which is required on alignment sensitive 
+data structures, which is required on alignment sensitive
 architectures and improves performance on many other architectures.
-The packet filter insures that the 
+The packet filter insures that the
 .I bpf_hdr
 and the \fInetwork layer\fR header will be word aligned.  Suitable precautions
 must be taken when accessing the link layer protocol fields on alignment
@@ -353,9 +353,9 @@ p = (char *)p + BPF_WORDALIGN(p->bh_hdrlen + p->bh_caplen)
 .RE
 .PP
 For the alignment mechanisms to work properly, the
-buffer passed to 
+buffer passed to
 .I read(2)
-must itself be word aligned.  
+must itself be word aligned.
 .I malloc(3)
 will always return an aligned buffer.
 .ft R
@@ -381,12 +381,12 @@ struct bpf_insn {
 .ft R
 .RE
 
-The \fIk\fP field is used in different ways by different instructions, 
+The \fIk\fP field is used in different ways by different instructions,
 and the \fIjt\fP and \fIjf\fP fields are used as offsets
 by the branch instructions.
 The opcodes are encoded in a semi-hierarchical fashion.
 There are eight classes of instructions: BPF_LD, BPF_LDX, BPF_ST, BPF_STX,
-BPF_ALU, BPF_JMP, BPF_RET, and BPF_MISC.  Various other mode and 
+BPF_ALU, BPF_JMP, BPF_RET, and BPF_MISC.  Various other mode and
 operator bits are or'd into the class to give the actual instructions.
 The classes and modes are defined in <net/bpf.h>.
 
@@ -404,8 +404,8 @@ instruction definition.  ``len'' refers to the length of the packet.
 .TP 10
 .B BPF_LD
 These instructions copy a value into the accumulator.  The type of the
-source operand is specified by an ``addressing mode'' and can be 
-a constant (\fBBPF_IMM\fP), packet data at a fixed offset (\fBBPF_ABS\fP), 
+source operand is specified by an ``addressing mode'' and can be
+a constant (\fBBPF_IMM\fP), packet data at a fixed offset (\fBBPF_ABS\fP),
 packet data at a variable offset (\fBBPF_IND\fP), the packet length
 (\fBBPF_LEN\fP),
 or a word in the scratch memory store (\fBBPF_MEM\fP).
@@ -489,7 +489,7 @@ M[k] <- X
 .B BPF_ALU
 The alu instructions perform operations between the accumulator and
 index register or constant, and store the result back in the accumulator.
-For binary operations, a source mode is required (\fBBPF_K\fP or 
+For binary operations, a source mode is required (\fBBPF_K\fP or
 \fBBPF_X\fP).
 .RS
 .TP 30
@@ -548,11 +548,11 @@ A <- -A
 .TP 10
 .B BPF_JMP
 The jump instructions alter flow of control.  Conditional jumps
-compare the accumulator against a constant (\fBBPF_K\fP) or 
+compare the accumulator against a constant (\fBBPF_K\fP) or
 the index register (\fBBPF_X\fP).  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.
-However, the jump always (\fBBPF_JA\fP) opcode uses the 32 bit \fIk\fP 
+However, the jump always (\fBBPF_JA\fP) opcode uses the 32 bit \fIk\fP
 field as the offset, allowing arbitrarily distant destinations.
 All conditionals use unsigned comparison conventions.
 .RS
@@ -614,12 +614,12 @@ X <- A
 A <- X
 .RE
 .PP
-The BPF interface provides the following macros to facilitate 
+The BPF interface provides the following macros to facilitate
 array initializers:
 .RS
 \fBBPF_STMT\fI(opcode, operand)\fR
 .br
-and 
+and
 .br
 \fBBPF_JUMP\fI(opcode, operand, true_offset, false_offset)\fR
 .RE
@@ -635,7 +635,7 @@ struct bpf_insn insns[] = {
 	BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, ETHERTYPE_REVARP, 0, 3),
 	BPF_STMT(BPF_LD+BPF_H+BPF_ABS, 20),
 	BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, REVARP_REQUEST, 0, 1),
-	BPF_STMT(BPF_RET+BPF_K, sizeof(struct ether_arp) + 
+	BPF_STMT(BPF_RET+BPF_K, sizeof(struct ether_arp) +
 		 sizeof(struct ether_header)),
 	BPF_STMT(BPF_RET+BPF_K, 0),
 };
@@ -700,8 +700,8 @@ The read buffer must be of a fixed size (returned by the BIOCGBLEN ioctl).
 A file that does not request promiscuous mode may receive promiscuously
 received packets as a side effect of another file requesting this
 mode on the same hardware interface.  This could be fixed in the kernel
-with additional processing overhead.  However, we favor the model where 
-all files must assume that the interface is promiscuous, and if 
+with additional processing overhead.  However, we favor the model where
+all files must assume that the interface is promiscuous, and if
 so desired, must utilize a filter to reject foreign packets.
 .PP
 Data link protocols with variable length headers are not currently supported.
@@ -713,7 +713,7 @@ or lseek to 0 when read fails for this reason.
 .PP
 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 
+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
diff --git a/share/man/man4/bridge.4 b/share/man/man4/bridge.4
index bac4ff7fe1f..693a4190fc7 100644
--- a/share/man/man4/bridge.4
+++ b/share/man/man4/bridge.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: bridge.4,v 1.20 2000/02/11 04:22:27 jason Exp $
+.\"	$OpenBSD: bridge.4,v 1.21 2000/04/03 21:19:36 aaron Exp $
 .\"
 .\" Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -65,7 +65,7 @@ which can be used to reduce traffic on a set of segments and also to provide
 an IP firewall without changing the topology of the network.
 .Pp
 The algorithm works as follows by default, but can be modified via
-.Xr ioctl 2 
+.Xr ioctl 2
 or the utility
 .Xr brconfig 8 .
 When a frame comes in, the origin segment and the source address are
@@ -298,11 +298,11 @@ Retrieve the address cache expiration time (see above).
 .It Dv SIOCBRDGFLUSH
 .Pq Li "struct ifbreq"
 Flush addresses from the cache.
-.Ar ifbr_name 
+.Ar ifbr_name
 contains the name of the bridge device, and
 .Ar ifbr_ifsflags
 should be set to
-.Ar IFBF_FLUSHALL 
+.Ar IFBF_FLUSHALL
 to flush all addresses from the cache or
 .Ar IFBF_FLUSHDYN
 to flush only the dynamically learned addresses from the cache.
@@ -456,7 +456,7 @@ struct ifbrlconf {
 	char ifbrl_ifsname[IFNAMSIZ];/* member */
 	u_int32_t ifbrl_len;         /* buflen */
 	union {
-		caddr_t ifbrlu_buf; 
+		caddr_t ifbrlu_buf;
 		struct  ifbrlreq *ifbrlu_req;
 	} ifbrl_ifbrlu;
 #define ifbrl_buf ifbrl_ifbrlu.ifbrlu_buf
@@ -528,7 +528,7 @@ University of North Carolina at Greensboro.
 There is currently no loop detection.  Care must be taken to make sure
 that loops are not created when a bridge is brought up.
 .Pp
-Only 
+Only
 .Xr ipf 4
 input rules are checked with incoming packet; there is no easy way to
 handle output rules.
diff --git a/share/man/man4/cue.4 b/share/man/man4/cue.4
index c0891044e74..d03d59cdf6e 100644
--- a/share/man/man4/cue.4
+++ b/share/man/man4/cue.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cue.4,v 1.1 2000/03/29 00:27:05 aaron Exp $
+.\" $OpenBSD: cue.4,v 1.2 2000/04/03 21:19:36 aaron Exp $
 .\" $NetBSD: cue.4,v 1.2 2000/01/16 13:54:39 augustss Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 1999, 2000
@@ -79,7 +79,7 @@ The driver failed to allocate an mbuf for the receiver ring.
 .Xr arp 4 ,
 .Xr ifconfig 8 ,
 .Xr netintro 4 ,
-.Xr usb 4 
+.Xr usb 4
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man4/dc.4 b/share/man/man4/dc.4
index aa4b204f015..2903983c076 100644
--- a/share/man/man4/dc.4
+++ b/share/man/man4/dc.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dc.4,v 1.5 2000/02/23 18:08:55 aaron Exp $
+.\"	$OpenBSD: dc.4,v 1.6 2000/04/03 21:19:36 aaron Exp $
 .\" Copyright (c) 1997, 1998, 1999
 .\"	Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
 .\"
@@ -227,7 +227,7 @@ the card should be configured correctly.
 .El
 .Sh SEE ALSO
 .Xr arp 4 ,
-.Xr netintro 4 , 
+.Xr netintro 4 ,
 .Xr ifconfig 8
 .Rs
 .%T ADMtek AL981, AL983 and AL985 data sheets
diff --git a/share/man/man4/dpt.4 b/share/man/man4/dpt.4
index 87c2168eb96..3314399f8c2 100644
--- a/share/man/man4/dpt.4
+++ b/share/man/man4/dpt.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dpt.4,v 1.1 2000/02/17 20:42:31 niklas Exp $
+.\"	$OpenBSD: dpt.4,v 1.2 2000/04/03 21:19:36 aaron Exp $
 .\"	$NetBSD: dpt.4,v 1.7 2000/01/17 16:34:44 ad Exp $
 .\"
 .\" Copyright (c) 1999, 2000 Andy Doran <ad@NetBSD.org>
@@ -51,7 +51,7 @@ adapters:
 None of these messages should be encountered under normal circumstances. It
 should be noted that the list below is not complete.
 .Pp
-.Bl -tag -width indent 
+.Bl -tag -width indent
 .It dpt0: readcfg failed - see dpt(4)
 .br
 The EATA configuration data did not appear upon request. This may be caused
@@ -76,9 +76,9 @@ A corrupt or incomplete status packet was recieved from the HBA.
 .Sh AUTHOR
 The
 .Nm
-driver was written by 
-.An Andy Doran Aq ad@netbsd.org , 
-based upon the 
+driver was written by
+.An Andy Doran Aq ad@netbsd.org ,
+based upon the
 .Nm uha
 and
 .Nm bha
@@ -92,7 +92,7 @@ driver first appeared in
 This manpage is inadaquate.
 .Pp
 EATA adapters other than listed may function correctly with the
-.Nm 
+.Nm
 driver, however a definitive list is not avaiable.
 .Pp
 Older firmware may prove problematic. It is recommended that the latest
diff --git a/share/man/man4/ess.4 b/share/man/man4/ess.4
index bfec420fc5c..95bb147abbc 100644
--- a/share/man/man4/ess.4
+++ b/share/man/man4/ess.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ess.4,v 1.1 1999/08/05 21:53:08 niklas Exp $
+.\"	$OpenBSD: ess.4,v 1.2 2000/04/03 21:19:36 aaron Exp $
 .\"	$NetBSD: ess.4,v 1.6 1999/04/13 20:25:29 augustss Exp $
 .\"
 .\" Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
 .Sh DESCRIPTION
 The
 .Nm
-driver provides support for the ESS 1788, 1888, 1887, and 888 AudioDrive 
+driver provides support for the ESS 1788, 1888, 1887, and 888 AudioDrive
 audio devices.
 .Pp
 The AudioDrive 1788 is a half-duplex device, while the 1888, 1887, and
@@ -65,11 +65,11 @@ used they must be different.
 .Pp
 The joystick interface (if enabled) is handled by the
 .Xr joy 4
-driver. 
+driver.
 .Sh BUGS
 The AudioDrive devices have a SoundBlaster compatibility mode, and may
-be detected by the SoundBlaster driver (see 
-.Xr sb 4 )  
+be detected by the SoundBlaster driver (see
+.Xr sb 4 )
 rather than the AudioDrive driver. The workaround is to remove the
 SoundBlaster driver from the kernel configuration.
 .Sh SEE ALSO
diff --git a/share/man/man4/faith.4 b/share/man/man4/faith.4
index 76f0b23f710..69aa9f3f997 100644
--- a/share/man/man4/faith.4
+++ b/share/man/man4/faith.4
@@ -1,8 +1,8 @@
-.\"	$OpenBSD: faith.4,v 1.2 2000/01/19 08:09:40 itojun Exp $
+.\"	$OpenBSD: faith.4,v 1.3 2000/04/03 21:19:36 aaron Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
 .\" All rights reserved.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -14,7 +14,7 @@
 .\" 3. Neither the name of the project nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY THE PROJECT 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
diff --git a/share/man/man4/fxp.4 b/share/man/man4/fxp.4
index 8184ac44c2a..df01ae88c94 100644
--- a/share/man/man4/fxp.4
+++ b/share/man/man4/fxp.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fxp.4,v 1.12 1999/12/07 22:58:31 jason Exp $
+.\"	$OpenBSD: fxp.4,v 1.13 2000/04/03 21:19:36 aaron Exp $
 .\"
 .\" Copyright (c) 1997 David E. O'Brien
 .\"
@@ -108,9 +108,9 @@ the network connection (cable).
 .Xr ifmedia 4 ,
 .Xr inphy 4 ,
 .Xr iy 4 ,
-.Xr intro 4 , 
-.Xr iophy 4 , 
-.Xr netintro 4 , 
+.Xr intro 4 ,
+.Xr iophy 4 ,
+.Xr netintro 4 ,
 .Xr nsphy 4 ,
 .Xr ifconfig 8
 .Sh HISTORY
diff --git a/share/man/man4/gdt.4 b/share/man/man4/gdt.4
index 1fb2a7d38cf..21c83fb4630 100644
--- a/share/man/man4/gdt.4
+++ b/share/man/man4/gdt.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: gdt.4,v 1.1 2000/02/17 21:13:14 niklas Exp $
+.\"	$OpenBSD: gdt.4,v 1.2 2000/04/03 21:19:36 aaron Exp $
 .\"
 .\" Copyright (c) 2000 Niklas Hallqvist.  All rights reserved.
 .\"
@@ -69,8 +69,8 @@ has been tested as that was the adapter that was available to the author.
 .Sh AUTHOR
 The
 .Nm
-driver was written by 
-.An Niklas Hallqvist Aq niklas@openbsd.org , 
+driver was written by
+.An Niklas Hallqvist Aq niklas@openbsd.org ,
 inspired by the Linux driver by
 .An Achim Luebner Aq achim@vortex.de .
 .Sh HISTORY
diff --git a/share/man/man4/gif.4 b/share/man/man4/gif.4
index cee9f9d49bb..560ec9e6655 100644
--- a/share/man/man4/gif.4
+++ b/share/man/man4/gif.4
@@ -1,8 +1,8 @@
-.\"	$OpenBSD: gif.4,v 1.3 2000/01/16 00:04:27 angelos Exp $
+.\"	$OpenBSD: gif.4,v 1.4 2000/04/03 21:19:36 aaron Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
 .\" All rights reserved.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -14,7 +14,7 @@
 .\" 3. Neither the name of the project nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY THE PROJECT 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
@@ -74,7 +74,7 @@ interface.
 The
 .Nm
 interface will capture packets toward a IPv4-in-IPv4 tunnel used by a
-.Xr tun 4 
+.Xr tun 4
 multicast tunnel device
 .Pq used in MBone community .
 For compatibility, IPv4-in-IPv4 traffic will be matched to
diff --git a/share/man/man4/gre.4 b/share/man/man4/gre.4
index 0ba239a117c..adb20a7ed9e 100644
--- a/share/man/man4/gre.4
+++ b/share/man/man4/gre.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: gre.4,v 1.3 2000/01/08 02:30:02 angelos Exp $
+.\" $OpenBSD: gre.4,v 1.4 2000/04/03 21:19:36 aaron Exp $
 .\" $NetBSD: gre.4,v 1.10 1999/12/22 14:55:49 kleink Exp $
 .\"
 .\" Copyright 1998 (c) The NetBSD Foundation, Inc.
@@ -19,19 +19,19 @@
 .\"    must display the following acknowledgement:
 .\"     This product includes software developed by the NetBSD
 .\"	Foundation, Inc. and its contributors.
-.\" 4. Neither the name of the The NetBSD Foundation nor the names of its 
-.\"    contributors may be used to endorse or promote products derived 
+.\" 4. Neither the name of the The NetBSD Foundation nor the names of its
+.\"    contributors may be used to endorse or promote products derived
 .\"    from this software without specific prior written permission.
 .\"
-.\" 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 
+.\" 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
-.\" 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 
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-.\" CONTRACT, STRICT  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+.\" 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
+.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+.\" 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.
 .\"
@@ -66,7 +66,7 @@ the Mobile-IP (RFC 2004) encapsulation protocols.
 .Pp
 This driver currently supports the following modes of operation:
 .Bl -tag -width abc
-.It GRE encapsulation (IP protocol number 47). 
+.It GRE encapsulation (IP protocol number 47).
 Encapsulated datagrams are prepended by a outer datagram and a GRE header.
 The GRE header specifies the type of the encapsulated datagram
 and thus allows for tunneling other protocols than IP like
@@ -75,7 +75,7 @@ GRE mode is the default tunnel mode on Cisco routers.
 This is also the default mode of operation of the
 .Sy gre Ns Ar X
 interfaces.
-.It MOBILE encapsulation (IP protocol number 55). 
+.It MOBILE encapsulation (IP protocol number 55).
 Datagrams are encapsulated into IP, but with a much smaller
 encapsulation header.
 This protocol only supports IP in IP encapsulation, and is intended
@@ -93,18 +93,18 @@ line in the system config file.
 interfaces support the following
 .Xr ioctl 2 Ns s :
 .Bl -tag -width aaa
-.It GRESADDRS: 
+.It GRESADDRS:
 Set the IP address of the local tunnel end.
-.It GRESADDRD: 
+.It GRESADDRD:
 Set the IP address of the remote tunnel end.
-.It GREGADDRS: 
+.It GREGADDRS:
 Query the IP address that is set for the local tunnel end.
-.It GREGADDRD: 
+.It GREGADDRD:
 Query the IP address that is set for the remote tunnel end.
-.It GRESPROTO: 
+.It GRESPROTO:
 Set the operation mode to the specified IP protocol value.
 The protocol is passed to the interface in (struct ifreq)->ifr_flags.
-The operation mode can also be given as 
+The operation mode can also be given as
 .Bl -tag -width bbb
 .It link0
 IPPROTO_GRE
@@ -118,14 +118,14 @@ As the linkN flags are not mutually exclusive, modes must be set by applying
 positive and negative flags, e.g.,
 .Xr ifconfig 8
 link0 -link1 -link2
-.It GREGPROTO: 
+.It GREGPROTO:
 Query operation mode.
 .El
 .Pp
 Note that the IP addresses of the tunnel endpoints may be the same as the
-ones defined with 
+ones defined with
 .Xr ifconfig 8
-for the interface (as if IP is encapsulated), but need not be, as e.g. when 
+for the interface (as if IP is encapsulated), but need not be, as e.g. when
 encapsulating AppleTalk.
 .Pp
 .Sh EXAMPLE
@@ -160,7 +160,7 @@ Host X-- Host A  ----------------tunnel---------- cisco D------Host E
    On Host D (OpenBSD):
 
    # route add default C
-   # ifconfig greN D A 
+   # ifconfig greN D A
 .Pp
 To reach Host A over the tunnel (from host D), there has to be an
 alias on Host A for the ethernet interface:
@@ -181,7 +181,7 @@ to actually mark the interface as up, the keyword ``up'' must be given
 last on its command line.
 .Pp
 The kernel must be set to forward datagrams by including option
-``GATEWAY'' in the kernel config file and issuing the appropriate 
+``GATEWAY'' in the kernel config file and issuing the appropriate
 option to
 .Xr sysctl 8 .
 .Sh SEE ALSO
diff --git a/share/man/man4/icmp6.4 b/share/man/man4/icmp6.4
index 58093019cab..a94319003b5 100644
--- a/share/man/man4/icmp6.4
+++ b/share/man/man4/icmp6.4
@@ -1,8 +1,8 @@
-.\"	$OpenBSD: icmp6.4,v 1.1 1999/12/19 03:14:27 itojun Exp $
-.\" 
+.\"	$OpenBSD: icmp6.4,v 1.2 2000/04/03 21:19:36 aaron Exp $
+.\"
 .\" Copyright (C) 1999 WIDE Project.
 .\" All rights reserved.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -14,7 +14,7 @@
 .\" 3. Neither the name of the project nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY THE PROJECT 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
diff --git a/share/man/man4/inet6.4 b/share/man/man4/inet6.4
index f5b07a8d7a1..817aa5d447d 100644
--- a/share/man/man4/inet6.4
+++ b/share/man/man4/inet6.4
@@ -1,8 +1,8 @@
-.\"	$OpenBSD: inet6.4,v 1.8 2000/03/28 23:46:31 deraadt Exp $
+.\"	$OpenBSD: inet6.4,v 1.9 2000/04/03 21:19:36 aaron Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
 .\" All rights reserved.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -14,7 +14,7 @@
 .\" 3. Neither the name of the project nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY THE PROJECT 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
@@ -95,7 +95,7 @@ which is equal to IPv6 address
 .Pc
 to effect
 .Dq wildcard
-matching on incoming messages. 
+matching on incoming messages.
 The address in a
 .Xr connect 2
 or
@@ -112,7 +112,7 @@ field into 0, or by using the address contained in variable
 .Pp
 IPv6 specification defines scoped address,
 like link-local or site-local address.
-A scoped address is ambiguous to the kernel, 
+A scoped address is ambiguous to the kernel,
 if it is specified without scope identifier.
 To manipulate scoped addresses properly from the userland,
 programs must use advanced API defined in RFC2292.
@@ -156,7 +156,7 @@ Therefore,
 the address on some of the kernel structure is not the same as that on the wire.
 The embedded index will become visible on
 .Dv PF_ROUTE
-socket, kernel memory accesses via 
+socket, kernel memory accesses via
 .Xr kvm 3
 and some other occasions.
 HOWEVER, users should never use the embedded form.
diff --git a/share/man/man4/ip6.4 b/share/man/man4/ip6.4
index 73f3620b342..bc0d96f452f 100644
--- a/share/man/man4/ip6.4
+++ b/share/man/man4/ip6.4
@@ -1,8 +1,8 @@
-.\"	$OpenBSD: ip6.4,v 1.3 1999/12/22 06:52:28 itojun Exp $
+.\"	$OpenBSD: ip6.4,v 1.4 2000/04/03 21:19:36 aaron Exp $
 .\"
 .\" Copyright (C) 1999 WIDE Project.
 .\" All rights reserved.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -14,7 +14,7 @@
 .\" 3. Neither the name of the project nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY THE PROJECT 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
@@ -306,7 +306,7 @@ and
 .Dv IPV6_DSTOPTS .
 Similarly,
 .Xr inet6_rthdr_space 3
-and friends will help you parse ancillary data items for 
+and friends will help you parse ancillary data items for
 .Dv IPV6_RTHDR .
 .Pp
 .Dv IPV6_HOPOPTS
diff --git a/share/man/man4/ipsec.4 b/share/man/man4/ipsec.4
index 03ff22ad3c2..c3f6d968687 100644
--- a/share/man/man4/ipsec.4
+++ b/share/man/man4/ipsec.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ipsec.4,v 1.27 2000/01/10 22:51:12 angelos Exp $
+.\" $OpenBSD: ipsec.4,v 1.28 2000/04/03 21:19:36 aaron Exp $
 .\" Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
 .\" All rights reserved.
 .\"
@@ -349,7 +349,7 @@ key management daemon is required which listens to messages from the
 kernel.
 .Pp
 A list of all security associations in the kernel tables can be
-obtained via the kernfs file 
+obtained via the kernfs file
 .Aq Pa ipsec
 (typically in
 .Aq Pa /kernfs/ipsec
diff --git a/share/man/man4/isapnp.4 b/share/man/man4/isapnp.4
index 43b589fbbe7..c36856de88d 100644
--- a/share/man/man4/isapnp.4
+++ b/share/man/man4/isapnp.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: isapnp.4,v 1.14 1999/11/18 02:56:06 ericj Exp $
+.\"	$OpenBSD: isapnp.4,v 1.15 2000/04/03 21:19:36 aaron Exp $
 .\"	$NetBSD: isapnp.4,v 1.8 1998/06/07 09:08:46 enami Exp $
 .\"
 .\" Copyright (c) 1997 Jonathan Stone
@@ -39,7 +39,7 @@
 .Cd "isapnp0 at isa?"
 .Pp
 An
-.Nm 
+.Nm
 bus can be configured for each supported ISA bus.
 .Sh DESCRIPTION
 .Ox
diff --git a/share/man/man4/kue.4 b/share/man/man4/kue.4
index 31547e6a46d..eaf92e4c7e9 100644
--- a/share/man/man4/kue.4
+++ b/share/man/man4/kue.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: kue.4,v 1.1 2000/03/29 00:27:05 aaron Exp $
+.\" $OpenBSD: kue.4,v 1.2 2000/04/03 21:19:37 aaron Exp $
 .\" $NetBSD: kue.4,v 1.5 2000/03/20 01:34:22 augustss Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 1999, 2000
@@ -89,7 +89,7 @@ The driver failed to allocate an mbuf for the receiver ring.
 .Xr arp 4 ,
 .Xr ifconfig 8 ,
 .Xr netintro 4 ,
-.Xr usb 4 
+.Xr usb 4
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man4/man4.i386/awi.4 b/share/man/man4/man4.i386/awi.4
index 48bc71eb07f..ce1bdc63473 100644
--- a/share/man/man4/man4.i386/awi.4
+++ b/share/man/man4/man4.i386/awi.4
@@ -1,12 +1,12 @@
 .\"     $NetBSD: awi.4,v 1.1 1999/11/04 19:36:01 sommerfeld Exp $
-.\"	$OpenBSD: awi.4,v 1.3 2000/04/03 19:34:20 deraadt Exp $
+.\"	$OpenBSD: awi.4,v 1.4 2000/04/03 21:19:37 aaron Exp $
 .\"
 .\"
-.\"	$Id: awi.4,v 1.3 2000/04/03 19:34:20 deraadt Exp $
+.\"	$Id: awi.4,v 1.4 2000/04/03 21:19:37 aaron Exp $
 .\"
 .Dd October 31, 1999
-.Dt AWI 4 
-.Os 
+.Dt AWI 4
+.Os
 .Sh NAME
 .Nm awi
 .Nd
@@ -17,7 +17,7 @@ Bay Networks BayStack 650 IEEE 802.11FH PCMCIA driver
 The
 .Nm
 driver provides support for BayStack 650 IEEE 802.11 Frequency Hopping
-PCCARD adapters. 
+PCCARD adapters.
 .Pp
 The BayStack 650 is based on an AMD 79c930 controller, which provides
 access to 32kb of memory shared between the controller and the host.
@@ -31,9 +31,9 @@ speed is fixed at 1Mbps.
 The driver currently only works in infrastructure mode, communicating
 with an Access Point which serves as a link-layer bridge between an
 ethernet and the wireless network.
-.Pp 
+.Pp
 This card seems to take between 5 and 20 seconds after it has been brought up
-to synchronize with an AP.  When using 
+to synchronize with an AP.  When using
 .Xr dhclient 8
 to automatically configure an address on this card, it may be
 advisable to delay the invocation of dhclient for about 10 seconds
@@ -85,7 +85,7 @@ Round trip times seem higher than what one might expect.
 .Sh SEE ALSO
 .Xr ray 4 ,
 .Xr arp 4 ,
-.Xr netintro 4 , 
+.Xr netintro 4 ,
 .Xr pcmcia 4 ,
 .Xr ifconfig 8 ,
 .Xr awiconfig 8
diff --git a/share/man/man4/man4.i386/mtrr.4 b/share/man/man4/man4.i386/mtrr.4
index 3bc42f7a2df..bafb155ec41 100644
--- a/share/man/man4/man4.i386/mtrr.4
+++ b/share/man/man4/man4.i386/mtrr.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mtrr.4,v 1.3 1999/12/23 15:34:35 aaron Exp $
+.\"	$OpenBSD: mtrr.4,v 1.4 2000/04/03 21:19:38 aaron Exp $
 .\"
 .\" Pentium MTRR  driver for OpenBSD.
 .\" Copyright 1999 Matthieu Herrb <matthieu@openbsd.org>
@@ -19,16 +19,16 @@
 .Sh DESCRIPTION
 The
 .Nm
-device provides access to the memory range attributes supported by the 
-MTRRs on Pentiums. 
+device provides access to the memory range attributes supported by the
+MTRRs on Pentiums.
 .Pp
 .Ss IOCTL INTERFACE
 Several architectures allow attributes to be associated with ranges of physical
 memory.  These attributes can be manipulated via
 .Fn ioctl
 calls performed on
-.Pa /dev/mem 
-or 
+.Pa /dev/mem
+or
 .Pa /dev/xf86 .
 Declarations and data types are to be found in
 .Aq Pa memrange.h
@@ -76,7 +76,7 @@ We believe the region to be invalid or otherwise erroneous.
 .It MDF_FIXACTIVE
 The region cannot be disabled.
 .It MDF_BUSY
-The region is currently owned by another process and may not be 
+The region is currently owned by another process and may not be
 altered.
 .El
 .Pp
@@ -98,13 +98,13 @@ descriptors.  If greater than 0, the array at
 will be filled with a corresponding number of descriptor structures,
 or the maximum, whichever is less.
 .Pp
-The 
+The
 .Fa MEMRANGE_SET
 ioctl is used to add, alter and remove memory range attributes.  A range
 with the MDF_FIXACTIVE flag may not be removed; a range with the MDF_BUSY
 flag may not be removed or updated.
 .Pp
-.Fa mo_arg[0] 
+.Fa mo_arg[0]
 should be set to MEMRANGE_SET_UPDATE to update an existing
 or establish a new range, or to MEMRANGE_SET_REMOVE to remove a range.
 .Pp
diff --git a/share/man/man4/man4.i386/pms.4 b/share/man/man4/man4.i386/pms.4
index 6c1a7f9995f..756b830e95a 100644
--- a/share/man/man4/man4.i386/pms.4
+++ b/share/man/man4/man4.i386/pms.4
@@ -1,5 +1,5 @@
 .\"
-.\"	$OpenBSD: pms.4,v 1.7 2000/03/06 21:46:57 aaron Exp $
+.\"	$OpenBSD: pms.4,v 1.8 2000/04/03 21:19:38 aaron Exp $
 .\"
 .\" Copyright (c) 1996, Jason Downs.
 .\" Copyright (c) 1993 Christopher G. Demetriou
@@ -89,11 +89,11 @@ compatible.)  Otherwise, the mouse works as a normal, two button, PS/2
 device.
 .Pp
 .Sh NOTES
-The translated mode of this driver is being deprecated. The raw device 
+The translated mode of this driver is being deprecated. The raw device
 .Pa /dev/psm0
 should be used in
 .Pa /etc/XF86Config
-with the 
+with the
 .Em PS/2
 protocol, or one of its variants
 .Pf ( Em IMPS/2
diff --git a/share/man/man4/man4.i386/wi.4 b/share/man/man4/man4.i386/wi.4
index 158f15eeae6..9dfb9371262 100644
--- a/share/man/man4/man4.i386/wi.4
+++ b/share/man/man4/man4.i386/wi.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wi.4,v 1.5 2000/04/03 19:34:20 deraadt Exp $
+.\"	$OpenBSD: wi.4,v 1.6 2000/04/03 21:19:38 aaron Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 1999
 .\"	Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -89,7 +89,7 @@ command.
 .Sh SEE ALSO
 .Xr an 4 ,
 .Xr arp 4 ,
-.Xr netintro 4 , 
+.Xr netintro 4 ,
 .Xr ifconfig 8 ,
 .Xr wicontrol 8
 .Rs
diff --git a/share/man/man4/man4.sparc/pnozz.4 b/share/man/man4/man4.sparc/pnozz.4
index 01d550a4b17..5958da4674b 100644
--- a/share/man/man4/man4.sparc/pnozz.4
+++ b/share/man/man4/man4.sparc/pnozz.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: pnozz.4,v 1.2 1999/09/25 15:49:57 jason Exp $
+.\"     $OpenBSD: pnozz.4,v 1.3 2000/04/03 21:19:38 aaron Exp $
 .\"
 .\" Copyright (c) 1999 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -43,7 +43,7 @@ The
 is a memory based color frame buffer found on
 .Tn "Tadpole SPARCbook 3GS and 3GX"
 laptops.
-It is based on the 
+It is based on the
 .Tn "Weitek Power 9100"
 and an
 .Tn "IBM RGB528"
diff --git a/share/man/man4/options.4 b/share/man/man4/options.4
index dcf15ceb612..29236ed8a75 100644
--- a/share/man/man4/options.4
+++ b/share/man/man4/options.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: options.4,v 1.49 2000/03/06 21:46:57 aaron Exp $
+.\"	$OpenBSD: options.4,v 1.50 2000/04/03 21:19:37 aaron Exp $
 .\"	$NetBSD: options.4,v 1.21 1997/06/25 03:13:00 thorpej Exp $
 .\"
 .\" Copyright (c) 1998 Theo de Raadt
@@ -631,7 +631,7 @@ a swifter recovery. Both communication endpoints need to support
 The fallback behaviour is NewReno fast recovery phase, which allows
 one lost segment to be recovered per round trip time. When more than
 one segment has been dropped per window, the transmission can continue
-without waiting for a retranmission timeout. 
+without waiting for a retranmission timeout.
 .It Cd option TCP_FACK
 Turns on forward acknowledgements allowing a more precise estimate of
 outstanding data during the fast recovery phase by using
diff --git a/share/man/man4/pciide.4 b/share/man/man4/pciide.4
index d061c5d1567..f0b9109e196 100644
--- a/share/man/man4/pciide.4
+++ b/share/man/man4/pciide.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pciide.4,v 1.7 2000/03/24 17:52:00 chris Exp $
+.\"	$OpenBSD: pciide.4,v 1.8 2000/04/03 21:19:37 aaron Exp $
 .\"	$NetBSD: pciide.4,v 1.8 1999/03/16 01:19:17 garbled Exp $
 .\"
 .\" Copyright (c) 1998 Manuel Bouyer.
@@ -73,12 +73,12 @@ Promise PDC20246 (Ultra/33) and PDC20262 (Ultra/66)
 Silicon Integrated System 5513 (5597/5598)
 .It
 VIA Technologies VT82C586 and VT82C586A
-.El 
+.El
 .Pp
 Some of these controllers are only available in multifunction PCI chips.
 .Pp
 The 0x0001 flag forces the
-.Nm 
+.Nm
 driver to use DMA when there is no explicit DMA mode setting support for
 the controller but DMA is present. If the BIOS didn't configure the controller
 properly, this can cause a machine hang.
diff --git a/share/man/man4/raid.4 b/share/man/man4/raid.4
index 66fa5e4957a..e8c6dadc5ff 100644
--- a/share/man/man4/raid.4
+++ b/share/man/man4/raid.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: raid.4,v 1.10 2000/03/06 21:46:57 aaron Exp $
+.\"	$OpenBSD: raid.4,v 1.11 2000/04/03 21:19:37 aaron Exp $
 .\"     $NetBSD: raid.4,v 1.8 1999/12/15 22:07:33 abs Exp $
 .\"
 .\"
@@ -109,13 +109,13 @@ reconstructed from the data and parity present on the other
 components.  This results in much slower data accesses, but
 does mean that a failure need not bring the system to a complete halt.
 .Pp
-The RAID driver supports and enforces the use of 
+The RAID driver supports and enforces the use of
 .Sq component labels .
 A
 .Sq component label
 contains important information about the component, including a
 user-specified serial number, the row and column of that component in the RAID
-set, and whether the data (and parity) on the component is 
+set, and whether the data (and parity) on the component is
 .Sq clean .
 If the driver determines that the labels are very inconsistent with
 respect to each other (e.g. two or more serial numbers do not match)
@@ -189,7 +189,7 @@ sd5     at scsibus0 target 5 lun ?      # SCSI disk drives
 sd6     at scsibus0 target 6 lun ?      # SCSI disk drives
 .Ed
 .Pp
-See 
+See
 .Xr sd 4
 for more information.  The rationale for fixing the device addresses
 is as follows: Consider a system with three SCSI drives at SCSI ID's
diff --git a/share/man/man4/sf.4 b/share/man/man4/sf.4
index 16d37a7cde1..21933da4ea2 100644
--- a/share/man/man4/sf.4
+++ b/share/man/man4/sf.4
@@ -146,7 +146,7 @@ the network connection (cable).
 .El
 .Sh SEE ALSO
 .Xr arp 4 ,
-.Xr netintro 4 , 
+.Xr netintro 4 ,
 .Xr ifconfig 8
 .Rs
 .%T The Adaptec AIC-6915 Programmer's Manual
diff --git a/share/man/man4/sis.4 b/share/man/man4/sis.4
index f0a9d40474a..c13d800052c 100644
--- a/share/man/man4/sis.4
+++ b/share/man/man4/sis.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sis.4,v 1.5 2000/02/23 18:08:55 aaron Exp $
+.\"	$OpenBSD: sis.4,v 1.6 2000/04/03 21:19:37 aaron Exp $
 .\" Copyright (c) 1997, 1998, 1999
 .\"	Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
 .\"
@@ -131,7 +131,7 @@ the card should be configured correctly.
 .El
 .Sh SEE ALSO
 .Xr arp 4 ,
-.Xr netintro 4 , 
+.Xr netintro 4 ,
 .Xr ifconfig 8
 .Rs
 .%T SiS 900 and SiS 7016 datasheets
diff --git a/share/man/man4/ste.4 b/share/man/man4/ste.4
index 3142fe02e21..08964e49264 100644
--- a/share/man/man4/ste.4
+++ b/share/man/man4/ste.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ste.4,v 1.3 2000/02/23 18:08:55 aaron Exp $
+.\"	$OpenBSD: ste.4,v 1.4 2000/04/03 21:19:37 aaron Exp $
 .\" Copyright (c) 1997, 1998, 1999
 .\"	Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
 .\"
@@ -131,7 +131,7 @@ the card should be configured correctly.
 .El
 .Sh SEE ALSO
 .Xr arp 4 ,
-.Xr netintro 4 , 
+.Xr netintro 4 ,
 .Xr ifconfig 8
 .Rs
 .%T Sundance ST201 data sheet
diff --git a/share/man/man4/ti.4 b/share/man/man4/ti.4
index e3421ba7fe4..e98a2269b6f 100644
--- a/share/man/man4/ti.4
+++ b/share/man/man4/ti.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ti.4,v 1.4 2000/02/06 08:55:18 deraadt Exp $
+.\"	$OpenBSD: ti.4,v 1.5 2000/04/03 21:19:37 aaron Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 1999
 .\"	Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -171,7 +171,7 @@ the network connection (cable).
 .Sh SEE ALSO
 .Xr arp 4 ,
 .Xr ifmedia 4 ,
-.Xr netintro 4 , 
+.Xr netintro 4 ,
 .Xr ifconfig 8
 .Rs
 .%T Alteon Gigabit Ethernet/PCI NIC manuals
diff --git a/share/man/man4/ugen.4 b/share/man/man4/ugen.4
index 1411d902505..0c0037030b9 100644
--- a/share/man/man4/ugen.4
+++ b/share/man/man4/ugen.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ugen.4,v 1.3 2000/01/18 21:48:58 aaron Exp $
+.\"	$OpenBSD: ugen.4,v 1.4 2000/04/03 21:19:37 aaron Exp $
 .\"	$NetBSD: ugen.4,v 1.7 1999/07/30 01:32:05 augustss Exp $
 .\"
 .\" Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@ The control transfer mode can only happen on the control endpoint,
 which is always endpoint 0.  Control requests
 are issued by
 .Xr ioctl 2
-calls.  
+calls.
 .\" .Pp
 .\" The isochronous transfer mode can be in or out depending on the
 .\" endpoint.  To perform I/O on an isochronous endpoint
@@ -125,7 +125,7 @@ is the sole open endpoint.
 .It Dv USB_GET_ALTINTERFACE (struct usb_alt_interface)
 Get the alternative setting number for the interface with the given
 index.
-The 
+The
 .Fa config_index
 is ignored in this call.
 .Bd -literal
@@ -138,7 +138,7 @@ struct usb_alt_interface {
 .It Dv USB_SET_ALTINTERFACE (struct usb_alt_interface)
 Set the alternative setting to the given number in the interface with the
 given index.
-The 
+The
 .Fa config_index
 is ignored in this call.
 .Pp
@@ -202,7 +202,7 @@ struct usb_full_desc {
 };
 .Ed
 .Pp
-The 
+The
 .Fa data
 field should point to a memory area of the size given in the
 .Fa size
@@ -229,7 +229,7 @@ Any data sent to/from the device is located at
 .Fa data .
 The size of the transferred data is determined from the
 .Fa request .
-The 
+The
 .Fa addr
 field is ignored in this call.
 .Bd -literal
@@ -248,7 +248,7 @@ Get an information summary for the device.  This call will not
 issue any USB transactions.
 .El
 .Pp
-Note that there are two different ways of addressing configurations, interfaces, 
+Note that there are two different ways of addressing configurations, interfaces,
 alternatives, and endpoints: by index or by number.
 The index is the ordinal number (starting from 0) of the descriptor
 as presented by the device.  The number is the respective number of
@@ -265,7 +265,7 @@ and for each of these iterating the
 .Fa endpoint_index
 from 0 to
 .Fa interface_desc->bNumEndpoints .
-The 
+The
 .Fa config_index
 should set to
 .Dv USB_CURRENT_CONFIG_INDEX
diff --git a/share/man/man4/uhid.4 b/share/man/man4/uhid.4
index 22ec29a5e1e..0e6591f1cb9 100644
--- a/share/man/man4/uhid.4
+++ b/share/man/man4/uhid.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: uhid.4,v 1.2 1999/08/13 14:47:50 aaron Exp $
+.\"	$OpenBSD: uhid.4,v 1.3 2000/04/03 21:19:37 aaron Exp $
 .\"	$NetBSD: uhid.4,v 1.6 1999/05/11 21:05:09 augustss Exp $
 .\"
 .\" Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@ calls:
 .Bl -tag -width indent -compact
 .It Dv USB_GET_REPORT_DESC (struct usb_ctl_report_desc)
 Get the HID report descriptor.  Using
-this descriptor the exact layout and meaning of data to/from 
+this descriptor the exact layout and meaning of data to/from
 the device can be found.  The report descriptor is delivered
 without any processing.
 .Bd -literal
@@ -77,7 +77,7 @@ interrupt pipe.  This call may fail if the device does not support
 this feature.
 .It Dv USB_GET_REPORT (struct usb_ctl_report)
 Get a report from the device without waiting for data on
-the interrupt pipe.  The 
+the interrupt pipe.  The
 .Fa report
 field indicates which report is requested.  It should be
 .Dv UHID_INPUT_REPORT ,
diff --git a/share/man/man4/usb.4 b/share/man/man4/usb.4
index 1cb2931a51e..8f94da1a8a1 100644
--- a/share/man/man4/usb.4
+++ b/share/man/man4/usb.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: usb.4,v 1.3 2000/02/06 11:42:09 jakob Exp $
+.\"	$OpenBSD: usb.4,v 1.4 2000/04/03 21:19:37 aaron Exp $
 .\"	$NetBSD: usb.4,v 1.15 1999/07/29 14:20:32 augustss Exp $
 .\"
 .\" Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -334,8 +334,8 @@ does not have string valued locators.
 .\".Xr ums 4 ,
 .Xr usbdevs 8
 .Pp
-The 
-.Tn USB 
+The
+.Tn USB
 specifications can be found at:
 .Pp
 .Dl http://www.usb.org/developers/docs.htm
diff --git a/share/man/man4/vr.4 b/share/man/man4/vr.4
index 16751a2bfa8..f40b5d9c03a 100644
--- a/share/man/man4/vr.4
+++ b/share/man/man4/vr.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vr.4,v 1.2 1999/10/28 22:48:57 aaron Exp $
+.\"	$OpenBSD: vr.4,v 1.3 2000/04/03 21:19:37 aaron Exp $
 .\"
 .\" Copyright (c) 1997, 1998
 .\"	Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -137,7 +137,7 @@ the card should be configured correctly.
 .El
 .Sh SEE ALSO
 .Xr arp 4 ,
-.Xr netintro 4 , 
+.Xr netintro 4 ,
 .Xr ifconfig 8
 .Rs
 .%T The VIA Technologies VT86C100A data sheet
diff --git a/share/man/man4/wd.4 b/share/man/man4/wd.4
index d26c9ebeb41..0272b0efadf 100644
--- a/share/man/man4/wd.4
+++ b/share/man/man4/wd.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wd.4,v 1.4 1999/07/21 23:57:55 aaron Exp $
+.\"	$OpenBSD: wd.4,v 1.5 2000/04/03 21:19:37 aaron Exp $
 .\"	$NetBSD: wd.4,v 1.4 1999/04/25 00:00:05 mjl Exp $
 .\"
 .\"
@@ -12,7 +12,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.
@@ -25,10 +25,10 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd October 15, 1998
-.Dt WD 4 
+.Dt WD 4
 .Os
 .Sh NAME
-.Nm wd 
+.Nm wd
 .Nd WD100x compatible hard disk driver
 .Sh SYNOPSIS
 .Cd "wd* at wdc? channel ? drive ? flags 0x0000"
@@ -56,7 +56,7 @@ For DMA and UltraDMA, 0xf (1111) means
 .Dq disable .
 For example, a
 .Cm flags
-value of 0x0fac (1111 1010 1100) 
+value of 0x0fac (1111 1010 1100)
 means
 .Do
 use PIO mode 4, DMA mode 2, disable UltraDMA