summaryrefslogtreecommitdiffstats
path: root/usr.sbin/ntpd
diff options
context:
space:
mode:
authorotto <otto@openbsd.org>2019-06-20 08:26:13 +0000
committerotto <otto@openbsd.org>2019-06-20 08:26:13 +0000
commit3c2789fc10f024c825945ee611c4b3fd26995911 (patch)
tree5a03c9930f35a2c08a18618f9254f88dd5f80768 /usr.sbin/ntpd
parentAdd a helper function to work out option table from name. (diff)
downloadwireguard-openbsd-3c2789fc10f024c825945ee611c4b3fd26995911.tar.xz
wireguard-openbsd-3c2789fc10f024c825945ee611c4b3fd26995911.zip
Tell a bit about automatic mode; ok jmc@
Diffstat (limited to 'usr.sbin/ntpd')
-rw-r--r--usr.sbin/ntpd/ntpd.814
1 files changed, 10 insertions, 4 deletions
diff --git a/usr.sbin/ntpd/ntpd.8 b/usr.sbin/ntpd/ntpd.8
index 0b74c2587fa..c2f0af57f96 100644
--- a/usr.sbin/ntpd/ntpd.8
+++ b/usr.sbin/ntpd/ntpd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ntpd.8,v 1.41 2017/09/06 19:43:46 jmc Exp $
+.\" $OpenBSD: ntpd.8,v 1.42 2019/06/20 08:26:13 otto Exp $
.\"
.\" 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
.\" OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: September 6 2017 $
+.Dd $Mdocdate: June 20 2019 $
.Dt NTPD 8
.Os
.Sh NAME
@@ -60,11 +60,17 @@ instead of the default
Configtest mode.
Only check the configuration file for validity.
.It Fl S
-Do not set the time immediately at startup.
-This is the default.
+Cancel the effect of the
+.Fl s
+flag.
.It Fl s
Try to set the time immediately at startup, as opposed to slowly adjusting the
clock.
+By default
+.Nm
+attempts to set the time at boot if constraints are configured and
+satisfied and the clock should be moved forward.
+.Pp
.Nm
will stay in the foreground for up to 15 seconds waiting for one of the
configured NTP servers to reply.