timedatectl: avoid specifically referring to NTP

systemd-timesyncd not only does NTP, but also manages clock monotonicity
using a flags file. In future, it might learn PTP support. Hence don't
expose its enablement state as "NTP" but use the more generic term
"network time synchronization". After all, for similar reasons
systemd-timesyncd is not called systemd-ntpd.

diff --git a/man/timedatectl.xml b/man/timedatectl.xml
index e5d0ef41718d613326e547b142a86250356f0fd3..187a7ad26aafffe4f97b1ce71f8f52adcc7f2bb8 100644 (file)
--- a/man/timedatectl.xml
+++ b/man/timedatectl.xml
@@ -104,10 +104,13 @@
         <term><command>status</command></term>
 
         <listitem><para>Show current settings of the system clock and
-        RTC, including whether NTP is enabled. Note that the NTP state
+        RTC, including whether network time synchronization is
+        enabled. Note that the network time synchronization state
         simply reflects whether the
         <filename>systemd-timesyncd.service</filename> unit is
-        enabled.</para></listitem>
+        enabled. Even if the status is shown as off with this command
+        another service might still synchronize the network over the
+        network.</para></listitem>
       </varlistentry>
 
       <varlistentry>
@@ -162,11 +165,13 @@
       <varlistentry>
         <term><command>set-ntp [BOOL]</command></term>
 
-        <listitem><para>Takes a boolean argument. Controls whether NTP
-        based network time synchronization is enabled (if
-        available). This enables or disables the
-        <filename>systemd-timesyncd.service</filename>
-        unit.</para></listitem>
+        <listitem><para>Takes a boolean argument. Controls whether
+        network time synchronous is enabled (if available). This
+        enables or disables the
+        <filename>systemd-timesyncd.service</filename> unit. Note that
+        even if time synchronization is turned off with this command
+        another system service might still synchronize the clock with
+        the network.</para></listitem>
       </varlistentry>
 
     </variablelist>

diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c
index 89913cc4edc5915965eb1e70ed0959670024736d..58a92d3158c3cf0a37104f204f139a4173aa9003 100644 (file)
--- a/src/timedate/timedatectl.c
+++ b/src/timedate/timedatectl.c
@@ -136,7 +136,7 @@ static void print_status_info(const StatusInfo *i) {
                 tzset();
 
         printf("       Time zone: %s (%.*s)\n"
-               "     NTP enabled: %s\n"
+               " Network Time on: %s\n"
                "NTP synchronized: %s\n"
                " RTC in local TZ: %s\n",
                strna(i->timezone), (int) sizeof(a), have_time ? a : "n/a",
@@ -331,7 +331,7 @@ static void help(void) {
                "  set-timezone ZONE        Set system time zone\n"
                "  list-timezones           Show known time zones\n"
                "  set-local-rtc BOOL       Control whether RTC is in local time\n"
-               "  set-ntp BOOL             Control whether NTP is enabled\n",
+               "  set-ntp BOOL             Control whether network time synchronization is enabled\n",
                program_invocation_short_name);
 }