X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemctl.xml;h=be6b5ea1fb4a25b20d5b98ef5252d8e0e599cc6e;hp=1642a47273c0958b5e3411a7104ad4c5054139ed;hb=accdd018ede77ef1c057775396c18c73406cbcb4;hpb=27722f964361a7da2532cf0a2d57a2f0dd0a09f2

diff --git a/man/systemctl.xml b/man/systemctl.xml
index 1642a4727..be6b5ea1f 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -174,7 +174,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
         <term><option>--full</option></term>
 
         <listitem>
-          <para>Do not ellipsize unit names, cgroup members, and
+          <para>Do not ellipsize unit names, process tree entries, and
           truncate unit descriptions in the output of
           <command>list-units</command> and
           <command>list-jobs</command>.</para>
@@ -566,7 +566,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
             their configuration. Note that this will reload the
             service-specific configuration, not the unit configuration
             file of systemd. If you want systemd to reload the
-            configuration file of a unit use the
+            configuration file of a unit, use the
             <command>daemon-reload</command> command. In other words:
             for the example case of Apache, this will reload Apache's
             <filename>httpd.conf</filename> in the web server, not the
@@ -692,12 +692,12 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
 
           <listitem>
             <para>Show properties of one or more units, jobs, or the
-            manager itself. If no argument is specified properties of
-            the manager will be shown. If a unit name is specified
+            manager itself. If no argument is specified, properties of
+            the manager will be shown. If a unit name is specified,
             properties of the unit is shown, and if a job id is
-            specified properties of the job is shown. By default, empty
+            specified, properties of the job is shown. By default, empty
             properties are suppressed. Use <option>--all</option> to
-            show those too. To select specific properties to show use
+            show those too. To select specific properties to show, use
             <option>--property=</option>. This command is intended to be
             used whenever computer-parsable output is required. Use
             <command>status</command> if you are looking for formatted
@@ -711,14 +711,14 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
           <listitem>
             <para>Set the specified unit properties at runtime where
             this is supported. This allows changing configuration
-            parameter properties such as resource management controls at
+            parameter properties such as resource control settings at
             runtime. Not all properties may be changed at runtime, but
-            many resource management settings (primarily those in
-            <citerefentry><refentrytitle>systemd.cgroup</refentrytitle><manvolnum>5</manvolnum></citerefentry>)
+            many resource control settings (primarily those in
+            <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>)
             may. The changes are applied instantly, and stored on disk
             for future boots, unless <option>--runtime</option> is
-            passed, in which case the settings only apply until the next
-            reboot. The syntax of the property assignment follows
+            passed, in which case the settings only apply until the
+            next reboot. The syntax of the property assignment follows
             closely the syntax of assignments in unit files.</para>
 
             <para>Example: <command>systemctl set-property foobar.service CPUShares=777</command></para>
@@ -830,10 +830,11 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
             case of socket units), and so on.</para>
 
             <para>Depending on whether <option>--system</option>,
-            <option>--user</option> or <option>--global</option> is
-            specified, this enables the unit for the system, for the
-            calling user only or for all future logins of all
-            users. Note that in the last case, no systemd daemon
+            <option>--user</option>, <option>--runtime</option>,
+            or <option>--global</option> is specified, this enables the unit
+            for the system, for the calling user only, for only this boot of
+            the system, or for all future logins of all users, or only this
+            boot.  Note that in the last case, no systemd daemon
             configuration is reloaded.</para>
           </listitem>
         </varlistentry>
@@ -860,8 +861,9 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
             </para>
 
             <para>This command honors <option>--system</option>,
-            <option>--user</option>, <option>--global</option> in a
-            similar way as <command>enable</command>.</para>
+            <option>--user</option>, <option>--runtime</option> and
+            <option>--global</option> in a similar way as
+            <command>enable</command>.</para>
           </listitem>
         </varlistentry>
 
@@ -918,7 +920,9 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
             start them. This is a stronger version of
             <command>disable</command>, since it prohibits all kinds of
             activation of the unit, including manual activation. Use
-            this option with care.</para>
+            this option with care. This honors the
+            <option>--runtime</option> option to only mask temporarily
+            until the next reoobt of the system.</para>
           </listitem>
         </varlistentry>
 
@@ -1075,7 +1079,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
           <listitem>
             <para>Reload systemd manager configuration. This will reload
             all unit files and recreate the entire dependency
-            tree. While the daemon is reloaded, all sockets systemd
+            tree. While the daemon is being 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
@@ -1089,9 +1093,9 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
             <para>Reexecute the systemd manager. This will serialize the
             manager state, reexecute the process and deserialize the
             state again. This command is of little use except for
-            debugging and package upgrades. Sometimes it might be
+            debugging and package upgrades. Sometimes, it might be
             helpful as a heavy-weight <command>daemon-reload</command>.
-            While the daemon is reexecuted, all sockets systemd listening
+            While the daemon is being reexecuted, all sockets systemd listening
             on behalf of user configuration will stay accessible.
             </para>
           </listitem>
@@ -1286,7 +1290,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
       <citerefentry><refentrytitle>journalctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>loginctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd.cgroup</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>systemd.resource-management</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>wall</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>systemd.preset</refentrytitle><manvolnum>5</manvolnum></citerefentry>