diff options
| author | Renato Botelho <renato@netgate.com> | 2015-11-03 09:45:44 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-11-03 09:45:44 -0200 |
| commit | c7275b999acdea9746ff095cf10188b4a3d09b7a (patch) | |
| tree | a95eeaad8a2157ed3641d93c98bdc108bcd728d4 /contrib/ntp/ntpd/ntpd.1ntpdmdoc | |
| parent | 2b0a9fbf7a64ff2e54d03cebd5bc2d787026eaf8 (diff) | |
| parent | fe49fc6e1c94b6c41d1d3844ca219a76da3c70dc (diff) | |
| download | FreeBSD-src-c7275b999acdea9746ff095cf10188b4a3d09b7a.zip FreeBSD-src-c7275b999acdea9746ff095cf10188b4a3d09b7a.tar.gz | |
Merge branch 'stable/10' into devel
Diffstat (limited to 'contrib/ntp/ntpd/ntpd.1ntpdmdoc')
| -rw-r--r-- | contrib/ntp/ntpd/ntpd.1ntpdmdoc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/contrib/ntp/ntpd/ntpd.1ntpdmdoc b/contrib/ntp/ntpd/ntpd.1ntpdmdoc index 08d7655..139de52 100644 --- a/contrib/ntp/ntpd/ntpd.1ntpdmdoc +++ b/contrib/ntp/ntpd/ntpd.1ntpdmdoc @@ -1,9 +1,9 @@ -.Dd June 29 2015 +.Dd October 21 2015 .Dt NTPD 1ntpdmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed June 29, 2015 at 04:30:41 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed October 21, 2015 at 12:38:30 PM by AutoGen 5.18.5 .\" From the definitions ntpd-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -532,6 +532,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. @@ -541,7 +543,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 |
