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

[Lennart Poettering]

 man/systemd.unit.xml |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 96ddbf819a5675dba23ffadc35099462fdb2579f
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Aug 11 16:41:05 2014 +0200

    man: document that we look for both the instance's and the template's .d/ directory when looking for unit file drop-ins.

diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index dc5e385..c8d9300 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -203,7 +203,12 @@
                 settings to a unit, without having to modify their
                 unit files. Make sure that the file that is included
                 has the appropriate section headers before any
-                directive.</para>
+                directive. Note that for instanced units this logic
+                will first look for the instance
+                <literal>.d/</literal> subdirectory and read its
+                <literal>.conf</literal> files, followed by the
+                template <literal>.d/</literal> subdirectory and reads
+                its <literal>.conf</literal> files.</para>
 
                 <para>Note that while systemd offers a flexible
                 dependency system between units it is recommended to