chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0cdfd26
)
man: document that we look for both the instance's and the template's .d/ directory...
author
Lennart Poettering
<lennart@poettering.net>
Mon, 11 Aug 2014 14:41:05 +0000
(16:41 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Mon, 11 Aug 2014 14:41:05 +0000
(16:41 +0200)
man/systemd.unit.xml
patch
|
blob
|
history
diff --git
a/man/systemd.unit.xml
b/man/systemd.unit.xml
index dc5e385ac835c75375026f6fb3b496bea6cf5d9f..c8d9300d955dd2ef6053a0ab0b362cc962128d6b 100644
(file)
--- 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
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
<para>Note that while systemd offers a flexible
dependency system between units it is recommended to