- switch from wpapsk to wpakey

- remove the "return device to default settings" example, which theo says
is rubbish

ok deraadt

16 files changed, 78 insertions, 204 deletions

diff --git a/share/man/man4/ath.4 b/share/man/man4/ath.4
index 64d980c850f..0fab01c540b 100644
--- a/share/man/man4/ath.4
+++ b/share/man/man4/ath.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ath.4,v 1.50 2010/03/13 06:35:40 jmc Exp $
+.\"	$OpenBSD: ath.4,v 1.51 2010/11/01 17:59:09 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: March 13 2010 $
+.Dd $Mdocdate: November 1 2010 $
 .Dt ATH 4
 .Os
 .Sh NAME
@@ -220,17 +220,10 @@ inet 192.168.1.1 255.255.255.0 NONE media autoselect \e
 .Pp
 Configure ath0 to join network
 .Dq my_net
-using WPA-PSK with passphrase
+using WPA with passphrase
 .Dq my_passphrase :
 .Bd -literal -offset indent
-# ifconfig ath0 nwid my_net wpa wpapsk \e
-	`wpa-psk my_net my_passphrase`
-.Ed
-.Pp
-Return ath0 to its default settings:
-.Bd -literal -offset indent
-# ifconfig ath0 -bssid -chan media autoselect \e
-	nwid "" -nwkey -wpa -wpapsk
+# ifconfig ath0 nwid my_net wpakey my_passphrase
 .Ed
 .Pp
 Join an existing BSS network,
@@ -325,8 +318,7 @@ This should not happen.
 .Xr hostname.if 5 ,
 .Xr gpioctl 8 ,
 .Xr hostapd 8 ,
-.Xr ifconfig 8 ,
-.Xr wpa-psk 8
+.Xr ifconfig 8
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man4/athn.4 b/share/man/man4/athn.4
index d204ae6adc8..c0a1c3e89ab 100644
--- a/share/man/man4/athn.4
+++ b/share/man/man4/athn.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: athn.4,v 1.10 2010/08/18 19:18:30 damien Exp $
+.\" $OpenBSD: athn.4,v 1.11 2010/11/01 17:59:09 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: August 18 2010 $
+.Dd $Mdocdate: November 1 2010 $
 .Dt ATHN 4
 .Os
 .Sh NAME
@@ -174,17 +174,10 @@ inet 192.168.1.1 255.255.255.0 NONE media autoselect \e
 .Pp
 Configure athn0 to join network
 .Dq my_net
-using WPA-PSK with passphrase
+using WPA with passphrase
 .Dq my_passphrase :
 .Bd -literal -offset indent
-# ifconfig athn0 nwid my_net wpa wpapsk \e
-	`wpa-psk my_net my_passphrase`
-.Ed
-.Pp
-Return athn0 to its default settings:
-.Bd -literal -offset indent
-# ifconfig athn0 -bssid -chan media autoselect \e
-	nwid "" -nwkey -wpa -wpapsk
+# ifconfig athn0 nwid my_net wpakey my_passphrase
 .Ed
 .Pp
 Join an existing BSS network,
@@ -214,8 +207,7 @@ The driver will turn the interface down.
 .Xr netintro 4 ,
 .Xr pci 4 ,
 .Xr hostname.if 5 ,
-.Xr ifconfig 8 ,
-.Xr wpa-psk 8
+.Xr ifconfig 8
 .Pp
 Atheros Communications Bulletins:
 .Pa http://www.atheros.com/pt/bulletins/
diff --git a/share/man/man4/bwi.4 b/share/man/man4/bwi.4
index 98c8c395959..c14bda4a655 100644
--- a/share/man/man4/bwi.4
+++ b/share/man/man4/bwi.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bwi.4,v 1.29 2010/04/29 09:21:45 jmc Exp $
+.\" $OpenBSD: bwi.4,v 1.30 2010/11/01 17:59:09 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: April 29 2010 $
+.Dd $Mdocdate: November 1 2010 $
 .Dt BWI 4
 .Os
 .Sh NAME
@@ -144,17 +144,10 @@ dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
 .Pp
 Configure bwi0 to join network
 .Dq my_net
-using WPA-PSK with passphrase
+using WPA with passphrase
 .Dq my_passphrase :
 .Bd -literal -offset indent
