summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-08-11 16:41:05 +0200
committerLennart Poettering <lennart@poettering.net>2014-08-11 16:41:05 +0200
commit96ddbf819a5675dba23ffadc35099462fdb2579f (patch)
tree8e3f87b48b1c5ce6fd2d4648dbfe1e7f6b4d7279 /man
parent0cdfd26ef826f8a595ab7d85ebc37894f4f3d940 (diff)
man: document that we look for both the instance's and the template's .d/ directory when looking for unit file drop-ins.
Diffstat (limited to 'man')
-rw-r--r--man/systemd.unit.xml7
1 files changed, 6 insertions, 1 deletions
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index dc5e385ac8..c8d9300d95 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