New upstream version 1.22.8 upstream/1.22.8

1 files changed, 23 insertions, 0 deletions

diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
index c0c05147..782f1ab5 100644
--- a/man/NetworkManager.conf.xml
+++ b/man/NetworkManager.conf.xml
@@ -338,6 +338,10 @@ no-auto-default=*
         setting below), the name server there will be localhost only.
         NetworkManager also writes a file <filename>&nmrundir;/no-stub-resolv.conf</filename>
         that contains the original name servers pushed to the DNS plugin.</para>
+
+        <para>When using <literal>dnsmasq</literal> and <literal>systemd-resolved</literal>
+        per-connection added dns servers will always be queried using
+        the device the connection has been activated on.</para>
         </listitem>
       </varlistentry>
 
@@ -677,9 +681,11 @@ ipv6.ip6-privacy=0
         </varlistentry>
         <varlistentry>
           <term><varname>connection.llmnr</varname></term>
+          <listitem><para>If unspecified, the ultimate default values depends on the DNS plugin. With systemd-resolved the default currently is "yes" (2) and for all other plugins "no" (0).</para></listitem>
         </varlistentry>
         <varlistentry>
           <term><varname>connection.mdns</varname></term>
+          <listitem><para>If unspecified, the ultimate default values depends on the DNS plugin. With systemd-resolved the default currently is "no" (0) and for all other plugins also "no" (0).</para></listitem>
         </varlistentry>
         <varlistentry>
           <term><varname>connection.stable-id</varname></term>
@@ -744,6 +750,10 @@ ipv6.ip6-privacy=0
           </para></listitem>
         </varlistentry>
         <varlistentry>
+          <term><varname>ipv6.ra-timeout</varname></term>
+          <listitem><para>If left unspecified, the default value depends on the sysctl solicitation settings.</para></listitem>
+        </varlistentry>
+        <varlistentry>
           <term><varname>ipv6.dhcp-duid</varname></term>
           <listitem><para>If left unspecified, it defaults to "lease".</para></listitem>
         </varlistentry>
@@ -1081,6 +1091,19 @@ managed=1
     <para>
       <variablelist>
         <varlistentry>
+          <term><varname>enabled</varname></term>
+          <listitem><para>Whether connectivity check is enabled.
+          Note that to enable connectivity check, a valid uri must
+          also be configured. The value defaults to true, but since
+          the uri is unset by default, connectivity check may be disabled.
+          The main purpose of this option is to have a single flag
+          to disable connectivity check. Note that this setting can
+          also be set via D-Bus API at runtime. In that case, the value gets
+          stored in <filename>/var/lib/NetworkManager/NetworkManager-intern.conf</filename>
+          file.
+          </para></listitem>
+        </varlistentry>
+        <varlistentry>
           <term><varname>uri</varname></term>
           <listitem><para>The URI of a web page to periodically
           request when connectivity is being checked.  This page