-# ifconfig bwi0 nwid my_net wpa wpapsk \e
-	`wpa-psk my_net my_passphrase`
-.Ed
-.Pp
-Return bwi0 to its default settings:
-.Bd -literal -offset indent
-# ifconfig bwi0 -bssid -chan media autoselect \e
-	nwid "" -nwkey -wpa -wpapsk
+# ifconfig bwi0 nwid my_net wpakey my_passphrase
 .Ed
 .Pp
 Join an existing BSS network,
@@ -171,8 +164,7 @@ Join an existing BSS network,
 .Xr pci 4 ,
 .Xr hostname.if 5 ,
 .\".Xr hostapd 8 ,
-.Xr ifconfig 8 ,
-.Xr wpa-psk 8
+.Xr ifconfig 8
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man4/ipw.4 b/share/man/man4/ipw.4
index b905304414c..841a2990545 100644
--- a/share/man/man4/ipw.4
+++ b/share/man/man4/ipw.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ipw.4,v 1.33 2010/04/29 09:20:17 jmc Exp $
+.\" $OpenBSD: ipw.4,v 1.34 2010/11/01 17:59:09 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: April 29 2010 $
+.Dd $Mdocdate: November 1 2010 $
 .Dt IPW 4
 .Os
 .Sh NAME
@@ -127,17 +127,10 @@ dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
 .Pp
 Configure ipw0 to join network
 .Dq my_net
-using WPA-PSK with passphrase
+using WPA with passphrase
 .Dq my_passphrase :
 .Bd -literal -offset indent
-# ifconfig ipw0 nwid my_net wpa wpapsk \e
-	`wpa-psk my_net my_passphrase`
-.Ed
-.Pp
-Return ipw0 to its default settings:
-.Bd -literal -offset indent
-# ifconfig ipw0 -bssid -chan media autoselect \e
-	nwid "" -nwkey -wpa -wpapsk
+# ifconfig ipw0 nwid my_net wpakey my_passphrase
 .Ed
 .Pp
 Join an existing BSS network,
diff --git a/share/man/man4/iwi.4 b/share/man/man4/iwi.4
index 1946846a1e5..2e460fbca5b 100644
--- a/share/man/man4/iwi.4
+++ b/share/man/man4/iwi.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: iwi.4,v 1.39 2010/04/29 09:20:17 jmc Exp $
+.\" $OpenBSD: iwi.4,v 1.40 2010/11/01 17:59:09 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: April 29 2010 $
+.Dd $Mdocdate: November 1 2010 $
 .Dt IWI 4
 .Os
 .Sh NAME
@@ -126,17 +126,10 @@ dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
 .Pp
 Configure iwi0 to join network
 .Dq my_net
-using WPA-PSK with passphrase
+using WPA with passphrase
 .Dq my_passphrase :
 .Bd -literal -offset indent
-# ifconfig iwi0 nwid my_net wpa wpapsk \e
-	`wpa-psk my_net my_passphrase`
-.Ed
-.Pp
-Return iwi0 to its default settings:
-.Bd -literal -offset indent
-# ifconfig iwi0 -bssid -chan media autoselect \e
-	nwid "" -nwkey -wpa -wpapsk
+# ifconfig iwi0 nwid my_net wpakey my_passphrase
 .Ed
 .Pp
 Join an existing BSS network,
diff --git a/share/man/man4/iwn.4 b/share/man/man4/iwn.4
index 27ac25a2e82..438d748dc18 100644
--- a/share/man/man4/iwn.4
+++ b/share/man/man4/iwn.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: iwn.4,v 1.29 2010/06/19 08:05:23 damien Exp $
+.\" $OpenBSD: iwn.4,v 1.30 2010/11/01 17:59:09 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: June 19 2010 $
+.Dd $Mdocdate: November 1 2010 $
 .Dt IWN 4
 .Os
 .Sh NAME
@@ -149,17 +149,10 @@ dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
 .Pp
 Configure iwn0 to join network
 .Dq my_net
-using WPA-PSK with passphrase
+using WPA with passphrase
 .Dq my_passphrase :
 .Bd -literal -offset indent
