man: Make options consistent

Option listings seemed to be pretty much random, some were short opt,
long opt, others were long opt, short opt. This just makes every option
with a short and long opt that I could find in the order short opt, long
opt, for formatting's sake.

diff --git a/man/hostnamectl.xml b/man/hostnamectl.xml
index 07d363420c7eda8f23a21a609414e67949463e8a..9efe22011983674b4d187728c843186e55811e1f 100644 (file)
--- a/man/hostnamectl.xml
+++ b/man/hostnamectl.xml
@@ -93,8 +93,8 @@
 
                 <variablelist>
                         <varlistentry>
-                                <term><option>--help</option></term>
                                 <term><option>-h</option></term>
+                                <term><option>--help</option></term>
 
                                 <listitem><para>Prints a short help
                                 text and exits.</para></listitem>

diff --git a/man/journalctl.xml b/man/journalctl.xml
index d8f8f689295843e1ec77d659d45e7e2aff849c26..5ed0e1fe3f791578ae09aa5c427db2e75218ae7a 100644 (file)
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -114,8 +114,8 @@
 
                 <variablelist>
                         <varlistentry>
-                                <term><option>--help</option></term>
                                 <term><option>-h</option></term>
+                                <term><option>--help</option></term>
 
                                 <listitem><para>Prints a short help
                                 text and exits.</para></listitem>
@@ -143,8 +143,8 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>--all</option></term>
                                 <term><option>-a</option></term>
+                                <term><option>--all</option></term>
 
                                 <listitem><para>Show all fields in
                                 full, even if they include unprintable
@@ -153,8 +153,8 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>--follow</option></term>
                                 <term><option>-f</option></term>
+                                <term><option>--follow</option></term>
 
                                 <listitem><para>Show only the most recent
                                 journal entries, and continuously print
@@ -163,8 +163,8 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>--lines=</option></term>
                                 <term><option>-n</option></term>
+                                <term><option>--lines=</option></term>
 
                                 <listitem><para>Show the most recent
                                 journal events and limit the number of
@@ -185,8 +185,8 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>--output=</option></term>
                                 <term><option>-o</option></term>
+                                <term><option>--output=</option></term>
 
                                 <listitem><para>Controls the
                                 formatting of the journal entries that
@@ -240,8 +240,8 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>--catalog</option></term>
                                 <term><option>-x</option></term>
+                                <term><option>--catalog</option></term>
 
                                 <listitem><para>Augment log lines with
                                 explanation texts from the message
@@ -264,8 +264,8 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>--quiet</option></term>
                                 <term><option>-q</option></term>
+                                <term><option>--quiet</option></term>
 
                                 <listitem><para>Suppresses any warning
                                 message regarding inaccessible system
@@ -274,8 +274,8 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>--merge</option></term>
                                 <term><option>-m</option></term>
+                                <term><option>--merge</option></term>
 
                                 <listitem><para>Show entries
                                 interleaved from all available
@@ -284,8 +284,8 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>--this-boot</option></term>
                                 <term><option>-b</option></term>
+                                <term><option>--this-boot</option></term>
 
                                 <listitem><para>Show data only from
                                 current boot. This will add a match
@@ -295,8 +295,8 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>--unit=</option></term>
                                 <term><option>-u</option></term>
+                                <term><option>--unit=</option></term>
 
                                 <listitem><para>Show data only of the
                                 specified unit. This will add a match
@@ -341,8 +341,8 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>--cursor=</option></term>
                                 <term><option>-c</option></term>
+                                <term><option>--cursor=</option></term>
 
                                 <listitem><para>Start showing entries
                                 from the location in the journal
@@ -381,8 +381,8 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>--field=</option></term>
                                 <term><option>-F</option></term>
+                                <term><option>--field=</option></term>
 
                                 <listitem><para>Print all possible
                                 data values the specified field can
@@ -391,8 +391,8 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>--directory=</option></term>
                                 <term><option>-D</option></term>
