remove the CONFIGURATION section from the wireless pages:

the addition of the wpa options have shown just how unwieldy it had
become, it's already in ifconfig(8) anyway, and "ifconfig -m" will
get the relevant ones.

ok dlg jsg

22 files changed, 88 insertions, 2652 deletions

diff --git a/share/man/man4/acx.4 b/share/man/man4/acx.4
index bb14529c3fd..6ae0b791d13 100644
--- a/share/man/man4/acx.4
+++ b/share/man/man4/acx.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: acx.4,v 1.30 2007/12/10 10:32:54 jmc Exp $
+.\"	$OpenBSD: acx.4,v 1.31 2008/04/17 14:01:22 jmc Exp $
 .\"
 .\" Copyright (c) 2006 Theo de Raadt.
 .\" Copyright (c) 2006 The DragonFly Project.  All rights reserved.
@@ -30,7 +30,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: December 10 2007 $
+.Dd $Mdocdate: April 17 2008 $
 .Os
 .Dt ACX 4
 .Sh NAME
@@ -93,169 +93,13 @@ WEP is not enabled by default.
 .Pp
 The transmit speed is user-selectable or can be adapted automatically by the
 driver depending on the number of hardware transmission retries.
-.Sh CONFIGURATION
+.Pp
 The
 .Nm
 driver can be configured at runtime with
 .Xr ifconfig 8
 or on boot with
-.Xr hostname.if 5
-using the following parameters:
-.Bl -tag -width Ds
-.It Cm bssid Ar bssid
-Set the desired BSSID.
-.It Fl bssid
-Unset the desired BSSID.
-The interface will automatically select a BSSID in this mode, which is
-the default.
-.It Cm chan Ar n
-Set the channel (radio frequency) to be used by the driver based on
-the given channel ID
-.Ar n .
-.It Fl chan
-Unset the desired channel to be used by the driver.
-The driver will automatically select a channel in this mode, which is
-the default.
-.It Cm media Ar media
-The
-.Nm
-driver supports the following
-.Ar media
-types:
-.Pp
-.Bl -tag -width autoselect -compact
-.It Cm autoselect
-Enable autoselection of the media type and options.
-.It Cm DS1
-Set 802.11b DS 1Mbps operation.
-.It Cm DS2
-Set 802.11b DS 2Mbps operation.
-.It Cm DS5
-Set 802.11b DS 5.5Mbps operation.
-.It Cm DS11
-Set 802.11b DS 11Mbps operation.
-.It Cm OFDM6
-Set 802.11a/g OFDM 6Mbps operation.
-.It Cm OFDM9
-Set 802.11a/g OFDM 9Mbps operation.
-.It Cm OFDM12
-Set 802.11a/g OFDM 12Mbps operation.
-.It Cm OFDM18
-Set 802.11a/g OFDM 18Mbps operation.
-.It Cm OFDM24
-Set 802.11a/g OFDM 24Mbps operation.
-.It Cm OFDM36
-Set 802.11a/g OFDM 36Mbps operation.
-.It Cm OFDM48
-Set 802.11a/g OFDM 48Mbps operation.
-.It Cm OFDM54
-Set 802.11a/g OFDM 54Mbps operation.
-.El
-.It Cm mediaopt Ar opts
-The
-.Nm
-driver supports the following media options:
-.Pp
-.Bl -tag -width monitor -compact
-.It Cm hostap
-Select Host AP operation.
-.It Cm ibss
-Select IBSS operation.
-.It Cm monitor
-Select monitor mode.
-.El
-.It Fl mediaopt Ar opts
-Disable the specified media options on the driver and return it to the
-default mode of operation (BSS).
-.It Cm mode Ar mode
-The
-.Nm
-driver supports the following modes:
-.Pp
-.Bl -tag -width 11b -compact
-.It Cm 11a
-Force 802.11a operation.
-.It Cm 11b
-Force 802.11b operation.
-.It Cm 11g
-Force 802.11g operation.
-.El
-.It Cm nwflag Ar flag
-Set a specified flag for the wireless network interface.
-The flag name can be either
-.Ql hidenwid
-or
-.Ql nobridge .
-The
-.Ql hidenwid
-flag will hide the network ID (ESSID) in beacon frames when operating
-in Host AP mode.
-It will also prevent responses to probe requests with an unspecified
-network ID.
-The
-.Ql nobridge
-flag will disable the direct bridging of frames between associated
-nodes when operating in Host AP mode.
-Setting this flag will block and filter direct inter-station
-communications.
-.Pp
-Note that the
-.Ql hidenwid
-and
-.Ql nobridge
-options do not provide any security.
-The hidden network ID will be sent in clear text by associating
-stations and can be easily discovered with tools like
-.Xr tcpdump 8
-and
-.Xr hostapd 8 .
-.It Fl nwflag Ar flag
-Remove a specified flag for the wireless network interface.
-.It Cm nwid Ar id
-Set the network ID.
-The
-.Ar id
-can either be any text string up to 32 characters in length,
-or a series of hexadecimal digits up to 64 digits.
-An empty
-.Ar id
-string allows the interface to connect to any available access points.
-By default the
-.Nm
-driver uses an empty string.
-Note that network ID is synonymous with Extended Service Set ID (ESSID).
-.It Fl nwid
-Set the network ID to the empty string to allow the interface to connect
-to any available access point.
-.It Cm nwkey Ar key
-Enable WEP encryption using the specified
-.Ar key .
-The
-.Ar key
-can either be a string, a series of hexadecimal digits (preceded by
-.Sq 0x ) ,
-or a set of keys of the form
-.Dq n:k1,k2,k3,k4 ,
-where
-.Sq n
-specifies which of the keys will be used for transmitted packets,
-and the four keys,
-.Dq k1
-through
-.Dq k4 ,
-are configured as WEP keys.
-If a set of keys is specified, a comma
-.Pq Sq \&,
-within the key must be escaped with a backslash.
-Note that if multiple keys are used, their order must be the same within
-the network.
-.Nm
-is capable of using both 40-bit (5 characters or 10 hexadecimal digits)
-or 104-bit (13 characters or 26 hexadecimal digits) keys.
-.It Fl nwkey
-Disable WEP encryption.
-This is the default mode of operation.
-.El
+.Xr hostname.if 5 .
 .Sh FILES
 The driver needs a set of firmware files which are loaded when
 an interface is brought up:
diff --git a/share/man/man4/an.4 b/share/man/man4/an.4
index ff8032420ad..401667cf19f 100644
--- a/share/man/man4/an.4
+++ b/share/man/man4/an.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: an.4,v 1.34 2007/05/31 19:19:49 jmc Exp $
+.\"	$OpenBSD: an.4,v 1.35 2008/04/17 14:01:22 jmc Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 1999
 .\"	Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\" $FreeBSD: src/share/man/man4/an.4,v 1.5 2000/03/02 14:53:45 sheldonh Exp $
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: April 17 2008 $
 .Dt AN 4
 .Os
 .Sh NAME
@@ -115,109 +115,13 @@ Unfortunately, due to serious weaknesses in WEP protocol
 it is strongly recommended that it not be used as the
 sole mechanism to secure wireless communication.
 WEP is not enabled by default.
-.Sh CONFIGURATION
+.Pp
 The
 .Nm
 driver can be configured at runtime with
 .Xr ifconfig 8
 or on boot with
-.Xr hostname.if 5
-using the following parameters:
-.Bl -tag -width Ds
-.It Cm bssid Ar bssid
-Set the desired BSSID.
-.It Fl bssid
-Unset the desired BSSID.
-The interface will automatically select a BSSID in this mode, which is
-the default.
-.It Cm chan Ar n
-Set the channel (radio frequency) to be used by the driver based on
-the given channel ID
-.Ar n .
-.It Fl chan
-Unset the desired channel to be used by the driver.
-The driver will automatically select a channel in this mode, which is
-the default.
-.It Cm media Ar media
-The
-.Nm
-driver supports the following
-.Ar media
-types:
-.Pp
-.Bl -tag -width autoselect -compact
-.It Cm autoselect
-Enable autoselection of the media type and options.
-.It Cm DS1
-Set 802.11b DS 1Mbps operation.
-.It Cm DS2
-Set 802.11b DS 2Mbps operation.
-.It Cm DS5
-Set 802.11b DS 5.5Mbps operation.
-.It Cm DS11
-Set 802.11b DS 11Mbps operation.
-.El
-.It Cm mediaopt Ar opts
-The
-.Nm
-driver supports the following media options:
-.Pp
-.Bl -tag -width monitor -compact
-.It Cm ibss
-Select IBSS operation.
-.It Cm monitor
-Select monitor mode.
-.El
-.It Fl mediaopt Ar opts
-Disable the specified media options on the driver and return it to the
-default mode of operation (BSS).
-.It Cm nwid Ar id
-Set the network ID.
-The
-.Ar id
-can either be any text string up to 32 characters in length,
-or a series of hexadecimal digits up to 64 digits.
-An empty
-.Ar id
-string allows the interface to connect to any available access points.
-By default the
-.Nm
-driver uses an empty string.
-Note that network ID is synonymous with Extended Service Set ID (ESSID).
-.It Fl nwid
-Set the network ID to the empty string to allow the interface to connect
-to any available access point.
-.It Cm nwkey Ar key
-Enable WEP encryption using the specified
-.Ar key .
-The
-.Ar key
-can either be a string, a series of hexadecimal digits (preceded by
-.Sq 0x ) ,
-or a set of keys of the form
-.Dq n:k1,k2,k3,k4 ,
-where
-.Sq n
-specifies which of the keys will be used for transmitted packets,
-and the four keys,
-.Dq k1
-through
-.Dq k4 ,
-are configured as WEP keys.
-If a set of keys is specified, a comma
-.Pq Sq \&,
-within the key must be escaped with a backslash.
-Note that if multiple keys are used, their order must be the same within
-the network.
-.Nm
-is capable of using both 40-bit (5 characters or 10 hexadecimal digits)
-or 104-bit (13 characters or 26 hexadecimal digits) keys.
-.It Fl nwkey
-Disable WEP encryption.
-This is the default mode of operation.
-.It Cm nwkey persist
-Enable WEP encryption with the persistent key stored in the network card.
-.El
+.Xr hostname.if 5 .
 .Sh EXAMPLES
 The following
 .Xr hostname.if 5
diff --git a/share/man/man4/ath.4 b/share/man/man4/ath.4
index 2719062cbff..03888b6608b 100644
--- a/share/man/man4/ath.4
+++ b/share/man/man4/ath.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ath.4,v 1.39 2007/12/10 10:32:54 jmc Exp $
+.\"	$OpenBSD: ath.4,v 1.40 2008/04/17 14:01:22 jmc Exp $
 .\"     $NetBSD: ath.4,v 1.5 2004/07/03 16:58:18 mycroft Exp $
 .\"
 .\" Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting
@@ -42,7 +42,7 @@
 .\" $FreeBSD: /repoman/r/ncvs/src/share/man/man4/ath.4,v 1.16 2004/02/18 08:30:08 maxim Exp $
 .\" parts from $FreeBSD: /repoman/r/ncvs/src/share/man/man4/ath_hal.4,v 1.7 2004/01/07 20:49:51 blackend Exp $
 .\"
-.Dd $Mdocdate: December 10 2007 $
+.Dd $Mdocdate: April 17 2008 $
 .Dt ATH 4
 .Os
 .Sh NAME
@@ -134,185 +134,13 @@ WEP is not enabled by default.
 .Pp
 AR5211 and AR5212 support the AES, TKIP, and Michael cryptographic
 operations required for WPA but at this time the driver does not support them.
-.Sh CONFIGURATION
+.Pp
 The
 .Nm
 driver can be configured at runtime with
 .Xr ifconfig 8
 or on boot with
