X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemctl.xml;h=e3a07d5d033f744f782cf17b1b1b47a4a60428a4;hb=707e5e52804a8f041f0d2f822f0bcf7062ad24ac;hp=696a5060ad2173b8656b848489ac4eb4a8b5edbf;hpb=7874bcd6028d1efbb4451c8b5cf5b2ac8d77af74;p=elogind.git

diff --git a/man/systemctl.xml b/man/systemctl.xml
index 696a5060a..e3a07d5d0 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -70,7 +70,7 @@
                 <variablelist>
                         <varlistentry>
                                 <term><option>--help</option></term>
-                                <term><option>--h</option></term>
+                                <term><option>-h</option></term>
 
                                 <listitem><para>Prints a short help
                                 text and exits.</para></listitem>
@@ -78,6 +78,7 @@
 
                         <varlistentry>
                                 <term><option>--type=</option></term>
+                                <term><option>-t</option></term>
 
                                 <listitem><para>When listing units,
                                 limit display to certain unit
@@ -91,6 +92,7 @@
 
                         <varlistentry>
                                 <term><option>--all</option></term>
+                                <term><option>-a</option></term>
 
                                 <listitem><para>When listing units,
                                 show all units, regardless of their
@@ -102,7 +104,7 @@
                                 <term><option>--replace</option></term>
 
                                 <listitem><para>If the requested
-                                operation conflicts with an exisiting
+                                operation conflicts with an existing
                                 unfinished operation, replace the
                                 existing operation by the requested
                                 operation. If this is not specified
@@ -125,11 +127,24 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>--block</option></term>
+                                <term><option>--no-block</option></term>
 
-                                <listitem><para>Synchronously wait for
-                                the requested operation to
-                                finish.</para></listitem>
+				<listitem><para>Do not synchronously wait for
+				the requested operation to finish. If this is
+				not specified the job will be verified,
+				enqueued and <command>systemctl</command> will
+				wait until it is completed. By passing this
+				argument it is only verified and
+				enqueued.</para></listitem> </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--quiet</option></term>
+                                <term><option>-q</option></term>
+
+                                <listitem><para>Suppress output to
+                                STDOUT for <command>snapshot</command>
+                                and
+                                <command>check</command>.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
@@ -178,7 +193,7 @@
                                 cannot be used to reload unit
                                 configuration. Use the
                                 <command>daemon-reload</command>
-                                command for that. All in all this
+                                command for that. All in all, this
                                 command is of little use except for
                                 debugging.</para>
                                 <para>This command should not be
@@ -251,6 +266,18 @@
                                 dependencies and stop all
                                 others.</para></listitem>
                         </varlistentry>
+                        <varlistentry>
+                                <term><command>check [NAME...]</command></term>
+
+                                <listitem><para>Check whether any of
+                                the specified units is active
+                                (i.e. running). Returns 0 if at least
+                                one is active, non-zero
+                                otherwise. Unless
+                                <option>--quiet</option> is specified
+                                this will also print the current unit
+                                state to STDOUT.</para></listitem>
+                        </varlistentry>
                         <varlistentry>
                                 <term><command>monitor</command></term>
 
@@ -276,12 +303,14 @@
                                 <term><command>snapshot [NAME]</command></term>
 
                                 <listitem><para>Create a snapshot. If
-                                a snapshot name is specified the new
+                                a snapshot name is specified, the new
                                 snapshot will be named after it. If
                                 none is specified an automatic
                                 snapshot name is generated. In either
-                                case the snapshot name used is printed
-                                to STDOUT.</para>
+                                case, the snapshot name used is
+                                printed to STDOUT, unless
+                                <option>--quiet</option> is
+                                specified.</para>
 
                                 <para>A snapshot refers to a saved
                                 state of the systemd manager. It is
@@ -301,6 +330,13 @@
                                 state. Snapshots are dynamic and lost
                                 on reboot.</para>
                         </varlistentry>
+                        <varlistentry>
+                                <term><command>delete [NAME...]</command></term>
+
+                                <listitem><para>Remove a snapshot
+                                previously created with
+                                <command>snapshot</command>.</para></listitem>
+                        </varlistentry>
                         <varlistentry>
                                 <term><command>daemon-reload</command></term>
 
@@ -308,8 +344,8 @@
                                 configuration. This will reload all
                                 unit files and recreate the entire
                                 dependency tree. While the daemon is
-                                reloaded all sockets systemd listens
-                                on on behalf of user configuration will
+                                reloaded, all sockets systemd listens
+                                on on behalf of user configuration, will
                                 stay accessible.</para> <para>This
                                 command should not be confused with
                                 the <command>load</command> or