diff --git a/TODO b/TODO
index a8a97bb5af..5de106e122 100644
--- a/TODO
+++ b/TODO
@@ -51,7 +51,7 @@ CGroup Rework Completion:
* introduce high-level settings for RT budget, swappiness
-* man: document new bus apis
+* wiki: document new bus APIs of PID 1
* Send SIGHUP and SIGTERM in session scopes
diff --git a/man/systemd.cgroup.xml b/man/systemd.cgroup.xml
index bb0cb1c2e3..b93b52ff6d 100644
--- a/man/systemd.cgroup.xml
+++ b/man/systemd.cgroup.xml
@@ -90,34 +90,19 @@ along with systemd; If not, see .
for cgroup configuration:
+
CPUAccounting=
- Turn on CPU usage accounting for this
- unit.
+ Turn on CPU usage accounting for this unit. Takes a
+ boolean argument. Note that turning on CPU accounting for
+ one unit might also implicitly turn it on for all units
+ contained in the same slice and for all its parent slices and
+ the units contained therein.
-
- BlockIOAccounting=
-
-
- Turn on Block IO bandwidth accounting
- for this unit.
-
-
-
-
- MemoryAccounting=
-
-
- Turn on process and kernel memory
- accounting for this unit.
-
-
-
-
CPUShares=weight
@@ -133,6 +118,18 @@ along with systemd; If not, see .
+
+ MemoryAccounting=
+
+
+ Turn on process and kernel memory accounting for this
+ unit. Takes a boolean argument. Note that turning on memory
+ accounting for one unit might also implicitly turn it on for
+ all units contained in the same slice and for all its parent
+ slices and the units contained therein.
+
+
+
MemoryLimit=bytes
MemorySoftLimit=bytes
@@ -158,6 +155,18 @@ along with systemd; If not, see .
+
+ BlockIOAccounting=
+
+
+ Turn on Block IO accounting for this unit. Takes a
+ boolean argument. Note that turning on block IO accounting
+ for one unit might also implicitly turn it on for all units
+ contained in the same slice and all for its parent slices and
+ the units contained therein.
+
+
+
BlockIOWeight=weight
@@ -172,7 +181,11 @@ along with systemd; If not, see .
defaults to 1000. For details about
this control group attribute, see
blkio-controller.txt.
+ url="https://www.kernel.org/doc/Documentation/cgroups/blkio-controller.txt">blkio-controller.txt.
+
+ Implies
+ BlockIOAccounting=true.
+
@@ -192,6 +205,9 @@ along with systemd; If not, see .
times to set weights for multiple devices. For details about
this control group attribute, see blkio-controller.txt.
+
+ Implies
+ BlockIOAccounting=true.
@@ -217,6 +233,9 @@ along with systemd; If not, see .
group attributes, see
blkio-controller.txt.
+
+ Implies
+ BlockIOAccounting=true.
@@ -283,6 +302,24 @@ along with systemd; If not, see .
+
+
+ Slice=
+
+
+ The name of the slice unit to place the unit
+ in. Defaults to system.slice for all
+ unit types, except for slice units themselves. This may be
+ used to arrange systemd units in a hierarchy of slices each
+ of which might have resource settings applied.
+
+ For units of type slice the only accepted value for
+ this setting is the parent slice. Since the name of a slice
+ unit implies the parent slice it is hence redundant to ever
+ set this parameter directly for slice units.
+
+
+
@@ -298,6 +335,7 @@ along with systemd; If not, see .
systemd.mount5,
systemd.swap5,
systemd.directives7,
+ systemd.special7,
The documentation for control groups and specific controllers in the Linux kernel:
cgroups.txt,
cpuacct.txt,
diff --git a/man/systemd.special.xml b/man/systemd.special.xml
index 7dbc5580e2..6d456e18e5 100644
--- a/man/systemd.special.xml
+++ b/man/systemd.special.xml
@@ -1039,40 +1039,44 @@
-.slice
The root slice is the
- root of the hierarchy. It does
- not contain services directly,
- but is used to set defaults
- for the whole tree.
+ root of the hierarchy. It
+ usually does not contain units
+ directly, but may be used to
+ set defaults for the whole
+ tree.
system.slice
- This slice contains
+ By default all services
services started by
- systemd.
+ systemd are
+ found in this slice.
user.slice
- This slice contains user
+ By default all user
processes and services started
on behalf of the user,
including the per-user systemd
- instance.
+ instance are found in this
+ slice.
machine.slice
- This slice contains
- virtual machines and
- containers registered with
- systemd-machined.
+ By defalt all virtual
+ machines and containers
+ registered with
+ systemd-machined
+ are found in this slice.