about summary refs log tree commit diff
path: root/docs/libnm/html/NMSettingIPConfig.html
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2021-02-25 11:36:45 +0100
committerSebastien Bacher <seb128@ubuntu.com>2021-02-25 11:36:45 +0100
commitd92aa7f298fe84d4cf686c5ad64b73438e00d377 (patch)
tree2f1f4c7b48cff9e63b0d0e3669bada3d9aeda72e /docs/libnm/html/NMSettingIPConfig.html
parenta82e048a943092315a32d745c99e0f5635e29134 (diff)
parent3a56bce6c0ea7ba0fe269520547740783b342e0d (diff)
Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream/latest
Diffstat (limited to 'docs/libnm/html/NMSettingIPConfig.html')
-rw-r--r--docs/libnm/html/NMSettingIPConfig.html3
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/libnm/html/NMSettingIPConfig.html b/docs/libnm/html/NMSettingIPConfig.html
index 06bb11e3..b2b0b8e2 100644
--- a/docs/libnm/html/NMSettingIPConfig.html
+++ b/docs/libnm/html/NMSettingIPConfig.html
@@ -6680,6 +6680,9 @@ distinct from an empty list of properties.</p>
 <p>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.</p>
+<p>When using a caching DNS plugin (dnsmasq or systemd-resolved in
+NetworkManager.conf) then "edns0" and "trust-ad" are automatically
+added.</p>
 <p>Owner: NMSettingIPConfig</p>
 <p>Flags: Read / Write</p>
 <p class="since">Since: 1.2</p>