summaryrefslogtreecommitdiffstats
path: root/man/resolved.conf.xml
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-03-04 01:10:21 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-03-04 01:10:21 +0100
commite93549ef29c4123d9ee45acb5815048390201e49 (patch)
tree2cfe31cef554e2b7a3dd9b5a27f4d5867901c7f0 /man/resolved.conf.xml
parenttmpfiles.d: only copy /etc/pam.d if PAM is present (diff)
downloadsystemd-e93549ef29c4123d9ee45acb5815048390201e49.tar.xz
systemd-e93549ef29c4123d9ee45acb5815048390201e49.zip
Do not advertise .d snippets over main config file
For daemons which have a main configuration file, there's little reason for the administrator to use configuration snippets. They are useful for packagers which need to override settings, but we shouldn't advertise that as the main way of configuring those services. https://bugs.freedesktop.org/show_bug.cgi?id=89397
Diffstat (limited to 'man/resolved.conf.xml')
-rw-r--r--man/resolved.conf.xml3
1 files changed, 1 insertions, 2 deletions
diff --git a/man/resolved.conf.xml b/man/resolved.conf.xml
index 36cae2706c..8047a4ea75 100644
--- a/man/resolved.conf.xml
+++ b/man/resolved.conf.xml
@@ -63,8 +63,7 @@
</refsect1>
- <xi:include href="standard-conf.xml" xpointer="confd" />
- <xi:include href="standard-conf.xml" xpointer="conf" />
+ <xi:include href="standard-conf.xml" xpointer="main-conf" />
<refsect1>
<title>Options</title>