svn commit: r43740 - head/en_US.ISO8859-1/books/handbook/network-servers

[Dru Lavigne]

Author: dru
Date: Mon Feb  3 21:47:48 2014
New Revision: 43740
URL: http://svnweb.freebsd.org/changeset/doc/43740

Log:
  Remove ntpdate.
  Re-clarify servers' response section.
  
  Submitted by: bjk, imp
  Sponsored by: iXsystems

Modified:
  head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml

Modified: head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Mon Feb  3 20:34:30 2014	(r43739)
+++ head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Mon Feb  3 21:47:48 2014	(r43740)
@@ -5266,31 +5266,18 @@ Starting smbd.</screen>
 
       <indexterm><primary>NTP</primary>
 	<secondary>ntp.conf</secondary>
-	<tertiary>ntpdate</tertiary>
       </indexterm>
 
-      <para>To only synchronize the clock when a system boots, use
-	&man.ntpdate.8;.  This alone can be appropriate for desktops
-	which are frequently rebooted.  However, most systems should
-	run <application>ntpdate</application> at boot time as well as
-	configure <application>ntpd</application>.  This is because
-	<application>ntpd</application> changes the clock gradually,
-	whereas <application>ntpdate</application> sets the clock, no
-	matter how great the difference between a machine's current
-	clock setting and the correct time.</para>
-
-      <para>To enable <application>ntpdate</application> at boot time,
-	add <literal>ntpdate_enable="YES"</literal> to
-	<filename>/etc/rc.conf</filename>.  To also enable
-	<application>ntpd</application>, add the
-	<literal>ntpd_enable="YES"</literal> entry to
+      <para>On &os;, the built-in <application>ntpd</application> can
+	be used to synchronize a system's clock.  To enable <application>ntpd</application> at boot time,
+	add <literal>ntpd_enable="YES"</literal> to
 	<filename>/etc/rc.conf</filename>.  Additional variables can
 	be specified in <filename>/etc/rc.conf</filename>.  Refer to
-	&man.rc.conf.5;, &man.ntpdate.8;, and &man.ntpd.8; for
+	&man.rc.conf.5; and &man.ntpd.8; for
 	details.</para>
 
-      <para>Both applications read <filename>/etc/ntp.conf</filename>
-	to determine which servers to query.  Here is a simple example
+      <para>This application reads <filename>/etc/ntp.conf</filename>
+      to determine which <acronym>NTP</acronym> servers to query.  Here is a simple example
 	of an <filename>/etc/ntp.conf</filename>:</para>
 
       <example>
@@ -5309,7 +5296,7 @@ driftfile /var/db/ntp.drift</programlist
 	entry includes <literal>prefer</literal>, that server is
 	preferred over other servers.  A response from a preferred
 	server will be discarded if it differs significantly from
-	responses; otherwise it will be used.  The
+	other servers' responses; otherwise it will be used.  The
 	<literal>prefer</literal> argument should only be used for
 	<acronym>NTP</acronym> servers that are known to be highly
 	accurate, such as those with special time monitoring