X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Ftimesyncd.conf.xml;h=1127970a18a1ebaf8eec5b8274fba66e178fc955;hb=1cfa9a4cbb41ef770614fa97961cc056a63c1b7c;hp=aeb7182f912f650ab16c5bbf905ffc856fdf2d5b;hpb=874ff7bf4d6fe693542209f127d23cd89adc499b;p=elogind.git

diff --git a/man/timesyncd.conf.xml b/man/timesyncd.conf.xml
index aeb7182f9..1127970a1 100644
--- a/man/timesyncd.conf.xml
+++ b/man/timesyncd.conf.xml
@@ -1,7 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
-<?xml-stylesheet type="text/xsl" href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
@@ -22,94 +21,91 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="timesyncd.conf" conditional='ENABLE_TIMESYNCD'>
-        <refentryinfo>
-                <title>timesyncd.conf</title>
-                <productname>systemd</productname>
-
-                <authorgroup>
-                        <author>
-                                <contrib>Developer</contrib>
-                                <firstname>Lennart</firstname>
-                                <surname>Poettering</surname>
-                                <email>lennart@poettering.net</email>
-                        </author>
-                </authorgroup>
-        </refentryinfo>
-
-        <refmeta>
-                <refentrytitle>timesyncd.conf</refentrytitle>
-                <manvolnum>5</manvolnum>
-        </refmeta>
-
-        <refnamediv>
-                <refname>timesyncd.conf</refname>
-                <refpurpose>Network Time Synchronization configuration file</refpurpose>
-        </refnamediv>
-
-        <refsynopsisdiv>
-                <para><filename>/etc/systemd/timesyncd.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
-                synchronization.</para>
-
-        </refsect1>
-
-        <refsect1>
-                <title>Options</title>
-
-                <variablelist class='network-directives'>
-
-                        <varlistentry>
-                                <term><varname>NTP=</varname></term>
-                                <listitem><para>A space separated list
-                                of NTP servers host names or IP
-                                addresses. During runtime this list is
-                                combined with any per-interface NTP
-                                servers acquired from
-                                <citerefentry><refentrytitle>systemd-networkd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>. systemd-timesyncd
-                                will contact all configured system or
-                                per-interface servers in turn until
-                                one is found that responds. This
-                                setting defaults to the empty
-                                list.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><varname>FallbackNTP=</varname></term>
-                                <listitem><para>A space separated list
-                                of NTP server host names or IP
-                                addresses to be used as the fallback
-                                NTP servers. Any per-interface NTP
-                                servers obtained from
-                                <citerefentry><refentrytitle>systemd-networkd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-                                take precedence over this setting, as
-                                do any servers set via
-                                <varname>NTP=</varname> above. This
-                                setting is hence only used if no other
-                                NTP server information is known. If
-                                this option is not given, a
-                                compiled-in list of NTP servers is
-                                used instead.</para></listitem>
-                        </varlistentry>
-
-                </variablelist>
-        </refsect1>
-
-        <refsect1>
-                  <title>See Also</title>
-                  <para>
-                        <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>systemd-timesyncd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>systemd-networkd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-                  </para>
-        </refsect1>
+<refentry id="timesyncd.conf" conditional='ENABLE_TIMESYNCD'
+    xmlns:xi="http://www.w3.org/2001/XInclude">
+  <refentryinfo>
+    <title>timesyncd.conf</title>
+    <productname>systemd</productname>
+
+    <authorgroup>
+      <author>
+        <contrib>Developer</contrib>
+        <firstname>Lennart</firstname>
+        <surname>Poettering</surname>
+        <email>lennart@poettering.net</email>
+      </author>
+    </authorgroup>
+  </refentryinfo>
+
+  <refmeta>
+    <refentrytitle>timesyncd.conf</refentrytitle>
+    <manvolnum>5</manvolnum>
+  </refmeta>
+
+  <refnamediv>
+    <refname>timesyncd.conf</refname>
+    <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>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>
+
+    <variablelist class='network-directives'>
+
+      <varlistentry>
+        <term><varname>NTP=</varname></term>
+        <listitem><para>A space separated list of NTP servers host
+        names or IP addresses. During runtime this list is combined
+        with any per-interface NTP servers acquired from
+        <citerefentry><refentrytitle>systemd-networkd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
+        systemd-timesyncd will contact all configured system or
+        per-interface servers in turn until one is found that
+        responds. This setting defaults to the empty
+        list.</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><varname>FallbackNTP=</varname></term>
+        <listitem><para>A space separated list of NTP server host
+        names or IP addresses to be used as the fallback NTP servers.
+        Any per-interface NTP servers obtained from
+        <citerefentry><refentrytitle>systemd-networkd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+        take precedence over this setting, as do any servers set via
+        <varname>NTP=</varname> above. This setting is hence only used
+        if no other NTP server information is known. If this option is
+        not given, a compiled-in list of NTP servers is used
+        instead.</para></listitem>
+      </varlistentry>
+
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+      <title>See Also</title>
+      <para>
+      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>systemd-timesyncd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>systemd-networkd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+      </para>
+  </refsect1>
 
 </refentry>