From: Harlan Stenn Date: Wed, 26 Dec 2012 04:12:37 +0000 (+0000) Subject: NTP_4_2_7P339 X-Git-Tag: NTP_4_2_7P339^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15fb7940018bc1cc10011b4cf01040748d6465b6;p=thirdparty%2Fntp.git NTP_4_2_7P339 bk: 50da7935osPjVr6qY60XK4qDx6MrAw --- diff --git a/ChangeLog b/ChangeLog index 6f6275f33..48663680e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.2.7p339) 2012/12/26 Released by Harlan Stenn * mdoc2texi fixes: parseQuote, closing of list item tables. * ntp-wait, ntpd, ntpdc, ntpq, ntpsnmpd autogen documentation updates. (4.2.7p338) 2012/12/25 Released by Harlan Stenn diff --git a/ntpd/invoke-ntp.conf.texi b/ntpd/invoke-ntp.conf.texi index 52ad66a47..0c1eeacd6 100644 --- a/ntpd/invoke-ntp.conf.texi +++ b/ntpd/invoke-ntp.conf.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntp.conf.texi) # -# It has been AutoGen-ed December 25, 2012 at 11:32:50 AM by AutoGen 5.16.2 +# It has been AutoGen-ed December 25, 2012 at 12:49:13 PM by AutoGen 5.16.2 # From the definitions ntp.conf.def # and the template file agtexi-file.tpl @end ignore @@ -30,7 +30,8 @@ The file format is similar to other @sc{UNIX} configuration files. Comments begin with a -@quoteleft{}#@quoteright{} +@quoteleft{}@quoteright{}# +# character and extend to the end of the line; blank lines are ignored. Configuration commands consist of an initial keyword @@ -175,8 +176,7 @@ equivalent classes for that address family. [@code{minpoll} @code{minpoll} ] [@code{maxpoll} @code{maxpoll} ] [@code{ttl} @code{ttl} ] - -@end multitable +@end table These five commands specify the time server name or address to be used and the mode in which to operate. @@ -270,8 +270,7 @@ providing the best time and continues as with the @code{server} command. The remaining servers are discarded as if never heard. - -@end multitable +@end table Options: @table @samp @@ -353,8 +352,7 @@ Specifies the version number to be used for outgoing NTP packets. Versions 1-4 are the choices, with version 4 the default. - -@end multitable +@end table @node Auxiliary @section Auxiliary @@ -406,8 +404,7 @@ public-key authentication as described in @ref{Authentication}Authentication Options . - -@end multitable +@end table @node Authentication @section Authentication @@ -915,8 +912,7 @@ the link in the keys directory. If this file is not found, the host key is also the sign key. - -@end multitable +@end table .It Ic keys @@ -1046,8 +1042,7 @@ The certificate is missing, corrupted or bogus. @item 114 (bad or missing identity) The identity key is missing, corrupt or bogus. - -@end multitable +@end table @node Monitoring @section Monitoring @@ -1220,8 +1215,7 @@ Number of packets with invalid length, format or port number. Number of packets not verified as authentic. @item Rate Number of packets discarded due to rate limitation. - -@end multitable +@end table .It Cm statsdir @@ -1290,7 +1284,10 @@ For example, the prefix used with @item Cm This string is directly concatenated to the prefix mentioned above (no intervening -@quoteleft{}/ ) .@quoteright{} +@quoteleft{}@quoteright{}/). +/ +) +. This can be modified using the file argument to the @code{filegen} statement. @@ -1303,8 +1300,7 @@ parts outside the filesystem hierarchy denoted by This part is reflects individual elements of a file set. It is generated according to the type of a file set. - -@end multitable +@end table .It Cm type @@ -1382,8 +1378,7 @@ This number is taken to be the number of seconds the server is running at the start of the corresponding 24-hour period. Information is only written to a file generation by specifying @code{enable}; output is prevented by specifying -@code{disable}. -@end multitable +@code{disable}. @end table .It Cm link @@ -1644,8 +1639,7 @@ The is sorted later in the list. @item Cm Deny packets that do not match the current NTP version. - -@end multitable +@end table Default restriction list entries with the flags ignore, interface, ntpport, for each of the local host's interface addresses are @@ -2001,8 +1995,7 @@ However, according to principles of Byzantine agreement, @code{minsane} should be at least 4 in order to detect and discard a single falseticker. - -@end multitable +@end table .It Cm ttl @@ -2227,8 +2220,7 @@ For modem reference clocks, @code{minpoll} defaults to 10 (17.1 m) and @code{maxpoll} defaults to 14 (4.5 h). The allowable range is 4 (16 s) to 17 (36.4 h) inclusive. - -@end multitable +@end table .It Xo Ic @@ -2340,8 +2332,7 @@ Further information on the @ref{Monitoring}Monitoring Options . - -@end multitable +@end table @end multitable @node Miscellaneous @@ -2460,8 +2451,7 @@ See the Options section for further information. The default for this flag is -@code{disable}. -@end multitable +@code{disable}. @end table .It Ic includefile @@ -2490,18 +2480,26 @@ facility or the alternate By default, all output is turned on. All @code{configkeyword} keywords can be prefixed with -@quoteleft{}= ,@quoteright{} -@quoteleft{}+@quoteright{} +@quoteleft{}@quoteright{}=, += +, +@quoteleft{}@quoteright{}+ ++ and -@quoteleft{}- ,@quoteright{} +@quoteleft{}@quoteright{}-, +- +, where -@quoteleft{}=@quoteright{} +@quoteleft{}@quoteright{}= += sets the @code{syslog(3)} priority mask, -@quoteleft{}+@quoteright{} +@quoteleft{}@quoteright{}+ ++ adds and -@quoteleft{}-@quoteright{} +@quoteleft{}@quoteright{}- +- removes messages. @code{syslog(3)} @@ -2688,8 +2686,7 @@ It can be set to any positive number in seconds. If set to zero, the stepout pulses will not be suppressed. - -@end multitable +@end table .It Xo Ic diff --git a/ntpd/invoke-ntp.keys.texi b/ntpd/invoke-ntp.keys.texi index fc29a84b0..8cbb320dd 100644 --- a/ntpd/invoke-ntp.keys.texi +++ b/ntpd/invoke-ntp.keys.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntp.keys.texi) # -# It has been AutoGen-ed December 25, 2012 at 11:34:16 AM by AutoGen 5.16.2 +# It has been AutoGen-ed December 26, 2012 at 04:09:53 AM by AutoGen 5.16.2 # From the definitions ntp.keys.def # and the template file agtexi-file.tpl @end ignore @@ -86,8 +86,7 @@ a @item Li The key is a hex-encoded ASCII string of 40 characters, which is truncated as necessary. - -@end multitable +@end table Note that the keys used by the @code{ntpq(8)} diff --git a/ntpd/invoke-ntpd.texi b/ntpd/invoke-ntpd.texi index fd0734a18..8b5d09e47 100644 --- a/ntpd/invoke-ntpd.texi +++ b/ntpd/invoke-ntpd.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntpd.texi) # -# It has been AutoGen-ed December 25, 2012 at 11:34:26 AM by AutoGen 5.16.2 +# It has been AutoGen-ed December 26, 2012 at 04:10:31 AM by AutoGen 5.16.2 # From the definitions ntpd-opts.def # and the template file agtexi-cmd.tpl @end ignore @@ -140,7 +140,7 @@ with a status code of 0. @exampleindent 0 @example -ntpd - NTP daemon program - Ver. 4.2.7p338 +ntpd - NTP daemon program - Ver. 4.2.7p339 USAGE: ntpd [ - [] | --[@{=| @}] ]... \ [ ... ] Flg Arg Option-Name Description @@ -1109,8 +1109,7 @@ the default name of the configuration file the default name of the drift file @item Pa the default name of the key file - -@end multitable +@end table @node ntpd See Also @subsection ntpd See Also @code{ntp.conf(5)}, diff --git a/ntpd/ntp.conf.5man b/ntpd/ntp.conf.5man index 7e34b5a1e..cda256548 100644 --- a/ntpd/ntp.conf.5man +++ b/ntpd/ntp.conf.5man @@ -1,8 +1,8 @@ -.TH ntp.conf 5man "25 Dec 2012" "4.2.7p338" "File Formats" +.TH ntp.conf 5man "25 Dec 2012" "4.2.7p339" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed December 25, 2012 at 11:32:38 AM by AutoGen 5.16.2 +.\" It has been AutoGen-ed December 25, 2012 at 12:49:00 PM by AutoGen 5.16.2 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .\" diff --git a/ntpd/ntp.conf.5mdoc b/ntpd/ntp.conf.5mdoc index 3a5bbdd54..919f06474 100644 --- a/ntpd/ntp.conf.5mdoc +++ b/ntpd/ntp.conf.5mdoc @@ -1,9 +1,9 @@ -.Dd December 25 2012 +.Dd December 26 2012 .Dt NTP_CONF 5mdoc File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed December 25, 2012 at 11:34:28 AM by AutoGen 5.16.2 +.\" It has been AutoGen-ed December 26, 2012 at 04:10:33 AM by AutoGen 5.16.2 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/ntpd/ntp.conf.html b/ntpd/ntp.conf.html index c37cc770d..2099f5b5d 100644 --- a/ntpd/ntp.conf.html +++ b/ntpd/ntp.conf.html @@ -33,7 +33,7 @@ Up: (dir)

This document describes the configuration file for the NTP Project's ntpd program. -

This document applies to version 4.2.7p338 of ntp.conf. +

This document applies to version 4.2.7p339 of ntp.conf.

  • ntp.conf Description @@ -94,12 +94,11 @@ and text strings.

    The rest of this page describes the configuration and control options. The -"NotesonConfiguringNTPandSettingupaNTPSubnet" +"Notes on Configuring NTP and Setting up a NTP Subnet" page (available as part of the HTML documentation provided in /usr/share/doc/ntp) -) contains an extended discussion of these options. In addition to the discussion of general ConfigurationConfiguration @@ -198,47 +197,45 @@ equivalent classes for that address family.

    Xo
    [burst ] [iburst ] -[version Ar version ] +[version version ] [prefer ] -[minpoll Ar minpoll ] -[maxpoll Ar maxpoll ] -
    Xo
    [key Ar key\&| Cm autokey ] +[minpoll minpoll ] +[maxpoll maxpoll ] +
    Xo
    [key key \&| Cm autokey ] [burst ] [iburst ] -[version Ar version ] +[version version ] [prefer ] -[minpoll Ar minpoll ] -[maxpoll Ar maxpoll ] -
    Xo
    [key Ar key\&| Cm autokey ] -[version Ar version ] +[minpoll minpoll ] +[maxpoll maxpoll ] +
    Xo
    [key key \&| Cm autokey ] +[version version ] [prefer ] -[minpoll Ar minpoll ] -[maxpoll Ar maxpoll ] -
    Xo
    [key Ar key\&| Cm autokey ] -[version Ar version ] +[minpoll minpoll ] +[maxpoll maxpoll ] +
    Xo
    [key key \&| Cm autokey ] +[version version ] [prefer ] -[minpoll Ar minpoll ] -[ttl Ar ttl ] -
    Xo
    [key Ar key\&| Cm autokey ] -[version Ar version ] +[minpoll minpoll ] +[ttl ttl ] +
    Xo
    [key key \&| Cm autokey ] +[version version ] [prefer ] -[minpoll Ar minpoll ] -[maxpoll Ar maxpoll ] -[ttl Ar ttl ] +[minpoll minpoll ] +[maxpoll maxpoll ] +[ttl ttl ]

    These five commands specify the time server name or address to be used and the mode in which to operate. The -address can be +address can be either a DNS name or an IP address in dotted-quad notation. Additional information on association behavior can be found in the -"AssociationManagement" +"Association Management" page (available as part of the HTML documentation provided in -/usr/share/doc/ntp). -) -. +/usr/share/doc/ntp).

    Ic
    For type s addresses, this command mobilizes a persistent client mode association with a number of remote servers. @@ -276,7 +273,7 @@ broadcast messages go only to the interface associated with the subnet specified, but multicast messages go to all interfaces. In broadcast mode the local server sends periodic broadcast messages to a client population at the -address specified, which is usually the broadcast address on (one of) the +address specified, which is usually the broadcast address on (one of) the local network(s) or a multicast address assigned to NTP. The IANA has assigned the multicast group address IPv4 224.0.1.1 and @@ -308,7 +305,7 @@ discovered as the result of broadcast/multicast messages. The client broadcasts a request message to the group address associated with the specified -address and specifically enabled +address and specifically enabled servers respond to these messages. The client selects the servers providing the best time and continues as with the @@ -347,7 +344,7 @@ is started with the -q option.
    Cm
    All packets sent to and received from the server or peer are to include authentication fields encrypted using the specified -key identifier with values from 1 to 65534, inclusive. +key identifier with values from 1 to 65534, inclusive. The default is to include no encryption field.
    Cm
    Cm
    These options specify the minimum and maximum poll intervals @@ -366,19 +363,18 @@ All other things being equal, this host will be chosen for synchronization among a set of correctly operating hosts. See the -"MitigationRulesandthepreferKeyword" +"Mitigation Rules and the prefer Keyword" page (available as part of the HTML documentation provided in /usr/share/doc/ntp) -) for further information.
    Cm
    This option is used only with broadcast server and manycast client modes. It specifies the time-to-live -ttl to +ttl to use on broadcast server and multicast server and the maximum -ttl for the expanding ring search with manycast +ttl for the expanding ring search with manycast client packets. Selection of the proper value, which defaults to 127, is something of a black art and should be coordinated with the @@ -601,7 +597,6 @@ Keys and related information are specified in a key file, usually called ntp.keys, -, which must be distributed and stored using secure means beyond the scope of the NTP protocol itself. Besides the keys used @@ -905,19 +900,19 @@ sent. utility, which uses the standard protocol defined in RFC-1305. The -key argument is +key argument is the key identifier for a trusted key, where the value can be in the range 1 to 65,534, inclusive. -
    Xo
    [cert Ar file ] -[leap Ar file ] -[randfile Ar file ] -[host Ar file ] -[sign Ar file ] -[gq Ar file ] -[gqpar Ar file ] -[iffpar Ar file ] -[mvpar Ar file ] -[pw Ar password ] +
    Xo
    [cert file ] +[leap file ] +[randfile file ] +[host file ] +[sign file ] +[gq file ] +[gqpar file ] +[iffpar file ] +[mvpar file ] +[pw password ] This command requires the OpenSSL library. It activates public key cryptography, selects the message digest and signature @@ -930,38 +925,25 @@ location of a file is relative to the keys directory specified in the keysdir command or default /usr/local/etc. -. Following are the subcommands:
    Cm
    Specifies the location of the required host public certificate file. This overrides the link ntpkey_cert_NsArhostname -Ns -Ar -hostname in the keys directory.
    Cm
    Specifies the location of the optional GQ parameters file. This overrides the link ntpkey_gq_NsArhostname -Ns -Ar -hostname in the keys directory.
    Cm
    Specifies the location of the required host key file. This overrides the link ntpkey_key_NsArhostname -Ns -Ar -hostname in the keys directory.
    Cm
    Specifies the location of the optional IFF parameters file.This overrides the link ntpkey_iff_NsArhostname -Ns -Ar -hostname in the keys directory.
    Cm
    Specifies the location of the optional leapsecond file. This overrides the link @@ -971,9 +953,6 @@ in the keys directory. This overrides the link ntpkey_mv_NsArhostname -Ns -Ar -hostname in the keys directory.
    Cm
    Specifies the password to decrypt files containing private keys and identity parameters. @@ -986,9 +965,6 @@ The defaults are described in the main text above. This overrides the link ntpkey_sign_NsArhostname -Ns -Ar -hostname in the keys directory. If this file is not found, the host key is also the sign key. @@ -1016,7 +992,6 @@ This command specifies the default directory path for cryptographic keys, parameters and certificates. The default is /usr/local/etc/. -. .It Ic requestkey @@ -1028,7 +1003,7 @@ utility program, which uses a proprietary protocol specific to this implementation of ntpd(1ntpdmdoc). The -key argument is a key identifier +key argument is a key identifier for the trusted key, where the value can be in the range 1 to 65,534, inclusive. .It @@ -1064,7 +1039,7 @@ and remote servers share the same key and key identifier for this purpose, although different keys can be used with different servers. The -key arguments are 32-bit unsigned +key arguments are 32-bit unsigned integers with values from 1 to 65,534.
    @@ -1080,38 +1055,38 @@ Codes The following error codes are reported via the NTP control and monitoring protocol trap mechanism.
    -
    101
    (badfieldformatorlength) +
    101
    (bad field format or length) The packet has invalid version, length or format. -
    102
    (badtimestamp) +
    102
    (bad timestamp) The packet timestamp is the same or older than the most recent received. This could be due to a replay or a server clock time step. -
    103
    (badfilestamp) +
    103
    (bad filestamp) The packet filestamp is the same or older than the most recent received. This could be due to a replay or a key file generation error. -
    104
    (badormissingpublickey) +
    104
    (bad or missing public key) The public key is missing, has incorrect format or is an unsupported type. -
    105
    (unsupporteddigesttype) +
    105
    (unsupported digest type) The server requires an unsupported digest/signature scheme. -
    106
    (mismatcheddigesttypes) +
    106
    (mismatched digest types) Not used. -
    107
    (badsignaturelength) +
    107
    (bad signature length) The signature length does not match the current public key. -
    108
    (signaturenotverified) +
    108
    (signature not verified) The message fails the signature check. It could be bogus or signed by a different private key. -
    109
    (certificatenotverified) +
    109
    (certificate not verified) The certificate is invalid or signed with the wrong key. -
    110
    (certificatenotverified) +
    110
    (certificate not verified) The certificate is not yet valid or has expired or the signature could not be verified. -
    111
    (badormissingcookie) +
    111
    (bad or missing cookie) The cookie is missing, corrupted or bogus. -
    112
    (badormissingleapsecondstable) +
    112
    (bad or missing leapseconds table) The leapseconds table is missing, corrupted or bogus. -
    113
    (badormissingcertificate) +
    113
    (bad or missing certificate) The certificate is missing, corrupted or bogus. -
    114
    (badormissingidentity) +
    114
    (bad or missing identity) The identity key is missing, corrupt or bogus.
    @@ -1155,7 +1130,7 @@ Commands
    Ic
    Enables writing of statistics records. Currently, four kinds of -name statistics are supported. +name statistics are supported.
    Cm
    Enables recording of clock driver statistics information. Each update @@ -1297,8 +1272,8 @@ filegen Ar name Xo -[file Ar filename ] -[type Ar typename ] +[file filename ] +[type typename ] [link | nolink ] [enable | disable ] Configures setting of generation file set name. @@ -1327,34 +1302,34 @@ program running at a remote location.
    Cm
    This is the file name for the statistics records. Filenames of set members are built from three concatenated elements -Cm prefix, Cm filename and -Cm suffix: +Cm prefix, Cm filename and +Cm suffix:
    Cm
    This is a constant filename path. It is not subject to modifications via the -filegen option. +filegen option. It is defined by the server, usually specified as a compile-time constant. It may, however, be configurable for individual file generation sets via other commands. For example, the prefix used with -loopstats and -peerstats generation can be configured using the -statsdir option explained above. +loopstats and +peerstats generation can be configured using the +statsdir option explained above.
    Cm
    This string is directly concatenated to the prefix mentioned above (no intervening -/). +/ ) . This can be modified using the file argument to the -filegen statement. +filegen statement. No .. elements are allowed in this component to prevent filenames referring to parts outside the filesystem hierarchy denoted by -prefix.
    Cm
    This part is reflects individual elements of a file set. +prefix.
    Cm
    This part is reflects individual elements of a file set. It is generated according to the type of a file set. @@ -1378,8 +1353,8 @@ server incarnations. The set member filename is built by appending a \&. to concatenated -prefix and -filename strings, and +prefix and +filename strings, and appending the decimal representation of the process ID of the ntpd(1ntpdmdoc) server process. @@ -1396,7 +1371,7 @@ the form dd is a two digit day number. Thus, all information written at 10 December 1992 would end up in a file named -prefix filename Ns.19921210.
    Cm
    Any file set member contains data related to a certain week of +prefix filename Ns .19921210.
    Cm
    Any file set member contains data related to a certain week of a year. The term week is defined by computing day-of-year modulo 7. @@ -1482,13 +1457,11 @@ The list is searched in order with the last match found defining the restriction flags associated with the entry. Additional information and examples can be found in the -"NotesonConfiguringNTPandSettingupaNTPSubnet" +"Notes on Configuring NTP and Setting up a NTP Subnet" page (available as part of the HTML documentation provided in -/usr/share/doc/ntp). -) -. +/usr/share/doc/ntp).

    The restriction facility was implemented in conformance with the access policies for the original NSFnet backbone @@ -1571,9 +1544,9 @@ It will happen at the server only if the server operator cooperates. Control Commands

    -
    Xo
    [average Ar avg ] -[minimum Ar min ] -[monitor Ar prob ] +
    Xo
    [average avg ] +[minimum min ] +[monitor prob ] Set the parameters of the limited facility which protects the server from client abuse. @@ -1587,20 +1560,20 @@ The default minimum average and minimum are 5 and 2, respectively. The monitor subcommand specifies the probability of discard for packets that overflow the rate-control window. -
    Xo
    [mask Ar mask ] -[flag... ] +
    Xo
    [mask mask ] +[flag ... ] The -address argument expressed in +address argument expressed in dotted-quad form is the address of a host or network. Alternatively, the -address argument can be a valid host DNS name. +address argument can be a valid host DNS name. The -mask argument expressed in dotted-quad form defaults to -255.255.255.255, meaning that the -address is treated as the address of an individual host. +mask argument expressed in dotted-quad form defaults to +255.255.255.255, meaning that the +address is treated as the address of an individual host. A default entry (address -0.0.0.0, mask -0.0.0.0) is always included and is always the first entry in the list. +0.0.0.0, mask +0.0.0.0) is always included and is always the first entry in the list. Note that text string default, with no mask option, may be used to indicate the default entry. @@ -2012,7 +1985,7 @@ from there while collecting all servers in scope. Options
    Xo
    .Oo -ceiling Ar ceiling | cohort 0 | 1 | floor Ar floor | minclock Ar minclock | minsane Ar minsane .Oc +ceiling ceiling | cohort 0 | 1 | floor floor | minclock minclock | minsane minsane .Oc This command affects the clock selection and clustering algorithms. It can be used to select the quality and @@ -2085,45 +2058,37 @@ satellite and modem reference clocks plus a special pseudo-clock used for backup or when no other clock source is available. Detailed descriptions of individual device drivers and options can be found in the -"ReferenceClockDrivers" +"Reference Clock Drivers" page (available as part of the HTML documentation provided in /usr/share/doc/ntp). -) -. Additional information can be found in the pages linked there, including the -"DebuggingHintsforReferenceClockDrivers" +"Debugging Hints for Reference Clock Drivers" and -"HowToWriteaReferenceClockDriver" +"How To Write a Reference Clock Driver" pages (available as part of the HTML documentation provided in /usr/share/doc/ntp). -) -. In addition, support for a PPS signal is available as described in the -"Pulse-per-second(PPS)SignalInterfacing" +"Pulse-per-second (PPS) Signal Interfacing" page (available as part of the HTML documentation provided in /usr/share/doc/ntp). -) -. Many drivers support special line discipline/streams modules which can significantly improve the accuracy using the driver. These are described in the -"LineDisciplinesandStreamsDrivers" +"Line Disciplines and Streams Drivers" page (available as part of the HTML documentation provided in -/usr/share/doc/ntp). -) -. +/usr/share/doc/ntp).

    A reference clock will generally (though not always) be a radio timecode receiver which is synchronized to a source of standard @@ -2163,9 +2128,9 @@ u .Sm on where -t is an integer +t is an integer denoting the clock type and -u indicates the unit +u indicates the unit number in the range 0-3. While it may seem overkill, it is in fact sometimes useful to configure multiple reference clocks of the same @@ -2174,7 +2139,7 @@ type, in which case the unit numbers must be unique.

    The server command is used to configure a reference clock, where the -address argument in that command +address argument in that command is the clock address. The key, version and @@ -2188,11 +2153,10 @@ persuade the server to cherish a reference clock with somewhat more enthusiasm than other reference clocks or peers. Further information on this option can be found in the -"MitigationRulesandthepreferKeyword" +"Mitigation Rules and the prefer Keyword" (available as part of the HTML documentation provided in /usr/share/doc/ntp) -) page. The minpoll and @@ -2207,7 +2171,7 @@ information for individual clock drivers and normally follows immediately after the server command. The -address argument specifies the clock address. +address argument specifies the clock address. The refid and stratum options can be used to @@ -2259,9 +2223,9 @@ u .Sm on [prefer ] -[mode Ar int ] -[minpoll Ar int ] -[maxpoll Ar int ] +[mode int ] +[minpoll int ] +[maxpoll int ] This command can be used to configure reference clocks in special ways. The options are interpreted as follows: @@ -2271,12 +2235,11 @@ All other things being equal, this host will be chosen for synchronization among a set of correctly operating hosts. See the -"MitigationRulesandthepreferKeyword" +"Mitigation Rules and the prefer Keyword" page (available as part of the HTML documentation provided in /usr/share/doc/ntp) -) for further information.

    Cm
    Specifies a mode number which is interpreted in a device-specific fashion. @@ -2310,15 +2273,15 @@ Ar u .Sm on -[time1 Ar sec ] -[time2 Ar sec ] -[stratum Ar int ] -[refid Ar string ] -[mode Ar int ] -[flag1 Cm 0\&| Cm 1 ] -[flag2 Cm 0\&| Cm 1 ] -[flag3 Cm 0\&| Cm 1 ] -[flag4 Cm 0\&| Cm 1 ] +[time1 sec ] +[time2 sec ] +[stratum int ] +[refid string ] +[mode int ] +[flag1 Cm 0 \&| Cm 1 ] +[flag2 Cm 0 \&| Cm 1 ] +[flag3 Cm 0 \&| Cm 1 ] +[flag4 Cm 0 \&| Cm 1 ] This command can be used to configure reference clocks in special ways. It must immediately follow the @@ -2353,24 +2316,20 @@ It takes the form of an argument to the MiscellaneousMiscellaneous Options page and operates as described in the -"ReferenceClockDrivers" +"Reference Clock Drivers" page (available as part of the HTML documentation provided in /usr/share/doc/ntp). -) -.
    Cm
    Specifies a fixed-point decimal number in seconds, which is interpreted in a driver-dependent way. See the descriptions of specific drivers in the -"ReferenceClockDrivers" +"Reference Clock Drivers" page (available as part of the HTML documentation provided in /usr/share/doc/ntp). -) -.
    Cm
    Specifies the stratum number assigned to the driver, an integer between 0 and 15. This number overrides the default stratum number diff --git a/ntpd/ntp.conf.man.in b/ntpd/ntp.conf.man.in index bd0a09f01..2d09d4996 100644 --- a/ntpd/ntp.conf.man.in +++ b/ntpd/ntp.conf.man.in @@ -1,8 +1,8 @@ -.TH ntp.conf 5 "25 Dec 2012" "4.2.7p338" "File Formats" +.TH ntp.conf 5 "25 Dec 2012" "4.2.7p339" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed December 25, 2012 at 11:32:38 AM by AutoGen 5.16.2 +.\" It has been AutoGen-ed December 25, 2012 at 12:49:00 PM by AutoGen 5.16.2 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .\" diff --git a/ntpd/ntp.conf.mdoc.in b/ntpd/ntp.conf.mdoc.in index 29c6db52c..28f0f0bbe 100644 --- a/ntpd/ntp.conf.mdoc.in +++ b/ntpd/ntp.conf.mdoc.in @@ -1,9 +1,9 @@ -.Dd December 25 2012 +.Dd December 26 2012 .Dt NTP_CONF 5 File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed December 25, 2012 at 11:34:28 AM by AutoGen 5.16.2 +.\" It has been AutoGen-ed December 26, 2012 at 04:10:33 AM by AutoGen 5.16.2 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/ntpd/ntp.keys.5man b/ntpd/ntp.keys.5man index 9424447c1..612c184bf 100644 --- a/ntpd/ntp.keys.5man +++ b/ntpd/ntp.keys.5man @@ -1,8 +1,8 @@ -.TH ntp.keys 5man "25 Dec 2012" "4.2.7p338" "File Formats" +.TH ntp.keys 5man "25 Dec 2012" "4.2.7p339" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed December 25, 2012 at 11:32:41 AM by AutoGen 5.16.2 +.\" It has been AutoGen-ed December 25, 2012 at 12:49:03 PM by AutoGen 5.16.2 .\" From the definitions ntp.keys.def .\" and the template file agman-file.tpl .\" diff --git a/ntpd/ntp.keys.5mdoc b/ntpd/ntp.keys.5mdoc index e178a4c42..9f5a67a92 100644 --- a/ntpd/ntp.keys.5mdoc +++ b/ntpd/ntp.keys.5mdoc @@ -1,9 +1,9 @@ -.Dd December 25 2012 +.Dd December 26 2012 .Dt NTP_KEYS 5mdoc File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed December 25, 2012 at 11:34:30 AM by AutoGen 5.16.2 +.\" It has been AutoGen-ed December 26, 2012 at 04:10:35 AM by AutoGen 5.16.2 .\" From the definitions ntp.keys.def .\" and the template file agmdoc-file.tpl .Sh NAME diff --git a/ntpd/ntp.keys.html b/ntpd/ntp.keys.html index b3b74ceb0..f555e0cad 100644 --- a/ntpd/ntp.keys.html +++ b/ntpd/ntp.keys.html @@ -33,7 +33,7 @@ Up: (dir)

    This document describes the symmetric key file for the NTP Project's ntpd program. -

    This document applies to version 4.2.7p338 of ntp.keys. +

    This document applies to version 4.2.7p339 of ntp.keys.

    Short Contents

    @@ -72,7 +72,7 @@ be specified in a configuration file, by default /etc/ntp.keys.

    This document describes the format of an NTP symmetric key file. For a description of the use of this type of file, see the -"AuthenticationSupport" +"Authentication Support" section of the ntp.conf(5) page. @@ -98,17 +98,17 @@ type key

    where -keyno is a positive integer (between 1 and 65534), -type is the message digest algorithm, +keyno is a positive integer (between 1 and 65534), +type is the message digest algorithm, and -key is the key itself. +key is the key itself.

    The -key may be given in a format +key may be given in a format controlled by the -type field. +type field. The -type .Li +type .Li MD5 is always supported. If @@ -117,7 +117,7 @@ ntpd was built with the OpenSSL library then any digest library supported by that library may be specified. However, if compliance with FIPS 140-2 is required the -type must be either +type must be either .Li SHA or diff --git a/ntpd/ntp.keys.man.in b/ntpd/ntp.keys.man.in index 0d5da7097..86ad2bb5e 100644 --- a/ntpd/ntp.keys.man.in +++ b/ntpd/ntp.keys.man.in @@ -1,8 +1,8 @@ -.TH ntp.keys 5 "25 Dec 2012" "4.2.7p338" "File Formats" +.TH ntp.keys 5 "25 Dec 2012" "4.2.7p339" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed December 25, 2012 at 11:32:41 AM by AutoGen 5.16.2 +.\" It has been AutoGen-ed December 25, 2012 at 12:49:03 PM by AutoGen 5.16.2 .\" From the definitions ntp.keys.def .\" and the template file agman-file.tpl .\" diff --git a/ntpd/ntp.keys.mdoc.in b/ntpd/ntp.keys.mdoc.in index 2c17ffb06..28a709e08 100644 --- a/ntpd/ntp.keys.mdoc.in +++ b/ntpd/ntp.keys.mdoc.in @@ -1,9 +1,9 @@ -.Dd December 25 2012 +.Dd December 26 2012 .Dt NTP_KEYS 5 File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed December 25, 2012 at 11:34:30 AM by AutoGen 5.16.2 +.\" It has been AutoGen-ed December 26, 2012 at 04:10:35 AM by AutoGen 5.16.2 .\" From the definitions ntp.keys.def .\" and the template file agmdoc-file.tpl .Sh NAME diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index a1b6337a1..b308cc950 100644 --- a/ntpd/ntpd-opts.c +++ b/ntpd/ntpd-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.c) * - * It has been AutoGen-ed December 25, 2012 at 11:31:45 AM by AutoGen 5.16.2 + * It has been AutoGen-ed December 25, 2012 at 12:48:11 PM by AutoGen 5.16.2 * From the definitions ntpd-opts.def * and the template file options * @@ -78,7 +78,7 @@ extern FILE * option_usage_fp; * ntpd option static const strings */ static char const ntpd_opt_strs[2987] = -/* 0 */ "ntpd 4.2.7p338\n" +/* 0 */ "ntpd 4.2.7p339\n" "Copyright (C) 1970-2012 The University of Delaware, all rights reserved.\n" "This is free software. It is licensed for use, modification and\n" "redistribution under the terms of the NTP License, copies of which\n" @@ -204,12 +204,12 @@ static char const ntpd_opt_strs[2987] = /* 2753 */ "Output version information and exit\0" /* 2789 */ "version\0" /* 2797 */ "NTPD\0" -/* 2802 */ "ntpd - NTP daemon program - Ver. 4.2.7p338\n" +/* 2802 */ "ntpd - NTP daemon program - Ver. 4.2.7p339\n" "USAGE: %s [ - [] | --[{=| }] ]... \\\n" "\t\t[ ... ]\n\0" /* 2935 */ "http://bugs.ntp.org, bugs@ntp.org\0" /* 2969 */ "\n\n\0" -/* 2972 */ "ntpd 4.2.7p338"; +/* 2972 */ "ntpd 4.2.7p339"; /* * ipv4 option description with diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index fecb0cf9f..3fe8fc928 100644 --- a/ntpd/ntpd-opts.h +++ b/ntpd/ntpd-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.h) * - * It has been AutoGen-ed December 25, 2012 at 11:31:44 AM by AutoGen 5.16.2 + * It has been AutoGen-ed December 25, 2012 at 12:48:09 PM by AutoGen 5.16.2 * From the definitions ntpd-opts.def * and the template file options * @@ -104,8 +104,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 37 -#define NTPD_VERSION "4.2.7p338" -#define NTPD_FULL_VERSION "ntpd 4.2.7p338" +#define NTPD_VERSION "4.2.7p339" +#define NTPD_FULL_VERSION "ntpd 4.2.7p339" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman index bc1df36b0..a8ec059ef 100644 --- a/ntpd/ntpd.1ntpdman +++ b/ntpd/ntpd.1ntpdman @@ -1,8 +1,8 @@ -.TH ntpd 1ntpdman "25 Dec 2012" "4.2.7p338" "User Commands" +.TH ntpd 1ntpdman "25 Dec 2012" "4.2.7p339" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.man) .\" -.\" It has been AutoGen-ed December 25, 2012 at 11:32:45 AM by AutoGen 5.16.2 +.\" It has been AutoGen-ed December 25, 2012 at 12:49:07 PM by AutoGen 5.16.2 .\" From the definitions ntpd-opts.def .\" and the template file agman-cmd.tpl .\" diff --git a/ntpd/ntpd.1ntpdmdoc b/ntpd/ntpd.1ntpdmdoc index 7ecbfa1e4..52d7baf7e 100644 --- a/ntpd/ntpd.1ntpdmdoc +++ b/ntpd/ntpd.1ntpdmdoc @@ -1,9 +1,9 @@ -.Dd December 25 2012 +.Dd December 26 2012 .Dt NTPD 1ntpdmdoc User Commands .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed December 25, 2012 at 11:34:32 AM by AutoGen 5.16.2 +.\" It has been AutoGen-ed December 26, 2012 at 04:10:37 AM by AutoGen 5.16.2 .\" From the definitions ntpd-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/ntpd/ntpd.html b/ntpd/ntpd.html index cc43a7162..b739ed915 100644 --- a/ntpd/ntpd.html +++ b/ntpd/ntpd.html @@ -3,7 +3,7 @@ ntpd: Network Time Protocol (NTP) Daemon User's Manual - + @@ -14,20 +14,18 @@ pre.smallformat { font-family:inherit; font-size:smaller } pre.smallexample { font-size:smaller } pre.smalllisp { font-size:smaller } - span.sc { font-variant:small-caps } - span.roman { font-family:serif; font-weight:normal; } - span.sansserif { font-family:sans-serif; font-weight:normal; } + span.sc { font-variant:small-caps } + span.roman { font-family: serif; font-weight: normal; } -->

    ntpd: Network Time Protocol (NTP) Daemon User's Manual

    -

    -Next: , +Next: , Previous: (dir), Up: (dir) - +

    ntpd: Network Time Protocol (NTP) Daemon User Manual

    @@ -41,7 +39,7 @@ The program can operate in any of several modes, including client/server, symmetric and broadcast modes, and with both symmetric-key and public-key cryptography. -

    This document applies to version 4.2.7p337 of ntpd. +

    This document applies to version 4.2.7p339 of ntpd.

    -

    - - + +
    @@ -81,10 +78,9 @@ If nothing is heard after a few minutes' time, the daemon times out and exits without setting the clock.
    -

    - - + +

    Invoking ntpd

    @@ -164,7 +160,7 @@ using the agtexi-cmd template and the option descriptions for the < This software is released under the NTP license, <http://ntp.org/license>.
      -
    • ntpd usage: ntpd help/usage (--help) +
    • ntpd usage: ntpd help/usage (--help)
    • ntpd ipv4: ipv4 option (-4)
    • ntpd ipv6: ipv6 option (-6)
    • ntpd authreq: authreq option (-a) @@ -203,27 +199,26 @@ This software is released under the NTP license, <http://ntp.org/license>.
    -

    -Next: , +Next: , Up: ntpd Invocation - +
    -

    ntpd help/usage (--help)

    +

    ntpd help/usage (--help)

    This is the automatically generated usage text for ntpd.

    The text printed is the same whether selected with the help option -(--help) or the more-help option (--more-help). more-help will print +(--help) or the more-help option (--more-help). more-help will print the usage text by passing it through a pager program. more-help is disabled on platforms without a working fork(2) function. The PAGER environment variable is -used to select the program, defaulting to more. Both will exit +used to select the program, defaulting to more. Both will exit with a status code of 0. -

    ntpd - NTP daemon program - Ver. 4.2.7p337
