diff --git a/man/logind.conf.xml b/man/logind.conf.xml
index 96e5936e5ed..362a4f61081 100644
--- a/man/logind.conf.xml
+++ b/man/logind.conf.xml
@@ -207,10 +207,17 @@
These settings control
the default control group hierarchies
- users logging in are added to. When
- logging in users will get private
- control groups in all hierarchies
- listed in
+ users logging in are added to, in
+ addition to the
+ name=systemd named
+ hierarchy. These settings take space
+ separated lists of controller
+ names. Pass the empty string to ensure
+ that logind does not touch any
+ hierarchies but systemd's own. When
+ logging in user sessions will get
+ private control groups in all
+ hierarchies listed in
Controllers= and be
reset to the root control group in all
hierarchies listed in
@@ -218,7 +225,15 @@
defaults to the empty list,
ResetControllers=
defaults to
- cpu.
+ cpu. Note that for
+ all controllers that are not listed in
+ either Controllers=
+ nor
+ ResetControllers=
+ newly created sessions will be part of
+ the control groups of the system
+ service that created the
+ session.
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index 12979d81b67..eaa770b4b1e 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -107,15 +107,16 @@
DefaultControllers=cpu
Configures in which
- cgroup controller hierarchies to
- create per-service cgroups
- automatically, in addition to the
- name=systemd named hierarchy. Defaults
- to 'cpu'. Takes a space separated list
- of controller names. Pass an empty
- string to ensure that systemd does not
- touch any hierarchies but its
- own.
+ control group hierarchies to create
+ per-service cgroups automatically, in
+ addition to the
+ name=systemd named
+ hierarchy. Defaults to
+ cpu. Takes a space
+ separated list of controller
+ names. Pass the empty string to ensure
+ that systemd does not touch any
+ hierarchies but its own.
Note that the default value of
'cpu' will make realtime scheduling