- beef up the text on wep/wpa

- simplify wpa example

help/ok damien

9 files changed, 108 insertions, 45 deletions

diff --git a/share/man/man4/bwi.4 b/share/man/man4/bwi.4
index 2936a6f77e2..4f6f03a21fc 100644
--- a/share/man/man4/bwi.4
+++ b/share/man/man4/bwi.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bwi.4,v 1.20 2008/07/28 20:10:28 damien Exp $
+.\" $OpenBSD: bwi.4,v 1.21 2008/07/29 16:44:19 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: July 28 2008 $
+.Dd $Mdocdate: July 29 2008 $
 .Os
 .Dt BWI 4
 .Sh NAME
@@ -61,7 +61,14 @@ or to scan for access points.
 .Pp
 The
 .Nm
-driver can be configured to use the WEP, WPA-PSK and WPA2-PSK protocols.
+driver can be configured to use
+Wireless Equivalent Privacy (WEP) or
+Wi-Fi Protected Access (WPA-PSK and WPA2-PSK).
+WPA is the de facto encryption standard for wireless networks.
+It is strongly recommended that WEP
+not be used as the sole mechanism
+to secure wireless communication,
+due to serious weaknesses in it.
 The
 .Nm
 driver relies on the software 802.11 stack for both encryption and decryption
@@ -140,8 +147,8 @@ Configure bwi0 to join network
 using WPA-PSK with passphrase
 .Dq my_passphrase :
 .Bd -literal -offset indent
-# _psk=$(wpa-psk my_net my_passphrase)
-# ifconfig bwi0 nwid my_net wpa wpapsk ${_psk}
+# ifconfig bwi0 nwid my_net wpa wpapsk \e
+	$(wpa-psk my_net my_passphrase)
 .Ed
 .Pp
 Return bwi0 to its default settings:
diff --git a/share/man/man4/iwn.4 b/share/man/man4/iwn.4
index cdbe8eebcae..80135842f37 100644
--- a/share/man/man4/iwn.4
+++ b/share/man/man4/iwn.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: iwn.4,v 1.7 2008/07/28 20:10:28 damien Exp $
+.\" $OpenBSD: iwn.4,v 1.8 2008/07/29 16:44:19 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: July 28 2008 $
+.Dd $Mdocdate: July 29 2008 $
 .Os
 .Dt IWN 4
 .Sh NAME
@@ -50,7 +50,14 @@ or to scan for access points.
 .Pp
 The
 .Nm
-driver can be configured to use the WEP, WPA-PSK and WPA2-PSK protocols.
+driver can be configured to use
+Wireless Equivalent Privacy (WEP) or
+Wi-Fi Protected Access (WPA-PSK and WPA2-PSK).
+WPA is the de facto encryption standard for wireless networks.
+It is strongly recommended that WEP
+not be used as the sole mechanism
+to secure wireless communication,
+due to serious weaknesses in it.
 The
 .Nm
 driver relies on the software 802.11 stack for both encryption and decryption
@@ -104,8 +111,8 @@ Configure iwn0 to join network
 using WPA-PSK with passphrase
 .Dq my_passphrase :
 .Bd -literal -offset indent
-# _psk=$(wpa-psk my_net my_passphrase)
-# ifconfig iwn0 nwid my_net wpa wpapsk ${_psk}
+# ifconfig iwn0 nwid my_net wpa wpapsk \e
+	$(wpa-psk my_net my_passphrase)
 .Ed
 .Pp
 Return iwn0 to its default settings:
diff --git a/share/man/man4/malo.4 b/share/man/man4/malo.4
index c61b6d2257a..c898c0d8b5f 100644
--- a/share/man/man4/malo.4
+++ b/share/man/man4/malo.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: malo.4,v 1.27 2008/07/28 20:10:28 damien Exp $
+.\"	$OpenBSD: malo.4,v 1.28 2008/07/29 16:44:19 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: July 28 2008 $
+.Dd $Mdocdate: July 29 2008 $
 .Os
 .Dt MALO 4
 .Sh NAME
@@ -75,7 +75,14 @@ or to scan for access points.
 .Pp
 The
 .Nm
-driver can be configured to use the WEP, WPA-PSK and WPA2-PSK protocols.
+driver can be configured to use
+Wireless Equivalent Privacy (WEP) or
+Wi-Fi Protected Access (WPA-PSK and WPA2-PSK).
+WPA is the de facto encryption standard for wireless networks.
+It is strongly recommended that WEP
+not be used as the sole mechanism
+to secure wireless communication,
+due to serious weaknesses in it.
 The
 .Nm
 driver relies on the software 802.11 stack for both encryption and decryption
@@ -150,8 +157,8 @@ Configure malo0 to join network
 using WPA-PSK with passphrase
 .Dq my_passphrase :
 .Bd -literal -offset indent
-# _psk=$(wpa-psk my_net my_passphrase)
-# ifconfig malo0 nwid my_net wpa wpapsk ${_psk}
+# ifconfig malo0 nwid my_net wpa wpapsk \e
+	$(wpa-psk my_net my_passphrase)
 .Ed
 .Pp
 Return malo0 to its default settings:
