X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=man%2Fresolved.conf.xml;h=36013a5e3a2de333560760f275357c3d39dd38ce;hb=3543f8218b732132dff6d0dccb2ce357e4154801;hp=6e0185bf411f32030879adcad54b8c6d159b5343;hpb=252f2b9e854dced09cf0968417d1868e5fa90a06;p=elogind.git
diff --git a/man/resolved.conf.xml b/man/resolved.conf.xml
index 6e0185bf4..36013a5e3 100644
--- a/man/resolved.conf.xml
+++ b/man/resolved.conf.xml
@@ -22,7 +22,8 @@
along with systemd; If not, see .
-->
-
+
resolved.conf
systemd
@@ -44,23 +45,28 @@
resolved.conf
- Network Name Resolution configuration file
+ resolved.conf.d
+ Network Name Resolution configuration files
/etc/systemd/resolved.conf
+ /etc/systemd/resolved.conf.d/*.conf
+ /run/systemd/resolved.conf.d/*.conf
+ /usr/lib/systemd/resolved.conf.d/*.conf
Description
- When starting, systemd-resolved will read the
- configuration file resolved.conf.
- This configuration file controls local DNS name
- resolving.
+ These configuration files control local DNS and LLMNR
+ name resolving.
+
+
+
Options