rework EXAMPLES somewhat, and remove the obsolete NONE NONE NONE dhcp

stuff; ok krw

27 files changed, 403 insertions, 646 deletions

diff --git a/share/man/man4/acx.4 b/share/man/man4/acx.4
index f3d32207f3f..d6839cef369 100644
--- a/share/man/man4/acx.4
+++ b/share/man/man4/acx.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: acx.4,v 1.44 2012/12/22 14:33:35 stsp Exp $
+.\"	$OpenBSD: acx.4,v 1.45 2013/02/14 07:40:42 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 22 2012 $
+.Dd $Mdocdate: February 14 2013 $
 .Dt ACX 4
 .Os
 .Sh NAME
@@ -150,40 +150,31 @@ driver:
 .It "ZyXEL G-360 EE" Ta ACX111 Ta PCI Ta b/g
 .El
 .Sh EXAMPLES
+The following example scans for available networks:
+.Pp
+.Dl # ifconfig acx0 scan
+.Pp
 The following
 .Xr hostname.if 5
-example configures acx0 to join whatever network is available on boot,
+example configures acx0 to join network
+.Dq mynwid ,
 using WEP key
-.Dq 0x1deadbeef1 ,
-channel 11, obtaining an IP address using DHCP:
+.Dq mywepkey ,
+obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
+nwid mynwid
+nwkey mywepkey
+dhcp
 .Ed
 .Pp
 The following
 .Xr hostname.if 5
 example creates a host-based access point on boot:
 .Bd -literal -offset indent
-inet 192.168.1.1 255.255.255.0 NONE media autoselect \e
-	mediaopt hostap nwid my_net chan 11
-.Ed
-.Pp
-Configure acx0 for WEP, using hex key
-.Dq 0x1deadbeef1 :
-.Bd -literal -offset indent
-# ifconfig acx0 nwkey 0x1deadbeef1
-.Ed
-.Pp
-Return acx0 to its default settings:
-.Bd -literal -offset indent
-# ifconfig acx0 -bssid -chan media autoselect \e
-	nwid "" -nwkey
-.Ed
-.Pp
-Join an existing BSS network,
-.Dq my_net :
-.Bd -literal -offset indent
-# ifconfig acx0 192.168.1.1 netmask 0xffffff00 nwid my_net
+inet 192.168.1.1 255.255.255.0
+mediaopt hostap
+nwid mynwid
+nwkey mywepkey
 .Ed
 .Sh SEE ALSO
 .Xr arp 4 ,
diff --git a/share/man/man4/an.4 b/share/man/man4/an.4
index f2ade64c91c..b488b389f7d 100644
--- a/share/man/man4/an.4
+++ b/share/man/man4/an.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: an.4,v 1.37 2009/09/02 07:00:24 jmc Exp $
+.\"	$OpenBSD: an.4,v 1.38 2013/02/14 07:40:42 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: September 2 2009 $
+.Dd $Mdocdate: February 14 2013 $
 .Dt AN 4
 .Os
 .Sh NAME
@@ -121,32 +121,21 @@ driver can be configured at runtime with
 or on boot with
 .Xr hostname.if 5 .
 .Sh EXAMPLES
+The following example scans for available networks:
+.Pp
+.Dl # ifconfig wi0 scan
+.Pp
 The following
 .Xr hostname.if 5
-example configures an0 to join whatever network is available on boot,
+example configures wi0 to join network
+.Dq mynwid ,
 using WEP key
-.Dq 0x1deadbeef1 ,
-channel 11, obtaining an IP address using DHCP:
-.Bd -literal -offset indent
-dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
-.Ed
-.Pp
-Configure an0 for WEP, using hex key
-.Dq 0x1deadbeef1 :
-.Bd -literal -offset indent
-# ifconfig an0 nwkey 0x1deadbeef1
-.Ed
-.Pp
-Return an0 to its default settings:
-.Bd -literal -offset indent
-# ifconfig an0 -bssid -chan media autoselect \e
-	nwid "" -nwkey
-.Ed
-.Pp
-Join an existing BSS network,
-.Dq my_net :
+.Dq mywepkey ,
+obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-# ifconfig an0 192.168.1.1 netmask 0xffffff00 nwid my_net
+nwid mynwid
+nwkey mywepkey
+dhcp
 .Ed
 .Sh DIAGNOSTICS
 .Bl -diag
diff --git a/share/man/man4/ath.4 b/share/man/man4/ath.4
index 7ebf98b9901..f2933541748 100644
--- a/share/man/man4/ath.4
+++ b/share/man/man4/ath.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ath.4,v 1.54 2011/09/03 22:59:07 jmc Exp $
+.\"	$OpenBSD: ath.4,v 1.55 2013/02/14 07:40:42 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: September 3 2011 $
+.Dd $Mdocdate: February 14 2013 $
 .Dt ATH 4
 .Os
 .Sh NAME
@@ -71,12 +71,10 @@ Support for the various devices is as follows:
 .It AR5210
 These devices support 802.11a operation with transmit speeds
 of 6 Mbps, 9 Mbps, 12 Mbps, 18 Mbps, 24 Mbps, 36 Mbps, 48 Mbps, and 54 Mbps.
-.Pp
 .It AR5211
 These devices support 802.11a and 802.11b operation with
 transmit speeds as above for 802.11a and
 1Mbps, 2Mbps, 5.5 Mbps, and 11Mbps for 802.11b operation.
-.Pp
 .It AR5212
 These devices support 802.11a, 802.11b, and 802.11g operation with
 transmit speeds as above for 802.11a, 802.11b, and 802.11g operation
@@ -196,36 +194,31 @@ driver:
 .It "Wistron CM9" Ta AR5212 Ta Mini PCI Ta a/b/g
 .El
 .Sh EXAMPLES
+The following example scans for available networks:
+.Pp
+.Dl # ifconfig ath0 scan
+.Pp
 The following
 .Xr hostname.if 5
-example configures ath0 to join whatever network is available on boot,
-using WEP key
-.Dq 0x1deadbeef1 ,
-channel 11, obtaining an IP address using DHCP:
+example configures ath0 to join network
+.Dq mynwid ,
+using WPA key
+.Dq mywpakey ,
+obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
+nwid mynwid
+wpakey mywpakey
+dhcp
 .Ed
 .Pp
 The following
 .Xr hostname.if 5
 example creates a host-based access point on boot:
 .Bd -literal -offset indent
-inet 192.168.1.1 255.255.255.0 NONE media autoselect \e
-	mediaopt hostap nwid my_net chan 11
-.Ed
-.Pp
-Configure ath0 to join network
-.Dq my_net
-using WPA with passphrase
-.Dq my_passphrase :
-.Bd -literal -offset indent
-# ifconfig ath0 nwid my_net wpakey my_passphrase
-.Ed
-.Pp
-Join an existing BSS network,
-.Dq my_net :
-.Bd -literal -offset indent
-# ifconfig ath0 192.168.1.1 netmask 0xffffff00 nwid my_net
+inet 192.168.1.1 255.255.255.0
+mediaopt hostap
+nwid mynwid
+wpakey mywpakey
 .Ed
 .Sh DIAGNOSTICS
 .Bl -diag