diff --git a/share/man/man4/ral.4 b/share/man/man4/ral.4
index ed4511ea202..47766b8889e 100644
--- a/share/man/man4/ral.4
+++ b/share/man/man4/ral.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ral.4,v 1.86 2008/07/28 20:10:28 damien Exp $
+.\" $OpenBSD: ral.4,v 1.87 2008/07/29 16:44:19 jmc Exp $
 .\"
 .\" Copyright (c) 2005-2008
 .\"	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: July 28 2008 $
+.Dd $Mdocdate: July 29 2008 $
 .Os
 .Dt RAL 4
 .Sh NAME
@@ -94,7 +94,14 @@ or to scan for access points.
 .Pp
 The
 .Nm
-driver can be configured to use the WEP, WPA-PSK and WPA2-PSK protocols.
+driver can be configured to use
+Wireless Equivalent Privacy (WEP) or
+Wi-Fi Protected Access (WPA-PSK and WPA2-PSK).
+WPA is the de facto encryption standard for wireless networks.
+It is strongly recommended that WEP
+not be used as the sole mechanism
+to secure wireless communication,
+due to serious weaknesses in it.
 .Pp
 The
 .Nm
@@ -278,8 +285,8 @@ Configure ral0 to join network
 using WPA-PSK with passphrase
 .Dq my_passphrase :
 .Bd -literal -offset indent
-# _psk=$(wpa-psk my_net my_passphrase)
-# ifconfig ral0 nwid my_net wpa wpapsk ${_psk}
+# ifconfig ral0 nwid my_net wpa wpapsk \e
+	$(wpa-psk my_net my_passphrase)
 .Ed
 .Pp
 Return ral0 to its default settings:
diff --git a/share/man/man4/rum.4 b/share/man/man4/rum.4
index 26e21c677a5..2208b40ff92 100644
--- a/share/man/man4/rum.4
+++ b/share/man/man4/rum.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rum.4,v 1.38 2008/07/28 20:10:28 damien Exp $
+.\" $OpenBSD: rum.4,v 1.39 2008/07/29 16:44:19 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: July 28 2008 $
+.Dd $Mdocdate: July 29 2008 $
 .Os
 .Dt RUM 4
 .Sh NAME
@@ -77,7 +77,14 @@ or to scan for access points.
 .Pp
 The
 .Nm
-driver can be configured to use the WEP, WPA-PSK and WPA2-PSK protocols.
+driver can be configured to use
+Wireless Equivalent Privacy (WEP) or
+Wi-Fi Protected Access (WPA-PSK and WPA2-PSK).
+WPA is the de facto encryption standard for wireless networks.
+It is strongly recommended that WEP
+not be used as the sole mechanism
+to secure wireless communication,
+due to serious weaknesses in it.
 The
 .Nm
 driver relies on the software 802.11 stack for both encryption and decryption
@@ -161,8 +168,8 @@ Configure rum0 to join network
 using WPA-PSK with passphrase
 .Dq my_passphrase :
 .Bd -literal -offset indent
-# _psk=$(wpa-psk my_net my_passphrase)
-# ifconfig rum0 nwid my_net wpa wpapsk ${_psk}
+# ifconfig rum0 nwid my_net wpa wpapsk \e
+	$(wpa-psk my_net my_passphrase)
 .Ed
 .Pp
 Return rum0 to its default settings:
diff --git a/share/man/man4/upgt.4 b/share/man/man4/upgt.4
index ca2e3c7ef06..afcbdcf0c70 100644
--- a/share/man/man4/upgt.4
+++ b/share/man/man4/upgt.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: upgt.4,v 1.7 2008/07/28 20:10:28 damien Exp $
+.\" $OpenBSD: upgt.4,v 1.8 2008/07/29 16:44:19 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: July 28 2008 $
+.Dd $Mdocdate: July 29 2008 $
 .Os
 .Dt UPGT 4
 .Sh NAME
@@ -95,7 +95,14 @@ or to scan for access points.
 .Pp
 The
 .Nm
-driver can be configured to use the WEP, WPA-PSK and WPA2-PSK protocols.
+driver can be configured to use
+Wireless Equivalent Privacy (WEP) or
+Wi-Fi Protected Access (WPA-PSK and WPA2-PSK).
+WPA is the de facto encryption standard for wireless networks.
+It is strongly recommended that WEP
+not be used as the sole mechanism
+to secure wireless communication,
+due to serious weaknesses in it.
 The
 .Nm
 driver relies on the software 802.11 stack for both encryption and decryption
@@ -168,8 +175,8 @@ Configure upgt0 to join network
 using WPA-PSK with passphrase
 .Dq my_passphrase :
 .Bd -literal -offset indent
-# _psk=$(wpa-psk my_net my_passphrase)
-# ifconfig upgt0 nwid my_net wpa wpapsk ${_psk}
+# ifconfig upgt0 nwid my_net wpa wpapsk \e
+	$(wpa-psk my_net my_passphrase)
 .Ed
 .Pp
 Return upgt0 to its default settings:
diff --git a/share/man/man4/ural.4 b/share/man/man4/ural.4
index 1afd882497e..e8ee1d05dd2 100644
--- a/share/man/man4/ural.4
+++ b/share/man/man4/ural.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ural.4,v 1.6 2008/07/28 20:10:28 damien Exp $
+.\" $OpenBSD: ural.4,v 1.7 2008/07/29 16:44:19 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: July 28 2008 $
+.Dd $Mdocdate: July 29 2008 $
 .Os
 .Dt URAL 4
 .Sh NAME
@@ -65,7 +65,14 @@ or to scan for access points.
 .Pp
 The
 .Nm
-driver can be configured to use the WEP, WPA-PSK and WPA2-PSK protocols.
+driver can be configured to use
+Wireless Equivalent Privacy (WEP) or
+Wi-Fi Protected Access (WPA-PSK and WPA2-PSK).
+WPA is the de facto encryption standard for wireless networks.
+It is strongly recommended that WEP
+not be used as the sole mechanism
+to secure wireless communication,
+due to serious weaknesses in it.
 The
 .Nm
 driver relies on the software 802.11 stack for both encryption and decryption
@@ -144,8 +151,8 @@ Configure ural0 to join network
 using WPA-PSK with passphrase
 .Dq my_passphrase :
 .Bd -literal -offset indent
-# _psk=$(wpa-psk my_net my_passphrase)
-# ifconfig ural0 nwid my_net wpa wpapsk ${_psk}
+# ifconfig ural0 nwid my_net wpa wpapsk \e
+	$(wpa-psk my_net my_passphrase)
 .Ed
 .Pp
 Return ural0 to its default settings:
diff --git a/share/man/man4/wpi.4 b/share/man/man4/wpi.4
index 4e5e1746a66..c662c1608d8 100644
--- a/share/man/man4/wpi.4
+++ b/share/man/man4/wpi.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wpi.4,v 1.18 2008/07/28 20:10:28 damien Exp $
+.\" $OpenBSD: wpi.4,v 1.19 2008/07/29 16:44:19 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: July 28 2008 $
+.Dd $Mdocdate: July 29 2008 $
 .Os
 .Dt WPI 4
 .Sh NAME
@@ -60,7 +60,14 @@ or to scan for access points.
 .Pp
 The
 .Nm
-driver can be configured to use the WEP, WPA-PSK and WPA2-PSK protocols.
+driver can be configured to use
+Wireless Equivalent Privacy (WEP) or
+Wi-Fi Protected Access (WPA-PSK and WPA2-PSK).
+WPA is the de facto encryption standard for wireless networks.
+It is strongly recommended that WEP
+not be used as the sole mechanism
+to secure wireless communication,
+due to serious weaknesses in it.
 The
 .Nm
 driver relies on the software 802.11 stack for both encryption and decryption
@@ -115,8 +122,8 @@ Configure wpi0 to join network
 using WPA-PSK with passphrase
 .Dq my_passphrase :
 .Bd -literal -offset indent
-# _psk=$(wpa-psk my_net my_passphrase)
-# ifconfig wpi0 nwid my_net wpa wpapsk ${_psk}
+# ifconfig wpi0 nwid my_net wpa wpapsk \e
+	$(wpa-psk my_net my_passphrase)
 .Ed
 .Pp
 Return wpi0 to its default settings:
diff --git a/share/man/man4/zyd.4 b/share/man/man4/zyd.4
index eb557b69202..0b1fc88ac7d 100644
--- a/share/man/man4/zyd.4
+++ b/share/man/man4/zyd.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: zyd.4,v 1.29 2008/07/28 20:10:28 damien Exp $
+.\" $OpenBSD: zyd.4,v 1.30 2008/07/29 16:44:19 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: July 28 2008 $
+.Dd $Mdocdate: July 29 2008 $
 .Dt ZYD 4
 .Os
 .Sh NAME
@@ -64,7 +64,14 @@ or to scan for access points.
 .Pp
 The
 .Nm
-driver can be configured to use the WEP, WPA-PSK and WPA2-PSK protocols.
+driver can be configured to use
+Wireless Equivalent Privacy (WEP) or
+Wi-Fi Protected Access (WPA-PSK and WPA2-PSK).
+WPA is the de facto encryption standard for wireless networks.
+It is strongly recommended that WEP
+not be used as the sole mechanism
+to secure wireless communication,
+due to serious weaknesses in it.
 The
 .Nm
 driver relies on the software 802.11 stack for both encryption and decryption
@@ -150,8 +157,8 @@ Configure zyd0 to join network
 using WPA-PSK with passphrase
 .Dq my_passphrase :
 .Bd -literal -offset indent
-# _psk=$(wpa-psk my_net my_passphrase)
-# ifconfig zyd0 nwid my_net wpa wpapsk ${_psk}
+# ifconfig zyd0 nwid my_net wpa wpapsk \e
+	$(wpa-psk my_net my_passphrase)
 .Ed
 .Pp
 Return zyd0 to its default settings: