X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemctl.xml;h=22d3f6ee5e5befb12860f465e1945749677d876d;hp=1bd08da96bbf1793ab54b502c8043c7371893f05;hb=a974d58e83e409a92ca916bb9bbce0e457ea896f;hpb=393a2f9be167f4147e117fd2fc912292899b6b33

diff --git a/man/systemctl.xml b/man/systemctl.xml
index 1bd08da96..22d3f6ee5 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -116,15 +116,15 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>--replace</option></term>
+                                <term><option>--fail</option></term>
 
                                 <listitem><para>If the requested
                                 operation conflicts with an existing
-                                unfinished operation, replace the
-                                existing operation by the requested
-                                operation. If this is not specified
-                                the requested operation will
-                                fail.</para></listitem>
+                                unfinished operation, fail the
+                                command. If this is not specified the
+                                requested operation will replace the
+                                pending job if
+                                necessary.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
@@ -246,17 +246,26 @@
                                 this will also print the current unit
                                 state to STDOUT.</para></listitem>
                         </varlistentry>
+                        <varlistentry>
+                                <term><command>status [NAME...]</command></term>
+
+                                <listitem><para>Show short status
+                                information about one or more
+                                units. This shows terse runtime
+                                information about
+                                units.</para></listitem>
+                        </varlistentry>
                         <varlistentry>
                                 <term><command>show [NAME...|JOB...]</command></term>
 
-                                <listitem><para>Show information about
+                                <listitem><para>Show properties of
                                 one or more units, jobs or the manager
                                 itself. If no argument is specified
-                                information about the manager will be
+                                properties of the manager will be
                                 shown. If a unit name is specified
-                                information about the unit is shown,
+                                properties of the unit is shown,
                                 and if a job id is specified
-                                information about the job is
+                                properties of the job is
                                 shown.</para></listitem>
                         </varlistentry>
                         <varlistentry>
@@ -372,7 +381,7 @@
                                 unit files and recreate the entire
                                 dependency tree. While the daemon is
                                 reloaded, all sockets systemd listens
-                                on on behalf of user configuration, will
+                                on on behalf of user configuration will
                                 stay accessible.</para> <para>This
                                 command should not be confused with
                                 the <command>load</command> or
@@ -492,7 +501,7 @@
                                 <listitem><para>Enter emergency
                                 mode. This is mostly equivalent to
                                 <command>isolate
-                                emergency.service</command> but also
+                                emergency.target</command> but also
                                 prints a wall message to all
                                 users.</para></listitem>
                         </varlistentry>