From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 9 Oct 2012 06:15:38 +0000 (-0400)
Subject: [Bug 1013] ntpdate's HTML page claims wrong default version.
X-Git-Tag: NTP_4_2_7P311~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0693474d5aea68665ea6ccd21351e8dcf66d2c73;p=thirdparty%2Fntp.git

[Bug 1013] ntpdate's HTML page claims wrong default version.

bk: 5073c10aF5g5JgQe85_cO5JtY8eTRg
---

diff --git a/ChangeLog b/ChangeLog
index 83e074849..6eb8697ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 1013] ntpdate's HTML page claims wrong default version.
 * [Bug 1374] Support SO_TIMESTAMPNS.
 * [Bug 2266] Remove deprecated refclock_trak.c from Windows Makefile
   equivalents.
diff --git a/html/ntpdate.html b/html/ntpdate.html
index 497b317ae..06923989e 100644
--- a/html/ntpdate.html
+++ b/html/ntpdate.html
@@ -44,7 +44,8 @@
   <dt><tt>-k <i>keyfile</i></tt></dt>
   <dd>Specify the path for the authentication key file as the string <i>keyfile</i>. The default is <tt>/etc/ntp.keys</tt>. This file should be in the format described in <tt>ntpd</tt>.</dd>
   <dt><tt>-o <i>version</i></tt></dt>
-  <dd>Specify the NTP version for outgoing packets as the integer <i>version</i>, which can be 1 or 2. The default is 3. This allows <tt>ntpdate</tt> to be used with older NTP versions.</dd>
+  <dd>Specify the NTP version for outgoing packets as the integer
+	<i>version</i>, which can be 1, 2, 3 or 4. The default is 4. This allows <tt>ntpdate</tt> to be used with older NTP versions.</dd>
   <dt><tt>-p <i>samples</i></tt></dt>
   <dd>Specify the number of samples to be acquired from each server as the integer <i>samples</i>, with values from 1 to 8 inclusive. The default is 4.</dd>
   <dt><i><tt>-q</tt></i></dt>