+
    ntpd - NTP daemon program - Ver. 4.2.7p338
 USAGE:  ntpd [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \
                 [ <server1> ... <serverN> ]
   Flg Arg Option-Name    Description
@@ -299,12 +294,11 @@ The following option preset mechanisms are supported:
 please send bug reports to:  http://bugs.ntp.org, bugs@ntp.org
 
    
   
    
-
 
    
-Next: ,
+Next: ,
 Previous: ntpd usage,
 Up: ntpd Invocation
-
+
    
 
    
 
 
    ipv4 option (-4)
    
@@ -321,12 +315,11 @@ ipv6.
   
    Force DNS resolution of following host names on the command line
 to the IPv4 namespace. 
 
    
-
 
    
-Next: ,
+Next: ,
 Previous: ntpd ipv4,
 Up: ntpd Invocation
-
+
    
 
    
 
 
    ipv6 option (-6)
    
@@ -343,12 +336,11 @@ ipv4.
   
    Force DNS resolution of following host names on the command line
 to the IPv6 namespace. 
 
    
-
 
    
-Next: ,
+Next: ,
 Previous: ntpd ipv6,
 Up: ntpd Invocation
-
+
    
 
    
 
 
    authreq option (-a)
    
@@ -366,12 +358,11 @@ authnoreq.
 multicast client and symmetric passive associations. 
 This is the default. 
 
    
-
 
    
-Next: ,
+Next: ,
 Previous: ntpd authreq,
 Up: ntpd Invocation
-
+
    
 
    
 
 
    authnoreq option (-A)
    
@@ -389,12 +380,11 @@ authreq.
 multicast client and symmetric passive associations. 
 This is almost never a good idea. 
 
    
-
 
    
-Next: ,
+Next: ,
 Previous: ntpd authnoreq,
 Up: ntpd Invocation
-
+
    
 
    
 
 
    configfile option (-c)
    
@@ -403,15 +393,14 @@ Up: ntpd Invocation
 This is the “configuration file name” option. 
 This option takes an argument string. 
 The name and path of the configuration file,
-/etc/ntp.conf
+/etc/ntp.conf
 by default. 
 
    
-
 
    
-Next: ,
+Next: ,
 Previous: ntpd configfile,
 Up: ntpd Invocation
-
+
    
 
    
 
 
    driftfile option (-f)
    
@@ -420,20 +409,19 @@ Up: ntpd Invocation
 This is the “frequency drift file name” option. 
 This option takes an argument string. 
 The name and path of the frequency file,
-/etc/ntp.drift
+/etc/ntp.drift
 by default. 
 This is the same operation as the
 driftfile driftfile
 configuration specification in the
-/etc/ntp.conf
+/etc/ntp.conf
 file. 
 
    
-
 
    
-Next: ,
+Next: ,
 Previous: ntpd driftfile,
 Up: ntpd Invocation
-
+
    
 
    
 
 
    panicgate option (-g)
    
@@ -459,12 +447,11 @@ See the
 tinker
 configuration file directive for other options. 
 
    
-
 
    
-Next: ,
+Next: ,
 Previous: ntpd panicgate,
 Up: ntpd Invocation
-
+
    
 
    
 
 
    jaildir option (-i)
    
@@ -491,19 +478,18 @@ This option is supported under NetBSD (configure with
 --enable-clockctl) and Linux (configure with
 --enable-linuxcaps). 
 
    
-
 
    
-Next: ,
+Next: ,
 Previous: ntpd jaildir,
 Up: ntpd Invocation
-
+
    
 
    
 
 
    interface option (-I)
    
 
 
    
 This is the “listen on an interface name or address” option. 
-This option takes an argument string iface.
+This option takes an argument string iface.
 
 
    This option has some usage constraints.  It:
      
      
@@ -516,12 +502,11 @@ also implies not opening other addresses, except wildcard and localhost.
 This option is deprecated. Please consider using the configuration file
 interface command, which is more versatile. 
 
      
-
 
      
-Next: ,
+Next: ,
 Previous: ntpd interface,
 Up: ntpd Invocation
-
+
      
 
      
 
 
      keyfile option (-k)
      
@@ -530,18 +515,17 @@ Up: ntpd Invocation
 This is the “path to symmetric keys” option. 
 This option takes an argument string. 
 Specify the name and path of the symmetric key file. 
-/etc/ntp.keys
+/etc/ntp.keys
 is the default. 
 This is the same operation as the
 keys keyfile
 configuration file directive. 
 
      
-
 
      
-Next: ,
+Next: ,
 Previous: ntpd keyfile,
 Up: ntpd Invocation
-
+
      
 
      
 
 
      logfile option (-l)
      
@@ -555,12 +539,11 @@ This is the same operation as the
 logfile logfile
 configuration file directive. 
 
      
-
 
      
-Next: ,
+Next: ,
 Previous: ntpd logfile,
 Up: ntpd Invocation
-
+
      
 
      
 
 
      novirtualips option (-L)
      
@@ -572,12 +555,11 @@ names containing a colon.  This option is deprecated.  Please
 consider using the configuration file interface command, which
 is more versatile. 
 
      
-
 
      
-Next: ,
+Next: ,
 Previous: ntpd novirtualips,
 Up: ntpd Invocation
-
+
      
 
      
 
 
      modifymmtimer option (-M)
      
@@ -594,12 +576,11 @@ This is the “modify multimedia timer (windows only)” option.
 ensures the resolution does not change while ntpd is running,
 avoiding timekeeping glitches associated with changes. 
 
      
-
 
      
-Next: ,
+Next: ,
 Previous: ntpd modifymmtimer,
 Up: ntpd Invocation
-
+
      
 
      
 
 
      nice option (-N)
      
@@ -610,12 +591,11 @@ To the extent permitted by the operating system, run
 ntpd
 at the highest priority. 
 
      
-
 
      
-Next: ,
+Next: ,
 Previous: ntpd nice,
 Up: ntpd Invocation
-
+
      
 
      
 
 
      pidfile option (-p)
      
@@ -630,12 +610,11 @@ This is the same operation as the
 pidfile pidfile
 configuration file directive. 
 
      
-
 
      
-Next: ,
+Next: ,
 Previous: ntpd pidfile,
 Up: ntpd Invocation
-
+
      
 
      
 
 
      priority option (-P)
      
@@ -649,12 +628,11 @@ at the specified
 sched_setscheduler(SCHED_FIFO)
 priority. 
 
      
-
 
      
-Next: ,
+Next: ,
 Previous: ntpd priority,
 Up: ntpd Invocation
-
+
      
 
      
 
 
      quit option (-q)
      
@@ -680,12 +658,11 @@ and
 options can be used with this option. 
 Note: The kernel time discipline is disabled with this option. 
 
      
-
 
      
-Next: ,
+Next: ,
 Previous: ntpd quit,
 Up: ntpd Invocation
-
+
      
 
      
 
 
      propagationdelay option (-r)
      
@@ -695,12 +672,11 @@ This is the “broadcast/propagation delay” option.
 This option takes an argument string. 
 Specify the default propagation delay from the broadcast/multicast server to this client. This is necessary only if the delay cannot be computed automatically by the protocol. 
 
      
-
 
      
-Next: ,
+Next: ,
 Previous: ntpd propagationdelay,
 Up: ntpd Invocation
-
+
      
 
      
 
 
      saveconfigquit option
      
@@ -720,12 +696,11 @@ quit, wait-sync.
 equivalent to the given filename and exit.  This option was
 designed for automated testing. 
 
      
-
 
      
-Next: ,
+Next: ,
 Previous: ntpd saveconfigquit,
 Up: ntpd Invocation
-
+
      
 
      
 
 
      statsdir option (-s)
      
@@ -738,19 +713,18 @@ This is the same operation as the
 statsdir statsdir
 configuration file directive. 
 
      
-
 
      
-Next: ,
+Next: ,
 Previous: ntpd statsdir,
 Up: ntpd Invocation
-
+
      
 
      
 
 
      trustedkey option (-t)
      
 
 
      
 This is the “trusted key number” option. 
-This option takes an argument string tkey.
+This option takes an argument string tkey.
 
 
      This option has some usage constraints.  It:
      
        
@@ -759,12 +733,11 @@ This option takes an argument string tkey
 
   
        Add the specified key number to the trusted key list. 
 
        
-
 
        
-Next: ,
+Next: ,
 Previous: ntpd trustedkey,
 Up: ntpd Invocation
-
+
        
 
        
 
 
        user option (-u)
        
@@ -785,12 +758,11 @@ This option is supported under NetBSD (configure with
 --enable-clockctl) and Linux (configure with
 --enable-linuxcaps). 
 
        
-
 
        
-Next: ,
+Next: ,
 Previous: ntpd user,
 Up: ntpd Invocation
-
+
        
 
        
 
 
        updateinterval option (-U)
        
@@ -803,13 +775,11 @@ For systems with routing socket support the scans will be performed shortly afte
 has been detected by the system. 
 Use 0 to disable scanning. 60 seconds is the minimum time between scans. 
 
        
-
-
 
        
-Next: ,
+Next: ,
 Previous: ntpd updateinterval,
 Up: ntpd Invocation
-
+
        
 
        
 
 
        wait-sync option (-w)
        
@@ -834,12 +804,11 @@ otherwise it is ETIMEDOUT.
 This provides the option for a script starting ntpd to easily
 wait for the first set of the clock before proceeding. 
 
        
-
 
        
-Next: ,
+Next: ,
 Previous: ntpd wait-sync,
 Up: ntpd Invocation
-
+
        
 
        
 
 
        slew option (-x)
        
@@ -860,12 +829,11 @@ See the
 configuration file directive for other options. 
 Note: The kernel time discipline is disabled with this option. 
 
        
-
 
        
-Next: ,
+Next: ,
 Previous: ntpd slew,
 Up: ntpd Invocation
-
+
        
 
        
 
 
        usepcc option
        
@@ -883,12 +851,11 @@ The CPU counter and QueryPerformanceCounter are compared, and if
 they have the same frequency, the CPU counter (RDTSC on x86) is
 used directly, saving the overhead of a system call. 
 
        
-
 
        
-Next: ,
+Next: ,
 Previous: ntpd usepcc,
 Up: ntpd Invocation
-
+
        
 
        
 
 
        pccfreq option
        
@@ -906,12 +873,11 @@ This option takes an argument string.
 The CPU counter (RDTSC on x86) is used unconditionally with the
 given frequency (in Hz). 
 
        
-
 
        
-Next: ,
+Next: ,
 Previous: ntpd pccfreq,
 Up: ntpd Invocation
-
+
        
 
        
 
 
        mdns option (-m)
        
@@ -928,12 +894,11 @@ This is the “register with mdns as a ntp server” option.
 the server to be discovered via mDNS client lookup.
 
 
        
-
 
        
-Next: ,
+Next: ,
 Previous: ntpd mdns,
 Up: ntpd Invocation
-
+
        
 
        
 
 
        presetting/configuring ntpd
        
@@ -955,43 +920,40 @@ detail to provide.  The default is to print just the version.  The licensing inf
 first letter of the argument is examined:
 
      
        
-
        ‘version’
        Only print the version.  This is the default. 
-
        ‘copyright’
        Name the copyright usage licensing terms. 
-
        ‘verbose’
        Print the full copyright usage licensing terms. 
+
        version
        Only print the version.  This is the default. 
+
        copyright
        Name the copyright usage licensing terms. 
+
        verbose
        Print the full copyright usage licensing terms. 
 
        
 
 
        
-
 
        
-Next: ,
+Next: ,
 Previous: ntpd config,
 Up: ntpd Invocation
-
+
        
 
        
 
 
        ntpd exit status
        
 
 
        One of the following exit values will be returned:
      
        
-
        ‘0 (EXIT_SUCCESS)’
        Successful program execution. 
-
        ‘1 (EXIT_FAILURE)’
        The operation failed or the command syntax was not valid. 
+
        0 (EXIT_SUCCESS)
        Successful program execution. 
+
        1 (EXIT_FAILURE)
        The operation failed or the command syntax was not valid. 
 
        
   
        
-
 
        
-Next: ,
+Next: ,
 Previous: ntpd exit status,
 Up: ntpd Invocation
-
+
        
 
        
 
 
        ntpd Usage
        
 
 
        
-
 
        
-
-
+
+
        
 
        
 
 
        How NTP Operates
        
@@ -1113,14 +1075,14 @@ frequency error is so large that the first sample is outside the
 acceptable range,
 ntpd
 enters the same state as when the
-ntp.drift
+ntp.drift
 file is not present. 
 The intent of this behavior
 is to quickly correct the frequency and restore operation to the
 normal tracking mode. 
 In the most extreme cases
 (the host
-time.ien.it comes to mind), there may be occasional
+time.ien.it comes to mind), there may be occasional
 step/slew corrections and subsequent frequency corrections. 
 It
 helps in these cases to use the
@@ -1140,11 +1102,9 @@ but this was never more than a mediocre hack and is no longer needed.
 ntpd(8)
 that often addresses all of the problems mentioned above. 
 
        
-
-
 
        
-
-
+
+
        
 
        
 
 
        Starting NTP (Best Current Practice)
        
@@ -1155,7 +1115,7 @@ First, use the
 server entries.
 
   
        If you can also keep a good
-ntp.drift
+ntp.drift
 file then
 ntpd(8)
 will effectively "warm-start" and your system's clock will
@@ -1188,10 +1148,9 @@ exits successfully
 it is as safe as it will ever be to start any process that require
 stable time. 
 
        
-
 
        
-
-
+
+
        
 
        
 
 
        Frequency Discipline
        
@@ -1201,8 +1160,7 @@ The
 ntpd
 behavior at startup depends on whether the
 frequency file, usually
-ntp.drift,
-,
+ntp.drift,
 exists. 
 This file
 contains the latest estimate of clock frequency error. 
@@ -1229,10 +1187,9 @@ immediately.
 After that the current frequency offset is written to
 the file at hourly intervals. 
 
        
