diff options
| author |   Lennart Poettering <lennart@poettering.net> | 2014-08-12 19:49:15 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-08-12 19:49:15 +0200 |
| commit | 7964ca43478d8c69263dd8de244131c97bb4cedd (patch) | |
| tree | aebc4e6b091b77fefa2850ca4a3067d4a3ba2be1 /man/systemd-resolved.service.xml | |
| parent | timesyncd: beef up NTP server selection logic, and acquire NTP servers from DHCP (diff) | |
| download | systemd-7964ca43478d8c69263dd8de244131c97bb4cedd.tar.gz systemd-7964ca43478d8c69263dd8de244131c97bb4cedd.tar.bz2 systemd-7964ca43478d8c69263dd8de244131c97bb4cedd.zip | |
man: minimal updates to resolved.conf man page
Diffstat (limited to 'man/systemd-resolved.service.xml')
| -rw-r--r-- | man/systemd-resolved.service.xml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml index dc0e3b6e3..c44b10c47 100644 --- a/man/systemd-resolved.service.xml +++ b/man/systemd-resolved.service.xml @@ -62,8 +62,10 @@ 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 + <filename>/etc/resolv.conf</filename>.</para> + + <para>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 @@ -79,8 +81,8 @@ <refsect1> <title>See Also</title> <para> - <citerefentry><refentrytitle>resolved.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, + <citerefentry><refentrytitle>resolved.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd.network</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd-networkd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry> </para> |