journald: log the slice of a process along with each message in _SYSTEMD_SLICE=

[elogind.git] / man / systemd.cgroup.xml

diff --git a/man/systemd.cgroup.xml b/man/systemd.cgroup.xml
index 12b19f5c4b72890a511597e3fa9c9daa68168c2d..ac5896233c69733c4ceffbe19c85e008fbc5c7d2 100644 (file)
--- a/man/systemd.cgroup.xml
+++ b/man/systemd.cgroup.xml
@@ -136,22 +136,17 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
       <varlistentry>
         <term><varname>MemoryLimit=<replaceable>bytes</replaceable></varname></term>
 
       <varlistentry>
         <term><varname>MemoryLimit=<replaceable>bytes</replaceable></varname></term>

-        <term><varname>MemorySoftLimit=<replaceable>bytes</replaceable></varname></term>

 
         <listitem>
 
         <listitem>

-          <para>Specify the hard and soft limits on maximum memory
-          usage of the executed processes. The "hard" limit specifies
-          how much process and kernel memory can be used by tasks in
-          this unit, when there is no memory contention. If the kernel
-          detects memory contention, memory reclaim will be performed
-          until the memory usage is within the "soft" limit. Takes a
+          <para>Specify the limit on maximum memory usage of the
+          executed processes. The limit specifies how much process and
+          kernel memory can be used by tasks in this unit. Takes a

           memory size in bytes. If the value is suffixed with K, M, G
           or T, the specified memory size is parsed as Kilobytes,
           Megabytes, Gigabytes, or Terabytes (with the base 1024),
           respectively. This controls the
           memory size in bytes. If the value is suffixed with K, M, G
           or T, the specified memory size is parsed as Kilobytes,
           Megabytes, Gigabytes, or Terabytes (with the base 1024),
           respectively. This controls the

-          <literal>memory.limit_in_bytes</literal> and
-          <literal>memory.soft_limit_in_bytes</literal> control group
-          attributes. For details about these control group attributes,
+          <literal>memory.limit_in_bytes</literal> control group
+          attribute. For details about this control group attribute,

           see <ulink
           url="https://www.kernel.org/doc/Documentation/cgroups/memory.txt">memory.txt</ulink>.</para>
 
           see <ulink
           url="https://www.kernel.org/doc/Documentation/cgroups/memory.txt">memory.txt</ulink>.</para>
 


@@ -322,9 +317,9 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
           hierarchy of slices each of which might have resource
           settings applied.</para>
 
           hierarchy of slices each of which might have resource
           settings applied.</para>
 

-          <para>For units of type slice the only accepted value for
+          <para>For units of type slice, the only accepted value for

           this setting is the parent slice. Since the name of a slice
           this setting is the parent slice. Since the name of a slice

-          unit implies the parent slice it is hence redundant to ever
+          unit implies the parent slice, it is hence redundant to ever

           set this parameter directly for slice units.</para>
         </listitem>
       </varlistentry>
           set this parameter directly for slice units.</para>
         </listitem>
       </varlistentry>