diff -Nrup wpa_supplicant-0.5-2006-05-22/doc/docbook/wpa_cli.sgml wpa_supplicant-0.5-2006-05-22.work/doc/docbook/wpa_cli.sgml
--- wpa_supplicant-0.5-2006-05-22/doc/docbook/wpa_cli.sgml	2005-11-13 02:41:32.000000000 +1000
+++ wpa_supplicant-0.5-2006-05-22.work/doc/docbook/wpa_cli.sgml	2006-06-16 20:12:09.000000000 +1000
@@ -141,7 +141,15 @@ CTRL-REQ-OTP-2:Challenge 1235663 needed 
         based on events from wpa_supplicant.  The specified file will
 	be executed with the first argument set to interface name and
 	second to "CONNECT" or "DISCONNECT" depending on the event.
-	This can be used </para></listitem>
+	This can be used to execute networking tools required to configure
+	the interface.</para>
+	
+	<para>Additionally, three environmental variables are available to
+	the file; WPA_CTRL_DIR, WPA_ID and WPA_ID_STR. WPA_CTRL_DIR
+	contains the absolute path to the ctrl_interface socket. WPA_ID
+	contains the unique network_id identifier assigned to the active
+	network, and WPA_ID_STR contains the content of the id_str option.
+	</para></listitem>
       </varlistentry>
 
       <varlistentry>
@@ -282,7 +290,7 @@ CTRL-REQ-OTP-2:Challenge 1235663 needed 
       </varlistentry>
 
       <varlistentry>
-	<term>bssid *lt;network id&gt; &lt;BSSID&gt;</term>
+	<term>bssid &lt;network id&gt; &lt;BSSID&gt;</term>
 	<listitem>
 	  <para>set preferred BSSID for an SSID</para>
 	</listitem>