diff --git a/share/man/man4/athn.4 b/share/man/man4/athn.4
index 13de6fd510c..4b83baa1616 100644
--- a/share/man/man4/athn.4
+++ b/share/man/man4/athn.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: athn.4,v 1.21 2012/09/17 11:04:24 sthen Exp $
+.\" $OpenBSD: athn.4,v 1.22 2013/02/14 07:40:42 jmc Exp $
 .\"
 .\" Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>.
 .\"
@@ -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: September 17 2012 $
+.Dd $Mdocdate: February 14 2013 $
 .Dt ATHN 4
 .Os
 .Sh NAME
@@ -173,36 +173,31 @@ firmware files, which are loaded when an interface is attached:
 A prepackaged version of the firmware can be installed using
 .Xr fw_update 1 .
 .Sh EXAMPLES
+The following example scans for available networks:
+.Pp
+.Dl # ifconfig athn0 scan
+.Pp
 The following
 .Xr hostname.if 5
-example configures athn0 to join whatever network is available on boot,
-using WEP key
-.Dq 0x1deadbeef1 ,
-channel 11, obtaining an IP address using DHCP:
+example configures athn0 to join network
+.Dq mynwid ,
+using WPA key
+.Dq mywpakey ,
+obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
+nwid mynwid
+wpakey mywpakey
+dhcp
 .Ed
 .Pp
 The following
 .Xr hostname.if 5
 example creates a host-based access point on boot:
 .Bd -literal -offset indent
-inet 192.168.1.1 255.255.255.0 NONE media autoselect \e
-	mediaopt hostap nwid my_net chan 11
-.Ed
-.Pp
-Configure athn0 to join network
-.Dq my_net
-using WPA with passphrase
-.Dq my_passphrase :
-.Bd -literal -offset indent
-# ifconfig athn0 nwid my_net wpakey my_passphrase
-.Ed
-.Pp
-Join an existing BSS network,
-.Dq my_net :
-.Bd -literal -offset indent
-# ifconfig athn0 192.168.1.1 netmask 0xffffff00 nwid my_net
+inet 192.168.1.1 255.255.255.0
+mediaopt hostap
+nwid mynwid
+wpakey mywpakey
 .Ed
 .Sh DIAGNOSTICS
 .Bl -diag
diff --git a/share/man/man4/atu.4 b/share/man/man4/atu.4
index b3be27e1477..db48aa72125 100644
--- a/share/man/man4/atu.4
+++ b/share/man/man4/atu.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: atu.4,v 1.35 2009/09/02 07:00:24 jmc Exp $
+.\" $OpenBSD: atu.4,v 1.36 2013/02/14 07:40:42 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: September 2 2009 $
+.Dd $Mdocdate: February 14 2013 $
 .Dt ATU 4
 .Os
 .Sh NAME
@@ -166,32 +166,21 @@ driver when the device is attached:
 .It Pa /etc/firmware/atu-rfmd2958smc-ext
 .El
 .Sh EXAMPLES
+The following example scans for available networks:
+.Pp
+.Dl # ifconfig atu0 scan
+.Pp
 The following
 .Xr hostname.if 5
-example configures atu0 to join whatever network is available on boot,
+example configures atu0 to join network
+.Dq mynwid ,
 using WEP key
-.Dq 0x1deadbeef1 ,
-channel 11, obtaining an IP address using DHCP:
-.Bd -literal -offset indent
-dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
-.Ed
-.Pp
-Configure atu0 for WEP, using hex key
-.Dq 0x1deadbeef1 :
-.Bd -literal -offset indent
-# ifconfig atu0 nwkey 0x1deadbeef1
-.Ed
-.Pp
-Return atu0 to its default settings:
-.Bd -literal -offset indent
-# ifconfig atu0 -bssid -chan media autoselect \e
-	nwid "" -nwkey
-.Ed
-.Pp
-Join an existing BSS network,
-.Dq my_net :
+.Dq mywepkey ,
+obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-# ifconfig atu0 192.168.0.2 netmask 0xffffff00 nwid my_net
+nwid mynwid
+nwkey mywepkey
+dhcp
 .Ed
 .Sh SEE ALSO
 .Xr arp 4 ,
diff --git a/share/man/man4/atw.4 b/share/man/man4/atw.4
index da8e15b174a..fca9fadb977 100644
--- a/share/man/man4/atw.4
+++ b/share/man/man4/atw.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: atw.4,v 1.31 2012/08/18 08:44:25 jmc Exp $
+.\"     $OpenBSD: atw.4,v 1.32 2013/02/14 07:40:42 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: August 18 2012 $
+.Dd $Mdocdate: February 14 2013 $
 .Dt ATW 4
 .Os
 .Sh NAME
@@ -133,32 +133,21 @@ driver does not yet support cards using revision 0x30 (ADM8211C).
 .\".Bl -tag -width Ds -offset indent -compact
 .\".El
 .Sh EXAMPLES
+The following example scans for available networks:
+.Pp
+.Dl # ifconfig atw0 scan
+.Pp
 The following
 .Xr hostname.if 5
-example configures atw0 to join whatever network is available on boot,
+example configures atw0 to join network
+.Dq mynwid ,
 using WEP key
-.Dq 0x1deadbeef1 ,
-channel 11, obtaining an IP address using DHCP:
-.Bd -literal -offset indent
-dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
-.Ed
-.Pp
-Configure atw0 for WEP, using hex key
-.Dq 0x1deadbeef1 :
-.Bd -literal -offset indent
-# ifconfig atw0 nwkey 0x1deadbeef1
-.Ed
-.Pp
-Return atw0 to its default settings:
-.Bd -literal -offset indent
-# ifconfig atw0 -bssid -chan media autoselect \e
-	nwid "" -nwkey
-.Ed
-.Pp
-Join an existing BSS network,
-.Dq my_net :
+.Dq mywepkey ,
+obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-# ifconfig atw0 192.168.1.1 netmask 0xffffff00 nwid my_net
+nwid mynwid
+nwkey mywepkey
+dhcp
 .Ed
 .Sh DIAGNOSTICS
 .Bl -diag
diff --git a/share/man/man4/bwi.4 b/share/man/man4/bwi.4
index 8e24e92348a..258386af905 100644
--- a/share/man/man4/bwi.4
+++ b/share/man/man4/bwi.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bwi.4,v 1.35 2012/09/17 11:04:24 sthen Exp $
+.\" $OpenBSD: bwi.4,v 1.36 2013/02/14 07:40:42 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: September 17 2012 $
+.Dd $Mdocdate: February 14 2013 $
 .Dt BWI 4
 .Os
 .Sh NAME
