new 3Com NIC man pages (aka, work no one else wants to do) :-)

6 files changed, 342 insertions, 273 deletions

diff --git a/share/man/man4/ec.4 b/share/man/man4/ec.4
index d719b354b7c..fcb853eaec1 100644
--- a/share/man/man4/ec.4
+++ b/share/man/man4/ec.4
@@ -1,5 +1,5 @@
-.\"	$OpenBSD: ec.4,v 1.3 1998/11/27 08:51:27 deraadt Exp $	
-.\"	$NetBSD: ec.4,v 1.4 1998/08/09 00:39:02 thorpej Exp $
+.\"	$OpenBSD: ec.4,v 1.4 1999/05/26 02:34:12 aaron Exp $
+.\"     $NetBSD: ec.4,v 1.4 1998/08/09 00:39:02 thorpej Exp $
 .\"
 .\" Copyright (c) 1997 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -37,41 +37,47 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd September 22, 1998
-.Dt EC 4
-.Os OpenBSD
+.Dt EC 4 i386
+.Os
 .Sh NAME
 .Nm ec
-.Nd device driver for 3Com 3c503 (Etherlink II) Ethernet cards
+.Nd "3Com EtherLink II (3C503) Ethernet device driver"
 .Sh SYNOPSIS
 .Cd "ec0 at isa? port 0x250 iomem 0xd8000 irq 9"
 .Sh DESCRIPTION
 The
-.Nm
-device driver supports 3Com Etherlink II (3c503) Ethernet cards.
-.Pp
-Other models of 3Com hardware are supported by the
-.Xr xl 4 ,
+.Nm ec
+device driver supports 3Com EtherLink II (3C503) Ethernet cards.
+Other models of 3Com network cards are supported by the
+.Xr eg 4 ,
+.Xr el 4 ,
 .Xr ep 4 ,
+.Xr ie 4 ,
 and
-.Xr eg 4
+.Xr xl 4
 drivers.
-.Sh MEDIA SELECTION
+.Pp
 The Etherlink II supports two media types on a single card.  All support
 the AUI media type.  The other media is either BNC or UTP behind a
 transciever.  Software cannot differentiate between BNC and UTP cards.
 .Pp
-To enable the AUI media, select the
-.Em 10base5
-or
-.Em aui
-media type with
-.Xr ifconfig 8 's
-.Sq media
-directive.  To select the other media (BNC or UTP), select the
-.Em 10base2
-or
-.Em bnc
-media type.
+The following media types and options (as given to
+.Xr ifconfig 8 )
+are supported:
+.Pp
+.Bl -tag -width xxx -offset indent
+.It Cm media No 10base5
+Set 10base5 (thick-net) operation.
+.It Cm media No 10base2
+Set BNC (10base2/thin-net) or UTP operation.
+.El
+.Pp
+For more information on configuring this device, see
+.Xr ifconfig 8 .
+To view a list of media types and options supported by your card try
+.Dq ifconfig -m <device> .
+For example,
+.Dq ifconfig -m ec0 .
 .Sh DIAGNOSTICS
 .Bl -diag
 .It "ec0: wildcarded IRQ is not allowed"
@@ -82,13 +88,15 @@ An IRQ other than the above listed IRQs was specified in the kernel
 configuration file.  The Etherlink II hardware only supports the
 above listed IRQs.
 .It "ec0: failed to clear shared memory at offset <off>"
-The memory test was unable to clear shared the interface's shared memory
+The memory test was unable to clear the interface's shared memory
 region.  This often indicates that the card is configured at a conflicting
 .Em iomem
 address.
-.El
 .Sh SEE ALSO
+.Xr eg 4 ,
+.Xr el 4 ,
+.Xr ep 4 ,
+.Xr ie 4 ,
 .Xr ifmedia 4 ,
-.Xr intro 4 ,
-.Xr isa 4 ,
+.Xr xl 4 ,
 .Xr ifconfig 8
