X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.conf.xml;h=7776c8f4f739808e13b17173eb9855a7628f0d02;hp=fb038eaf6d9b65d7929e357926df0189ef455ca8;hb=f89a3b6f5bf695186e7b9e6cc63993b1272e7569;hpb=4aa6e7782a1b693a8e4fa1d84c87dd76fe1e536d
diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml
index fb038eaf6..7776c8f4f 100644
--- a/man/systemd.conf.xml
+++ b/man/systemd.conf.xml
@@ -44,7 +44,7 @@
systemd.conf
- systemd manager configuration file
+ System and service manager configuration file
@@ -69,7 +69,7 @@
All options are configured in the
[Manager] section:
-
+
LogLevel=
@@ -118,14 +118,14 @@
- JoinControllers=cpu,cpuacct
+ JoinControllers=cpu,cpuacct,cpuset net_cls,netprio
Configures controllers
that shall be mounted in a single
hierarchy. By default systemd will
mount all controllers which are
enabled in the kernel in individual
- hierachies, with the exception of
+ hierarchies, with the exception of
those listed in this setting. Takes a
space separated list of comma
separated controller names, in order