-# ifconfig iwn0 nwid my_net wpa wpapsk \e
-	`wpa-psk my_net my_passphrase`
-.Ed
-.Pp
-Return iwn0 to its default settings:
-.Bd -literal -offset indent
-# ifconfig iwn0 -bssid -chan media autoselect \e
-	nwid "" -nwkey -wpa -wpapsk
+# ifconfig iwn0 nwid my_net wpakey my_passphrase
 .Ed
 .Pp
 Join an existing BSS network,
@@ -199,8 +192,7 @@ The driver will reset the hardware.
 .Xr netintro 4 ,
 .Xr pci 4 ,
 .Xr hostname.if 5 ,
-.Xr ifconfig 8 ,
-.Xr wpa-psk 8
+.Xr ifconfig 8
 .Sh AUTHORS
 The
 .Nm
diff --git a/share/man/man4/malo.4 b/share/man/man4/malo.4
index ae169eecf99..4b445c7bb1b 100644
--- a/share/man/man4/malo.4
+++ b/share/man/man4/malo.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: malo.4,v 1.34 2010/04/29 09:20:17 jmc Exp $
+.\"	$OpenBSD: malo.4,v 1.35 2010/11/01 17:59:09 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: April 29 2010 $
+.Dd $Mdocdate: November 1 2010 $
 .Dt MALO 4
 .Os
 .Sh NAME
@@ -155,17 +155,10 @@ dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
 .\".Pp
 Configure malo0 to join network
 .Dq my_net
-using WPA-PSK with passphrase
+using WPA with passphrase
 .Dq my_passphrase :
 .Bd -literal -offset indent
-# ifconfig malo0 nwid my_net wpa wpapsk \e
-	`wpa-psk my_net my_passphrase`
-.Ed
-.Pp
-Return malo0 to its default settings:
-.Bd -literal -offset indent
-# ifconfig malo0 -bssid -chan media autoselect \e
-	nwid "" -nwkey -wpa -wpapsk
+# ifconfig malo0 nwid my_net wpakey my_passphrase
 .Ed
 .Pp
 Join an existing BSS network,
@@ -182,8 +175,7 @@ Join an existing BSS network,
 .Xr pci 4 ,
 .Xr hostname.if 5 ,
 .Xr hostapd 8 ,
-.Xr ifconfig 8 ,
-.Xr wpa-psk 8
+.Xr ifconfig 8
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man4/otus.4 b/share/man/man4/otus.4
index 1ebcf7ee94f..d87849c8c8d 100644
--- a/share/man/man4/otus.4
+++ b/share/man/man4/otus.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: otus.4,v 1.14 2010/08/18 18:49:36 damien Exp $
+.\" $OpenBSD: otus.4,v 1.15 2010/11/01 17:59:09 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: August 18 2010 $
+.Dd $Mdocdate: November 1 2010 $
 .Dt OTUS 4
 .Os
 .Sh NAME
@@ -119,17 +119,10 @@ dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
 .Pp
 Configure otus0 to join network
 .Dq my_net
-using WPA-PSK with passphrase
+using WPA with passphrase
 .Dq my_passphrase :
 .Bd -literal -offset indent
-# ifconfig otus0 nwid my_net wpa wpapsk \e
-	`wpa-psk my_net my_passphrase`
-.Ed
-.Pp
-Return otus0 to its default settings:
-.Bd -literal -offset indent
-# ifconfig otus0 -bssid -chan media autoselect \e
-	nwid "" -nwkey -wpa -wpapsk
+# ifconfig otus0 nwid my_net wpakey my_passphrase
 .Ed
 .Pp
 Join an existing BSS network,
@@ -155,8 +148,7 @@ This should not happen.
 .Xr netintro 4 ,
 .Xr usb 4 ,
 .Xr hostname.if 5 ,
-.Xr ifconfig 8 ,
-.Xr wpa-psk 8
+.Xr ifconfig 8
 .Pp
 Atheros Communications AR9001U-2NX/AR9001U-2NG/AR9001U-NG:
 .Pa http://www.atheros.com/pt/bulletins/AR9001USBBulletin.pdf
diff --git a/share/man/man4/ral.4 b/share/man/man4/ral.4
index 0c336f8227e..77533e9ebfb 100644
--- a/share/man/man4/ral.4
+++ b/share/man/man4/ral.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ral.4,v 1.96 2010/10/23 14:28:33 damien Exp $
+.\" $OpenBSD: ral.4,v 1.97 2010/11/01 17:59:09 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 23 2010 $
+.Dd $Mdocdate: November 1 2010 $
 .Dt RAL 4
 .Os
 .Sh NAME
@@ -286,17 +286,10 @@ inet 192.168.1.1 255.255.255.0 NONE media autoselect \e
 .Pp
 Configure ral0 to join network
 .Dq my_net
-using WPA-PSK with passphrase
+using WPA with passphrase
 .Dq my_passphrase :
 .Bd -literal -offset indent
-# ifconfig ral0 nwid my_net wpa wpapsk \e
-	`wpa-psk my_net my_passphrase`
-.Ed
-.Pp
-Return ral0 to its default settings:
-.Bd -literal -offset indent
-# ifconfig ral0 -bssid -chan media autoselect \e
-	nwid "" -nwkey -wpa -wpapsk
+# ifconfig ral0 nwid my_net wpakey my_passphrase
 .Ed
 .Pp
 Join an existing BSS network,
@@ -329,8 +322,7 @@ This should not happen.
 .Xr pci 4 ,
 .Xr hostname.if 5 ,
 .Xr hostapd 8 ,
-.Xr ifconfig 8 ,
-.Xr wpa-psk 8
+.Xr ifconfig 8
 .Pp
 Ralink Technology:
 .Pa http://www.ralinktech.com/
diff --git a/share/man/man4/rum.4 b/share/man/man4/rum.4
index eff5cab45d9..4ee0207e9da 100644
--- a/share/man/man4/rum.4
+++ b/share/man/man4/rum.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rum.4,v 1.48 2010/04/29 09:20:17 jmc Exp $
+.\" $OpenBSD: rum.4,v 1.49 2010/11/01 17:59:09 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 29 2010 $
+.Dd $Mdocdate: November 1 2010 $
 .Dt RUM 4
 .Os
 .Sh NAME
@@ -170,17 +170,10 @@ inet 192.168.1.1 255.255.255.0 NONE media autoselect \e
 .Pp
 Configure rum0 to join network
 .Dq my_net
-using WPA-PSK with passphrase
+using WPA with passphrase
 .Dq my_passphrase :
 .Bd -literal -offset indent
-# ifconfig rum0 nwid my_net wpa wpapsk \e
-	`wpa-psk my_net my_passphrase`
-.Ed
-.Pp
-Return rum0 to its default settings:
-.Bd -literal -offset indent
-# ifconfig rum0 -bssid -chan media autoselect \e
-	nwid "" -nwkey -wpa -wpapsk
+# ifconfig rum0 nwid my_net wpakey my_passphrase
 .Ed
 .Pp
 Join an existing BSS network,
@@ -210,8 +203,7 @@ This should not happen.
 .Xr usb 4 ,
 .Xr hostname.if 5 ,
 .Xr hostapd 8 ,
-.Xr ifconfig 8 ,
-.Xr wpa-psk 8
+.Xr ifconfig 8
 .Pp
 Ralink Technology:
 .Pa http://www.ralinktech.com/
diff --git a/share/man/man4/run.4 b/share/man/man4/run.4
index 5ce292be5c8..4b0304b9906 100644
--- a/share/man/man4/run.4
+++ b/share/man/man4/run.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: run.4,v 1.25 2010/04/29 09:04:28 jmc Exp $
+.\" $OpenBSD: run.4,v 1.26 2010/11/01 17:59:09 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: April 29 2010 $
+.Dd $Mdocdate: November 1 2010 $
 .Dt RUN 4
 .Os
 .Sh NAME
@@ -150,17 +150,10 @@ dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
 .Pp
 Configure run0 to join network
 .Dq my_net
-using WPA-PSK with passphrase
+using WPA with passphrase
 .Dq my_passphrase :
 .Bd -literal -offset indent
-# ifconfig run0 nwid my_net wpa wpapsk \e
-	`wpa-psk my_net my_passphrase`
-.Ed
-.Pp
-Return run0 to its default settings:
-.Bd -literal -offset indent
-# ifconfig run0 -bssid -chan media autoselect \e
-	nwid "" -nwkey -wpa -wpapsk
+# ifconfig run0 nwid my_net wpakey my_passphrase
 .Ed
 .Pp
 Join an existing BSS network,
@@ -189,8 +182,7 @@ This should not happen.
 .Xr netintro 4 ,
 .Xr usb 4 ,
 .Xr hostname.if 5 ,
-.Xr ifconfig 8 ,
-.Xr wpa-psk 8
+.Xr ifconfig 8
 .Pp
 Ralink Technology:
 .Pa http://www.ralinktech.com/
diff --git a/share/man/man4/upgt.4 b/share/man/man4/upgt.4
index 9b878f9876c..f3869f65a5f 100644
--- a/share/man/man4/upgt.4
+++ b/share/man/man4/upgt.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: upgt.4,v 1.14 2010/04/29 09:20:17 jmc Exp $
+.\" $OpenBSD: upgt.4,v 1.15 2010/11/01 17:59:09 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: April 29 2010 $
+.Dd $Mdocdate: November 1 2010 $
 .Dt UPGT 4
 .Os
 .Sh NAME
@@ -178,17 +178,10 @@ dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
 .Pp
 Configure upgt0 to join network
 .Dq my_net
-using WPA-PSK with passphrase
+using WPA with passphrase
 .Dq my_passphrase :
 .Bd -literal -offset indent
-# ifconfig upgt0 nwid my_net wpa wpapsk \e
-	`wpa-psk my_net my_passphrase`
-.Ed
-.Pp
-Return upgt0 to its default settings:
-.Bd -literal -offset indent
-# ifconfig upgt0 -bssid -chan media autoselect \e
-	nwid "" -nwkey -wpa -wpapsk
+# ifconfig upgt0 nwid my_net wpakey my_passphrase
 .Ed
 .Pp
 Join an existing BSS network,
@@ -204,8 +197,7 @@ Join an existing BSS network,
 .Xr usb 4 ,
 .Xr hostname.if 5 ,
 .\".Xr hostapd 8 ,
-.Xr ifconfig 8 ,
-.Xr wpa-psk 8
+.Xr ifconfig 8
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man4/ural.4 b/share/man/man4/ural.4
index 992b6b1a2b1..f2cd75a3a13 100644
--- a/share/man/man4/ural.4
+++ b/share/man/man4/ural.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ural.4,v 1.12 2010/04/29 09:20:17 jmc Exp $
+.\" $OpenBSD: ural.4,v 1.13 2010/11/01 17:59:09 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 29 2010 $
+.Dd $Mdocdate: November 1 2010 $
 .Dt URAL 4
 .Os
 .Sh NAME
@@ -148,17 +148,10 @@ inet 192.168.1.1 255.255.255.0 NONE media autoselect \e
 .Pp
 Configure ural0 to join network
 .Dq my_net
-using WPA-PSK with passphrase
+using WPA with passphrase
 .Dq my_passphrase :
 .Bd -literal -offset indent
-# ifconfig ural0 nwid my_net wpa wpapsk \e
-	`wpa-psk my_net my_passphrase`
-.Ed
-.Pp
-Return ural0 to its default settings:
-.Bd -literal -offset indent
-# ifconfig ural0 -bssid -chan media autoselect \e
-	nwid "" -nwkey -wpa -wpapsk
+# ifconfig ural0 nwid my_net wpakey my_passphrase
 .Ed
 .Pp
 Join an existing BSS network,
@@ -181,8 +174,7 @@ This should not happen.
 .Xr usb 4 ,
 .Xr hostname.if 5 ,
 .Xr hostapd 8 ,
-.Xr ifconfig 8 ,
-.Xr wpa-psk 8
+.Xr ifconfig 8
 .Pp
 Ralink Technology:
 .Pa http://www.ralinktech.com/
diff --git a/share/man/man4/urtw.4 b/share/man/man4/urtw.4
index f81043461c4..3b66e3d814d 100644
--- a/share/man/man4/urtw.4
+++ b/share/man/man4/urtw.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: urtw.4,v 1.15 2010/04/29 09:20:17 jmc Exp $
+.\" $OpenBSD: urtw.4,v 1.16 2010/11/01 17:59:09 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: April 29 2010 $
+.Dd $Mdocdate: November 1 2010 $
 .Dt URTW 4
 .Os
 .Sh NAME
@@ -96,17 +96,10 @@ dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
 .Pp
 Configure urtw0 to join network
 .Dq my_net
