X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=man%2Fresolved.conf.xml;h=535a23f500a12853fe081b744a31c4846ad7c159;hb=6b222c4b0227f9914446ac54754aea867f742be4;hp=0e9b90c1cd9c375b23a1c119b9398564d230128c;hpb=f9044b74c533916d1f3949ffb15fee8b03d1f1f4;p=thirdparty%2Fsystemd.git

diff --git a/man/resolved.conf.xml b/man/resolved.conf.xml
index 0e9b90c1cd9..535a23f500a 100644
--- a/man/resolved.conf.xml
+++ b/man/resolved.conf.xml
@@ -41,14 +41,19 @@
   <refsect1>
     <title>Options</title>
 
-    <para>The following options are available in the <literal>[Resolve]</literal> section:</para>
+    <para>The following options are available in the [Resolve] section:</para>
 
     <variablelist class='network-directives'>
 
       <varlistentry>
         <term><varname>DNS=</varname></term>
-        <listitem><para>A space-separated list of IPv4 and IPv6 addresses to use as system DNS servers. DNS requests
-        are sent to one of the listed DNS servers in parallel to suitable per-link DNS servers acquired from
+        <listitem><para>A space-separated list of IPv4 and IPv6 addresses to use as system DNS servers. Each address can
+        optionally take a port number separated with <literal>:</literal>, a network interface name or index separated with
+        <literal>%</literal>, and a Server Name Indication (SNI) separated with <literal>#</literal>. When IPv6 address is
+        specified with a port number, then the address must be in the square brackets. That is, the acceptable full formats
+        are <literal>111.222.333.444:9953%ifname#example.com</literal> for IPv4 and
+        <literal>[1111:2222::3333]:9953%ifname#example.com</literal> for IPv6. DNS requests are sent to one of the listed
+        DNS servers in parallel to suitable per-link DNS servers acquired from
         <citerefentry><refentrytitle>systemd-networkd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry> or
         set at runtime by external applications.  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
@@ -57,8 +62,8 @@
 
       <varlistentry>
         <term><varname>FallbackDNS=</varname></term>
-        <listitem><para>A space-separated list of IPv4 and IPv6 addresses to use as the fallback DNS servers. Any
-        per-link DNS servers obtained from
+        <listitem><para>A space-separated list of IPv4 and IPv6 addresses to use as the fallback DNS servers. Please see
+        <varname>DNS=</varname> for acceptable format of adddresses. Any per-link DNS servers obtained from
         <citerefentry><refentrytitle>systemd-networkd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
         take precedence over this setting, as do any servers set via <varname>DNS=</varname> above or
         <filename>/etc/resolv.conf</filename>. This setting is hence only used if no other DNS server information is
@@ -80,7 +85,7 @@
 
         <para>The domains prefixed with <literal>~</literal> are called "routing domains". All domains listed
         here (both search domains and routing domains after removing the <literal>~</literal> prefix) define
-        a search path that preferably directs DNS queries to this inteface. This search path has an effect
+        a search path that preferably directs DNS queries to this interface. This search path has an effect
         only when suitable per-link DNS servers are known. Such servers may be defined through the
         <varname>DNS=</varname> setting (see above) and dynamically at run time, for example from DHCP
         leases. If no per-link DNS servers are known, routing domains have no effect.</para>