[systemd-commits] man/systemd.exec.xml

[Lennart Poettering]

 man/systemd.exec.xml |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit f1779fd27b49d7ac9e04e0e83daf5f5f3efd9d8a
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Mar 4 14:13:47 2011 +0100

    man: document changed EnvironmentFile= behaviour

diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index 1f79e1e..f96d181 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>