From 04f883cf36b7fcf50b61e6800f7ad917c089acd8 Mon Sep 17 00:00:00 2001 From: Maurice Aiken Date: Sep 24 2019 09:32:54 +0000 Subject: [PATCH 1/2] Update modules/system-administrators-guide/pages/basic-system-configuration/Configuring_the_Date_and_Time.adoc Fix two typos. One is a redundant "it", the other is a missing prep. "in". --- diff --git a/modules/system-administrators-guide/pages/basic-system-configuration/Configuring_the_Date_and_Time.adoc b/modules/system-administrators-guide/pages/basic-system-configuration/Configuring_the_Date_and_Time.adoc index 7fc7bdc..f77ae07 100644 --- a/modules/system-administrators-guide/pages/basic-system-configuration/Configuring_the_Date_and_Time.adoc +++ b/modules/system-administrators-guide/pages/basic-system-configuration/Configuring_the_Date_and_Time.adoc @@ -1,4 +1,3 @@ - :experimental: include::{partialsdir}/entities.adoc[] @@ -72,7 +71,7 @@ To change the current time, type the following at a shell prompt as `root`: Replace _HH_ with an hour, _MM_ with a minute, and _SS_ with a second, all typed in two-digit form. -This command updates both the system time and the hardware clock. The result it is similar to using both the [command]#date --set# and [command]#hwclock --systohc# commands. +This command updates both the system time and the hardware clock. The result is similar to using both the [command]#date --set# and [command]#hwclock --systohc# commands. The command will fail if an `NTP` service is enabled. See xref:Configuring_the_Date_and_Time.adoc#sect-Configuring_the_Date_and_Time-timedatectl-NTP[Synchronizing the System Clock with a Remote Server] to temporally disable the service. @@ -369,7 +368,7 @@ Running [command]#hwclock# with no command line options as the `root` user retur [command]#hwclock# ---- -Note that using the [option]`--utc` or [option]`--localtime` options with the [command]#hwclock# command does not mean you are displaying the hardware clock time in UTC or local time. These options are used for setting the hardware clock to keep time in either of them. The time is always displayed in local time. Additionally, using the [command]#hwclock --utc# or [command]#hwclock --local# commands does not change the record in the `/etc/adjtime` file. This command can be useful when you know that the setting saved in `/etc/adjtime` is incorrect but you do not want to change the setting. On the other hand, you may receive misleading information if you use the command an incorrect way. See the `hwclock`(8) manual page for more details. +Note that using the [option]`--utc` or [option]`--localtime` options with the [command]#hwclock# command does not mean you are displaying the hardware clock time in UTC or local time. These options are used for setting the hardware clock to keep time in either of them. The time is always displayed in local time. Additionally, using the [command]#hwclock --utc# or [command]#hwclock --local# commands does not change the record in the `/etc/adjtime` file. This command can be useful when you know that the setting saved in `/etc/adjtime` is incorrect but you do not want to change the setting. On the other hand, you may receive misleading information if you use the command in an incorrect way. See the `hwclock`(8) manual page for more details. [[exam-sect3-displaying-time-hwclock]] .Displaying the Current Date and Time From 6e24c0bff6bbc8cf75a15a8f57368f4237eb9606 Mon Sep 17 00:00:00 2001 From: Maurice Aiken Date: Sep 24 2019 09:35:06 +0000 Subject: [PATCH 2/2] Update modules/system-administrators-guide/pages/basic-system-configuration/Configuring_the_Date_and_Time.adoc --- diff --git a/modules/system-administrators-guide/pages/basic-system-configuration/Configuring_the_Date_and_Time.adoc b/modules/system-administrators-guide/pages/basic-system-configuration/Configuring_the_Date_and_Time.adoc index f77ae07..28403b7 100644 --- a/modules/system-administrators-guide/pages/basic-system-configuration/Configuring_the_Date_and_Time.adoc +++ b/modules/system-administrators-guide/pages/basic-system-configuration/Configuring_the_Date_and_Time.adoc @@ -1,3 +1,4 @@ + :experimental: include::{partialsdir}/entities.adoc[]