man: numerous updates to document updated systemctl behaviour

diff --git a/man/systemctl.xml b/man/systemctl.xml
index 2fa448874b279baee35a91a15725dce470a641e7..cdf4f5cd2901587a4f6c7cee4ff9298848f0af7d 100644 (file)
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -76,6 +76,13 @@
                                 text and exits.</para></listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <term><option>--version</option></term>
+
+                                <listitem><para>Prints a short version
+                                string and exits.</para></listitem>
+                        </varlistentry>
+
                         <varlistentry>
                                 <term><option>--type=</option></term>
                                 <term><option>-t</option></term>
@@ -781,16 +788,6 @@
                                 configuration will stay
                                 accessible.</para></listitem>
                         </varlistentry>
-                        <varlistentry>
-                                <term><command>daemon-exit</command></term>
-
-                                <listitem><para>Ask the systemd
-                                manager to quit. This is only
-                                supported for session managers
-                                (i.e. in conjunction with the
-                                <option>--session</option> option) and
-                                will fail otherwise.</para></listitem>
-                        </varlistentry>
                         <varlistentry>
                                 <term><command>show-environment</command></term>
 
@@ -823,7 +820,34 @@
                                 is only removed if it has the
                                 specified value.</para></listitem>
                         </varlistentry>
+                        <varlistentry>
+                                <term><command>default</command></term>
+
+                                <listitem><para>Enter default
+                                mode. This is mostly equivalent to
+                                <command>start
+                                default.target</command>.</para></listitem>
+                        </varlistentry>
+                        <varlistentry>
+                                <term><command>rescue</command></term>
+
+                                <listitem><para>Enter rescue
+                                mode. This is mostly equivalent to
+                                <command>isolate
+                                rescue.target</command> but also
+                                prints a wall message to all
+                                users.</para></listitem>
+                        </varlistentry>
+                        <varlistentry>
+                                <term><command>emergency</command></term>
 
+                                <listitem><para>Enter emergency
+                                mode. This is mostly equivalent to
+                                <command>isolate
+                                emergency.target</command> but also
+                                prints a wall message to all
+                                users.</para></listitem>
+                        </varlistentry>
                         <varlistentry>
                                 <term><command>halt</command></term>
 
@@ -831,7 +855,14 @@
                                 system. This is mostly equivalent to
                                 <command>start halt.target</command>
                                 but also prints a wall message to all
-                                users.</para></listitem>
+                                users.  If
+                                combined with <option>--force</option>
+                                shutdown of all running services is
+                                skipped, however all processes killed
+                                and all file systems unmounted or
+                                mounted read-only, immediately
+                                followed by the
+                                system halt.</para></listitem>
                         </varlistentry>
                         <varlistentry>
                                 <term><command>poweroff</command></term>
@@ -841,7 +872,14 @@
                                 equivalent to <command>start
                                 poweroff.target</command> but also
                                 prints a wall message to all
-                                users.</para></listitem>
+                                users. If
+                                combined with <option>--force</option>
+                                shutdown of all running services is
+                                skipped, however all processes killed
+                                and all file systems unmounted or
+                                mounted read-only, immediately
+                                followed by the
+                                powering off.</para></listitem>
                         </varlistentry>
                         <varlistentry>
                                 <term><command>reboot</command></term>
@@ -851,35 +889,40 @@
                                 equivalent to <command>start
                                 reboot.target</command> but also
                                 prints a wall message to all
-                                users.</para></listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><command>default</command></term>
-
-                                <listitem><para>Enter default
-                                mode. This is mostly equivalent to
-                                <command>start
-                                default.target</command>.</para></listitem>
+                                users. If
+                                combined with <option>--force</option>
+                                shutdown of all running services is
+                                skipped, however all processes killed
+                                and all file systems unmounted or
+                                mounted read-only, immediately
+                                followed by the
+                                reboot.</para></listitem>
                         </varlistentry>
                         <varlistentry>
-                                <term><command>rescue</command></term>
+                                <term><command>kexec</command></term>
 
-                                <listitem><para>Enter rescue
-                                mode. This is mostly equivalent to
-                                <command>isolate
-                                rescue.target</command> but also
-                                prints a wall message to all
-                                users.</para></listitem>
+                                <listitem><para>Shut down and reboot
+                                the system via kexec. This is mostly
+                                equivalent to <command>start
+                                kexec.target</command> but also prints
+                                a wall message to all users. If
+                                combined with <option>--force</option>
+                                shutdown of all running services is
+                                skipped, however all processes killed
+                                and all file systems unmounted or
+                                mounted read-only, immediately
+                                followed by the
+                                reboot.</para></listitem>
                         </varlistentry>
                         <varlistentry>
-                                <term><command>emergency</command></term>
+                                <term><command>exit</command></term>
 
-                                <listitem><para>Enter emergency
-                                mode. This is mostly equivalent to
-                                <command>isolate
-                                emergency.target</command> but also
-                                prints a wall message to all
-                                users.</para></listitem>
+                                <listitem><para>Ask the systemd
+                                manager to quit. This is only
+                                supported for session managers
+                                (i.e. in conjunction with the
+                                <option>--session</option> option) and
+                                will fail otherwise.</para></listitem>
                         </varlistentry>
                 </variablelist>