colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nm-online: sort options in man page and program help

Browse Source
This commit is contained in:
Beniamino Galvani
2018-10-31 13:47:02 +01:00
parent e107d3b593
commit 15d722b70c
2 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
clients/nm-online.c
View File

@@ -249,10 +249,10 @@ main (int argc, char *argv[])
GOptionContext *opt_ctx = NULL; GOptionContext *opt_ctx = NULL;
gboolean success; gboolean success;
GOptionEntry options[] = { GOptionEntry options[] = {
{"timeout", 't', 0, G_OPTION_ARG_INT, &t_secs, N_("Time to wait for a connection, in seconds (without the option, default value is 30)"), "<timeout>"},
{"exit", 'x', 0, G_OPTION_ARG_NONE, &data.exit_no_nm, N_("Exit immediately if NetworkManager is not running or connecting"), NULL},
{"quiet", 'q', 0, G_OPTION_ARG_NONE, &data.quiet, N_("Don't print anything"), NULL}, {"quiet", 'q', 0, G_OPTION_ARG_NONE, &data.quiet, N_("Don't print anything"), NULL},
{"wait-for-startup", 's', 0, G_OPTION_ARG_NONE, &data.wait_startup, N_("Wait for NetworkManager startup instead of a connection"), NULL}, {"wait-for-startup", 's', 0, G_OPTION_ARG_NONE, &data.wait_startup, N_("Wait for NetworkManager startup instead of a connection"), NULL},
{"timeout", 't', 0, G_OPTION_ARG_INT, &t_secs, N_("Time to wait for a connection, in seconds (without the option, default value is 30)"), "<timeout>"},
{"exit", 'x', 0, G_OPTION_ARG_NONE, &data.exit_no_nm, N_("Exit immediately if NetworkManager is not running or connecting"), NULL},
{ NULL }, { NULL },
}; };

49
man/nm-online.xml
View File

@@ -67,30 +67,14 @@
<refsect1 id='options'><title>Options</title> <refsect1 id='options'><title>Options</title>
<variablelist> <variablelist>
<varlistentry>
<term>
<group choice='plain'>
<arg choice='plain'><option>-t</option></arg>
<arg choice='plain'><option>--timeout</option></arg>
</group>
<arg choice='plain'><replaceable>seconds</replaceable></arg>
</term>
<listitem>
<para>Time to wait for a connection, in seconds. If the option is not provided,
the default timeout is 30 seconds.</para>
</listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term><group choice='plain'> <term><group choice='plain'>
<arg choice='plain'><option>-x</option></arg> <arg choice='plain'><option>-h</option></arg>
<arg choice='plain'><option>--exit</option></arg> <arg choice='plain'><option>--help</option></arg>
</group></term> </group></term>
<listitem> <listitem>
<para>Exit immediately if NetworkManager is not running or connecting.</para> <para>Print help information.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@@ -122,6 +106,33 @@
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term>
<group choice='plain'>
<arg choice='plain'><option>-t</option></arg>
<arg choice='plain'><option>--timeout</option></arg>
</group>
<arg choice='plain'><replaceable>seconds</replaceable></arg>
</term>
<listitem>
<para>Time to wait for a connection, in seconds. If the option is not provided,
the default timeout is 30 seconds.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><group choice='plain'>
<arg choice='plain'><option>-x</option></arg>
<arg choice='plain'><option>--exit</option></arg>
</group></term>
<listitem>
<para>Exit immediately if NetworkManager is not running or connecting.</para>
</listitem>
</varlistentry>
</variablelist> </variablelist>
</refsect1> </refsect1>