-
 
        
-
-
+
+
        
 
        
 
 
        Operating Modes
        
@@ -1243,13 +1200,11 @@ The
 utility can operate in any of several modes, including
 symmetric active/passive, client/server broadcast/multicast and
 manycast, as described in the
-"AssociationManagement"
+"Association Management"
 page
 (available as part of the HTML documentation
 provided in
-/usr/share/doc/ntp). 
-)
-. 
+/usr/share/doc/ntp). 
 It normally operates continuously while
 monitoring for small changes in frequency and trimming the clock
 for the ultimate precision. 
@@ -1337,10 +1292,9 @@ At each startup, the
 frequency is read from the file and initializes the kernel
 frequency. 
 
        
-
 
        
-
-
+
+
        
 
        
 
 
        Poll Interval Control
        
@@ -1382,7 +1336,7 @@ At a minimum of 1,024
 s, for example, the capture range is only 31 PPM. 
 If the intrinsic
 error is greater than this, the drift file
-ntp.drift
+ntp.drift
 will
 have to be specially tailored to reduce the residual error below
 this limit. 
@@ -1390,11 +1344,9 @@ Once this is done, the drift file is automatically
 updated once per hour and is available to initialize the frequency
 on subsequent daemon restarts. 
 
        
-
-
 
        
-
-
+
+
        
 
        
 
 
        The huff-n'-puff Filter
        
@@ -1432,28 +1384,26 @@ offset.
 huffpuff keyword, as described in
 ntp.conf(5). 
 
        
-
 
        
-Next: ,
+Next: ,
 Previous: ntpd Usage,
 Up: ntpd Invocation
-
+
        
 
        
 
 
        ntpd Files
        
 
      
        
-
        ‘Pa’
        the default name of the configuration file
-
        ‘Pa’
        the default name of the drift file
-
        ‘Pa’
        the default name of the key file
+
        Pa
        the default name of the configuration file
+
        Pa
        the default name of the drift file
+
        Pa
        the default name of the key file
 
 
        
-
 
        
-Next: ,
+Next: ,
 Previous: ntpd Files,
 Up: ntpd Invocation
-
+
        
 
        
 
 
        ntpd See Also
        
@@ -1470,8 +1420,7 @@ at
 http://www.ntp.org/
 . 
 A snapshot of this documentation is available in HTML format in
-/usr/share/doc/ntp. 
-. 
+/usr/share/doc/ntp. 
 .Rs
 .%A
 David
@@ -1608,12 +1557,11 @@ DHCPv6
 RFC5908
 .Re
 
        
-
 
        
-Next: ,
+Next: ,
 Previous: ntpd See Also,
 Up: ntpd Invocation
-
+
        
 
        
 
 
        ntpd Bugs
        
@@ -1629,11 +1577,10 @@ the fancy features which consume the space were designed more with
 a busy primary server, rather than a high stratum workstation in
 mind. 
 
        
-
 
        
-Previous: ntpd Bugs,
+Previous: ntpd Bugs,
 Up: ntpd Invocation
-
+
        
 
        
 
 
        ntpd Notes
        
@@ -1642,10 +1589,9 @@ Up: ntpd Invocation
 Portions of this document came from FreeBSD.
 
 
        
-
 
        
-
-
+
+
        
 
        
 
      
diff --git a/ntpd/ntpd.man.in b/ntpd/ntpd.man.in
index 18ba1600f..183fd416e 100644
--- a/ntpd/ntpd.man.in
+++ b/ntpd/ntpd.man.in
@@ -1,8 +1,8 @@
-.TH ntpd @NTPD_MS@ "25 Dec 2012" "4.2.7p338" "User Commands"
+.TH ntpd @NTPD_MS@ "25 Dec 2012" "4.2.7p339" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  December 25, 2012 at 11:32:45 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  December 25, 2012 at 12:49:07 PM by AutoGen 5.16.2
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/ntpd/ntpd.mdoc.in b/ntpd/ntpd.mdoc.in
index 8795e397f..8002694cf 100644
--- a/ntpd/ntpd.mdoc.in
+++ b/ntpd/ntpd.mdoc.in
@@ -1,9 +1,9 @@
-.Dd December 25 2012
+.Dd December 26 2012
 .Dt NTPD @NTPD_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  December 25, 2012 at 11:34:32 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  December 26, 2012 at 04:10:37 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpdc/invoke-ntpdc.texi b/ntpdc/invoke-ntpdc.texi
index 842b05af0..545242d36 100644
--- a/ntpdc/invoke-ntpdc.texi
+++ b/ntpdc/invoke-ntpdc.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (invoke-ntpdc.texi)
 # 
-# It has been AutoGen-ed  December 25, 2012 at 11:34:55 AM by AutoGen 5.16.2
+# It has been AutoGen-ed  December 26, 2012 at 04:11:03 AM by AutoGen 5.16.2
 # From the definitions    ntpdc-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -69,7 +69,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p338
+ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p339
 USAGE:  ntpdc [ - [] | --[@{=| @}] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
@@ -412,7 +412,8 @@ uniquely identify the command need be typed.
 The output of a
 command is normally sent to the standard output, but optionally the
 output of individual commands may be sent to a file by appending a
-@quoteleft{}\&> ,@quoteright{}
+@quoteleft{}\&>@quoteright{},
+,
 followed by a file name, to the command line.
 
 A number of interactive format commands are executed entirely
@@ -487,8 +488,7 @@ Note that since
 @code{ntpdc}
 retries each query once after a timeout, the total waiting time for
 a timeout will be twice the timeout value set.
-
-@end multitable
+@end table
 @node Control Message Commands
 @section Control Message Commands
 
@@ -697,8 +697,7 @@ Obtain debugging information for a reference clock driver.
 This
 information is provided only by some clock drivers and is mostly
 undecodable without a copy of the driver source in hand.
-
-@end multitable
+@end table
 @node Runtime Configuration Requests
 @section Runtime Configuration Requests
 
@@ -866,8 +865,7 @@ section of
 @code{ntp.conf(5)}
 for further information.
 The default for this flag is disable.
-
-@end multitable
+@end table
 .It
 Xo
 Ic
diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c
index a0ac0db69..b151a6612 100644
--- a/ntpdc/ntpdc-opts.c
+++ b/ntpdc/ntpdc-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.c)
  *  
- *  It has been AutoGen-ed  December 25, 2012 at 11:34:45 AM by AutoGen 5.16.2
+ *  It has been AutoGen-ed  December 26, 2012 at 04:10:51 AM by AutoGen 5.16.2
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -72,7 +72,7 @@ extern FILE * option_usage_fp;
  *  ntpdc option static const strings
  */
 static char const ntpdc_opt_strs[1862] =
-/*     0 */ "ntpdc 4.2.7p338\n"
+/*     0 */ "ntpdc 4.2.7p339\n"
             "Copyright (C) 1970-2012 The University of Delaware, all rights reserved.\n"
             "This is free software. It is licensed for use, modification and\n"
             "redistribution under the terms of the NTP License, copies of which\n"
@@ -130,14 +130,14 @@ static char const ntpdc_opt_strs[1862] =
 /*  1640 */ "no-load-opts\0"
 /*  1653 */ "no\0"
 /*  1656 */ "NTPDC\0"
-/*  1662 */ "ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p338\n"
+/*  1662 */ "ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p339\n"
             "USAGE:  %s [ - [] | --[{=| }] ]... [ host ...]\n\0"
 /*  1794 */ "$HOME\0"
 /*  1800 */ ".\0"
 /*  1802 */ ".ntprc\0"
 /*  1809 */ "http://bugs.ntp.org, bugs@ntp.org\0"
 /*  1843 */ "\n\n\0"
-/*  1846 */ "ntpdc 4.2.7p338";
+/*  1846 */ "ntpdc 4.2.7p339";
 
 /*
  *  ipv4 option description with
diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h
index 8f7925c1d..a806e77d8 100644
--- a/ntpdc/ntpdc-opts.h
+++ b/ntpdc/ntpdc-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.h)
  *  
- *  It has been AutoGen-ed  December 25, 2012 at 11:34:45 AM by AutoGen 5.16.2
+ *  It has been AutoGen-ed  December 26, 2012 at 04:10:50 AM by AutoGen 5.16.2
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -82,8 +82,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    15
-#define NTPDC_VERSION       "4.2.7p338"
-#define NTPDC_FULL_VERSION  "ntpdc 4.2.7p338"
+#define NTPDC_VERSION       "4.2.7p339"
+#define NTPDC_FULL_VERSION  "ntpdc 4.2.7p339"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpdc/ntpdc.1ntpdcman b/ntpdc/ntpdc.1ntpdcman
index 8866b78bd..dd8619145 100644
--- a/ntpdc/ntpdc.1ntpdcman
+++ b/ntpdc/ntpdc.1ntpdcman
@@ -1,8 +1,8 @@
-.TH ntpdc 1ntpdcman "25 Dec 2012" "4.2.7p338" "User Commands"
+.TH ntpdc 1ntpdcman "26 Dec 2012" "4.2.7p339" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  December 25, 2012 at 11:34:51 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  December 26, 2012 at 04:10:58 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/ntpdc/ntpdc.1ntpdcmdoc b/ntpdc/ntpdc.1ntpdcmdoc
index 7662b23c0..faaf76755 100644
--- a/ntpdc/ntpdc.1ntpdcmdoc
+++ b/ntpdc/ntpdc.1ntpdcmdoc
@@ -1,9 +1,9 @@
-.Dd December 25 2012
+.Dd December 26 2012
 .Dt NTPDC 1ntpdcmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  December 25, 2012 at 11:34:57 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  December 26, 2012 at 04:11:05 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpdc/ntpdc.html b/ntpdc/ntpdc.html
index 26cbd6bf1..61e56e972 100644
--- a/ntpdc/ntpdc.html
+++ b/ntpdc/ntpdc.html
@@ -3,7 +3,7 @@
 ntpdc: NTPD Control User's Manual
 
 
-
+
 
 
 
@@ -14,20 +14,18 @@
   pre.smallformat  { font-family:inherit; font-size:smaller }
   pre.smallexample { font-size:smaller }
   pre.smalllisp    { font-size:smaller }
-  span.sc    { font-variant:small-caps }
-  span.roman { font-family:serif; font-weight:normal; } 
-  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+  span.sc { font-variant:small-caps }
+  span.roman { font-family: serif; font-weight: normal; } 
 -->
 
 
 
        ntpdc: NTPD Control User's Manual
        
 
        
-
 
        
-Next: ,
+Next: ,
 Previous: (dir),
 Up: (dir)
-
+
        
 
        
 
 
        ntpdc: NTPD Control User Manual
        
@@ -38,18 +36,11 @@ display the time offset of the system clock relative to the server
 clock.  Run as root, it can correct the system clock to this offset as
 well.  It can be run as an interactive command or from a cron job.
 
-  
        This document applies to version 4.2.7p338 of ntpdc.
+  
        This document applies to version 4.2.7p339 of ntpdc.
 
   
        The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
 
-                      
        
-
        Short Contents
        
-
-
        
-
 
 
 
        
-
 
        
-
-
+
+
        
 
        
 
 
@@ -79,10 +69,9 @@ the +4.567 +/- 0.089 secs indicates the time offset and
 error bound of the system clock relative to the server clock.
 
 
        
-
 
        
-
-
+
+
        
 
        
 
 
        Invoking ntpdc
        
@@ -112,7 +101,7 @@ using the agtexi-cmd template and the option descriptions for the <
 This software is released under the NTP license, <http://ntp.org/license>.
 
 
 
 
        
-
 
        
-Next: ,
+Next: ,
 Up: ntpdc Invocation
-
+
        
 
        
 
-
        ntpdc help/usage (--help)
        
+
        ntpdc help/usage (--help)
        
 
 
        
 This is the automatically generated usage text for ntpdc.
 
   
        The text printed is the same whether selected with the help option
-(--help) or the more-help option (--more-help).  more-help will print
+(--help) or the more-help option (--more-help).  more-help will print
 the usage text by passing it through a pager program. 
 more-help is disabled on platforms without a working
 fork(2) function.  The PAGER environment variable is
-used to select the program, defaulting to more.  Both will exit
+used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
-
        ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p338
+
        ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p339
 USAGE:  ntpdc [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
@@ -202,12 +190,11 @@ The following option preset mechanisms are supported:
 please send bug reports to:  http://bugs.ntp.org, bugs@ntp.org
 
        
   
        
-
 
        
-Next: ,
+Next: ,
 Previous: ntpdc usage,
 Up: ntpdc Invocation
-
+
        
 
        
 
 
        ipv4 option (-4)
        
@@ -224,12 +211,11 @@ ipv6.
   
        Force DNS resolution of following host names on the command line
 to the IPv4 namespace. 
 
        
-
 
        
-Next: ,
+Next: ,
 Previous: ntpdc ipv4,
 Up: ntpdc Invocation
-
+
        
 
        
 
 
        ipv6 option (-6)
        
@@ -246,19 +232,18 @@ ipv4.
   
        Force DNS resolution of following host names on the command line
 to the IPv6 namespace. 
 
        
-
 
        
-Next: ,
+Next: ,
 Previous: ntpdc ipv6,
 Up: ntpdc Invocation
-
+
        
 
        
 
 
        command option (-c)
        
 
 
        
 This is the “run a command and exit” option. 
-This option takes an argument string cmd.
+This option takes an argument string cmd.
 
 
        This option has some usage constraints.  It:
      
          
@@ -269,12 +254,11 @@ This option takes an argument string cmd.
 and is added to the list of commands to be executed on the specified
 host(s). 
 
          
-
 
          
-Next: ,
+Next: ,
 Previous: ntpdc command,
 Up: ntpdc Invocation
-
+
          
 
          
 
 
          interactive option (-i)
          
@@ -291,12 +275,11 @@ command, listpeers, peers, showpeers.
   
          Force ntpq to operate in interactive mode.  Prompts will be written
 to the standard output and commands read from the standard input. 
 
          
-
 
          
-Next: ,
+Next: ,
 Previous: ntpdc interactive,
 Up: ntpdc Invocation
-
+
          
 
          
 
 
          listpeers option (-l)
          
@@ -313,12 +296,11 @@ command.
   
          Print a list of the peers known to the server as well as a summary of
 their state. This is equivalent to the 'listpeers' interactive command. 
 
          
-
 
          
-Next: ,
+Next: ,
 Previous: ntpdc listpeers,
 Up: ntpdc Invocation
-
+
          
 
          
 
 
          numeric option (-n)
          
@@ -328,12 +310,11 @@ This is the “numeric host addresses” option.
 Output all host addresses in dotted-quad numeric format rather than
 converting to the canonical host names. 
 
          
-
 
          
-Next: ,
+Next: ,
 Previous: ntpdc numeric,
 Up: ntpdc Invocation
-
+
          
 
          
 
 
          peers option (-p)
          
@@ -350,12 +331,11 @@ command.
   
          Print a list of the peers known to the server as well as a summary
 of their state. This is equivalent to the 'peers' interactive command. 
 
          
-
 
          
-Next: ,
+Next: ,
 Previous: ntpdc peers,
 Up: ntpdc Invocation
-
+
          
 
          
 
 
          showpeers option (-s)
          
@@ -373,12 +353,11 @@ command.
 of their state. This is equivalent to the 'dmpeers' interactive command.
 
 
          
-
 
          
-Next: ,
+Next: ,
 Previous: ntpdc showpeers,
 Up: ntpdc Invocation
-
+
          
 
          
 
 
          presetting/configuring ntpdc
          
@@ -396,9 +375,9 @@ values are treated like option arguments.
 
        • $PWD
 
        
   The environment variables HOME, and PWD
-are expanded and replaced when ntpdc runs. 
+are expanded and replaced when ntpdc runs. 
 For any of these that are plain files, they are simply processed. 
-For any that are directories, then a file named .ntprc is searched for
+For any that are directories, then a file named .ntprc is searched for
 within that directory and processed.
 
   
        Configuration files may be in a wide variety of formats. 
@@ -440,37 +419,35 @@ detail to provide.  The default is to print just the version.  The licensing inf
 first letter of the argument is examined:
 
      
        
-
        ‘version’
        Only print the version.  This is the default. 
-
        ‘copyright’
        Name the copyright usage licensing terms. 
-
        ‘verbose’
        Print the full copyright usage licensing terms. 
+
        version
        Only print the version.  This is the default. 
+
        copyright
        Name the copyright usage licensing terms. 
+
        verbose
        Print the full copyright usage licensing terms. 
 
        
 
 
        
-
 
        
-Next: ,
+Next: ,
 Previous: ntpdc config,
 Up: ntpdc Invocation
-
+
        
 
        
 
 
        ntpdc exit status
        
 
 
        One of the following exit values will be returned:
      
        
-
        ‘0 (EXIT_SUCCESS)’
        Successful program execution. 
-
        ‘1 (EXIT_FAILURE)’
        The operation failed or the command syntax was not valid. 
-
        ‘66 (EX_NOINPUT)’
        A specified configuration file could not be loaded. 
-
        ‘70 (EX_SOFTWARE)’
        libopts had an internal operational error.  Please report
+
        0 (EXIT_SUCCESS)
        Successful program execution. 
+
        1 (EXIT_FAILURE)
        The operation failed or the command syntax was not valid. 
+
        66 (EX_NOINPUT)
        A specified configuration file could not be loaded. 
+
        70 (EX_SOFTWARE)
        libopts had an internal operational error.  Please report
 it to autogen-users@lists.sourceforge.net.  Thank you. 
 
        
   
        
-
 
        
-Next: ,
+Next: ,
 Previous: ntpdc exit status,
 Up: ntpdc Invocation
-
+
        
 
        
 
 
        ntpdc Usage
        
@@ -536,10 +513,9 @@ will
 attempt to read interactive format commands from the standard
 input. 
 
        
-
 
        
-
-
+
+
        
 
        
 
 
        Interactive Commands
        
@@ -552,7 +528,8 @@ uniquely identify the command need be typed.
 The output of a
 command is normally sent to the standard output, but optionally the
 output of individual commands may be sent to a file by appending a
-\&> ,
+\&>,
+,
 followed by a file name, to the command line.
 
   
        A number of interactive format commands are executed entirely
@@ -577,7 +554,7 @@ source of information about
 ntpq(8)
 than this manual
 page. 
-
        ‘Ic’
        Specify a time interval to be added to timestamps included in
+
        Ic
        Specify a time interval to be added to timestamps included in
 requests which require authentication. 
 This is used to enable
 (unreliable) server reconfiguration over long delay network paths
@@ -585,10 +562,10 @@ or between machines whose clocks are unsynchronized.
 Actually the
 server does not now require timestamps in authenticated requests,
 so this command may be obsolete. 
-
        ‘Ic’
        Set the host to which future queries will be sent. 
+
        Ic
        Set the host to which future queries will be sent. 
 Hostname may
 be either a host name or a numeric address. 
-
        ‘Ic’
        If
+
        Ic
        If
 yes is specified, host names are printed in
 information displays. 
 If
@@ -598,50 +575,49 @@ The default is
 yes, unless
 modified using the command line
 -n switch. 
-
        ‘Ic’
        This command allows the specification of a key number to be
+
        Ic
        This command allows the specification of a key number to be
 used to authenticate configuration requests. 
 This must correspond
 to a key number the server has been configured to use for this
 purpose. 
-
        ‘Ic’
        Exit
+
        Ic
        Exit
 ntpdc. 
-
        ‘Ic’
        This command prompts you to type in a password (which will not
+
        Ic
        This command prompts you to type in a password (which will not
 be echoed) which will be used to authenticate configuration
 requests. 
 The password must correspond to the key configured for
 use by the NTP server for this purpose if such requests are to be
 successful. 
-
        ‘Ic’
        Specify a timeout period for responses to server queries. 
+
        Ic
        Specify a timeout period for responses to server queries. 
 The
 default is about 8000 milliseconds. 
 Note that since
 ntpdc
 retries each query once after a timeout, the total waiting time for
-a timeout will be twice the timeout value set.
-
-
        
-
+a timeout will be twice the timeout value set. 
+
        
+  
        
 
        
-
-
+
+
        
 
        
 
 
        Control Message Commands
        
 
-     
        Control Message Commands
+
        Control Message Commands
 Query commands result in NTP mode 7 packets containing requests for
 information being sent to the server. 
 These are read-only commands
 in that they make no modification of the server configuration
 state.
-          
        
-
        ‘Ic’
        Obtains and prints a brief list of the peers for which the
+     
        
+
        Ic
        Obtains and prints a brief list of the peers for which the
 server is maintaining state. 
 These should include all configured
 peer associations as well as those peers whose stratum is such that
 they are considered by the server to be possible future
 synchronization candidates. 
-
        ‘Ic’
        Obtains a list of peers for which the server is maintaining
+
        Ic
        Obtains a list of peers for which the server is maintaining
 state, along with a summary of that state. 
 Summary information
 includes the address of the remote peer, the local interface
@@ -651,525 +627,23 @@ peer is unsynchronized), the polling interval, in seconds, the
 reachability register, in octal, and the current estimated delay,
 offset and dispersion of the peer, all in seconds.
 
-          
        The character in the left margin indicates the mode this peer
+     
        The character in the left margin indicates the mode this peer
 entry is operating in. 
 A
-‘\&+’
+\&+
 denotes symmetric active, a
-‘\&-’
+\&-
 indicates symmetric passive, a
-‘\&=’
+\&=
 means the
 remote server is being polled in client mode, a
-‘\&^’
+\&^
 indicates that the server is broadcasting to this address, a
-‘\&~’
+\&~
 denotes that the remote peer is sending broadcasts and a
-‘\&~’
+\&~
 denotes that the remote peer is sending broadcasts and a
-‘\&*’
+\&*
 marks the peer the server is currently synchronizing
 to.
 
-          
        The contents of the host field may be one of four forms. 
-It may
-be a host name, an IP address, a reference clock implementation
-name with its parameter or
-.Fn
-REFCLK
-"implementation_number"
-"parameter"
-. 
-On
-hostnames no only IP-addresses
-will be displayed. 
-
        ‘Ic’
        A slightly different peer summary list. 
-Identical to the output
-of the
-peers command, except for the character in the
-leftmost column. 
-Characters only appear beside peers which were
-included in the final stage of the clock selection algorithm. 
-A
-‘\&.’
-indicates that this peer was cast off in the falseticker
-detection, while a
-‘\&+’
-indicates that the peer made it
-through. 
-A
-‘\&*’
-denotes the peer the server is currently
-synchronizing with. 
-
        ‘Ic’
        Shows a detailed display of the current peer variables for one
-or more peers. 
-Most of these values are described in the NTP
-Version 2 specification. 
-
        ‘Ic’
        Show per-peer statistic counters associated with the specified
-peer(s). 
-
        ‘Ic’
        Obtain and print information concerning a peer clock. 
-The
-values obtained provide information on the setting of fudge factors
-and other clock performance information. 
-
        ‘Ic’
        Obtain and print kernel phase-lock loop operating parameters. 
-This information is available only if the kernel has been specially
-modified for a precision timekeeping function. 
-
        ‘Ic’
        Print the values of selected loop filter variables. 
-The loop
-filter is the part of NTP which deals with adjusting the local
-system clock. 
-The
-‘offset’
-is the last offset given to the
-loop filter by the packet processing code. 
-The
-‘frequency’
-is the frequency error of the local clock in parts-per-million
-(ppm). 
-The
-‘time_const’
-controls the stiffness of the
-phase-lock loop and thus the speed at which it can adapt to
-oscillator drift. 
-The
-‘watchdogtimer’
-value is the number
-of seconds which have elapsed since the last sample offset was
-given to the loop filter. 
-The
-oneline and
-multiline options specify the format in which this
-information is to be printed, with
-multiline as the
-default. 
-
        ‘Ic’
        Print a variety of system state variables, i.e., state related
-to the local server. 
-All except the last four lines are described
-in the NTP Version 3 specification, RFC-1305.
-
-          
        The
-‘systemflags’
-show various system flags, some of
-which can be set and cleared by the
-enable and
-disable configuration commands, respectively. 
-These are
-the
-auth, bclient, monitor, pll, pps and
-stats flags. 
-See the
-ntpd(8)
-documentation for the meaning of these flags. 
-There
-are two additional flags which are read only, the
-kernel_pll and
-kernel_pps. These flags indicate
-the synchronization status when the precision time kernel
-modifications are in use. 
-The
-‘kernel_pll’
-indicates that
-the local clock is being disciplined by the kernel, while the
-‘kernel_pps’
-indicates the kernel discipline is provided by the PPS
-signal.
-
-          
        The
-‘stability’
-is the residual frequency error remaining
-after the system frequency correction is applied and is intended for
-maintenance and debugging. 
-In most architectures, this value will
-initially decrease from as high as 500 ppm to a nominal value in
-the range .01 to 0.1 ppm. 
-If it remains high for some time after
-starting the daemon, something may be wrong with the local clock,
-or the value of the kernel variable
-.Va
-kern.clockrate.tick
-may be
-incorrect.
-
-          
        The
-‘broadcastdelay’
-shows the default broadcast delay,
-as set by the
-broadcastdelay configuration command.
-
-          
        The
-‘authdelay’
-shows the default authentication delay,
-as set by the
-authdelay configuration command. 
-
        ‘Ic’
        Print statistics counters maintained in the protocol
-module. 
-
        ‘Ic’
        Print statistics counters related to memory allocation
-code. 
-
        ‘Ic’
        Print statistics counters maintained in the input-output
-module. 
-
        ‘Ic’
        Print statistics counters maintained in the timer/event queue
-support code. 
-
        ‘Ic’
        Obtain and print the server's restriction list. 
-This list is
-(usually) printed in sorted order and may help to understand how
-the restrictions are applied. 
-
        ‘Ic’
        Obtain and print traffic counts collected and maintained by the
-monitor facility. 
-The version number should not normally need to be
-specified. 
-
        ‘Ic’
        Obtain debugging information for a reference clock driver. 
-This
-information is provided only by some clock drivers and is mostly
-undecodable without a copy of the driver source in hand.
-
-
        
-
-
        
-
-
-
        
-
-
        Runtime Configuration Requests
        
-
-          
        Runtime Configuration Requests
-All requests which cause state changes in the server are
-authenticated by the server using a configured NTP key (the
-facility can also be disabled by the server by not configuring a
-key). 
-The key number and the corresponding key must also be made
-known to
-ntpdc. 
-This can be done using the
-keyid and
-passwd commands, the latter of which will prompt at the terminal for a
-password to use as the encryption key. 
-You will also be prompted
-automatically for both the key number and password the first time a
-command which would result in an authenticated request to the
-server is given. 
-Authentication not only provides verification that
-the requester has permission to make such changes, but also gives
-an extra degree of protection again transmission errors.
-
-            
        Authenticated requests always include a timestamp in the packet
-data, which is included in the computation of the authentication
-code. 
-This timestamp is compared by the server to its receive time
-stamp. 
-If they differ by more than a small amount the request is
-rejected. 
-This is done for two reasons. 
-First, it makes simple
-replay attacks on the server, by someone who might be able to
-overhear traffic on your LAN, much more difficult. 
-Second, it makes
-it more difficult to request configuration changes to your server
-from topologically remote hosts. 
-While the reconfiguration facility
-will work well with a server on the local host, and may work
-adequately between time-synchronized hosts on the same LAN, it will
-work very poorly for more distant hosts. 
-As such, if reasonable
-passwords are chosen, care is taken in the distribution and
-protection of keys and appropriate source address restrictions are
-applied, the run time reconfiguration facility should provide an
-adequate level of security.
-
-            
        The following commands all make authenticated requests.
-               
        
-
        ‘Xo’
        [keyid ]
-[version ]
-[prefer ]
-Add a configured peer association at the given address and
-operating in symmetric active mode. 
-Note that an existing
-association with the same peer may be deleted when this command is
-executed, or may simply be converted to conform to the new
-configuration, as appropriate. 
-If the optional
-keyid is a
-nonzero integer, all outgoing packets to the remote server will
-have an authentication field attached encrypted with this key. 
-If
-the value is 0 (or not given) no authentication will be done. 
-The
-version can be 1, 2 or 3 and defaults to 3. 
-The
-prefer keyword indicates a preferred peer (and thus will
-be used primarily for clock synchronisation if possible). 
-The
-preferred peer also determines the validity of the PPS signal - if
-the preferred peer is suitable for synchronisation so is the PPS
-signal. 
-
        ‘Xo’
        [keyid ]
-[version ]
-[prefer ]
-Identical to the addpeer command, except that the operating
-mode is client. 
-
        ‘Xo’
        [keyid ]
-[version ]
-[prefer ]
-Identical to the addpeer command, except that the operating
-mode is broadcast. 
-In this case a valid key identifier and key are
-required. 
-The
-peer_address parameter can be the broadcast
-address of the local network or a multicast group address assigned
-to NTP. 
-If a multicast address, a multicast-capable kernel is
-required. 
-
        ‘Ic’
        This command causes the configured bit to be removed from the
-specified peer(s). 
-In many cases this will cause the peer
-association to be deleted. 
-When appropriate, however, the
-association may persist in an unconfigured mode if the remote peer
-is willing to continue on in this fashion. 
-
        ‘Xo’
        [time1 ]
-[time2 ]
-[stratum ]
-[refid ]
-This command provides a way to set certain data for a reference
-clock. 
-See the source listing for further information. 
-
        ‘Xo’
        .Oo
-auth | Cm bclient | calibrate | Cm kernel | monitor | Cm ntp | pps | Cm stats .Oc
-
        ‘Xo’
        .Oo
-auth | Cm bclient | calibrate | Cm kernel | monitor | Cm ntp | pps | Cm stats .Oc
-These commands operate in the same way as the
-enable and
-disable configuration file commands of
-ntpd(8).
-                    
        
-
        ‘Cm’
        Enables the server to synchronize with unconfigured peers only
-if the peer has been correctly authenticated using either public key
-or private key cryptography. 
-The default for this flag is enable. 
-
        ‘Cm’
        Enables the server to listen for a message from a broadcast or
-multicast server, as in the multicastclient command with
-default address. 
-The default for this flag is disable. 
-
        ‘Cm’
        Enables the calibrate feature for reference clocks. 
-The default for this flag is disable. 
-
        ‘Cm’
        Enables the kernel time discipline, if available. 
-The default for this flag is enable if support is available, otherwise disable. 
-
        ‘Cm’
        Enables the monitoring facility. 
-See the
-ntpdc(8). 
-program and the monlist command or further information. 
-The default for this flag is enable. 
-
        ‘Cm’
        Enables time and frequency discipline. 
-In effect, this switch opens and closes the feedback loop,
-which is useful for testing. 
-The default for this flag is enable. 
-
        ‘Cm’
        Enables the pulse-per-second (PPS) signal when frequency
-and time is disciplined by the precision time kernel modifications. 
-See the
-"AKernelModelforPrecisionTimekeeping"
-(available as part of the HTML documentation
-provided in
-/usr/share/doc/ntp)
-)
-page for further information. 
-The default for this flag is disable. 
-
        ‘Cm’
        Enables the statistics facility. 
-See the
-MonitoringMonitoring
-Options
-section of
-ntp.conf(5)
-for further information. 
-The default for this flag is disable.
-
-                    
        .It
-Xo
-Ic
-restrict
-Ar
-address
-Ar
-mask
-flag Oo Ar... Oc This command operates in the same way as the
-restrict configuration file commands of
-ntpd(8). 
-.It
-Xo
-Ic
-unrestrict
-Ar
-address
-Ar
-mask
-flag Oo Ar... Oc Unrestrict the matching entry from the restrict list. 
-.It
-Xo
-Ic
-delrestrict
-Ar
-address
-Ar
-mask
-[ntpport ]
-Delete the matching entry from the restrict list. 
-.It
-Ic
-readkeys
-Causes the current set of authentication keys to be purged and
-a new set to be obtained by rereading the keys file (which must
-have been specified in the
-ntpd(8)
-configuration file). 
-This
-allows encryption keys to be changed without restarting the
-server. 
-.It
-Ic
-trustedkey
-Ar
-keyid
-Oo
-Ar
-... 
-Oc
-.It
-Ic
-untrustedkey
-Ar
-keyid
-Oo
-Ar
-... 
-Oc
-These commands operate in the same way as the
-trustedkey and
-untrustedkey configuration file
-commands of
-ntpd(8). 
-.It
-Ic
-authinfo
-Returns information concerning the authentication module,
-including known keys and counts of encryptions and decryptions
-which have been done. 
-.It
-Ic
-traps
-Display the traps set in the server. 
-See the source listing for
-further information. 
-.It
-Xo
-Ic
-addtrap
-Ar
-address
-[port ]
-[interface ]
-Set a trap for asynchronous messages. 
-See the source listing
-for further information. 
-.It
-Xo
-Ic
-clrtrap
-Ar
-address
-[port ]
-[interface ]
-Clear a trap for asynchronous messages. 
-See the source listing
-for further information. 
-.It
-Ic
-reset
-Clear the statistics counters in various modules of the server. 
-See the source listing for further information.
-
-
        
-
-
        
-Next: ,
-Previous: ntpdc Usage,
-Up: ntpdc Invocation
-
-
        
-
-
        ntpdc See Also
        
-
-                    
        ntp.conf(5),
-ntpd(8)
-.Rs
-.%A
-David
-L. 
-Mills
-.%T
-Network
-Time
-Protocol
-(Version
-3)
-.%O
-RFC1305
-.Re
-
        
-
-
        
-Next: ,
-Previous: ntpdc See Also,
-Up: ntpdc Invocation
-
-
        
-
-
        ntpdc Authors
        
-
-                    
        The formatting directives in this document came from FreeBSD. 
-
        
-
-
        
-Previous: ntpdc Authors,
-Up: ntpdc Invocation
-
-
        
-
-
        ntpdc Bugs
        
-
-                    
        The
-ntpdc
-utility is a crude hack. 
-Much of the information it shows is
-deadly boring and could only be loved by its implementer. 
-The
-program was designed so that new (and temporary) features were easy
-to hack in, at great expense to the program's ease of use. 
-Despite
-this, the program is occasionally useful.
-
-                      
        Please report bugs to http://bugs.ntp.org .
-
-
        
-
-
        
-
-
-
        
-
-                    
-
        Usage
        
-
-                    
        The simplest use of this program is as an unprivileged command to
-check the current time, offset, and error in the local clock. 
-For example:
-
-                    
                                ntpdc ntpserver.somewhere
-
        
-                      
        With suitable privilege, it can be run as a command or in a
-cron job to reset the local clock from a reliable server, like
-the ntpdate and rdate commands. 
-For example:
-
-                    
                                ntpdc -a ntpserver.somewhere
-
        
-                      
-
diff --git a/ntpdc/ntpdc.man.in b/ntpdc/ntpdc.man.in
index f2e19e694..5db298b37 100644
--- a/ntpdc/ntpdc.man.in
+++ b/ntpdc/ntpdc.man.in
@@ -1,8 +1,8 @@
-.TH ntpdc @NTPDC_MS@ "25 Dec 2012" "4.2.7p338" "User Commands"
+.TH ntpdc @NTPDC_MS@ "26 Dec 2012" "4.2.7p339" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  December 25, 2012 at 11:34:51 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  December 26, 2012 at 04:10:58 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/ntpdc/ntpdc.mdoc.in b/ntpdc/ntpdc.mdoc.in
index e49f82582..845557f08 100644
--- a/ntpdc/ntpdc.mdoc.in
+++ b/ntpdc/ntpdc.mdoc.in
@@ -1,9 +1,9 @@
-.Dd December 25 2012
+.Dd December 26 2012
 .Dt NTPDC @NTPDC_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  December 25, 2012 at 11:34:57 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  December 26, 2012 at 04:11:05 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpq/invoke-ntpq.texi b/ntpq/invoke-ntpq.texi
index 7ba97b003..22f09fc70 100644
--- a/ntpq/invoke-ntpq.texi
+++ b/ntpq/invoke-ntpq.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (invoke-ntpq.texi)
 # 
-# It has been AutoGen-ed  December 25, 2012 at 11:35:11 AM by AutoGen 5.16.2
+# It has been AutoGen-ed  December 26, 2012 at 04:11:20 AM by AutoGen 5.16.2
 # From the definitions    ntpq-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -112,7 +112,8 @@ page.
 @item Ic
 The data carried by NTP mode 6 messages consists of a list of
 items of the form
-@quoteleft{}variable_name=value ,@quoteright{}
+@quoteleft{}variable_name=value@quoteright{},
+,
 where the
 @quoteleft{}=value@quoteright{}
 is ignored, and can be omitted,
@@ -165,7 +166,8 @@ Variables which
 @code{ntpq}
 thinks should have a decodable value but didn't are
 marked with a trailing
-@quoteleft{}\&? .@quoteright{}
+@quoteleft{}\&?@quoteright{}.
+.
 @item Xo
 @code{debug} .Oo
 @code{more} | @code{less} | @code{off} .Oc
@@ -271,7 +273,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntpq - standard NTP query program - Ver. 4.2.7p338
+ntpq - standard NTP query program - Ver. 4.2.7p339
 USAGE:  ntpq [ - [] | --[@{=| @}] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
diff --git a/ntpq/ntpq-opts.c b/ntpq/ntpq-opts.c
index 3c0931481..edf8a25e4 100644
--- a/ntpq/ntpq-opts.c
+++ b/ntpq/ntpq-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpq-opts.c)
  *  
- *  It has been AutoGen-ed  December 25, 2012 at 11:35:01 AM by AutoGen 5.16.2
+ *  It has been AutoGen-ed  December 26, 2012 at 04:11:08 AM by AutoGen 5.16.2
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -72,7 +72,7 @@ extern FILE * option_usage_fp;
  *  ntpq option static const strings
  */
 static char const ntpq_opt_strs[1833] =
