summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-08-10 23:40:18 +0200
committerLennart Poettering <lennart@poettering.net>2014-08-11 15:06:22 +0200
commit31a339fd7f0e87376bade9ebd7ae32c58d34cf85 (patch)
tree969ba0f4f4d11abdf2bfe7a5b032d4254bcbfaf6 /man
parent81663503e6769b4634b7d717ec8f112e26423f6f (diff)
man: update resolved man pages a bit
Diffstat (limited to 'man')
-rw-r--r--man/resolved.conf.xml4
-rw-r--r--man/systemd-resolved.service.xml16
2 files changed, 12 insertions, 8 deletions
diff --git a/man/resolved.conf.xml b/man/resolved.conf.xml
index 6e0185bf41..c582368568 100644
--- a/man/resolved.conf.xml
+++ b/man/resolved.conf.xml
@@ -56,8 +56,8 @@
<para>When starting, systemd-resolved will read the
configuration file <filename>resolved.conf</filename>.
- This configuration file controls local DNS name
- resolving.</para>
+ This configuration file controls local DNS and LLMNR
+ name resolving.</para>
</refsect1>
diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml
index 839f46a12b..dc0e3b6e3d 100644
--- a/man/systemd-resolved.service.xml
+++ b/man/systemd-resolved.service.xml
@@ -57,13 +57,17 @@
<title>Description</title>
<para><command>systemd-resolved</command> is a system
- service that manages network name resolution. It does so by
- generating <filename>/run/systemd/resolve/resolv.conf</filename>,
- which may be symlinked from <filename>/etc/resolv.conf</filename>.
- The contents is generated from the global settings in
+ service that manages network name resolution. It
+ implements a caching DNS stub resolver and an LLMNR
+ resolver and responder. It also generates
+ <filename>/run/systemd/resolve/resolv.conf</filename>
+ for compatibility which may be symlinked from
+ <filename>/etc/resolv.conf</filename>. The DNS servers contacted
+ are determined from the global settings in
<citerefentry><refentrytitle>resolved.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
- the per-link static settings in <filename>.network</filename> files,
- and the per-link dynamic settings received over DHCP. See
+ the per-link static settings in
+ <filename>.network</filename> files, and the per-link
+ dynamic settings received over DHCP. See
<citerefentry><refentrytitle>systemd.network</refentrytitle><manvolnum>5</manvolnum></citerefentry>
for more details.</para>