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

bk: 55b5af5cfsuMUR735OkqBoA_6FrjsQ

diff --git a/ChangeLog b/ChangeLog
index 1cc4a83dbd55fea71e30227da4f99f47481f341c..e2a0d29430c170282af23fedeb3a80d33cf24bc8 100644 (file)
--- 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 ad5a2a393a697954aeae91db449de746392f7385..9aeb211b48047e1bada990de59747d92f50b5c43 100644 (file)
--- 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 dee484dbe1b4cbf6b423ea695e1304b85cd69b8b..00d35115dc434c1d6b51922728b8c43a1e2d90a7 100644 (file)
--- 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