-/*     0 */ "ntpq 4.2.7p338\n"
+/*     0 */ "ntpq 4.2.7p339\n"
             "Copyright (C) 1970-2012 The University of Delaware, all rights reserved.\n"
             "This is free software. It is licensed for use, modification and\n"
             "redistribution under the terms of the NTP License, copies of which\n"
@@ -128,13 +128,13 @@ static char const ntpq_opt_strs[1833] =
 /*  1627 */ "no-load-opts\0"
 /*  1640 */ "no\0"
 /*  1643 */ "NTPQ\0"
-/*  1648 */ "ntpq - standard NTP query program - Ver. 4.2.7p338\n"
+/*  1648 */ "ntpq - standard NTP query program - Ver. 4.2.7p339\n"
             "USAGE:  %s [ - [] | --[{=| }] ]... [ host ...]\n\0"
 /*  1769 */ "$HOME\0"
 /*  1775 */ ".\0"
 /*  1777 */ ".ntprc\0"
 /*  1784 */ "http://bugs.ntp.org, bugs@ntp.org\0"
-/*  1818 */ "ntpq 4.2.7p338";
+/*  1818 */ "ntpq 4.2.7p339";
 
 /*
  *  ipv4 option description with
diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h
index 53b8bc3bc..346abfe6b 100644
--- a/ntpq/ntpq-opts.h
+++ b/ntpq/ntpq-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpq-opts.h)
  *  
- *  It has been AutoGen-ed  December 25, 2012 at 11:35:00 AM by AutoGen 5.16.2
+ *  It has been AutoGen-ed  December 26, 2012 at 04:11:08 AM by AutoGen 5.16.2
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -81,8 +81,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    14
-#define NTPQ_VERSION       "4.2.7p338"
-#define NTPQ_FULL_VERSION  "ntpq 4.2.7p338"
+#define NTPQ_VERSION       "4.2.7p339"
+#define NTPQ_FULL_VERSION  "ntpq 4.2.7p339"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpq/ntpq.1ntpqman b/ntpq/ntpq.1ntpqman
index 99a355bfa..c03ae15bb 100644
--- a/ntpq/ntpq.1ntpqman
+++ b/ntpq/ntpq.1ntpqman
@@ -1,8 +1,8 @@
-.TH ntpq 1ntpqman "25 Dec 2012" "4.2.7p338" "User Commands"
+.TH ntpq 1ntpqman "26 Dec 2012" "4.2.7p339" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  December 25, 2012 at 11:35:07 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  December 26, 2012 at 04:11:16 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -13,264 +13,6 @@ ntpq \- standard NTP query program
 .\" Mixture of short (flag) options and long options
 .RB [ \-\fIflag\fP " [\fIvalue\fP]]... [" \-\-\fIopt\-name\fP " [[=| ]\fIvalue\fP]]..." [ host ...]
 .SH DESCRIPTION
-The
-.B 
-utility program is used to query NTP servers which
-implement the standard NTP mode 6 control message formats defined
-in Appendix B of the NTPv3 specification RFC1305, requesting
-information about current state and/or changes in that state.
-The same formats are used in NTPv4, although some of the
-variables have changed and new ones added. The description on this
-page is for the NTPv4 variables.
-The program may be run either in interactive mode or controlled using
-command line arguments.
-Requests to read and write arbitrary
-variables can be assembled, with raw and pretty-printed output
-options being available.
-The
-.B 
-utility can also obtain and print a
-list of peers in a common format by sending multiple queries to the
-server.
-If one or more request options is included on the command line
-when
-.B 
-is executed, each of the requests will be sent
-to the NTP servers running on each of the hosts given as command
-line arguments, or on localhost by default.
-If no request options
-are given,
-.B 
-will attempt to read commands from the
-standard input and execute these on the NTP server running on the
-first host given on the command line, again defaulting to localhost
-when no other host is specified.
-The
-.B 
-utility will prompt for
-commands if the standard input is a terminal device.
-.B 
-uses NTP mode 6 packets to communicate with the
-NTP server, and hence can be used to query any compatible server on
-the network which permits it.
-Note that since NTP is a UDP protocol
-this communication will be somewhat unreliable, especially over
-large distances in terms of network topology.
-The
-.B 
-utility makes
-one attempt to retransmit requests, and will time requests out if
-the remote host is not heard from within a suitable timeout
-time.
-Specifying a
-command line option other than
-i
-or
-n
-will
-cause the specified query (queries) to be sent to the indicated
-host(s) immediately.
-Otherwise,
-.B 
-will attempt to read
-interactive format commands from the standard input.
-.SS "Internal Commands"
-Interactive format commands consist of a keyword followed by zero
-to four arguments.
-Only enough characters of the full keyword to
-uniquely identify the command need be typed.
-A
-number of interactive format commands are executed entirely within
-the
-.B 
-utility itself and do not result in NTP mode 6
-requests being sent to a server.
-These are described following.
-.TP
-.BR Ic ? Op Ar command_keyword
-.TP
-.BR Ic help Op Ar command_keyword
-A
-.Ql \&?
-by itself will print a list of all the command
-keywords known to this incarnation of
-.Nm .
-A
-.Ql \&?
-followed by a command keyword will print function and usage
-information about the command.
-This command is probably a better
-source of information about
-.Nm
-than this manual
-page.
-.TP
-.BR Ic addvars Ar variable_name Xo Op Ic =value
-.Ic ...
-.Xc
-.TP
-.BR Ic rmvars Ar variable_name Ic ...
-.TP
-.BR Ic clearvars
-The data carried by NTP mode 6 messages consists of a list of
-items of the form
-.Ql variable_name=value ,
-where the
-.Ql =value
-is ignored, and can be omitted,
-in requests to the server to read variables.
-The
-.Nm
-utility maintains an internal list in which data to be included in control
-messages can be assembled, and sent using the
-.Ic readlist
-and
-.Ic writelist
-commands described below.
-The
-.Ic addvars
-command allows variables and their optional values to be added to
-the list.
-If more than one variable is to be added, the list should
-be comma-separated and not contain white space.
-The
-.Ic rmvars
-command can be used to remove individual variables from the list,
-while the
-.Ic clearlist
-command removes all variables from the
-list.
-.TP
-.BR Ic authenticate Op yes | no
-Normally
-.Nm
-does not authenticate requests unless
-they are write requests.
-The command
-.Ql authenticate yes
-causes
-.Nm
-to send authentication with all requests it
-makes.
-Authenticated requests causes some servers to handle
-requests slightly differently, and can occasionally melt the CPU in
-fuzzballs if you turn authentication on before doing a
-.Ic peer
-display.
-The command
-.Ql authenticate
-causes
-.Nm
-to display whether or not
-.Nm
-is currently autheinticating requests.
-.TP
-.BR Ic cooked
-Causes output from query commands to be "cooked", so that
-variables which are recognized by
-.Nm
-will have their
-values reformatted for human consumption.
-Variables which
-.Nm
-thinks should have a decodable value but didn't are
-marked with a trailing
-.Ql \&? .
-.TP
-.BR Xo
-.Ic debug
-.Oo
-.Cm more |
-.Cm less |
-.Cm off
-.Oc
-.Xc
-With no argument, displays the current debug level.
-Otherwise, the debug level is changed to the indicated level.
-.TP
-.BR Ic delay Ar milliseconds
-Specify a time interval to be added to timestamps included in
-requests which require authentication.
-This is used to enable
-(unreliable) server reconfiguration over long delay network paths
-or between machines whose clocks are unsynchronized.
-Actually the
-server does not now require timestamps in authenticated requests,
-so this command may be obsolete.
-.TP
-.BR Ic host Ar hostname
-Set the host to which future queries will be sent.
-\fIhostname\fR
-may be either a host name or a numeric address.
-.TP
-.BR Ic hostnames Op Cm yes | Cm no
-If
-.Cm yes
-is specified, host names are printed in
-information displays.
-If
-.Cm no
-is specified, numeric
-addresses are printed instead.
-The default is
-.Cm yes ,
-unless
-modified using the command line
-n
-switch.
-.TP
-.BR Ic keyid Ar keyid
-This command allows the specification of a key number to be
-used to authenticate configuration requests.
-This must correspond
-to a key number the server has been configured to use for this
-purpose.
-.TP
-.BR Ic ntpversion Xo Oo
-.Cm 1 |
-.Cm 2 |
-.Cm 3 |
-.Cm 4
-.Oc
-.Xc
-Sets the NTP version number which
-.Nm
-claims in
-packets.
-Defaults to 3, and note that mode 6 control messages (and
-modes, for that matter) didn't exist in NTP version 1.
-There appear
-to be no servers left which demand version 1.
-With no argument, displays the current NTP version that will be used
-when communicating with servers.
-.TP
-.BR Ic quit
-Exit
-.Nm
-.TP
-.BR Ic passwd
-This command prompts you to type in a password (which will not
-be echoed) which will be used to authenticate configuration
-requests.
-The password must correspond to the key configured for
-use by the NTP server for this purpose if such requests are to be
-successful.
-.TP
-.BR Ic raw
-Causes all output from query commands is printed as received
-from the remote server.
-The only formating/interpretation done on
-the data is to transform nonascii data into a printable (but barely
-understandable) form.
-.TP
-.BR Ic timeout Ar milliseconds
-Specify a timeout period for responses to server queries.
-The
-default is about 5000 milliseconds.
-Note that since
-.Nm
-retries each query once after a timeout, the total waiting time for
-a timeout will be twice the timeout value set.
 .SH "OPTIONS"
 .TP
 .BR \-4 ", " -\-ipv4
diff --git a/ntpq/ntpq.1ntpqmdoc b/ntpq/ntpq.1ntpqmdoc
index 6743e6cd1..05829eb4d 100644
--- a/ntpq/ntpq.1ntpqmdoc
+++ b/ntpq/ntpq.1ntpqmdoc
@@ -1,9 +1,9 @@
-.Dd December 25 2012
+.Dd December 26 2012
 .Dt NTPQ 1ntpqmdoc User Commands
-.Os FreeBSD 6.4-STABLE
+.Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  December 25, 2012 at 11:35:13 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  December 26, 2012 at 04:11:21 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -18,249 +18,6 @@
 [ host ...]
 .Pp
 .Sh DESCRIPTION
-The
-.Nm
-utility program is used to query NTP servers which
-implement the standard NTP mode 6 control message formats defined
-in Appendix B of the NTPv3 specification RFC1305, requesting
-information about current state and/or changes in that state.
-The same formats are used in NTPv4, although some of the
-variables have changed and new ones added. The description on this
-page is for the NTPv4 variables.
-The program may be run either in interactive mode or controlled using
-command line arguments.
-Requests to read and write arbitrary
-variables can be assembled, with raw and pretty-printed output
-options being available.
-The
-.Nm
-utility can also obtain and print a
-list of peers in a common format by sending multiple queries to the
-server.
-If one or more request options is included on the command line
-when
-.Nm
-is executed, each of the requests will be sent
-to the NTP servers running on each of the hosts given as command
-line arguments, or on localhost by default.
-If no request options
-are given,
-.Nm
-will attempt to read commands from the
-standard input and execute these on the NTP server running on the
-first host given on the command line, again defaulting to localhost
-when no other host is specified.
-The
-.Nm
-utility will prompt for
-commands if the standard input is a terminal device.
-.Nm
-uses NTP mode 6 packets to communicate with the
-NTP server, and hence can be used to query any compatible server on
-the network which permits it.
-Note that since NTP is a UDP protocol
-this communication will be somewhat unreliable, especially over
-large distances in terms of network topology.
-The
-.Nm
-utility makes
-one attempt to retransmit requests, and will time requests out if
-the remote host is not heard from within a suitable timeout
-time.
-Specifying a
-command line option other than
-.Fl i
-or
-.Fl n
-will
-cause the specified query (queries) to be sent to the indicated
-host(s) immediately.
-Otherwise,
-.Nm
-will attempt to read
-interactive format commands from the standard input.
-.Ss "Internal Commands"
-Interactive format commands consist of a keyword followed by zero
-to four arguments.
-Only enough characters of the full keyword to
-uniquely identify the command need be typed.
-A
-number of interactive format commands are executed entirely within
-the
-.Nm
-utility itself and do not result in NTP mode 6
-requests being sent to a server.
-These are described following.
-.Bl -tag -width "? [command_keyword]" -compact -offset indent
-.It Ic ? Op  Ar command_keyword
-.It Ic help Op Ar command_keyword
-A
-.Ql \&?
-by itself will print a list of all the command
-keywords known to this incarnation of
-.Nm .
-A
-.Ql \&?
-followed by a command keyword will print function and usage
-information about the command.
-This command is probably a better
-source of information about
-.Nm
-than this manual
-page.
-.It Ic addvars Ar variable_name Xo Op Ic =value
-.Ic ...
-.Xc
-.It Ic rmvars Ar variable_name Ic ...
-.It Ic clearvars
-The data carried by NTP mode 6 messages consists of a list of
-items of the form
-.Ql variable_name=value ,
-where the
-.Ql =value
-is ignored, and can be omitted,
-in requests to the server to read variables.
-The
-.Nm
-utility maintains an internal list in which data to be included in control
-messages can be assembled, and sent using the
-.Ic readlist
-and
-.Ic writelist
-commands described below.
-The
-.Ic addvars
-command allows variables and their optional values to be added to
-the list.
-If more than one variable is to be added, the list should
-be comma-separated and not contain white space.
-The
-.Ic rmvars
-command can be used to remove individual variables from the list,
-while the
-.Ic clearlist
-command removes all variables from the
-list.
-.It Ic authenticate Op yes | no
-Normally
-.Nm
-does not authenticate requests unless
-they are write requests.
-The command
-.Ql authenticate yes
-causes
-.Nm
-to send authentication with all requests it
-makes.
-Authenticated requests causes some servers to handle
-requests slightly differently, and can occasionally melt the CPU in
-fuzzballs if you turn authentication on before doing a
-.Ic peer
-display.
-The command
-.Ql authenticate
-causes
-.Nm
-to display whether or not
-.Nm
-is currently autheinticating requests.
-.It Ic cooked
-Causes output from query commands to be "cooked", so that
-variables which are recognized by
-.Nm
-will have their
-values reformatted for human consumption.
-Variables which
-.Nm
-thinks should have a decodable value but didn't are
-marked with a trailing
-.Ql \&? .
-.It Xo
-.Ic debug
-.Oo
-.Cm more |
-.Cm less |
-.Cm off
-.Oc
-.Xc
-With no argument, displays the current debug level.
-Otherwise, the debug level is changed to the indicated level.
-.It Ic delay Ar milliseconds
-Specify a time interval to be added to timestamps included in
-requests which require authentication.
-This is used to enable
-(unreliable) server reconfiguration over long delay network paths
-or between machines whose clocks are unsynchronized.
-Actually the
-server does not now require timestamps in authenticated requests,
-so this command may be obsolete.
-.It Ic host Ar hostname
-Set the host to which future queries will be sent.
-.Ar hostname
-may be either a host name or a numeric address.
-.It Ic hostnames Op Cm yes | Cm no
-If
-.Cm yes
-is specified, host names are printed in
-information displays.
-If
-.Cm no
-is specified, numeric
-addresses are printed instead.
-The default is
-.Cm yes ,
-unless
-modified using the command line
-.Fl n
-switch.
-.It Ic keyid Ar keyid
-This command allows the specification of a key number to be
-used to authenticate configuration requests.
-This must correspond
-to a key number the server has been configured to use for this
-purpose.
-.It Ic ntpversion Xo Oo
-.Cm 1 |
-.Cm 2 |
-.Cm 3 |
-.Cm 4
-.Oc
-.Xc
-Sets the NTP version number which
-.Nm
-claims in
-packets.
-Defaults to 3, and note that mode 6 control messages (and
-modes, for that matter) didn't exist in NTP version 1.
-There appear
-to be no servers left which demand version 1.
-With no argument, displays the current NTP version that will be used
-when communicating with servers.
-.It Ic quit
-Exit
-.Nm
-.It Ic passwd
-This command prompts you to type in a password (which will not
-be echoed) which will be used to authenticate configuration
-requests.
-The password must correspond to the key configured for
-use by the NTP server for this purpose if such requests are to be
-successful.
-.It Ic raw
-Causes all output from query commands is printed as received
-from the remote server.
-The only formating/interpretation done on
-the data is to transform nonascii data into a printable (but barely
-understandable) form.
-.It Ic timeout Ar milliseconds
-Specify a timeout period for responses to server queries.
-The
-default is about 5000 milliseconds.
-Note that since
-.Nm
-retries each query once after a timeout, the total waiting time for
-a timeout will be twice the timeout value set.
-.El
 .Sh "OPTIONS"
 .Bl -tag
 .It  \-4 ", " -\-ipv4
diff --git a/ntpq/ntpq.html b/ntpq/ntpq.html
index d360936c4..e64e1b2ce 100644
--- a/ntpq/ntpq.html
+++ b/ntpq/ntpq.html
@@ -20,7 +20,7 @@
 
 
 
        ntpq: Network Time Protocol Query User's Manual
        
-       
        
+  
        
 
        Short Contents
        
 
          
 ntpq: Network Time Protocol Query User Manual
@@ -31,7 +31,9 @@
 
 
          
 
          
-Up: (dir)
+Next: ,
+Previous: (dir),
+Up: (dir)
 
          
 
          
 
@@ -42,7 +44,7 @@ monitor the operational status
 and determine the performance of
 ntpd, the NTP daemon.
 
-  
          This document applies to version 4.2.7p337 of ntpq.
+  
          This document applies to version 4.2.7p339 of ntpq.
 
 
          
 
-
          
-
          
-Next: ,
-Previous: (dir),
-Up: (dir)
-
          
-
          
-
-
          ntpq: Network Time Protocol Query User Manual
          
-
-
          The ntpq utility program is used to monitor NTP daemon ntpd
-operations and determine performance.  It uses the standard NTP mode 6 control
-
-  
          This document applies to version {No value for `VERSION'} of ntpq.
-
-
          
-
 
          
 
          
 Next: ,
@@ -212,9 +193,9 @@ source of information about
 ntpq
 than this manual
 page. 
-
          Ic
          ... 
          Ic
          Ic
          The data carried by NTP mode 6 messages consists of a list of
+
          Ic
          ... 
          Ic
          Ic
          The data carried by NTP mode 6 messages consists of a list of
 items of the form
-variable_name=value,
+variable_name=value ,
 where the
 =value
 is ignored, and can be omitted,
@@ -240,7 +221,7 @@ list.
 does not authenticate requests unless
 they are write requests. 
 The command
-authenticateyes
+authenticate yes
 causes
 ntpq
 to send authentication with all requests it
@@ -265,7 +246,7 @@ Variables which
 ntpq
 thinks should have a decodable value but didn't are
 marked with a trailing
-\&?. 
+\&? . 
 
          Xo
          debug .Oo
 more | less | off .Oc
 With no argument, displays the current debug level. 
@@ -279,7 +260,7 @@ Actually the
 server does not now require timestamps in authenticated requests,
 so this command may be obsolete. 
 
          Ic
          Set the host to which future queries will be sent. 
-hostname may be either a host name or a numeric address. 
+hostname may be either a host name or a numeric address. 
 
          Ic
          If
 yes is specified, host names are printed in
 information displays. 
@@ -325,13 +306,14 @@ default is about 5000 milliseconds.
 Note that since
 ntpq
 retries each query once after a timeout, the total waiting time for
-a timeout will be twice the timeout value set.
+a timeout will be twice the timeout value set. 
+
        
 
-     
        This section was generated by AutoGen,
+  
        This section was generated by AutoGen,
 using the agtexi-cmd template and the option descriptions for the ntpq program. 
 This software is released under the NTP license, <http://ntp.org/license>.
 
-     
          
+
            
 
          • ntpq usage:                   ntpq help/usage (--help)
 
          • ntpq ipv4:                    ipv4 option (-4)
 
          • ntpq ipv6:                    ipv6 option (-6)
@@ -353,10 +335,10 @@ Up: Internal Commandsntpq help/usage (--help)
 
-     
            
+
            
 This is the automatically generated usage text for ntpq.
 
-       
            The text printed is the same whether selected with the help option
+  
            The text printed is the same whether selected with the help option
 (--help) or the more-help option (--more-help).  more-help will print
 the usage text by passing it through a pager program. 
 more-help is disabled on platforms without a working
@@ -364,49 +346,49 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
-     
                 ntpq - standard NTP query program - Ver. 4.2.7p337
-     USAGE:  ntpq [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]
-       Flg Arg Option-Name    Description
-        -4 no  ipv4           Force IPv4 DNS name resolution
-                                     - prohibits these options:
-                                     ipv6
-        -6 no  ipv6           Force IPv6 DNS name resolution
-                                     - prohibits these options:
-                                     ipv4
-        -c Str command        run a command and exit
-                                     - may appear multiple times
-        -d no  debug-level    Increase debug verbosity level
-                                     - may appear multiple times
-        -D Num set-debug-level Set the debug verbosity level
-                                     - may appear multiple times
-        -p no  peers          Print a list of the peers
-                                     - prohibits these options:
-                                     interactive
-        -i no  interactive    Force ntpq to operate in interactive mode
-                                     - prohibits these options:
-                                     command
-                                     peers
-        -n no  numeric        numeric host addresses
-           no  old-rv         Always output status line with readvar
-           opt version        Output version information and exit
-        -? no  help           Display extended usage information and exit
-        -! no  more-help      Extended usage information passed thru pager
-        -> opt save-opts      Save the option state to a config file
-        -< Str load-opts      Load options from a config file
-                                     - disabled as --no-load-opts
-                                     - may appear multiple times
-     
-     Options are specified by doubled hyphens and their name or by a single
-     hyphen and the flag character.
-     
-     The following option preset mechanisms are supported:
-      - reading file $HOME/.ntprc
-      - reading file ./.ntprc
-      - examining environment variables named NTPQ_*
-     
-     please send bug reports to:  http://bugs.ntp.org, bugs@ntp.org
+
            ntpq - standard NTP query program - Ver. 4.2.7p338
+USAGE:  ntpq [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]
+  Flg Arg Option-Name    Description
+   -4 no  ipv4           Force IPv4 DNS name resolution
+                                - prohibits these options:
+                                ipv6
+   -6 no  ipv6           Force IPv6 DNS name resolution
+                                - prohibits these options:
+                                ipv4
+   -c Str command        run a command and exit
+                                - may appear multiple times
+   -d no  debug-level    Increase debug verbosity level
+                                - may appear multiple times
+   -D Num set-debug-level Set the debug verbosity level
+                                - may appear multiple times
+   -p no  peers          Print a list of the peers
+                                - prohibits these options:
+                                interactive
+   -i no  interactive    Force ntpq to operate in interactive mode
+                                - prohibits these options:
+                                command
+                                peers
+   -n no  numeric        numeric host addresses
+      no  old-rv         Always output status line with readvar
+      opt version        Output version information and exit
+   -? no  help           Display extended usage information and exit
+   -! no  more-help      Extended usage information passed thru pager
+   -> opt save-opts      Save the option state to a config file
+   -< Str load-opts      Load options from a config file
+                                - disabled as --no-load-opts
+                                - may appear multiple times
+
+Options are specified by doubled hyphens and their name or by a single
+hyphen and the flag character.
+
+The following option preset mechanisms are supported:
+ - reading file $HOME/.ntprc
+ - reading file ./.ntprc
+ - examining environment variables named NTPQ_*
+
+please send bug reports to:  http://bugs.ntp.org, bugs@ntp.org
 
            
-       
            
+  
            
 
            
 Next: ,
 Previous: ntpq usage,
@@ -416,16 +398,16 @@ Up: Internal Commandsipv4 option (-4)
 
-     
            
+
            
 This is the “force ipv4 dns name resolution” option.
 
-     
            This option has some usage constraints.  It:
-          
              
+
              This option has some usage constraints.  It:
+     
                
 
              • must not appear in combination with any of the following options:
 ipv6. 
 
              
 
-       
              Force DNS resolution of following host names on the command line
+  
              Force DNS resolution of following host names on the command line
 to the IPv4 namespace. 
 
              
 
              
@@ -437,16 +419,16 @@ Up: Internal Commandsipv6 option (-6)
 
-     
              
+
              
 This is the “force ipv6 dns name resolution” option.
 
-     
              This option has some usage constraints.  It:
-          
                
+
                This option has some usage constraints.  It:
+     
                  
 
                • must not appear in combination with any of the following options:
 ipv4. 
 
                
 
-       
                Force DNS resolution of following host names on the command line
+  
                Force DNS resolution of following host names on the command line
 to the IPv6 namespace. 
 
                
 
                
@@ -458,16 +440,16 @@ Up: Internal Commandscommand option (-c)
 
-     
                
+
                
 This is the “run a command and exit” option. 
 This option takes an argument string cmd.
 
-     
                This option has some usage constraints.  It:
-          
                  
+
                  This option has some usage constraints.  It:
+     
                    
 
                  • may appear an unlimited number of times. 
 
                  
 
-       
                  The following argument is interpreted as an interactive format command
+  
                  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). 
 
                  
@@ -480,16 +462,16 @@ Up: Internal Commandspeers option (-p)
 
-     
                  
+
                  
 This is the “print a list of the peers” option.
 
-     
                  This option has some usage constraints.  It:
-          
                    
+
                    This option has some usage constraints.  It:
+     
                      
 
                    • must not appear in combination with any of the following options:
 interactive. 
 
                    
 
-       
                    Print a list of the peers known to the server as well as a summary
+  
                    Print a list of the peers known to the server as well as a summary
 of their state. This is equivalent to the 'peers' interactive command. 
 
                    
 
                    
@@ -501,16 +483,16 @@ Up: Internal Commandsinteractive option (-i)
 
-     
                    
+
                    
 This is the “force ntpq to operate in interactive mode” option.
 
-     
                    This option has some usage constraints.  It:
-          
                      
+
                      This option has some usage constraints.  It:
+     
                        
 
                      • must not appear in combination with any of the following options:
 command, peers. 
 
                      
 
-       
                      Force ntpq to operate in interactive mode.  Prompts will be written
+  
                      Force ntpq to operate in interactive mode.  Prompts will be written
 to the standard output and commands read from the standard input. 
 
                      
 
                      
@@ -522,7 +504,7 @@ Up: Internal Commandsnumeric option (-n)
 
-     
                      
+
                      
 This is the “numeric host addresses” option. 
 Output all host addresses in dotted-quad numeric format rather than
 converting to the canonical host names. 
@@ -536,7 +518,7 @@ Up: Internal Commandsold-rv option
 
-     
                      
+
                      
 This is the “always output status line with readvar” option. 
 By default, ntpq now suppresses the associd=... line that
 precedes the output of "readvar" (alias "rv") when a single
@@ -556,63 +538,63 @@ Up: Internal Commandspresetting/configuring ntpq
 
-     
                      Any option that is not marked as not presettable may be preset by
+
                      Any option that is not marked as not presettable may be preset by
 loading values from configuration ("rc" or "ini") files, and values from environment variables named NTPQ and NTPQ_<OPTION_NAME>.  <OPTION_NAME> must be one of
 the options listed above in upper case and segmented with underscores. 
 The NTPQ variable will be tokenized and parsed like
 the command line.  The remaining variables are tested for existence and their
 values are treated like option arguments.
 
-     
                      libopts will search in 2 places for configuration files:
-          
                      
 
-     
+
 
                      Usage
                      
 
-     
                      What Default Flag Option
+
                      What Default Flag Option
 
                      configuration file
 /etc/ntp.conf
 -c
@@ -690,16 +672,16 @@ Up: Top
 
                      
 
 
-     
+
 
                      Internal Commands
                      
 
-     
                      Interactive format commands consist of a keyword followed by zero to four arguments.  Only enough characters of the full keyword to uniquely identify the command need be typed.  The output of a command is normally sent to the standard output, but optionally the output of individual commands may be sent to a file by appending a >, followed by a file name, to the command line.  A number of interactive format commands are executed entirely within the ntpq program itself and do not result in NTP mode-6 requests being sent to a server.  These are described following.
+
                      Interactive format commands consist of a keyword followed by zero to four arguments.  Only enough characters of the full keyword to uniquely identify the command need be typed.  The output of a command is normally sent to the standard output, but optionally the output of individual commands may be sent to a file by appending a >, followed by a file name, to the command line.  A number of interactive format commands are executed entirely within the ntpq program itself and do not result in NTP mode-6 requests being sent to a server.  These are described following.
 
-          
                      
-
                       ? [command_keyword
                      help [command_keyword]
                      A ? by itself will print a list of all the command keywords known to ntpq.  A ? followed by a command keyword will print function and usage information about the command.
+     
                      
+
                       ? [command_keyword]
                      help [command_keyword]
                      A ? by itself will print a list of all the command keywords known to ntpq.  A ? followed by a command keyword will print function and usage information about the command.
 
-          
                       >addvars name [ = value] [...]
                      rmvars name [...]
                      clearvars</dt>
                      The arguments to these commands consist of a list of items of the form
-name = value, where the = value is ignored,
+     
                       >addvars name [ = value] [...]
                      rmvars name [...]
                      clearvars</dt>
                      The arguments to these commands consist of a list of items of the form
+name = value, where the = value is ignored,
 and can be omitted in read requests. 
 ntpq maintains an internal list in which data to be included
 in control messages can be assembled, and sent using the readlist
@@ -712,47 +694,50 @@ The rmvars command can be used to remove individual variables
 from the list,
 while the clearlist command removes all variables from the list.
 
-          
                       cooked
                      Display server messages in prettyprint format.
-          
                       debug more | less | off
                      Turns internal query program debugging on and off.
-          
                       delay milliseconds
                      Specify a time interval to be added to timestamps included in requests which require authentication.  This is used to enable (unreliable) server reconfiguration over long delay network paths or between machines whose clocks are unsynchronized.  Actually the server does not now require timestamps in authenticated requests, so this command may be obsolete.
+     
                       cooked
                      Display server messages in prettyprint format.
+
+     
                       debug more | less | off
                      Turns internal query program debugging on and off.
 
-          
                       host name
                      Set the host to which future queries will be sent. 
+     
                       delay milliseconds
                      Specify a time interval to be added to timestamps included in requests which require authentication.  This is used to enable (unreliable) server reconfiguration over long delay network paths or between machines whose clocks are unsynchronized.  Actually the server does not now require timestamps in authenticated requests, so this command may be obsolete.
+
+     
                       host name
                      Set the host to which future queries will be sent. 
 The name may be either a DNS name or a numeric address.
 
-          
                       hostnames [yes | no]
                      If yes is specified, host names are printed in information displays. 
-If no is specified, numeric addresses are printed instead. 
-The default is yes,
-unless modified using the command line -n switch.
+     
                       hostnames [yes | no]
                      If yes is specified, host names are printed in information displays. 
+If no is specified, numeric addresses are printed instead. 
+The default is yes,
+unless modified using the command line -n switch.
 
-          
                       keyid keyid
                      This command specifies the key number to be used
+     
                       keyid keyid
                      This command specifies the key number to be used
 to authenticate configuration requests. 
 This must correspond to a key ID configured in ntp.conf for this purpose.
 
-          
                       keytype
                      Specify the digest algorithm to use for authenticated requests,
-with default MD5. 
+     
                       keytype
                      Specify the digest algorithm to use for authenticated requests,
+with default MD5. 
 If the OpenSSL library is installed,
 digest can be be any message digest algorithm supported by the library. 
 The current selections are: MD2, MD4, MD5, MDC2, RIPEMD160, SHA and SHA1.
 
-          
                       ntpversion 1 | 2 | 3 | 4
                      Sets the NTP version number which ntpq claims in packets. 
+     
                       ntpversion 1 | 2 | 3 | 4
                      Sets the NTP version number which ntpq claims in packets. 
 Defaults to 2. 
 Note that mode-6 control messages (and modes, for that matter)
 didn't exist in NTP version 1.
 
-          
                       passwd
                      This command prompts for a password to authenticate requests. 
-The password must correspond to the key ID configured in ntp.conf for this purpose.
+     
                       passwd
                      This command prompts for a password to authenticate requests. 
+The password must correspond to the key ID configured in ntp.conf for this purpose.
 
-          
                       quit
                      Exit ntpq.
+     
                       quit
                      Exit ntpq.
 
-          
                       raw
                      Display server messages as received and without reformatting.
+     
                       raw
                      Display server messages as received and without reformatting.
 
-          
                       timeout millseconds
                      Specify a timeout period for responses to server queries. 
+     
                       timeout millseconds
                      Specify a timeout period for responses to server queries. 
 The default is about 5000 milliseconds. 
 Note that since ntpq retries each query once after a timeout
 the total waiting time for a timeout will be twice the timeout value set.
 
-       
                      
-       
                      
+  
                      
+
+
                      
 
                      
 Next: ,
 Previous: Internal Commands,
@@ -760,10 +745,10 @@ Up: Top
 
                      
 
                      
 
-     
+
 
                      Control Message Commands
                      
 
-     
                      Association IDs are used to identify system, peer and clock variables. 
+
                      Association IDs are used to identify system, peer and clock variables. 
 System variables are assigned an association ID of zero and system name space,
 while each association is assigned a nonzero association ID and peer namespace. 
 Most control commands send a single mode-6 message to the server
@@ -773,84 +758,72 @@ which sends a series of messages,
 and the mreadlist and mreadvar commands,
 which iterate over a range of associations.
 
-       
                      
-          
                      
+  
                      
+     
                      
 
                      associations
                      Display a list of mobilized associations in the form:
 
                      
 ind assid status conf reach auth condition last_event cnt
-
                      
-       

                      Variable Description
 
-     

                      ind
-index on this list
+     
                      Variable Description
 
-     

                      assid
-association ID
+     

                      ind
+index on this list
 
-     

                      status
-peer status word
+     

                      assid
+association ID
 
-     

                      conf
-yes: persistent, no: ephemeral
+     

                      status
+peer status word
 
-     

                      reach
-yes: reachable, no: unreachable
+     

                      conf
+yes: persistent, no: ephemeral
 
-

                      auth
-ok, yes, bad and none
-     

                      auth
-ok, yes, bad and none
+     

                      reach
+yes: reachable, no: unreachable
 
-     

                      condition
-selection status (see the select field of the peer status word)
+     

                      auth
+ok, yes, bad and none
 
-     

                      last_event
-event report (see the event field of the peer status word)
+     

                      condition
+selection status (see the select field of the peer status word)
 
-     

                      cnt
+     

                      last_event
+event report (see the event field of the peer status word)
+
+     

                      cnt
 event count (see the count field of the peer status word)
 
-       
                      
+     
                      
 
-       
                       clockvar assocID [name [ = value [...]] [...]] 
- cv assocID [name [ = value [...] ][...]] 
-Display a list of See clock variables for those associations supporting a reference clock.
+     
                       clockvar assocID [name [ = value [...]] [...]]
                      cv assocID [name [ = value [...] ][...]]
                      Display a list of clock variables for those associations supporting a reference clock.
 
-       
                       :config [...] 
-Send the remainder of the command line, including whitespace, to the server
+     
                       :config [...]
                      Send the remainder of the command line, including whitespace, to the server
 as a run-time configuration command in the same format
 as the configuration file. 
 This command is experimental until further notice and clarification. 
 Authentication is of course required.
 
-       
                       config-from-file filename
-Send the each line of filename to the server as
+     
                       config-from-file filename
                      Send the each line of filename to the server as
 run-time configuration commands in the same format as the configuration file. 
 This command is experimental until further notice and clarification. 
 Authentication is required.
 
-       
                       ifstats
-Display statistics for each local network address. 
+     
                       ifstats
                      Display statistics for each local network address. 
 Authentication is required.
 
-       
                       iostats
-Display network and reference clock I/O statistics.
+     
                       iostats
                      Display network and reference clock I/O statistics.
 
-       
                       kerninfo
-Display kernel loop and PPS statistics. 
+     
                       kerninfo
                      Display kernel loop and PPS statistics. 
 As with other ntpq output, times are in milliseconds. 
 The precision value displayed is in milliseconds as well,
 unlike the precision system variable.
 
-       
                       lassociations
-Perform the same function as the associations command,
+     
                       lassociations
                      Perform the same function as the associations command,
 except display mobilized and unmobilized associations.
 
-       
                       monstats
-Display monitor facility statistics.
+     
                       monstats
                      Display monitor facility statistics.
 
-       
                       mrulist [limited | kod | mincount=count | laddr=localaddr | sort=sortorder | resany=hexmask | resall=hexmask]
-Obtain and print traffic counts collected and maintained by
+     
                       mrulist [limited | kod | mincount=count | laddr=localaddr | sort=sortorder | resany=hexmask | resall=hexmask]
                      Obtain and print traffic counts collected and maintained by
 the monitor facility. 
 With the exception of sort=sortorder,
 the options filter the list returned by ntpd. 
@@ -870,7 +843,7 @@ The sortorder defaults to lstint and may be any of
 any of those preceded by a minus sign (hyphen) to reverse the sort order. 
 The output columns are:
 
-       
                      Column Description
+     
                      Column Description
 
      

                      lstint
 
@@ -914,25 +887,21 @@ Source port of last packet from this address.
 DNS name, numeric address, or address followed by claimed DNS name which
 could not be verified in parentheses.
 
-       
                      
+     
                      
 
-       
                       mreadvar assocID assocID [ variable_name [ = value[ ... ]
-  mrv assocID assocID [ variable_name [ = value[ ... ]
-Perform the same function as the readvar command,
+     
                       mreadvar assocID assocID [ variable_name [ = value[ ... ]
                       mrv assocID assocID [ variable_name [ = value[ ... ]
                      Perform the same function as the readvar command,
 except for a range of association IDs. 
 This range is determined from the association list cached by
 the most recent associations command.
 
-       
                       passociations
-Perform the same function as the associations command, except that
+     
                       passociations
                      Perform the same function as the associations command, except that
 it uses previously stored data rather than making a new query.
 
-       
                       peers
-Display a list of peers in the form:
+     
                       peers
                      Display a list of peers in the form:
 
                      
 [tally]remote refid st t when pool reach delay offset jitter
 
-       
                      Variable Description
+     
                      Variable Description
 
                      [tally]
 
 single-character code indicating current value of the select field
@@ -984,11 +953,9 @@ offset of server relative to this host
 
 jitter
 
-       
                      
+     
                      
 
-       
                       readvar assocID name [ = value ] [,...] 
- rv assocID [ name ] [,...] 
-Display the specified variables. 
+     
                       readvar assocID name [ = value ] [,...]
                      rv assocID [ name ] [,...]
                      Display the specified variables. 
 If assocID is zero,
 the variables are from the system variables name space,
 otherwise they are from the peer variables name space. 
@@ -1003,8 +970,7 @@ Some NTP timestamps are represented in the format YYYYMMDDTTTT,
 where YYYY is the year, MM the month of year, DD the day of month and
 TTTT the time of day.
 
-       
                       saveconfig filename
-Write the current configuration, including any runtime modifications
+     
                       saveconfig filename
                      Write the current configuration, including any runtime modifications
 given with :config or config-from-file,
 to the ntpd host's file filename. 
 This command will be rejected by the server unless
@@ -1016,20 +982,31 @@ to substitute the current date and time, for example,
 The filename used is stored in system variable savedconfig. 
 Authentication is required.
 
-       
                       writevar assocID name = value [,...] 
-Write the specified variables. 
+     
                       writevar assocID name = value [,...]
                      Write the specified variables. 
 If the assocID is zero, the variables are from the
 system variables name space, otherwise they are from the
 peer variables name	space. 
 The assocID is required,
 as the same name can occur in both spaces.
 
-       
                       System Variables, Control Message Commands, Top
-
+     
                       sysinfo
                      Display operational summary.
+
+     
                       sysstats
                      Print statistics counters maintained in the protocol module.
+
+  
+
+
                      
+
                      
+Next: ,
+Previous: Control Message Commands,
+Up: Top
+
                      
+
                      
 
+
 
                      Status Words and Kiss Codes
                      
 
-     
                      The current state of the operating program is shown
+
                      The current state of the operating program is shown
 in a set of status words maintained by the system
 and each association separately. 
 These words are displayed in the rv and as commands
@@ -1039,7 +1016,7 @@ The codes, tips and short explanations are on the
 The page also includes a list of system and peer messages,
 the code for the latest of which is included in the status word.
 
-       
                      Information resulting from protocol machine state transitions
+  
                      Information resulting from protocol machine state transitions
 is displayed using an informal set of ASCII strings called
 kiss codes. 
 The original purpose was for kiss-o'-death (KoD) packets sent
@@ -1055,148 +1032,148 @@ Up: Top
 
                      
 
 
-     
+
 
                      System Variables
                      
 
-     
                      The following system variables appear in the rv billboard. 
+
                      The following system variables appear in the rv billboard. 
 Not all variables are displayed in some configurations.
 
-       
                      Variable Description
+  
                      Variable Description
 
-     

                      status
+

                      status
 
 system status word
 
-     

                      version
+

                      version
 
 NTP software version and build time
 
-     

                      processor
+

                      processor
 
 hardware platform and version
 
-     

                      system
+

                      system
 
 operating system and version
 
-     

                      leap
+

                      leap
 
 leap warning indicator (0-3)
 
-     

                      stratum
+

                      stratum
 
 stratum (1-15)
 
-     

                      precision
+

                      precision
 
 precision (log(2) s)
 
-     

                      rootdelay
+

                      rootdelay
 
 total roundtrip delay to the primary reference clock
 
-     

                      rootdisp
+

                      rootdisp
 
 total dispersion to the primary reference clock
 
-     

                      peer
+

                      peer
 
 system peer association ID
 
-     

                      tc
+

                      tc
 time constant and poll exponent (log(2) s) (3-17)
 
-       

                      mintc
+  

                      mintc
 minimum time constant (log(2) s) (3-10)
 
-       

                      clock
+  

                      clock
 
 date and time of day
 
-     

                      refid
+

                      refid
 reference ID or kiss code
 
-       

                      reftime
+  

                      reftime
 
 reference time
 
-     

                      offset
+

                      offset
 
 combined offset of server relative to this host
 
-     

                      sys_jitter
+

                      sys_jitter
 
 combined system jitter
 
-     

                      frequency
+

                      frequency
 
 frequency offset (PPM) relative to hardware clock
 
-     

                      clk_wander
+

                      clk_wander
 
 clock frequency wander (PPM)
 
-     

                      clk_jitter
+

                      clk_jitter
 
 clock jitter
 
-     

                      tai
+

                      tai
 
 TAI-UTC offset (s)
 
-     

                      leapsec
+

                      leapsec
 
 NTP seconds when the next leap second is/was inserted
 
-     

                      expire
+

                      expire
 
 NTP seconds when the NIST leapseconds file expires
 
-       
                      
+  
                      
 
-       
                      The jitter and wander statistics are exponentially-weighted RMS averages. 
+  
                      The jitter and wander statistics are exponentially-weighted RMS averages. 
 The system jitter is defined in the NTPv4 specification;
 the clock jitter statistic is computed by the clock discipline module.
 
-       
                      When the NTPv4 daemon is compiled with the OpenSSL software library,
+  
                      When the NTPv4 daemon is compiled with the OpenSSL software library,
 additional system variables are displayed, including some or all of the
 following, depending on the particular Autokey dance:
 
-       
                      Variable Description
+  
                      Variable Description
 
-     

                      host
+

                      host
 
 Autokey host name for this host
 
-     

                      ident
+

                      ident
 
 Autokey group name for this host
 
-     

                      flags
+

                      flags
 
 host flags  (see Autokey specification)
 
-     

                      digest
+

                      digest
 
 OpenSSL message digest algorithm
 
-     

                      signature
+

                      signature
 
 OpenSSL digest/signature scheme
 
-     

                      update
+

                      update
 
 NTP seconds at last signature update
 
-     

                      cert
+

                      cert
 
 certificate subject, issuer and certificate flags
 
-     

                      until
+

                      until
 
 NTP seconds when the certificate expires
 
-       
                      
+  
                      
 
 
                      
 
                      
@@ -1206,162 +1183,162 @@ Up: Top
 
                      
 
                      
 
-     
+
 
                      Peer Variables
                      
 
-     
                      The following peer variables appear in the rv billboard
+
                      The following peer variables appear in the rv billboard
 for each association. 
 Not all variables are displayed in some configurations.
 
-       
                      Variable Description
+  
                      Variable Description
 
-     

                      associd
+

                      associd
 
 association ID
 
-     

                      status
+

                      status
 
 peer status word
 
-     

                      srcadr
+

                      srcadr
 
                      srcport
 
 source (remote) IP address and port
 
-     

                      dstadr
+

                      dstadr
 
                      dstport
 
 destination (local) IP address and port
 
-     

                      leap
+

                      leap
 
 leap indicator (0-3)
 
-     

                      stratum
+

                      stratum
 
 stratum (0-15)
 
-     

                      precision
+

                      precision
 
 precision (log(2) s)
 
-     

                      rootdelay
+

                      rootdelay
 
 total roundtrip delay to the primary reference clock
 
-     

                      rootdisp
+

                      rootdisp
 total root dispersion to the primary reference clock
 
-     

                      refid
+

                      refid
 
 reference ID or kiss code
 
-     

                      reftime
+

                      reftime
 
 reference time
 
-     

                      reach
+

                      reach
 
 reach register (octal)
 
-     

                      unreach
+

                      unreach
 
 unreach counter
 
-     

                      hmode
+

                      hmode
 
 host mode (1-6)
 
-     

                      pmode
+

                      pmode
 
 peer mode (1-5)
 
-     

                      hpoll
+

                      hpoll
 
 host poll exponent (log(2) s) (3-17)
 
                      ppoll
 
 peer poll exponent (log(2) s) (3-17)
 
-     

                      headway
+

                      headway
 
 headway (see Rate Management and the Kiss-o'-Death Packet)
 
-     

                      flash
+

                      flash
 
 flash status word
 
-     

                      offset
+

                      offset
 
 filter offset
 
-     

                      delay
+

                      delay
 
 filter delay
 
-     

                      dispersion
+

                      dispersion
 
 filter dispersion
 
-     

                      jitter
+

                      jitter
 
 filter jitter
 
-     

                      ident
+

                      ident
 
 Autokey group name for this association
 
-     

                      bias
+

                      bias
 
 unicast/broadcast bias
 
-     

                      xleave
+

                      xleave
 
 interleave delay (see NTP Interleaved Modes)
 
-       
                      
+  
                      
 
-       
                      The bias variable is calculated when the first broadcast packet is received
+  
                      The bias variable is calculated when the first broadcast packet is received
 after the calibration volley.  It represents the offset of the broadcast
 subgraph relative to the unicast subgraph.  The xleave variable appears
 only the interleaved symmetric and interleaved modes.  It represents
 the internal queuing, buffering and transmission delays for the preceding
 packet.
 
-       
                      When the NTPv4 daemon is compiled with the OpenSSL software library,
+  
                      When the NTPv4 daemon is compiled with the OpenSSL software library,
 additional peer variables are displayed, including the following:
 
-       
                      Variable Description
+  
                      Variable Description
 
-     

                      flags
+

                      flags
 
 peer flags (see Autokey specification)
 
-     

                      host
+

                      host
 
 Autokey server name
 
-     

                      flags
+

                      flags
 
 peer flags (see Autokey specification)
 
-     

                      signature
+

                      signature
 
 OpenSSL digest/signature scheme
 
-     

                      initsequence
+

                      initsequence
 
 initial key ID
 
-     

                      initkey
+

                      initkey
 
 initial key index
 
-     

                      timestamp
+

                      timestamp
 
 Autokey signature timestamp
 
-       
                      
+  
                      
 
 
                      
 
                      
@@ -1370,12 +1347,12 @@ Up: Top
 
                      
 
                      
 
-     
+
 
                      Clock Variables
                      
 
-     
                      The following clock variables appear in the cv billboard for each association with a reference clock.  Not all variables are displayed in some configurations.
+
                      The following clock variables appear in the cv billboard for each association with a reference clock.  Not all variables are displayed in some configurations.
 
-       
                      Variable Description
+  
                      Variable Description
 
                      associd
 association ID
 
                      status
@@ -1402,14 +1379,14 @@ Up: Top
 driver reference ID
 
                      flags
 driver flags
-       
                      
+  
                      
 
-       
                      ===
+  
                      ===
 
-       
                      <h4>Synopsis</h4>
+  
                      <h4>Synopsis</h4>
 ntpq [-inp] [-c command] [host] [...]
 
-       
                      <p>Command line options are described following.  Specifying a command line option other than -i or -n will cause the specified query (queries) to be sent to the indicated host(s) immediately.  Otherwise, ntpq will attempt to read interactive format commands from the standard input.</p>
+  
                      <p>Command line options are described following.  Specifying a command line option other than -i or -n will cause the specified query (queries) to be sent to the indicated host(s) immediately.  Otherwise, ntpq will attempt to read interactive format commands from the standard input.</p>
 <dl>
   <dt>-4</dt>
   <dd>Force DNS resolution of following host names on the command line to the IPv4 namespace.</dd>
diff --git a/ntpq/ntpq.man.in b/ntpq/ntpq.man.in
index dbc16e73f..598569b5b 100644
--- a/ntpq/ntpq.man.in
+++ b/ntpq/ntpq.man.in
@@ -1,8 +1,8 @@
-.TH ntpq @NTPQ_MS@ "25 Dec 2012" "4.2.7p338" "User Commands"
+.TH ntpq @NTPQ_MS@ "26 Dec 2012" "4.2.7p339" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  December 25, 2012 at 11:35:07 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  December 26, 2012 at 04:11:16 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -13,264 +13,6 @@ ntpq \- standard NTP query program
 .\" Mixture of short (flag) options and long options
 .RB [ \-\fIflag\fP " [\fIvalue\fP]]... [" \-\-\fIopt\-name\fP " [[=| ]\fIvalue\fP]]..." [ host ...]
 .SH DESCRIPTION
-The
-.B 
-utility program is used to query NTP servers which
-implement the standard NTP mode 6 control message formats defined
-in Appendix B of the NTPv3 specification RFC1305, requesting
-information about current state and/or changes in that state.
-The same formats are used in NTPv4, although some of the
-variables have changed and new ones added. The description on this
-page is for the NTPv4 variables.
-The program may be run either in interactive mode or controlled using
-command line arguments.
-Requests to read and write arbitrary
-variables can be assembled, with raw and pretty-printed output
-options being available.
-The
-.B 
-utility can also obtain and print a
-list of peers in a common format by sending multiple queries to the
-server.
-If one or more request options is included on the command line
-when
-.B 
-is executed, each of the requests will be sent
-to the NTP servers running on each of the hosts given as command
-line arguments, or on localhost by default.
-If no request options
-are given,
-.B 
-will attempt to read commands from the
-standard input and execute these on the NTP server running on the
-first host given on the command line, again defaulting to localhost
-when no other host is specified.
-The
-.B 
-utility will prompt for
-commands if the standard input is a terminal device.
-.B 
-uses NTP mode 6 packets to communicate with the
-NTP server, and hence can be used to query any compatible server on
-the network which permits it.
-Note that since NTP is a UDP protocol
-this communication will be somewhat unreliable, especially over
-large distances in terms of network topology.
-The
-.B 
-utility makes
-one attempt to retransmit requests, and will time requests out if
-the remote host is not heard from within a suitable timeout
-time.
-Specifying a
-command line option other than
-i
-or
-n
-will
-cause the specified query (queries) to be sent to the indicated
-host(s) immediately.
-Otherwise,
-.B 
-will attempt to read
-interactive format commands from the standard input.
-.SS "Internal Commands"
-Interactive format commands consist of a keyword followed by zero
-to four arguments.
-Only enough characters of the full keyword to
-uniquely identify the command need be typed.
-A
-number of interactive format commands are executed entirely within
-the
-.B 
-utility itself and do not result in NTP mode 6
-requests being sent to a server.
-These are described following.
-.TP
-.BR Ic ? Op Ar command_keyword
-.TP
-.BR Ic help Op Ar command_keyword
-A
-.Ql \&?
-by itself will print a list of all the command
-keywords known to this incarnation of
-.Nm .
-A
-.Ql \&?
-followed by a command keyword will print function and usage
-information about the command.
-This command is probably a better
-source of information about
-.Nm
-than this manual
-page.
-.TP
-.BR Ic addvars Ar variable_name Xo Op Ic =value
-.Ic ...
-.Xc
-.TP
-.BR Ic rmvars Ar variable_name Ic ...
-.TP
-.BR Ic clearvars
-The data carried by NTP mode 6 messages consists of a list of
-items of the form
-.Ql variable_name=value ,
-where the
-.Ql =value
-is ignored, and can be omitted,
-in requests to the server to read variables.
-The
-.Nm
-utility maintains an internal list in which data to be included in control
-messages can be assembled, and sent using the
-.Ic readlist
-and
-.Ic writelist
-commands described below.
-The
-.Ic addvars
-command allows variables and their optional values to be added to
-the list.
-If more than one variable is to be added, the list should
-be comma-separated and not contain white space.
-The
-.Ic rmvars
-command can be used to remove individual variables from the list,
-while the
-.Ic clearlist
-command removes all variables from the
-list.
-.TP
-.BR Ic authenticate Op yes | no
-Normally
-.Nm
-does not authenticate requests unless
-they are write requests.
-The command
-.Ql authenticate yes
-causes
-.Nm
-to send authentication with all requests it
-makes.
-Authenticated requests causes some servers to handle
-requests slightly differently, and can occasionally melt the CPU in
-fuzzballs if you turn authentication on before doing a
-.Ic peer
-display.
-The command
-.Ql authenticate
-causes
-.Nm
-to display whether or not
-.Nm
-is currently autheinticating requests.
-.TP
-.BR Ic cooked
-Causes output from query commands to be "cooked", so that
-variables which are recognized by
-.Nm
-will have their
-values reformatted for human consumption.
-Variables which
-.Nm
-thinks should have a decodable value but didn't are
-marked with a trailing
-.Ql \&? .
-.TP
-.BR Xo
-.Ic debug
-.Oo
-.Cm more |
-.Cm less |
-.Cm off
-.Oc
-.Xc
-With no argument, displays the current debug level.
-Otherwise, the debug level is changed to the indicated level.
-.TP
-.BR Ic delay Ar milliseconds
-Specify a time interval to be added to timestamps included in
-requests which require authentication.
-This is used to enable
-(unreliable) server reconfiguration over long delay network paths
-or between machines whose clocks are unsynchronized.
-Actually the
-server does not now require timestamps in authenticated requests,
-so this command may be obsolete.
-.TP
-.BR Ic host Ar hostname
-Set the host to which future queries will be sent.
-\fIhostname\fR
-may be either a host name or a numeric address.
-.TP
-.BR Ic hostnames Op Cm yes | Cm no
-If
-.Cm yes
-is specified, host names are printed in
-information displays.
-If
-.Cm no
-is specified, numeric
-addresses are printed instead.
-The default is
-.Cm yes ,
-unless
-modified using the command line
-n
-switch.
-.TP
-.BR Ic keyid Ar keyid
-This command allows the specification of a key number to be
-used to authenticate configuration requests.
-This must correspond
-to a key number the server has been configured to use for this
-purpose.
-.TP
-.BR Ic ntpversion Xo Oo
-.Cm 1 |
-.Cm 2 |
-.Cm 3 |
-.Cm 4
-.Oc
-.Xc
-Sets the NTP version number which
-.Nm
-claims in
-packets.
-Defaults to 3, and note that mode 6 control messages (and
-modes, for that matter) didn't exist in NTP version 1.
-There appear
-to be no servers left which demand version 1.
-With no argument, displays the current NTP version that will be used
-when communicating with servers.
-.TP
-.BR Ic quit
-Exit
-.Nm
-.TP
-.BR Ic passwd
-This command prompts you to type in a password (which will not
-be echoed) which will be used to authenticate configuration
-requests.
-The password must correspond to the key configured for
-use by the NTP server for this purpose if such requests are to be
-successful.
-.TP
-.BR Ic raw
-Causes all output from query commands is printed as received
-from the remote server.
-The only formating/interpretation done on
-the data is to transform nonascii data into a printable (but barely
-understandable) form.
-.TP
-.BR Ic timeout Ar milliseconds
-Specify a timeout period for responses to server queries.
-The
-default is about 5000 milliseconds.
-Note that since
-.Nm
-retries each query once after a timeout, the total waiting time for
-a timeout will be twice the timeout value set.
 .SH "OPTIONS"
 .TP
 .BR \-4 ", " -\-ipv4
diff --git a/ntpq/ntpq.mdoc.in b/ntpq/ntpq.mdoc.in
index 7b9a0b682..970f0b519 100644
--- a/ntpq/ntpq.mdoc.in
+++ b/ntpq/ntpq.mdoc.in
@@ -1,9 +1,9 @@
-.Dd December 25 2012
+.Dd December 26 2012
 .Dt NTPQ @NTPQ_MS@ User Commands
-.Os FreeBSD 6.4-STABLE
+.Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  December 25, 2012 at 11:35:13 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  December 26, 2012 at 04:11:21 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -18,249 +18,6 @@
 [ host ...]
 .Pp
 .Sh DESCRIPTION
-The
-.Nm
-utility program is used to query NTP servers which
-implement the standard NTP mode 6 control message formats defined
-in Appendix B of the NTPv3 specification RFC1305, requesting
-information about current state and/or changes in that state.
-The same formats are used in NTPv4, although some of the
-variables have changed and new ones added. The description on this
-page is for the NTPv4 variables.
-The program may be run either in interactive mode or controlled using
-command line arguments.
-Requests to read and write arbitrary
-variables can be assembled, with raw and pretty-printed output
-options being available.
-The
-.Nm
-utility can also obtain and print a
-list of peers in a common format by sending multiple queries to the
-server.
-If one or more request options is included on the command line
-when
-.Nm
-is executed, each of the requests will be sent
-to the NTP servers running on each of the hosts given as command
-line arguments, or on localhost by default.
-If no request options
-are given,
-.Nm
-will attempt to read commands from the
-standard input and execute these on the NTP server running on the
-first host given on the command line, again defaulting to localhost
-when no other host is specified.
-The
-.Nm
-utility will prompt for
-commands if the standard input is a terminal device.
-.Nm
-uses NTP mode 6 packets to communicate with the
-NTP server, and hence can be used to query any compatible server on
-the network which permits it.
-Note that since NTP is a UDP protocol
-this communication will be somewhat unreliable, especially over
-large distances in terms of network topology.
-The
-.Nm
-utility makes
-one attempt to retransmit requests, and will time requests out if
-the remote host is not heard from within a suitable timeout
-time.
-Specifying a
-command line option other than
-.Fl i
-or
-.Fl n
-will
-cause the specified query (queries) to be sent to the indicated
-host(s) immediately.
-Otherwise,
-.Nm
-will attempt to read
-interactive format commands from the standard input.
-.Ss "Internal Commands"
-Interactive format commands consist of a keyword followed by zero
-to four arguments.
-Only enough characters of the full keyword to
-uniquely identify the command need be typed.
-A
-number of interactive format commands are executed entirely within
-the
-.Nm
-utility itself and do not result in NTP mode 6
-requests being sent to a server.
-These are described following.
-.Bl -tag -width "? [command_keyword]" -compact -offset indent
-.It Ic ? Op  Ar command_keyword
-.It Ic help Op Ar command_keyword
-A
-.Ql \&?
-by itself will print a list of all the command
-keywords known to this incarnation of
-.Nm .
-A
-.Ql \&?
-followed by a command keyword will print function and usage
-information about the command.
-This command is probably a better
-source of information about
-.Nm
-than this manual
-page.
-.It Ic addvars Ar variable_name Xo Op Ic =value
-.Ic ...
-.Xc
-.It Ic rmvars Ar variable_name Ic ...
-.It Ic clearvars
-The data carried by NTP mode 6 messages consists of a list of
-items of the form
-.Ql variable_name=value ,
-where the
-.Ql =value
-is ignored, and can be omitted,
-in requests to the server to read variables.
-The
-.Nm
-utility maintains an internal list in which data to be included in control
-messages can be assembled, and sent using the
-.Ic readlist
-and
-.Ic writelist
-commands described below.
-The
-.Ic addvars
-command allows variables and their optional values to be added to
-the list.
-If more than one variable is to be added, the list should
-be comma-separated and not contain white space.
-The
-.Ic rmvars
-command can be used to remove individual variables from the list,
-while the
-.Ic clearlist
-command removes all variables from the
-list.
-.It Ic authenticate Op yes | no
-Normally
-.Nm
-does not authenticate requests unless
-they are write requests.
-The command
-.Ql authenticate yes
-causes
-.Nm
-to send authentication with all requests it
-makes.
-Authenticated requests causes some servers to handle
-requests slightly differently, and can occasionally melt the CPU in
-fuzzballs if you turn authentication on before doing a
-.Ic peer
-display.
-The command
-.Ql authenticate
-causes
-.Nm
-to display whether or not
-.Nm
-is currently autheinticating requests.
-.It Ic cooked
-Causes output from query commands to be "cooked", so that
-variables which are recognized by
-.Nm
-will have their
-values reformatted for human consumption.
-Variables which
-.Nm
-thinks should have a decodable value but didn't are
-marked with a trailing
-.Ql \&? .
-.It Xo
-.Ic debug
-.Oo
-.Cm more |
-.Cm less |
-.Cm off
-.Oc
-.Xc
-With no argument, displays the current debug level.
-Otherwise, the debug level is changed to the indicated level.
-.It Ic delay Ar milliseconds
-Specify a time interval to be added to timestamps included in
-requests which require authentication.
-This is used to enable
-(unreliable) server reconfiguration over long delay network paths
-or between machines whose clocks are unsynchronized.
-Actually the
-server does not now require timestamps in authenticated requests,
-so this command may be obsolete.
-.It Ic host Ar hostname
-Set the host to which future queries will be sent.
-.Ar hostname
-may be either a host name or a numeric address.
-.It Ic hostnames Op Cm yes | Cm no
-If
-.Cm yes
-is specified, host names are printed in
-information displays.
-If
-.Cm no
-is specified, numeric
-addresses are printed instead.
-The default is
-.Cm yes ,
-unless
-modified using the command line
-.Fl n
-switch.
-.It Ic keyid Ar keyid
-This command allows the specification of a key number to be
-used to authenticate configuration requests.
-This must correspond
-to a key number the server has been configured to use for this
-purpose.
-.It Ic ntpversion Xo Oo
-.Cm 1 |
-.Cm 2 |
-.Cm 3 |
-.Cm 4
-.Oc
-.Xc
-Sets the NTP version number which
-.Nm
-claims in
-packets.
-Defaults to 3, and note that mode 6 control messages (and
-modes, for that matter) didn't exist in NTP version 1.
-There appear
-to be no servers left which demand version 1.
-With no argument, displays the current NTP version that will be used
-when communicating with servers.
-.It Ic quit
-Exit
-.Nm
-.It Ic passwd
-This command prompts you to type in a password (which will not
-be echoed) which will be used to authenticate configuration
-requests.
-The password must correspond to the key configured for
-use by the NTP server for this purpose if such requests are to be
-successful.
-.It Ic raw
-Causes all output from query commands is printed as received
-from the remote server.
-The only formating/interpretation done on
-the data is to transform nonascii data into a printable (but barely
-understandable) form.
-.It Ic timeout Ar milliseconds
-Specify a timeout period for responses to server queries.
-The
-default is about 5000 milliseconds.
-Note that since
-.Nm
-retries each query once after a timeout, the total waiting time for
-a timeout will be twice the timeout value set.
-.El
 .Sh "OPTIONS"
 .Bl -tag
 .It  \-4 ", " -\-ipv4
diff --git a/ntpsnmpd/invoke-ntpsnmpd.texi b/ntpsnmpd/invoke-ntpsnmpd.texi
index 56dc99908..c427ee95f 100644
--- a/ntpsnmpd/invoke-ntpsnmpd.texi
+++ b/ntpsnmpd/invoke-ntpsnmpd.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (invoke-ntpsnmpd.texi)
 # 
-# It has been AutoGen-ed  December 25, 2012 at 11:35:26 AM by AutoGen 5.16.2
+# It has been AutoGen-ed  December 26, 2012 at 04:11:35 AM by AutoGen 5.16.2
 # From the definitions    ntpsnmpd-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -47,7 +47,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p338
+ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p339
 USAGE:  ntpsnmpd [ - [] | --[@{=| @}] ]...
   Flg Arg Option-Name    Description
    -n no  nofork         Do not fork
@@ -233,8 +233,7 @@ please fill me in...
 please fill me in...
 @item Li
 please fill me in...
-
-@end multitable
+@end table
 
 This document corresponds to version @VERSION@ of NTP.
 @node ntpsnmpd Authors
diff --git a/ntpsnmpd/ntpsnmpd-opts.c b/ntpsnmpd/ntpsnmpd-opts.c
index 9bca28b67..1a042f6ff 100644
--- a/ntpsnmpd/ntpsnmpd-opts.c
+++ b/ntpsnmpd/ntpsnmpd-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.c)
  *  
- *  It has been AutoGen-ed  December 25, 2012 at 11:35:16 AM by AutoGen 5.16.2
+ *  It has been AutoGen-ed  December 26, 2012 at 04:11:24 AM by AutoGen 5.16.2
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -64,7 +64,7 @@ extern FILE * option_usage_fp;
  *  ntpsnmpd option static const strings
  */
 static char const ntpsnmpd_opt_strs[1561] =