-.Xr hostname.if 5
-using the following parameters:
-.Bl -tag -width Ds
-.It Cm bssid Ar bssid
-Set the desired BSSID.
-.It Fl bssid
-Unset the desired BSSID.
-The interface will automatically select a BSSID in this mode, which is
-the default.
-.It Cm chan Ar n
-Set the channel (radio frequency) to be used by the driver based on
-the given channel ID
-.Ar n .
-.It Fl chan
-Unset the desired channel to be used by the driver.
-The driver will automatically select a channel in this mode, which is
-the default.
-.It Cm media Ar media
-The
-.Nm
-driver supports the following
-.Ar media
-types:
-.Pp
-.Bl -tag -width autoselect -compact
-.It Cm autoselect
-Enable autoselection of the media type and options.
-.It Cm DS1
-Set 802.11b DS 1Mbps operation.
-.It Cm DS2
-Set 802.11b DS 2Mbps operation.
-.It Cm DS5
-Set 802.11b DS 5.5Mbps operation.
-.It Cm DS11
-Set 802.11b DS 11Mbps operation.
-.It Cm OFDM6
-Set 802.11a/g OFDM 6Mbps operation.
-.It Cm OFDM9
-Set 802.11a/g OFDM 9Mbps operation.
-.It Cm OFDM12
-Set 802.11a/g OFDM 12Mbps operation.
-.It Cm OFDM18
-Set 802.11a/g OFDM 18Mbps operation.
-.It Cm OFDM24
-Set 802.11a/g OFDM 24Mbps operation.
-.It Cm OFDM36
-Set 802.11a/g OFDM 36Mbps operation.
-.It Cm OFDM48
-Set 802.11a/g OFDM 48Mbps operation.
-.It Cm OFDM54
-Set 802.11a/g OFDM 54Mbps operation.
-.El
-.It Cm mediaopt Ar opts
-The
-.Nm
-driver supports the following media options:
-.Pp
-.Bl -tag -width monitor -compact
-.It Cm hostap
-Select Host AP operation.
-.It Cm ibss
-Select IBSS operation.
-.It Cm monitor
-Select monitor mode.
-.It Cm turbo
-Select turbo mode.
-.El
-.It Fl mediaopt Ar opts
-Disable the specified media options on the driver and return it to the
-default mode of operation (BSS).
-.It Cm mode Ar mode
-The
-.Nm
-driver supports the following modes:
-.Pp
-.Bl -tag -width 11b -compact
-.It Cm 11a
-Force 802.11a operation.
-.It Cm 11b
-Force 802.11b operation.
-.It Cm 11g
-Force 802.11g operation.
-.El
-.It Cm nwflag Ar flag
-Set a specified flag for the wireless network interface.
-The flag name can be either
-.Ql hidenwid
-or
-.Ql nobridge .
-The
-.Ql hidenwid
-flag will hide the network ID (ESSID) in beacon frames when operating
-in Host AP mode.
-It will also prevent responses to probe requests with an unspecified
-network ID.
-The
-.Ql nobridge
-flag will disable the direct bridging of frames between associated
-nodes when operating in Host AP mode.
-Setting this flag will block and filter direct inter-station
-communications.
-.Pp
-Note that the
-.Ql hidenwid
-and
-.Ql nobridge
-options do not provide any security.
-The hidden network ID will be sent in clear text by associating
-stations and can be easily discovered with tools like
-.Xr tcpdump 8
-and
-.Xr hostapd 8 .
-.It Fl nwflag Ar flag
-Remove a specified flag for the wireless network interface.
-.It Cm nwid Ar id
-Set the network ID.
-The
-.Ar id
-can either be any text string up to 32 characters in length,
-or a series of hexadecimal digits up to 64 digits.
-An empty
-.Ar id
-string allows the interface to connect to any available access points.
-By default the
-.Nm
-driver uses an empty string.
-Note that network ID is synonymous with Extended Service Set ID (ESSID).
-.It Fl nwid
-Set the network ID to the empty string to allow the interface to connect
-to any available access point.
-.It Cm nwkey Ar key
-Enable WEP encryption using the specified
-.Ar key .
-The
-.Ar key
-can either be a string, a series of hexadecimal digits (preceded by
-.Sq 0x ) ,
-or a set of keys of the form
-.Dq n:k1,k2,k3,k4 ,
-where
-.Sq n
-specifies which of the keys will be used for transmitted packets,
-and the four keys,
-.Dq k1
-through
-.Dq k4 ,
-are configured as WEP keys.
-If a set of keys is specified, a comma
-.Pq Sq \&,
-within the key must be escaped with a backslash.
-Note that if multiple keys are used, their order must be the same within
-the network.
-.Nm
-is capable of using both 40-bit (5 characters or 10 hexadecimal digits)
-or 104-bit (13 characters or 26 hexadecimal digits) keys.
-.It Fl nwkey
-Disable WEP encryption.
-This is the default mode of operation.
-.It Cm nwkey persist
-Enable WEP encryption with the persistent key stored in the network card.
-.It Cm nwkey persist : Ns Ar key
-Write
-.Ar key
-to the persistent memory of the network card,
-and enable WEP encryption using that key.
-.It Cm powersave
-Enable power saving mode.
-.It Fl powersave
-Disable power saving mode.
-This is the default mode of operation.
-.It Cm powersavesleep Ar duration
-Set the receiver sleep duration (in milliseconds) for power saving mode.
-.El
+.Xr hostname.if 5 .
 .Sh HARDWARE
 Devices supported by the
 .Nm
diff --git a/share/man/man4/atu.4 b/share/man/man4/atu.4
index 852761a44e3..1a8d5b64e95 100644
--- a/share/man/man4/atu.4
+++ b/share/man/man4/atu.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: atu.4,v 1.32 2007/08/05 06:20:39 jmc Exp $
+.\" $OpenBSD: atu.4,v 1.33 2008/04/17 14:01:22 jmc Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 1999
 .\" Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -30,7 +30,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 5 2007 $
+.Dd $Mdocdate: April 17 2008 $
 .Dt ATU 4
 .Os
 .Sh NAME
@@ -81,104 +81,13 @@ Unfortunately, due to serious weaknesses in WEP protocol
 it is strongly recommended that it not be used as the
 sole mechanism to secure wireless communication.
 WEP is not enabled by default.
-.Sh CONFIGURATION
+.Pp
 The
 .Nm
 driver can be configured at runtime with
 .Xr ifconfig 8
 or on boot with
-.Xr hostname.if 5
-using the following parameters:
-.Bl -tag -width Ds
-.It Cm bssid Ar bssid
-Set the desired BSSID.
-.It Fl bssid
-Unset the desired BSSID.
-The interface will automatically select a BSSID in this mode, which is
-the default.
-.It Cm chan Ar n
-Set the channel (radio frequency) to be used by the driver based on
-the given channel ID
-.Ar n .
-.It Fl chan
-Unset the desired channel to be used by the driver.
-The driver will automatically select a channel in this mode, which is
-the default.
-.It Cm media Ar media
-The
-.Nm
-driver supports the following
-.Ar media
-types:
-.Pp
-.Bl -tag -width autoselect -compact
-.It Cm autoselect
-Enable autoselection of the media type and options.
-.It Cm DS1
-Set 802.11b DS 1Mbps operation.
-.It Cm DS2
-Set 802.11b DS 2Mbps operation.
-.It Cm DS5
-Set 802.11b DS 5.5Mbps operation.
-.It Cm DS11
-Set 802.11b DS 11Mbps operation.
-.El
-.It Cm mediaopt Ar opts
-The
-.Nm
-driver supports the following media options:
-.Bl -tag -width ibss
-.It Cm ibss
-Select Independent Basic Service Set (IBSS) operation.
-.El
-.It Fl mediaopt Ar opts
-Disable the specified media options on the driver and return it to the
-default mode of operation (BSS).
-.It Cm nwid Ar id
-Set the network ID.
-The
-.Ar id
-can either be any text string up to 32 characters in length,
-or a series of hexadecimal digits up to 64 digits.
-An empty
-.Ar id
-string allows the interface to connect to any available access points.
-By default the
-.Nm
-driver uses an empty string.
-Note that network ID is synonymous with Extended Service Set ID (ESSID).
-.It Fl nwid
-Set the network ID to the empty string to allow the interface to connect
-to any available access point.
-.It Cm nwkey Ar key
-Enable WEP encryption using the specified
-.Ar key .
-The
-.Ar key
-can either be a string, a series of hexadecimal digits (preceded by
-.Sq 0x ) ,
-or a set of keys of the form
-.Dq n:k1,k2,k3,k4 ,
-where
-.Sq n
-specifies which of the keys will be used for transmitted packets,
-and the four keys,
-.Dq k1
-through
-.Dq k4 ,
-are configured as WEP keys.
-If a set of keys is specified, a comma
-.Pq Sq \&,
-within the key must be escaped with a backslash.
-Note that if multiple keys are used, their order must be the same within
-the network.
-.Nm
-is capable of using both 40-bit (5 characters or 10 hexadecimal digits)
-or 104-bit (13 characters or 26 hexadecimal digits) keys.
-.It Fl nwkey
-Disable WEP encryption.
-This is the default mode of operation.
-.El
+.Xr hostname.if 5 .
 .Sh HARDWARE
 The following devices are known to be supported by the
 .Nm
diff --git a/share/man/man4/atw.4 b/share/man/man4/atw.4
index 2a09e018a63..257209df487 100644
--- a/share/man/man4/atw.4
+++ b/share/man/man4/atw.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: atw.4,v 1.25 2007/05/31 19:19:49 jmc Exp $
+.\"     $OpenBSD: atw.4,v 1.26 2008/04/17 14:01:22 jmc Exp $
 .\"	$NetBSD: atw.4,v 1.8 2004/06/06 04:05:49 wiz Exp $
 .\"
 .\" Copyright (c) 2003
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: April 17 2008 $
 .Dt ATW 4
 .Os
 .Sh NAME
@@ -101,112 +101,13 @@ Unfortunately, due to serious weaknesses in WEP protocol
 it is strongly recommended that it not be used as the
 sole mechanism to secure wireless communication.
 WEP is not enabled by default.
-.Sh CONFIGURATION
+.Pp
 The
 .Nm
 driver can be configured at runtime with
 .Xr ifconfig 8
 or on boot with
-.Xr hostname.if 5
-using the following parameters:
-.Bl -tag -width Ds
-.It Cm bssid Ar bssid
-Set the desired BSSID.
-.It Fl bssid
-Unset the desired BSSID.
-The interface will automatically select a BSSID in this mode, which is
-the default.
-.It Cm chan Ar n
-Set the channel (radio frequency) to be used by the driver based on
-the given channel ID
-.Ar n .
-.It Fl chan
-Unset the desired channel to be used by the driver.
-The driver will automatically select a channel in this mode, which is
-the default.
-.It Cm media Ar media
-The
-.Nm
-driver supports the following
-.Ar media
-types:
-.Pp
-.Bl -tag -width autoselect -compact
-.It Cm autoselect
-Enable autoselection of the media type and options.
-.It Cm DS1
-Set 802.11b DS 1Mbps operation.
-.It Cm DS2
-Set 802.11b DS 2Mbps operation.
-.It Cm DS5
-Set 802.11b DS 5.5Mbps operation.
-.It Cm DS11
-Set 802.11b DS 11Mbps operation.
-.El
-.It Cm mediaopt Ar opts
-The
-.Nm
-driver supports the following media options:
-.Pp
-.Bl -tag -width monitor -compact
-.It Cm ibss
-Select IBSS operation.
-.El
-.It Fl mediaopt Ar opts
-Disable the specified media options on the driver and return it to the
-default mode of operation (BSS).
-.It Cm nwid Ar id
-Set the network ID.
-The
-.Ar id
-can either be any text string up to 32 characters in length,
-or a series of hexadecimal digits up to 64 digits.
-An empty
-.Ar id
-string allows the interface to connect to any available access points.
-By default the
-.Nm
-driver uses an empty string.
-Note that network ID is synonymous with Extended Service Set ID (ESSID).
-.It Fl nwid
-Set the network ID to the empty string to allow the interface to connect
-to any available access point.
-.It Cm nwkey Ar key
-Enable WEP encryption using the specified
-.Ar key .
-The
-.Ar key
-can either be a string, a series of hexadecimal digits (preceded by
-.Sq 0x ) ,
-or a set of keys of the form
-.Dq n:k1,k2,k3,k4 ,
-where
-.Sq n
-specifies which of the keys will be used for transmitted packets,
-and the four keys,
-.Dq k1
-through
-.Dq k4 ,
-are configured as WEP keys.
-If a set of keys is specified, a comma
-.Pq Sq \&,
-within the key must be escaped with a backslash.
-Note that if multiple keys are used, their order must be the same within
-the network.
-.Nm
-is capable of using both 40-bit (5 characters or 10 hexadecimal digits)
-or 104-bit (13 characters or 26 hexadecimal digits) keys.
-.It Fl nwkey
-Disable WEP encryption.
-This is the default mode of operation.
-.It Cm nwkey persist
-Enable WEP encryption with the persistent key stored in the network card.
-.It Cm nwkey persist : Ns Ar key
-Write
-.Ar key
-to the persistent memory of the network card,
-and enable WEP encryption using that key.
-.El
+.Xr hostname.if 5 .
 .Sh HARDWARE
 The
 .Nm
diff --git a/share/man/man4/awi.4 b/share/man/man4/awi.4
index f1a52766720..68218296463 100644
--- a/share/man/man4/awi.4
+++ b/share/man/man4/awi.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: awi.4,v 1.24 2007/05/31 19:19:49 jmc Exp $
+.\"	$OpenBSD: awi.4,v 1.25 2008/04/17 14:01:22 jmc Exp $
 .\"     $NetBSD: awi.4,v 1.1 1999/11/04 19:36:01 sommerfeld Exp $
 .\"
 .\" Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: April 17 2008 $
 .Dt AWI 4
 .Os
 .Sh NAME
@@ -77,59 +77,13 @@ mode, this is used when associating with an access point, through
 which all traffic passes.
 This is the only mode available for this card.
 .El
-.Sh CONFIGURATION
+.Pp
 The
 .Nm
 driver can be configured at runtime with
 .Xr ifconfig 8
 or on boot with
-.Xr hostname.if 5
-using the following parameters:
-.Bl -tag -width Ds
-.It Cm bssid Ar bssid
-Set the desired BSSID.
-.It Fl bssid
-Unset the desired BSSID.
-The interface will automatically select a BSSID in this mode, which is
-the default.
-.It Cm chan Ar n
-Set the channel (radio frequency) to be used by the driver based on
-the given channel ID
-.Ar n .
-.It Fl chan
-Unset the desired channel to be used by the driver.
-The driver will automatically select a channel in this mode, which is
-the default.
-.It Cm media Ar media
-The
-.Nm
-driver supports the following
-.Ar media
-types:
-.Pp
-.Bl -tag -width autoselect -compact
-.It Cm autoselect
-Enable autoselection of the media type and options.
-.It Cm FH1
-Set legacy 802.11 FH 1Mbps operation.
-.El
-.It Cm nwid Ar id
-Set the network ID.
-The
-.Ar id
-can either be any text string up to 32 characters in length,
-or a series of hexadecimal digits up to 64 digits.
-An empty
-.Ar id
-string allows the interface to connect to any available access points.
-By default the
-.Nm
-driver uses an empty string.
-Note that network ID is synonymous with Extended Service Set ID (ESSID).
-.It Fl nwid
-Set the network ID to the empty string to allow the interface to connect
-to any available access point.
-.El
+.Xr hostname.if 5 .
 .Sh HARDWARE
 The following adapters are known to be supported:
 .Pp
diff --git a/share/man/man4/bwi.4 b/share/man/man4/bwi.4
index 9474c05341b..e1d9f24e7a6 100644
--- a/share/man/man4/bwi.4
+++ b/share/man/man4/bwi.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bwi.4,v 1.18 2007/12/05 06:19:40 mglocker Exp $
+.\" $OpenBSD: bwi.4,v 1.19 2008/04/17 14:01:22 jmc Exp $
 .\"
 .\" Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: December 5 2007 $
+.Dd $Mdocdate: April 17 2008 $
 .Os
 .Dt BWI 4
 .Sh NAME
@@ -73,136 +73,13 @@ or to scan for access points.
 The transmit speed is user-selectable or can be adapted automatically by the
 driver depending on the received signal strength and on the number of hardware
 transmission retries.
-.Sh CONFIGURATION
+.Pp
 The
 .Nm
 driver can be configured at runtime with
 .Xr ifconfig 8
 or on boot with
-.Xr hostname.if 5
-using the following parameters:
-.Bl -tag -width Ds
-.It Cm bssid Ar bssid
-Set the desired BSSID.
-.It Fl bssid
-Unset the desired BSSID.
-The interface will automatically select a BSSID in this mode, which is
-the default.
-.It Cm chan Ar n
-Set the channel (radio frequency) to be used by the driver based on
-the given channel ID
-.Ar n .
-.It Fl chan
-Unset the desired channel to be used by the driver.
-The driver will automatically select a channel in this mode, which is
-the default.
-.It Cm media Ar media
-The
-.Nm
-driver supports the following
-.Ar media
-types:
-.Pp
-.Bl -tag -width autoselect -compact
-.It Cm autoselect
-Enable autoselection of the media type and options.
-.It Cm DS1
-Set 802.11b DS 1Mbps operation.
-.It Cm DS2
-Set 802.11b DS 2Mbps operation.
-.It Cm DS5
-Set 802.11b DS 5.5Mbps operation.
-.It Cm DS11
-Set 802.11b DS 11Mbps operation.
-.It Cm OFDM6
-Set 802.11g OFDM 6Mbps operation.
-.It Cm OFDM9
-Set 802.11g OFDM 9Mbps operation.
-.It Cm OFDM12
-Set 802.11g OFDM 12Mbps operation.
-.It Cm OFDM18
-Set 802.11g OFDM 18Mbps operation.
-.It Cm OFDM24
-Set 802.11g OFDM 24Mbps operation.
-.It Cm OFDM36
-Set 802.11g OFDM 36Mbps operation.
-.It Cm OFDM48
-Set 802.11g OFDM 48Mbps operation.
-.It Cm OFDM54
-Set 802.11g OFDM 54Mbps operation.
-.El
-.It Cm mediaopt Ar opts
-The
-.Nm
-driver supports the following media options:
-.Pp
-.Bl -tag -width monitor -compact
-.\".It Cm hostap
-.\"Select Host AP operation.
-.\".It Cm ibss
-.\"Select IBSS operation.
-.It Cm monitor
-Select monitor mode.
-.El
-.It Fl mediaopt Ar opts
-Disable the specified media options on the driver and return it to the
-default mode of operation (BSS).
-.It Cm mode Ar mode
-The
-.Nm
-driver supports the following modes:
-.Pp
-.Bl -tag -width 11b -compact
-.It Cm 11b
-Force 802.11b operation.
-.It Cm 11g
-Force 802.11g operation.
-.El
-.It Cm nwid Ar id
-Set the network ID.
-The
-.Ar id
-can either be any text string up to 32 characters in length,
-or a series of hexadecimal digits up to 64 digits.
-An empty
-.Ar id
-string allows the interface to connect to any available access points.
-By default the
-.Nm
-driver uses an empty string.
-Note that network ID is synonymous with Extended Service Set ID (ESSID).
-.It Fl nwid
-Set the network ID to the empty string to allow the interface to connect
-to any available access point.
-.It Cm nwkey Ar key
-Enable WEP encryption using the specified
-.Ar key .
-The
-.Ar key
-can either be a string, a series of hexadecimal digits (preceded by
-.Sq 0x ) ,
-or a set of keys of the form
-.Dq n:k1,k2,k3,k4 ,
-where
-.Sq n
-specifies which of the keys will be used for transmitted packets,
-and the four keys,
-.Dq k1
-through
-.Dq k4 ,
-are configured as WEP keys.
-If a set of keys is specified, a comma
-.Pq Sq \&,
-within the key must be escaped with a backslash.
-Note that if multiple keys are used, their order must be the same within
-the network.
-.Nm
-is capable of using both 40-bit (5 characters or 10 hexadecimal digits)
-or 104-bit (13 characters or 26 hexadecimal digits) keys.
-.It Fl nwkey
-Disable WEP encryption.
-This is the default mode of operation.
-.El
+.Xr hostname.if 5 .
 .Sh FILES
 The driver needs a firmware file which is loaded when an interface is
 brought up:
diff --git a/share/man/man4/ipw.4 b/share/man/man4/ipw.4
index aa22f57d635..aae15138d65 100644
--- a/share/man/man4/ipw.4
+++ b/share/man/man4/ipw.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ipw.4,v 1.24 2007/08/29 20:09:30 damien Exp $
+.\" $OpenBSD: ipw.4,v 1.25 2008/04/17 14:01:22 jmc Exp $
 .\"
 .\" Copyright (c) 2004
 .\"	Damien Bergamini <damien.bergamini@free.fr>. All rights reserved.
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 29 2007 $
+.Dd $Mdocdate: April 17 2008 $
 .Os
 .Dt IPW 4
 .Sh NAME
@@ -78,88 +78,13 @@ Unfortunately, due to serious weaknesses in WEP protocol
 it is strongly recommended that it not be used as the
 sole mechanism to secure wireless communication.
 WEP is not enabled by default.
-.Sh CONFIGURATION
+.Pp
 The
 .Nm
 driver can be configured at runtime with
 .Xr ifconfig 8
 or on boot with
-.Xr hostname.if 5
-using the following parameters:
-.Bl -tag -width Ds
-.It Cm bssid Ar bssid
-Set the desired BSSID.
-.It Fl bssid
-Unset the desired BSSID.
-The interface will automatically select a BSSID in this mode, which is
-the default.
-.It Cm chan Ar n
-Set the channel (radio frequency) to be used by the driver based on
-the given channel ID
-.Ar n .
-.It Fl chan
-Unset the desired channel to be used by the driver.
-The driver will automatically select a channel in this mode, which is
-the default.
-.It Cm mediaopt Ar opts
-The
-.Nm
-driver supports the following media options:
-.Pp
-.Bl -tag -width monitor -compact
-.It Cm ibss
-Select IBSS operation.
-.It Cm monitor
-Select monitor mode.
-.El
-.It Fl mediaopt Ar opts
-Disable the specified media options on the driver and return it to the
-default mode of operation (BSS).
-.It Cm nwid Ar id
-Set the network ID.
-The
-.Ar id
-can either be any text string up to 32 characters in length,
-or a series of hexadecimal digits up to 64 digits.
-An empty
-.Ar id
-string allows the interface to connect to any available access points.
-By default the
-.Nm
-driver uses an empty string.
-Note that network ID is synonymous with Extended Service Set ID (ESSID).
-.It Fl nwid
-Set the network ID to the empty string to allow the interface to connect
-to any available access point.
-.It Cm nwkey Ar key
-Enable WEP encryption using the specified
-.Ar key .
-The
-.Ar key
-can either be a string, a series of hexadecimal digits (preceded by
-.Sq 0x ) ,
-or a set of keys of the form
-.Dq n:k1,k2,k3,k4 ,
-where
-.Sq n
-specifies which of the keys will be used for transmitted packets,
-and the four keys,
-.Dq k1
-through
-.Dq k4 ,
-are configured as WEP keys.
-If a set of keys is specified, a comma
-.Pq Sq \&,
-within the key must be escaped with a backslash.
-Note that if multiple keys are used, their order must be the same within
-the network.
-.Nm
-is capable of using both 40-bit (5 characters or 10 hexadecimal digits)
-or 104-bit (13 characters or 26 hexadecimal digits) keys.
-.It Fl nwkey
-Disable WEP encryption.
-This is the default mode of operation.
-.El
+.Xr hostname.if 5 .
 .Sh FILES
 The driver needs at least version 1.3 of the following firmware files,
 which are loaded when an interface is brought up:
diff --git a/share/man/man4/iwi.4 b/share/man/man4/iwi.4
index ce819bdeb58..4a1a90ed93d 100644
--- a/share/man/man4/iwi.4
+++ b/share/man/man4/iwi.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: iwi.4,v 1.29 2007/08/29 20:09:30 damien Exp $
+.\" $OpenBSD: iwi.4,v 1.30 2008/04/17 14:01:22 jmc Exp $
 .\"
 .\" Copyright (c) 2004
 .\"	Damien Bergamini <damien.bergamini@free.fr>. All rights reserved.
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 29 2007 $
+.Dd $Mdocdate: April 17 2008 $
 .Os
 .Dt IWI 4
 .Sh NAME
@@ -77,112 +77,13 @@ Unfortunately, due to serious weaknesses in WEP protocol
 it is strongly recommended that it not be used as the
 sole mechanism to secure wireless communication.
 WEP is not enabled by default.
-.Sh CONFIGURATION
+.Pp
 The
 .Nm
 driver can be configured at runtime with
 .Xr ifconfig 8
 or on boot with
-.Xr hostname.if 5
-using the following parameters:
-.Bl -tag -width Ds
-.It Cm bssid Ar bssid
-Set the desired BSSID.
-.It Fl bssid
-Unset the desired BSSID.
-The interface will automatically select a BSSID in this mode, which is
-the default.
-.It Cm chan Ar n
-Set the channel (radio frequency) to be used by the driver based on
-the given channel ID
-.Ar n .
-.It Fl chan
-Unset the desired channel to be used by the driver.
-The driver will automatically select a channel in this mode, which is
-the default.
-.It Cm media Ar media
-The
-.Nm
-driver supports the following
-.Ar media
-types:
-.Pp
-.Bl -tag -width autoselect -compact
-.It Cm autoselect
-Enable autoselection of the media type and options.
-.El
-.It Cm mediaopt Ar opts
-The
-.Nm
-driver supports the following media options:
-.Pp
-.Bl -tag -width monitor -compact
-.It Cm ibss
-Select IBSS operation.
-.It Cm monitor
-Select monitor mode.
-.El
-.It Fl mediaopt Ar opts
-Disable the specified media options on the driver and return it to the
-default mode of operation (BSS).
-.It Cm mode Ar mode
-The
-.Nm
-driver supports the following modes:
-.Pp
-.Bl -tag -width 11b -compact
-.It Cm 11a
-Force 802.11a operation.
-.It Cm 11b
-Force 802.11b operation.
-.It Cm 11g
-Force 802.11g operation.
-.El
-.It Cm nwid Ar id
-Set the network ID.
-The
-.Ar id
-can either be any text string up to 32 characters in length,
-or a series of hexadecimal digits up to 64 digits.
-An empty
-.Ar id
-string allows the interface to connect to any available access points.
-By default the
-.Nm
-driver uses an empty string.
-Note that network ID is synonymous with Extended Service Set ID (ESSID).
-.It Fl nwid
-Set the network ID to the empty string to allow the interface to connect
-to any available access point.
-.It Cm nwkey Ar key
-Enable WEP encryption using the specified
-.Ar key .
-The
-.Ar key
-can either be a string, a series of hexadecimal digits (preceded by
-.Sq 0x ) ,
-or a set of keys of the form
-.Dq n:k1,k2,k3,k4 ,
-where
-.Sq n
-specifies which of the keys will be used for transmitted packets,
-and the four keys,
-.Dq k1
-through
-.Dq k4 ,
-are configured as WEP keys.
-If a set of keys is specified, a comma
-.Pq Sq \&,
-within the key must be escaped with a backslash.
-Note that if multiple keys are used, their order must be the same within
-the network.
-.Nm
-is capable of using both 40-bit (5 characters or 10 hexadecimal digits)
-or 104-bit (13 characters or 26 hexadecimal digits) keys.
-.It Fl nwkey
-Disable WEP encryption.
-This is the default mode of operation.
-.El
+.Xr hostname.if 5 .
 .Sh FILES
 The driver needs at least version 3.0 of the following firmware files,
 which are loaded when an interface is brought up:
