Merge remote-tracking branch 'salsa/debian/master' into ubuntu/master

1 files changed, 22 insertions, 2 deletions

diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html
index 97287e90..04672d9b 100644
--- a/docs/api/html/NetworkManager.conf.html
+++ b/docs/api/html/NetworkManager.conf.html
@@ -328,6 +328,9 @@ no-auto-default=*
         setting below), the name server there will be localhost only.
         NetworkManager also writes a file <code class="filename">/run/NetworkManager/no-stub-resolv.conf</code>
         that contains the original name servers pushed to the DNS plugin.</p>
+<p>When using <code class="literal">dnsmasq</code> and <code class="literal">systemd-resolved</code>
+        per-connection added dns servers will always be queried using
+        the device the connection has been activated on.</p>
 </td>
 </tr>
 <tr>
@@ -640,11 +643,11 @@ ipv6.ip6-privacy=0
 </tr>
 <tr>
 <td><p><span class="term"><code class="varname">connection.llmnr</code></span></p></td>
-<td></td>
+<td><p>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).</p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="varname">connection.mdns</code></span></p></td>
-<td></td>
+<td><p>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).</p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="varname">connection.stable-id</code></span></p></td>
@@ -716,6 +719,10 @@ ipv6.ip6-privacy=0
           </p></td>
 </tr>
 <tr>
+<td><p><span class="term"><code class="varname">ipv6.ra-timeout</code></span></p></td>
+<td><p>If left unspecified, the default value depends on the sysctl solicitation settings.</p></td>
+</tr>
+<tr>
 <td><p><span class="term"><code class="varname">ipv6.dhcp-duid</code></span></p></td>
 <td><p>If left unspecified, it defaults to "lease".</p></td>
 </tr>
@@ -1067,6 +1074,19 @@ managed=1
 </colgroup>
 <tbody>
 <tr>
+<td><p><span class="term"><code class="varname">enabled</code></span></p></td>
+<td><p>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 <code class="filename">/var/lib/NetworkManager/NetworkManager-intern.conf</code>
+          file.
+          </p></td>
+</tr>
+<tr>
 <td><p><span class="term"><code class="varname">uri</code></span></p></td>
 <td><p>The URI of a web page to periodically
           request when connectivity is being checked.  This page