@@ -119,36 +119,21 @@ driver:
 .It "US Robotics 5411" Ta BCM4318 Ta CardBus Ta b/g
 .El
 .Sh EXAMPLES
-The following
-.Xr hostname.if 5
-example configures bwi0 to join whatever network is available on boot,
-using WEP key
-.Dq 0x1deadbeef1 ,
-channel 11, obtaining an IP address using DHCP:
-.Bd -literal -offset indent
-dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
-.\".Ed
-.\".Pp
-.\"The following
-.\".Xr hostname.if 5
-.\"example creates a host-based access point on boot:
-.\".Bd -literal -offset indent
-.\"inet 192.168.1.1 255.255.255.0 NONE media autoselect \e
-.\"	mediaopt hostap nwid my_net chan 11
-.Ed
+The following example scans for available networks:
 .Pp
-Configure bwi0 to join network
-.Dq my_net
-using WPA with passphrase
-.Dq my_passphrase :
-.Bd -literal -offset indent
-# ifconfig bwi0 nwid my_net wpakey my_passphrase
-.Ed
+.Dl # ifconfig bwi0 scan
 .Pp
-Join an existing BSS network,
-.Dq my_net :
+The following
+.Xr hostname.if 5
+example configures bwi0 to join network
+.Dq mynwid ,
+using WPA key
+.Dq mywpakey ,
+obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-# ifconfig bwi0 192.168.1.1 netmask 0xffffff00 nwid my_net
+nwid mynwid
+wpakey mywpakey
+dhcp
 .Ed
 .Sh SEE ALSO
 .Xr arp 4 ,
diff --git a/share/man/man4/ipw.4 b/share/man/man4/ipw.4
index 360844ed145..54ed39e4526 100644
--- a/share/man/man4/ipw.4
+++ b/share/man/man4/ipw.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ipw.4,v 1.37 2012/09/17 11:04:24 sthen Exp $
+.\" $OpenBSD: ipw.4,v 1.38 2013/02/14 07:40:42 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: September 17 2012 $
+.Dd $Mdocdate: February 14 2013 $
 .Dt IPW 4
 .Os
 .Sh NAME
@@ -111,28 +111,21 @@ majid.awad@intel.com.
 A prepackaged version of the firmware can be installed using
 .Xr fw_update 1 .
 .Sh EXAMPLES
-The following
-.Xr hostname.if 5
-example configures ipw0 to join whatever network is available on boot,
-using WEP key
-.Dq 0x1deadbeef1 ,
-channel 11, obtaining an IP address using DHCP:
-.Bd -literal -offset indent
-dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
-.Ed
+The following example scans for available networks:
 .Pp
-Configure ipw0 to join network
-.Dq my_net
-using WPA with passphrase
-.Dq my_passphrase :
-.Bd -literal -offset indent
-# ifconfig ipw0 nwid my_net wpakey my_passphrase
-.Ed
+.Dl # ifconfig ipw0 scan
 .Pp
-Join an existing BSS network,
-.Dq my_net :
+The following
+.Xr hostname.if 5
+example configures ipw0 to join network
+.Dq mynwid ,
+using WPA key
+.Dq mywpakey ,
+obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-# ifconfig ipw0 192.168.1.1 netmask 0xffffff00 nwid my_net
+nwid mynwid
+wpakey mywpakey
+dhcp
 .Ed
 .Sh DIAGNOSTICS
 .Bl -diag
diff --git a/share/man/man4/iwi.4 b/share/man/man4/iwi.4
index b0875396ad7..442554c6977 100644
--- a/share/man/man4/iwi.4
+++ b/share/man/man4/iwi.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: iwi.4,v 1.43 2012/09/17 11:04:24 sthen Exp $
+.\" $OpenBSD: iwi.4,v 1.44 2013/02/14 07:40:42 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: September 17 2012 $
+.Dd $Mdocdate: February 14 2013 $
 .Dt IWI 4
 .Os
 .Sh NAME
@@ -110,28 +110,21 @@ majid.awad@intel.com.
 A prepackaged version of the firmware can be installed using
 .Xr fw_update 1 .
 .Sh EXAMPLES
-The following
-.Xr hostname.if 5
-example configures iwi0 to join whatever network is available on boot,
-using WEP key
-.Dq 0x1deadbeef1 ,
-channel 11, obtaining an IP address using DHCP:
-.Bd -literal -offset indent
-dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
-.Ed
+The following example scans for available networks:
 .Pp
-Configure iwi0 to join network
-.Dq my_net
-using WPA with passphrase
-.Dq my_passphrase :
-.Bd -literal -offset indent
-# ifconfig iwi0 nwid my_net wpakey my_passphrase
-.Ed
+.Dl # ifconfig iwi0 scan
 .Pp
-Join an existing BSS network,
-.Dq my_net :
+The following
+.Xr hostname.if 5
+example configures iwi0 to join network
+.Dq mynwid ,
+using WPA key
+.Dq mywpakey ,
+obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-# ifconfig iwi0 192.168.1.1 netmask 0xffffff00 nwid my_net
+nwid mynwid
+wpakey mywpakey
+dhcp
 .Ed
 .Sh DIAGNOSTICS
 .Bl -diag
diff --git a/share/man/man4/iwn.4 b/share/man/man4/iwn.4
index b005b5a7728..727b8195fa4 100644
--- a/share/man/man4/iwn.4
+++ b/share/man/man4/iwn.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: iwn.4,v 1.35 2012/09/17 11:04:24 sthen Exp $
+.\" $OpenBSD: iwn.4,v 1.36 2013/02/14 07:40:42 jmc Exp $
 .\"
 .\" Copyright (c) 2007,2008
 .\"	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: September 17 2012 $
+.Dd $Mdocdate: February 14 2013 $
 .Dt IWN 4
 .Os
 .Sh NAME
@@ -132,28 +132,21 @@ users have to download these files on their own.
 A prepackaged version of the firmware can be installed using
 .Xr fw_update 1 .
 .Sh EXAMPLES
-The following
-.Xr hostname.if 5
-example configures iwn0 to join whatever network is available on boot,
-using WEP key
-.Dq 0x1deadbeef1 ,
-channel 11, obtaining an IP address using DHCP:
-.Bd -literal -offset indent
-dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
-.Ed
+The following example scans for available networks:
 .Pp
-Configure iwn0 to join network
-.Dq my_net
-using WPA with passphrase
-.Dq my_passphrase :
-.Bd -literal -offset indent
-# ifconfig iwn0 nwid my_net wpakey my_passphrase
-.Ed
+.Dl # ifconfig iwn0 scan
 .Pp
-Join an existing BSS network,
-.Dq my_net :
+The following
+.Xr hostname.if 5
+example configures iwn0 to join network
+.Dq mynwid ,
+using WPA key
+.Dq mywpakey ,
+obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-# ifconfig iwn0 192.168.1.1 netmask 0xffffff00 nwid my_net
+nwid mynwid
+wpakey mywpakey
+dhcp
 .Ed
 .Sh DIAGNOSTICS
 .Bl -diag
