[system-administrators-guide] https://bugzilla.redhat.com/show_bug.cgi?id=977045#c8 Updates to Configuring_the_Date_and_Time.xml t

[stephenw]

commit 9996b8b5a3f44c9a96a7136c032172f10182981e
Author: Stephen Wadeley <swadeley at redhat.com>
Date:   Mon Oct 14 22:11:21 2013 +0200

    https://bugzilla.redhat.com/show_bug.cgi?id=977045#c8
    Updates to Configuring_the_Date_and_Time.xml to go with the addition of
     the new ntpd chapter.  id="ch-Configuring_NTP_using_ntpd"

 en-US/Configuring_the_Date_and_Time.xml |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)
---
diff --git a/en-US/Configuring_the_Date_and_Time.xml b/en-US/Configuring_the_Date_and_Time.xml
index 12cd4c4..66d4b17 100644
--- a/en-US/Configuring_the_Date_and_Time.xml
+++ b/en-US/Configuring_the_Date_and_Time.xml
@@ -4,7 +4,7 @@
 <chapter id="ch-Configuring_the_Date_and_Time">
   <title>Configuring the Date and Time</title>
   <para>
-    This chapter covers setting the system date and time in &MAJOROS;, both manually and using the Network Time Protocol (<abbrev>NTP</abbrev>), as well as setting the adequate time zone. Two methods are covered: setting the date and time using the <application>Date and Time</application> configuration tool, and doing so on the command line.
+    This chapter covers setting the system date and time in &MAJOROS;, both manually and using the <firstterm>Network Time Protocol</firstterm> (<acronym>NTP</acronym>), as well as setting the time zone. Two methods are covered: setting the date and time using the <application>Date and Time</application> configuration tool, and doing so on the command line.
   </para>
   <section id="sect-Configuring_the_Date_and_Time-Date_and_Time">
     <title>Using the Date and Time Configuration Tool</title>
@@ -67,7 +67,7 @@
   <section id="sect-Configuring_the_Date_and_Time-Command_Line_Configuration">
     <title>Using the Command Line Tools</title>
     <para>
-      &MAJOROSVER; provides command line tools that allow you to configure the date and time both manually and using the NTP protocol.
+      &MAJOROSVER; provides command line tools that allow you to configure the date and time both manually and using the <systemitem class="protocol">NTP</systemitem> protocol.
     </para>
     <section id="sect-Configuring_the_Date_and_Time-Command_Line_Configuration-Date">
       <title>Changing the Date</title>
@@ -89,7 +89,7 @@
         You can verify the current settings by running <command>date</command> without any additional argument.
       </para>
     </section>
-    <!-- Hiding this as it no longer valid for Fedora 18. Should we link from here to the new chrony section?
+
     <section id="sect-Configuring_the_Date_and_Time-Command_Line_Configuration-Time">
       <title>Changing the Time</title>
       <para>
@@ -105,7 +105,7 @@
       </para>
       <screen>~]# <command>date +%T -s 23:26:00 -u</command></screen>
       <para>
-        You can verify the current settings by running <command>date</command> without any additional argument.
+        You can verify the current settings by running <command>date</command> without any additional argument. You should not use this command to set the time if the system clock is being maintained by <application>chrony</application>, <systemitem class="daemon">ntpd</systemitem>, or any other similar automated process.
       </para>
     </section>
     <section id="sect-Configuring_the_Date_and_Time-Command_Line_Configuration-Network_Time_Protocol">
@@ -117,6 +117,22 @@
       <indexterm>
         <primary>Network Time Protocol</primary>
       </indexterm>
+      <para>
+        Fedora includes the <application>chrony</application> suite of programs to automatically adjust the system clock using the <firstterm>Network Time Protocol</firstterm> (<acronym>NTP</acronym>). See <xref linkend="ch-Configuring_NTP_Using_the_chrony_Suite" /> for information on configuring and enabling <application>chrony</application>.</para>
+      <para>
+        It is also possible to use <systemitem class="daemon">ntpd</systemitem> to adjust the system clock using the <firstterm>Network Time Protocol</firstterm> (<acronym>NTP</acronym>). See <xref linkend="ch-Configuring_NTP_using_ntpd" /> for information on configuring <systemitem class="daemon">ntpd</systemitem>.</para>
+    </section>
+
+    <!-- Hiding this as it no longer valid for Fedora 18. Should we link from here to the new chrony section?
+    <section id="sect-Configuring_the_Date_and_Time-Command_Line_Configuration-Network_Time_Protocol">
+      <title>Configuring the Network Time Protocol</title>
+      <indexterm>
+        <primary>NTP</primary>
+        <see>Network Time Protocol</see>
+      </indexterm>
+      <indexterm>
+        <primary>Network Time Protocol</primary>
+      </indexterm>
       <indexterm>
         <primary>Network Time Protocol</primary>
         <secondary><command>ntpdate</command></secondary>