for the net80211 drivers supporting WPA, update to a new unified text showing

that WPA1 is disabled by default, and provide a couple of extra pointers about
configuration. direction of change proposed by stsp, ok jmc stsp

1 files changed, 14 insertions, 8 deletions

diff --git a/share/man/man4/upgt.4 b/share/man/man4/upgt.4
index 1912c1176b0..6af74e46619 100644
--- a/share/man/man4/upgt.4
+++ b/share/man/man4/upgt.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: upgt.4,v 1.26 2019/03/29 17:16:35 jmc Exp $
+.\" $OpenBSD: upgt.4,v 1.27 2019/11/10 14:10:41 sthen 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: March 29 2019 $
+.Dd $Mdocdate: November 10 2019 $
 .Dt UPGT 4
 .Os
 .Sh NAME
@@ -84,12 +84,18 @@ The
 .Nm
 driver can be configured to use
 Wired Equivalent Privacy (WEP) or
-Wi-Fi Protected Access (WPA-PSK and WPA2-PSK).
-WPA is the current 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.
+Wi-Fi Protected Access (WPA1 and WPA2).
+WPA2 is the current encryption standard for wireless networks.
+It is strongly recommended that neither WEP nor WPA1
+are used as the sole mechanism to secure wireless communication,
+due to serious weaknesses.
+WPA1 is disabled by default and may be enabled using the option
+.Qq Cm wpaprotos Ar wpa1,wpa2 .
+For standard WPA networks which use pre-shared keys (PSK),
+keys are configured using the
+.Qq Cm wpakey
+option.
+WPA-Enterprise networks require use of the wpa_supplicant package.
 The
 .Nm
 driver relies on the software 802.11 stack for both encryption and decryption