diff --git a/share/man/man4/iwn.4 b/share/man/man4/iwn.4
index 89a861aa88a..e2773dca04c 100644
--- a/share/man/man4/iwn.4
+++ b/share/man/man4/iwn.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: iwn.4,v 1.5 2007/11/30 19:12:09 damien Exp $
+.\" $OpenBSD: iwn.4,v 1.6 2008/04/17 14:01:22 jmc Exp $
 .\"
 .\" Copyright (c) 2007
 .\"	Damien Bergamini <damien.bergamini@free.fr>. All rights reserved.
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: November 30 2007 $
+.Dd $Mdocdate: April 17 2008 $
 .Os
 .Dt IWN 4
 .Sh NAME
@@ -61,110 +61,13 @@ WEP is not enabled by default.
 .Pp
 The device has one temperature sensor in degC.
 Sensor data is updated every 500 milliseconds.
-.Sh CONFIGURATION
+.Pp
 The
 .Nm
 driver can be configured at runtime with
 .Xr ifconfig 8
 or on boot with
-.Xr hostname.if 5
-using the following parameters:
-.Bl -tag -width Ds
-.It Cm bssid Ar bssid
-Set the desired BSSID.
-.It Fl bssid
-Unset the desired BSSID.
-The interface will automatically select a BSSID in this mode, which is
-the default.
-.It Cm chan Ar n
-Set the channel (radio frequency) to be used by the driver based on
-the given channel ID
-.Ar n .
-.It Fl chan
-Unset the desired channel to be used by the driver.
-The driver will automatically select a channel in this mode, which is
-the default.
-.It Cm media Ar media
-The
-.Nm
-driver supports the following
-.Ar media
-types:
-.Pp
-.Bl -tag -width autoselect -compact
-.It Cm autoselect
-Enable autoselection of the media type and options.
-.El
-.It Cm mediaopt Ar opts
-The
-.Nm
-driver supports the following media options:
-.Pp
-.Bl -tag -width monitor -compact
-.It Cm monitor
-Select monitor mode.
-.El
-.It Fl mediaopt Ar opts
-Disable the specified media options on the driver and return it to the
-default mode of operation (BSS).
-.It Cm mode Ar mode
-The
-.Nm
-driver supports the following modes:
-.Pp
-.Bl -tag -width 11b -compact
-.It Cm 11a
-Force 802.11a operation.
-.It Cm 11b
-Force 802.11b operation.
-.It Cm 11g
-Force 802.11g operation.
-.El
-.It Cm nwid Ar id
-Set the network ID.
-The
-.Ar id
-can either be any text string up to 32 characters in length,
-or a series of hexadecimal digits up to 64 digits.
-An empty
-.Ar id
-string allows the interface to connect to any available access points.
-By default the
-.Nm
-driver uses an empty string.
-Note that network ID is synonymous with Extended Service Set ID (ESSID).
-.It Fl nwid
-Set the network ID to the empty string to allow the interface to connect
-to any available access point.
-.It Cm nwkey Ar key
-Enable WEP encryption using the specified
-.Ar key .
-The
-.Ar key
-can either be a string, a series of hexadecimal digits (preceded by
-.Sq 0x ) ,
-or a set of keys of the form
-.Dq n:k1,k2,k3,k4 ,
-where
-.Sq n
-specifies which of the keys will be used for transmitted packets,
-and the four keys,
-.Dq k1
-through
-.Dq k4 ,
-are configured as WEP keys.
-If a set of keys is specified, a comma
-.Pq Sq \&,
-within the key must be escaped with a backslash.
-Note that if multiple keys are used, their order must be the same within
-the network.
-.Nm
-is capable of using both 40-bit (5 characters or 10 hexadecimal digits)
-or 104-bit (13 characters or 26 hexadecimal digits) keys.
-.It Fl nwkey
-Disable WEP encryption.
-This is the default mode of operation.
-.El
+.Xr hostname.if 5 .
 .Sh FILES
 The driver needs at least version 4.44.1.20 of the following firmware file,
 which is loaded when an interface is brought up:
diff --git a/share/man/man4/malo.4 b/share/man/man4/malo.4
index 6f213a6e2cb..fb812871685 100644
--- a/share/man/man4/malo.4
+++ b/share/man/man4/malo.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: malo.4,v 1.24 2007/10/13 18:54:12 mglocker Exp $
+.\"	$OpenBSD: malo.4,v 1.25 2008/04/17 14:01:22 jmc Exp $
 .\"
 .\" Copyright (c) 2006 Theo de Raadt.
 .\"
@@ -26,7 +26,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: October 13 2007 $
+.Dd $Mdocdate: April 17 2008 $
 .Os
 .Dt MALO 4
 .Sh NAME
@@ -83,136 +83,13 @@ Unfortunately, due to serious weaknesses in WEP protocol
 it is strongly recommended that it not be used as the
 sole mechanism to secure wireless communication.
 WEP is not enabled by default.
-.Sh CONFIGURATION
+.Pp
 The
 .Nm
 driver can be configured at runtime with
 .Xr ifconfig 8
 or on boot with
-.Xr hostname.if 5
-using the following parameters:
-.Bl -tag -width Ds
-.It Cm bssid Ar bssid
-Set the desired BSSID.
-.It Fl bssid
-Unset the desired BSSID.
-The interface will automatically select a BSSID in this mode, which is
-the default.
-.It Cm chan Ar n
-Set the channel (radio frequency) to be used by the driver based on
-the given channel ID
-.Ar n .
-.It Fl chan
-Unset the desired channel to be used by the driver.
-The driver will automatically select a channel in this mode, which is
-the default.
-.It Cm media Ar media
-The
-.Nm
-driver supports the following
-.Ar media
-types:
-.Pp
-.Bl -tag -width autoselect -compact
-.It Cm autoselect
-Enable autoselection of the media type and options.
-.It Cm DS1
-Set 802.11b DS 1Mbps operation.
-.It Cm DS2
-Set 802.11b DS 2Mbps operation.
-.It Cm DS5
-Set 802.11b DS 5.5Mbps operation.
-.It Cm DS11
-Set 802.11b DS 11Mbps operation.
-.It Cm OFDM6
-Set 802.11g OFDM 6Mbps operation.
-.It Cm OFDM9
-Set 802.11g OFDM 9Mbps operation.
-.It Cm OFDM12
-Set 802.11g OFDM 12Mbps operation.
-.It Cm OFDM18
-Set 802.11g OFDM 18Mbps operation.
-.It Cm OFDM24
-Set 802.11g OFDM 24Mbps operation.
-.It Cm OFDM36
-Set 802.11g OFDM 36Mbps operation.
-.It Cm OFDM48
-Set 802.11g OFDM 48Mbps operation.
-.It Cm OFDM54
-Set 802.11g OFDM 54Mbps operation.
-.El
-.It Cm mediaopt Ar opts
-The
-.Nm
-driver supports the following media options:
-.Pp
-.Bl -tag -width monitor -compact
-.\".It Cm hostap
-.\"Select Host AP operation.
-.\".It Cm ibss
-.\"Select IBSS operation.
-.It Cm monitor
-Select monitor mode.
-.El
-.It Fl mediaopt Ar opts
-Disable the specified media options on the driver and return it to the
-default mode of operation (BSS).
-.It Cm mode Ar mode
-The
-.Nm
-driver supports the following modes:
-.Pp
-.Bl -tag -width 11b -compact
-.It Cm 11b
-Force 802.11b operation.
-.It Cm 11g
-Force 802.11g operation.
-.El
-.It Cm nwid Ar id
-Set the network ID.
-The
-.Ar id
-can either be any text string up to 32 characters in length,
-or a series of hexadecimal digits up to 64 digits.
-An empty
-.Ar id
-string allows the interface to connect to any available access points.
-By default the
-.Nm
-driver uses an empty string.
-Note that network ID is synonymous with Extended Service Set ID (ESSID).
-.It Fl nwid
-Set the network ID to the empty string to allow the interface to connect
-to any available access point.
-.It Cm nwkey Ar key
-Enable WEP encryption using the specified
-.Ar key .
-The
-.Ar key
-can either be a string, a series of hexadecimal digits (preceded by
-.Sq 0x ) ,
-or a set of keys of the form
-.Dq n:k1,k2,k3,k4 ,
-where
-.Sq n
-specifies which of the keys will be used for transmitted packets,
-and the four keys,
-.Dq k1
-through
-.Dq k4 ,
-are configured as WEP keys.
-If a set of keys is specified, a comma
-.Pq Sq \&,
-within the key must be escaped with a backslash.
-Note that if multiple keys are used, their order must be the same within
-the network.
-.Nm
-is capable of using both 40-bit (5 characters or 10 hexadecimal digits)
-or 104-bit (13 characters or 26 hexadecimal digits) keys.
-.It Fl nwkey
-Disable WEP encryption.
-This is the default mode of operation.
-.El
+.Xr hostname.if 5 .
 .Sh FILES
 The driver needs a set of firmware files which are loaded when
 an interface is brought up:
diff --git a/share/man/man4/pgt.4 b/share/man/man4/pgt.4
index 4a63be8f2a2..b48c67a33e9 100644
--- a/share/man/man4/pgt.4
+++ b/share/man/man4/pgt.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pgt.4,v 1.25 2007/12/10 10:32:54 jmc Exp $
+.\"	$OpenBSD: pgt.4,v 1.26 2008/04/17 14:01:22 jmc Exp $
 .\"
 .\" Copyright (c) 2006 Theo de Raadt.
 .\" Copyright (c) 2006 The DragonFly Project.  All rights reserved.
@@ -30,7 +30,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: December 10 2007 $
+.Dd $Mdocdate: April 17 2008 $
 .Os
 .Dt PGT 4
 .Sh NAME
@@ -91,169 +91,13 @@ Unfortunately, due to serious weaknesses in WEP protocol
 it is strongly recommended that it not be used as the
 sole mechanism to secure wireless communication.
 WEP is not enabled by default.
-.Sh CONFIGURATION
+.Pp
 The
 .Nm
 driver can be configured at runtime with
 .Xr ifconfig 8
 or on boot with