-/*     0 */ "ntpsnmpd 4.2.7p338\n"
+/*     0 */ "ntpsnmpd 4.2.7p339\n"
             "Copyright (C) 1970-2012 The University of Delaware, all rights reserved.\n"
             "This is free software. It is licensed for use, modification and\n"
             "redistribution under the terms of the NTP License, copies of which\n"
@@ -103,14 +103,14 @@ static char const ntpsnmpd_opt_strs[1561] =
 /*  1360 */ "no-load-opts\0"
 /*  1373 */ "no\0"
 /*  1376 */ "NTPSNMPD\0"
-/*  1385 */ "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p338\n"
+/*  1385 */ "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p339\n"
             "USAGE:  %s [ - [] | --[{=| }] ]...\n\0"
 /*  1490 */ "$HOME\0"
 /*  1496 */ ".\0"
 /*  1498 */ ".ntprc\0"
 /*  1505 */ "http://bugs.ntp.org, bugs@ntp.org\0"
 /*  1539 */ "\n\n\0"
-/*  1542 */ "ntpsnmpd 4.2.7p338";
+/*  1542 */ "ntpsnmpd 4.2.7p339";
 
 /*
  *  nofork option description:
diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h
index d21865c5d..6d65469b5 100644
--- a/ntpsnmpd/ntpsnmpd-opts.h
+++ b/ntpsnmpd/ntpsnmpd-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.h)
  *  
- *  It has been AutoGen-ed  December 25, 2012 at 11:35:16 AM by AutoGen 5.16.2
+ *  It has been AutoGen-ed  December 26, 2012 at 04:11:24 AM by AutoGen 5.16.2
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -75,8 +75,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    8
-#define NTPSNMPD_VERSION       "4.2.7p338"
-#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.7p338"
+#define NTPSNMPD_VERSION       "4.2.7p339"
+#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.7p339"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
index 131daef57..c6447c5aa 100644
--- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
+++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
@@ -1,8 +1,8 @@
-.TH ntpsnmpd 1ntpsnmpdman "25 Dec 2012" "4.2.7p338" "User Commands"
+.TH ntpsnmpd 1ntpsnmpdman "26 Dec 2012" "4.2.7p339" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  December 25, 2012 at 11:35:22 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  December 26, 2012 at 04:11:32 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -16,9 +16,6 @@ ntpsnmpd \- NTP SNMP MIB agent
 All arguments must be options.
 .PP
 .SH DESCRIPTION
-.B 
-is an SNMP MIB agent designed to interface with
-.Xr ntpd 1ntpdmdoc .
 .SH "OPTIONS"
 .TP
 .BR \-n ", " -\-nofork
@@ -74,22 +71,6 @@ The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
 If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
 .SH USAGE
-.B 
-currently uses a private MIB OID,
-.Ql enterprises.5597 ,
-which is the Meinberg top level OEM OID, and
-.Ql 99
-is the temporary working space for this project. 
-The final OID has to be registered with IANA
-and this is done by the RFC Editor
-when the NTPv4 MIB RFC is standardized. 
-.PP
-If you have
-.Xr snmpwalk 1
-installed you can run
-.Dl % snmpwalk -v2c -c public localhost enterprises.5597.99
-to see a list of all currently supported NTP MIB objects
-and their current values.
 .SH "ENVIRONMENT"
 See \fBOPTION PRESETS\fP for configuration environment variables.
 .SH "FILES"
@@ -110,47 +91,12 @@ A specified configuration file could not be loaded.
 libopts had an internal operational error.  Please report
 it to autogen-users@lists.sourceforge.net.  Thank you.
 .SH AUTHORS
-.An "Heiko Gerstung"
 .SH "COPYRIGHT"
 Copyright (C) 1970-2012 The University of Delaware all rights reserved.
 This program is released under the terms of the NTP license, .
 .SH "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .SH NOTES
-The following objects are currently supported:
-.PP
-.TP
-.BR Li ntpEntSoftwareName
-please fill me in...
-.TP
-.BR Li ntpEntSoftwareVersion
-please fill me in...
-.TP
-.BR Li ntpEntSoftwareVersionVal
-please fill me in...
-.TP
-.BR Li ntpEntSoftwareVendor
-please fill me in...
-.TP
-.BR Li ntpEntSystemType
-please fill me in...
-.TP
-.BR Li ntpEntTimeResolution
-please fill me in...
-.TP
-.BR Li ntpEntTimeResolutionVal
-please fill me in...
-.TP
-.BR Li ntpEntTimePrecision
-please fill me in...
-.TP
-.BR Li ntpEntTimePrecisionVal
-please fill me in...
-.TP
-.BR Li ntpEntTimeDistance
-please fill me in...
-.PP
-This document corresponds to version @VERSION@ of NTP.
 .PP
 This manual page was \fIAutoGen\fP-erated from the \fBntpsnmpd\fP
 option definitions.
diff --git a/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc b/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
index cad27ce38..f91ba9a8a 100644
--- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
+++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
@@ -1,9 +1,9 @@
-.Dd December 25 2012
+.Dd December 26 2012
 .Dt NTPSNMPD 1ntpsnmpdmdoc User Commands
-.Os FreeBSD 6.4-STABLE
+.Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  December 25, 2012 at 11:35:28 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  December 26, 2012 at 04:11:37 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -19,9 +19,6 @@
 All arguments must be options.
 .Pp
 .Sh DESCRIPTION
-.Nm
-is an SNMP MIB agent designed to interface with
-.Xr ntpd 1ntpdmdoc .
 .Sh "OPTIONS"
 .Bl -tag
 .It  \-n ", " -\-nofork
@@ -73,22 +70,6 @@ The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
 If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
 .Sh USAGE
-.Nm
-currently uses a private MIB OID,
-.Ql enterprises.5597 ,
-which is the Meinberg top level OEM OID, and
-.Ql 99
-is the temporary working space for this project. 
-The final OID has to be registered with IANA
-and this is done by the RFC Editor
-when the NTPv4 MIB RFC is standardized. 
-.Pp
-If you have
-.Xr snmpwalk 1
-installed you can run
-.Dl % snmpwalk -v2c -c public localhost enterprises.5597.99
-to see a list of all currently supported NTP MIB objects
-and their current values.
 .Sh "ENVIRONMENT"
 See \fBOPTION PRESETS\fP for configuration environment variables.
 .Sh "FILES"
@@ -107,39 +88,12 @@ libopts had an internal operational error.  Please report
 it to autogen-users@lists.sourceforge.net.  Thank you.
 .El
 .Sh AUTHORS
-.An "Heiko Gerstung"
 .Sh "COPYRIGHT"
 Copyright (C) 1970-2012 The University of Delaware all rights reserved.
 This program is released under the terms of the NTP license, .
 .Sh "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .Sh NOTES
-The following objects are currently supported:
-.Pp
-.Bl -tag -width ".Li ntpEntSoftwareVersionVal" -compact -offset indent
-.It Li ntpEntSoftwareName
-please fill me in...
-.It Li ntpEntSoftwareVersion
-please fill me in...
-.It Li ntpEntSoftwareVersionVal
-please fill me in...
-.It Li ntpEntSoftwareVendor
-please fill me in...
-.It Li ntpEntSystemType
-please fill me in...
-.It Li ntpEntTimeResolution
-please fill me in...
-.It Li ntpEntTimeResolutionVal
-please fill me in...
-.It Li ntpEntTimePrecision
-please fill me in...
-.It Li ntpEntTimePrecisionVal
-please fill me in...
-.It Li ntpEntTimeDistance
-please fill me in...
-.El
-.Pp
-This document corresponds to version @VERSION@ of NTP.
 .Pp
 This manual page was \fIAutoGen\fP-erated from the \fBntpsnmpd\fP
 option definitions.
diff --git a/ntpsnmpd/ntpsnmpd.html b/ntpsnmpd/ntpsnmpd.html
index 6b90951f3..1b346927a 100644
--- a/ntpsnmpd/ntpsnmpd.html
+++ b/ntpsnmpd/ntpsnmpd.html
@@ -3,7 +3,7 @@
 ntpsnmpd: Network Time Protocol SNMP Daemon User's Manual
 
 
-
+
 
 
 
@@ -14,9 +14,8 @@
   pre.smallformat  { font-family:inherit; font-size:smaller }
   pre.smallexample { font-size:smaller }
   pre.smalllisp    { font-size:smaller }
-  span.sc    { font-variant:small-caps }
-  span.roman { font-family:serif; font-weight:normal; } 
-  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+  span.sc { font-variant:small-caps }
+  span.roman { font-family: serif; font-weight: normal; } 
 -->
 
 
@@ -31,12 +30,11 @@
 
 
 
                      
-
 
                      
-Next: ,
+Next: ,
 Previous: (dir),
 Up: (dir)
-
+
                      
 
                      
 
 
                      ntpsnmpd: Network Time Protocol Query User Manual
                      
@@ -44,7 +42,7 @@ Up: (dir)
 
                      The ntpsnmpd utility program is used to monitor NTP daemon ntpd
 operations and determine performance.  It uses the standard NTP mode 6 control
 
-  
                      This document applies to version 4.2.7p337 of ntpsnmpd.
+  
                      This document applies to version 4.2.7p339 of ntpsnmpd.
 
 
                        
 
                      • ntpsnmpd Description:             Description
@@ -53,12 +51,11 @@ operations and determine performance.  It uses the standard NTP mode 6 control
 
                      
 
 
                      
-
 
                      
-Next: ,
+Next: ,
 Previous: Top,
 Up: Top
-
+
                      
 
                      
 
 
@@ -67,12 +64,10 @@ Up: Top
 
                      The ntpsnmpd utility program provides an SNMP MIB agent for ntpd.
 
 
                      
-
 
                      
-Next: ,
-Previous: ntpsnmpd Description,
+Previous: ntpsnmpd Description,
 Up: Top
-
+
                      
 
                      
 
 
diff --git a/ntpsnmpd/ntpsnmpd.man.in b/ntpsnmpd/ntpsnmpd.man.in
index 03f430e21..8735d6a0e 100644
--- a/ntpsnmpd/ntpsnmpd.man.in
+++ b/ntpsnmpd/ntpsnmpd.man.in
@@ -1,8 +1,8 @@
-.TH ntpsnmpd @NTPSNMPD_MS@ "25 Dec 2012" "4.2.7p338" "User Commands"
+.TH ntpsnmpd @NTPSNMPD_MS@ "26 Dec 2012" "4.2.7p339" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  December 25, 2012 at 11:35:22 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  December 26, 2012 at 04:11:32 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -16,9 +16,6 @@ ntpsnmpd \- NTP SNMP MIB agent
 All arguments must be options.
 .PP
 .SH DESCRIPTION
-.B 
-is an SNMP MIB agent designed to interface with
-.Xr ntpd @NTPD_MS@ .
 .SH "OPTIONS"
 .TP
 .BR \-n ", " -\-nofork
@@ -74,22 +71,6 @@ The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
 If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
 .SH USAGE
-.B 
-currently uses a private MIB OID,
-.Ql enterprises.5597 ,
-which is the Meinberg top level OEM OID, and
-.Ql 99
-is the temporary working space for this project. 
-The final OID has to be registered with IANA
-and this is done by the RFC Editor
-when the NTPv4 MIB RFC is standardized. 
-.PP
-If you have
-.Xr snmpwalk 1
-installed you can run
-.Dl % snmpwalk -v2c -c public localhost enterprises.5597.99
-to see a list of all currently supported NTP MIB objects
-and their current values.
 .SH "ENVIRONMENT"
 See \fBOPTION PRESETS\fP for configuration environment variables.
 .SH "FILES"
@@ -110,47 +91,12 @@ A specified configuration file could not be loaded.
 libopts had an internal operational error.  Please report
 it to autogen-users@lists.sourceforge.net.  Thank you.
 .SH AUTHORS
-.An "Heiko Gerstung"
 .SH "COPYRIGHT"
 Copyright (C) 1970-2012 The University of Delaware all rights reserved.
 This program is released under the terms of the NTP license, .
 .SH "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .SH NOTES
-The following objects are currently supported:
-.PP
-.TP
-.BR Li ntpEntSoftwareName
-please fill me in...
-.TP
-.BR Li ntpEntSoftwareVersion
-please fill me in...
-.TP
-.BR Li ntpEntSoftwareVersionVal
-please fill me in...
-.TP
-.BR Li ntpEntSoftwareVendor
-please fill me in...
-.TP
-.BR Li ntpEntSystemType
-please fill me in...
-.TP
-.BR Li ntpEntTimeResolution
-please fill me in...
-.TP
-.BR Li ntpEntTimeResolutionVal
-please fill me in...
-.TP
-.BR Li ntpEntTimePrecision
-please fill me in...
-.TP
-.BR Li ntpEntTimePrecisionVal
-please fill me in...
-.TP
-.BR Li ntpEntTimeDistance
-please fill me in...
-.PP
-This document corresponds to version @VERSION@ of NTP.
 .PP
 This manual page was \fIAutoGen\fP-erated from the \fBntpsnmpd\fP
 option definitions.
diff --git a/ntpsnmpd/ntpsnmpd.mdoc.in b/ntpsnmpd/ntpsnmpd.mdoc.in
index c6ad1dca2..564bc7dc7 100644
--- a/ntpsnmpd/ntpsnmpd.mdoc.in
+++ b/ntpsnmpd/ntpsnmpd.mdoc.in
@@ -1,9 +1,9 @@
-.Dd December 25 2012
+.Dd December 26 2012
 .Dt NTPSNMPD @NTPSNMPD_MS@ User Commands
-.Os FreeBSD 6.4-STABLE
+.Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  December 25, 2012 at 11:35:28 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  December 26, 2012 at 04:11:37 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -19,9 +19,6 @@
 All arguments must be options.
 .Pp
 .Sh DESCRIPTION
-.Nm
-is an SNMP MIB agent designed to interface with
-.Xr ntpd @NTPD_MS@ .
 .Sh "OPTIONS"
 .Bl -tag
 .It  \-n ", " -\-nofork
@@ -73,22 +70,6 @@ The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
 If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
 .Sh USAGE
-.Nm
-currently uses a private MIB OID,
-.Ql enterprises.5597 ,
-which is the Meinberg top level OEM OID, and
-.Ql 99
-is the temporary working space for this project. 
-The final OID has to be registered with IANA
-and this is done by the RFC Editor
-when the NTPv4 MIB RFC is standardized. 
-.Pp
-If you have
-.Xr snmpwalk 1
-installed you can run
-.Dl % snmpwalk -v2c -c public localhost enterprises.5597.99
-to see a list of all currently supported NTP MIB objects
-and their current values.
 .Sh "ENVIRONMENT"
 See \fBOPTION PRESETS\fP for configuration environment variables.
 .Sh "FILES"
@@ -107,39 +88,12 @@ libopts had an internal operational error.  Please report
 it to autogen-users@lists.sourceforge.net.  Thank you.
 .El
 .Sh AUTHORS
-.An "Heiko Gerstung"
 .Sh "COPYRIGHT"
 Copyright (C) 1970-2012 The University of Delaware all rights reserved.
 This program is released under the terms of the NTP license, .
 .Sh "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .Sh NOTES
-The following objects are currently supported:
-.Pp
-.Bl -tag -width ".Li ntpEntSoftwareVersionVal" -compact -offset indent
-.It Li ntpEntSoftwareName
-please fill me in...
-.It Li ntpEntSoftwareVersion
-please fill me in...
-.It Li ntpEntSoftwareVersionVal
-please fill me in...
-.It Li ntpEntSoftwareVendor
-please fill me in...
-.It Li ntpEntSystemType
-please fill me in...
-.It Li ntpEntTimeResolution
-please fill me in...
-.It Li ntpEntTimeResolutionVal
-please fill me in...
-.It Li ntpEntTimePrecision
-please fill me in...
-.It Li ntpEntTimePrecisionVal
-please fill me in...
-.It Li ntpEntTimeDistance
-please fill me in...
-.El
-.Pp
-This document corresponds to version @VERSION@ of NTP.
 .Pp
 This manual page was \fIAutoGen\fP-erated from the \fBntpsnmpd\fP
 option definitions.
diff --git a/packageinfo.sh b/packageinfo.sh
index d5e0b6db1..9ad0bcbfc 100644
--- a/packageinfo.sh
+++ b/packageinfo.sh
@@ -70,7 +70,7 @@ CLTAG=NTP_4_2_0
 # - Numeric values increment
 # - empty 'increments' to 1
 # - NEW 'increments' to empty
-point=338
+point=339
 
 ### betapoint is normally modified by script.
 # ntp-stable Beta number (betapoint)
diff --git a/scripts/invoke-ntp-wait.texi b/scripts/invoke-ntp-wait.texi
index f5a2588af..c6e6de3c7 100644
--- a/scripts/invoke-ntp-wait.texi
+++ b/scripts/invoke-ntp-wait.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (invoke-ntp-wait.texi)
 # 
-# It has been AutoGen-ed  December 25, 2012 at 11:30:28 AM by AutoGen 5.16.2
+# It has been AutoGen-ed  December 25, 2012 at 12:47:19 PM by AutoGen 5.16.2
 # From the definitions    ntp-wait-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -139,6 +139,7 @@ The operation failed or the command syntax was not valid.
 @end table
 @node ntp-wait Authors
 @subsection ntp-wait Authors
+1@*
 @node ntp-wait Notes
 @subsection ntp-wait Notes
 This document corresponds to version @VERSION@ of NTP.
diff --git a/scripts/ntp-wait.1ntp-waitman b/scripts/ntp-wait.1ntp-waitman
index 6af2f6aef..03c398856 100644
--- a/scripts/ntp-wait.1ntp-waitman
+++ b/scripts/ntp-wait.1ntp-waitman
@@ -1,8 +1,8 @@
-.TH ntp-wait 1ntp-waitman "25 Dec 2012" "ntp (4.2.7p338)" "User Commands"
+.TH ntp-wait 1ntp-waitman "25 Dec 2012" "ntp (4.2.7p339)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  December 25, 2012 at 11:30:24 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  December 25, 2012 at 12:47:15 PM by AutoGen 5.16.2
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/scripts/ntp-wait.1ntp-waitmdoc b/scripts/ntp-wait.1ntp-waitmdoc
index ce16f6f1b..43989fe54 100644
--- a/scripts/ntp-wait.1ntp-waitmdoc
+++ b/scripts/ntp-wait.1ntp-waitmdoc
@@ -3,7 +3,7 @@
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  December 25, 2012 at 11:30:30 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  December 25, 2012 at 12:47:21 PM by AutoGen 5.16.2
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/scripts/ntp-wait.html b/scripts/ntp-wait.html
index a75b2e03e..9c62c8be8 100644
--- a/scripts/ntp-wait.html
+++ b/scripts/ntp-wait.html
@@ -3,7 +3,7 @@
 Ntp-wait User's Manual
 
 
-
+
 
 
 
@@ -14,20 +14,18 @@
   pre.smallformat  { font-family:inherit; font-size:smaller }
   pre.smallexample { font-size:smaller }
   pre.smalllisp    { font-size:smaller }
-  span.sc    { font-variant:small-caps }
-  span.roman { font-family:serif; font-weight:normal; } 
-  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+  span.sc { font-variant:small-caps }
+  span.roman { font-family: serif; font-weight: normal; } 
 -->
 
 
 
                      Ntp-wait User's Manual
                      
 
                      
-
 
                      
-Next: ,
+Next: ,
 Previous: (dir),
 Up: (dir)
-
+
                      
 
                      
 
 
                      Simple Network Time Protocol User Manual
                      
@@ -43,7 +41,7 @@ until the system's time has stabilized and synchronized,
 and only then start any applicaitons (like database servers) that require
 accurate and stable time.
 
-  
                      This document applies to version 4.2.7p338 of ntp-wait.
+  
                      This document applies to version 4.2.7p339 of ntp-wait.
 
   
                      
 
                      Short Contents
                      
@@ -58,11 +56,9 @@ accurate and stable time.
 
 
 
                      
-
-
 
                      
-
-
+
+
                      
 
                      
 
 
@@ -73,11 +69,9 @@ This can be useful at boot time, to delay the boot sequence until after
 ntpd -g has set the time.
 
 
                      
-
-
 
                      
-
-
+
+
                      
 
                      
 
 
                      Invoking ntp-wait
                      
@@ -102,7 +96,7 @@ using the agtexi-cmd template and the option descriptions for the <
 This software is released under the NTP license, <http://ntp.org/license>.
 
 
 
 
                      
-
-
 
                      
-Next: ,
+Next: ,
 Up: ntp-wait Invocation
-
+
                      
 
                      
 
-
                      ntp-wait help/usage (--help)
                      
+
                      ntp-wait help/usage (--help)
                      
 
 
                      
 This is the automatically generated usage text for ntp-wait.
 
   
                      The text printed is the same whether selected with the help option
-(--help) or the more-help option (--more-help).  more-help will print
+(--help) or the more-help option (--more-help).  more-help will print
 the usage text by passing it through a pager program. 
 more-help is disabled on platforms without a working
 fork(2) function.  The PAGER environment variable is
-used to select the program, defaulting to more.  Both will exit
+used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
 
                      /deacon/backroom/snaps/ntp-dev/A.snap/scripts/ntp-wait version [unknown] calling Getopt::Std::getopts (version 1.05 [paranoid]),
@@ -149,47 +141,41 @@ Space is not required between options and their arguments.
    See ``perldoc Getopt::Std'' about $Getopt::Std::STANDARD_HELP_VERSION.]
 
                      
   
                      
-
-
 
                      
-Next: ,
+Next: ,
 Previous: ntp-wait,
 Up: ntp-wait Invocation
-
+
                      
 
                      
 
 
                      option (-n)
                      
 
 
                      
 This is the “number of times to check ntpd” option. 
-This option takes an argument number num-tries. 
+This option takes an argument number num-tries. 
 The maximum number of times we will check ntpd to see if it
 has been able to synchronize and stabilize the system clock. 
 
                      
-
-
 
                      
-Next: ,
+Next: ,
 Previous: ntp-wait,
 Up: ntp-wait Invocation
-
+
                      
 
                      
 
 
                      option (-s)
                      
 
 
                      
 This is the “how long to sleep between tries” option. 
-This option takes an argument number secs-between-tries. 
-We will sleep for secs-between-tries after each query of ntpd
+This option takes an argument number secs-between-tries. 
+We will sleep for secs-between-tries after each query of ntpd
 that returns "the time is not yet stable". 
 
                      
-
-
 
                      
-Next: ,
+Next: ,
 Previous: ntp-wait,
 Up: ntp-wait Invocation
-
+
                      
 
                      
 
 
                      option (-v)
                      
@@ -200,13 +186,11 @@ By default, ntp-wait is silent.  With this option, ntp-wait
 will provide status information.
 
 
                      
-
-
 
                      
-Next: ,
+Next: ,
 Previous: ntp-wait,
 Up: ntp-wait Invocation
-
+
                      
 
                      
 
 
                      presetting/configuring ntp-wait
                      
@@ -228,47 +212,42 @@ detail to provide.  The default is to print just the version.  The licensing inf
 first letter of the argument is examined:
 
      
                      
-
                      ‘version’
                      Only print the version.  This is the default. 
-
                      ‘copyright’
                      Name the copyright usage licensing terms. 
-
                      ‘verbose’
                      Print the full copyright usage licensing terms. 
+
                      version
                      Only print the version.  This is the default. 
+
                      copyright
                      Name the copyright usage licensing terms. 
+
                      verbose
                      Print the full copyright usage licensing terms. 
 
                      
 
 
                      
-
-
 
                      
-Next: ,
+Next: ,
 Previous: ntp-wait config,
 Up: ntp-wait Invocation
-
+
                      
 
                      
 
 
                      ntp-wait exit status
                      
 
 
                      One of the following exit values will be returned:
      
                      
-
                      ‘0 (EXIT_SUCCESS)’
                      Successful program execution. 
-
                      ‘1 (EXIT_FAILURE)’
                      The operation failed or the command syntax was not valid. 
+
                      0 (EXIT_SUCCESS)
                      Successful program execution. 
+
                      1 (EXIT_FAILURE)
                      The operation failed or the command syntax was not valid. 
 
                      
   
                      
-
-
 
                      
-Next: ,
+Next: ,
 Previous: ntp-wait exit status,
 Up: ntp-wait Invocation
-
+
                      
 
                      
 
 
                      ntp-wait Authors
                      
 
+
                      1
                      
 
                      
-
-
 
                      
-Previous: ntp-wait Authors,
+Previous: ntp-wait Authors,
 Up: ntp-wait Invocation
-
+
                      
 
                      
 
 
                      ntp-wait Notes
                      
diff --git a/scripts/ntp-wait.man.in b/scripts/ntp-wait.man.in
index dc28e0b36..1ba5ef80c 100644
--- a/scripts/ntp-wait.man.in
+++ b/scripts/ntp-wait.man.in
@@ -1,8 +1,8 @@
-.TH ntp-wait @NTP_WAIT_MS@ "25 Dec 2012" "ntp (4.2.7p338)" "User Commands"
+.TH ntp-wait @NTP_WAIT_MS@ "25 Dec 2012" "ntp (4.2.7p339)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  December 25, 2012 at 11:30:24 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  December 25, 2012 at 12:47:15 PM by AutoGen 5.16.2
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/scripts/ntp-wait.mdoc.in b/scripts/ntp-wait.mdoc.in
index 312a1a06b..68acc20ca 100644
--- a/scripts/ntp-wait.mdoc.in
+++ b/scripts/ntp-wait.mdoc.in
@@ -3,7 +3,7 @@
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  December 25, 2012 at 11:30:30 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  December 25, 2012 at 12:47:21 PM by AutoGen 5.16.2
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/sntp/invoke-sntp.texi b/sntp/invoke-sntp.texi
index 9f89c1b0b..d7d167c84 100644
--- a/sntp/invoke-sntp.texi
+++ b/sntp/invoke-sntp.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (invoke-sntp.texi)
 # 
-# It has been AutoGen-ed  December 25, 2012 at 11:36:08 AM by AutoGen 5.16.2
+# It has been AutoGen-ed  December 26, 2012 at 04:12:19 AM by AutoGen 5.16.2
 # From the definitions    sntp-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -95,7 +95,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p338
+sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p339
 USAGE:  sntp [ - [] | --[@{=| @}] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description
@@ -436,10 +436,10 @@ like the (deprecated)
 or
 @code{rdate(8)}
 commands.
-
-@end multitable
+@end table
 @node sntp Authors
 @subsection sntp Authors
+1@*1@*1@*
 @node sntp Notes
 @subsection sntp Notes
 This document corresponds to version @VERSION@ of
diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c
index e518cc723..f1beb7f59 100644
--- a/sntp/sntp-opts.c
+++ b/sntp/sntp-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (sntp-opts.c)
  *  
- *  It has been AutoGen-ed  December 25, 2012 at 11:26:58 AM by AutoGen 5.16.2
+ *  It has been AutoGen-ed  December 25, 2012 at 12:44:42 PM by AutoGen 5.16.2
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -73,7 +73,7 @@ extern FILE * option_usage_fp;
  *  sntp option static const strings
  */
 static char const sntp_opt_strs[2500] =
