Sync manpages and command-line options

Signed-hostap: Dan Williams <dcbw@redhat.com>
This commit is contained in:
Dan Winship 2014-01-20 17:11:31 -06:00 committed by Jouni Malinen
parent b948e78b46
commit 32185f541c
2 changed files with 78 additions and 4 deletions

View file

@ -15,10 +15,12 @@
<cmdsynopsis> <cmdsynopsis>
<command>wpa_cli</command> <command>wpa_cli</command>
<arg>-p <replaceable>path to ctrl sockets</replaceable></arg> <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>-i <replaceable>ifname</replaceable></arg>
<arg>-hvB</arg> <arg>-hvB</arg>
<arg>-a <replaceable>action file</replaceable></arg> <arg>-a <replaceable>action file</replaceable></arg>
<arg>-P <replaceable>pid file</replaceable></arg> <arg>-P <replaceable>pid file</replaceable></arg>
<arg>-G <replaceable>ping interval</replaceable></arg>
<arg><replaceable>command ...</replaceable></arg> <arg><replaceable>command ...</replaceable></arg>
</cmdsynopsis> </cmdsynopsis>
</refsynopsisdiv> </refsynopsisdiv>
@ -110,6 +112,14 @@ CTRL-REQ-OTP-2:Challenge 1235663 needed for SSID foobar
be found.</para></listitem> be found.</para></listitem>
</varlistentry> </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> <varlistentry>
<term>-i ifname</term> <term>-i ifname</term>
@ -160,6 +170,13 @@ CTRL-REQ-OTP-2:Challenge 1235663 needed for SSID foobar
file.</para></listitem> file.</para></listitem>
</varlistentry> </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> <varlistentry>
<term>command</term> <term>command</term>

View file

@ -12,7 +12,7 @@
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis> <cmdsynopsis>
<command>wpa_supplicant</command> <command>wpa_supplicant</command>
<arg>-BddfhKLqqtuvW</arg> <arg>-BddfhKLqqsTtuvW</arg>
<arg>-i<replaceable>ifname</replaceable></arg> <arg>-i<replaceable>ifname</replaceable></arg>
<arg>-c<replaceable>config file</replaceable></arg> <arg>-c<replaceable>config file</replaceable></arg>
<arg>-D<replaceable>driver</replaceable></arg> <arg>-D<replaceable>driver</replaceable></arg>
@ -343,10 +343,21 @@
</listitem> </listitem>
</varlistentry> </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> <varlistentry>
<term>-f output file</term> <term>-f output file</term>
<listitem> <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> </listitem>
</varlistentry> </varlistentry>
@ -386,6 +397,22 @@
</listitem> </listitem>
</varlistentry> </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> <varlistentry>
<term>-p</term> <term>-p</term>
<listitem> <listitem>
@ -408,11 +435,41 @@
</listitem> </listitem>
</varlistentry> </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> <varlistentry>
<term>-u</term> <term>-u</term>
<listitem> <listitem>
<para>Enabled DBus control interface. If enabled, interface <para>Enable DBus control interface. If enabled, interface
definitions may be omitted.</para> 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> </listitem>
</varlistentry> </varlistentry>