summaryrefslogtreecommitdiff
path: root/man/systemd.xml
diff options
context:
space:
mode:
authorJosh Triplett <josh@joshtriplett.org>2014-11-29 01:06:04 -0800
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-11-29 13:55:31 -0500
commit1b907b5c3b11491b790e541dd24255a758511a2f (patch)
tree3a13537868e9518c704c324fc93eb157022ca72a /man/systemd.xml
parentd3fae78fe86f1dfcdb07fd613ccbb3adf547a617 (diff)
core: Support system.conf.d and user.conf.d directories in the usual search paths
Diffstat (limited to 'man/systemd.xml')
-rw-r--r--man/systemd.xml10
1 files changed, 6 insertions, 4 deletions
diff --git a/man/systemd.xml b/man/systemd.xml
index bf7a7a6f67..d776815414 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -75,10 +75,12 @@
<citerefentry><refentrytitle>telinit</refentrytitle><manvolnum>8</manvolnum></citerefentry>
for more information.</para>
- <para>When run as system instance, systemd interprets
- the configuration file
- <filename>system.conf</filename>, otherwise
- <filename>user.conf</filename>. See
+ <para>When run as a system instance, systemd interprets the
+ configuration file <filename>system.conf</filename> and the
+ files in <filename>system.conf.d</filename> directories; when
+ run as a user instance, systemd interprets the configuration
+ file <filename>user.conf</filename> and the files in
+ <filename>user.conf.d</filename> directories. See
<citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
for more information.</para>
</refsect1>