-.Xr hostname.if 5
-using the following parameters:
-.Bl -tag -width Ds
-.It Cm bssid Ar bssid
-Set the desired BSSID.
-.It Fl bssid
-Unset the desired BSSID.
-The interface will automatically select a BSSID in this mode, which is
-the default.
-.It Cm chan Ar n
-Set the channel (radio frequency) to be used by the driver based on
-the given channel ID
-.Ar n .
-.It Fl chan
-Unset the desired channel to be used by the driver.
-The driver will automatically select a channel in this mode, which is
-the default.
-.It Cm media Ar media
-The
-.Nm
-driver supports the following
-.Ar media
-types:
-.Pp
-.Bl -tag -width autoselect -compact
-.It Cm autoselect
-Enable autoselection of the media type and options.
-.It Cm DS1
-Set 802.11b DS 1Mbps operation.
-.It Cm DS2
-Set 802.11b DS 2Mbps operation.
-.It Cm DS5
-Set 802.11b DS 5.5Mbps operation.
-.It Cm DS11
-Set 802.11b DS 11Mbps operation.
-.It Cm OFDM6
-Set 802.11a/g OFDM 6Mbps operation.
-.It Cm OFDM9
-Set 802.11a/g OFDM 9Mbps operation.
-.It Cm OFDM12
-Set 802.11a/g OFDM 12Mbps operation.
-.It Cm OFDM18
-Set 802.11a/g OFDM 18Mbps operation.
-.It Cm OFDM24
-Set 802.11a/g OFDM 24Mbps operation.
-.It Cm OFDM36
-Set 802.11a/g OFDM 36Mbps operation.
-.It Cm OFDM48
-Set 802.11a/g OFDM 48Mbps operation.
-.It Cm OFDM54
-Set 802.11a/g OFDM 54Mbps operation.
-.El
-.It Cm mediaopt Ar opts
-The
-.Nm
-driver supports the following media options:
-.Pp
-.Bl -tag -width monitor -compact
-.It Cm hostap
-Select Host AP operation.
-.It Cm ibss
-Select IBSS operation.
-.It Cm monitor
-Select monitor mode.
-.El
-.It Fl mediaopt Ar opts
-Disable the specified media options on the driver and return it to the
-default mode of operation (BSS).
-.It Cm mode Ar mode
-The
-.Nm
-driver supports the following modes:
-.Pp
-.Bl -tag -width 11b -compact
-.It Cm 11a
-Force 802.11a operation.
-.It Cm 11b
-Force 802.11b operation.
-.It Cm 11g
-Force 802.11g operation.
-.El
-.It Cm nwflag Ar flag
-Set a specified flag for the wireless network interface.
-The flag name can be either
-.Ql hidenwid
-or
-.Ql nobridge .
-The
-.Ql hidenwid
-flag will hide the network ID (ESSID) in beacon frames when operating
-in Host AP mode.
-It will also prevent responses to probe requests with an unspecified
-network ID.
-The
-.Ql nobridge
-flag will disable the direct bridging of frames between associated
-nodes when operating in Host AP mode.
-Setting this flag will block and filter direct inter-station
-communications.
-.Pp
-Note that the
-.Ql hidenwid
-and
-.Ql nobridge
-options do not provide any security.
-The hidden network ID will be sent in clear text by associating
-stations and can be easily discovered with tools like
-.Xr tcpdump 8
-and
-.Xr hostapd 8 .
-.It Fl nwflag Ar flag
-Remove a specified flag for the wireless network interface.
-.It Cm nwid Ar id
-Set the network ID.
-The
-.Ar id
-can either be any text string up to 32 characters in length,
-or a series of hexadecimal digits up to 64 digits.
-An empty
-.Ar id
-string allows the interface to connect to any available access points.
-By default the
-.Nm
-driver uses an empty string.
-Note that network ID is synonymous with Extended Service Set ID (ESSID).
-.It Fl nwid
-Set the network ID to the empty string to allow the interface to connect
-to any available access point.
-.It Cm nwkey Ar key
-Enable WEP encryption using the specified
-.Ar key .
-The
-.Ar key
-can either be a string, a series of hexadecimal digits (preceded by
-.Sq 0x ) ,
-or a set of keys of the form
-.Dq n:k1,k2,k3,k4 ,
-where
-.Sq n
-specifies which of the keys will be used for transmitted packets,
-and the four keys,
-.Dq k1
-through
-.Dq k4 ,
-are configured as WEP keys.
-If a set of keys is specified, a comma
-.Pq Sq \&,
-within the key must be escaped with a backslash.
-Note that if multiple keys are used, their order must be the same within
-the network.
-.Nm
-is capable of using both 40-bit (5 characters or 10 hexadecimal digits)
-or 104-bit (13 characters or 26 hexadecimal digits) keys.
-.It Fl nwkey
-Disable WEP encryption.
-This is the default mode of operation.
-.El
+.Xr hostname.if 5 .
 .Sh FILES
 The driver needs a set of firmware files which are loaded when
 an interface is brought up:
diff --git a/share/man/man4/ral.4 b/share/man/man4/ral.4
index c53c63ede50..5a71bd5a62e 100644
--- a/share/man/man4/ral.4
+++ b/share/man/man4/ral.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ral.4,v 1.79 2008/03/06 09:14:22 deraadt Exp $
+.\" $OpenBSD: ral.4,v 1.80 2008/04/17 14:01:22 jmc Exp $
 .\"
 .\" Copyright (c) 2005-2007
 .\"	Damien Bergamini <damien.bergamini@free.fr>
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: March 6 2008 $
+.Dd $Mdocdate: April 17 2008 $
 .Os
 .Dt RAL 4
 .Sh NAME
@@ -101,169 +101,13 @@ WEP is not enabled by default.
 .Pp
 The transmit speed is user-selectable or can be adapted automatically by the
 driver depending on the number of hardware transmission retries.
-.Sh CONFIGURATION
+.Pp
 The
 .Nm
 driver can be configured at runtime with
 .Xr ifconfig 8
 or on boot with
-.Xr hostname.if 5
-using the following parameters:
-.Bl -tag -width Ds
-.It Cm bssid Ar bssid
-Set the desired BSSID.
-.It Fl bssid
-Unset the desired BSSID.
-The interface will automatically select a BSSID in this mode, which is
-the default.
-.It Cm chan Ar n
-Set the channel (radio frequency) to be used by the driver based on
-the given channel ID
-.Ar n .
-.It Fl chan
-Unset the desired channel to be used by the driver.
-The driver will automatically select a channel in this mode, which is
-the default.
-.It Cm media Ar media
-The
-.Nm
-driver supports the following
-.Ar media
-types:
-.Pp
-.Bl -tag -width autoselect -compact
-.It Cm autoselect
-Enable autoselection of the media type and options.
-.It Cm DS1
-Set 802.11b DS 1Mbps operation.
-.It Cm DS2
-Set 802.11b DS 2Mbps operation.
-.It Cm DS5
-Set 802.11b DS 5.5Mbps operation.
-.It Cm DS11
-Set 802.11b DS 11Mbps operation.
-.It Cm OFDM6
-Set 802.11a/g OFDM 6Mbps operation.
-.It Cm OFDM9
-Set 802.11a/g OFDM 9Mbps operation.
-.It Cm OFDM12
-Set 802.11a/g OFDM 12Mbps operation.
-.It Cm OFDM18
-Set 802.11a/g OFDM 18Mbps operation.
-.It Cm OFDM24
-Set 802.11a/g OFDM 24Mbps operation.
-.It Cm OFDM36
-Set 802.11a/g OFDM 36Mbps operation.
-.It Cm OFDM48
-Set 802.11a/g OFDM 48Mbps operation.
-.It Cm OFDM54
-Set 802.11a/g OFDM 54Mbps operation.
-.El
-.It Cm mediaopt Ar opts
-The
-.Nm
-driver supports the following media options:
-.Pp
-.Bl -tag -width monitor -compact
-.It Cm hostap
-Select Host AP operation.
-.It Cm ibss
-Select IBSS operation.
-.It Cm monitor
-Select monitor mode.
-.El
-.It Fl mediaopt Ar opts
-Disable the specified media options on the driver and return it to the
-default mode of operation (BSS).
-.It Cm mode Ar mode
-The
-.Nm
-driver supports the following modes:
-.Pp
-.Bl -tag -width 11b -compact
-.It Cm 11a
-Force 802.11a operation.
-.It Cm 11b
-Force 802.11b operation.
-.It Cm 11g
-Force 802.11g operation.
-.El
-.It Cm nwflag Ar flag
-Set a specified flag for the wireless network interface.
-The flag name can be either
-.Ql hidenwid
-or
-.Ql nobridge .
-The
-.Ql hidenwid
-flag will hide the network ID (ESSID) in beacon frames when operating
-in Host AP mode.
-It will also prevent responses to probe requests with an unspecified
-network ID.
-The
-.Ql nobridge
-flag will disable the direct bridging of frames between associated
-nodes when operating in Host AP mode.
-Setting this flag will block and filter direct inter-station
-communications.
-.Pp
-Note that the
-.Ql hidenwid
-and
-.Ql nobridge
-options do not provide any security.
-The hidden network ID will be sent in clear text by associating
-stations and can be easily discovered with tools like
-.Xr tcpdump 8
-and
-.Xr hostapd 8 .
-.It Fl nwflag Ar flag
-Remove a specified flag for the wireless network interface.
-.It Cm nwid Ar id
-Set the network ID.
-The
-.Ar id
-can either be any text string up to 32 characters in length,
-or a series of hexadecimal digits up to 64 digits.
-An empty
-.Ar id
-string allows the interface to connect to any available access points.
-By default the
-.Nm
-driver uses an empty string.
-Note that network ID is synonymous with Extended Service Set ID (ESSID).
-.It Fl nwid
-Set the network ID to the empty string to allow the interface to connect
-to any available access point.
-.It Cm nwkey Ar key
-Enable WEP encryption using the specified
-.Ar key .
-The
-.Ar key
-can either be a string, a series of hexadecimal digits (preceded by
-.Sq 0x ) ,
-or a set of keys of the form
-.Dq n:k1,k2,k3,k4 ,
-where
-.Sq n
-specifies which of the keys will be used for transmitted packets,
-and the four keys,
-.Dq k1
-through
-.Dq k4 ,
-are configured as WEP keys.
-If a set of keys is specified, a comma
-.Pq Sq \&,
-within the key must be escaped with a backslash.
-Note that if multiple keys are used, their order must be the same within
-the network.
-.Nm
-is capable of using both 40-bit (5 characters or 10 hexadecimal digits)
-or 104-bit (13 characters or 26 hexadecimal digits) keys.
-.It Fl nwkey
-Disable WEP encryption.
-This is the default mode of operation.
-.El
+.Xr hostname.if 5 .
 .Sh FILES
 The RT2501, RT2600 and RT2800 chipsets require the following firmware
 files to be loaded when an interface is brought up:
diff --git a/share/man/man4/ray.4 b/share/man/man4/ray.4
index 3475ff46d76..300cfd491f4 100644
--- a/share/man/man4/ray.4
+++ b/share/man/man4/ray.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ray.4,v 1.23 2007/05/31 19:19:51 jmc Exp $
+.\"	$OpenBSD: ray.4,v 1.24 2008/04/17 14:01:22 jmc Exp $
 .\"	$NetBSD: ray.4,v 1.5 2000/02/28 13:54:55 enami Exp $
 .\"
 .\" Copyright (c) 2000 Christian E. Hopps
@@ -26,7 +26,7 @@
 .\" (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 $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: April 17 2008 $
 .Dt RAY 4
 .Os
 .Sh NAME
@@ -82,73 +82,13 @@ This is the standardized method of operating without an access point.
 Stations associate with a service set.
 However, actual connections between stations are peer-to-peer.
 .El
-.Sh CONFIGURATION
+.Pp
 The
 .Nm
 driver can be configured at runtime with
 .Xr ifconfig 8
 or on boot with
-.Xr hostname.if 5
-using the following parameters:
-.Bl -tag -width Ds
-.It Cm bssid Ar bssid
-Set the desired BSSID.
-.It Fl bssid
-Unset the desired BSSID.
-The interface will automatically select a BSSID in this mode, which is
-the default.
-.It Cm chan Ar n
-Set the channel (radio frequency) to be used by the driver based on
-the given channel ID
-.Ar n .
-.It Fl chan
-Unset the desired channel to be used by the driver.
-The driver will automatically select a channel in this mode, which is
-the default.
-.It Cm media Ar media
-The
-.Nm
-driver supports the following
-.Ar media
-types:
-.Pp
-.Bl -tag -width autoselect -compact
-.It Cm autoselect
-Enable autoselection of the media type and options.
-.It Cm FH1
-Set legacy 802.11 FH 1Mbps operation.
-.It Cm FH2
-Set legacy 802.11 FH 2Mbps operation.
-.El
-.It Cm mediaopt Ar opts
-The
-.Nm
-driver supports the following media options:
-.Pp
-.Bl -tag -width monitor -compact
-.It Cm ibss
-Select IBSS operation.
-.El
-.It Fl mediaopt Ar opts
-Disable the specified media options on the driver and return it to the
-default mode of operation (BSS).
-.It Cm nwid Ar id
-Set the network ID.
-The
-.Ar id
-can either be any text string up to 32 characters in length,
-or a series of hexadecimal digits up to 64 digits.
-An empty
-.Ar id
-string allows the interface to connect to any available access points.
-By default the
-.Nm
-driver uses an empty string.
-Note that network ID is synonymous with Extended Service Set ID (ESSID).
-.It Fl nwid
-Set the network ID to the empty string to allow the interface to connect
-to any available access point.
-.El
+.Xr hostname.if 5 .
 .Sh HARDWARE
 Cards supported by the
 .Nm
diff --git a/share/man/man4/rtw.4 b/share/man/man4/rtw.4
index c59bbd5bda9..2bd3ef80390 100644
--- a/share/man/man4/rtw.4
+++ b/share/man/man4/rtw.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rtw.4,v 1.30 2007/12/10 10:32:54 jmc Exp $
+.\"	$OpenBSD: rtw.4,v 1.31 2008/04/17 14:01:22 jmc Exp $
 .\"
 .\" Copyright (c) 2004 Jonathan Gray <jsg@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: December 10 2007 $
+.Dd $Mdocdate: April 17 2008 $
 .Dt RTW 4
 .Os
 .Sh NAME
@@ -72,142 +72,13 @@ Unfortunately, due to serious weaknesses in WEP protocol
 it is strongly recommended that it not be used as the
 sole mechanism to secure wireless communication.
 WEP is not enabled by default.
-.Sh CONFIGURATION
+.Pp
 The
 .Nm
 driver can be configured at runtime with
 .Xr ifconfig 8
 or on boot with
