X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-system.conf.xml;h=a67b158996c2fe85ffe3eb2aab12d02f5d5f8fe0;hb=042f9f5e5e76cf0e3cbfd009abd2add0366cdeca;hp=588685540774d08a5d6499301641c65643268bb4;hpb=97d0e5f83ba4dd713170f802b90149b7325bc992;p=elogind.git
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index 588685540..a67b15899 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -112,8 +112,8 @@
addition to the
name=systemd named
hierarchy. Defaults to
- cpu. Takes a space
- separated list of controller
+ cpu. Takes a
+ space-separated list of controller
names. Pass the empty string to ensure
that systemd does not touch any
hierarchies but its own.
@@ -138,8 +138,8 @@
enabled in the kernel in individual
hierarchies, with the exception of
those listed in this setting. Takes a
- space separated list of comma
- separated controller names, in order
+ space-separated list of comma-separated
+ controller names, in order
to allow multiple joined
hierarchies. Defaults to
'cpu,cpuacct'. Pass an empty string to
@@ -150,7 +150,7 @@
Note that this option is only
applied once, at very early boot. If
you use an initial RAM disk (initrd)
- that uses systemd it might hence be
+ that uses systemd, it might hence be
necessary to rebuild the initrd if
this option is changed, and make sure
the new configuration file is included
@@ -214,9 +214,8 @@
capability bounding set for PID 1 and
its children. See
capabilities7
- for details. Takes a whitespace
- separated list of capability names as
- read by
+ for details. Takes a whitespace-separated
+ list of capability names as read by
cap_from_name3.
Capabilities listed will be included
in the bounding set, all others are
@@ -265,22 +264,23 @@
DefaultEnvironment=
- Sets systemd manager
- environment variables for executed
- processes. Takes a space-separated
- list of variable assignments.
-
+ Sets manager
+ environment variables passed to all
+ executed processes. Takes a
+ space-separated list of variable
+ assignments. See
+ environ7
+ for details about environment
+ variables.
Example:
- Environment="VAR1=word1 word2" VAR2=word3 "VAR3=word 5 6"
- gives three variables VAR1,
- VAR2, VAR3.
-
-
- See
- environ7
- for details about environment variables.
+ DefaultEnvironment="VAR1=word1 word2" VAR2=word3 "VAR3=word 5 6"
+
+ Sets three variables
+ VAR1,
+ VAR2,
+ VAR3.
@@ -323,7 +323,8 @@
See Also
systemd1,
- systemd.directives7
+ systemd.directives7,
+ environ7