summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
Diffstat (limited to 'man')
-rw-r--r--man/resolved.conf.xml21
1 files changed, 16 insertions, 5 deletions
diff --git a/man/resolved.conf.xml b/man/resolved.conf.xml
index 811e33f4fa..4680b6a4e5 100644
--- a/man/resolved.conf.xml
+++ b/man/resolved.conf.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
+<?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
@@ -77,10 +77,11 @@
sent to one of the listed DNS servers in parallel to any
per-interface DNS servers acquired from
<citerefentry><refentrytitle>systemd-networkd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
- For compatibility reasons, if set to the empty list, the DNS
- servers listed in <filename>/etc/resolv.conf</filename> are
- used, if any are configured there. This setting defaults to
- the empty list.</para></listitem>
+ For compatibility reasons, if this setting is not specified,
+ the DNS servers listed in
+ <filename>/etc/resolv.conf</filename> are used instead, if
+ that file exists and any servers are configured in it. This
+ setting defaults to the empty list.</para></listitem>
</varlistentry>
<varlistentry>
@@ -98,6 +99,16 @@
</varlistentry>
<varlistentry>
+ <term><varname>Domains=</varname></term>
+ <listitem><para>A space-separated list of search domains. For
+ compatibility reasons, if this setting is not specified, the
+ search domains listed in <filename>/etc/resolv.conf</filename>
+ are used instead, if that file exists and any domains are
+ configured in it. This setting defaults to the empty
+ list.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><varname>LLMNR=</varname></term>
<listitem><para>Takes a boolean argument or
<literal>resolve</literal>. Controls Link-Local Multicast Name