-.Xr hostname.if 5
-using the following parameters:
-.Bl -tag -width Ds
-.It Cm bssid Ar bssid
-Set the desired BSSID.
-.It Fl bssid
-Unset the desired BSSID.
-The interface will automatically select a BSSID in this mode, which is
-the default.
-.It Cm chan Ar n
-Set the channel (radio frequency) to be used by the driver based on
-the given channel ID
-.Ar n .
-.It Fl chan
-Unset the desired channel to be used by the driver.
-The driver will automatically select a channel in this mode, which is
-the default.
-.It Cm media Ar media
-The
-.Nm
-driver supports the following
-.Ar media
-types:
-.Pp
-.Bl -tag -width autoselect -compact
-.It Cm autoselect
-Enable autoselection of the media type and options.
-.It Cm DS1
-Set 802.11b DS 1Mbps operation.
-.It Cm DS2
-Set 802.11b DS 2Mbps operation.
-.It Cm DS5
-Set 802.11b DS 5.5Mbps operation.
-.It Cm DS11
-Set 802.11b DS 11Mbps operation.
-.El
-.It Cm mediaopt Ar opts
-The
-.Nm
-driver supports the following media options:
-.Pp
-.Bl -tag -width monitor -compact
-.It Cm hostap
-Select Host AP operation.
-.It Cm ibss
-Select IBSS operation.
-.It Cm monitor
-Select monitor mode.
-.El
-.It Fl mediaopt Ar opts
-Disable the specified media options on the driver and return it to the
-default mode of operation (BSS).
-.It Cm nwflag Ar flag
-Set a specified flag for the wireless network interface.
-The flag name can be either
-.Ql hidenwid
-or
-.Ql nobridge .
-The
-.Ql hidenwid
-flag will hide the network ID (ESSID) in beacon frames when operating
-in Host AP mode.
-It will also prevent responses to probe requests with an unspecified
-network ID.
-The
-.Ql nobridge
-flag will disable the direct bridging of frames between associated
-nodes when operating in Host AP mode.
-Setting this flag will block and filter direct inter-station
-communications.
-.Pp
-Note that the
-.Ql hidenwid
-and
-.Ql nobridge
-options do not provide any security.
-The hidden network ID will be sent in clear text by associating
-stations and can be easily discovered with tools like
-.Xr tcpdump 8
-and
-.Xr hostapd 8 .
-.It Fl nwflag Ar flag
-Remove a specified flag for the wireless network interface.
-.It Cm nwid Ar id
-Set the network ID.
-The
-.Ar id
-can either be any text string up to 32 characters in length,
-or a series of hexadecimal digits up to 64 digits.
-An empty
-.Ar id
-string allows the interface to connect to any available access points.
-By default the
-.Nm
-driver uses an empty string.
-Note that network ID is synonymous with Extended Service Set ID (ESSID).
-.It Fl nwid
-Set the network ID to the empty string to allow the interface to connect
-to any available access point.
-.It Cm nwkey Ar key
-Enable WEP encryption using the specified
-.Ar key .
-The
-.Ar key
-can either be a string, a series of hexadecimal digits (preceded by
-.Sq 0x ) ,
-or a set of keys of the form
-.Dq n:k1,k2,k3,k4 ,
-where
-.Sq n
-specifies which of the keys will be used for transmitted packets,
-and the four keys,
-.Dq k1
-through
-.Dq k4 ,
-are configured as WEP keys.
-If a set of keys is specified, a comma
-.Pq Sq \&,
-within the key must be escaped with a backslash.
-Note that if multiple keys are used, their order must be the same within
-the network.
-.Nm
-is capable of using both 40-bit (5 characters or 10 hexadecimal digits)
-or 104-bit (13 characters or 26 hexadecimal digits) keys.
-.It Fl nwkey
-Disable WEP encryption.
-This is the default mode of operation.
-.It Cm nwkey persist
-Enable WEP encryption with the persistent key stored in the network card.
-.El
+.Xr hostname.if 5 .
 .Sh HARDWARE
 The following adapters should work:
 .Pp
diff --git a/share/man/man4/rum.4 b/share/man/man4/rum.4
index 345be2a6017..c1e96b18d8b 100644
--- a/share/man/man4/rum.4
+++ b/share/man/man4/rum.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rum.4,v 1.33 2008/04/01 13:43:53 jsg Exp $
+.\" $OpenBSD: rum.4,v 1.34 2008/04/17 14:01:22 jmc Exp $
 .\"
 .\" Copyright (c) 2005-2007
 .\"	Damien Bergamini <damien.bergamini@free.fr>
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: April 1 2008 $
+.Dd $Mdocdate: April 17 2008 $
 .Os
 .Dt RUM 4
 .Sh NAME
@@ -85,169 +85,13 @@ Unfortunately, due to serious weaknesses in WEP protocol
 it is strongly recommended that it not be used as the
 sole mechanism to secure wireless communication.
 WEP is not enabled by default.
-.Sh CONFIGURATION
+.Pp
 The
 .Nm
 driver can be configured at runtime with
 .Xr ifconfig 8
 or on boot with
-.Xr hostname.if 5
-using the following parameters:
-.Bl -tag -width Ds
-.It Cm bssid Ar bssid
-Set the desired BSSID.
-.It Fl bssid
-Unset the desired BSSID.
-The interface will automatically select a BSSID in this mode, which is
-the default.
-.It Cm chan Ar n
-Set the channel (radio frequency) to be used by the driver based on
-the given channel ID
-.Ar n .
-.It Fl chan
-Unset the desired channel to be used by the driver.
-The driver will automatically select a channel in this mode, which is
-the default.
-.It Cm media Ar media
-The
-.Nm
-driver supports the following
-.Ar media
-types:
-.Pp
-.Bl -tag -width autoselect -compact
-.It Cm autoselect
-Enable autoselection of the media type and options.
-.It Cm DS1
-Set 802.11b DS 1Mbps operation.
-.It Cm DS2
-Set 802.11b DS 2Mbps operation.
-.It Cm DS5
-Set 802.11b DS 5.5Mbps operation.
-.It Cm DS11
-Set 802.11b DS 11Mbps operation.
-.It Cm OFDM6
-Set 802.11a/g OFDM 6Mbps operation.
-.It Cm OFDM9
-Set 802.11a/g OFDM 9Mbps operation.
-.It Cm OFDM12
-Set 802.11a/g OFDM 12Mbps operation.
-.It Cm OFDM18
-Set 802.11a/g OFDM 18Mbps operation.
-.It Cm OFDM24
-Set 802.11a/g OFDM 24Mbps operation.
-.It Cm OFDM36
-Set 802.11a/g OFDM 36Mbps operation.
-.It Cm OFDM48
-Set 802.11a/g OFDM 48Mbps operation.
-.It Cm OFDM54
-Set 802.11a/g OFDM 54Mbps operation.
-.El
-.It Cm mediaopt Ar opts
-The
-.Nm
-driver supports the following media options:
-.Pp
-.Bl -tag -width monitor -compact
-.It Cm hostap
-Select Host AP operation.
-.It Cm ibss
-Select IBSS operation.
-.It Cm monitor
-Select monitor mode.
-.El
-.It Fl mediaopt Ar opts
-Disable the specified media options on the driver and return it to the
-default mode of operation (BSS).
-.It Cm mode Ar mode
-The
-.Nm
-driver supports the following modes:
-.Pp
-.Bl -tag -width 11b -compact
-.It Cm 11a
-Force 802.11a operation.
-.It Cm 11b
-Force 802.11b operation.
-.It Cm 11g
-Force 802.11g operation.
-.El
-.It Cm nwflag Ar flag
-Set a specified flag for the wireless network interface.
-The flag name can be either
-.Ql hidenwid
-or
-.Ql nobridge .
-The
-.Ql hidenwid
-flag will hide the network ID (ESSID) in beacon frames when operating
-in Host AP mode.
-It will also prevent responses to probe requests with an unspecified
-network ID.
-The
-.Ql nobridge
-flag will disable the direct bridging of frames between associated
-nodes when operating in Host AP mode.
-Setting this flag will block and filter direct inter-station
-communications.
-.Pp
-Note that the
-.Ql hidenwid
-and
-.Ql nobridge
-options do not provide any security.
-The hidden network ID will be sent in clear text by associating
-stations and can be easily discovered with tools like
-.Xr tcpdump 8
-and
-.Xr hostapd 8 .
-.It Fl nwflag Ar flag
-Remove a specified flag for the wireless network interface.
-.It Cm nwid Ar id
-Set the network ID.
-The
-.Ar id
-can either be any text string up to 32 characters in length,
-or a series of hexadecimal digits up to 64 digits.
-An empty
-.Ar id
-string allows the interface to connect to any available access points.
-By default the
-.Nm
-driver uses an empty string.
-Note that network ID is synonymous with Extended Service Set ID (ESSID).
-.It Fl nwid
-Set the network ID to the empty string to allow the interface to connect
-to any available access point.
-.It Cm nwkey Ar key
-Enable WEP encryption using the specified
-.Ar key .
-The
-.Ar key
-can either be a string, a series of hexadecimal digits (preceded by
-.Sq 0x ) ,
-or a set of keys of the form
-.Dq n:k1,k2,k3,k4 ,
-where
-.Sq n
-specifies which of the keys will be used for transmitted packets,
-and the four keys,
-.Dq k1
-through
-.Dq k4 ,
-are configured as WEP keys.
-If a set of keys is specified, a comma
-.Pq Sq \&,
-within the key must be escaped with a backslash.
-Note that if multiple keys are used, their order must be the same within
-the network.
-.Nm
-is capable of using both 40-bit (5 characters or 10 hexadecimal digits)
-or 104-bit (13 characters or 26 hexadecimal digits) keys.
-.It Fl nwkey
-Disable WEP encryption.
-This is the default mode of operation.
-.El
+.Xr hostname.if 5 .
 .Sh FILES
 The following firmware file is loaded when an interface is brought up:
 .Pp
diff --git a/share/man/man4/uath.4 b/share/man/man4/uath.4
index 5044743ee4b..f9ebb16b80f 100644
--- a/share/man/man4/uath.4
+++ b/share/man/man4/uath.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: uath.4,v 1.12 2008/01/27 08:30:31 jmc Exp $
+.\" $OpenBSD: uath.4,v 1.13 2008/04/17 14:01:22 jmc Exp $
 .\"
 .\" Copyright (c) 2006
 .\"     Damien Bergamini <damien.bergamini@free.fr>
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: January 27 2008 $
+.Dd $Mdocdate: April 17 2008 $
 .Os
 .Dt UATH 4
 .Sh NAME
@@ -69,134 +69,13 @@ Unfortunately, due to serious weaknesses in WEP protocol
 it is strongly recommended that it not be used as the
 sole mechanism to secure wireless communication.
 WEP is not enabled by default.
-.Sh CONFIGURATION
+.Pp
 The
 .Nm
 driver can be configured at runtime with
 .Xr ifconfig 8
 or on boot with
-.Xr hostname.if 5
-using the following parameters:
-.Bl -tag -width Ds
-.It Cm bssid Ar bssid
-Set the desired BSSID.
-.It Fl bssid
-Unset the desired BSSID.
-The interface will automatically select a BSSID in this mode, which is
-the default.
-.It Cm chan Ar n
-Set the channel (radio frequency) to be used by the driver based on
-the given channel ID
-.Ar n .
-.It Fl chan
-Unset the desired channel to be used by the driver.
-The driver will automatically select a channel in this mode, which is
-the default.
-.It Cm media Ar media
-The
-.Nm
-driver supports the following
-.Ar media
-types:
-.Pp
-.Bl -tag -width autoselect -compact
-.It Cm autoselect
-Enable autoselection of the media type and options.
-.It Cm DS1
-Set 802.11b DS 1Mbps operation.
-.It Cm DS2
-Set 802.11b DS 2Mbps operation.
-.It Cm DS5
-Set 802.11b DS 5.5Mbps operation.
-.It Cm DS11
-Set 802.11b DS 11Mbps operation.
-.It Cm OFDM6
-Set 802.11a/g OFDM 6Mbps operation.
-.It Cm OFDM9
-Set 802.11a/g OFDM 9Mbps operation.
-.It Cm OFDM12
-Set 802.11a/g OFDM 12Mbps operation.
-.It Cm OFDM18
-Set 802.11a/g OFDM 18Mbps operation.
-.It Cm OFDM24
-Set 802.11a/g OFDM 24Mbps operation.
-.It Cm OFDM36
-Set 802.11a/g OFDM 36Mbps operation.
-.It Cm OFDM48
-Set 802.11a/g OFDM 48Mbps operation.
-.It Cm OFDM54
-Set 802.11a/g OFDM 54Mbps operation.
-.El
-.It Cm mediaopt Ar opts
-The
-.Nm
-driver supports the following media options:
-.Pp
-.Bl -tag -width monitor -compact
-.It Cm monitor
-Select monitor mode.
-.El
-.It Fl mediaopt Ar opts
-Disable the specified media options on the driver and return it to the
-default mode of operation (BSS).
-.It Cm mode Ar mode
-The
-.Nm
-driver supports the following modes:
-.Pp
-.Bl -tag -width 11b -compact
-.It Cm 11a
-Force 802.11a operation.
-.It Cm 11b
-Force 802.11b operation.
-.It Cm 11g
-Force 802.11g operation.
-.El
-.It Cm nwid Ar id
-Set the network ID.
-The
-.Ar id
-can either be any text string up to 32 characters in length,
-or a series of hexadecimal digits up to 64 digits.
-An empty
-.Ar id
-string allows the interface to connect to any available access points.
-By default the
-.Nm
-driver uses an empty string.
-Note that network ID is synonymous with Extended Service Set ID (ESSID).
-.It Fl nwid
-Set the network ID to the empty string to allow the interface to connect
-to any available access point.
-.It Cm nwkey Ar key
-Enable WEP encryption using the specified
-.Ar key .
-The
-.Ar key
-can either be a string, a series of hexadecimal digits (preceded by
-.Sq 0x ) ,
-or a set of keys of the form
-.Dq n:k1,k2,k3,k4 ,
-where
-.Sq n
-specifies which of the keys will be used for transmitted packets,
-and the four keys,
-.Dq k1
-through
-.Dq k4 ,
-are configured as WEP keys.
-If a set of keys is specified, a comma
-.Pq Sq \&,
-within the key must be escaped with a backslash.
-Note that if multiple keys are used, their order must be the same within
-the network.
-.Nm
-is capable of using both 40-bit (5 characters or 10 hexadecimal digits)
-or 104-bit (13 characters or 26 hexadecimal digits) keys.
-.It Fl nwkey
-Disable WEP encryption.
-This is the default mode of operation.
-.El
+.Xr hostname.if 5 .
 .Sh FILES
 The following firmware file is loaded when a device is plugged:
 .Pp
