Browse Source

remove -s and -S documentation, and explain the boot-time startup mode

more clearly
ok ingo schwarze
OPENBSD_6_7
deraadt 5 years ago
parent
commit
e3b7366f35
1 changed files with 8 additions and 13 deletions
  1. +8
    -13
      src/usr.sbin/ntpd/ntpd.8

+ 8
- 13
src/usr.sbin/ntpd/ntpd.8 View File

@ -1,4 +1,4 @@
.\" $OpenBSD: ntpd.8,v 1.43 2019/06/20 12:20:20 otto Exp $
.\" $OpenBSD: ntpd.8,v 1.44 2019/11/11 01:05:30 deraadt Exp $
.\" .\"
.\" Copyright (c) 2003, 2004, 2006 Henning Brauer <henning@openbsd.org> .\" Copyright (c) 2003, 2004, 2006 Henning Brauer <henning@openbsd.org>
.\" .\"
@ -14,7 +14,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
.\" OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\" .\"
.Dd $Mdocdate: June 20 2019 $
.Dd $Mdocdate: November 11 2019 $
.Dt NTPD 8 .Dt NTPD 8
.Os .Os
.Sh NAME .Sh NAME
@ -23,7 +23,7 @@
.Sh SYNOPSIS .Sh SYNOPSIS
.Nm ntpd .Nm ntpd
.Bk -words .Bk -words
.Op Fl dnSsv
.Op Fl dnv
.Op Fl f Ar file .Op Fl f Ar file
.Ek .Ek
.Sh DESCRIPTION .Sh DESCRIPTION
@ -59,16 +59,6 @@ instead of the default
.It Fl n .It Fl n
Configtest mode. Configtest mode.
Only check the configuration file for validity. Only check the configuration file for validity.
.It Fl S
Cancel the effect of the
.Fl s
flag.
.It Fl s
Always try to set the time at startup.
By default
.Nm
attempts to set the time at boot only if constraints are configured and
satisfied, and the clock should be moved forward.
.Pp .Pp
.Nm .Nm
will stay in the foreground for up to 15 seconds waiting for one of the will stay in the foreground for up to 15 seconds waiting for one of the
@ -97,6 +87,11 @@ option, all calls to
.Xr adjtime 2 .Xr adjtime 2
will be logged. will be logged.
.Pp .Pp
.Nm
makes efforts to verify and correct the time at boot if constraints are
configured and satisfied, if trusted servers return results, and if the
clock is not being moved backwards.
.Pp
After the local clock is synchronized, After the local clock is synchronized,
.Nm .Nm
adjusts the clock frequency using the adjusts the clock frequency using the


Loading…
Cancel
Save