-/*     0 */ "sntp 4.2.7p338\n"
+/*     0 */ "sntp 4.2.7p339\n"
             "Copyright (C) 1970-2012 The University of Delaware, all rights reserved.\n"
             "This is free software. It is licensed for use, modification and\n"
             "redistribution under the terms of the NTP License, copies of which\n"
@@ -157,7 +157,7 @@ static char const sntp_opt_strs[2500] =
 /*  2244 */ "LOAD_OPTS\0"
 /*  2254 */ "no-load-opts\0"
 /*  2267 */ "SNTP\0"
-/*  2272 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p338\n"
+/*  2272 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p339\n"
             "USAGE:  %s [ - [] | --[{=| }] ]... \\\n"
             "\t\t[ hostname-or-IP ...]\n\0"
 /*  2433 */ "$HOME\0"
@@ -165,7 +165,7 @@ static char const sntp_opt_strs[2500] =
 /*  2441 */ ".ntprc\0"
 /*  2448 */ "http://bugs.ntp.org, bugs@ntp.org\0"
 /*  2482 */ "\n\n\0"
-/*  2485 */ "sntp 4.2.7p338";
+/*  2485 */ "sntp 4.2.7p339";
 
 /*
  *  ipv4 option description with
diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h
index 41aa1f943..7029ad2dd 100644
--- a/sntp/sntp-opts.h
+++ b/sntp/sntp-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (sntp-opts.h)
  *  
- *  It has been AutoGen-ed  December 25, 2012 at 11:26:57 AM by AutoGen 5.16.2
+ *  It has been AutoGen-ed  December 25, 2012 at 12:44:42 PM by AutoGen 5.16.2
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -90,8 +90,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    23
-#define SNTP_VERSION       "4.2.7p338"
-#define SNTP_FULL_VERSION  "sntp 4.2.7p338"
+#define SNTP_VERSION       "4.2.7p339"
+#define SNTP_FULL_VERSION  "sntp 4.2.7p339"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/sntp/sntp.1sntpman b/sntp/sntp.1sntpman
index bb9ac5278..2bfa406ca 100644
--- a/sntp/sntp.1sntpman
+++ b/sntp/sntp.1sntpman
@@ -1,8 +1,8 @@
-.TH sntp 1sntpman "25 Dec 2012" "4.2.7p338" "User Commands"
+.TH sntp 1sntpman "26 Dec 2012" "4.2.7p339" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  December 25, 2012 at 11:36:03 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  December 26, 2012 at 04:12:14 AM by AutoGen 5.16.2
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/sntp/sntp.1sntpmdoc b/sntp/sntp.1sntpmdoc
index feb1636e4..ccb5b6363 100644
--- a/sntp/sntp.1sntpmdoc
+++ b/sntp/sntp.1sntpmdoc
@@ -1,9 +1,9 @@
-.Dd December 25 2012
+.Dd December 26 2012
 .Dt SNTP 1sntpmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  December 25, 2012 at 11:36:10 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  December 26, 2012 at 04:12:21 AM by AutoGen 5.16.2
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/sntp/sntp.html b/sntp/sntp.html
index 78a13e3b1..60430bd60 100644
--- a/sntp/sntp.html
+++ b/sntp/sntp.html
@@ -36,12 +36,12 @@ display the time offset of the system clock relative to the server
 clock.  Run as root, it can correct the system clock to this offset as
 well.  It can be run as an interactive command or from a cron job.
 
-  
                      This document applies to version 4.2.7p338 of sntp.
+  
                      This document applies to version 4.2.7p339 of sntp.
 
   
                      The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
 
-       
                      
+  
                      
 
                      Short Contents
                      
 
                        
 Simple Network Time Protocol User Manual
@@ -170,7 +170,7 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
-
                        sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p338
+
                        sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p339
 USAGE:  sntp [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description
@@ -596,8 +596,8 @@ like the (deprecated)
 ntpdate(1ntpdatemdoc),
 or
 rdate(8)
-commands.
-
+commands. 
+
 
                        
 
                        
 Next: ,
@@ -608,6 +608,7 @@ Up: sntp Invocation
 
 
                        sntp Authors
                        
 
+
                        1
                        1
                        1
                        
 
                        
 
                        
 Previous: sntp Authors,
@@ -617,7 +618,7 @@ Up: sntp Invocation
 
 
                        sntp Notes
                        
 
-     
                        This document corresponds to version  of
+
                        This document corresponds to version  of
 sntp.
 
 
                        
@@ -626,21 +627,21 @@ Up: sntp Invocation
 
                        
 
                        
 
-     
+
 
                        Usage
                        
 
-     
                        The simplest use of this program is as an unprivileged command to
+
                        The simplest use of this program is as an unprivileged command to
 check the current time, offset, and error in the local clock. 
 For example:
 
-     
                                 sntp ntpserver.somewhere
-    
                        
-       
                        With suitable privilege, it can be run as a command or in a
+
                            sntp ntpserver.somewhere
+
                        
+  
                        With suitable privilege, it can be run as a command or in a
 crom job to reset the local clock from a reliable server, like
 the ntpdate and rdate commands. 
 For example:
 
-     
                                 sntp -a ntpserver.somewhere
-    
                        
-       
+
                            sntp -a ntpserver.somewhere
+
                        
+  
 
diff --git a/sntp/sntp.man.in b/sntp/sntp.man.in
index 3301dfecf..24dd2117b 100644
--- a/sntp/sntp.man.in
+++ b/sntp/sntp.man.in
@@ -1,8 +1,8 @@
-.TH sntp @SNTP_MS@ "25 Dec 2012" "4.2.7p338" "User Commands"
+.TH sntp @SNTP_MS@ "26 Dec 2012" "4.2.7p339" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  December 25, 2012 at 11:36:03 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  December 26, 2012 at 04:12:14 AM by AutoGen 5.16.2
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/sntp/sntp.mdoc.in b/sntp/sntp.mdoc.in
index 9a20317e8..15f52f9ee 100644
--- a/sntp/sntp.mdoc.in
+++ b/sntp/sntp.mdoc.in
@@ -1,9 +1,9 @@
-.Dd December 25 2012
+.Dd December 26 2012
 .Dt SNTP @SNTP_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  December 25, 2012 at 11:36:10 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  December 26, 2012 at 04:12:21 AM by AutoGen 5.16.2
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/util/invoke-ntp-keygen.texi b/util/invoke-ntp-keygen.texi
index f8341db3f..e26c4a305 100644
--- a/util/invoke-ntp-keygen.texi
+++ b/util/invoke-ntp-keygen.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (invoke-ntp-keygen.texi)
 # 
-# It has been AutoGen-ed  December 25, 2012 at 11:35:45 AM by AutoGen 5.16.2
+# It has been AutoGen-ed  December 26, 2012 at 04:11:56 AM by AutoGen 5.16.2
 # From the definitions    ntp-keygen-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -700,8 +700,7 @@ Generate a trusted certificate.
 By default, the program generates a non-trusted certificate.
 @item Fl
 Generate parameters and keys for the Mu-Varadharajan (MV) identification scheme.
-
-@end multitable
+@end table
 @node Random
 @section Random
 
@@ -792,7 +791,8 @@ where
 which is a printable ASCII string 16 characters or less in length.
 Each character is chosen from the 93 printable characters
 in the range 0x21 through 0x7f excluding space and the
-@quoteleft{}#@quoteright{}
+@quoteleft{}@quoteright{}#
+#
 character.
 
 Note that the keys used by the
@@ -874,7 +874,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p338
+ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p339
 USAGE:  ntp-keygen [ - [] | --[@{=| @}] ]...
   Flg Arg Option-Name    Description
    -b Num imbits         identity modulus bits
diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c
index 9369f9c46..2365b4082 100644
--- a/util/ntp-keygen-opts.c
+++ b/util/ntp-keygen-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.c)
  *  
- *  It has been AutoGen-ed  December 25, 2012 at 11:35:32 AM by AutoGen 5.16.2
+ *  It has been AutoGen-ed  December 26, 2012 at 04:11:42 AM by AutoGen 5.16.2
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -75,7 +75,7 @@ extern FILE * option_usage_fp;
  *  ntp-keygen option static const strings
  */
 static char const ntp_keygen_opt_strs[2358] =
