From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 27 Jul 2015 04:11:08 +0000 (+0000)
Subject: [Bug 2595] ntpdate man page quirks.  Hal Murray, Harlan Stenn
X-Git-Tag: NTP_4_3_65~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=993357ef00366a912792121869c1e53c99574da6;p=thirdparty%2Fntp.git

[Bug 2595] ntpdate man page quirks.  Hal Murray, Harlan Stenn

bk: 55b5af5cfsuMUR735OkqBoA_6FrjsQ
---

diff --git a/ChangeLog b/ChangeLog
index 1cc4a83db..e2a0d2943 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 ---
 
+* [Bug 2595] ntpdate man page quirks.  Hal Murray, Harlan Stenn.
 * [Bug 2625] Deprecate flag1 in local refclock.  Hal Murray, Harlan Stenn.
 * [Bug 2817] Stop locking ntpd into memory by default under Linux.  H.Stenn.
 * [Bug 2823] ntpsweep with recursive peers option doesn't work.  H.Stenn.
diff --git a/ntpd/ntp.conf.def b/ntpd/ntp.conf.def
index ad5a2a393..9aeb211b4 100644
--- a/ntpd/ntp.conf.def
+++ b/ntpd/ntp.conf.def
@@ -1905,7 +1905,7 @@ re-associate accordingly.
 Some administrators prefer to avoid running
 .Xr ntpd 1ntpdmdoc
 continuously and run either
-.Xr ntpdate 8
+.Xr sntp 1sntpmdoc
 or
 .Xr ntpd 1ntpdmdoc
 .Fl q
diff --git a/ntpd/ntpd-opts.def b/ntpd/ntpd-opts.def
index dee484dbe..00d35115d 100644
--- a/ntpd/ntpd-opts.def
+++ b/ntpd/ntpd-opts.def
@@ -236,6 +236,8 @@ when you have permission to do so from the owner of the target host.
 Finally,
 in the past many startup scripts would run
 .Xr ntpdate 1ntpdatemdoc
+or
+.Xr sntp 1sntpmdoc
 to get the system clock close to correct before starting
 .Xr ntpd 1ntpdmdoc ,
 but this was never more than a mediocre hack and is no longer needed.
@@ -245,7 +247,9 @@ and you still need to set the system time before starting
 .Nm ,
 please open a bug report and document what is going on,
 and then look at using
-.Xr sntp 1sntpmdoc .
+.Xr sntp 1sntpmdoc
+if you really need to set the clock before starting
+.Nm .
 .Pp
 There is a way to start
 .Xr ntpd 1ntpdmdoc