man.diff

diff --git a/usr.sbin/802_11/hostapd/hostapd.8 b/usr.sbin/802_11/hostapd/hostapd.8
index e0441cb..ed7fb0e 100644
--- a/usr.sbin/802_11/hostapd/hostapd.8
+++ b/usr.sbin/802_11/hostapd/hostapd.8
@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/usr.sbin/wpa/hostapd/hostapd.8 195644 2009-07-12 19:58:52Z sam $
+.\" $FreeBSD: head/usr.sbin/wpa/hostapd/hostapd.8 238606 2012-07-18 23:32:12Z gjb $
 .\"
-.Dd October 26, 2007
+.Dd July 18, 2012
 .Dt HOSTAPD 8
 .Os
 .Sh NAME
@@ -109,12 +109,13 @@ Store PID in
 .El
 .Sh SEE ALSO
 .Xr ath 4 ,
-.\".Xr ipw 4 ,
+.Xr ipw 4 ,
 .Xr iwi 4 ,
+.Xr mwl 4 ,
 .Xr ral 4 ,
-.\".Xr ural 4 ,
 .Xr rum 4 ,
 .Xr run 4 ,
+.Xr ural 4 ,
 .Xr wi 4 ,
 .Xr hostapd.conf 5 ,
 .Xr hostapd_cli 8 ,
@@ -128,7 +129,7 @@ utility first appeared in
 The
 .Nm
 utility was written by
-.An Jouni Malinen Aq Mt [email protected] .
+.An Jouni Malinen Aq [email protected] .
 This manual page is derived from the
 .Pa README
 file included in the
diff --git a/usr.sbin/802_11/hostapd/hostapd.conf.5 b/usr.sbin/802_11/hostapd/hostapd.conf.5
index 9a1ef12..7acb935 100644
--- a/usr.sbin/802_11/hostapd/hostapd.conf.5
+++ b/usr.sbin/802_11/hostapd/hostapd.conf.5
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/usr.sbin/wpa/hostapd/hostapd.conf.5 195644 2009-07-12 19:58:52Z sam $
+.\" $FreeBSD: head/usr.sbin/wpa/hostapd/hostapd.conf.5 235499 2012-05-16 01:59:09Z gjb $
 .\"
 .Dd September 2, 2006
 .Dt HOSTAPD.CONF 5
@@ -67,7 +67,8 @@ The following parameters are recognized:
 Interface name.
 Should be set in
 .Dq hostap
-mode.
+mode.  Make certain that there are no spaces after the interface name,
+or hostapd will complain that the interface does not exist.
 .It Va debug
 Debugging mode: 0 = no, 1 = minimal, 2 = verbose, 3 = msg dumps, 4 =
 excessive.
@@ -171,8 +172,8 @@ will be converted to PSK.
 This conversion uses SSID so the PSK changes when ASCII passphrase is
 used and the SSID is changed.
 .It Va wpa_psk_file
