shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-26 09:57:26 +03:00
Code

man: update resolved man pages a bit

Browse Source
This commit is contained in:
Lennart Poettering 2014-08-10 23:40:18 +02:00
parent 81663503e6
commit 31a339fd7f
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
man/resolved.conf.xml
View File

@ -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>

16
man/systemd-resolved.service.xml
View File

@ -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>