From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 4 Mar 2011 13:13:47 +0000 (+0100)
Subject: man: document changed EnvironmentFile= behaviour
X-Git-Tag: v20~26
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=f1779fd27b49d7ac9e04e0e83daf5f5f3efd9d8a;hp=aa1671320df5bd8aa4108c0efb34a49fdedd0e5f

man: document changed EnvironmentFile= behaviour
---

diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index 1f79e1e19..f96d181a9 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -284,7 +284,17 @@
                                 "-", which indicates that if the file
                                 does not exist it won't be read and no
                                 error or warning message is
-                                logged.</para></listitem>
+                                logged. The files listed with this
+                                directive will be read shortly before
+                                the process is executed. 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 they are specified and the
+                                later setting will override the
+                                earlier setting. </para></listitem>
                         </varlistentry>
 
                         <varlistentry>