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:35:01 +0100
committerSebastien Bacher <seb128@ubuntu.com>2021-02-25 11:49:48 +0100
commit77dea84aa6e816f66dc622cec8ae2668eba3c068 (patch)
tree755536a0ed1fb36c2899e9bff9e092c4008a25c4 /docs/libnm/html/NMSettingIPConfig.html
parent47f08826b44eed651b44dc8bacb5b46bc4c52067 (diff)
parentfd80297a396cc4dd7da4da20208fb360aa369aa7 (diff)
Merge branch 'debian/master' into ubuntu/master
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>