X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=man%2Fsystemd.conf.xml;h=a6be932c73ad64137c61d54fbaee26800afdf634;hb=140883405e429d9f8d3480a2701d8904f97e4a98;hp=613763e8a3886154e191d18f959985d1079fb267;hpb=d081dffbd3e57dc9da494a3384e333bf565d4175;p=elogind.git
diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml
index 613763e8a..a6be932c7 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=
@@ -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
@@ -201,7 +201,7 @@
capabilities will be included, the
effect of the assignment
inverted. Note that this option also
- effects the respective capabilities in
+ affects the respective capabilities in
the effective, permitted and
inheritable capability sets. The
capability bounding set may also be
@@ -220,7 +220,7 @@
Sets the timer slack
in nanoseconds for PID 1 which is then
inherited to all executed processes,
- unless overriden individually, for
+ unless overridden individually, for
example with the
TimerSlackNSec=
setting in service units (for details
@@ -264,7 +264,7 @@
infinity to
configure no limit on a specific
resource. These settings may be
- overriden in individual units
+ overridden in individual units
using the corresponding LimitXXX=
directives. Note that these resource
limits are only defaults for units,