summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorDavid Herrmann <dh.herrmann@gmail.com>2015-03-12 12:46:46 +0100
committerDavid Herrmann <dh.herrmann@gmail.com>2015-03-12 12:48:22 +0100
commitf407824d751a9cb31abfdf0343fe179e0efef259 (patch)
tree96a9cae03d1b55e2e2c179c2048483b71b350189 /man
parent103635db51044e6b56efda08bfe98ed78a218b75 (diff)
downloadsystemd-f407824d751a9cb31abfdf0343fe179e0efef259.tar.gz
systemd-f407824d751a9cb31abfdf0343fe179e0efef259.tar.bz2
systemd-f407824d751a9cb31abfdf0343fe179e0efef259.zip
man: split paragraph
Explicitly put the "multiple EnvironmentFile=" description into its own paragraph to make it much easier to find.
Diffstat (limited to 'man')
-rw-r--r--man/systemd.exec.xml4
1 files changed, 3 insertions, 1 deletions
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index 11b160e58f..fdb1578641 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -283,7 +283,9 @@
shortly before the process is executed (more specifically,
after all processes from a previous unit state terminated.
This means you can generate these files in one unit state, and
- read it with this option in the next). Settings from these
+ read it with this option in the next).</para>
+
+ <para>Settings from these
files override settings made with
<varname>Environment=</varname>. If the same variable is set
twice from these files, the files will be read in the order