diff --git a/share/man/man4/ep.4 b/share/man/man4/ep.4
index 27d74aa2b2d..c9fd9422e26 100644
--- a/share/man/man4/ep.4
+++ b/share/man/man4/ep.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ep.4,v 1.10 1999/05/16 19:56:22 alex Exp $
+.\"	$OpenBSD: ep.4,v 1.11 1999/05/26 02:34:12 aaron Exp $
 .\"
 .\" Copyright (c) 1994 Herb Peyerl
 .\" All rights reserved.
@@ -33,126 +33,106 @@
 .Os
 .Sh NAME
 .Nm ep
-.Nd Ethernet driver for 3Com 3c5x9 (Etherlink III)
+.Nd "3Com EtherLink III and Fast EtherLink III Ethernet device driver"
 .Sh SYNOPSIS
 .Cd "ep? at eisa? slot ?"
 .Cd "ep? at isa? port ? irq ?"
 .Cd "ep? at pci? dev ? function ?"
-.Cd "ep* at pcmcia? function ?"
+.Cd "ep? at pcmcia? port 0x300 size 0x10 irq 10 slot ?"
 .Cd "ep* at isapnp?"
 .Sh DESCRIPTION
 The
 .Nm ep
-device driver supports the 3Com Etherlink III family of ethernet cards.
-This includes, among others,
-the 3c509 (ISA), 3c579 (EISA), 3c589 (PCMCIA), and 3c590, 3c595.
+device driver supports the 3Com EtherLink III and Fast EtherLink III family
+of Ethernet cards. This includes, among others, the following models:
 .Pp
-Other models of 3Com hardware are supported by the
+.Bl -tag -width 3CXXXX -offset indent -compact
+.It 3C509
+EtherLink III ISA
+.It 3C579
+EtherLink III EISA
+.It 3C589
+EtherLink III LAN PC Card (PCMCIA)
+.It 3C590
+Fast EtherLink III PCI
+.It 3C595
+Fast EtherLink III 10/100 PCI
+.El
+.Pp
+Other models of 3Com network cards are supported by the
 .Xr ec 4 ,
 .Xr eg 4 ,
 .Xr el 4 ,
-.Xr ie 4
+.Xr ie 4 ,
 and
 .Xr xl 4
 drivers.
 .Pp
-Various models of these cards come with a different assortment of
-connectors:
+Category 3, 4 or 5 unshielded twisted-pair (UTP) cable should be used for
+RJ-45 (10baseT), thick Ethernet coaxial (RG59 B/U, 50 ohm) for AUI/DIX, and
+thin Ethernet coaxial (RG58 A/U or C/U, 50 ohm +/- 4) for BNC (10base2).
+Some 3Com NICs also support MII connectors (switchable 10/100Mbps UTP).
 .Pp
-.Bl -tag -width xxxxxxxxxxxxxxxxxxxx
-.It AUI/DIX
-Standard 15 pin connector
-.It 10Base2
-BNC, also known as thin-net
-.It 10BaseT
-10 Mbps UTP, also known as twisted pair
-.It MII
-UTP, switchable between 10 and 100 Mbps
-.El
+The following media types and options (as given to
+.Xr ifconfig 8 )
+are supported:
 .Pp
-Various models of the
-.Nm
-support different media types or connectors.
-Therefore, the default media type varies based on the model of card.
-The supported media types are as follows.
-.Bl -tag -width xxxxxxxxxxxxxxxxxxxxx
-.It media autoselect
-Attempt to autoselect the media type
-.It media 100baseTX mediaopt full-duplex
-Use 100baseTX, full duplex
-.It media 100baseTX Op mediaopt half-duplex
-Use 100baseTX, half duplex
-.It media 10baseT mediaopt full-duplex
-Use 10baseT, full duplex
-.It media 10baseT Op mediaopt half-duplex
-Use 10baseT (UTP), half duplex
-.It media 10base5 Op mediaopt half-duplex
-Use 10base5 (Thin-net), half duplex
-.It media 10base2 Op mediaopt half-duplex
-Use 10base2 (Thick-net), half duplex
+.Bl -tag -width xxx -offset indent
+.It Cm media No autoselect
+Enable autoselection of media type and options.
+.It Cm media No 100baseTX Cm mediaopt No full-duplex
+Set 100Mbps (fast Ethernet) operation and force full-duplex mode.
+.It Cm media No 100baseTX Cm mediaopt No half-duplex
+Set 100Mbps (fast Ethernet) operation and force half-duplex mode.
+.It Cm media No 10baseT Cm mediaopt No full-duplex
+Set 10baseT (UTP) operation and force full-duplex mode.
+.It Cm media No 10baseT Cm mediaopt No half-duplex
+Set 10baseT (UTP) operation and force half-duplex mode.
+.It Cm media No 10base5
+Set 10base5 (thick-net) operation (half-duplex only).
+.It Cm media No 10base2
+Set 10base2 (thin-net) operation (half-duplex only).
 .El
 .Pp
