Update command options section in ntp.conf(5) man page, drop "dynamic"

option (closes: #553976)

git-svn-id: svn://svn.debian.org/pkg-ntp/ntp/trunk@313 0070b5ef-2f16-0410-befa-9a02bd1d6ddb

2 files changed, 17 insertions, 8 deletions

diff --git a/debian/changelog b/debian/changelog
index 902ccce..cf326f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ntp (1:4.2.6.p1+dfsg-2) UNRELEASED; urgency=low
+
+  * Update command options section in ntp.conf(5) man page, drop "dynamic"
+    option (closes: #553976)
+
+ -- Peter Eisentraut <petere@debian.org>  Fri, 02 Jul 2010 23:31:17 -0400
+
 ntp (1:4.2.6.p1+dfsg-1) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/man/ntp.conf.5 b/debian/man/ntp.conf.5
index ef08c72..a0aea7d 100644
--- a/debian/man/ntp.conf.5
+++ b/debian/man/ntp.conf.5
@@ -28,7 +28,7 @@ indefinite repetition of the last item before the [ ... ].
 
 Following is a description of the configuration commands in NTPv4.  There are 
 two classes of commands, configuration commands that configure an association 
-with a remote server, peer or reference clock, and auxilliary commands that 
+with a remote server, peer or reference clock, and auxiliary commands that 
 specify environmental variables that control various related operations.
 .SS "Configuration Commands"
 The various modes are determined by the command keyword and the required IP 
@@ -157,6 +157,11 @@ h).  The minimum poll interval defaults to 6 (64 s), but can be decreased by
 the minpoll option to a lower limit of 4 (16 s).  These option are valid only 
 with the \fBserver\fR and \fBpeer\fR commands.
 .TP
+.B mode \fIoption\fR
+Pass the \fIoption\fR to a reference clock driver, where \fIoption\fR
+is an integer in the range from 0 to 255, inclusive. This option is
+valid only with type r addresses.
+.TP
 .B noselect 
 Marks the server as unused, except for display purposes.  The server is 
 discarded by the selection algorithm.  This option is valid only with the 
@@ -195,13 +200,10 @@ Specifies the version number to be used for outgoing NTP packets.  Versions
 1-4 are the choices, with version 4 the default.  This option is valid only 
 with the \fBserver\fR, \fBpeer\fR and \fBbroadcast\fR commands.
 .TP
-.B dynamic 
-Allows a server/peer to be configured even if it is not reachable at 
-configuration time.  It is assumed that at some point in the future the 
-network environment changes so that this server/peer can be reached.  This 
-option is useful to configure servers/peers on mobile systems with 
-intermittent network access (e.g. wlan clients).
-.SS "Auxilliary Commands"
+.B xleave
+Operate in interleaved mode (symmetric and broadcast modes only). (see
+NTP Interleaved Modes)
+.SS "Auxiliary Commands"
 .TP
 .B broadcastclient \fR[\fBnovolley\fR]
 This command enables reception of broadcast server messages to any local