From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 13 Mar 2021 10:56:30 +0000 (+0900)
Subject: man: DNS/NTP servers received from DHCP server are concatenated with the statically... 
X-Git-Tag: v248-rc4~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b63dae3168209a06cefe2b9916667b7754b7de34;p=thirdparty%2Fsystemd.git

man: DNS/NTP servers received from DHCP server are concatenated with the statically configured ones

Prompted by #9473.
---

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index abf8ea0a6f2..cec2f96f26c 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -1597,9 +1597,7 @@ IPv6Token=prefixstable:2002:da8:1::</programlisting></para>
         <varlistentry>
           <term><varname>UseDNS=</varname></term>
           <listitem>
-            <para>When true (the default), the DNS servers received
-            from the DHCP server will be used and take precedence over
-            any statically configured ones.</para>
+            <para>When true (the default), the DNS servers received from the DHCP server will be used.</para>
 
             <para>This corresponds to the <option>nameserver</option>
             option in <citerefentry
@@ -1618,8 +1616,7 @@ IPv6Token=prefixstable:2002:da8:1::</programlisting></para>
           <term><varname>UseNTP=</varname></term>
           <listitem>
             <para>When true (the default), the NTP servers received from the DHCP server will be used by
-            <filename>systemd-timesyncd.service</filename> and take precedence over any statically configured
-            ones.</para>
+            <filename>systemd-timesyncd.service</filename>.</para>
           </listitem>
         </varlistentry>
         <varlistentry>
@@ -1739,13 +1736,12 @@ IPv6Token=prefixstable:2002:da8:1::</programlisting></para>
           <term><varname>UseGateway=</varname></term>
           <listitem>
             <para>When true, the gateway will be requested from the DHCP server and added to the routing table with a
-            metric of 1024, and a scope of "link".  When unset, the value specified with <option>UseRoutes=</option>
+            metric of 1024, and a scope of "link". When unset, the value specified with <option>UseRoutes=</option>
             is used.</para>
           </listitem>
         </varlistentry>
         <varlistentry>
           <term><varname>UseTimezone=</varname></term>
-
           <listitem><para>When true, the timezone received from the
           DHCP server will be set as timezone of the local
           system. Defaults to <literal>no</literal>.</para></listitem>
@@ -2163,8 +2159,7 @@ IPv6Token=prefixstable:2002:da8:1::</programlisting></para>
         <varlistentry>
           <term><varname>UseDNS=</varname></term>
           <listitem>
-            <para>When true (the default), the DNS servers received in the Router Advertisement will be used and take
-            precedence over any statically configured ones.</para>
+            <para>When true (the default), the DNS servers received in the Router Advertisement will be used.</para>
 
             <para>This corresponds to the <option>nameserver</option> option in <citerefentry
             project='man-pages'><refentrytitle>resolv.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>