Sync manpages and command-line options

Signed-hostap: Dan Williams <dcbw@redhat.com>

diff --git a/wpa_supplicant/doc/docbook/wpa_cli.sgml b/wpa_supplicant/doc/docbook/wpa_cli.sgml
index c080c07de0dd8dd325639d84602d4d480c7c5a8d..f79557e2b73bd107e5ea03c9ef0c067b125bbe32 100644 (file)
--- a/wpa_supplicant/doc/docbook/wpa_cli.sgml
+++ b/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>
@@ -110,6 +112,14 @@ CTRL-REQ-OTP-2:Challenge 1235663 needed for SSID foobar
        be found.</para></listitem>
       </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>
 
@@ -160,6 +170,13 @@ CTRL-REQ-OTP-2:Challenge 1235663 needed for SSID foobar
        file.</para></listitem>
       </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>
 

diff --git a/wpa_supplicant/doc/docbook/wpa_supplicant.sgml b/wpa_supplicant/doc/docbook/wpa_supplicant.sgml
index aa20e571139b95c2d660bdbb2076f6f195114811..346ce26169f786d4f571035a6bbf8a9bb72dc783 100644 (file)
--- a/wpa_supplicant/doc/docbook/wpa_supplicant.sgml
+++ b/wpa_supplicant/doc/docbook/wpa_supplicant.sgml
@@ -12,7 +12,7 @@
   <refsynopsisdiv>
     <cmdsynopsis>
       <command>wpa_supplicant</command>
-      <arg>-BddfhKLqqtuvW</arg>
+      <arg>-BddfhKLqqsTtuvW</arg>
       <arg>-i<replaceable>ifname</replaceable></arg>
       <arg>-c<replaceable>config file</replaceable></arg>
       <arg>-D<replaceable>driver</replaceable></arg>
@@ -343,10 +343,21 @@
        </listitem>
       </varlistentry>
 
+      <varlistentry>
+       <term>-e entropy file</term>
+       <listitem>
+         <para>File for <command>wpa_supplicant</command> to use to
+         maintain its internal entropy store in over restarts.</para>
+       </listitem>
+      </varlistentry>
+
       <varlistentry>
        <term>-f output file</term>
        <listitem>
-         <para>Log output to specified file instead of stdout.</para>
+         <para>Log output to specified file instead of stdout. (This
+         is only available if <command>wpa_supplicant</command> was
+         built with the <literal>CONFIG_DEBUG_FILE</literal>
+         option.)</para>
        </listitem>
       </varlistentry>
 
@@ -386,6 +397,22 @@
        </listitem>
       </varlistentry>
 
+      <varlistentry>
+       <term>-o override driver</term>
+       <listitem>
+         <para>Override the driver parameter for new
+         interfaces.</para>
+       </listitem>
+      </varlistentry>
+
+      <varlistentry>
+       <term>-O override ctrl_interface</term>
+       <listitem>
+         <para>Override the ctrl_interface parameter for new
+         interfaces.</para>
+       </listitem>
+      </varlistentry>
+
       <varlistentry>
        <term>-p</term>
        <listitem>
@@ -408,11 +435,41 @@
        </listitem>
       </varlistentry>
 
+      <varlistentry>
+       <term>-s</term>
+       <listitem>
+         <para>Log output to syslog instead of stdout. (This is only
+         available if <command>wpa_supplicant</command> was built
+         with the <literal>CONFIG_DEBUG_SYSLOG</literal>
+         option.)</para>
+       </listitem>
+      </varlistentry>
+
+      <varlistentry>
+       <term>-T</term>
+       <listitem>
+         <para>Log output to Linux tracing in addition to any other
+         destinations. (This is only available
+         if <command>wpa_supplicant</command> was built with
+         the <literal>CONFIG_DEBUG_LINUX_TRACING</literal>
+         option.)</para>
+       </listitem>
+      </varlistentry>
+
+      <varlistentry>
+       <term>-t</term>
+       <listitem>
+         <para>Include timestamp in debug messages.</para>
+       </listitem>
+      </varlistentry>
+
       <varlistentry>
        <term>-u</term>
        <listitem>
-         <para>Enabled DBus control interface. If enabled, interface
-         definitions may be omitted.</para>
+         <para>Enable DBus control interface. If enabled, interface
+         definitions may be omitted. (This is only available
+         if <command>wpa_supplicant</command> was built with
+         the <literal>CONFIG_DBUS</literal> option.)</para>0
        </listitem>
       </varlistentry>