diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2021-02-25 11:35:01 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2021-02-25 11:49:48 +0100 |
| commit | 77dea84aa6e816f66dc622cec8ae2668eba3c068 (patch) | |
| tree | 755536a0ed1fb36c2899e9bff9e092c4008a25c4 /docs/api/html/settings-ipv6.html | |
| parent | 47f08826b44eed651b44dc8bacb5b46bc4c52067 (diff) | |
| parent | fd80297a396cc4dd7da4da20208fb360aa369aa7 (diff) | |
Merge branch 'debian/master' into ubuntu/master
Diffstat (limited to 'docs/api/html/settings-ipv6.html')
| -rw-r--r-- | docs/api/html/settings-ipv6.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/api/html/settings-ipv6.html b/docs/api/html/settings-ipv6.html index eab52cee..3c11795e 100644 --- a/docs/api/html/settings-ipv6.html +++ b/docs/api/html/settings-ipv6.html @@ -38,7 +38,7 @@ Properties </h2> <div class="table"> -<a name="id-1.3.3.18.2.2.1"></a><p class="title"><b>Table 58. </b></p> +<a name="id-1.3.3.18.2.2.1"></a><p class="title"><b>Table 61. </b></p> <div class="table-contents"><table class="table" border="1"> <colgroup> <col> @@ -129,7 +129,7 @@ <td><pre class="screen">dns-options</pre></td> <td><pre class="screen">array of string</pre></td> <td><pre class="screen"></pre></td> -<td>Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties. The currently supported options are "attempts", "debug", "edns0", "inet6", "ip6-bytestring", "ip6-dotint", "ndots", "no-check-names", "no-ip6-dotint", "no-reload", "no-tld-query", "rotate", "single-request", "single-request-reopen", "timeout", "trust-ad", "use-vc". The "trust-ad" setting is only honored if the profile contributes name servers to resolv.conf, and if all contributing profiles have "trust-ad" enabled.</td> +<td>Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties. The currently supported options are "attempts", "debug", "edns0", "inet6", "ip6-bytestring", "ip6-dotint", "ndots", "no-check-names", "no-ip6-dotint", "no-reload", "no-tld-query", "rotate", "single-request", "single-request-reopen", "timeout", "trust-ad", "use-vc". The "trust-ad" setting is only honored if the profile contributes name servers to resolv.conf, and if all contributing profiles have "trust-ad" enabled. When using a caching DNS plugin (dnsmasq or systemd-resolved in NetworkManager.conf) then "edns0" and "trust-ad" are automatically added.</td> </tr> <tr> <td><pre class="screen">dns-priority</pre></td> |