final v236 update (#7649)

[thirdparty/systemd.git] / man / timedatectl.xml

diff --git a/man/timedatectl.xml b/man/timedatectl.xml
index d7bd052eff719331b4efe95a93d23c362b8d3abf..dba94d88317b187929fde4b7ae5326441fd16d19 100644 (file)
--- a/man/timedatectl.xml
+++ b/man/timedatectl.xml
@@ -1,11 +1,10 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
+  SPDX-License-Identifier: LGPL-2.1+
+
   This file is part of systemd.
 
   Copyright 2012 Lennart Poettering
@@ -106,14 +105,11 @@
       <varlistentry>
         <term><command>status</command></term>
 
-        <listitem><para>Show current settings of the system clock and
-        RTC, including whether network time synchronization is
-        on. Note that whether network time synchronization is on
-        simply reflects whether the
-        <filename>systemd-timesyncd.service</filename> unit is
-        enabled. Even if this command shows the status as off a
-        different service might still synchronize the clock with the
-        network.</para></listitem>
+        <listitem><para>Show current settings of the system clock and RTC,
+        including whether network time synchronization through
+        <filename>systemd-timesyncd.service</filename> is active. Even if it is
+        inactive, a different service might still synchronize the clock.
+        </para></listitem>
       </varlistentry>
 
       <varlistentry>
@@ -169,12 +165,27 @@
         <term><command>set-ntp [BOOL]</command></term>
 
         <listitem><para>Takes a boolean argument. Controls whether
-        network time synchronization is enabled (if available). This
-        enables or disables the
-        <filename>systemd-timesyncd.service</filename> unit. Note that
-        even if this command turns time synchronization off a
-        different system service might still synchronize the clock
-        with the network.</para></listitem>
+        network time synchronization is active and enabled (if
+        available). This enables and starts, or disables and stops the
+        <filename>systemd-timesyncd.service</filename> unit. It does
+        not affect the state of any other, unrelated network time
+        synchronization services that might be installed on the
+        system. This command is hence mostly equivalent to:
+        <command>systemctl enable --now
+        systemd-timesyncd.service</command> and <command>systemctl
+        disable --now systemd-timesyncd.service</command>, but is
+        protected by a different access policy.</para>
+
+        <para>Note that even if time synchronization is turned off
+        with this command, another unrelated system service might
+        still synchronize the clock with the network. Also note that,
+        strictly speaking,
+        <filename>systemd-timesyncd.service</filename> does more than
+        just network time synchronization, as it ensures a monotonic
+        clock on systems without RTC even if no network is
+        available. See
+        <citerefentry><refentrytitle>systemd-timesyncd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+        for details about this.</para></listitem>
       </varlistentry>
 
     </variablelist>
@@ -194,13 +205,13 @@
     <title>Examples</title>
     <para>Show current settings:
     <programlisting>$ timedatectl
-      Local time: Di 2015-04-07 16:26:56 CEST
-  Universal time: Di 2015-04-07 14:26:56 UTC
-        RTC time: Di 2015-04-07 14:26:56
-       Time zone: Europe/Berlin (CEST, +0200)
- Network time on: yes
-NTP synchronized: yes
- RTC in local TZ: no</programlisting>
+                      Local time: Thu 2017-09-21 16:08:56 CEST
+                  Universal time: Thu 2017-09-21 14:08:56 UTC
+                        RTC time: Thu 2017-09-21 14:08:56
+                       Time zone: Europe/Warsaw (CEST, +0200)
+       System clock synchronized: yes
+systemd-timesyncd.service active: yes
+                 RTC in local TZ: no</programlisting>
     </para>
 
     <para>Enable network time synchronization:
@@ -213,14 +224,14 @@ Password: ********
 
     <programlisting>$ systemctl status systemd-timesyncd.service
 ● systemd-timesyncd.service - Network Time Synchronization
-   Loaded: loaded (&rootlibexecdir;/system/systemd-timesyncd.service; enabled)
+   Loaded: loaded (/usr/lib/systemd/system/systemd-timesyncd.service; enabled)
    Active: active (running) since Mo 2015-03-30 14:20:38 CEST; 5s ago
      Docs: man:systemd-timesyncd.service(8)
  Main PID: 595 (systemd-timesyn)
    Status: "Using Time Server 216.239.38.15:123 (time4.google.com)."
    CGroup: /system.slice/systemd-timesyncd.service
-           └─595 &rootlibexecdir;/systemd-timesyncd
-...</programlisting>
+           └─595 /usr/lib/systemd/systemd-timesyncd
+…</programlisting>
     </para>
   </refsect1>