+Note that the 100baseTX media type is only available if supported by the
+adapter. For more information on configuring this device, see
+.Xr ifconfig 8 .
+To view a list of media types and options supported by your card try
+``ifconfig -m <device>''. For example, ``ifconfig -m ep0''.
 .Pp
-If there are multiple cards in the computer, they are searched for
+If more than one of the supported cards is installed, they are probed for
 in the following order:
-The PCI cards are found first based on PCI function# order.
-The EISA cards are found next based on EISA slot# order.
-Next, the 3c509 ISA cards are found based on in increasing ethernet
-address order.
-Then, the 3c509 ISA cards in Plug-and-Play mode will be probed
-for and matched in Plug-and-Play order.
-Finally, the PCMCIA cards are found based on PCMCIA controller
-slot# order.
-This is an example of how these will probe:
-.Pp
-ep0 at isa0 port 0x300-0x30f irq 3: 3Com 3C509 Ethernet: address 00:a0:24:29:a3:6b, utp (default utp)
-.Pp
-ep0 at pci0 dev 12 function 0 "3Com 3c905 100Base-TX" rev 0x00: address 00:60:97:dd:fc:eb, mii default mii/autoselect isa irq 9
 .Pp
-You may specify the port and irq numbers that the cards are expected
-to be found at, but it is not necessary.
-The cards are sufficiently intelligent to tell us where they
-actually live on the ISA bus.
-.Pp
-.Sh NOTES
-The 3c509 card has no jumpers to set the address.
-3Com supplies software to set the address of the card in software.
-To find the card on the ISA bus, the kernel performs a complex
-scan operation at IO address 0x100.
-Beware!
-Avoid placing other cards at that address!
-.Pp
-Some models of 3c5x9 have all three connectors on them.
-In the case of these cards; you must configure the transceiver type
-with the 3Com supplied DOS configuration disk before the link0/link1
-flags will operate correctly.
-.Pp
-Do not specify link flags for the 3c905.
-If you can not get this card to work, try running the 3Com supplied DOS
-configuration program (available from their web site) and tell it to
-autoselect the connector type.
+.Bl -item -offset indent -compact
+.It
+1.  PCI cards based on PCI function number order.
+.It
+2.  EISA cards based on EISA slot number order.
+.It
+3.  ISA cards based on increasing Ethernet address order.
+.It
+4.  Any ISA cards in Plug-and-Play mode, in Plug-and-Play order.
+.El
 .Pp
+You may specify the port and IRQ numbers where the cards are expected to
+be found, but it is not necessary. The cards are intelligent enough to
+let us know where they live on the bus.
 .Sh DIAGNOSTICS
-ep0: reset (status: %x)
-.in +4
-the driver has encountered a FIFO underrun or overrun. The driver will reset
+.Bl -diag
+.It ep0: reset (status: %x)
+The driver has encountered a FIFO underrun or overrun. The driver will reset
 the card and the packet will be lost. This is not fatal.
-.in -4
-ep0: eeprom failed to come ready
-.in +4
-The eeprom failed to come ready.  This probably means the card is wedged.
-.in -4
-ep0: 3c509 in test mode. Erase pencil mark!
-.in +4
+.It ep0: eeprom failed to come ready
+The EEPROM failed to come ready. This probably means the card is wedged.
+.It ep0: 3c509 in test mode. Erase pencil mark!
 This means that someone has scribbled with pencil in the test area on the
