X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.cgroup.xml;h=ac5896233c69733c4ceffbe19c85e008fbc5c7d2;hp=cc0eb15abb901976db4a2641ab3c793489c7128f;hb=ddca82aca08712a302cfabdbe59f73ee9ed3f73a;hpb=387abf80ad40e4a6c2f4725c8eff4d66bf110d1f
diff --git a/man/systemd.cgroup.xml b/man/systemd.cgroup.xml
index cc0eb15ab..ac5896233 100644
--- a/man/systemd.cgroup.xml
+++ b/man/systemd.cgroup.xml
@@ -136,22 +136,17 @@ along with systemd; If not, see .
MemoryLimit=bytes
- MemorySoftLimit=bytes
- 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
+ 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.limit_in_bytes and
- memory.soft_limit_in_bytes control group
- attributes. For details about these control group attributes,
+ memory.limit_in_bytes control group
+ attribute. For details about this control group attribute,
see memory.txt.