X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fresolved.conf.xml;h=36013a5e3a2de333560760f275357c3d39dd38ce;hp=c58236856851ac1e3ec21044738c7f2360b40aa2;hb=9b15b7846d4de01bb5d9700a24077787e984e8ab;hpb=31a339fd7f0e87376bade9ebd7ae32c58d34cf85;ds=sidebyside
diff --git a/man/resolved.conf.xml b/man/resolved.conf.xml
index c58236856..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 and LLMNR
+ These configuration files control local DNS and LLMNR
name resolving.
+
+
+
Options