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

diff --git a/man/systemctl.xml b/man/systemctl.xml
index d6e0a51f2..a3e0a307a 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -304,13 +304,11 @@
                                 <command>kill</command>, choose the
                                 mode how to kill the selected
                                 processes. Must be one of
-                                <option>control-group</option>,
-                                <option>process-group</option> or
+                                <option>control-group</option> or
                                 <option>process</option> to select
                                 whether to kill the entire control
-                                group, the process group or only the
-                                selected process itself. If omitted
-                                defaults to
+                                group or only the selected process
+                                itself. If omitted defaults to
                                 <option>control-group</option> if
                                 <option>--kill-who=all</option> is
                                 set, or <option>process</option>
@@ -383,13 +381,24 @@
                                 disabled.</para></listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <term><option>--root=</option></term>
+
+                                <listitem><para>When used with
+				<command>enable</command>/
+				<command>disable</command>/
+				<command>is-enabled</command>,
+				use alternative root path for systemd
+				install.</para></listitem>
+                        </varlistentry>
+
                         <varlistentry>
                                 <term><option>-H</option></term>
                                 <term><option>--host</option></term>
 
                                 <listitem><para>Execute operation
-                                remotely. Specifiy a hostname, or
-                                username and hostname seperated by @,
+                                remotely. Specify a hostname, or
+                                username and hostname separated by @,
                                 to connect to. This will use SSH to
                                 talk to the remote systemd
                                 instance.</para></listitem>
@@ -468,9 +477,9 @@
 
                                 <listitem><para>Restart one or more
                                 units specified on the command
-                                line. If the units are not running yet
-                                the operation will
-                                fail. Note that for compatibility
+                                line if the units are running. Do
+                                nothing if units are not running.
+                                Note that for compatibility
                                 with Red Hat init scripts
                                 <command>condrestart</command> is
                                 equivalent to this command.</para></listitem>
@@ -489,12 +498,13 @@
 
                                 <listitem><para>Reload one or more
                                 units if they support it. If not,
-                                restart them instead. If the units
-                                are not running yet the operation
-                                will fail. Note that for
-                                compatibility with SysV init scripts
+                                restart them instead. Do nothing if
+                                the units are not running. Note that
+                                for compatibility with SysV init
+                                scripts
                                 <command>force-reload</command> is
-                                equivalent to this command.</para></listitem>
+                                equivalent to this
+                                command.</para></listitem>
                         </varlistentry>
                         <varlistentry>
                                 <term><command>isolate [NAME]</command></term>
@@ -1022,6 +1032,22 @@
                 code otherwise.</para>
         </refsect1>
 
+        <refsect1>
+                <title>Environment</title>
+
+                <variablelist>
+                        <varlistentry>
+                                <term><varname>$SYSTEMD_PAGER</varname></term>
+                                <listitem><para>Pager to use when
+                                <option>--no-pager</option> is not given;
+                                overrides <varname>$PAGER</varname>.  Setting
+                                this to an empty string or the value
+                                <literal>cat</literal> is equivalent to passing
+                                <option>--no-pager</option>.</para></listitem>
+                        </varlistentry>
+                </variablelist>
+        </refsect1>
+
         <refsect1>
                 <title>See Also</title>
                 <para>