-card.  Erase the pencil mark and reboot.  (This is not a joke).
-.in -4
+card. Erase the pencil mark and reboot. (This is not a joke).
+.El
 .Sh SEE ALSO
+.Xr ec 4 ,
 .Xr eg 4 ,
 .Xr el 4 ,
 .Xr ie 4 ,
-.Xr intro 4 ,
-.Xr le 4 ,
-.Xr ne 4 ,
+.Xr ifmedia 4 ,
 .Xr xl 4 ,
 .Xr ifconfig 8
diff --git a/share/man/man4/man4.i386/eg.4 b/share/man/man4/man4.i386/eg.4
index 4424c81f347..18e9ae7f9a3 100644
--- a/share/man/man4/man4.i386/eg.4
+++ b/share/man/man4/man4.i386/eg.4
@@ -1,53 +1,82 @@
-.\"	$OpenBSD: eg.4,v 1.6 1999/05/16 19:57:03 alex Exp $
+.\"	$OpenBSD: eg.4,v 1.7 1999/05/26 02:34:13 aaron Exp $
+.\"     $NetBSD: ec.4,v 1.4 1998/08/09 00:39:02 thorpej Exp $
 .\"
-.\" Copyright (c) 1994 James A. Jegers
+.\" Copyright (c) 1997 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
+.\" This code is derived from software contributed to The NetBSD Foundation
+.\" by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
+.\" NASA Ames Research Center.
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    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.
-.\" IN NO EVENT SHALL THE AUTHOR 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.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"        This product includes software developed by the NetBSD
+.\"        Foundation, Inc. and its contributors.
+.\" 4. Neither the name of 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
+.\" 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)
+.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+.\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd July 10, 1995
+.Dd September 22, 1998
 .Dt EG 4 i386
 .Os
 .Sh NAME
 .Nm eg
-.Nd Ethernet driver for 3Com 3c505 (Etherlink Plus) Ethernet boards
+.Nd "3Com EtherLink Plus (3C505) Ethernet device driver"
 .Sh SYNOPSIS
 .Cd "eg0 at isa? port 0x310 irq 5"
 .Sh DESCRIPTION
 The
 .Nm
-interface provides access to a 10 Mb/s Ethernet network via the
-3Com 3c505 Ethernet board. 
-.Pp
-Other models of 3Com hardware are supported by the
-.Xr xl 4 ,
+device driver supports 3Com EtherLink Plus (3C505) Ethernet cards.
+Other models of 3Com network cards are supported by the
+.Xr ec 4 ,
+.Xr el 4 ,
 .Xr ep 4 ,
+.Xr ie 4 ,
 and
-.Xr ec 4
+.Xr xl 4
 drivers.
 .Pp
+For more information on configuring this device, see
+.Xr ifconfig 8 .
+To view a list of media types and options supported by your card try
+.Dq ifconfig -m <device> .
+For example,
+.Dq ifconfig -m eg0 .
+.Sh DIAGNOSTICS
+.Bl -diag
+.It "eg%d: device timeout"
+The device has stopped responding to the network, or there is a problem with
+the network connection (cable).
+.It "eg%d: invalid packet size %d; dropping"
+A packet of an invalid length (less than size of Ethernet header or greater
+than maximum size of Ethernet frame) was received and dropped.
+.El
 .Sh SEE ALSO
-.Xr ed 4 ,
+.Xr ec 4 ,
 .Xr el 4 ,
 .Xr ep 4 ,
 .Xr ie 4 ,
-.Xr intro 4 ,
-.Xr le 4 ,
-.Xr ifconfig 8 ,
+.Xr ifmedia 4 ,
+.Xr xl 4 ,
+.Xr ifconfig 8
diff --git a/share/man/man4/man4.i386/el.4 b/share/man/man4/man4.i386/el.4
index 9e9c6e80c68..1b268159ef8 100644
--- a/share/man/man4/man4.i386/el.4
+++ b/share/man/man4/man4.i386/el.4
@@ -1,45 +1,82 @@
-.\"	$OpenBSD: el.4,v 1.4 1999/05/16 19:57:03 alex Exp $
+.\"	$OpenBSD: el.4,v 1.5 1999/05/26 02:34:13 aaron Exp $
+.\"     $NetBSD: ec.4,v 1.4 1998/08/09 00:39:02 thorpej Exp $
 .\"
