X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=man%2Fsystemctl.xml;h=bf11cc3c71cd9e2fc2e73b3522befdff2a8e4db7;hb=46ba8aae2b82bc5c87ba347e6bf914ecd5e9d51e;hp=f86952c683092e73ea50e95affd13bc63cdee136;hpb=f274ece0f76b5709408821e317e87aef76123db6;p=elogind.git

diff --git a/man/systemctl.xml b/man/systemctl.xml
index f86952c68..bf11cc3c7 100644
--- 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
@@ -156,7 +156,7 @@
                                 <term><option>--full</option></term>
 
                                 <listitem><para>Do not ellipsize unit
-                                names and truncate unit descriptions
+                                names, cgroup members, and truncate unit descriptions
                                 in the output of
                                 <command>list-units</command> and
                                 <command>list-jobs</command>.</para></listitem>
@@ -191,8 +191,35 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>--quiet</option></term>
+                                <term><option>-i</option></term>
+                                <term><option>--ignore-inhibitors</option></term>
+
+                                <listitem><para>When system shutdown
+                                or a sleep state is requested, ignore
+                                inhibitor locks. Applications can
+                                establish inhibitor locks to avoid
+                                that certain important operations
+                                (such as CD burning or suchlike) are
+                                interrupted by system shutdown or a
+                                sleep state. Any user may take these
+                                locks and privileged users may
+                                override these locks. If any locks are
+                                taken, shutdown and sleep state
+                                requests will normally fail
+                                (regardless if privileged or not) and
+                                list of active locks is
+                                printed. However if
+                                <option>--ignore-inhibitors</option>
+                                is specified the locks are ignored and
+                                not printed, and the operation
+                                attempted anyway, possibly requiring
+                                additional
+                                privileges.</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
                                 <term><option>-q</option></term>
+                                <term><option>--quiet</option></term>
 
                                 <listitem><para>Suppress output to
                                 STDOUT in
@@ -343,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
@@ -357,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
@@ -436,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
@@ -449,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
@@ -969,6 +996,19 @@
                                 ordering and requirement
                                 dependencies.</para></listitem>
                         </varlistentry>
+                        <varlistentry>
+                                <term><command>list-dependencies [NAME]</command></term>
+
+                                <listitem><para> Shows required and
+                                wanted units of the specified unit. If
+                                no unit is specified
+                                <filename>default.target</filename> is
+                                implied. Target units are recursively
+                                expanded.  When <option>--all</option>
+                                is passed all other units aare
+                                recursively expanded as well.</para>
+                                </listitem>
+                        </varlistentry>
                         <varlistentry>
                                 <term><command>snapshot [NAME]</command></term>
 
@@ -1256,7 +1296,7 @@
         <refsect1>
                 <title>Environment</title>
 
-                <variablelist>
+                <variablelist class='environment-variables'>
                         <varlistentry>
                                 <term><varname>$SYSTEMD_PAGER</varname></term>
                                 <listitem><para>Pager to use when