document the optional "weight" keyword, and a little cleanup;

from henning and myself

1 files changed, 28 insertions, 9 deletions

diff --git a/usr.sbin/ntpd/ntpd.conf.5 b/usr.sbin/ntpd/ntpd.conf.5
index 5e132f04028..d0c7d5a5ea5 100644
--- a/usr.sbin/ntpd/ntpd.conf.5
+++ b/usr.sbin/ntpd/ntpd.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ntpd.conf.5,v 1.12 2006/05/28 07:58:52 jmc Exp $
+.\" $OpenBSD: ntpd.conf.5,v 1.13 2006/05/29 18:47:19 jmc Exp $
 .\"
 .\" Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
 .\"
@@ -24,7 +24,20 @@
 This manual page describes the format of the
 .Xr ntpd 8
 configuration file.
-It has the following format:
+.Pp
+The optional
+.Ic weight
+keyword permits finer control over the relative importance
+of time sources (servers or sensor devices).
+Weights are specified in the range 1 to 10:
+a server with a weight of 5
+will have five times more importance on time offset calculation
+than a server with a weight of 1.
+If no weight is given,
+the default is 1.
+.Pp
+.Nm
+has the following format:
 .Pp
 Empty lines and lines beginning with the
 .Sq #
@@ -57,14 +70,16 @@ or
 listen on 127.0.0.1
 listen on ::1
 .Ed
-.It Ic sensor Ar device
+.It Xo Ic sensor Ar device
+.Op Ic weight Ar offset
+.Xc
 Specify a timedelta sensor device
 .Xr ntpd 8
 should use.
-It can be specified multiple times:
+The sensor can be specified multiple times:
 .Xr ntpd 8
 will use each given sensor that actually exists.
-Nonexistant sensors are ignored.
+Non-existent sensors are ignored.
 If
 .Sq *
 is given as device name,
@@ -77,7 +92,9 @@ For example:
 sensor *
 sensor udcf0
 .Ed
-.It Ic server Ar address
+.It Xo Ic server Ar address
+.Op Ic weight Ar offset
+.Xc
 Specify the IP address or the hostname of an NTP
 server to synchronize to.
 If it appears multiple times,
@@ -92,14 +109,16 @@ retries with the next address and continues to do so until a working address
 is found.
 For example:
 .Bd -literal -offset indent
-server 10.0.0.2
-server ntp.example.org
+server 10.0.0.2 weight 5
+server ntp.example.org weight 1
 .Ed
 .Pp
 To provide redundancy, it is good practice to configure multiple servers.
 In general, best accuracy is obtained by using servers that have a low
 network latency.
-.It Ic servers Ar address
+.It Xo Ic servers Ar address
+.Op Ic weight Ar offset
+.Xc
 As with
 .Cm server ,
 specify the IP address or hostname of an NTP server to synchronize to.