-.\" Copyright (c) 1994 James A. Jegers
+.\" Copyright (c) 1997 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
+.\" This code is derived from software contributed to The NetBSD Foundation
+.\" by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
+.\" NASA Ames Research Center.
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    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.
-.\" IN NO EVENT SHALL THE AUTHOR 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.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"        This product includes software developed by the NetBSD
+.\"        Foundation, Inc. and its contributors.
+.\" 4. Neither the name of 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
+.\" 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)
+.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+.\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd July 10, 1995
+.Dd September 22, 1998
 .Dt EL 4 i386
 .Os
 .Sh NAME
 .Nm el
-.Nd Ethernet driver for 3Com 3C501 (Etherlink) device driver
+.Nd "3Com EtherLink (3C501) Ethernet device driver"
 .Sh SYNOPSIS
 .Cd "el0 at isa? port 0x300 irq 9"
 .Sh DESCRIPTION
 The
 .Nm
-interface provides access to a 10 Mb/s Ethernet network via the
-3Com 3c501 Ethernet cards.
+device driver supports 3Com EtherLink (3C501) Ethernet cards.
+Other models of 3Com network cards are supported by the
+.Xr ec 4 ,
+.Xr eg 4 ,
+.Xr ep 4 ,
+.Xr ie 4 ,
+and
+.Xr xl 4
+drivers.
+.Pp
+For more information on configuring this device, see
+.Xr ifconfig 8 .
+To view a list of media types and options supported by your card try
+.Dq ifconfig -m <device> .
+For example,
+.Dq ifconfig -m el0 .
+.Sh DIAGNOSTICS
+.Bl -diag
+.It "el%d: device timeout"
+The device has stopped responding to the network, or there is a problem with
+the network connection (cable).
+.It "el%d: invalid packet size %d; dropping"
+A packet of an invalid length (less than size of Ethernet header or greater
+than maximum size of Ethernet frame) was received and dropped.
+.El
 .Sh SEE ALSO
-.Xr ed 4 ,
+.Xr ec 4 ,
 .Xr eg 4 ,
 .Xr ep 4 ,
 .Xr ie 4 ,
-.Xr intro 4 ,
-.Xr le 4 ,
-.Xr ifconfig 8 ,
+.Xr ifmedia 4 ,
+.Xr xl 4 ,
+.Xr ifconfig 8
diff --git a/share/man/man4/man4.i386/ie.4 b/share/man/man4/man4.i386/ie.4
index 3e3b51a5858..29eb4391d0b 100644
--- a/share/man/man4/man4.i386/ie.4
+++ b/share/man/man4/man4.i386/ie.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ie.4,v 1.3 1999/05/16 19:57:04 alex Exp $
+.\"	$OpenBSD: ie.4,v 1.4 1999/05/26 02:34:13 aaron Exp $
 .\"
 .\" Copyright (c) 1994 James A. Jegers
 .\" All rights reserved.
@@ -27,28 +27,42 @@
 .Os
 .Sh NAME
 .Nm ie 
-.Nd Ethernet driver for Intel 82586 Ethernet chip
+.Nd Intel 82586 chip Ethernet device driver
 .Sh SYNOPSIS
 .Cd "ie0 at isa? port 0x360 irq 7 iomem 0xd0000"
 .Sh DESCRIPTION
 The
 .Nm
-interface provides access to a 10 Mb/s Ethernet network via the
-Intel 82586 chips.  The Ethernet cards supported by the
-.Nm
-interface are:
+device driver supports Intel 82586-based Ethernet cards. This includes the
+following network adapters:
 .Pp
-.Bl -tag -width -offset indet -compact
+.Bl -tag -width -offset indent -compact
 .It AT&T StarLAN 10
 .It AT&T EN100
 .It AT&T StarLan Fiber
-.It 3Com 3c507
+.It 3Com 3C507
 .El
