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=92942f1a93797c714ff892ba1e7e86b0ebd5a344;hb=aae9a96d4b3a8562af9e8c6a23871b442645b954;hpb=aa0f64ac851ebf27342d66947b5170bfeb9f49ae
diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml
index 92942f1a9..7776c8f4f 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
@@ -69,7 +69,7 @@
All options are configured in the
[Manager] section:
-
+
LogLevel=
@@ -79,7 +79,6 @@
DumpCore=yes
CrashShell=no
ShowStatus=yes
- SysVConsole=yes
CrashChVT=1
DefaultStandardOutput=journal
DefaultStandardError=inherit
@@ -119,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