Updated through tag hostap_2_5 from git://w1.fi/hostap.git

[mech_eap.git] / libeap / wpa_supplicant / doc / docbook / wpa_cli.sgml

diff --git a/libeap/wpa_supplicant/doc/docbook/wpa_cli.sgml b/libeap/wpa_supplicant/doc/docbook/wpa_cli.sgml
index 1fe98f4..47947c1 100644 (file)
--- a/libeap/wpa_supplicant/doc/docbook/wpa_cli.sgml
+++ b/libeap/wpa_supplicant/doc/docbook/wpa_cli.sgml
@@ -15,10 +15,12 @@
     <cmdsynopsis>
       <command>wpa_cli</command>
       <arg>-p <replaceable>path to ctrl sockets</replaceable></arg>
+      <arg>-g <replaceable>path to global ctrl_interface socket</replaceable></arg>
       <arg>-i <replaceable>ifname</replaceable></arg>
       <arg>-hvB</arg>
       <arg>-a <replaceable>action file</replaceable></arg>
       <arg>-P <replaceable>pid file</replaceable></arg>
+      <arg>-G <replaceable>ping interval</replaceable></arg>
       <arg><replaceable>command ...</replaceable></arg>
     </cmdsynopsis>
   </refsynopsisdiv>
@@ -111,6 +113,14 @@ CTRL-REQ-OTP-2:Challenge 1235663 needed for SSID foobar
       </varlistentry>
 
       <varlistentry>
+       <term>-g control socket path</term>
+
+       <listitem><para>Connect to the global control socket at the
+       indicated path rather than an interface-specific control
+       socket.</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
        <term>-i ifname</term>
 
         <listitem><para>Specify the interface that is being
@@ -161,6 +171,13 @@ CTRL-REQ-OTP-2:Challenge 1235663 needed for SSID foobar
       </varlistentry>
 
       <varlistentry>
+       <term>-G ping interval</term>
+
+       <listitem><para>Set the interval (in seconds) at which
+       wpa_cli pings the supplicant.</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
        <term>command</term>
 
        <listitem><para>Run a command.  The available commands are
@@ -328,12 +345,12 @@ CTRL-REQ-OTP-2:Challenge 1235663 needed for SSID foobar
   </refsect1>
   <refsect1>
     <title>Legal</title>
-    <para>wpa_supplicant is copyright (c) 2003-2007,
+    <para>wpa_supplicant is copyright (c) 2003-2015,
     Jouni Malinen <email>j@w1.fi</email> and
     contributors.
     All Rights Reserved.</para>
 
-    <para>This program is dual-licensed under both the GPL version 2
-    and BSD license. Either license may be used at your option.</para>
+    <para>This program is licensed under the BSD license (the one with
+    advertisement clause removed).</para>
   </refsect1>
 </refentry>