+.Pp
+Other models of 3Com network cards are supported by the
+.Xr ec 4 ,
+.Xr eg 4 ,
+.Xr el 4 ,
+.Xr ep 4 ,
+and
+.Xr xl 4
+drivers.
+.Pp
+For more information on configuring this device, see
+.Xr ifconfig 8 .
+To view a list of media types and options supported by your card try
+.Dq ifconfig -m <device> .
+For example,
+.Dq ifconfig -m ie0 .
 .Sh SEE ALSO
-.Xr ed 4 ,
+.Xr ec 4 ,
 .Xr eg 4 ,
 .Xr el 4 ,
 .Xr ep 4 ,
-.Xr intro 4 ,
-.Xr le 4 ,
-.Xr ifconfig 8 ,
+.Xr ifmedia 4 ,
+.Xr xl 4 ,
+.Xr ifconfig 8
diff --git a/share/man/man4/xl.4 b/share/man/man4/xl.4
index 50ec4b8e3ff..7f0730d52eb 100644
--- a/share/man/man4/xl.4
+++ b/share/man/man4/xl.4
@@ -1,7 +1,7 @@
-.\"	$OpenBSD: xl.4,v 1.8 1999/03/15 15:54:47 deraadt Exp $
+.\"	$OpenBSD: xl.4,v 1.9 1999/05/26 02:34:12 aaron Exp $
 .\"
 .\" Copyright (c) 1997, 1998
-.\"	Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
+.\"     Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -13,7 +13,7 @@
 .\"    documentation and/or other materials provided with the distribution.
 .\" 3. All advertising materials mentioning features or use of this software
 .\"    must display the following acknowledgement:
-.\"	This product includes software developed by Bill Paul.
+.\"     This product includes software developed by Bill Paul.
 .\" 4. Neither the name of the author nor the names of any co-contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"   without specific prior written permission.
@@ -30,101 +30,98 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$FreeBSD: xl.4,v 1.3 1998/12/05 09:36:15 rnordier Exp $
+.\"     $FreeBSD: xl.4,v 1.1 1998/08/16 17:19:58 wpaul Exp $
 .\"
 .Dd August 16, 1998
-.Dt XL 4
-.Os FreeBSD
+.Dt XL 4 i386
+.Os
 .Sh NAME
 .Nm xl
-.Nd
-3Com Etherlink XL and Fast Etherlink XL ethernet device driver
+.Nd "3Com EtherLink XL and Fast EtherLink XL Ethernet device driver"
 .Sh SYNOPSIS
 .Cd "xl* at pci? dev ? function ?"
 .Sh DESCRIPTION
 The
-.Nm
-driver provides support for PCI ethernet adapters and embedded
-controllers based on the 3Com "boomerang" and "cyclone" bus-master
-Etherlink XL chips. This includes the 3c900-TP, 3c900-COMBO,
-3c900B-TP, 3c900B-COMBO, 3c905-TX,
-3c905-T4, 3c905B-TP, 3c905B-FX, 3c905B-T4, 3c905B-TX, and embedded 3c905-TX
-and 3c905B-TX ethernet hardware in certain Dell Optiplex and Dell
-Precision desktop machines and in certain Dell Latitude laptop
-docking stations.
+.Nm xl
+device driver supports the 3Com EtherLink XL and Fast EtherLink XL family
+of Ethernet cards, and embedded controllers based on the 3Com
+.Dq boomerang
+and
+.Dq cyclone
+bus master EtherLink XL chips. This includes, among
+others, the following models:
 .Pp
-Other models of 3Com hardware are supported by the
-.Xr ep 4 ,
+.Bl -tag -width 3CXXXX -offset indent -compact
+.It 3C900
+EtherLink XL PCI
+.It 3C900B
+EtherLink XL PCI
+.It 3C905
+Fast EtherLink XL PCI
+.It 3C905B
+Fast EtherLink XL PCI
+.El
+.Pp
+It also supports embedded 3C905-TX and 3C905B-TX Ethernet hardware found
+in certain Dell OptiPlex and Dell Precision desktop machines, as well as
+some Dell Latitude laptop docking stations. Other models of 3Com network
+cards are supported by the
 .Xr ec 4 ,