-Optionally, WPA PSKs can be read from a separate text file (containing a
-list of (PSK,MAC address) pairs.
+Optionally, WPA PSKs can be read from a separate text file containing a
+list of PSK and MAC address pairs.
 .It Va wpa_key_mgmt
 Set of accepted key management algorithms (WPA-PSK, WPA-EAP, or both).
 .It Va wpa_pairwise
@@ -207,4 +208,4 @@ and
 files in the
 .Nm hostapd
 distribution provided by
-.An Jouni Malinen Aq Mt [email protected] .
+.An Jouni Malinen Aq [email protected] .
diff --git a/usr.sbin/802_11/hostapd_cli/hostapd_cli.8 b/usr.sbin/802_11/hostapd_cli/hostapd_cli.8
index bae10c7..08a39a9 100644
--- a/usr.sbin/802_11/hostapd_cli/hostapd_cli.8
+++ b/usr.sbin/802_11/hostapd_cli/hostapd_cli.8
@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/wpa/hostapd_cli/hostapd_cli.8,v 1.2 2005/06/27 06:40:43 ru Exp $
+.\" $FreeBSD: head/usr.sbin/wpa/hostapd_cli/hostapd_cli.8 195644 2009-07-12 19:58:52Z sam $
 .\"
-.Dd August 19, 2006
+.Dd June 16, 2005
 .Dt HOSTAPD_CLI 8
 .Os
 .Sh NAME
@@ -104,7 +104,7 @@ utility first appeared in
 The
 .Nm
 utility was written by
-.An Jouni Malinen Aq Mt [email protected] .
+.An Jouni Malinen Aq [email protected] .
 This manual page is derived from the
 .Pa README
 file included in the
diff --git a/usr.sbin/802_11/ndis_events/ndis_events.8 b/usr.sbin/802_11/ndis_events/ndis_events.8
index fb6708b..b783ab6 100644
--- a/usr.sbin/802_11/ndis_events/ndis_events.8
+++ b/usr.sbin/802_11/ndis_events/ndis_events.8
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/wpa/ndis_events/ndis_events.8,v 1.7 2007/09/07 22:19:29 brueffer Exp $
+.\" $FreeBSD: head/usr.sbin/wpa/ndis_events/ndis_events.8 258438 2013-11-21 19:31:57Z pluknet $
 .\"
 .Dd August 30, 2007
 .Dt NDIS_EVENTS 8
@@ -77,11 +77,11 @@ The standard
 distribution includes its own version of this utility for use with
 .Tn Windows\[rg] .
 The
-.Dx
+.Fx
 version performs the same functions as the
 .Tn Windows\[rg]
 one, except that it uses an
-.Fn ioctl
+.Xr ioctl 2
 and routing socket interface instead of WMI.
 .Pp
 Note that a single instance of
@@ -132,4 +132,4 @@ utility first appeared in
 The
 .Nm
 utility was written by
-.An Bill Paul Aq Mt [email protected] .
+.An Bill Paul Aq [email protected] .
diff --git a/usr.sbin/802_11/wpa_cli/wpa_cli.8 b/usr.sbin/802_11/wpa_cli/wpa_cli.8
index 67cb51e..fb8cd35 100644
--- a/usr.sbin/802_11/wpa_cli/wpa_cli.8
+++ b/usr.sbin/802_11/wpa_cli/wpa_cli.8
@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/wpa/wpa_cli/wpa_cli.8,v 1.2.2.1 2005/07/16 19:02:21 brueffer Exp $
+.\" $FreeBSD: head/usr.sbin/wpa/wpa_cli/wpa_cli.8 210763 2010-08-02 13:11:27Z uqs $
 .\"
-.Dd July 7, 2006
+.Dd June 16, 2005
 .Dt WPA_CLI 8
 .Os
 .Sh NAME
@@ -113,7 +113,7 @@ The
 .Nm
 utility
 shows these requests with a
-.Dq Li CTRL-REQ- Ns Ao Ar type Ac Ns Li - Ns Ao Ar id Ac Ns Li : Ns Aq Ar text
+.Dq Li CTRL-REQ- Ns Ao Ar type Ac Ns Li - Ns Ao Ar id Ac Ns : Ns Aq Ar text
 prefix, where
 .Aq Ar type
 is
@@ -214,7 +214,7 @@ utility first appeared in
 The
 .Nm
 utility was written by
-.An Jouni Malinen Aq Mt [email protected] .
+.An Jouni Malinen Aq [email protected] .
 This manual page is derived from the
 .Pa README
 file included in the
diff --git a/usr.sbin/802_11/wpa_passphrase/wpa_passphrase.8 b/usr.sbin/802_11/wpa_passphrase/wpa_passphrase.8
index 04d4abf..c0ea6d4 100644
--- a/usr.sbin/802_11/wpa_passphrase/wpa_passphrase.8
+++ b/usr.sbin/802_11/wpa_passphrase/wpa_passphrase.8
@@ -55,11 +55,12 @@ The
 utility first appeared in
 .Fx 6.3 .
 .Sh AUTHORS
-.An -nosplit
 The
 .Nm
 utility was written by
-.An Jouni Malinen Aq Mt [email protected] .
+.An Jouni Malinen
+.Aq [email protected] .
 .Pp
 This manual page was written by
-.An Henrik Brix Andersen Aq Mt [email protected] .
+.An Henrik Brix Andersen
+.Aq [email protected] .
diff --git a/usr.sbin/802_11/wpa_supplicant/wpa_supplicant.8 b/usr.sbin/802_11/wpa_supplicant/wpa_supplicant.8
index 5b2ec61..ae30d3d 100644
--- a/usr.sbin/802_11/wpa_supplicant/wpa_supplicant.8
+++ b/usr.sbin/802_11/wpa_supplicant/wpa_supplicant.8
@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8,v 1.8 2012/11/17 01:55:00 svnexp Exp $
+.\" $FreeBSD: head/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8 242696 2012-11-07 15:47:36Z issyl0 $
 .\"
-.Dd November 23, 2012
+.Dd November 7, 2012
 .Dt WPA_SUPPLICANT 8
 .Os
 .Sh NAME
@@ -113,7 +113,7 @@ in the background.
 Enable debugging messages.
 If this option is supplied twice, more verbose messages are displayed.
 .It Fl D
-Driver name (bsd, ndis etc.)
+Driver name (can be multiple drivers: nl80211,wext).
 .It Fl f
 Log output to debug file instead of stdout.
 .It Fl g
@@ -154,15 +154,15 @@ Wait for a control interface monitor before starting.
 .Sh SEE ALSO
 .Xr an 4 ,
 .Xr ath 4 ,
-.\".Xr ipw 4 ,
+.Xr ipw 4 ,
 .Xr iwi 4 ,
 .Xr ral 4 ,
 .Xr rum 4 ,
-.\".Xr ural 4 ,
+.Xr ural 4 ,
 .Xr wi 4 ,
 .Xr wlan 4 ,
 .Xr wpi 4 ,
-.\".Xr zyd 4 ,
+.Xr zyd 4 ,
 .Xr wpa_supplicant.conf 5 ,
 .Xr devd 8 ,
 .Xr ifconfig 8 ,
@@ -176,7 +176,7 @@ utility first appeared in
 The
 .Nm
 utility was written by
-.An Jouni Malinen Aq Mt [email protected] .
+.An Jouni Malinen Aq [email protected] .
 This manual page is derived from the
 .Pa README
 file included in the
diff --git a/usr.sbin/802_11/wpa_supplicant/wpa_supplicant.conf.5 b/usr.sbin/802_11/wpa_supplicant/wpa_supplicant.conf.5
index 86559b0..cbc5a19 100644
--- a/usr.sbin/802_11/wpa_supplicant/wpa_supplicant.conf.5
+++ b/usr.sbin/802_11/wpa_supplicant/wpa_supplicant.conf.5
@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5 195644 2009-07-12 19:58:52Z sam $
+.\" $FreeBSD: head/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5 235337 2012-05-12 15:08:22Z gjb $
 .\"
-.Dd July 8, 2007
+.Dd April 10, 2010
 .Dt WPA_SUPPLICANT.CONF 5
 .Os
 .Sh NAME
@@ -153,7 +153,27 @@ Note that IBSS (adhoc) mode can only be used with
 .Va key_mgmt
 set to
 .Li NONE
-(plaintext and static WEP).
+(plaintext and static WEP), or
+.Va key_mgmt
+set to
+.Li WPA-NONE
+(fixed group key TKIP/CCMP).
+In addition,
+.Va ap_scan
+has to be set to 2 for IBSS.
+.Li WPA-NONE
+requires
+.Va proto
+set to WPA,
+.Va key_mgmt
+set to WPA-NONE,
+.Va pairwise
+set to NONE,
+.Va group
+set to either
+CCMP or TKIP (but not both), and
+.Va psk
+must also be set.
 .It Va proto
 List of acceptable protocols; one or more of:
 .Li WPA
@@ -249,7 +269,7 @@ used only as a Phase 2 metod with EAP-PEAP or EAP-TTLS),
 (EAP-PEAP, with tunneled EAP authentication),
 .Li TTLS
 (EAP-TTLS, with tunneled EAP or PAP/CHAP/MSCHAP/MSCHAPV2 authentication).
