better fxp man page

1 files changed, 57 insertions, 51 deletions

diff --git a/share/man/man4/fxp.4 b/share/man/man4/fxp.4
index a936ea92da0..ff51adaefed 100644
--- a/share/man/man4/fxp.4
+++ b/share/man/man4/fxp.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fxp.4,v 1.9 1999/07/03 02:11:12 aaron Exp $
+.\"	$OpenBSD: fxp.4,v 1.10 1999/07/08 17:43:52 aaron Exp $
 .\"
 .\" Copyright (c) 1997 David E. O'Brien
 .\"
@@ -30,67 +30,68 @@
 .Sh NAME
 .Nm fxp
 .Nd
-Intel EtherExpress Pro/100B ethernet device driver
+Intel EtherExpress PRO/100 Ethernet device driver
 .Sh SYNOPSIS
 .Cd "fxp* at pci?"
 .Sh DESCRIPTION
 The
 .Nm
-driver provides support for the EtherExpress Pro/10 and Pro/100B PCI Fast Ethernet
-adapters based on the Intel i82557 and i82558 ethernet chip.
-<<<<<<< fxp.4
+device driver supports the Intel EtherExpress 100 family of Ethernet cards
+based on the i82557, i82558, and i82559 chipsets. These come in several
+different varieties, including dual-port cards, and as built-in Ethernet
+solutions on certain motherboards. This includes, among others, the following
+models:
 .Pp
-.\" The
-.\" .Nm
-.\" driver supports the following media types:
-.\" .Pp
-.\" .Bl -tag -width xxxxxxxxxxxxxxxxxxxx
-.\" .It autoselect
-.\" Enable autoselection of the media type and options
-.\" .It 10baseT/UTP
-.\" Set 10Mbps operation
-.\" .It 100baseTX
-.\" Set 100Mbps (fast ethernet) operation
-.\" .El
-.\" .Pp
-.\" The
-.\" .Nm
-.\" driver supports the following media options:
-.\" .Pp
-.\" .Bl -tag -width xxxxxxxxxxxxxxxxxxxx
-.\" .It full-duplex
-.\" Set full duplex operation
-.\" .El
-.\" .Pp
-.\" Note that 100baseTX media type is only available on the Pro/100B. For further information
-.\" on configuring this device, see
-.\" .Xr ifconfig 8 .
+.Bl -item -offset indent -compact
+.It
+Intel EtherExpress PRO/100
+.It
+Intel EtherExpress PRO/100B
+.It
+Intel EtherExpress PRO/100+
+.It
+Intel EtherExpress PRO/100 Dual-Port
+.El
 .Pp
-Media types and options are set by specifying link flags to
-.Xr ifconfig 8 .
-If none are specified, the ethernet card will perform auto-negotiation of
-link speed and options.
-=======
-The
+Other models of Intel network cards are supported by the
+.Xr ie 4
+and
+.Xr iy 4
+drivers.
+This list is not exhaustive. In particular, the
 .Nm
-driver supports the following media types:
->>>>>>> 1.6
+driver should support any card by any manufacturer which is based on one of the
+aforementioned chipsets.
+.Pp
+The following media types and options (as given to
+.Xr ifconfig 8 )
+are supported:
 .Pp
-.Bl -tag -width xxxxxxxx
-.It media autoselect
-Enable autoselection of the media type and options (default)
-.It media 10baseT Op mediaopt half-duplex
-Set 10Mbps operation, half-duplex
-.It media 10baseT Op mediaopt full-duplex
-Set 10Mbps operation, full-duplex
-.It media 100baseTX Op mediaopt half-duplex
-Set 100Mbps operation, half duplex
-.It media 100baseTX Op mediaopt full-duplex
-Set 100Mbps operation, full duplex
+.Bl -tag -width xxx -offset indent
+.It Cm media No autoselect
+Enable autoselection of the media type and options (default).
+.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 10Mbps operation and force full-duplex.
+.It Cm media No 10baseT Cm mediaopt No half-duplex
+Set 10Mbps operation and force half-duplex.
 .El
 .Pp
-Note that 100baseTX media type is only available on the Pro/100B and i82558
-cards.
+If no media options are present, the
+.Nm
+driver places the card into autoselect mode. Also, note that the 100baseTX 
+media type is only available on the PRO/100B and cards based on the i82558
+chipset.
+.Pp
+These cards also come with a variety of PHYs. Models exist with PHYs supported
+by both the
+.Xr inphy 4
+and
+.Xr nsphy 4
+drivers.
 .Sh DIAGNOSTICS
 .Bl -diag
 .It "fxp%d: couldn't map memory"
@@ -105,8 +106,13 @@ the network connection (cable).
 .El
 .Sh SEE ALSO
 .Xr arp 4 ,
+.Xr ie 4 ,
+.Xr ifmedia 4 ,
+.Xr inphy 4 ,
+.Xr iy 4 ,
 .Xr intro 4 , 
 .Xr netintro 4 , 
+.Xr nsphy 4 ,
 .Xr ifconfig 8
 .Sh HISTORY
 The