diff --git a/share/man/man4/malo.4 b/share/man/man4/malo.4
index e0ed5363294..0aa90b1cf78 100644
--- a/share/man/man4/malo.4
+++ b/share/man/man4/malo.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: malo.4,v 1.41 2012/09/17 11:04:24 sthen Exp $
+.\"	$OpenBSD: malo.4,v 1.42 2013/02/14 07:40:42 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: September 17 2012 $
+.Dd $Mdocdate: February 14 2013 $
 .Dt MALO 4
 .Os
 .Sh NAME
@@ -130,36 +130,21 @@ driver:
 .It "Tenda TWL542P" Ta 88W8335 Ta PCI Ta b/g
 .El
 .Sh EXAMPLES
-The following
-.Xr hostname.if 5
-example configures malo0 to join whatever network is available on boot,
-using WEP key
-.Dq 0x1deadbeef1 ,
-channel 11, obtaining an IP address using DHCP:
-.Bd -literal -offset indent
-dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
-.Ed
+The following example scans for available networks:
 .Pp
-.\"The following
-.\".Xr hostname.if 5
-.\"example creates a host-based access point on boot:
-.\".Bd -literal -offset indent
-.\"inet 192.168.1.1 255.255.255.0 NONE media autoselect \e
-.\"	mediaopt hostap nwid my_net chan 11
-.\".Ed
-.\".Pp
-Configure malo0 to join network
-.Dq my_net
-using WPA with passphrase
-.Dq my_passphrase :
-.Bd -literal -offset indent
-# ifconfig malo0 nwid my_net wpakey my_passphrase
-.Ed
+.Dl # ifconfig malo0 scan
 .Pp
-Join an existing BSS network,
-.Dq my_net :
+The following
+.Xr hostname.if 5
+example configures malo0 to join network
+.Dq mynwid ,
+using WPA key
+.Dq mywpakey ,
+obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-# ifconfig malo0 192.168.1.1 netmask 0xffffff00 nwid my_net
+nwid mynwid
+wpakey mywpakey
+dhcp
 .Ed
 .Sh SEE ALSO
 .Xr arp 4 ,
diff --git a/share/man/man4/otus.4 b/share/man/man4/otus.4
index 62a64ea91c7..428ee8f0ada 100644
--- a/share/man/man4/otus.4
+++ b/share/man/man4/otus.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: otus.4,v 1.21 2012/09/17 11:04:24 sthen Exp $
+.\" $OpenBSD: otus.4,v 1.22 2013/02/14 07:40:42 jmc Exp $
 .\"
 .\" Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
 .\"
@@ -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: September 17 2012 $
+.Dd $Mdocdate: February 14 2013 $
 .Dt OTUS 4
 .Os
 .Sh NAME
@@ -105,28 +105,21 @@ The following adapters should work:
 .It ZyXEL NWD-271N
 .El
 .Sh EXAMPLES
-The following
-.Xr hostname.if 5
-example configures otus0 to join whatever network is available on boot,
-using WEP key
-.Dq 0x1deadbeef1 ,
-channel 11, obtaining an IP address using DHCP:
-.Bd -literal -offset indent
-dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
-.Ed
+The following example scans for available networks:
 .Pp
-Configure otus0 to join network
-.Dq my_net
-using WPA with passphrase
-.Dq my_passphrase :
-.Bd -literal -offset indent
-# ifconfig otus0 nwid my_net wpakey my_passphrase
-.Ed
+.Dl # ifconfig otus0 scan
 .Pp
-Join an existing BSS network,
-.Dq my_net :
+The following
+.Xr hostname.if 5
+example configures otus0 to join network
+.Dq mynwid ,
+using WPA key
+.Dq mywpakey ,
+obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-# ifconfig otus0 192.168.1.1 netmask 0xffffff00 nwid my_net
+nwid mynwid
+wpakey mywpakey
+dhcp
 .Ed
 .Sh DIAGNOSTICS
 .Bl -diag
diff --git a/share/man/man4/pgt.4 b/share/man/man4/pgt.4
index fc4503786ed..fdac12e3511 100644
--- a/share/man/man4/pgt.4
+++ b/share/man/man4/pgt.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pgt.4,v 1.38 2012/09/17 11:04:24 sthen Exp $
+.\"	$OpenBSD: pgt.4,v 1.39 2013/02/14 07:40:42 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: September 17 2012 $
+.Dd $Mdocdate: February 14 2013 $
 .Dt PGT 4
 .Os
 .Sh NAME
@@ -138,40 +138,31 @@ driver:
 .It "ZyXEL ZyAIR G-100" Ta ISL3890 Ta CardBus
 .El
 .Sh EXAMPLES
+The following example scans for available networks:
+.Pp
+.Dl # ifconfig pgt0 scan
+.Pp
 The following
 .Xr hostname.if 5
-example configures pgt0 to join whatever network is available on boot,
+example configures pgt0 to join network
+.Dq mynwid ,
 using WEP key
-.Dq 0x1deadbeef1 ,
-channel 11, obtaining an IP address using DHCP:
+.Dq mywepkey ,
+obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
+nwid mynwid
+nwkey mywepkey
+dhcp
 .Ed
 .Pp
 The following
 .Xr hostname.if 5
 example creates a host-based access point on boot:
 .Bd -literal -offset indent
-inet 192.168.1.1 255.255.255.0 NONE media autoselect \e
-	mediaopt hostap nwid my_net chan 11
-.Ed
-.Pp
-Configure pgt0 for WEP, using hex key
-.Dq 0x1deadbeef1 :
-.Bd -literal -offset indent
-# ifconfig pgt0 nwkey 0x1deadbeef1
-.Ed
-.Pp
-Return pgt0 to its default settings:
-.Bd -literal -offset indent
-# ifconfig pgt0 -bssid -chan media autoselect \e
-	nwid "" -nwkey
-.Ed
-.Pp
-Join an existing BSS network,
-.Dq my_net :
-.Bd -literal -offset indent
-# ifconfig pgt0 192.168.1.1 netmask 0xffffff00 nwid my_net
+inet 192.168.1.1 255.255.255.0
+mediaopt hostap
+nwid mynwid
+nwkey mywepkey
 .Ed
 .Sh SEE ALSO
 .Xr arp 4 ,
diff --git a/share/man/man4/ral.4 b/share/man/man4/ral.4
index 07ded4e0240..1ab91a02c49 100644
--- a/share/man/man4/ral.4
+++ b/share/man/man4/ral.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ral.4,v 1.100 2012/10/11 09:43:22 kettenis Exp $
+.\" $OpenBSD: ral.4,v 1.101 2013/02/14 07:40:42 jmc Exp $
 .\"
 .\" Copyright (c) 2005-2010 Damien Bergamini <damien.bergamini@free.fr>
 .\"
@@ -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: October 11 2012 $
+.Dd $Mdocdate: February 14 2013 $
 .Dt RAL 4
 .Os
 .Sh NAME
