diff options
| author | Josh Triplett <josh@joshtriplett.org> | 2014-11-29 01:07:11 -0800 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-11-29 13:55:32 -0500 |
| commit | f2dacc96b25528ca1b0caca6364a69d656cf1569 (patch) | |
| tree | 9830f1b716a73f6c3845032e019d3384e6f57fba /man | |
| parent | 301af7e4853ad0281402f8d86f5a77c6cb7ce9f4 (diff) | |
resolved: Support resolved.conf.d directories in the usual search paths
Diffstat (limited to 'man')
| -rw-r--r-- | man/resolved.conf.xml | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/man/resolved.conf.xml b/man/resolved.conf.xml index c582368568..36013a5e3a 100644 --- a/man/resolved.conf.xml +++ b/man/resolved.conf.xml @@ -22,7 +22,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. --> -<refentry id="resolved.conf" conditional='ENABLE_RESOLVED'> +<refentry id="resolved.conf" conditional='ENABLE_RESOLVED' + xmlns:xi="http://www.w3.org/2001/XInclude"> <refentryinfo> <title>resolved.conf</title> <productname>systemd</productname> @@ -44,23 +45,28 @@ <refnamediv> <refname>resolved.conf</refname> - <refpurpose>Network Name Resolution configuration file</refpurpose> + <refname>resolved.conf.d</refname> + <refpurpose>Network Name Resolution configuration files</refpurpose> </refnamediv> <refsynopsisdiv> <para><filename>/etc/systemd/resolved.conf</filename></para> + <para><filename>/etc/systemd/resolved.conf.d/*.conf</filename></para> + <para><filename>/run/systemd/resolved.conf.d/*.conf</filename></para> + <para><filename>/usr/lib/systemd/resolved.conf.d/*.conf</filename></para> </refsynopsisdiv> <refsect1> <title>Description</title> - <para>When starting, systemd-resolved will read the - configuration file <filename>resolved.conf</filename>. - This configuration file controls local DNS and LLMNR + <para>These configuration files control local DNS and LLMNR name resolving.</para> </refsect1> + <xi:include href="standard-conf.xml" xpointer="confd" /> + <xi:include href="standard-conf.xml" xpointer="conf" /> + <refsect1> <title>Options</title> |