-If not set this defaults to all available methods compiled into
+If not set this defaults to all available methods compiled in to
 .Xr wpa_supplicant 8 .
 Note that by default
 .Xr wpa_supplicant 8
@@ -296,7 +316,7 @@ This can be used to achieve forward secrecy.
 If the
 .Va dh_file
 is in DSA parameters format, it will be automatically converted
-into DH params.
+into DH parameters.
 .It Va subject_match
 Substring to be matched against the subject of the
 authentication server certificate.
@@ -350,7 +370,7 @@ TLS Message Length field in all TLS messages even if they are not
 fragmented.
 .It Li sim_min_num_chal=3
 can be used to configure EAP-SIM to require three
-challenges (by default, it accepts 2 or 3)
+challenges (by default, it accepts 2 or 3).
 .It Li fast_provisioning=1
 option enables in-line provisioning of EAP-FAST
 credentials (PAC).
@@ -404,6 +424,16 @@ Enable/disable EAP workarounds for various interoperability issues
 with misbehaving authentication servers.
 By default these workarounds are enabled.
 Strict EAP conformance can be configured by setting this to 0.
+.It Va wep_tx_keyidx
+which key to use for transmission of packets.
+.It Va wep_keyN key
+An
+.Tn ASCII
+string enclosed in quotation marks to encode the WEP key.
+Without quotes this is a hex string of the actual key.
+WEP is considered insecure and should be avoided.
+The exact translation from an ASCII key to a hex key varies.
+Use hex keys where possible.
 .El
 .Sh CERTIFICATES
 Some EAP authentication methods require use of certificates.
@@ -520,7 +550,10 @@ network={
         scan_ssid=1
         key_mgmt=NONE
         wep_tx_keyidx=0
+	# hex keys denoted without quotes
         wep_key0=42FEEDDEAFBABEDEAFBEEFAA55
+	# ASCII keys denoted with quotes.
+	wep_key1="DragonFlyBSDr0cks!"
 }
 .Ed
 .Sh SEE ALSO
@@ -542,4 +575,4 @@ and
 files in the
 .Nm wpa_supplicant
 distribution provided by
-.An Jouni Malinen Aq Mt [email protected] .
+.An Jouni Malinen Aq [email protected] .