+                                <term><option>--directory=</option></term>
 
                                 <listitem><para>Takes an absolute
                                 directory path as argument. If

diff --git a/man/localectl.xml b/man/localectl.xml
index 3e5b812dac44405da272a97b55cf380d2b9c692b..5e7886c108e2ca9163988c3a8cc80d5196d1ac9d 100644 (file)
--- a/man/localectl.xml
+++ b/man/localectl.xml
@@ -79,8 +79,8 @@
 
                 <variablelist>
                         <varlistentry>
-                                <term><option>--help</option></term>
                                 <term><option>-h</option></term>
+                                <term><option>--help</option></term>
 
                                 <listitem><para>Prints a short help
                                 text and exits.</para></listitem>

diff --git a/man/loginctl.xml b/man/loginctl.xml
index ba0352cf6100fee0939f26738b73144e97e44125..2c8d982eda773f8df54664c0861a0c4b5c9479f9 100644 (file)
--- a/man/loginctl.xml
+++ b/man/loginctl.xml
@@ -69,8 +69,8 @@
 
                 <variablelist>
                         <varlistentry>
-                                <term><option>--help</option></term>
                                 <term><option>-h</option></term>
+                                <term><option>--help</option></term>
 
                                 <listitem><para>Prints a short help
                                 text and exits.</para></listitem>
@@ -84,8 +84,8 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>--property=</option></term>
                                 <term><option>-p</option></term>
+                                <term><option>--property=</option></term>
 
                                 <listitem><para>When showing
                                 session/user properties, limit
@@ -101,8 +101,8 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>--all</option></term>
                                 <term><option>-a</option></term>
+                                <term><option>--all</option></term>
 
                                 <listitem><para>When showing
                                 unit/job/manager properties, show all
@@ -148,8 +148,8 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>--signal=</option></term>
                                 <term><option>-s</option></term>
+                                <term><option>--signal=</option></term>
 
                                 <listitem><para>When used with
                                 <command>kill-session</command> or

diff --git a/man/systemctl.xml b/man/systemctl.xml
index 38426454d48b3c6376e547f6acf24724eb72d71f..bf11cc3c71cd9e2fc2e73b3522befdff2a8e4db7 100644 (file)
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -69,8 +69,8 @@
 
                 <variablelist>
                         <varlistentry>
-                                <term><option>--help</option></term>
                                 <term><option>-h</option></term>
+                                <term><option>--help</option></term>
 
                                 <listitem><para>Prints a short help
                                 text and exits.</para></listitem>
@@ -84,8 +84,8 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>--type=</option></term>
                                 <term><option>-t</option></term>
+                                <term><option>--type=</option></term>
 
                                 <listitem><para>The argument should
                                 be a unit type name such as
@@ -115,8 +115,8 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>--property=</option></term>
                                 <term><option>-p</option></term>
+                                <term><option>--property=</option></term>
 
                                 <listitem><para>When showing
                                 unit/job/manager properties, limit
@@ -132,8 +132,8 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>--all</option></term>
                                 <term><option>-a</option></term>
+                                <term><option>--all</option></term>
 
                                 <listitem><para>When listing units,
                                 show all units, regardless of their
@@ -218,8 +218,8 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>--quiet</option></term>
                                 <term><option>-q</option></term>
+                                <term><option>--quiet</option></term>
 
                                 <listitem><para>Suppress output to
                                 STDOUT in
@@ -370,8 +370,8 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>--signal=</option></term>
                                 <term><option>-s</option></term>
+                                <term><option>--signal=</option></term>
 
                                 <listitem><para>When used with
                                 <command>kill</command>, choose which
@@ -384,8 +384,8 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>--force</option></term>
                                 <term><option>-f</option></term>
+                                <term><option>--force</option></term>
 
                                 <listitem><para>When used with
                                 <command>enable</command>, overwrite any
@@ -463,8 +463,8 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>--lines=</option></term>
                                 <term><option>-n</option></term>
+                                <term><option>--lines=</option></term>
 
                                 <listitem><para>When used with
                                 <command>status</command> controls the
