diff options
| author | Josh Triplett <josh@joshtriplett.org> | 2014-11-29 01:07:21 -0800 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-11-29 13:55:32 -0500 |
| commit | be795898c0d2fa21e3389b89793dcd45c47f8b9f (patch) | |
| tree | 3e92c674e76a94e8b7e9b11b487ca0b543a3f698 /man | |
| parent | f2dacc96b25528ca1b0caca6364a69d656cf1569 (diff) | |
timesyncd: Support timesyncd.conf.d directories in the usual search paths
Diffstat (limited to 'man')
| -rw-r--r-- | man/timesyncd.conf.xml | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/man/timesyncd.conf.xml b/man/timesyncd.conf.xml index aeb7182f91..1a56c2c5c4 100644 --- a/man/timesyncd.conf.xml +++ b/man/timesyncd.conf.xml @@ -22,7 +22,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. --> -<refentry id="timesyncd.conf" conditional='ENABLE_TIMESYNCD'> +<refentry id="timesyncd.conf" conditional='ENABLE_TIMESYNCD' + xmlns:xi="http://www.w3.org/2001/XInclude"> <refentryinfo> <title>timesyncd.conf</title> <productname>systemd</productname> @@ -44,24 +45,28 @@ <refnamediv> <refname>timesyncd.conf</refname> - <refpurpose>Network Time Synchronization configuration file</refpurpose> + <refname>timesyncd.conf.d</refname> + <refpurpose>Network Time Synchronization configuration files</refpurpose> </refnamediv> <refsynopsisdiv> <para><filename>/etc/systemd/timesyncd.conf</filename></para> + <para><filename>/etc/systemd/timesyncd.conf.d/*.conf</filename></para> + <para><filename>/run/systemd/timesyncd.conf.d/*.conf</filename></para> + <para><filename>/usr/lib/systemd/timesyncd.conf.d/*.conf</filename></para> </refsynopsisdiv> <refsect1> <title>Description</title> - <para>When starting, systemd-timesyncd will read the - configuration file - <filename>timesyncd.conf</filename>. This - configuration file controls NTP network time + <para>These configuration files control NTP network time synchronization.</para> </refsect1> + <xi:include href="standard-conf.xml" xpointer="confd" /> + <xi:include href="standard-conf.xml" xpointer="conf" /> + <refsect1> <title>Options</title> |