-using WPA-PSK with passphrase
+using WPA with passphrase
 .Dq my_passphrase :
 .Bd -literal -offset indent
-# ifconfig urtw0 nwid my_net wpa wpapsk \e
-	`wpa-psk my_net my_passphrase`
-.Ed
-.Pp
-Return urtw0 to its default settings:
-.Bd -literal -offset indent
-# ifconfig urtw0 -bssid -chan media autoselect \e
-	nwid "" -nwkey -wpa -wpapsk
+# ifconfig urtw0 nwid my_net wpakey my_passphrase
 .Ed
 .Pp
 Join an existing BSS network,
@@ -122,8 +115,7 @@ Join an existing BSS network,
 .Xr usb 4 ,
 .Xr hostname.if 5 ,
 .Xr hostapd 8 ,
-.Xr ifconfig 8 ,
-.Xr wpa-psk 8
+.Xr ifconfig 8
 .Pp
 Realtek Semiconductor:
 .Pa http://www.realtek.com.tw/
diff --git a/share/man/man4/wpi.4 b/share/man/man4/wpi.4
index a1433607087..dc2dc5391ce 100644
--- a/share/man/man4/wpi.4
+++ b/share/man/man4/wpi.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wpi.4,v 1.28 2010/04/29 09:20:17 jmc Exp $
+.\" $OpenBSD: wpi.4,v 1.29 2010/11/01 17:59:09 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: April 29 2010 $
+.Dd $Mdocdate: November 1 2010 $
 .Dt WPI 4
 .Os
 .Sh NAME
@@ -113,17 +113,10 @@ dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
 .Pp
 Configure wpi0 to join network
 .Dq my_net
-using WPA-PSK with passphrase
+using WPA with passphrase
 .Dq my_passphrase :
 .Bd -literal -offset indent
-# ifconfig wpi0 nwid my_net wpa wpapsk \e
-	`wpa-psk my_net my_passphrase`
-.Ed
-.Pp
-Return wpi0 to its default settings:
-.Bd -literal -offset indent
-# ifconfig wpi0 -bssid -chan media autoselect \e
-	nwid "" -nwkey -wpa -wpapsk
+# ifconfig wpi0 nwid my_net wpakey my_passphrase
 .Ed
 .Pp
 Join an existing BSS network,
@@ -163,8 +156,7 @@ The driver will reset the hardware.
 .Xr netintro 4 ,
 .Xr pci 4 ,
 .Xr hostname.if 5 ,
-.Xr ifconfig 8 ,
-.Xr wpa-psk 8
+.Xr ifconfig 8
 .Sh AUTHORS
 The
 .Nm
diff --git a/share/man/man4/zyd.4 b/share/man/man4/zyd.4
index 21804700d5f..c13958a8e5e 100644
--- a/share/man/man4/zyd.4
+++ b/share/man/man4/zyd.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: zyd.4,v 1.35 2009/09/23 15:57:31 jsg Exp $
+.\" $OpenBSD: zyd.4,v 1.36 2010/11/01 17:59:09 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 23 2009 $
+.Dd $Mdocdate: November 1 2010 $
 .Dt ZYD 4
 .Os
 .Sh NAME
@@ -155,17 +155,10 @@ dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
 .Pp
 Configure zyd0 to join network
 .Dq my_net
-using WPA-PSK with passphrase
+using WPA with passphrase
 .Dq my_passphrase :
 .Bd -literal -offset indent
-# ifconfig zyd0 nwid my_net wpa wpapsk \e
-	`wpa-psk my_net my_passphrase`
-.Ed
-.Pp
-Return zyd0 to its default settings:
-.Bd -literal -offset indent
-# ifconfig zyd0 -bssid -chan media autoselect \e
-	nwid "" -nwkey -wpa -wpapsk
+# ifconfig zyd0 nwid my_net wpakey my_passphrase
 .Ed
 .Pp
 Join an existing BSS network,
@@ -202,8 +195,7 @@ This should not happen.
 .Xr netintro 4 ,
 .Xr usb 4 ,
 .Xr hostname.if 5 ,
-.Xr ifconfig 8 ,
-.Xr wpa-psk 8
+.Xr ifconfig 8
 .Sh AUTHORS
 .An -nosplit
 The