@@ -266,53 +266,32 @@ Tonze PC-620C.
 Zinwell ZWX-G360.
 .Ed
 .Sh EXAMPLES
+The following example scans for available networks:
+.Pp
+.Dl # ifconfig ral0 scan
+.Pp
 The following
 .Xr hostname.if 5
-example configures ral0 to join whatever network is available on boot,
-using WEP key
-.Dq 0x1deadbeef1 ,
-channel 11, obtaining an IP address using DHCP:
+example configures ral0 to join network
+.Dq mynwid ,
+using WPA key
+.Dq mywpakey ,
+obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
+nwid mynwid
+wpakey mywpakey
+dhcp
 .Ed
 .Pp
 The following
 .Xr hostname.if 5
 example creates a host-based access point on boot:
 .Bd -literal -offset indent
-inet 192.168.1.1 255.255.255.0 NONE media autoselect \e
-	mediaopt hostap nwid my_net chan 11
-.Ed
-.Pp
-Configure ral0 to join network
-.Dq my_net
-using WPA with passphrase
-.Dq my_passphrase :
-.Bd -literal -offset indent
-# ifconfig ral0 nwid my_net wpakey my_passphrase
+inet 192.168.1.1 255.255.255.0
+mediaopt hostap
+nwid mynwid
+wpakey mywpakey
 .Ed
-.Pp
-Join an existing BSS network,
-.Dq my_net :
-.Bd -literal -offset indent
-# ifconfig ral0 192.168.1.1 netmask 0xffffff00 nwid my_net
-.Ed
-.Sh DIAGNOSTICS
-.Bl -diag
-.It "ral%d: error %d, could not read firmware %s"
-For some reason, the driver was unable to read the firmware image from the
-filesystem.
-The file might be missing or corrupted.
-.It "ral%d: could not load 8051 microcode"
-An error occurred while attempting to upload the microcode to the onboard 8051
-microcontroller unit.
-.It "ral%d: timeout waiting for MCU to initialize"
-The onboard 8051 microcontroller unit failed to initialize in time.
-.It "ral%d: device timeout"
-A frame dispatched to the hardware for transmission did not complete in time.
-The driver will reset the hardware.
-This should not happen.
-.El
 .Sh SEE ALSO
 .Xr arp 4 ,
 .Xr cardbus 4 ,
diff --git a/share/man/man4/ray.4 b/share/man/man4/ray.4
index 300cfd491f4..387d946379a 100644
--- a/share/man/man4/ray.4
+++ b/share/man/man4/ray.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ray.4,v 1.24 2008/04/17 14:01:22 jmc Exp $
+.\"	$OpenBSD: ray.4,v 1.25 2013/02/14 07:40:42 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: April 17 2008 $
+.Dd $Mdocdate: February 14 2013 $
 .Dt RAY 4
 .Os
 .Sh NAME
@@ -100,23 +100,18 @@ driver include:
 .It WebGear Aviator PRO
 .El
 .Sh EXAMPLES
-The following
-.Xr hostname.if 5
-example configures ray0 to join whatever network is available on boot,
-channel 11, obtaining an IP address using DHCP:
-.Bd -literal -offset indent
-dhcp NONE NONE NONE chan 11
-.Ed
+The following example scans for available networks:
 .Pp
-Return ray0 to its default settings:
-.Bd -literal -offset indent
-# ifconfig ray0 -bssid -chan media autoselect nwid ""
-.Ed
+.Dl # ifconfig ray0 scan
 .Pp
-Join an existing BSS network,
-.Dq my_net :
+The following
+.Xr hostname.if 5
+example configures ray0 to join network
+.Dq mynwid ,
+obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-# ifconfig ray0 192.168.1.1 netmask 0xffffff00 nwid my_net
+nwid mynwid
+dhcp
 .Ed
 .Sh DIAGNOSTICS
 .Bl -diag
diff --git a/share/man/man4/rsu.4 b/share/man/man4/rsu.4
index 8ddb87e6a59..c81948e12c2 100644
--- a/share/man/man4/rsu.4
+++ b/share/man/man4/rsu.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rsu.4,v 1.10 2012/09/17 11:04:24 sthen Exp $
+.\" $OpenBSD: rsu.4,v 1.11 2013/02/14 07:40:42 jmc Exp $
 .\"
 .\" Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
 .\"
@@ -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: September 17 2012 $
+.Dd $Mdocdate: February 14 2013 $
 .Dt RSU 4
 .Os
 .Sh NAME
@@ -98,28 +98,21 @@ The following adapters should work:
 .It TRENDnet TEW-649UB
 .El
 .Sh EXAMPLES
-The following
-.Xr hostname.if 5
-example configures rsu0 to join whatever network is available on boot,
-using WEP key
-.Dq 0x1deadbeef1 ,
-channel 11, obtaining an IP address using DHCP:
-.Bd -literal -offset indent
-dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
-.Ed
+The following example scans for available networks:
 .Pp
-Configure rsu0 to join network
-.Dq my_net
-using WPA with passphrase
-.Dq my_passphrase :
-.Bd -literal -offset indent
-# ifconfig rsu0 nwid my_net wpakey my_passphrase
-.Ed
+.Dl # ifconfig rsu0 scan
 .Pp
-Join an existing BSS network,
-.Dq my_net :
+The following
+.Xr hostname.if 5
+example configures rsu0 to join network
+.Dq mynwid ,
+using WPA key
+.Dq mywpakey ,
+obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-# ifconfig rsu0 192.168.1.1 netmask 0xffffff00 nwid my_net
+nwid mynwid
+wpakey mywpakey
+dhcp
 .Ed
 .Sh DIAGNOSTICS
 .Bl -diag
diff --git a/share/man/man4/rtw.4 b/share/man/man4/rtw.4
index 59cdd81e5ef..0ae20da21ab 100644
--- a/share/man/man4/rtw.4
+++ b/share/man/man4/rtw.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rtw.4,v 1.40 2012/08/18 08:44:25 jmc Exp $
+.\"	$OpenBSD: rtw.4,v 1.41 2013/02/14 07:40:42 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: August 18 2012 $
+.Dd $Mdocdate: February 14 2013 $
 .Dt RTW 4
 .Os
 .Sh NAME
@@ -123,40 +123,31 @@ The following adapters should work:
 .It Li "Zonet ZEW1000" Ta GRF5101 Ta CardBus
 .El
 .Sh EXAMPLES
+The following example scans for available networks:
+.Pp
+.Dl # ifconfig rtw0 scan
+.Pp
 The following
 .Xr hostname.if 5
-example configures rtw0 to join whatever network is available on boot,
+example configures rtw0 to join network
+.Dq mynwid ,
 using WEP key
-.Dq 0x1deadbeef1 ,
-channel 11, obtaining an IP address using DHCP:
+.Dq mywepkey ,
+obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
+nwid mynwid
+nwkey mywepkey
+dhcp
 .Ed
 .Pp
 The following
 .Xr hostname.if 5
 example creates a host-based access point on boot:
 .Bd -literal -offset indent