+.Xr eg 4 ,
+.Xr el 4 ,
+.Xr ep 4 ,
 and
-.Xr eg 4
+.Xr ie 4
 drivers.
 .Pp
-The Etherlink XL chips support built-in 10baseT, 10base2 and 10base5
-transceivers as well as an MII bus for externally attached PHY
-transceivers. The 3c905 series typically uses a National Semiconductor
-NS 83840A 10/100 PHY for 10/100 Mbps support in full or half-duplex.
-The 3c905B adapters have built-in autonegotiation logic mapped onto
-the MII for compatibility with previous drivers. Fast Etherlink XL
-adapters such as the 3c905-TX and 3c905B-TX are capable of 10 or
-100Mbps data rates in either full or half duplex and can be manually
-configured for any supported mode or automatically negotiate the highest
-possible mode with a link partner.  The 3c905B-FX and other similar cards
-are capable of 100 Mbps over fiber.
+Category 3, 4 or 5 unshielded twisted-pair (UTP) cable should be used for
+RJ-45 (10baseT), thick Ethernet coaxial (RG59 B/U, 50 ohm) for AUI/DIX,
+and thin Ethernet coaxial (RG58 A/U or C/U, 50 ohm +/- 4) for BNC (10base2).
+Some 3Com NICs also support MII connectors (switchable 10/100Mbps UTP).
+The 3C905B-FX and other similar cards are capable of 100Mbps over fiber.
 .Pp
-The
-.Nm
-driver supports the following media types:
+The following media types and options (as given to
+.Xr ifconfig 8 )
+are supported:
 .Pp
-.Bl -tag -width xxxxxxxxxxxxxxxxxxxx
-.It autoselect
-Enable autoselection of the media type and options. Note that this
-option is only available with the 3c905 and 3c905B adapters with
-external PHYs or built-in autonegotiation logic. For 3c900 adapters,
-the driver will choose the mode specified in the EEPROM. The user can
-change this by adding media options to the appropriate
+.Bl -tag -width xxx -offset indent
+.It Cm media No autoselect
+Enable autoselection of media type and options. Note that this media type is
+only available with the 3C905 and 3C905B adapters with external PHYs or
+built-in autonegotiation logic. For 3C900 and 3C900B adapters, the driver
+will choose the mode specified in the EEPROM. You can change this by adding
+media options to the appropriate
 .Pa /etc/hostname.xlX
 file.
-.It 10baseT/UTP
-Set 10Mbps operation. The
-.Ar mediaopt
-option can also be used to select either
-.Ar full-duplex
-or
-.Ar half-duplex modes.
-.It 100baseTX
-Set 100Mbps (fast ethernet) operation. The
-.Ar mediaopt
-option can also be used to select either
-.Ar full-duplex
-or
-.Ar half-duplex modes.
-.It 100baseFX
-For those cards that support it, set 100 Mbps operation over fiber.
-.It 10base5/AUI
-Enable AUI transceiver (available only on COMBO cards).
-.It 10base2/BNC
-Enable BNC coax transceiver (available only on COMBO cards).
-.El
-.Pp
-The
-.Nm
-driver supports the following media options:
-.Pp
-.Bl -tag -width xxxxxxxxxxxxxxxxxxxx
-.It full-duplex
-Force full duplex operation
-.It half-duplex
-Force half duplex operation.
+.It Cm media No 100baseFX Cm mediaopt No full-duplex
+For those cards that support it, force full-duplex 100Mbps operation over fiber.
+.It Cm media No 100baseFX Cm mediaopt No half-duplex
+For those cards that support it, force half-duplex 100Mbps operation over fiber.
+.It Cm media No 100baseTX Cm mediaopt No full-duplex
+Set 100Mbps (Fast Ethernet) operation and force full-duplex mode.
+.It Cm media No 100baseTX Cm mediaopt No half-duplex
+Set 100Mbps (Fast Ethernet) operation and force half-duplex mode.
+.It Cm media No 10baseT Cm mediaopt No full-duplex
+Set 10baseT (UTP) operation and force full-duplex mode.
+.It Cm media No 10baseT Cm mediaopt No half-duplex
+Set 10baseT (UTP) operation and force half-duplex mode.
+.It Cm media No 10base5
+Set 10base5 (thick-net) operation (half-duplex only).
+.It Cm media No 10base2
+Set 10base2 (thin-net) operation (half-duplex only).
 .El
 .Pp
