X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.conf.xml;h=a550c2c71aacc0ef86dd2ee6c64564efb9da187b;hp=613763e8a3886154e191d18f959985d1079fb267;hb=d4e9eb91ea12e11bff7d8c6265b067a20ccf37b8;hpb=d081dffbd3e57dc9da494a3384e333bf565d4175
diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml
index 613763e8a..a550c2c71 100644
--- a/man/systemd.conf.xml
+++ b/man/systemd.conf.xml
@@ -44,12 +44,12 @@
systemd.conf
- systemd manager configuration file
+ System and service manager configuration file
- system.conf
- user.conf
+ /etc/systemd/system.conf
+ /etc/systemd/user.conf
@@ -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