Documentation updates from Dave Mills.

bk: 3d6c8479LpXxigM5c6GSNbqTBXekiQ

diff --git a/html/confopt.htm b/html/confopt.htm
index f4f141b56a7cbf6fded1af315c2afa780ba5553c..31b179fa106103eadcb3c3d7facd703fca122458 100644 (file)
--- a/html/confopt.htm
+++ b/html/confopt.htm
@@ -44,10 +44,13 @@ few cases, including the <tt>reslist</tt> billboard generated by
 addresses can be identified by the presence of colons ":" in the
 address field. IPv6 addresses can be used almost everywhere where
 IPv4 addresses can be used, with the exception of reference clock
-addresses, which are always IPv4. DNS names will resolve with
-preference to IPv4 or IPv6 addresses depending on the host system's
-resolver library. See IPv6 references for the equivalent classes
-for that address family.</p>
+addresses, which are always IPv4.</p>
+
+<p>Note that in contexts where a host name is expected, a <tt>-4</tt>
+qualifier preceding the host name forces DNS resolution to the IPv4
+namespace, while a <tt>-6</tt> qualifier forces DNS resolution to the
+IPv6 namespace. See IPv6 references for the equivalent classes for
+that address family.</p>
 
 <dl>
 <dt><tt>server <i>address</i> [key <i>key</i> | autokey] [burst]
@@ -177,7 +180,7 @@ default is to include no encryption field.</dd>
 <tt>maxpoll <i>maxpoll</i></tt></dt>
 
 <dd>These options specify the minimum and maximum poll intervals
-for NTP messages, in seconds to the power of two. The maximum poll
+for NTP messages, in seconds as a power of two. The maximum poll
 interval defaults to 10 (1,024 s), but can be increased by the <tt>
 maxpoll</tt> option to an upper limit of 17 (36.4 h). The minimum
 poll interval defaults to 6 (64 s), but can be decreased by the

diff --git a/html/ntpd.htm b/html/ntpd.htm
index 4598cbf8c5d5805acc9e142ed2dffceb1e6bdb32..8c4102a2067b8fd728bf4b411ca31522154c9d28 100644 (file)
--- a/html/ntpd.htm
+++ b/html/ntpd.htm
@@ -260,6 +260,11 @@ ntpd</tt> will attempt to read its configuration from the NetInfo
 if the default ntp.conf file cannot be read and no file is
 specified by the <tt>-c</tt> option.</p>
 
+<p>In contexts where a host name is expected, a <tt>-4</tt> qualifier
+preceding the host name forces DNS resolution to the IPv4
+namespace, while a <tt>-6</tt> qualifier forces DNS resolution to the
+IPv6 namespace.</p>
+
 <p>Various internal <tt>ntpd</tt> variables can be displayed and
 configuration options altered while the <tt>ntpd</tt> is running
 using the <tt><a href="ntpq.htm">ntpq</a></tt> and <tt><a href=
@@ -272,6 +277,16 @@ to <tt>022</tt>.</p>
 <h4>Command Line Options</h4>
 
 <dl>
+<dt><tt>-4</tt></dt>
+
+<dd>Force DNS resolution of following host names to the IPv4
+namespace.</dd>
+
+<dt><tt>-6</tt></dt>
+
+<dd>Force DNS resolution of following host names to the IPv6
+namespace.</dd>
+
 <dt><tt>-a</tt></dt>
 
 <dd>Enable authentication mode (default).</dd>
@@ -289,8 +304,6 @@ to <tt>022</tt>.</p>
 <dd>Specify the name and path of the configuration file. (Disable
 netinfo?)</dd>
 
-
-
 <dt><tt>-d</tt></dt>
 
 <dd>Specify debugging mode. This flag may occur multiple times,

diff --git a/html/ntpdate.htm b/html/ntpdate.htm
index c2d32bb258568c88bd8c740aab3fa7930ebb69b0..b6b374ed2ae342e9b9d8025350080e60b79624f1 100644 (file)
--- a/html/ntpdate.htm
+++ b/html/ntpdate.htm
@@ -68,6 +68,11 @@ an alternative to running a daemon, doing so once every hour or two
 will result in precise enough timekeeping to avoid stepping the
 clock.</p>
 
