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=804a50ead615f365ab373aff2bd65714b57c594f;hb=aae9a96d4b3a8562af9e8c6a23871b442645b954;hpb=49f43d5f91a99b23f745726aa351d8f159774357
diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml
index 804a50ead..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,7 +118,7 @@
- JoinControllers=cpu,cpuacct
+ JoinControllers=cpu,cpuacct,cpuset net_cls,netprio
Configures controllers
that shall be mounted in a single