chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journald: turn off COW for journal files on btrfs
[elogind.git]
/
man
/
resolved.conf.xml
diff --git
a/man/resolved.conf.xml
b/man/resolved.conf.xml
index c58236856851ac1e3ec21044738c7f2360b40aa2..36013a5e3a2de333560760f275357c3d39dd38ce 100644
(file)
--- a/
man/resolved.conf.xml
+++ b/
man/resolved.conf.xml
@@
-22,7
+22,8
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
-->
along with systemd; If not, see <http://www.gnu.org/licenses/>.
-->
-<refentry id="resolved.conf" conditional='ENABLE_RESOLVED'>
+<refentry id="resolved.conf" conditional='ENABLE_RESOLVED'
+ xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo>
<title>resolved.conf</title>
<productname>systemd</productname>
<refentryinfo>
<title>resolved.conf</title>
<productname>systemd</productname>
@@
-44,23
+45,28
@@
<refnamediv>
<refname>resolved.conf</refname>
<refnamediv>
<refname>resolved.conf</refname>
- <refpurpose>Network Name Resolution configuration file</refpurpose>
+ <refname>resolved.conf.d</refname>
+ <refpurpose>Network Name Resolution configuration files</refpurpose>
</refnamediv>
<refsynopsisdiv>
<para><filename>/etc/systemd/resolved.conf</filename></para>
</refnamediv>
<refsynopsisdiv>
<para><filename>/etc/systemd/resolved.conf</filename></para>
+ <para><filename>/etc/systemd/resolved.conf.d/*.conf</filename></para>
+ <para><filename>/run/systemd/resolved.conf.d/*.conf</filename></para>
+ <para><filename>/usr/lib/systemd/resolved.conf.d/*.conf</filename></para>
</refsynopsisdiv>
<refsect1>
<title>Description</title>
</refsynopsisdiv>
<refsect1>
<title>Description</title>
- <para>When starting, systemd-resolved will read the
- configuration file <filename>resolved.conf</filename>.
- This configuration file controls local DNS and LLMNR
+ <para>These configuration files control local DNS and LLMNR
name resolving.</para>
</refsect1>
name resolving.</para>
</refsect1>
+ <xi:include href="standard-conf.xml" xpointer="confd" />
+ <xi:include href="standard-conf.xml" xpointer="conf" />
+
<refsect1>
<title>Options</title>
<refsect1>
<title>Options</title>