X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.resource-control.xml;h=e91c260bf15d13c99fa8e9c3886d1085bb8e9fb0;hp=a1f63dd66b315001c44f3e3d8a93515e97060c1a;hb=19f8d037833f2426f0ea6b06279d669ed69fcfd1;hpb=db785129c9bce9294a118484cbc9bb6935ca34c2

diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml
index a1f63dd66..e91c260bf 100644
--- a/man/systemd.resource-control.xml
+++ b/man/systemd.resource-control.xml
@@ -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>
 
@@ -143,14 +145,11 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
         <listitem>
           <para>Assign the specified CPU time quota to the processes
-          executed. Takes a percentage value (suffixed with "%") or an
-          absolute time (suffixed by one of the common time units, us,
-          ms, s, ...). The percentage specifies how much CPU time the
-          unit shall get at maximum, relative to the total CPU time
-          available on one CPU. Use values &gt; 100% for alloting CPU
-          time on more than one CPU. If an absolute time is specified
-          the processes of this unit will get this much absolute time
-          within each quota period, at maximum. This controls the
+          executed. Takes a percentage value, suffixed with "%". The
+          percentage specifies how much CPU time the unit shall get at
+          maximum, relative to the total CPU time available on one
+          CPU. Use values &gt; 100% for alloting CPU time on more than
+          one CPU. This controls the
           <literal>cpu.cfs_quota_us</literal> control group
           attribute. For details about this control group attribute,
           see <ulink
@@ -164,20 +163,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
         </listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term><varname>CPUQuotaPeriodSec=</varname></term>
-
-        <listitem>
-          <para>Specify the CPU quota period to use. Defaults to
-          100ms. This controls the <literal>cpu.cfs_period_us</literal>
-          control group attribute. 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>.</para>
-
-          <para>Implies <literal>CPUAccounting=true</literal>.</para>
-        </listitem>
-      </varlistentry>
-
       <varlistentry>
         <term><varname>MemoryAccounting=</varname></term>