diff --git a/share/man/man4/upgt.4 b/share/man/man4/upgt.4
index 00bdb72a252..04c6dde6149 100644
--- a/share/man/man4/upgt.4
+++ b/share/man/man4/upgt.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: upgt.4,v 1.5 2008/01/20 00:14:41 mglocker Exp $
+.\" $OpenBSD: upgt.4,v 1.6 2008/04/17 14:01:22 jmc Exp $
 .\"
 .\" Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org>
 .\" Copyright (c) 2005-2007
@@ -48,7 +48,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: January 20 2008 $
+.Dd $Mdocdate: April 17 2008 $
 .Os
 .Dt UPGT 4
 .Sh NAME
@@ -107,136 +107,13 @@ WEP is not enabled by default.
 .\"The transmit speed is user-selectable or can be adapted automatically by the
 .\"driver depending on the received signal strength and on the number of hardware
 .\"transmission retries.
-.Sh CONFIGURATION
+.Pp
 The
 .Nm
 driver can be configured at runtime with
 .Xr ifconfig 8
 or on boot with
-.Xr hostname.if 5
-using the following parameters:
-.Bl -tag -width Ds
-.It Cm bssid Ar bssid
-Set the desired BSSID.
-.It Fl bssid
-Unset the desired BSSID.
-The interface will automatically select a BSSID in this mode, which is
-the default.
-.It Cm chan Ar n
-Set the channel (radio frequency) to be used by the driver based on
-the given channel ID
-.Ar n .
-.It Fl chan
-Unset the desired channel to be used by the driver.
-The driver will automatically select a channel in this mode, which is
-the default.
-.It Cm media Ar media
-The
-.Nm
-driver supports the following
-.Ar media
-types:
-.Pp
-.Bl -tag -width autoselect -compact
-.It Cm autoselect
-Enable autoselection of the media type and options.
-.It Cm DS1
-Set 802.11b DS 1Mbps operation.
-.It Cm DS2
-Set 802.11b DS 2Mbps operation.
-.It Cm DS5
-Set 802.11b DS 5.5Mbps operation.
-.It Cm DS11
-Set 802.11b DS 11Mbps operation.
-.It Cm OFDM6
-Set 802.11g OFDM 6Mbps operation.
-.It Cm OFDM9
-Set 802.11g OFDM 9Mbps operation.
-.It Cm OFDM12
-Set 802.11g OFDM 12Mbps operation.
-.It Cm OFDM18
-Set 802.11g OFDM 18Mbps operation.
-.It Cm OFDM24
-Set 802.11g OFDM 24Mbps operation.
-.It Cm OFDM36
-Set 802.11g OFDM 36Mbps operation.
-.It Cm OFDM48
-Set 802.11g OFDM 48Mbps operation.
-.It Cm OFDM54
-Set 802.11g OFDM 54Mbps operation.
-.El
-.It Cm mediaopt Ar opts
-The
-.Nm
-driver supports the following media options:
-.Pp
-.Bl -tag -width monitor -compact
-.\".It Cm hostap
-.\"Select Host AP operation.
-.\".It Cm ibss
-.\"Select IBSS operation.
-.It Cm monitor
-Select monitor mode.
-.El
-.It Fl mediaopt Ar opts
-Disable the specified media options on the driver and return it to the
-default mode of operation (BSS).
-.It Cm mode Ar mode
-The
-.Nm
-driver supports the following modes:
-.Pp
-.Bl -tag -width 11b -compact
-.It Cm 11b
-Force 802.11b operation.
-.It Cm 11g
-Force 802.11g operation.
-.El
-.It Cm nwid Ar id
-Set the network ID.
-The
-.Ar id
-can either be any text string up to 32 characters in length,
-or a series of hexadecimal digits up to 64 digits.
-An empty
-.Ar id
-string allows the interface to connect to any available access points.
-By default the
-.Nm
-driver uses an empty string.
-Note that network ID is synonymous with Extended Service Set ID (ESSID).
-.It Fl nwid
-Set the network ID to the empty string to allow the interface to connect
-to any available access point.
-.It Cm nwkey Ar key
-Enable WEP encryption using the specified
-.Ar key .
-The
-.Ar key
-can either be a string, a series of hexadecimal digits (preceded by
-.Sq 0x ) ,
-or a set of keys of the form
-.Dq n:k1,k2,k3,k4 ,
-where
-.Sq n
-specifies which of the keys will be used for transmitted packets,
-and the four keys,
-.Dq k1
-through
-.Dq k4 ,
-are configured as WEP keys.
-If a set of keys is specified, a comma
-.Pq Sq \&,
-within the key must be escaped with a backslash.
-Note that if multiple keys are used, their order must be the same within
-the network.
-.Nm
-is capable of using both 40-bit (5 characters or 10 hexadecimal digits)
-or 104-bit (13 characters or 26 hexadecimal digits) keys.
-.It Fl nwkey
-Disable WEP encryption.
-This is the default mode of operation.
-.El
+.Xr hostname.if 5 .
 .Sh FILES
 The driver needs a firmware file which is loaded when an interface is
 brought up:
diff --git a/share/man/man4/ural.4 b/share/man/man4/ural.4
index 6fd8a112699..8977574d714 100644
--- a/share/man/man4/ural.4
+++ b/share/man/man4/ural.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ural.4,v 1.4 2007/12/10 10:32:54 jmc Exp $
+.\" $OpenBSD: ural.4,v 1.5 2008/04/17 14:01:22 jmc Exp $
 .\"
 .\" Copyright (c) 2005-2007
 .\"	Damien Bergamini <damien.bergamini@free.fr>
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: December 10 2007 $
+.Dd $Mdocdate: April 17 2008 $
 .Os
 .Dt URAL 4
 .Sh NAME
@@ -76,167 +76,13 @@ WEP is not enabled by default.
 .Pp
 The transmit speed is user-selectable or can be adapted automatically by the
 driver depending on the number of hardware transmission retries.
-.Sh CONFIGURATION
+.Pp
 The
 .Nm
 driver can be configured at runtime with
 .Xr ifconfig 8
 or on boot with
-.Xr hostname.if 5
-using the following parameters:
-.Bl -tag -width Ds
-.It Cm bssid Ar bssid
-Set the desired BSSID.
-.It Fl bssid
-Unset the desired BSSID.
-The interface will automatically select a BSSID in this mode, which is
-the default.
-.It Cm chan Ar n
-Set the channel (radio frequency) to be used by the driver based on
-the given channel ID
-.Ar n .
-.It Fl chan
-Unset the desired channel to be used by the driver.
-The driver will automatically select a channel in this mode, which is
-the default.
-.It Cm media Ar media
-The
-.Nm
-driver supports the following
-.Ar media
-types:
-.Pp
-.Bl -tag -width autoselect -compact
-.It Cm autoselect
-Enable autoselection of the media type and options.
-.It Cm DS1
-Set 802.11b DS 1Mbps operation.
-.It Cm DS2
-Set 802.11b DS 2Mbps operation.
-.It Cm DS5
-Set 802.11b DS 5.5Mbps operation.
-.It Cm DS11
-Set 802.11b DS 11Mbps operation.
-.It Cm OFDM6
-Set 802.11g OFDM 6Mbps operation.
-.It Cm OFDM9
-Set 802.11g OFDM 9Mbps operation.
-.It Cm OFDM12
-Set 802.11g OFDM 12Mbps operation.
-.It Cm OFDM18
-Set 802.11g OFDM 18Mbps operation.
-.It Cm OFDM24
-Set 802.11g OFDM 24Mbps operation.
-.It Cm OFDM36
-Set 802.11g OFDM 36Mbps operation.
-.It Cm OFDM48
-Set 802.11g OFDM 48Mbps operation.
-.It Cm OFDM54
-Set 802.11g OFDM 54Mbps operation.
-.El
-.It Cm mediaopt Ar opts
-The
-.Nm
-driver supports the following media options:
-.Pp
-.Bl -tag -width monitor -compact
-.It Cm hostap
-Select Host AP operation.
-.It Cm ibss
-Select IBSS operation.
-.It Cm monitor
-Select monitor mode.
-.El
-.It Fl mediaopt Ar opts
-Disable the specified media options on the driver and return it to the
-default mode of operation (BSS).
-.It Cm mode Ar mode
-The
-.Nm
-driver supports the following modes:
-.Pp
-.Bl -tag -width 11b -compact
-.It Cm 11b
-Force 802.11b operation.
-.It Cm 11g
-Force 802.11g operation.
-.El
-.It Cm nwflag Ar flag
-Set a specified flag for the wireless network interface.
-The flag name can be either
-.Ql hidenwid
-or
-.Ql nobridge .
-The
-.Ql hidenwid
-flag will hide the network ID (ESSID) in beacon frames when operating
-in Host AP mode.
-It will also prevent responses to probe requests with an unspecified
-network ID.
-The
-.Ql nobridge
-flag will disable the direct bridging of frames between associated
-nodes when operating in Host AP mode.
-Setting this flag will block and filter direct inter-station
-communications.
-.Pp
-Note that the
-.Ql hidenwid
-and
-.Ql nobridge
-options do not provide any security.
-The hidden network ID will be sent in clear text by associating
-stations and can be easily discovered with tools like
-.Xr tcpdump 8
-and
-.Xr hostapd 8 .
-.It Fl nwflag Ar flag
-Remove a specified flag for the wireless network interface.
-.It Cm nwid Ar id
-Set the network ID.
-The
-.Ar id
-can either be any text string up to 32 characters in length,
-or a series of hexadecimal digits up to 64 digits.
-An empty
-.Ar id
-string allows the interface to connect to any available access points.
-By default the
-.Nm
-driver uses an empty string.
-Note that network ID is synonymous with Extended Service Set ID (ESSID).
-.It Fl nwid
-Set the network ID to the empty string to allow the interface to connect
-to any available access point.
-.It Cm nwkey Ar key
-Enable WEP encryption using the specified
-.Ar key .
-The
-.Ar key
-can either be a string, a series of hexadecimal digits (preceded by
-.Sq 0x ) ,
-or a set of keys of the form
-.Dq n:k1,k2,k3,k4 ,
-where
-.Sq n
-specifies which of the keys will be used for transmitted packets,
-and the four keys,
-.Dq k1
-through
-.Dq k4 ,
-are configured as WEP keys.
-If a set of keys is specified, a comma
-.Pq Sq \&,
-within the key must be escaped with a backslash.
-Note that if multiple keys are used, their order must be the same within
-the network.
-.Nm
-is capable of using both 40-bit (5 characters or 10 hexadecimal digits)
-or 104-bit (13 characters or 26 hexadecimal digits) keys.
-.It Fl nwkey
-Disable WEP encryption.
-This is the default mode of operation.
-.El
+.Xr hostname.if 5 .
 .Sh HARDWARE
 The following adapters should work:
 .Pp
diff --git a/share/man/man4/wi.4tbl b/share/man/man4/wi.4tbl
index d5eca9d6311..17952d3cb1d 100644
--- a/share/man/man4/wi.4tbl
+++ b/share/man/man4/wi.4tbl
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wi.4tbl,v 1.88 2007/12/10 10:32:54 jmc Exp $
+.\"	$OpenBSD: wi.4tbl,v 1.89 2008/04/17 14:01:22 jmc Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 1999
 .\"	Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\"	$FreeBSD: wi.4,v 1.3 1999/05/22 16:12:43 wpaul Exp $
 .\"
-.Dd $Mdocdate: December 10 2007 $
+.Dd $Mdocdate: April 17 2008 $
 .Dt WI 4
 .Os
 .Sh NAME
@@ -123,157 +123,13 @@ The Lucent WaveLAN/IEEE Bronze cards do not support WEP at all.
 See also
 .Sx CAVEATS
 below.
-.Sh CONFIGURATION
+.Pp
 The
 .Nm
 driver can be configured at runtime with
 .Xr ifconfig 8
 or on boot with
-.Xr hostname.if 5
-using the following parameters:
-.Bl -tag -width Ds
-.It Cm chan Ar n
-Set the channel (radio frequency) to be used by the driver based on
-the given channel ID
-.Ar n .
-.It Fl chan
-Unset the desired channel to be used by the driver.
-The driver will automatically select a channel in this mode, which is
-the default.
-.It Cm media Ar media
-The
-.Nm
-driver supports the following
-.Ar media
-types:
-.Pp
-.Bl -tag -width autoselect -compact
-.It Cm autoselect
-Enable autoselection of the media type and options.
-.It Cm DS1
-Set 802.11b DS 1Mbps operation.
-.It Cm DS2
-Set 802.11b DS 2Mbps operation.
-.It Cm DS5
-Set 802.11b DS 5.5Mbps operation.
-.It Cm DS11
-Set 802.11b DS 11Mbps operation.
-.El
-.It Cm mediaopt Ar opts
-The
-.Nm
-driver supports the following media options:
-.Pp
-.Bl -tag -width ibss-master -compact
-.It Cm adhoc
-Select ad-hoc demo mode.
-.It Cm hostap
-Select Host AP operation.
-.It Cm ibss
-Select IBSS operation.
-.It Cm ibss-master
-Select IBSS master operation.
-.El
-.It Fl mediaopt Ar opts
-Disable the specified media options on the driver and return it to the
-default mode of operation (BSS).
-.It Cm nwflag Ar flag
-Set a specified flag for the wireless network interface.
-The flag name can be either
-.Ql hidenwid
-or
-.Ql nobridge .
-The
-.Ql hidenwid
-flag will hide the network ID (ESSID) in beacon frames when operating
-in Host AP mode.
-It will also prevent responses to probe requests with an unspecified
-network ID.
-The
-.Ql nobridge
-flag will disable the direct bridging of frames between associated
-nodes when operating in Host AP mode.
-Setting this flag will block and filter direct inter-station
-communications.
-.Pp
-Note that the
-.Ql hidenwid
-and
-.Ql nobridge
-options do not provide any security.
-The hidden network ID will be sent in clear text by associating
-stations and can be easily discovered with tools like
-.Xr tcpdump 8
-and
-.Xr hostapd 8 .
-.It Fl nwflag Ar flag
-Remove a specified flag for the wireless network interface.
-.It Cm nwid Ar id
-Set the network ID.
-The
-.Ar id
-can either be any text string up to 32 characters in length,
-or a series of hexadecimal digits up to 64 digits.
-An empty
-.Ar id
-string allows the interface to connect to any available access points.
-By default the
-.Nm
-driver uses an empty string.
-Note that network ID is synonymous with Extended Service Set ID (ESSID).
-.It Fl nwid
-Set the network ID to the empty string to allow the interface to connect
-to any available access point.
-.It Cm nwkey Ar key
-Enable WEP encryption using the specified
-.Ar key .
-The
-.Ar key
-can either be a string, a series of hexadecimal digits (preceded by
-.Sq 0x ) ,
-or a set of keys of the form
-.Dq n:k1,k2,k3,k4 ,
-where
-.Sq n
-specifies which of the keys will be used for transmitted packets,
-and the four keys,
-.Dq k1
-through
-.Dq k4 ,
-are configured as WEP keys.
-If a set of keys is specified, a comma
-.Pq Sq \&,
-within the key must be escaped with a backslash.
-Note that if multiple keys are used, their order must be the same within
-the network.
-.Nm
-is capable of using both 40-bit (5 characters or 10 hexadecimal digits)
-or 104-bit (13 characters or 26 hexadecimal digits) keys.
-.It Fl nwkey
-Disable WEP encryption.
-This is the default mode of operation.
-.It Cm nwkey persist
-Enable WEP encryption with the persistent key stored in the network card.
-.It Cm nwkey persist : Ns Ar key
-Write
-.Ar key
-to the persistent memory of the network card,
-and enable WEP encryption using that key.
-.It Cm powersave
-Enable power saving mode.
-.It Fl powersave
-Disable power saving mode.
-This is the default mode of operation.
-.It Cm powersavesleep Ar duration
-Set the receiver sleep duration (in milliseconds) for power saving mode.
-.It Cm txpower Ar dBm
-Set the transmit power
-(and disable any auto level and transmit power controls).
-.It Fl txpower
-Disable manual transmit power
-(and enable any auto level and transmit power controls).
-This is the default mode of operation.
-.El
+.Xr hostname.if 5 .
 .Sh HARDWARE
 Cards supported by the
 .Nm
diff --git a/share/man/man4/wpi.4 b/share/man/man4/wpi.4
index e006570da11..29742e23035 100644
--- a/share/man/man4/wpi.4
+++ b/share/man/man4/wpi.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wpi.4,v 1.16 2007/09/11 18:10:15 damien Exp $
+.\" $OpenBSD: wpi.4,v 1.17 2008/04/17 14:01:22 jmc Exp $
 .\"
 .\" Copyright (c) 2006, 2007
 .\"	Damien Bergamini <damien.bergamini@free.fr>. All rights reserved.
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: September 11 2007 $
+.Dd $Mdocdate: April 17 2008 $
 .Os
 .Dt WPI 4
 .Sh NAME
@@ -72,110 +72,13 @@ WEP is not enabled by default.
 The device has one temperature sensor.
 Its value is in the range from 0 (coolest) to 285 (warmest).
 Sensor data is updated every 500 milliseconds.
-.Sh CONFIGURATION
+.Pp
 The
 .Nm
 driver can be configured at runtime with
 .Xr ifconfig 8
 or on boot with
-.Xr hostname.if 5
-using the following parameters:
-.Bl -tag -width Ds
-.It Cm bssid Ar bssid
-Set the desired BSSID.
-.It Fl bssid
-Unset the desired BSSID.
-The interface will automatically select a BSSID in this mode, which is
-the default.
-.It Cm chan Ar n
-Set the channel (radio frequency) to be used by the driver based on
-the given channel ID
-.Ar n .
-.It Fl chan
-Unset the desired channel to be used by the driver.
-The driver will automatically select a channel in this mode, which is
-the default.
-.It Cm media Ar media
-The
-.Nm
-driver supports the following
-.Ar media
-types:
-.Pp
-.Bl -tag -width autoselect -compact
-.It Cm autoselect
-Enable autoselection of the media type and options.
-.El
-.It Cm mediaopt Ar opts
-The
-.Nm
-driver supports the following media options:
-.Pp
-.Bl -tag -width monitor -compact
-.It Cm monitor
-Select monitor mode.
-.El
-.It Fl mediaopt Ar opts
-Disable the specified media options on the driver and return it to the
-default mode of operation (BSS).
-.It Cm mode Ar mode
-The
-.Nm
-driver supports the following modes:
-.Pp
-.Bl -tag -width 11b -compact
-.It Cm 11a
-Force 802.11a operation.
-.It Cm 11b
-Force 802.11b operation.
-.It Cm 11g
-Force 802.11g operation.
-.El
-.It Cm nwid Ar id
-Set the network ID.
-The
-.Ar id
-can either be any text string up to 32 characters in length,
-or a series of hexadecimal digits up to 64 digits.
-An empty
-.Ar id
-string allows the interface to connect to any available access points.
-By default the
-.Nm
-driver uses an empty string.
-Note that network ID is synonymous with Extended Service Set ID (ESSID).
-.It Fl nwid
-Set the network ID to the empty string to allow the interface to connect
-to any available access point.
-.It Cm nwkey Ar key
-Enable WEP encryption using the specified
-.Ar key .
-The
-.Ar key
-can either be a string, a series of hexadecimal digits (preceded by
-.Sq 0x ) ,
-or a set of keys of the form
-.Dq n:k1,k2,k3,k4 ,
-where
-.Sq n
-specifies which of the keys will be used for transmitted packets,
-and the four keys,
-.Dq k1
-through
-.Dq k4 ,
-are configured as WEP keys.
-If a set of keys is specified, a comma
-.Pq Sq \&,
-within the key must be escaped with a backslash.
-Note that if multiple keys are used, their order must be the same within
-the network.
-.Nm
-is capable of using both 40-bit (5 characters or 10 hexadecimal digits)
-or 104-bit (13 characters or 26 hexadecimal digits) keys.
-.It Fl nwkey
-Disable WEP encryption.
-This is the default mode of operation.
-.El
+.Xr hostname.if 5 .
 .Sh FILES
 The driver needs at least version 2.14.1.5 of the following firmware file,
 which is loaded when an interface is brought up:
diff --git a/share/man/man4/zyd.4 b/share/man/man4/zyd.4
index e36bba42e37..b7b94cd8849 100644
--- a/share/man/man4/zyd.4
+++ b/share/man/man4/zyd.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: zyd.4,v 1.26 2007/11/18 00:43:13 brad Exp $
+.\" $OpenBSD: zyd.4,v 1.27 2008/04/17 14:01:22 jmc Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 1999
 .\" Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -30,7 +30,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: November 18 2007 $
+.Dd $Mdocdate: April 17 2008 $
 .Dt ZYD 4
 .Os
 .Sh NAME
@@ -72,104 +72,13 @@ Unfortunately, due to serious weaknesses in WEP protocol
 it is strongly recommended that it not be used as the
 sole mechanism to secure wireless communication.
 WEP is not enabled by default.
-.Sh CONFIGURATION
+.Pp
 The
 .Nm
 driver can be configured at runtime with
 .Xr ifconfig 8
 or on boot with
-.Xr hostname.if 5
-using the following parameters:
-.Bl -tag -width Ds
-.It Cm bssid Ar bssid
-Set the desired BSSID.
-.It Fl bssid
-Unset the desired BSSID.
-The interface will automatically select a BSSID in this mode, which is
-the default.
-.It Cm chan Ar n
-Set the channel (radio frequency) to be used by the driver based on
-the given channel ID
-.Ar n .
-.It Fl chan
-Unset the desired channel to be used by the driver.
-The driver will automatically select a channel in this mode, which is
-the default.
-.It Cm media Ar media
-The
-.Nm
-driver supports the following
-.Ar media
-types:
-.Pp
-.Bl -tag -width autoselect -compact
-.It Cm autoselect
-Enable autoselection of the media type and options.
-.It Cm DS1
-Set 802.11b DS 1Mbps operation.
-.It Cm DS2
-Set 802.11b DS 2Mbps operation.
-.It Cm DS5
-Set 802.11b DS 5.5Mbps operation.
-.It Cm DS11
-Set 802.11b DS 11Mbps operation.
-.El
-.It Cm mediaopt Ar opts
-The
-.Nm
-driver supports the following media options:
-.Bl -tag -width ibss
-.It Cm ibss
-Select Independent Basic Service Set (IBSS) operation.
-.El
-.It Fl mediaopt Ar opts
-Disable the specified media options on the driver and return it to the
-default mode of operation (BSS).
-.It Cm nwid Ar id
-Set the network ID.
-The
-.Ar id
-can either be any text string up to 32 characters in length,
-or a series of hexadecimal digits up to 64 digits.
-An empty
-.Ar id
-string allows the interface to connect to any available access points.
-By default the
-.Nm
-driver uses an empty string.
-Note that network ID is synonymous with Extended Service Set ID (ESSID).
-.It Fl nwid
-Set the network ID to the empty string to allow the interface to connect
-to any available access point.
-.It Cm nwkey Ar key
-Enable WEP encryption using the specified
-.Ar key .
-The
-.Ar key
-can either be a string, a series of hexadecimal digits (preceded by
-.Sq 0x ) ,
-or a set of keys of the form
-.Dq n:k1,k2,k3,k4 ,
-where
-.Sq n
-specifies which of the keys will be used for transmitted packets,
-and the four keys,
-.Dq k1
-through
-.Dq k4 ,
-are configured as WEP keys.
-If a set of keys is specified, a comma
-.Pq Sq \&,
-within the key must be escaped with a backslash.
-Note that if multiple keys are used, their order must be the same within
-the network.
-.Nm
-is capable of using both 40-bit (5 characters or 10 hexadecimal digits)
-or 104-bit (13 characters or 26 hexadecimal digits) keys.
-.It Fl nwkey
-Disable WEP encryption.
-This is the default mode of operation.
-.El
+.Xr hostname.if 5 .
 .Sh HARDWARE
 The following devices are known to be supported by the
 .Nm