summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2020-07-16 09:26:55 +0200
committerLennart Poettering <lennart@poettering.net>2020-07-16 09:26:55 +0200
commit3f13f9159f27ce2859ee64443a3eaf9be1351b01 (patch)
treec944af20e72e805c55caca1eb8af91187f44982b
parentman: GNOME is usually capitalized (diff)
downloadsystemd-3f13f9159f27ce2859ee64443a3eaf9be1351b01.tar.xz
systemd-3f13f9159f27ce2859ee64443a3eaf9be1351b01.zip
man: configuration files contain assignments, no directories
-rw-r--r--man/environment.d.xml5
1 files changed, 2 insertions, 3 deletions
diff --git a/man/environment.d.xml b/man/environment.d.xml
index b7b0dcaa82..0f53b0fef1 100644
--- a/man/environment.d.xml
+++ b/man/environment.d.xml
@@ -36,8 +36,8 @@
<refsect1>
<title>Description</title>
- <para>The <filename>environment.d</filename> directories contain a list of environment variable
- assignments for services started by the systemd user instance.
+ <para>Configuration files in the <filename>environment.d/</filename> directories contain lists of
+ environment variable assignments for services started by the systemd user instance.
<citerefentry><refentrytitle>systemd-environment-d-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>
parses them and updates the environment exported by the systemd user instance. See below for an
discussion of which processes inherit those variables.</para>
@@ -58,7 +58,6 @@
variable assignments, separated by newlines. The right hand side of these assignments may
reference previously defined environment variables, using the <literal>${OTHER_KEY}</literal>
and <literal>$OTHER_KEY</literal> format. It is also possible to use
-
<literal>${<replaceable>FOO</replaceable>:-<replaceable>DEFAULT_VALUE</replaceable>}</literal>
to expand in the same way as <literal>${<replaceable>FOO</replaceable>}</literal> unless the
expansion would be empty, in which case it expands to <replaceable>DEFAULT_VALUE</replaceable>,