+<p>Note that in contexts where a host name is expected, a <tt>-4</tt>
+qualifier preceding the host name forces DNS resolution to the IPv4
+namespace, while a <tt>-6</tt> qualifier forces DNS resolution to the
+IPv6 namespace.</p>
+
 <p>If NetInfo support is compiled into <tt>ntpdate</tt>, then the
 <tt>server</tt> argument is optional if <tt>ntpdate</tt> can find a
 time server in the NetInfo configuration for <tt>ntpd</tt>.</p>
@@ -75,6 +80,16 @@ time server in the NetInfo configuration for <tt>ntpd</tt>.</p>
 <h4>Command Line Options</h4>
 
 <dl>
+<dt><tt>-4</tt></dt>
+
+<dd>Force DNS resolution of following host names on the command
+line to the IPv4 namespace.</dd>
+
+<dt><tt>-6</tt></dt>
+
+<dd>Force DNS resolution of following host names on the command
+line to the IPv6 namespace.</dd>
+
 <dt><tt>-a <i>key</i></tt></dt>
 
 <dd>Enable the authentication function and specify the key

diff --git a/html/ntpdc.htm b/html/ntpdc.htm
index d0499dcdb8e52dbb183b25cdd9510200c1f28ba3..4beebd046e0ed680d9473b3111a1d542e138db0a 100644 (file)
--- a/html/ntpdc.htm
+++ b/html/ntpdc.htm
@@ -58,6 +58,11 @@ state of the local server must be authenticated, which requires
 both the remote program and local server share a common key and key
 identifier.</p>
 
+<p>Note that in contexts where a host name is expected, a <tt>-4</tt>
+qualifier preceding the host name forces DNS resolution to the IPv4
+namespace, while a </tt>-6</tt> qualifier forces DNS resolution to the
+IPv6 namespace.</p>
+
 <h4>Command Line Options</h4>
 
 Specifying a command line option other than <tt>-i</tt> or <tt>
@@ -67,6 +72,16 @@ attempt to read interactive format commands from the standard
 input. 
 
 <dl>
+<dt><tt>-4</tt></dt>
+
+<dd>Force DNS resolution of following host names on the command
+line to the IPv4 namespace.</dd>
+
+<dt><tt>-6</tt></dt>
+
+<dd>Force DNS resolution of following host names on the command
+line to the IPv6 namespace.</dd>
+
 <dt><tt>-c <i>command</i></tt></dt>
 
 <dd>The following argument is interpreted as an interactive format

diff --git a/html/ntpq.htm b/html/ntpq.htm
index c0f62ea229570dd93da0634a8e96780b089aa39c..6f33097982c8fd7f636f4f4a67d87d4140d8bb8c 100644 (file)
--- a/html/ntpq.htm
+++ b/html/ntpq.htm
@@ -54,6 +54,11 @@ one attempt to retransmit requests, and will time requests out if
 the remote host is not heard from within a suitable timeout
 time.</p>
 
+<p>Note that in contexts where a host name is expected, a <tt>-4</tt>
+qualifier preceding the host name forces DNS resolution to the IPv4
+namespace, while a </tt>-6</tt> qualifier forces DNS resolution to the
+IPv6 namespace.</p>
+
 <p>For examples and usage, see the <a href="debug.htm">NTP
 Debugging Techniques</a> page.</p>
 
@@ -64,12 +69,26 @@ host(s) immediately. Otherwise, <tt>ntpq</tt> will attempt to read
 interactive format commands from the standard input.</p>
 
 <dl>
+<dt><tt>-4</tt></dt>
+
+<dd>Force DNS resolution of following host names on the command
+line to the IPv4 namespace.</dd>
+
+<dt><tt>-6</tt></dt>
+
+<dd>Force DNS resolution of following host names on the command
+line to the IPv6 namespace.</dd>
+
 <dt><tt>-c</tt></dt>
 
 <dd>The following argument is interpreted as an interactive format
 command and is added to the list of commands to be executed on the
 specified host(s). Multiple <tt>-c</tt> options may be given.</dd>
 
+<dt><tt>-d</tt></dt>
+
+<dd>Turn on debugging mode.</dd>
+
 <dt><tt>-i</tt></dt>
 
 <dd>Force <tt>ntpq</tt> to operate in interactive mode. Prompts
@@ -658,7 +677,6 @@ marked reachable, the packet is discarded; otherwise, the originate
 and receive timestamps are saved, as required by the NTP protocol,
 and processing continues.</p>
 
-
 <p>The <tt>flash</tt> bits for each test are defined as
 follows.</p>