X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.resource-control.xml;h=b050a1752348524d7f8a3924d1452bf28e5791d3;hb=82b1412852b70d240a2a7b6ffd134776bd246642;hp=e0e49db7d182a43f75cc07dea683f87dd6b2f8ec;hpb=9a0549093332880df47c4218209ce126b8586835;p=elogind.git

diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml
index e0e49db7d..b050a1752 100644
--- a/man/systemd.resource-control.xml
+++ b/man/systemd.resource-control.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
+<?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <?xml-stylesheet type="text/xsl" href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
@@ -119,22 +119,24 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
         <listitem>
           <para>Assign the specified CPU time share weight to the
-          processes executed. Takes an integer value. This controls
-          the <literal>cpu.shares</literal> control group attribute,
-          which defaults to 1024. For details about this control group
-          attribute, see <ulink
+          processes executed. Those options take an integer value and
+          control the <literal>cpu.shares</literal> control group
+          attribute, which defaults to 1024. For details about this
+          control group attribute, see <ulink
           url="https://www.kernel.org/doc/Documentation/scheduler/sched-design-CFS.txt">sched-design-CFS.txt</ulink>.
-          The available CPU time is split up among all units within one
-          slice relative to their CPU time share weight.</para>
+          The available CPU time is split up among all units within
+          one slice relative to their CPU time share weight.</para>
 
           <para>While <varname>StartupCPUShares=</varname> only
           applies to the startup phase of the system,
-          <varname>CPUShares=</varname> applies to the later runtime
-          of the system, and if the former is not set also to the
-          startup phase. This allows priorizing specific services at
-          boot-up differently than during runtime.</para>
-
-          <para>Implies <literal>CPUAccounting=true</literal>.</para>
+          <varname>CPUShares=</varname> applies to normal runtime of
+          the system, and if the former is not set also to the startup
+          phase. Using <varname>StartupCPUShares=</varname> allows
+          priorizing specific services at boot-up differently than
+          during normal runtime.</para>
+
+          <para>Those options imply
+          <literal>CPUAccounting=true</literal>.</para>
         </listitem>
       </varlistentry>
 
@@ -153,7 +155,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
           see <ulink
           url="https://www.kernel.org/doc/Documentation/scheduler/sched-design-CFS.txt">sched-design-CFS.txt</ulink>.</para>
 
-          <para>Example: <varname>CPUShares=20%</varname> ensures that
+          <para>Example: <varname>CPUQuota=20%</varname> ensures that
           the executed processes will never get more than 20% CPU time
           on one CPU.</para>
 
@@ -392,6 +394,20 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><varname>Delegate=</varname></term>
+
+        <listitem>
+          <para>Turns on delegation of further resource control
+          partitioning to processes of the unit. For unpriviliged
+          services (i.e. those using the <varname>User=</varname>
+          setting) this allows processes to create a subhierarchy
+          beneath its control group path. For priviliged services and
+          scopes this ensures the processes will have all control
+          group controllers enabled.</para>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
   </refsect1>