@@ -476,8 +476,8 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>--output=</option></term>
                                 <term><option>-o</option></term>
+                                <term><option>--output=</option></term>
 
                                 <listitem><para>When used with
                                 <command>status</command> controls the

diff --git a/man/systemd-coredumpctl.xml b/man/systemd-coredumpctl.xml
index 87ed6fa735a6503d12ec5a7b2901a7100e89b8ae..ce40404da7ace2e55f5a7df86afc3e1731b3e673 100644 (file)
--- a/man/systemd-coredumpctl.xml
+++ b/man/systemd-coredumpctl.xml
@@ -71,8 +71,8 @@
 
                 <variablelist>
                         <varlistentry>
-                                <term><option>--help</option></term>
                                 <term><option>-h</option></term>
+                                <term><option>--help</option></term>
 
                                 <listitem><para>Print a short help
                                 text and exit.</para></listitem>
@@ -86,8 +86,8 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>--field=</option></term>
                                 <term><option>-F</option></term>
+                                <term><option>--field=</option></term>
 
                                 <listitem><para>Print all possible
                                 data values the specified field
@@ -96,8 +96,8 @@
                         </varlistentry>
 
                         <varlistentry>
+                                <term><option>-o</option></term>
                                 <term><option>--output=FILE</option></term>
-                                <term><option>-o FILE</option></term>
 
                                 <listitem><para>Write the core to
                                 <option>FILE</option>.</para></listitem>

diff --git a/man/systemd-delta.xml b/man/systemd-delta.xml
index 072f55f1a1fcad44dcb37a74103940ce500da39e..9293c9b4629550be0a4284ee2b7317e12d88f60f 100644 (file)
--- a/man/systemd-delta.xml
+++ b/man/systemd-delta.xml
@@ -100,8 +100,8 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>--type=</option></term>
                                 <term><option>-t</option></term>
+                                <term><option>--type=</option></term>
 
                                 <listitem><para>When listing the
                                 differences, only list those that are

diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 554637d5f1919b0fc223860a3e47fe854c42fffb..2fa00e80c0c71696cdae51d87db80f132597d4a3 100644 (file)
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -132,8 +132,8 @@
 
                 <variablelist>
                         <varlistentry>
-                                <term><option>--help</option></term>
                                 <term><option>-h</option></term>
+                                <term><option>--help</option></term>
 
                                 <listitem><para>Prints a short help
                                 text and exits.</para></listitem>
@@ -147,8 +147,8 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>--directory=</option></term>
                                 <term><option>-D</option></term>
+                                <term><option>--directory=</option></term>
 
                                 <listitem><para>Directory to use as
                                 file system root for the namespace
@@ -158,8 +158,8 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>--boot</option></term>
                                 <term><option>-b</option></term>
+                                <term><option>--boot</option></term>
 
                                 <listitem><para>Automatically search
                                 for an init binary and invoke it
@@ -168,8 +168,8 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>--user=</option></term>
                                 <term><option>-u</option></term>
+                                <term><option>--user=</option></term>
 
                                 <listitem><para>Run the command
                                 under specified user, create home
@@ -192,8 +192,8 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>--controllers=</option></term>
                                 <term><option>-C</option></term>
+                                <term><option>--controllers=</option></term>
 
                                 <listitem><para>Makes the container appear in
                                 other hierarchies than the name=systemd:/ one.

diff --git a/man/timedatectl.xml b/man/timedatectl.xml
index a8e78ae8d3990fc815f803e7ed748d62dc268d04..faccc5086df95ca0892b4e219ea89fd0bba1c658 100644 (file)
--- a/man/timedatectl.xml
+++ b/man/timedatectl.xml
@@ -68,8 +68,8 @@
 
                 <variablelist>
                         <varlistentry>
-                                <term><option>--help</option></term>
                                 <term><option>-h</option></term>
+                                <term><option>--help</option></term>
 
                                 <listitem><para>Prints a short help
                                 text and exits.</para></listitem>