-/*     0 */ "ntp-keygen (ntp) 4.2.7p338\n"
+/*     0 */ "ntp-keygen (ntp) 4.2.7p339\n"
             "Copyright (C) 1970-2012 The University of Delaware, all rights reserved.\n"
             "This is free software. It is licensed for use, modification and\n"
             "redistribution under the terms of the NTP License, copies of which\n"
@@ -166,14 +166,14 @@ static char const ntp_keygen_opt_strs[2358] =
 /*  2136 */ "no-load-opts\0"
 /*  2149 */ "no\0"
 /*  2152 */ "NTP_KEYGEN\0"
-/*  2163 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p338\n"
+/*  2163 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p339\n"
             "USAGE:  %s [ - [] | --[{=| }] ]...\n\0"
 /*  2279 */ "$HOME\0"
 /*  2285 */ ".\0"
 /*  2287 */ ".ntprc\0"
 /*  2294 */ "http://bugs.ntp.org, bugs@ntp.org\0"
 /*  2328 */ "\n\n\0"
-/*  2331 */ "ntp-keygen (ntp) 4.2.7p338";
+/*  2331 */ "ntp-keygen (ntp) 4.2.7p339";
 
 /*
  *  imbits option description:
diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h
index 424c93bc1..e769bed25 100644
--- a/util/ntp-keygen-opts.h
+++ b/util/ntp-keygen-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.h)
  *  
- *  It has been AutoGen-ed  December 25, 2012 at 11:35:32 AM by AutoGen 5.16.2
+ *  It has been AutoGen-ed  December 26, 2012 at 04:11:41 AM by AutoGen 5.16.2
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -93,8 +93,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    26
-#define NTP_KEYGEN_VERSION       "4.2.7p338"
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.7p338"
+#define NTP_KEYGEN_VERSION       "4.2.7p339"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.7p339"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/util/ntp-keygen.1ntp-keygenman b/util/ntp-keygen.1ntp-keygenman
index 14d21ad15..cfe517ac0 100644
--- a/util/ntp-keygen.1ntp-keygenman
+++ b/util/ntp-keygen.1ntp-keygenman
@@ -1,8 +1,8 @@
-.TH ntp-keygen 1ntp-keygenman "25 Dec 2012" "ntp (4.2.7p338)" "User Commands"
+.TH ntp-keygen 1ntp-keygenman "26 Dec 2012" "ntp (4.2.7p339)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  December 25, 2012 at 11:35:40 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  December 26, 2012 at 04:11:51 AM by AutoGen 5.16.2
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/util/ntp-keygen.1ntp-keygenmdoc b/util/ntp-keygen.1ntp-keygenmdoc
index 60274f837..7956bd0ff 100644
--- a/util/ntp-keygen.1ntp-keygenmdoc
+++ b/util/ntp-keygen.1ntp-keygenmdoc
@@ -1,9 +1,9 @@
-.Dd December 25 2012
+.Dd December 26 2012
 .Dt NTP_KEYGEN 1ntp-keygenmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  December 25, 2012 at 11:35:47 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  December 26, 2012 at 04:11:58 AM by AutoGen 5.16.2
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/util/ntp-keygen.html b/util/ntp-keygen.html
index bf5b34bd4..be739e062 100644
--- a/util/ntp-keygen.html
+++ b/util/ntp-keygen.html
@@ -3,7 +3,7 @@
 Ntp-keygen User's Manual
 
 
-
+
 
 
 
@@ -14,9 +14,8 @@
   pre.smallformat  { font-family:inherit; font-size:smaller }
   pre.smallexample { font-size:smaller }
   pre.smalllisp    { font-size:smaller }
-  span.sc    { font-variant:small-caps }
-  span.roman { font-family:serif; font-weight:normal; } 
-  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+  span.sc { font-variant:small-caps }
+  span.roman { font-family: serif; font-weight: normal; } 
 -->
 
 
@@ -32,10 +31,9 @@
 
 
 
                        
-
 
                        
-Up: (dir)
-
+Up: (dir)
+
                        
 
                        
 
 
                        Top
                        
@@ -49,12 +47,11 @@ Up: (dir)
 
                      
 
 
                      
-
 
                      
-Next: ,
+Next: ,
 Previous: (dir),
 Up: (dir)
-
+
                      
 
                      
 
 
                      NTP Key Generation Program User Manual
                      
@@ -73,15 +70,14 @@ All other files are in PEM-encoded
 printable ASCII format so they can be embedded as MIME attachments in
 mail to other sites.
 
-  
                      This document applies to version 4.2.7p338 of ntp-keygen.
+  
                      This document applies to version 4.2.7p339 of ntp-keygen.
 
 
                      
-
 
                      
-Next: ,
+Next: ,
 Previous: Top,
 Up: Top
-
+
                      
 
                      
 
 
@@ -154,12 +150,11 @@ generating host and filestamp,
 as described in the Cryptographic Data Files section below.
 
 
                      
-
 
                      
-Next: ,
+Next: ,
 Previous: Description,
 Up: Top
-
+
                      
 
                      
 
 
@@ -211,11 +206,9 @@ certificate should be re-generated.
 Autokey Public-Key Authentication page.
 
 
                      
-
-
 
                      
-
-
+
+
                      
 
                      
 
 
                      Invoking ntp-keygen
                      
@@ -304,10 +297,9 @@ as described in the
 Cryptographic Data Files
 section below. 
 
                      
-
 
                      
-
-
+
+
                      
 
                      
 
 
                      Running
                      
@@ -317,7 +309,7 @@ the
 Program
 To test and gain experience with Autokey concepts, log in as root and
 change to the keys directory, usually
-/usr/local/etc
+/usr/local/etc
 When run for the first time, or if all files with names beginning with
 ntpkey have been removed, use the
 ntp-keygen
@@ -435,10 +427,9 @@ program uses the same timestamp extension for all files generated
 at one time, so each generation is distinct and can be readily
 recognized in monitoring data. 
 
                      
-
 
                      
-
-
+
+
                      
 
                      
 
 
                      Running
                      
@@ -499,7 +490,7 @@ shared file systems, as NFS clients may not be able to write
 to the shared keys directory, even as root. 
 In this case, NFS clients can specify the files in another
 directory such as
-/etc
+/etc
 using the
 keysdir command. 
 There is no need for one client to read the keys and certificates
@@ -557,10 +548,9 @@ program uses the same timestamp extension for all files generated
 at one time, so each generation is distinct and can be readily
 recognized in monitoring data. 
 
                      
-
 
                      
-
-
+
+
                      
 
                      
 
 
                      Running
                      
@@ -621,7 +611,7 @@ shared file systems, as NFS clients may not be able to write
 to the shared keys directory, even as root. 
 In this case, NFS clients can specify the files in another
 directory such as
-/etc
+/etc
 using the
 keysdir command. 
 There is no need for one client to read the keys and certificates
@@ -715,10 +705,9 @@ is restarted, it loads any new files and restarts the protocol.
 Other dependent hosts will continue as usual until signatures are refreshed,
 at which time the protocol is restarted. 
 
                      
-
 
                      
-
-
+
+
                      
 
                      
 
 
                      Identity
                      
@@ -854,10 +843,9 @@ to the client key file.
 As the MV scheme is independent of keys and certificates,
 these files can be refreshed as needed. 
 
                      
-
 
                      
-
-
+
+
                      
 
                      
 
 
                      Command
                      
@@ -866,7 +854,7 @@ these files can be refreshed as needed.
 Line
 Options
      
                      
-
                      ‘Fl’
                      Select certificate message digest/signature encryption scheme. 
+
                      Fl
                      Select certificate message digest/signature encryption scheme. 
 The
 scheme can be one of the following:
 . 
@@ -889,23 +877,23 @@ or
 DSA-SHA1. Note that RSA schemes must be used with a RSA sign key and DSA
 schemes must be used with a DSA sign key. 
 The default without this option is
-RSA-MD5. 
                      ‘Fl’
                      Enable debugging. 
+RSA-MD5. 
                      Fl
                      Enable debugging. 
 This option displays the cryptographic data produced in eye-friendly billboards. 
-
                      ‘Fl’
                      Write the IFF client keys to the standard output. 
+
                      Fl
                      Write the IFF client keys to the standard output. 
 This is intended for automatic key distribution by mail. 
-
                      ‘Fl’
                      Generate parameters and keys for the GQ identification scheme,
+
                      Fl
                      Generate parameters and keys for the GQ identification scheme,
 obsoleting any that may exist. 
-
                      ‘Fl’
                      Generate keys for the GQ identification scheme
+
                      Fl
                      Generate keys for the GQ identification scheme
 using the existing GQ parameters. 
 If the GQ parameters do not yet exist, create them first. 
-
                      ‘Fl’
                      Generate new host keys, obsoleting any that may exist. 
-
                      ‘Fl’
                      Generate parameters for the IFF identification scheme,
+
                      Fl
                      Generate new host keys, obsoleting any that may exist. 
+
                      Fl
                      Generate parameters for the IFF identification scheme,
 obsoleting any that may exist. 
 
                      Fl
                      Set the suject name to
 name. This is used as the subject field in certificates
 and in the file name for host and sign keys. 
-
                      ‘Fl’
                      Generate MD5 keys, obsoleting any that may exist. 
-
                      ‘Fl’
                      Generate a private certificate. 
+
                      Fl
                      Generate MD5 keys, obsoleting any that may exist. 
+
                      Fl
                      Generate a private certificate. 
 By default, the program generates public certificates. 
 
                      Fl
                      Encrypt generated files containing private data with
 password and the DES-CBC algorithm. 
@@ -916,15 +904,14 @@ By default, the program uses the host key as the sign key.
 
                      Fl
                      Set the issuer name to
 name. This is used for the issuer field in certificates
 and in the file name for identity files. 
-
                      ‘Fl’
                      Generate a trusted certificate. 
+
                      Fl
                      Generate a trusted certificate. 
 By default, the program generates a non-trusted certificate. 
-
                      ‘Fl’
                      Generate parameters and keys for the Mu-Varadharajan (MV) identification scheme.
+
                      Fl
                      Generate parameters and keys for the Mu-Varadharajan (MV) identification scheme.
 
 
                      
-
 
                      
-
-
+
+
                      
 
                      
 
 
                      Random
                      
@@ -980,10 +967,9 @@ If the file is not available or cannot be written,
 the daemon exits with a message to the system log and the program
 exits with a suitable error message. 
 
                      
-
 
                      
-
-
+
+
                      
 
                      
 
 
                      Cryptographic
                      
@@ -1022,7 +1008,7 @@ where
 which is a printable ASCII string 16 characters or less in length. 
 Each character is chosen from the 93 printable characters
 in the range 0x21 through 0x7f excluding space and the
-‘#’
+#
 character.
 
        
                      Note that the keys used by the
@@ -1061,7 +1047,7 @@ using the agtexi-cmd template and the option descriptions for the <
 This software is released under the NTP license, <http://ntp.org/license>.
 
      
                      
 
 
                      
-
-
 
                      
-Next: ,
+Next: ,
 Up: Cryptographic
-
+
                      
 
                      
 
-
                      ntp-keygen help/usage (--help)
                      
+
                      ntp-keygen help/usage (--help)
                      
 
      
                      
 This is the automatically generated usage text for ntp-keygen.
 
        
                      The text printed is the same whether selected with the help option
-(--help) or the more-help option (--more-help).  more-help will print
+(--help) or the more-help option (--more-help).  more-help will print
 the usage text by passing it through a pager program. 
 more-help is disabled on platforms without a working
 fork(2) function.  The PAGER environment variable is
-used to select the program, defaulting to more.  Both will exit
+used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
-     
                           ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p337
+     
                           ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p338
      USAGE:  ntp-keygen [ -<flag> [<val>] | --<name>[{=| }<val>] ]...
        Flg Arg Option-Name    Description
         -b Num imbits         identity modulus bits
@@ -1161,20 +1145,18 @@ with a status code of 0.
      please send bug reports to:  http://bugs.ntp.org, bugs@ntp.org
 
                      
        
                      
-
-
 
                      
-Next: ,
+Next: ,
 Previous: ntp-keygen usage,
 Up: Cryptographic
-
+
                      
 
                      
 
 
                      imbits option (-b)
                      
 
      
                      
 This is the “identity modulus bits” option. 
-This option takes an argument number imbits.
+This option takes an argument number imbits.
 
      
                      This option has some usage constraints.  It:
           
                      
        
                      or by
      
                               <?program ntp-keygen>
-
                      
+    
        
                      Do not mix these styles within one configuration file.
 
        
                      Compound values and carefully constructed string values may also be
@@ -1647,10 +1597,10 @@ specified using XML syntax:
      
                               <option-name>
             <sub-opt>...&lt;...&gt;...</sub-opt>
          </option-name>
-
                      
+    
        
                      yielding an option-name.sub-opt string value of
      
                               "...<...>..."
-
                      
+    
        
                      AutoOpts does not track suboptions.  You simply note that it is a
 hierarchicly valued option.  AutoOpts does provide a means for searching
 the associated name/value pair list (see: optionFindValue).
@@ -1665,39 +1615,35 @@ detail to provide.  The default is to print just the version.  The licensing inf
 first letter of the argument is examined:
 
           
                      
-
                      ‘version’
                      Only print the version.  This is the default. 
-
                      ‘copyright’
                      Name the copyright usage licensing terms. 
-
                      ‘verbose’
                      Print the full copyright usage licensing terms. 
+
                      version
                      Only print the version.  This is the default. 
+
                      copyright
                      Name the copyright usage licensing terms. 
+
                      verbose
                      Print the full copyright usage licensing terms. 
 
                      
 
 
                      
-
-
 
                      
-Next: ,
+Next: ,
 Previous: ntp-keygen config,
 Up: Cryptographic
-
+
                      
 
                      
 
 
                      ntp-keygen exit status
                      
 
      
                      One of the following exit values will be returned:
           
                      
-
                      ‘0 (EXIT_SUCCESS)’
                      Successful program execution. 
-
                      ‘1 (EXIT_FAILURE)’
                      The operation failed or the command syntax was not valid. 
-
                      ‘66 (EX_NOINPUT)’
                      A specified configuration file could not be loaded. 
-
                      ‘70 (EX_SOFTWARE)’
                      libopts had an internal operational error.  Please report
+
                      0 (EXIT_SUCCESS)
                      Successful program execution. 
+
                      1 (EXIT_FAILURE)
                      The operation failed or the command syntax was not valid. 
+
                      66 (EX_NOINPUT)
                      A specified configuration file could not be loaded. 
+
                      70 (EX_SOFTWARE)
                      libopts had an internal operational error.  Please report
 it to autogen-users@lists.sourceforge.net.  Thank you. 
 
                      
        
                      
-
-
 
                      
-Next: ,
+Next: ,
 Previous: ntp-keygen exit status,
 Up: Cryptographic
-
+
                      
 
                      
 
 
                      ntp-keygen Usage
                      
@@ -1713,13 +1659,11 @@ If an encrypted file is read successfully and
 no write password is specified, the read password is used
 as the write password by default. 
 
                      
-
-
 
                      
-Next: ,
+Next: ,
 Previous: ntp-keygen Usage,
 Up: Cryptographic
-
+
                      
 
                      
 
 
                      ntp-keygen Notes
                      
@@ -1727,12 +1671,10 @@ Up: Cryptographic
      
                      This document corresponds to version  of NTP. 
 Portions of this document came from FreeBSD. 
 
                      
-
-
 
                      
-Previous: ntp-keygen Notes,
+Previous: ntp-keygen Notes,
 Up: Cryptographic
-
+
                      
 
                      
 
 
                      ntp-keygen Bugs
                      
@@ -1745,12 +1687,11 @@ with older architectures such as SPARC IPC.
        
                      Please report bugs to http://bugs.ntp.org .
 
 
                      
-
 
                      
-Next: ,
+Next: ,
 Previous: Running the Program,
 Up: Top
-
+
                      
 
                      
 
      
@@ -1778,11 +1719,10 @@ If the file is not available or cannot be written, the program exits
 with a message to the system log.
 
 
                      
-
 
                      
-Previous: Random Seed File,
+Previous: Random Seed File,
 Up: Top
-
+
                      
 
                      
 
      
@@ -1844,7 +1784,7 @@ it can be constructed and edited using an ordinary text editor.
          18 SHA1 b5520c9fadd7ad3fd8bfa061c8821b65d029bb37  # SHA1 key
          19 SHA1 8c74fb440ec80f453ec6aaa62b9baed0ab723b92  # SHA1 key
          20 SHA1 6bc05f734306a189326000970c19b3910f403795  # SHA1 key
-
+    
        
                      Figure 1. Typical Symmetric Key File
 
        
                      Figure 1 shows a typical symmetric keys file used by the reference
diff --git a/util/ntp-keygen.man.in b/util/ntp-keygen.man.in
index b4dd85000..a3b9b7e8b 100644
--- a/util/ntp-keygen.man.in
+++ b/util/ntp-keygen.man.in
@@ -1,8 +1,8 @@
-.TH ntp-keygen @NTP_KEYGEN_MS@ "25 Dec 2012" "ntp (4.2.7p338)" "User Commands"
+.TH ntp-keygen @NTP_KEYGEN_MS@ "26 Dec 2012" "ntp (4.2.7p339)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  December 25, 2012 at 11:35:40 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  December 26, 2012 at 04:11:51 AM by AutoGen 5.16.2
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/util/ntp-keygen.mdoc.in b/util/ntp-keygen.mdoc.in
index 47f2e9d46..d039bd38a 100644
--- a/util/ntp-keygen.mdoc.in
+++ b/util/ntp-keygen.mdoc.in
@@ -1,9 +1,9 @@
-.Dd December 25 2012
+.Dd December 26 2012
 .Dt NTP_KEYGEN @NTP_KEYGEN_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  December 25, 2012 at 11:35:47 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  December 26, 2012 at 04:11:58 AM by AutoGen 5.16.2
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME