Various repairs, $Id$ tags added, etc.

45 files changed, 259 insertions, 197 deletions

diff --git a/share/man/man4/aac.4 b/share/man/man4/aac.4
index 056afb1d6a8..cc5dd94abbb 100644
--- a/share/man/man4/aac.4
+++ b/share/man/man4/aac.4
@@ -1,5 +1,4 @@
-.\"	$OpenBSD: aac.4,v 1.3 2000/12/17 21:46:56 mickey Exp $
-.\"
+.\"	$OpenBSD: aac.4,v 1.4 2000/12/21 21:01:14 aaron Exp $
 .\"
 .Dd November 7, 2000
 .Dt AAC 4
diff --git a/share/man/man4/ac97.4 b/share/man/man4/ac97.4
index 0daa38131f6..571d18d97d8 100644
--- a/share/man/man4/ac97.4
+++ b/share/man/man4/ac97.4
@@ -1,4 +1,5 @@
-.\"	$OpenBSD: ac97.4,v 1.5 2000/10/18 02:38:21 aaron Exp $
+.\"	$OpenBSD: ac97.4,v 1.6 2000/12/21 21:01:14 aaron Exp $
+.\"
 .Dd October 7, 1999
 .Dt AC97 4
 .Os
@@ -34,4 +35,3 @@ The
 .Nm
 driver could do more to detect mixer channels that don't work and cull
 them from the list.
-.Pp
diff --git a/share/man/man4/awi.4 b/share/man/man4/awi.4
index c9a9ea672e0..47349360e87 100644
--- a/share/man/man4/awi.4
+++ b/share/man/man4/awi.4
@@ -1,7 +1,5 @@
+.\"	$OpenBSD: awi.4,v 1.7 2000/12/21 21:01:14 aaron Exp $
 .\"     $NetBSD: awi.4,v 1.1 1999/11/04 19:36:01 sommerfeld Exp $
-.\"	$OpenBSD: awi.4,v 1.6 2000/11/10 20:02:16 todd Exp $
-.\"
-.\"	$Id: awi.4,v 1.6 2000/11/10 20:02:16 todd Exp $
 .\"
 .Dd October 31, 1999
 .Dt AWI 4
diff --git a/share/man/man4/cardbus.4 b/share/man/man4/cardbus.4
index b6406046342..4597cde3e99 100644
--- a/share/man/man4/cardbus.4
+++ b/share/man/man4/cardbus.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cardbus.4,v 1.9 2000/10/27 08:01:07 aaron Exp $
+.\" $OpenBSD: cardbus.4,v 1.10 2000/12/21 21:01:15 aaron Exp $
 .\" $NetBSD: cardbus.4,v 1.4 2000/02/02 19:57:17 augustss Exp $
 .\"
 .\" Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/share/man/man4/clnp.4 b/share/man/man4/clnp.4
index 54c440426c8..6a0c001276b 100644
--- a/share/man/man4/clnp.4
+++ b/share/man/man4/clnp.4
@@ -1,3 +1,4 @@
+.\"	$OpenBSD: clnp.4,v 1.6 2000/12/21 21:01:15 aaron Exp $
 .\"	$NetBSD: clnp.4,v 1.4 1994/11/30 16:22:07 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
diff --git a/share/man/man4/cltp.4 b/share/man/man4/cltp.4
index 71417f60543..1dd44849812 100644
--- a/share/man/man4/cltp.4
+++ b/share/man/man4/cltp.4
@@ -1,3 +1,4 @@
+.\"	$OpenBSD: cltp.4,v 1.6 2000/12/21 21:01:15 aaron Exp $
 .\"	$NetBSD: cltp.4,v 1.3 1994/11/30 16:22:08 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
diff --git a/share/man/man4/dc.4 b/share/man/man4/dc.4
index 2a9ddd180cc..a8d47505dee 100644
--- a/share/man/man4/dc.4
+++ b/share/man/man4/dc.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dc.4,v 1.16 2000/11/16 06:08:30 aaron Exp $
+.\"	$OpenBSD: dc.4,v 1.17 2000/12/21 21:01:15 aaron Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 1999
 .\"	Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
@@ -68,29 +68,31 @@ Xircom X3201-based CardBus
 .El
 .Pp
 All of these chips have the same general register layout, DMA
-descriptor format and method of operation. All of the clone chips
-are based on the 21143 design with various modifications. The
-21143 itself has support for 10baseT, BNC, AUI, MII and symbol
+descriptor format and method of operation.
+All of the clone chips are based on the 21143 design with
+various modifications.
+The 21143 itself has support for 10baseT, BNC, AUI, MII and symbol
 media attachments, 10 and 100Mbps speeds in full or half duplex,
-built in NWAY autonegotiation and wake on LAN. The 21143 also
-offers several receive filter programming options including
-perfect filtering, inverse perfect filtering and hash table
-filtering.
+built in NWAY autonegotiation and wake on LAN.
+The 21143 also offers several receive filter programming options including
+perfect filtering, inverse perfect filtering and hash table filtering.
 .Pp
 Some clone chips duplicate the 21143 fairly closely while others
-only maintain superficial simularities. Some support only MII
-media attachments. Others use different receiver filter programming
-mechanisms. At least one supports only chained DMA descriptors
+only maintain superficial simularities.
+Some support only MII media attachments.
+Others use different receiver filter programming mechanisms.
+At least one supports only chained DMA descriptors
 (most support both chained descriptors and contiguously allocated
-fixed size rings). Some chips (especially the PNIC) also have
-peculiar bugs. The
+fixed size rings).
+Some chips (especially the PNIC) also have peculiar bugs.
+The
 .Nm
 driver does its best to provide generalized support for all
 of these chipsets in order to keep special case code to a minimun.
 .Pp
 These chips are used by many vendors which makes it
-difficult provide a complete list of all supported cards. The
-following NICs are known to work with the
+difficult provide a complete list of all supported cards.
+The following NICs are known to work with the
 .Nm
 driver at this time:
 .Pp
@@ -134,7 +136,7 @@ CNet Pro110B (ASIX AX88140A)
 .It
 LinkSys LNE100TX v4.x (ADMtek AN983 Centaur-P)
 .It
-Xircom X3201-based CardBus PC Cards, including RealPort models (Xircom X3201)
+Xircom CardBus, including RealPort models (Xircom X3201)
 .It
 IBM EtherJet 10/100 CardBus (Intel 21143)
 .It
@@ -157,24 +159,29 @@ Note: the built-in NWAY autonegotiation on the original PNIC 82c168
 chip is horribly broken and is not supported by the
 .Nm
 driver at this time: the chip will operate in any speed or duplex
-mode, however these must be set manually. The original 82c168 appears
-on very early revisions of the LinkSys LNE100TX and Matrox FastNIC.
+mode, however these must be set manually.
+The original 82c168 appears on very early revisions of the LinkSys LNE100TX
+and Matrox FastNIC.
 .It 10baseT/UTP
-Set 10Mbps operation. The
+Set 10Mbps operation.
+The
 .Ar mediaopt
 option can also be used to enable
 .Ar full-duplex
-operation. Not specifying
+operation.
+Not specifying
 .Ar full duplex
 implies
 .Ar half-duplex
 mode.
 .It 100baseTX
-Set 100Mbps (Fast Ethernet) operation. The
+Set 100Mbps (Fast Ethernet) operation.
+The
 .Ar mediaopt
 option can also be used to enable
 .Ar full-duplex
-operation. Not specifying
+operation.
+Not specifying
 .Ar full duplex
 implies
 .Ar half-duplex
@@ -187,8 +194,9 @@ driver supports the following media options:
 .Pp
 .Bl -tag -width xxxxxxxxxxxxxxxxxxxx
 .It full-duplex
-Force full duplex operation. The interface will operate in
-half duplex mode if this media option is not specified.
+Force full duplex operation.
+The interface will operate in half duplex mode if this media option
+is not specified.
 .El
 .Pp
 Note that the 100baseTX media type may not be available on certain
@@ -204,40 +212,43 @@ A fatal initialization error has occurred.
 .It "dc%d: watchdog timeout"
 A packet was queued for transmission and a transmit command was
 issued, however the device failed to acknowledge the transmission
-before a timeout expired. This can happen if the device is unable
-to deliver interrupts for some reason, or if there is a problem with
-the network connection (cable).
+before a timeout expired.
+This can happen if the device is unable to deliver interrupts for some
+reason, or if there is a problem with the network connection (cable).
 .It "dc%d: no memory for rx list"
 The driver failed to allocate an mbuf for the receiver ring.
 .It "dc%d: TX underrun -- increasing TX threshold"
 The device generated a transmit underrun error while attempting to
-DMA and transmit a packet. This happens if the host is not able to
-DMA the packet data into the NIC's FIFO fast enough. The driver
-will dynamically increase the transmit start threshold so that
+DMA and transmit a packet.
+This happens if the host is not able to DMA the packet data into the NIC's
+FIFO fast enough.
+The driver will dynamically increase the transmit start threshold so that
 more data must be DMAed into the FIFO before the NIC will start
 transmitting it onto the wire.
 .It "dc%d: TX underrun -- using store and forward mode"
 The device continued to generate transmit underruns even after all
 possible transmit start threshold settings had been tried, so the
-driver programmed the chip for store and forward mode. In this mode,
-the NIC will not begin transmission until the entire packet has been
-transferred into its FIFO memory.
+driver programmed the chip for store and forward mode.
+In this mode, the NIC will not begin transmission until the entire packet
+has been transferred into its FIFO memory.
 .It "dc%d: chip is in D3 power state -- setting to D0"
-This message applies only to adapters which support power
-management. Some operating systems place the controller in low power
+This message applies only to adapters which support power management.
+Some operating systems place the controller in low power
 mode when shutting down, and some PCI BIOSes fail to bring the chip
-out of this state before configuring it. The controller loses all of
-its PCI configuration in the D3 state, so if the BIOS does not set
-it back to full power mode in time, it won't be able to configure it
-correctly. The driver tries to detect this condition and bring
+out of this state before configuring it.
+The controller loses all of its PCI configuration in the D3 state,
+so if the BIOS does not set it back to full power mode in time,
+it won't be able to configure it correctly.
+The driver tries to detect this condition and bring
 the adapter back to the D0 (full power) state, but this may not be
-enough to return the driver to a fully operational condition. If
-you see this message at boot time and the driver fails to attach
+enough to return the driver to a fully operational condition.
+If you see this message at boot time and the driver fails to attach
 the device as a network interface, you will have to perform a second
 warm boot to have the device properly configured.
 .Pp
 Note that this condition only occurs when warm booting from another
-operating system. If you power down your system prior to booting
+operating system.
+If you power down your system prior to booting
 .Ox ,
 the card should be configured correctly.
 .El
@@ -286,14 +297,15 @@ by Aaron Campbell <aaron@openbsd.org>.
 .Sh BUGS
 The Macronix application notes claim that in order to put the
 chips in normal operation, the driver must write a certain magic
-number into the CSR16 register. The numbers are documented in
-the app notes, but the exact meaning of the bits is not.
+number into the CSR16 register.
+The numbers are documented in the app notes, but the exact meaning of the
+bits is not.
 .Pp
 The 98713A seems to have a problem with 10Mbps full duplex mode.
 The transmitter works but the receiver tends to produce many
-unexplained errors leading to very poor overall performance. The
-98715A does not exhibit this problem. All other modes on the
-98713A seem to work correctly.
+unexplained errors leading to very poor overall performance.
+The 98715A does not exhibit this problem.
+All other modes on the 98713A seem to work correctly.
 .Pp
 The original 82c168 PNIC chip has built in NWAY support which is
 used on certain early LinkSys LNE100TX and Matrox FastNIC cards,
@@ -307,24 +319,27 @@ autonegotiation and work correctly.)
 The
 .Nm
 driver programs 82c168 and 82c169 PNIC chips to use the store and
-forward setting for the transmit start threshold by default. This
-is to work around problems with some NIC/PCI bus combinations where
+forward setting for the transmit start threshold by default.
+This is to work around problems with some NIC/PCI bus combinations where
 the PNIC can transmit corrupt frames when operating at 100Mbps,
 probably due to PCI DMA burst transfer errors.
 .Pp
 The 82c168 and 82c169 PNIC chips also have a receiver bug that
 sometimes manifests during periods of heavy receive and transmit
 activity, where the chip will improperly DMA received frames to
-the host. The chips appear to upload several kilobytes of garbage
+the host.
+The chips appear to upload several kilobytes of garbage
 data along with the received frame data, dirtying several RX buffers
-instead of just the expected one. The
+instead of just the expected one.
+The
 .Nm
 driver detects this condition and will salvage the frame, however
 it incurs a serious performance penalty in the process.
 .Pp
 The PNIC chips also sometimes generate a transmit underrun error when
 the driver attempts to download the receiver filter setup frame, which
-can result in the receive filter being incorrectly programmed. The
+can result in the receive filter being incorrectly programmed.
+The
 .Nm
 driver will watch for this condition and requeue the setup frame until
 it is transferred successfully.
@@ -332,12 +347,14 @@ it is transferred successfully.
 The ADMtek AL981 chip (and possibly the AN983 as well) has been observed
 to sometimes wedge on transmit: this appears to happen when the driver
 queues a sequence of frames which cause it to wrap from the end of
-the transmit descriptor ring back to the beginning. The
+the transmit descriptor ring back to the beginning.
+The
 .Nm
 driver attempts to avoid this condition by not queing any frames past
 the end of the transmit ring during a single invocation of the
 .Fn dc_start
-routine. This workaround has a negligible impact on transmit performance.
+routine.
+This workaround has a negligible impact on transmit performance.
 .Pp
 The
 .Fn mii_tick
diff --git a/share/man/man4/drum.4 b/share/man/man4/drum.4
index 28fe41a434d..ecdc794a8a3 100644
--- a/share/man/man4/drum.4
+++ b/share/man/man4/drum.4
@@ -1,3 +1,4 @@
+.\"	$OpenBSD: drum.4,v 1.3 2000/12/21 21:01:15 aaron Exp $
 .\"	$NetBSD: drum.4,v 1.3 1994/11/30 16:22:11 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
diff --git a/share/man/man4/eap.4 b/share/man/man4/eap.4
index 12a322fbc07..fb7c607b64d 100644
--- a/share/man/man4/eap.4
+++ b/share/man/man4/eap.4
@@ -1,5 +1,6 @@
-.\" $OpenBSD: eap.4,v 1.6 2000/12/21 05:32:52 aaron Exp $
+.\" $OpenBSD: eap.4,v 1.7 2000/12/21 21:01:16 aaron Exp $
 .\" $NetBSD: eap.4,v 1.2 1998/05/06 19:14:06 augustss Exp $
+.\"
 .\" Copyright (c) 1997 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
diff --git a/share/man/man4/enc.4 b/share/man/man4/enc.4
index 2bfa9d437d1..cc9b61a3329 100644
--- a/share/man/man4/enc.4
+++ b/share/man/man4/enc.4
@@ -1,4 +1,5 @@
-.\"	$OpenBSD: enc.4,v 1.8 2000/11/20 08:00:00 deraadt Exp $
+.\"	$OpenBSD: enc.4,v 1.9 2000/12/21 21:01:16 aaron Exp $
+.\"
 .Dd October 7, 1999
 .Dt ENC 4
 .Os
@@ -48,8 +49,7 @@ If the
 .Dv IFF_LINK0
 flag is set on an
 .Nm
-interface, IP-in-IP encapsulation (instead of Ethernet-in-IP) is
-done.
+interface, IP-in-IP encapsulation (instead of Ethernet-in-IP) is done.
 Its use is currently experimental.
 This flag should not be set when the interface is used in conjunction
 with the bridge.
diff --git a/share/man/man4/icmp.4 b/share/man/man4/icmp.4
index 25efd2b7e28..a3d80f93e1c 100644
--- a/share/man/man4/icmp.4
+++ b/share/man/man4/icmp.4
@@ -1,3 +1,4 @@
+.\"	$OpenBSD: icmp.4,v 1.6 2000/12/21 21:01:16 aaron Exp $
 .\"	$NetBSD: icmp.4,v 1.3 1994/11/30 16:22:14 jtc Exp $
 .\"
 .\" Copyright (c) 1986, 1991, 1993
diff --git a/share/man/man4/idp.4 b/share/man/man4/idp.4
index ee89ef71141..a31d5e14fe7 100644
--- a/share/man/man4/idp.4
+++ b/share/man/man4/idp.4
@@ -1,3 +1,4 @@
+.\"	$OpenBSD: idp.4,v 1.6 2000/12/21 21:01:16 aaron Exp $
 .\"	$NetBSD: idp.4,v 1.3 1994/11/30 16:22:15 jtc Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
diff --git a/share/man/man4/inet.4 b/share/man/man4/inet.4
index 2f9a5f00a56..1368039f3c8 100644
--- a/share/man/man4/inet.4
+++ b/share/man/man4/inet.4
@@ -1,3 +1,4 @@
+.\"	$OpenBSD: inet.4,v 1.7 2000/12/21 21:01:16 aaron Exp $
 .\"	$NetBSD: inet.4,v 1.3 1994/11/30 16:22:18 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -49,7 +50,8 @@ layered atop the
 .Pq Tn IP
 transport layer, and utilizing the Internet address format.
 The Internet family provides protocol support for the
-.Dv SOCK_STREAM , SOCK_DGRAM ,
+.Dv SOCK_STREAM ,
+.Dv SOCK_DGRAM ,
 and
 .Dv SOCK_RAW
 socket types; the
@@ -64,8 +66,7 @@ network standard format (on the
 these are word and byte
 reversed).  The include file
 .Aq Pa netinet/in.h
-defines this address
-as a discriminated union.
+defines this address as a discriminated union.
 .Pp
 Sockets bound to the Internet protocol family utilize
 the following addressing structure,
diff --git a/share/man/man4/inet6.4 b/share/man/man4/inet6.4
index 364aba2d002..e58f3e95558 100644
--- a/share/man/man4/inet6.4
+++ b/share/man/man4/inet6.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: inet6.4,v 1.18 2000/11/24 10:25:12 itojun Exp $
+.\"	$OpenBSD: inet6.4,v 1.19 2000/12/21 21:01:16 aaron Exp $
 .\"	$KAME: inet6.4,v 1.19 2000/11/24 10:13:18 itojun Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -57,7 +57,8 @@ transport layer, and utilizing the IPv6 address format.
 The
 .Nm
 family provides protocol support for the
-.Dv SOCK_STREAM , SOCK_DGRAM ,
+.Dv SOCK_STREAM ,
+.Dv SOCK_DGRAM ,
 and
 .Dv SOCK_RAW
 socket types; the
diff --git a/share/man/man4/ip.4 b/share/man/man4/ip.4
index 05bac174a3d..d9ca33fd76c 100644
--- a/share/man/man4/ip.4
+++ b/share/man/man4/ip.4
@@ -1,3 +1,4 @@
+.\"	$OpenBSD: ip.4,v 1.13 2000/12/21 21:01:16 aaron Exp $
 .\"	$NetBSD: ip.4,v 1.3 1994/11/30 16:22:19 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
diff --git a/share/man/man4/ipsec.4 b/share/man/man4/ipsec.4
index 527cbcb72ca..fa121147fc8 100644
--- a/share/man/man4/ipsec.4
+++ b/share/man/man4/ipsec.4
@@ -1,4 +1,5 @@
-.\" $OpenBSD: ipsec.4,v 1.37 2000/12/12 00:29:21 angelos Exp $
+.\" $OpenBSD: ipsec.4,v 1.38 2000/12/21 21:01:17 aaron Exp $
+.\"
 .\" Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
 .\" All rights reserved.
 .\"
diff --git a/share/man/man4/isapnp.4 b/share/man/man4/isapnp.4
index ae6bb461986..fea507ec0c2 100644
--- a/share/man/man4/isapnp.4
+++ b/share/man/man4/isapnp.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: isapnp.4,v 1.19 2000/10/18 16:32:11 aaron Exp $
+.\"	$OpenBSD: isapnp.4,v 1.20 2000/12/21 21:01:17 aaron Exp $
 .\"	$NetBSD: isapnp.4,v 1.8 1998/06/07 09:08:46 enami Exp $
 .\"
 .\" Copyright (c) 1997 Jonathan Stone
@@ -66,7 +66,7 @@ IDE controllers (typically found on sound cards).
 .It Xr com 4 , Xr pccom 4
 8250/16450/16550/16650/16850-compatible ISA PnP serial cards and internal
 modems.
-Win-modems are not supported.
+Winmodems are not supported.
 .El
 .Pp
 .Ss Network interfaces
diff --git a/share/man/man4/midi.4 b/share/man/man4/midi.4
index c8a92ffaadc..89fc73fbf83 100644
--- a/share/man/man4/midi.4
+++ b/share/man/man4/midi.4
@@ -1,5 +1,6 @@
-.\" $OpenBSD: midi.4,v 1.4 1999/07/21 11:20:33 deraadt Exp $
+.\" $OpenBSD: midi.4,v 1.5 2000/12/21 21:01:17 aaron Exp $
 .\" $NetBSD: midi.4,v 1.4 1998/08/22 14:45:35 augustss Exp $
+.\"
 .\" Copyright (c) 1997 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
diff --git a/share/man/man4/ns.4 b/share/man/man4/ns.4
index 714aeb1f85b..adbc0c2b349 100644
--- a/share/man/man4/ns.4
+++ b/share/man/man4/ns.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ns.4,v 1.8 2000/04/15 11:45:51 aaron Exp $
+.\"	$OpenBSD: ns.4,v 1.9 2000/12/21 21:01:17 aaron Exp $
 .\"	$NetBSD: ns.4,v 1.3 1994/11/30 16:22:26 jtc Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
@@ -57,7 +57,9 @@ address formats.
 The
 .Tn NS
 family provides protocol support for the
-.Dv SOCK_STREAM , SOCK_DGRAM , SOCK_SEQPACKET ,
+.Dv SOCK_STREAM ,
+.Dv SOCK_DGRAM ,
+.Dv SOCK_SEQPACKET ,
 and
 .Dv SOCK_RAW
 socket types; the
diff --git a/share/man/man4/opl.4 b/share/man/man4/opl.4
index e869f43a573..7b458b01999 100644
--- a/share/man/man4/opl.4
+++ b/share/man/man4/opl.4
@@ -1,5 +1,6 @@
-.\" $OpenBSD: opl.4,v 1.2 1999/07/09 13:35:48 aaron Exp $
+.\" $OpenBSD: opl.4,v 1.3 2000/12/21 21:01:17 aaron Exp $
 .\" $NetBSD: opl.4,v 1.3 1998/09/08 11:59:48 augustss Exp $
+.\"
 .\" Copyright (c) 1997 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
diff --git a/share/man/man4/pcdisplay.4 b/share/man/man4/pcdisplay.4
index 473bbf7d99e..1570129d6c1 100644
--- a/share/man/man4/pcdisplay.4
+++ b/share/man/man4/pcdisplay.4
@@ -1,5 +1,6 @@
-.\" $OpenBSD: pcdisplay.4,v 1.1 2000/11/15 21:29:32 aaron Exp $
+.\" $OpenBSD: pcdisplay.4,v 1.2 2000/12/21 21:01:17 aaron Exp $
 .\" $NetBSD: pcdisplay.4,v 1.3 2000/05/13 15:22:17 mycroft Exp $
+.\"
 .Dd March 20, 1999
 .Os
 .Dt PCDISPLAY 4
diff --git a/share/man/man4/pciide.4 b/share/man/man4/pciide.4
index 0d56696eef2..9b8e226c7ef 100644
--- a/share/man/man4/pciide.4
+++ b/share/man/man4/pciide.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pciide.4,v 1.10 2000/11/07 22:38:59 chris Exp $
+.\"	$OpenBSD: pciide.4,v 1.11 2000/12/21 21:01:18 aaron Exp $
 .\"	$NetBSD: pciide.4,v 1.8 1999/03/16 01:19:17 garbled Exp $
 .\"
 .\" Copyright (c) 1998 Manuel Bouyer.
@@ -31,7 +31,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-
 .Dd October 15, 1998
 .Dt PCIIDE 4
 .Os
@@ -75,12 +74,20 @@ VIA Technologies VT82C586 and VT82C586A
 .Pp
 Some of these controllers are only available in multifunction PCI chips.
 .Pp
-The 0x0001 flag forces the
+The
+.Li 0x0001
+flag forces the
 .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.
-
+the controller but DMA is present.
+If the BIOS didn't configure the controller properly, this can
+cause a machine hang.
+.Sh SEE ALSO
+.Xr atapiscsi 4 ,
+.Xr intro 4 ,
+.Xr scsi 4 ,
+.Xr wd 4 ,
+.Xr wdc 4
 .Sh BUGS
 There's no way to reliably know if a PCI064x controller is enabled or not.
 If the driver finds a PCI064x, it will assume it is enabled unless
@@ -91,14 +98,8 @@ and another controller has been installed which uses the ISA legacy I/O ports
 and interrupts.
 .Pp
 Although this driver supports several UltraDMA/100 controllers, at this time
-it only uses them in UltraDMA/66 modes.  
+it only uses them in UltraDMA/66 modes.
 .Pp
 The timings used for the PIO and DMA modes for controllers listed above
-are for a PCI bus running at 30 or 33 Mhz. This driver may not
-work properly on overclocked systems.
-.Sh SEE ALSO
-.Xr atapiscsi 4 ,
-.Xr intro 4 ,
-.Xr scsi 4 ,
-.Xr wd 4 ,
-.Xr wdc 4
+are for a PCI bus running at 30 or 33 Mhz.
+This driver may not work properly on overclocked systems.
diff --git a/share/man/man4/pckbc.4 b/share/man/man4/pckbc.4
index 66931801a53..a5929171834 100644
--- a/share/man/man4/pckbc.4
+++ b/share/man/man4/pckbc.4
@@ -1,5 +1,6 @@
-.\" $OpenBSD: pckbc.4,v 1.1 2000/11/15 21:20:52 aaron Exp $
+.\" $OpenBSD: pckbc.4,v 1.2 2000/12/21 21:01:18 aaron Exp $
 .\" $NetBSD: pckbc.4,v 1.2 2000/06/16 06:42:31 augustss Exp $
+.\"
 .Dd April 21, 1999
 .Os
 .Dt PCKBC 4
diff --git a/share/man/man4/pckbd.4 b/share/man/man4/pckbd.4
index 795ac504042..ee05684d511 100644
--- a/share/man/man4/pckbd.4
+++ b/share/man/man4/pckbd.4
@@ -1,5 +1,6 @@
-.\" $OpenBSD: pckbd.4,v 1.1 2000/11/15 21:20:52 aaron Exp $
+.\" $OpenBSD: pckbd.4,v 1.2 2000/12/21 21:01:18 aaron Exp $
 .\" $NetBSD: pckbd.4,v 1.3 1999/12/21 11:31:07 drochner Exp $
+.\"
 .Dd March 20, 1999
 .Os
 .Dt PCKBD 4
diff --git a/share/man/man4/ray.4 b/share/man/man4/ray.4
index 9d4821534d1..f067a483784 100644
--- a/share/man/man4/ray.4
+++ b/share/man/man4/ray.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ray.4,v 1.5 2000/10/17 04:51:04 mickey Exp $
+.\"	$OpenBSD: ray.4,v 1.6 2000/12/21 21:01:18 aaron Exp $
 .\"	$NetBSD: ray.4,v 1.5 2000/02/28 13:54:55 enami Exp $
 .\"
 .\" Copyright (c) 2000 Christian E. Hopps
@@ -102,15 +102,15 @@ obstructions) it is a maximum of 500 feet (152 meters).
 .Pp
 Windows(tm) drivers may use one of two framing modes for wireless packets,
 "translation" and "encapsulation." "Encapsulation" is the only framing
-mode available when using some older Windows drivers. 
+mode available when using some older Windows drivers.
 .Pp
 Setting
 .Em link0
 flag on the interface allows the
 Ethernet2 in 802.11 "encapsulation" framing method used by
-older Windows drivers for the card. For all other purposes, 
-link0 should not be used, and "translation" should be selected
-if you are given the option in a newer Windows driver.
+older Windows drivers for the card.
+For all other purposes, link0 should not be used, and "translation"
+should be selected if you are given the option in a newer Windows driver.
 .Sh DIAGNOSTICS
 .Bl -diag
 .It "ray0: card failed self test: status x"
@@ -122,6 +122,14 @@ Indicates the card has failed its initial startup tests.
 .Xr intro 4 ,
 .Xr pcmcia 4 ,
 .Xr ifconfig 8
+.Sh AUTHORS
+The
+.Nm
+driver was written by Christian E. Hopps <chopps@netbsd.org> and ported to
+.Ox
+by Michael Shalayeff <mickey@openbsd.org>.
+Support for interoperating with newer Windows driver was added by
+Steve Weiss <srw@alum.mit.edu>.
 .Sh HISTORY
 The
 .Nm
@@ -130,13 +138,6 @@ device driver first appeared in
 .Ox
 support was added in
 .Ox 2.7 .
-.Sh AUTHORS
-The
-.Nm
-driver was written by Christian E. Hopps <chopps@netbsd.org> and ported to
-.Ox
-by Michael Shalayeff <mickey@openbsd.org>. Support for interoperating
-with newer Windows driver was added by Steve Weiss <srw@alum.mit.edu>.
 .Sh BUGS
 Currently the infrastructure mode is untested, and authentication
 using WEP is unimplemented.
diff --git a/share/man/man4/rln.4 b/share/man/man4/rln.4
index 8832bf686d8..b796fb40e69 100644
--- a/share/man/man4/rln.4
+++ b/share/man/man4/rln.4
@@ -1,4 +1,5 @@
-.\"	$OpenBSD: rln.4,v 1.8 2000/11/10 20:02:17 todd Exp $
+.\"	$OpenBSD: rln.4,v 1.9 2000/12/21 21:01:18 aaron Exp $
+.\"
 .Dd 2 April, 1999
 .Dt RLN 4
 .Os
diff --git a/share/man/man4/route.4 b/share/man/man4/route.4
index 3e75df74778..e45352d9cb8 100644
--- a/share/man/man4/route.4
+++ b/share/man/man4/route.4
@@ -1,3 +1,4 @@
+.\"	$OpenBSD: route.4,v 1.6 2000/12/21 21:01:19 aaron Exp $
 .\"	$NetBSD: route.4,v 1.3 1994/11/30 16:22:31 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
diff --git a/share/man/man4/sl.4 b/share/man/man4/sl.4
index a91693505e2..568197f9f1f 100644
--- a/share/man/man4/sl.4
+++ b/share/man/man4/sl.4
@@ -1,3 +1,4 @@
+.\"	$OpenBSD: sl.4,v 1.5 2000/12/21 21:01:19 aaron Exp $
 .\"	$NetBSD: sl.4,v 1.1 1996/08/10 21:26:14 explorer Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
diff --git a/share/man/man4/spp.4 b/share/man/man4/spp.4
index 4245b9b583a..48ccf950ba2 100644
--- a/share/man/man4/spp.4
+++ b/share/man/man4/spp.4
@@ -1,3 +1,4 @@
+.\"	$OpenBSD: spp.4,v 1.6 2000/12/21 21:01:19 aaron Exp $
 .\"	$NetBSD: spp.4,v 1.3 1994/11/30 16:22:33 jtc Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
diff --git a/share/man/man4/strip.4 b/share/man/man4/strip.4
index 7154013e40f..399edb657df 100644
--- a/share/man/man4/strip.4
+++ b/share/man/man4/strip.4
@@ -1,3 +1,5 @@
+.\"	$OpenBSD: strip.4,v 1.9 2000/12/21 21:01:19 aaron Exp $
+.\"
 .\" Copyright 1996 The Board of Trustees of The Leland Stanford
 .\" Junior University. All Rights Reserved.
 .\"
diff --git a/share/man/man4/tb.4 b/share/man/man4/tb.4
index 673ab2b4ea4..a8d2b6a5361 100644
--- a/share/man/man4/tb.4
+++ b/share/man/man4/tb.4
@@ -1,3 +1,4 @@
+.\"	$OpenBSD: tb.4,v 1.4 2000/12/21 21:01:20 aaron Exp $
 .\"	$NetBSD: tb.4,v 1.3.6.1 1996/05/31 00:37:45 cgd Exp $
 .\"
 .\" Copyright (c) 1986, 1991 Regents of the University of California.
diff --git a/share/man/man4/tcp.4 b/share/man/man4/tcp.4
index 7d49d16a70f..cc03616f5d2 100644
--- a/share/man/man4/tcp.4
+++ b/share/man/man4/tcp.4
@@ -1,3 +1,4 @@
+.\"	$OpenBSD: tcp.4,v 1.11 2000/12/21 21:01:20 aaron Exp $
 .\"	$NetBSD: tcp.4,v 1.3 1994/11/30 16:22:35 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
diff --git a/share/man/man4/termios.4 b/share/man/man4/termios.4
index ca610ec3f90..8a67158d800 100644
--- a/share/man/man4/termios.4
+++ b/share/man/man4/termios.4
@@ -1,3 +1,4 @@
+.\"	$OpenBSD: termios.4,v 1.13 2000/12/21 21:01:20 aaron Exp $
 .\"	$NetBSD: termios.4,v 1.5 1994/11/30 16:22:36 jtc Exp $
 .\"
 .\" Copyright (c) 1991, 1992, 1993
diff --git a/share/man/man4/tp.4 b/share/man/man4/tp.4
index 6471e68d1b5..129f1325555 100644
--- a/share/man/man4/tp.4
+++ b/share/man/man4/tp.4
@@ -1,3 +1,4 @@
+.\"	$OpenBSD: tp.4,v 1.12 2000/12/21 21:01:21 aaron Exp $
 .\"	$NetBSD: tp.4,v 1.4 1994/11/30 16:22:38 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
diff --git a/share/man/man4/tun.4 b/share/man/man4/tun.4
index 3b5a98d01de..86a13216b3b 100644
--- a/share/man/man4/tun.4
+++ b/share/man/man4/tun.4
@@ -1,4 +1,5 @@
-.\"	$OpenBSD: tun.4,v 1.15 2000/09/17 00:53:35 aaron Exp $
+.\"	$OpenBSD: tun.4,v 1.16 2000/12/21 21:01:21 aaron Exp $
+.\"
 .Dd March 10, 1996
 .Dt TUN 4
 .Os
diff --git a/share/man/man4/udp.4 b/share/man/man4/udp.4
index 259dac4197c..49eec886b66 100644
--- a/share/man/man4/udp.4
+++ b/share/man/man4/udp.4
@@ -1,3 +1,4 @@
+.\"	$OpenBSD: udp.4,v 1.8 2000/12/21 21:01:21 aaron Exp $
 .\"	$NetBSD: udp.4,v 1.3 1994/11/30 16:22:41 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
diff --git a/share/man/man4/ums.4 b/share/man/man4/ums.4
index da490e2a69a..d134a9efcd2 100644
--- a/share/man/man4/ums.4
+++ b/share/man/man4/ums.4
@@ -1,3 +1,4 @@
+.\" $OpenBSD: ums.4,v 1.2 2000/12/21 21:01:21 aaron Exp $
 .\" $NetBSD: ums.4,v 1.5 1999/04/13 20:25:29 augustss Exp $
 .\"
 .\" Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/share/man/man4/unix.4 b/share/man/man4/unix.4
index b37eb93826c..c9f43c012ce 100644
--- a/share/man/man4/unix.4
+++ b/share/man/man4/unix.4
@@ -1,3 +1,4 @@
+.\"	$OpenBSD: unix.4,v 1.5 2000/12/21 21:01:21 aaron Exp $
 .\"	$NetBSD: unix.4,v 1.3 1994/11/30 16:22:43 jtc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
diff --git a/share/man/man4/vga.4 b/share/man/man4/vga.4
index d98543e5bb6..8c4986b2474 100644
--- a/share/man/man4/vga.4
+++ b/share/man/man4/vga.4
@@ -1,5 +1,6 @@
-.\" $OpenBSD: vga.4,v 1.1 2000/11/15 21:03:00 aaron Exp $
+.\" $OpenBSD: vga.4,v 1.2 2000/12/21 21:01:21 aaron Exp $
 .\" $NetBSD: vga.4,v 1.2.4.1 2000/08/09 07:48:40 drochner Exp $
+.\"
 .Dd March 20, 1999
 .Os
 .Dt VGA 4
diff --git a/share/man/man4/wsdisplay.4 b/share/man/man4/wsdisplay.4
index 70717de6a8d..a29727ed778 100644
--- a/share/man/man4/wsdisplay.4
+++ b/share/man/man4/wsdisplay.4
@@ -1,4 +1,6 @@
+.\" $OpenBSD: wsdisplay.4,v 1.2 2000/12/21 21:01:22 aaron Exp $
 .\" $NetBSD: wsdisplay.4,v 1.5 2000/05/13 15:22:19 mycroft Exp $
+.\"
 .Dd March 20, 1999
 .Os
 .Dt WSDISPLAY 4
@@ -28,9 +30,9 @@ The
 .Nm
 driver is an abstraction layer for display devices within the
 .Xr wscons 4
-framework. It attaches to the hardware specific display device
-driver and and makes it available as text terminal or graphics
-interface.
+framework.
+It attaches to the hardware specific display device driver and
+makes it available as text terminal or graphics interface.
 .Pp
 A display device can have the ability to display characters on it
 (without help of an X server), either directly by hardware or through
@@ -40,17 +42,21 @@ Such displays are called
 the
 .Nm
 driver will connect a terminal emulation module and provide a
-tty-like software interface. In contrary, non-emulating displays can only
-be used by special programs like X servers.
+tty-like software interface.
+In contrary, non-emulating displays can only be used by special programs
+like X servers.
 .Pp
 The
 .Em console
 locator in the configuration line refers to the device's use as output
-part of the operating system console. A device specification containing
-a positive value here will only match if the device is in use as system
-console. (The console device selection in early system startup is not
-influenced.) This way, the console device can be connected to a known
-wsdisplay device instance. (Naturally, only
+part of the operating system console.
+A device specification containing a positive value here will only match
+if the device is in use as system console.
+(The console device selection in early system startup is not influenced.)
+This way, the console device can be connected to a known
+.Xr wsdisplay 4
+device instance.
+(Naturally, only
 .Dq emulating
 display devices are usable as console.)
 .Pp
@@ -59,8 +65,10 @@ The logical unit of an independent contents displayed on a display
 .Dq virtual terminal
 ) is called a
 .Dq screen
-here. If the underlying device driver supports it, multiple screens can
-be used on one display. (As of this writing, only the
+here.
+If the underlying device driver supports it, multiple screens can
+be used on one display.
+(As of this writing, only the
 .Xr vga 4
 and the
 .Tn VAX
@@ -70,29 +78,37 @@ Screens have different minor device numbers and separate tty instances.
 One screen posesses the
 .Dq focus ,
 this means it is displayed on the display and its tty device will get
-the keyboard input. (In some cases - if no screen is set up or if a screen
-was just deleted - it is possible that no focus is present at all.)
+the keyboard input.
+(In some cases, if no screen is set up or if a screen
+was just deleted, it is possible that no focus is present at all.)
 The focus can be switched by either special keyboard input (typically
 CTL-ALT-Fn) or an ioctl command issued by a user program.
 Screens are set up or deleted through the
 .Pa /dev/ttyEcfg
 control decice (preferrably using the
 .Xr wsconscfg 8
-utility). Alternatively, the compile-time option
-.Cd WSDISPLAY_DEFAULTSCREENS=N
+utility).
+Alternatively, the compile-time option
+.Cm WSDISPLAY_DEFAULTSCREENS=N
 will set up N screens of the display driver's default type and using
 the system's default terminal emulator at autoconfiguration time.
 .Sh FILES
-.Bl -item
-.It
-.Pa /dev/ttyE*
-Terminal devices (per screen).
-.It
-.Pa /dev/ttyEcfg
-Control device.
-.It
-.Pa /usr/include/dev/wscons/wsconsio.h
+.Bl -tag -width /usr/include/dev/wscons/wsconsio.h -compact
+.It Pa /dev/ttyE*
+terminal devices (per screen)
+.It Pa /dev/ttyEcfg
+control device
+.It Pa /usr/include/dev/wscons/wsconsio.h
 .El
+.Sh SEE ALSO
+.Xr ega 4 ,
+.Xr pcdisplay 4 ,
+.Xr tty 4 ,
+.Xr vga 4 ,
+.Xr wscons 4 ,
+.Xr wsconscfg 8 ,
+.Xr wsconsctl 8 ,
+.Xr wsfontload 8
 .Sh BUGS
 The
 .Nm
@@ -106,13 +122,3 @@ are not cleanly distinguished in the code and in manual pages.
 .Pp
 .Dq non-emulating
 display devices are not tested.
-.Sh SEE ALSO
-.Xr wscons 4 ,
-.Xr wsconscfg 8 ,
-.Xr wsconsctl 8 ,
-.Xr wsfontload 8 ,
-.Xr ega 4 ,
-.Xr vga 4 ,
-.Xr pcdisplay 4 ,
-.Xr tty 4
-
diff --git a/share/man/man4/wskbd.4 b/share/man/man4/wskbd.4
index 934710a06eb..0a62d8a742d 100644
--- a/share/man/man4/wskbd.4
+++ b/share/man/man4/wskbd.4
@@ -1,4 +1,6 @@
+.\" $OpenBSD: wskbd.4,v 1.2 2000/12/21 21:01:22 aaron Exp $
 .\" $NetBSD: wskbd.4,v 1.5 2000/03/20 11:51:59 pk Exp $
+.\"
 .Dd March 20, 1999
 .Os
 .Dt WSKBD 4
@@ -25,7 +27,8 @@ The
 .Nm
 driver handles common tasks for keyboards within the
 .Xr wscons 4
-framework. It is attached to the hardware specific keyboard drivers and
+framework.
+It is attached to the hardware specific keyboard drivers and
 provides their connection to
 .Dq wsdisplay
 devices and a character device interface.
@@ -40,7 +43,8 @@ keysyms (hardware independent, defined in
 .It
 Handling of
 .Dq compose
-sequences. Characters commonly not present as separate key on keyboards
+sequences.
+Characters commonly not present as separate key on keyboards
 can be generated after either a special
 .Dq compose
 key is pressed or a
@@ -68,10 +72,11 @@ for use by X servers.
 The
 .Nm
 driver provides a number of ioctl functions to control key maps
-and other parameters. These functions are accessible though the
-associated
+and other parameters.
+These functions are accessible though the associated
 .Dq wsdisplay
-device as well. A complete list is in
+device as well.
+A complete list is in
 .Pa /usr/include/dev/wscons/wsconsio.h .
 The
 .Xr wsconsctl 8
@@ -80,19 +85,18 @@ utility allows to access key maps and other variables.
 The
 .Em console
 locator in the configuration line refers to the device's use as input
-part of the operating system console. A device specification containing
-a positive value here will only match if the device is in use as system
-console. (The console device selection in early system startup is not
-influenced.) This way, the console device can be connected to a known
-wskbd device instance.
+part of the operating system console.
+A device specification containing a positive value here will only match
+if the device is in use as system console.
+(The console device selection in early system startup is not influenced.)
+This way, the console device can be connected to a known
+.Xr wskbd 4
+device instance.
 .Sh FILES
-.Bl -item
-.It
-.Pa /dev/wskbd*
-.It
-.Pa /usr/include/dev/wscons/wsksymdef.h
-.It
-.Pa /usr/include/dev/wscons/wsconsio.h .
+.Bl -tag -width /usr/include/dev/wscons/wsksymdef.h -compact
+.It Pa /dev/wskbd*
+.It Pa /usr/include/dev/wscons/wsksymdef.h
+.It Pa /usr/include/dev/wscons/wsconsio.h
 .El
 .Sh SEE ALSO
 .Xr wscons 4 ,
diff --git a/share/man/man4/wsmouse.4 b/share/man/man4/wsmouse.4
index 6c380c9b35a..b14f1a58c9d 100644
--- a/share/man/man4/wsmouse.4
+++ b/share/man/man4/wsmouse.4
@@ -1,4 +1,6 @@
+.\" $OpenBSD: wsmouse.4,v 1.2 2000/12/21 21:01:22 aaron Exp $
 .\" $NetBSD: wsmouse.4,v 1.3 1999/12/06 14:52:08 augustss Exp $
+.\"
 .Dd March 20, 1999
 .Os
 .Dt WSMOUSE 4
@@ -25,25 +27,24 @@ The
 .Nm
 driver is an abstraction layer for mice within the
 .Xr wscons 4
-framework. It is attached to the hardware specific keyboard drivers and
-provides a character device interface. For use with X servers,
+framework.
+It is attached to the hardware specific keyboard drivers and
+provides a character device interface.
+For use with X servers,
 .Dq mouse events
 can be generated.
 .Pp
 The
 .Nm
-driver provides a number of ioctl functions to control
-various parameters. A complete list is in
-.Pa /usr/include/dev/wscons/wsconsio.h .
+driver provides a number of ioctl functions to control various parameters (see
+.Pa /usr/include/dev/wscons/wsconsio.h ) .
 The
 .Xr wsconsctl 8
 utility gives access to these variables.
 .Sh FILES
-.Bl -item
-.It
-.Pa /dev/wsmouse*
-.It
-.Pa /usr/include/dev/wscons/wsconsio.h .
+.Bl -tag -width /usr/include/dev/wscons/wsconsio.h -compact
+.It Pa /dev/wsmouse*
+.It Pa /usr/include/dev/wscons/wsconsio.h
 .El
 .Sh SEE ALSO
 .Xr wscons 4 ,
diff --git a/share/man/man4/wsmux.4 b/share/man/man4/wsmux.4
index 4d703de7519..f455b901dda 100644
--- a/share/man/man4/wsmux.4
+++ b/share/man/man4/wsmux.4
@@ -1,3 +1,4 @@
+.\" $OpenBSD: wsmux.4,v 1.3 2000/12/21 21:01:22 aaron Exp $
 .\" $NetBSD: wsmux.4,v 1.2 1999/11/03 22:01:40 castor Exp $
 .\"
 .\" Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -51,26 +52,29 @@ is a pseudo-device driver that allows several
 input devices to have their events multiplexed into one stream.
 .Pp
 The typical usage for this device is to have two multiplexors, one
-for mouse events and one for keyboard events.  All
+for mouse events and one for keyboard events.
+All
 .Xr wsmouse 4
 devices should direct their events to the mouse mux (normally 0)
 and all keyboard devices, except the console, should direct their
-events to the keyboard mux (normally 1).  A device will
-send its events to the mux indicated by the
+events to the keyboard mux (normally 1).
+A device will send its events to the mux indicated by the
 .Va mux
-locator.  If none is given the device will not use a multiplexor.
+locator.
+If none is given the device will not use a multiplexor.
 The keyboard multiplexor should be connected to the display, using
 the
 .Xr wsconscfg 8
-command.  It will then receive all keystrokes from all keyboards
-and, furthermore, keyboards can be dynamically attached and detached without
-further user interaction.
+command.
+It will then receive all keystrokes from all keyboards and, furthermore,
+keyboards can be dynamically attached and detached without further
+user interaction.
 In a similar way, the window system will open the mouse multiplexor
 and receive all mouse events; mice can also be dynamically attached
 and detached.
 .Pp
-It is also possible to inject events into a multiplexor from a
-user program.  This is used by the
+It is also possible to inject events into a multiplexor from a user program.
+This is used by the
 .Xr moused 8
 daemon to take data from a mouse connected to a serial port and
 make it appear on the standard mouse mux.
diff --git a/share/man/man4/xe.4 b/share/man/man4/xe.4
index e8ead7608c8..59fc8f22c01 100644
--- a/share/man/man4/xe.4
+++ b/share/man/man4/xe.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: xe.4,v 1.3 2000/10/18 02:38:24 aaron Exp $
+.\"	$OpenBSD: xe.4,v 1.4 2000/12/21 21:01:22 aaron Exp $
 .\"
 .\" Copyright (c) 1999 Niklas Hallqvist
 .\" All rights reserved.
@@ -34,7 +34,8 @@
 The
 .Nm
 interface provides access to a 10/100 Mb/s Ethernet network via a
-Xircom Ethernet card.  The Ethernet cards known to be supported by the
+Xircom Ethernet card.
+The Ethernet cards known to be supported by the
 .Nm
 interface are:
 .Pp
@@ -43,14 +44,13 @@ interface are:
 .It Xircom CE3
 .El
 .Pp
-However, most 16bit Xircom Ethernet cards should work.
+However, most 16-bit Xircom Ethernet cards should work.
 .Sh SEE ALSO
-.Xr pcmcia 4 ,
 .Xr intro 4 ,
-.Xr ifconfig 8 ,
+.Xr pcmcia 4 ,
+.Xr ifconfig 8
 .Sh HISTORY
 The
 .Nm
-driver
-appeared in
+driver appeared in
 .Ox 2.5 .
diff --git a/share/man/man4/ym.4 b/share/man/man4/ym.4
index fae32e3e46a..2e4432f7744 100644
--- a/share/man/man4/ym.4
+++ b/share/man/man4/ym.4
@@ -1,4 +1,5 @@
-.\" $OpenBSD: ym.4,v 1.6 2000/07/14 20:41:35 deraadt Exp $
+.\" $OpenBSD: ym.4,v 1.7 2000/12/21 21:01:22 aaron Exp $
+.\"
 .\" Copyright (c) 1998 Constantine Paul Sapuntzakis
 .\" All rights reserved
 .\"
@@ -43,12 +44,6 @@ The
 .Nm
 driver provides support for Yamaha OPL3-SAX chipset-based cards.
 cards.
-
-.Sh BUGS
-The "FM" DAC, wavetable synth, and MIDI port are not
-supported.  I can't seem to access any of the extended registers so
-master volume, mute, 3-d control might not work through the mixer interface.
-Lots of work needed.
 .Sh SEE ALSO
 .Xr audio 4 ,
 .Xr mixer 4 ,
@@ -61,4 +56,8 @@ The
 .Nm
 device driver appeared in
 .Ox 2.4 .
-
+.Sh BUGS
+The "FM" DAC, wavetable synth, and MIDI port are not supported.
+I can't seem to access any of the extended registers so
+master volume, mute, 3-d control might not work through the mixer interface.
+Lots of work needed.