-inet 192.168.1.1 255.255.255.0 NONE media autoselect \e
-	mediaopt hostap nwid my_net chan 11
-.Ed
-.Pp
-Configure rtw0 for WEP, using hex key
-.Dq 0x1deadbeef1 :
-.Bd -literal -offset indent
-# ifconfig rtw0 nwkey 0x1deadbeef1
-.Ed
-.Pp
-Return rtw0 to its default settings:
-.Bd -literal -offset indent
-# ifconfig rtw0 -bssid -chan media autoselect \e
-	nwid "" -nwkey
-.Ed
-.Pp
-Join an existing BSS network,
-.Dq my_net :
-.Bd -literal -offset indent
-# ifconfig rtw0 192.168.1.1 netmask 0xffffff00 nwid my_net
+inet 192.168.1.1 255.255.255.0
+mediaopt hostap
+nwid mynwid
+nwkey mywepkey
 .Ed
 .Sh SEE ALSO
 .Xr arp 4 ,
diff --git a/share/man/man4/rum.4 b/share/man/man4/rum.4
index ecc272ebb18..77dd1af7637 100644
--- a/share/man/man4/rum.4
+++ b/share/man/man4/rum.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rum.4,v 1.50 2012/08/12 17:01:35 schwarze Exp $
+.\" $OpenBSD: rum.4,v 1.51 2013/02/14 07:40:42 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: August 12 2012 $
+.Dd $Mdocdate: February 14 2013 $
 .Dt RUM 4
 .Os
 .Sh NAME
@@ -150,36 +150,31 @@ The following adapters should work:
 .It TP-LINK TL-WN321G
 .El
 .Sh EXAMPLES
+The following example scans for available networks:
+.Pp
+.Dl # ifconfig rum0 scan
+.Pp
 The following
 .Xr hostname.if 5
-example configures rum0 to join whatever network is available on boot,
-using WEP key
-.Dq 0x1deadbeef1 ,
-channel 11, obtaining an IP address using DHCP:
+example configures rum0 to join network
+.Dq mynwid ,
+using WPA key
+.Dq mywpakey ,
+obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
+nwid mynwid
+wpakey mywpakey
+dhcp
 .Ed
 .Pp
 The following
 .Xr hostname.if 5
 example creates a host-based access point on boot:
 .Bd -literal -offset indent
-inet 192.168.1.1 255.255.255.0 NONE media autoselect \e
-	mediaopt hostap nwid my_net chan 11
-.Ed
-.Pp
-Configure rum0 to join network
-.Dq my_net
-using WPA with passphrase
-.Dq my_passphrase :
-.Bd -literal -offset indent
-# ifconfig rum0 nwid my_net wpakey my_passphrase
-.Ed
-.Pp
-Join an existing BSS network,
-.Dq my_net :
-.Bd -literal -offset indent
-# ifconfig rum0 192.168.1.1 netmask 0xffffff00 nwid my_net
+inet 192.168.1.1 255.255.255.0
+mediaopt hostap
+nwid mynwid
+wpakey mywpakey
 .Ed
 .Sh DIAGNOSTICS
 .Bl -diag
diff --git a/share/man/man4/run.4 b/share/man/man4/run.4
index fb5aaad382e..464ff3f5c0d 100644
--- a/share/man/man4/run.4
+++ b/share/man/man4/run.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: run.4,v 1.35 2012/08/12 17:01:35 schwarze Exp $
+.\" $OpenBSD: run.4,v 1.36 2013/02/14 07:40:42 jmc Exp $
 .\"
 .\" Copyright (c) 2008 Damien Bergamini <damien.bergamini@free.fr>
 .\"
@@ -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: August 12 2012 $
+.Dd $Mdocdate: February 14 2013 $
 .Dt RUN 4
 .Os
 .Sh NAME
@@ -155,28 +155,21 @@ The following adapters should work:
 .It ZyXEL NWD270N
 .El
 .Sh EXAMPLES
-The following
-.Xr hostname.if 5
-example configures run0 to join whatever network is available on boot,
-using WEP key
-.Dq 0x1deadbeef1 ,
-channel 11, obtaining an IP address using DHCP:
-.Bd -literal -offset indent
-dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
-.Ed
+The following example scans for available networks:
 .Pp
-Configure run0 to join network
-.Dq my_net
-using WPA with passphrase
-.Dq my_passphrase :
-.Bd -literal -offset indent
-# ifconfig run0 nwid my_net wpakey my_passphrase
-.Ed
+.Dl # ifconfig run0 scan
 .Pp
-Join an existing BSS network,
-.Dq my_net :
+The following
+.Xr hostname.if 5
+example configures run0 to join network
+.Dq mynwid ,
+using WPA key
+.Dq mywpakey ,
+obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-# ifconfig run0 192.168.1.1 netmask 0xffffff00 nwid my_net
+nwid mynwid
+wpakey mywpakey
+dhcp
 .Ed
 .Sh DIAGNOSTICS
 .Bl -diag
diff --git a/share/man/man4/uath.4 b/share/man/man4/uath.4
index b6c97dc0eb7..7fc741d8411 100644
--- a/share/man/man4/uath.4
+++ b/share/man/man4/uath.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: uath.4,v 1.27 2012/09/17 11:04:24 sthen Exp $
+.\" $OpenBSD: uath.4,v 1.28 2013/02/14 07:40:42 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: September 17 2012 $
+.Dd $Mdocdate: February 14 2013 $
 .Dt UATH 4
 .Os
 .Sh NAME
@@ -122,32 +122,21 @@ The following adapters should work:
 .It Li "ZyXEL XtremeMIMO M-202" Ta AR5005UX
 .El
 .Sh EXAMPLES
+The following example scans for available networks:
+.Pp
+.Dl # ifconfig uath0 scan
+.Pp
 The following
 .Xr hostname.if 5
-example configures uath0 to join whatever network is available on boot,
+example configures uath0 to join network
+.Dq mynwid ,
 using WEP key
-.Dq 0x1deadbeef1 ,
-channel 11, obtaining an IP address using DHCP:
-.Bd -literal -offset indent
-dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
-.Ed
-.Pp
-Configure uath0 for WEP, using hex key
-.Dq 0x1deadbeef1 :
-.Bd -literal -offset indent
-# ifconfig uath0 nwkey 0x1deadbeef1
-.Ed
-.Pp
-Return uath0 to its default settings:
-.Bd -literal -offset indent
-# ifconfig uath0 -bssid -chan media autoselect \e
-        nwid "" -nwkey
-.Ed
-.Pp
-Join an existing BSS network,
-.Dq my_net :
+.Dq mywepkey ,
+obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-# ifconfig uath0 192.168.1.1 netmask 0xffffff00 nwid my_net
+nwid mynwid
+nwkey mywepkey
+dhcp
 .Ed
 .Sh DIAGNOSTICS
 .Bl -diag