-Note that the 100baseTX media type is only available if supported
-by the adapter.
-For more information on configuring this device, see
+Note that the 100baseTX media type is only available if supported by the
+adapter. For more information on configuring this device, see
 .Xr ifconfig 8 .
+To view a list of media types and options supported by your card try
+.Dq ifconfig -m <device> .
+For example,
+.Dq ifconfig -m xl0 .
+.Pp
 .Sh DIAGNOSTICS
 .Bl -diag
-.It "xl%d: couldn't map memory"
+.It "xl%d: couldn't map memory" 
 A fatal initialization error has occurred.
 .It "xl%d: couldn't map interrupt"
 A fatal initialization error has occurred.
@@ -134,23 +131,23 @@ the network connection (cable).
 .It "xl%d: no memory for rx list"
 The driver failed to allocate an mbuf for the receiver ring.
 .It "xl%d: no memory for tx list"
-The driver failed to allocate an mbuf for the transmitter ring when
+The driver fauled to allocate an mbuf for the transmitter ring when
 allocating a pad buffer or collapsing an mbuf chain into a cluster.
 .It "xl%d: command never completed!"
-Some commands issued to the 3c90x ASIC take time to complete: the
-driver is supposed to wait until the 'command in progress' bit in
+Some commands issued to the 3C90x ASIC take time to complete: the
+driver is supposed to wait until the ``command in progress'' bit in
 the status register clears before continuing. In rare instances, this
 bit may not clear. To avoid getting caught in an infinite wait loop,
-the driver only polls the bit for a finite number of times before
+the driver only polls the bit a finite number of times before
 giving up, at which point it issues this message. This message may
 be printed during driver initialization on slower machines. If you
 see this message but the driver continues to function normally, the
 message can probably be ignored.
 .It "xl%d: chip is in D3 power state -- setting to D0"
-This message applies only to 3c905B adapters, which support power
-management. Some operating systems place the 3c905B in low power
-mode when shutting down, and some PCI BIOSes fail to bring the chip
-out of this state before configuring it. The 3c905B loses all of
+This message applies only to 3C905B adapters, which support power
+management. Some operating systems place the 3C905B in low power
+mode when shutting down, and some PCI BIOSs fail to bring the chip
+out of this state before configuring it. The 3C905B 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
@@ -166,29 +163,33 @@ operating system. If you power down your system prior to booting
 the card should be configured correctly.
 .It "xl%d: WARNING: no media options bits set in the media options register!"
 This warning may appear when using the driver on some Dell Latitude
-docking stations with built-in 3c905-TX adapters. For whatever the
-reason, the 'MII available' bit in the media options register on
+docking stations with built-in 3C905-TX adapters. For whatever the
+reason, the ``MII available'' bit in the media options register on
 this particular equipment is not set, even though it should be (the
-3c905-TX always uses an external PHY transceiver). The driver will
+3C905-TX always uses an external PHY transceiver). The driver will
 attempt to guess the proper media type based on the PCI device ID
 word. The driver makes a lot of noise about this condition because
 the author considers it a manufacturing defect.
 .El
 .Sh SEE ALSO
-.Xr arp 4 ,
-.Xr netintro 4 , 
+.Xr ec 4 ,
+.Xr eg 4 ,
+.Xr el 4 ,
+.Xr ep 4 ,
+.Xr ie 4 ,
+.Xr ifmedia 4 ,
 .Xr ifconfig 8
 .Sh HISTORY
-The
+The 
 .Nm
 device driver first appeared in
 .Fx 3.0 ,
-and
+and 
 .Ox
 support was added in
 .Ox 2.4 .
 .Sh AUTHOR
-The
+The 
 .Nm
 driver was written by
 .An Bill Paul Aq wpaul@ctr.columbia.edu .