From 15d722b70c3958a44abdb4f3fc13690f9aa59bed Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Wed, 31 Oct 2018 13:47:02 +0100
Subject: nm-online: sort options in man page and program help

---
 clients/nm-online.c |  4 ++--
 man/nm-online.xml   | 49 ++++++++++++++++++++++++++++++-------------------
 2 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/clients/nm-online.c b/clients/nm-online.c
index 38ce03c8f8..18ca713b3d 100644
--- a/clients/nm-online.c
+++ b/clients/nm-online.c
@@ -249,10 +249,10 @@ main (int argc, char *argv[])
 	GOptionContext *opt_ctx = NULL;
 	gboolean success;
 	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},
 		{"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 },
 	};
 
diff --git a/man/nm-online.xml b/man/nm-online.xml
index 297920dd6f..d40aef98c9 100644
--- a/man/nm-online.xml
+++ b/man/nm-online.xml
@@ -67,30 +67,14 @@
 
   <refsect1 id='options'><title>Options</title>
     <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>
         <term><group choice='plain'>
-          <arg choice='plain'><option>-x</option></arg>
-          <arg choice='plain'><option>--exit</option></arg>
+          <arg choice='plain'><option>-h</option></arg>
+          <arg choice='plain'><option>--help</option></arg>
         </group></term>
 
         <listitem>
-          <para>Exit immediately if NetworkManager is not running or connecting.</para>
+          <para>Print help information.</para>
         </listitem>
       </varlistentry>
 
@@ -122,6 +106,33 @@
         </listitem>
       </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>
   </refsect1>
 
-- 
cgit v1.2.1