diff --git a/share/man/man4/upgt.4 b/share/man/man4/upgt.4
index 6d9a6ff3c30..0fb0a8eecd0 100644
--- a/share/man/man4/upgt.4
+++ b/share/man/man4/upgt.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: upgt.4,v 1.18 2012/09/17 11:04:24 sthen Exp $
+.\" $OpenBSD: upgt.4,v 1.19 2013/02/14 07:40:42 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: September 17 2012 $
+.Dd $Mdocdate: February 14 2013 $
 .Dt UPGT 4
 .Os
 .Sh NAME
@@ -154,36 +154,21 @@ The following adapters should work:
 .It Thomson SpeedTouch 121g
 .El
 .Sh EXAMPLES
-The following
-.Xr hostname.if 5
-example configures upgt0 to join whatever network is available on boot,
-using WEP key
-.Dq 0x1deadbeef1 ,
-channel 11, obtaining an IP address using DHCP:
-.Bd -literal -offset indent
-dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
-.\".Ed
-.\".Pp
-.\"The following
-.\".Xr hostname.if 5
-.\"example creates a host-based access point on boot:
-.\".Bd -literal -offset indent
-.\"inet 192.168.1.1 255.255.255.0 NONE media autoselect \e
-.\"	mediaopt hostap nwid my_net chan 11
-.Ed
+The following example scans for available networks:
 .Pp
-Configure upgt0 to join network
-.Dq my_net
-using WPA with passphrase
-.Dq my_passphrase :
-.Bd -literal -offset indent
-# ifconfig upgt0 nwid my_net wpakey my_passphrase
-.Ed
+.Dl # ifconfig upgt0 scan
 .Pp
-Join an existing BSS network,
-.Dq my_net :
+The following
+.Xr hostname.if 5
+example configures upgt0 to join network
+.Dq mynwid ,
+using WPA key
+.Dq mywpakey ,
+obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-# ifconfig upgt0 192.168.1.1 netmask 0xffffff00 nwid my_net
+nwid mynwid
+wpakey mywpakey
+dhcp
 .Ed
 .Sh SEE ALSO
 .Xr arp 4 ,
diff --git a/share/man/man4/ural.4 b/share/man/man4/ural.4
index 36317fb4abf..1d549ef6021 100644
--- a/share/man/man4/ural.4
+++ b/share/man/man4/ural.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ural.4,v 1.14 2012/08/12 17:01:35 schwarze Exp $
+.\" $OpenBSD: ural.4,v 1.15 2013/02/14 07:40:42 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: August 12 2012 $
+.Dd $Mdocdate: February 14 2013 $
 .Dt URAL 4
 .Os
 .Sh NAME
@@ -128,36 +128,31 @@ The following adapters should work:
 .It Zonet ZEW2500P
 .El
 .Sh EXAMPLES
+The following example scans for available networks:
+.Pp
+.Dl # ifconfig ural0 scan
+.Pp
 The following
 .Xr hostname.if 5
-example configures ural0 to join whatever network is available on boot,
-using WEP key
-.Dq 0x1deadbeef1 ,
-channel 11, obtaining an IP address using DHCP:
+example configures ural0 to join network
+.Dq mynwid ,
+using WPA key
+.Dq mywpakey ,
+obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
+nwid mynwid
+wpakey mywpakey
+dhcp
 .Ed
 .Pp
 The following
 .Xr hostname.if 5
 example creates a host-based access point on boot:
 .Bd -literal -offset indent
-inet 192.168.1.1 255.255.255.0 NONE media autoselect \e
-	mediaopt hostap nwid my_net chan 11
-.Ed
-.Pp
-Configure ural0 to join network
-.Dq my_net
-using WPA with passphrase
-.Dq my_passphrase :
-.Bd -literal -offset indent
-# ifconfig ural0 nwid my_net wpakey my_passphrase
-.Ed
-.Pp
-Join an existing BSS network,
-.Dq my_net :
-.Bd -literal -offset indent
-# ifconfig ural0 192.168.1.1 netmask 0xffffff00 nwid my_net
+inet 192.168.1.1 255.255.255.0
+mediaopt hostap
+nwid mynwid
+wpakey mywpakey
 .Ed
 .Sh DIAGNOSTICS
 .Bl -diag
diff --git a/share/man/man4/urtw.4 b/share/man/man4/urtw.4
index 70b30540414..3ba295025b2 100644
--- a/share/man/man4/urtw.4
+++ b/share/man/man4/urtw.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: urtw.4,v 1.17 2012/08/12 17:01:35 schwarze Exp $
+.\" $OpenBSD: urtw.4,v 1.18 2013/02/14 07:40:42 jmc Exp $
 .\"
 .\" Copyright (c) 2008 Weongyo Jeong <weongyo@FreeBSD.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: August 12 2012 $
+.Dd $Mdocdate: February 14 2013 $
 .Dt URTW 4
 .Os
 .Sh NAME
@@ -84,28 +84,21 @@ The following adapters should work:
 .It TRENDnet TEW-424UB V3.xR
 .El
 .Sh EXAMPLES
-The following
-.Xr hostname.if 5
-example configures urtw0 to join whatever network is available on boot,
-using WEP key
-.Dq 0x1deadbeef1 ,
-channel 11, obtaining an IP address using DHCP:
-.Bd -literal -offset indent
-dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
-.Ed
+The following example scans for available networks:
 .Pp
-Configure urtw0 to join network
-.Dq my_net
-using WPA with passphrase
-.Dq my_passphrase :
-.Bd -literal -offset indent
-# ifconfig urtw0 nwid my_net wpakey my_passphrase
-.Ed
+.Dl # ifconfig urtw0 scan
 .Pp
-Join an existing BSS network,
-.Dq my_net :
+The following
+.Xr hostname.if 5
+example configures urtw0 to join network
+.Dq mynwid ,
+using WPA key
+.Dq mywpakey ,
+obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-# ifconfig urtw0 192.168.1.1 netmask 0xffffff00 nwid my_net
+nwid mynwid
+wpakey mywpakey
+dhcp
 .Ed
 .Sh SEE ALSO
 .Xr arp 4 ,
diff --git a/share/man/man4/urtwn.4 b/share/man/man4/urtwn.4
index 9ac8ded3d78..ac080dad917 100644
--- a/share/man/man4/urtwn.4
+++ b/share/man/man4/urtwn.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: urtwn.4,v 1.17 2012/09/17 11:04:24 sthen Exp $
+.\" $OpenBSD: urtwn.4,v 1.18 2013/02/14 07:40:42 jmc Exp $
 .\"
 .\" Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
 .\"
@@ -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: September 17 2012 $
+.Dd $Mdocdate: February 14 2013 $
 .Dt URTWN 4
 .Os
 .Sh NAME
@@ -114,28 +114,21 @@ The following adapters should work:
 .It TRENDnet TEW-648UBM
 .El
 .Sh EXAMPLES
-The following
-.Xr hostname.if 5
-example configures urtwn0 to join whatever network is available on boot,
-using WEP key
-.Dq 0x1deadbeef1 ,
-channel 11, obtaining an IP address using DHCP:
-.Bd -literal -offset indent
-dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
-.Ed
+The following example scans for available networks:
 .Pp
-Configure urtwn0 to join network
-.Dq my_net
-using WPA with passphrase
-.Dq my_passphrase :
-.Bd -literal -offset indent
-# ifconfig urtwn0 nwid my_net wpakey my_passphrase
-.Ed
+.Dl # ifconfig urtwn0 scan
 .Pp
-Join an existing BSS network,
-.Dq my_net :
+The following
+.Xr hostname.if 5
+example configures urtwn0 to join network
+.Dq mynwid ,
+using WPA key
+.Dq mywpakey ,
+obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-# ifconfig urtwn0 192.168.1.1 netmask 0xffffff00 nwid my_net
+nwid mynwid
+wpakey mywpakey
+dhcp
 .Ed
 .Sh DIAGNOSTICS
 .Bl -diag
diff --git a/share/man/man4/wi.4tbl b/share/man/man4/wi.4tbl
index c237c87eede..715473310f5 100644
--- a/share/man/man4/wi.4tbl
+++ b/share/man/man4/wi.4tbl
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wi.4tbl,v 1.92 2009/09/02 07:00:24 jmc Exp $
+.\"	$OpenBSD: wi.4tbl,v 1.93 2013/02/14 07:40:42 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: September 2 2009 $
+.Dd $Mdocdate: February 14 2013 $
 .Dt WI 4
 .Os
 .Sh NAME
@@ -294,40 +294,31 @@ The following such adapters are supported or expected to work:
 .It US Robotics 2415 (rebadged WL11000P)
 .El
 .Sh EXAMPLES
+The following example scans for available networks:
+.Pp
+.Dl # ifconfig wi0 scan
+.Pp
 The following
 .Xr hostname.if 5
-example configures wi0 to join whatever network is available on boot,
+example configures wi0 to join network
+.Dq mynwid ,
 using WEP key
-.Dq 0x1deadbeef1 ,
-channel 11, obtaining an IP address using DHCP:
+.Dq mywepkey ,
+obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
+nwid mynwid
+nwkey mywepkey
+dhcp
 .Ed
 .Pp
 The following
 .Xr hostname.if 5
 example creates a host-based access point on boot:
 .Bd -literal -offset indent
-inet 192.168.1.1 255.255.255.0 NONE media autoselect \e
-	mediaopt hostap nwid my_net chan 11
-.Ed
-.Pp
-Configure wi0 for WEP, using hex key
-.Dq 0x1deadbeef1 :
-.Bd -literal -offset indent
-# ifconfig wi0 nwkey 0x1deadbeef1
-.Ed
-.Pp
-Return wi0 to its default settings:
-.Bd -literal -offset indent
-# ifconfig wi0 -chan media autoselect nwid "" \e
-	-nwkey -powersave -txpower
-.Ed
-.Pp
-Join an existing BSS network,
-.Dq my_net :
-.Bd -literal -offset indent
-# ifconfig wi0 192.168.1.1 netmask 0xffffff00 nwid my_net
+inet 192.168.1.1 255.255.255.0
+mediaopt hostap
+nwid mynwid
+nwkey mywepkey
 .Ed
 .Sh DIAGNOSTICS
 .Bl -diag
diff --git a/share/man/man4/wpi.4 b/share/man/man4/wpi.4
index 0b9bb036d96..e6e016cf612 100644
--- a/share/man/man4/wpi.4
+++ b/share/man/man4/wpi.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wpi.4,v 1.32 2012/09/17 11:04:24 sthen Exp $
+.\" $OpenBSD: wpi.4,v 1.33 2013/02/14 07:40:42 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 17 2012 $
+.Dd $Mdocdate: February 14 2013 $
 .Dt WPI 4
 .Os
 .Sh NAME
@@ -97,28 +97,21 @@ users have to download this file on their own.
 A prepackaged version of the firmware can be installed using
 .Xr fw_update 1 .
 .Sh EXAMPLES
-The following
-.Xr hostname.if 5
-example configures wpi0 to join whatever network is available on boot,
-using WEP key
-.Dq 0x1deadbeef1 ,
-channel 11, obtaining an IP address using DHCP:
-.Bd -literal -offset indent
-dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
-.Ed
+The following example scans for available networks:
 .Pp
-Configure wpi0 to join network
-.Dq my_net
-using WPA with passphrase
-.Dq my_passphrase :
-.Bd -literal -offset indent
-# ifconfig wpi0 nwid my_net wpakey my_passphrase
-.Ed
+.Dl # ifconfig wpi0 scan
 .Pp
-Join an existing BSS network,
-.Dq my_net :
+The following
+.Xr hostname.if 5
+example configures wpi0 to join network
+.Dq mynwid ,
+using WPA key
+.Dq mywpakey ,
+obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-# ifconfig wpi0 192.168.1.1 netmask 0xffffff00 nwid my_net
+nwid mynwid
+wpakey mywpakey
+dhcp
 .Ed
 .Sh DIAGNOSTICS
 .Bl -diag
diff --git a/share/man/man4/zyd.4 b/share/man/man4/zyd.4
index c13958a8e5e..f21284c037e 100644
--- a/share/man/man4/zyd.4
+++ b/share/man/man4/zyd.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: zyd.4,v 1.36 2010/11/01 17:59:09 jmc Exp $
+.\" $OpenBSD: zyd.4,v 1.37 2013/02/14 07:40:42 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 1 2010 $
+.Dd $Mdocdate: February 14 2013 $
 .Dt ZYD 4
 .Os
 .Sh NAME
@@ -143,28 +143,21 @@ driver when a device is attached:
 .It Pa /etc/firmware/zd1211b
 .El
 .Sh EXAMPLES
-The following
-.Xr hostname.if 5
-example configures zyd0 to join whatever network is available on boot,
-using WEP key
-.Dq 0x1deadbeef1 ,
-channel 11, obtaining an IP address using DHCP:
-.Bd -literal -offset indent
-dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
-.Ed
+The following example scans for available networks:
 .Pp
-Configure zyd0 to join network
-.Dq my_net
-using WPA with passphrase
-.Dq my_passphrase :
-.Bd -literal -offset indent
-# ifconfig zyd0 nwid my_net wpakey my_passphrase
-.Ed
+.Dl # ifconfig zyd0 scan
 .Pp
-Join an existing BSS network,
-.Dq my_net :
+The following
+.Xr hostname.if 5
+example configures zyd0 to join network
+.Dq mynwid ,
+using WPA key
+.Dq mywpakey ,
+obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-# ifconfig zyd0 192.168.0.2 netmask 0xffffff00 nwid my_net
+nwid mynwid
+wpakey mywpakey
+dhcp
 .Ed
 .Sh DIAGNOSTICS
 .Bl -diag