From: Harlan Stenn Date: Mon, 7 Jan 2013 11:42:38 +0000 (+0000) Subject: NTP_4_2_7P347 X-Git-Tag: NTP_4_2_7P347^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d3a1f9a1ea373e86249c3839d4e754b997230df;p=thirdparty%2Fntp.git NTP_4_2_7P347 bk: 50eab4ae5_9tVgJA-34dSfkstApEOQ --- diff --git a/ChangeLog b/ChangeLog index 228c694cf..e5f4d4f92 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.2.7p347) 2013/01/07 Released by Harlan Stenn * [Bug 2325] Re-enable mlockall() check under Linux post-1223 fix. (4.2.7p346) 2013/01/06 Released by Harlan Stenn * [Bug 1223] reorganize inclusion of sys/resource.h. diff --git a/ntpd/invoke-ntp.conf.texi b/ntpd/invoke-ntp.conf.texi index 4da19f723..660da5536 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 January 6, 2013 at 06:44:00 AM by AutoGen 5.17.1pre14 +# It has been AutoGen-ed January 7, 2013 at 11:39:56 AM by AutoGen 5.17.1pre14 # From the definitions ntp.conf.def # and the template file agtexi-file.tpl @end ignore diff --git a/ntpd/invoke-ntp.keys.texi b/ntpd/invoke-ntp.keys.texi index ab93d27b0..63c9d964c 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 January 6, 2013 at 06:44:03 AM by AutoGen 5.17.1pre14 +# It has been AutoGen-ed January 7, 2013 at 11:39:58 AM by AutoGen 5.17.1pre14 # From the definitions ntp.keys.def # and the template file agtexi-file.tpl @end ignore diff --git a/ntpd/invoke-ntpd.texi b/ntpd/invoke-ntpd.texi index 581bab8b7..a22ba0c37 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 January 6, 2013 at 06:44:04 AM by AutoGen 5.17.1pre14 +# It has been AutoGen-ed January 7, 2013 at 11:40:00 AM by AutoGen 5.17.1pre14 # From the definitions ntpd-opts.def # and the template file agtexi-cmd.tpl @end ignore @@ -141,7 +141,7 @@ with a status code of 0. @exampleindent 0 @example -ntpd - NTP daemon program - Ver. 4.2.7p346 +ntpd - NTP daemon program - Ver. 4.2.7p347 USAGE: ntpd [ - [] | --[@{=| @}] ]... \ [ ... ] Flg Arg Option-Name Description diff --git a/ntpd/ntp.conf.5man b/ntpd/ntp.conf.5man index 2881a523b..ad4b70a57 100644 --- a/ntpd/ntp.conf.5man +++ b/ntpd/ntp.conf.5man @@ -1,8 +1,8 @@ -.TH ntp.conf 5man "06 Jan 2013" "4.2.7p346" "File Formats" +.TH ntp.conf 5man "07 Jan 2013" "4.2.7p347" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed January 6, 2013 at 06:43:46 AM by AutoGen 5.17.1pre14 +.\" It has been AutoGen-ed January 7, 2013 at 11:39:42 AM by AutoGen 5.17.1pre14 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .\" @@ -2954,7 +2954,7 @@ services when they become universally available. .PP Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org .SH NOTES -This document corresponds to version 4.2.7p346 of NTP. +This document corresponds to version 4.2.7p347 of NTP. This document was derived from FreeBSD. .PP This manual page was \fIAutoGen\fP-erated from the \fBntp.conf\fP diff --git a/ntpd/ntp.conf.5mdoc b/ntpd/ntp.conf.5mdoc index 76a449110..8e513b64a 100644 --- a/ntpd/ntp.conf.5mdoc +++ b/ntpd/ntp.conf.5mdoc @@ -1,9 +1,9 @@ -.Dd January 6 2013 +.Dd January 7 2013 .Dt NTP_CONF 5mdoc File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed January 6, 2013 at 06:44:07 AM by AutoGen 5.17.1pre14 +.\" It has been AutoGen-ed January 7, 2013 at 11:40:02 AM by AutoGen 5.17.1pre14 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -2785,7 +2785,7 @@ services when they become universally available. .Pp Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org .Sh NOTES -This document corresponds to version 4.2.7p346 of NTP. +This document corresponds to version 4.2.7p347 of NTP. This document was derived from FreeBSD. .Pp This manual page was \fIAutoGen\fP\-erated from the \fBntp.conf\fP diff --git a/ntpd/ntp.conf.html b/ntpd/ntp.conf.html index 4c451cde7..4c806e546 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.7p346 of ntp.conf. +

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

  • ntp.conf Description diff --git a/ntpd/ntp.conf.man.in b/ntpd/ntp.conf.man.in index 67444fc75..d25b75786 100644 --- a/ntpd/ntp.conf.man.in +++ b/ntpd/ntp.conf.man.in @@ -1,8 +1,8 @@ -.TH ntp.conf 5 "06 Jan 2013" "4.2.7p346" "File Formats" +.TH ntp.conf 5 "07 Jan 2013" "4.2.7p347" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed January 6, 2013 at 06:43:46 AM by AutoGen 5.17.1pre14 +.\" It has been AutoGen-ed January 7, 2013 at 11:39:42 AM by AutoGen 5.17.1pre14 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .\" @@ -2954,7 +2954,7 @@ services when they become universally available. .PP Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org .SH NOTES -This document corresponds to version 4.2.7p346 of NTP. +This document corresponds to version 4.2.7p347 of NTP. This document was derived from FreeBSD. .PP This manual page was \fIAutoGen\fP-erated from the \fBntp.conf\fP diff --git a/ntpd/ntp.conf.mdoc.in b/ntpd/ntp.conf.mdoc.in index 252379b50..f65c05c28 100644 --- a/ntpd/ntp.conf.mdoc.in +++ b/ntpd/ntp.conf.mdoc.in @@ -1,9 +1,9 @@ -.Dd January 6 2013 +.Dd January 7 2013 .Dt NTP_CONF 5 File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed January 6, 2013 at 06:44:07 AM by AutoGen 5.17.1pre14 +.\" It has been AutoGen-ed January 7, 2013 at 11:40:02 AM by AutoGen 5.17.1pre14 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -2785,7 +2785,7 @@ services when they become universally available. .Pp Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org .Sh NOTES -This document corresponds to version 4.2.7p346 of NTP. +This document corresponds to version 4.2.7p347 of NTP. This document was derived from FreeBSD. .Pp This manual page was \fIAutoGen\fP\-erated from the \fBntp.conf\fP diff --git a/ntpd/ntp.keys.5man b/ntpd/ntp.keys.5man index 87fad1ba0..8fc73bb0b 100644 --- a/ntpd/ntp.keys.5man +++ b/ntpd/ntp.keys.5man @@ -1,8 +1,8 @@ -.TH ntp.keys 5man "06 Jan 2013" "4.2.7p346" "File Formats" +.TH ntp.keys 5man "07 Jan 2013" "4.2.7p347" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed January 6, 2013 at 06:43:52 AM by AutoGen 5.17.1pre14 +.\" It has been AutoGen-ed January 7, 2013 at 11:39:48 AM by AutoGen 5.17.1pre14 .\" From the definitions ntp.keys.def .\" and the template file agman-file.tpl .\" @@ -133,7 +133,7 @@ This program is released under the terms of the NTP license, (dir)

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

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

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

    Short Contents

    diff --git a/ntpd/ntp.keys.man.in b/ntpd/ntp.keys.man.in index 8faa1b2e7..7c58be2e2 100644 --- a/ntpd/ntp.keys.man.in +++ b/ntpd/ntp.keys.man.in @@ -1,8 +1,8 @@ -.TH ntp.keys 5 "06 Jan 2013" "4.2.7p346" "File Formats" +.TH ntp.keys 5 "07 Jan 2013" "4.2.7p347" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed January 6, 2013 at 06:43:52 AM by AutoGen 5.17.1pre14 +.\" It has been AutoGen-ed January 7, 2013 at 11:39:48 AM by AutoGen 5.17.1pre14 .\" From the definitions ntp.keys.def .\" and the template file agman-file.tpl .\" @@ -133,7 +133,7 @@ This program is released under the terms of the NTP license, [] | --[{=| }] ]... \\\n" "\t\t[ ... ]\n\0" /* 2935 */ "http://bugs.ntp.org, bugs@ntp.org\0" /* 2969 */ "\n\n\0" -/* 2972 */ "ntpd 4.2.7p346"; +/* 2972 */ "ntpd 4.2.7p347"; /* * ipv4 option description with diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index adfe5e4dd..4cbf8c969 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 January 6, 2013 at 05:41:24 AM by AutoGen 5.17.1pre14 + * It has been AutoGen-ed January 7, 2013 at 11:38:11 AM by AutoGen 5.17.1pre14 * 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.7p346" -#define NTPD_FULL_VERSION "ntpd 4.2.7p346" +#define NTPD_VERSION "4.2.7p347" +#define NTPD_FULL_VERSION "ntpd 4.2.7p347" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman index a55d624c6..16ef9d192 100644 --- a/ntpd/ntpd.1ntpdman +++ b/ntpd/ntpd.1ntpdman @@ -1,8 +1,8 @@ -.TH ntpd 1ntpdman "06 Jan 2013" "4.2.7p346" "User Commands" +.TH ntpd 1ntpdman "07 Jan 2013" "4.2.7p347" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.man) .\" -.\" It has been AutoGen-ed January 6, 2013 at 06:43:55 AM by AutoGen 5.17.1pre14 +.\" It has been AutoGen-ed January 7, 2013 at 11:39:51 AM by AutoGen 5.17.1pre14 .\" From the definitions ntpd-opts.def .\" and the template file agman-cmd.tpl .\" @@ -928,7 +928,7 @@ mind. .PP Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org .SH NOTES -This document corresponds to version 4.2.7p346 of NTP. +This document corresponds to version 4.2.7p347 of NTP. Portions of this document came from FreeBSD. .PP This manual page was \fIAutoGen\fP-erated from the \fBntpd\fP diff --git a/ntpd/ntpd.1ntpdmdoc b/ntpd/ntpd.1ntpdmdoc index c3d6b415e..d9010a7f0 100644 --- a/ntpd/ntpd.1ntpdmdoc +++ b/ntpd/ntpd.1ntpdmdoc @@ -1,9 +1,9 @@ -.Dd January 6 2013 +.Dd January 7 2013 .Dt NTPD 1ntpdmdoc User Commands .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed January 6, 2013 at 06:44:12 AM by AutoGen 5.17.1pre14 +.\" It has been AutoGen-ed January 7, 2013 at 11:40:07 AM by AutoGen 5.17.1pre14 .\" From the definitions ntpd-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -895,7 +895,7 @@ mind. .Pp Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org .Sh NOTES -This document corresponds to version 4.2.7p346 of NTP. +This document corresponds to version 4.2.7p347 of NTP. Portions of this document came from FreeBSD. .Pp This manual page was \fIAutoGen\fP\-erated from the \fBntpd\fP diff --git a/ntpd/ntpd.html b/ntpd/ntpd.html index 3b0b9a507..01d0766f3 100644 --- a/ntpd/ntpd.html +++ b/ntpd/ntpd.html @@ -39,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.7p346 of ntpd. +

    This document applies to version 4.2.7p347 of ntpd.

    • ntpd Description: Description @@ -219,7 +219,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. -
      ntpd - NTP daemon program - Ver. 4.2.7p345
+
      ntpd - NTP daemon program - Ver. 4.2.7p346
 USAGE:  ntpd [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \
                 [ <server1> ... <serverN> ]
   Flg Arg Option-Name    Description
@@ -951,453 +951,6 @@ Up: ntpd Invocation
 
 
      ntpd Usage
      
 
-
      
-
      
-
-
      
-
      
-
-
      How NTP Operates
      
-
-
      The
-ntpd
-utility operates by exchanging messages with
-one or more configured servers over a range of designated poll intervals. 
-When
-started, whether for the first or subsequent times, the program
-requires several exchanges from the majority of these servers so
-the signal processing and mitigation algorithms can accumulate and
-groom the data and set the clock. 
-In order to protect the network
-from bursts, the initial poll interval for each server is delayed
-an interval randomized over a few seconds. 
-At the default initial poll
-interval of 64s, several minutes can elapse before the clock is
-set. 
-This initial delay to set the clock
-can be safely and dramatically reduced using the
-iburst
-keyword with the
-server
-configuration
-command, as described in
-ntp.conf(5).
-
-  
      Most operating systems and hardware of today incorporate a
-time-of-year (TOY) chip to maintain the time during periods when
-the power is off. 
-When the machine is booted, the chip is used to
-initialize the operating system time. 
-After the machine has
-synchronized to a NTP server, the operating system corrects the
-chip from time to time. 
-In the default case, if
-ntpd
-detects that the time on the host
-is more than 1000s from the server time,
-ntpd
-assumes something must be terribly wrong and the only
-reliable action is for the operator to intervene and set the clock
-by hand. 
-(Reasons for this include there is no TOY chip,
-or its battery is dead, or that the TOY chip is just of poor quality.) 
-This causes
-ntpd
-to exit with a panic message to
-the system log. 
-The
--g
-option overrides this check and the
-clock will be set to the server time regardless of the chip time
-(up to 68 years in the past or future \(em
-this is a limitation of the NTPv4 protocol). 
-However, and to protect against broken hardware, such as when the
-CMOS battery fails or the clock counter becomes defective, once the
-clock has been set an error greater than 1000s will cause
-ntpd
-to exit anyway.
-
-  
      Under ordinary conditions,
-ntpd
-adjusts the clock in
-small steps so that the timescale is effectively continuous and
-without discontinuities. 
-Under conditions of extreme network
-congestion, the roundtrip delay jitter can exceed three seconds and
-the synchronization distance, which is equal to one-half the
-roundtrip delay plus error budget terms, can become very large. 
-The
-ntpd
-algorithms discard sample offsets exceeding 128 ms,
-unless the interval during which no sample offset is less than 128
-ms exceeds 900s. 
-The first sample after that, no matter what the
-offset, steps the clock to the indicated time. 
-In practice this
-reduces the false alarm rate where the clock is stepped in error to
-a vanishingly low incidence.
-
-  
      As the result of this behavior, once the clock has been set it
-very rarely strays more than 128 ms even under extreme cases of
-network path congestion and jitter. 
-Sometimes, in particular when
-ntpd
-is first started without a valid drift file
-on a system with a large intrinsic drift
-the error might grow to exceed 128 ms,
-which would cause the clock to be set backwards
-if the local clock time is more than 128 s
-in the future relative to the server. 
-In some applications, this behavior may be unacceptable. 
-There are several solutions, however. 
-If the
--x
-option is included on the command line, the clock will
-never be stepped and only slew corrections will be used. 
-But this choice comes with a cost that
-should be carefully explored before deciding to use
-the
--x
-option. 
-The maximum slew rate possible is limited
-to 500 parts-per-million (PPM) as a consequence of the correctness
-principles on which the NTP protocol and algorithm design are
-based. 
-As a result, the local clock can take a long time to
-converge to an acceptable offset, about 2,000 s for each second the
-clock is outside the acceptable range. 
-During this interval the
-local clock will not be consistent with any other network clock and
-the system cannot be used for distributed applications that require
-correctly synchronized network time.
-
-  
      In spite of the above precautions, sometimes when large
-frequency errors are present the resulting time offsets stray
-outside the 128-ms range and an eventual step or slew time
-correction is required. 
-If following such a correction the
-frequency error is so large that the first sample is outside the
-acceptable range,
-ntpd
-enters the same state as when the
-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
-step/slew corrections and subsequent frequency corrections. 
-It
-helps in these cases to use the
-burst
-keyword when
-configuring the server, but
-ONLY
-when you have permission to do so from the owner of the target host.
-
-  
      Finally,
-in the past many startup scripts would run
-ntpdate(8)
-to get the system clock close to correct before starting
-ntpd(8),
-but this was never more than a mediocre hack and is no longer needed.
-
-  
      There is a way to start
-ntpd(8)
-that often addresses all of the problems mentioned above. 
-
      
-
      
-
-
      
-
      
-
-
      Starting NTP (Best Current Practice)
      
-
-
      First, use the
-iburst
-option on your
-server
-entries.
-
-  
      If you can also keep a good
-ntp.drift
-file then
-ntpd(8)
-will effectively "warm-start" and your system's clock will
-be stable in under 11 seconds' time.
-
-  
      As soon as possible in the startup sequence, start
-ntpd(8)
-with at least the
--g
-and perhaps the
--N
-options. 
-Then,
-start the rest of your "normal" processes. 
-This will give
-ntpd(8)
-as much time as possible to get the system's clock synchronized and stable.
-
-  
      Finally,
-if you have processes like
-dovecot
-or database servers
-that require
-monotonically-increasing time,
-run
-ntp-wait(8)
-as late as possible in the boot sequence
-(perhaps with the
--v
-flag)
-and after
-ntp-wait(8)
-exits successfully
-it is as safe as it will ever be to start any process that require
-stable time. 
-
      
-
      
-
-
      
-
      
-
-
      Frequency Discipline
      
-
-
      The
-ntpd
-behavior at startup depends on whether the
-frequency file, usually
-ntp.drift,
-exists. 
-This file
-contains the latest estimate of clock frequency error. 
-When the
-ntpd
-is started and the file does not exist, the
-ntpd
-enters a special mode designed to quickly adapt to
-the particular system clock oscillator time and frequency error. 
-This takes approximately 15 minutes, after which the time and
-frequency are set to nominal values and the
-ntpd
-enters
-normal mode, where the time and frequency are continuously tracked
-relative to the server. 
-After one hour the frequency file is
-created and the current frequency offset written to it. 
-When the
-ntpd
-is started and the file does exist, the
-ntpd
-frequency is initialized from the file and enters normal mode
-immediately. 
-After that the current frequency offset is written to
-the file at hourly intervals. 
-
      
-
      
-
-
      
-
      
-
-
      Operating Modes
      
-
-
      The
-ntpd
-utility can operate in any of several modes, including
-symmetric active/passive, client/server broadcast/multicast and
-manycast, as described in the
-"Association Management"
-page
-(available as part of the HTML documentation
-provided in
-/usr/share/doc/ntp). 
-It normally operates continuously while
-monitoring for small changes in frequency and trimming the clock
-for the ultimate precision. 
-However, it can operate in a one-time
-mode where the time is set from an external server and frequency is
-set from a previously recorded frequency file. 
-A
-broadcast/multicast or manycast client can discover remote servers,
-compute server-client propagation delay correction factors and
-configure itself automatically. 
-This makes it possible to deploy a
-fleet of workstations without specifying configuration details
-specific to the local environment.
-
-  
      By default,
-ntpd
-runs in continuous mode where each of
-possibly several external servers is polled at intervals determined
-by an intricate state machine. 
-The state machine measures the
-incidental roundtrip delay jitter and oscillator frequency wander
-and determines the best poll interval using a heuristic algorithm. 
-Ordinarily, and in most operating environments, the state machine
-will start with 64s intervals and eventually increase in steps to
-1024s. 
-A small amount of random variation is introduced in order to
-avoid bunching at the servers. 
-In addition, should a server become
-unreachable for some time, the poll interval is increased in steps
-to 1024s in order to reduce network overhead.
-
-  
      In some cases it may not be practical for
-ntpd
-to run
-continuously. 
-A common workaround has been to run the
-ntpdate(8)
-program from a
-cron(8)
-job at designated
-times. 
-However, this program does not have the crafted signal
-processing, error checking and mitigation algorithms of
-ntpd. 
-The
--q
-option is intended for this purpose. 
-Setting this option will cause
-ntpd
-to exit just after
-setting the clock for the first time. 
-The procedure for initially
-setting the clock is the same as in continuous mode; most
-applications will probably want to specify the
-iburst
-keyword with the
-server
-configuration command. 
-With this
-keyword a volley of messages are exchanged to groom the data and
-the clock is set in about 10 s. 
-If nothing is heard after a
-couple of minutes, the daemon times out and exits. 
-After a suitable
-period of mourning, the
-ntpdate(8)
-program may be
-retired.
-
-  
      When kernel support is available to discipline the clock
-frequency, which is the case for stock Solaris, Tru64, Linux and
-Fx,
-a useful feature is available to discipline the clock
-frequency. 
-First,
-ntpd
-is run in continuous mode with
-selected servers in order to measure and record the intrinsic clock
-frequency offset in the frequency file. 
-It may take some hours for
-the frequency and offset to settle down. 
-Then the
-ntpd
-is
-stopped and run in one-time mode as required. 
-At each startup, the
-frequency is read from the file and initializes the kernel
-frequency. 
-
      
-
      
-
-
      
-
      
-
-
      Poll Interval Control
      
-
-
      This version of NTP includes an intricate state machine to
-reduce the network load while maintaining a quality of
-synchronization consistent with the observed jitter and wander. 
-There are a number of ways to tailor the operation in order enhance
-accuracy by reducing the interval or to reduce network overhead by
-increasing it. 
-However, the user is advised to carefully consider
-the consequences of changing the poll adjustment range from the
-default minimum of 64 s to the default maximum of 1,024 s. 
-The
-default minimum can be changed with the
-tinker
-minpoll
-command to a value not less than 16 s. 
-This value is used for all
-configured associations, unless overridden by the
-minpoll
-option on the configuration command. 
-Note that most device drivers
-will not operate properly if the poll interval is less than 64 s
-and that the broadcast server and manycast client associations will
-also use the default, unless overridden.
-
-  
      In some cases involving dial up or toll services, it may be
-useful to increase the minimum interval to a few tens of minutes
-and maximum interval to a day or so. 
-Under normal operation
-conditions, once the clock discipline loop has stabilized the
-interval will be increased in steps from the minimum to the
-maximum. 
-However, this assumes the intrinsic clock frequency error
-is small enough for the discipline loop correct it. 
-The capture
-range of the loop is 500 PPM at an interval of 64s decreasing by a
-factor of two for each doubling of interval. 
-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
-will
-have to be specially tailored to reduce the residual error below
-this limit. 
-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
      
-
-
      In scenarios where a considerable amount of data are to be
-downloaded or uploaded over telephone modems, timekeeping quality
-can be seriously degraded. 
-This occurs because the differential
-delays on the two directions of transmission can be quite large. 
-In
-many cases the apparent time errors are so large as to exceed the
-step threshold and a step correction can occur during and after the
-data transfer is in progress.
-
-  
      The huff-n'-puff filter is designed to correct the apparent time
-offset in these cases. 
-It depends on knowledge of the propagation
-delay when no other traffic is present. 
-In common scenarios this
-occurs during other than work hours. 
-The filter maintains a shift
-register that remembers the minimum delay over the most recent
-interval measured usually in hours. 
-Under conditions of severe
-delay, the filter corrects the apparent offset using the sign of
-the offset and the difference between the apparent delay and
-minimum delay. 
-The name of the filter reflects the negative (huff)
-and positive (puff) correction, which depends on the sign of the
-offset.
-
-  
      The filter is activated by the
-tinker
-command and
-huffpuff
-keyword, as described in
-ntp.conf(5). 
 
      
 
      
 Next: ,
@@ -1408,11 +961,6 @@ Up: ntpd Invocation
 
 
      ntpd Files
      
 
-     
      
-
      /etc/ntp.conf
      the default name of the configuration file
-
      /etc/ntp.drift
      the default name of the drift file
-
      /etc/ntp.keys
      the default name of the key file
-
      
 
      
 
      
 Next: ,
@@ -1423,31 +971,6 @@ Up: ntpd Invocation
 
 
      ntpd See Also
      
 
-
      ntp.conf(5),
-ntpdate(8),
-ntpdc(8),
-ntpq(8)
-
-  
      In addition to the manual pages provided,
-comprehensive documentation is available on the world wide web
-at
-http://www.ntp.org/. 
-A snapshot of this documentation is available in HTML format in
-/usr/share/doc/ntp. 
-
      
- David L. Mills, Network Time Protocol (Version 1),  RFC1059. 
-
      
- David L. Mills, Network Time Protocol (Version 2),  RFC1119. 
-
      
- David L. Mills, Network Time Protocol (Version 3),  RFC1305. 
-
      
- David L. Mills,  J. Martin, Ed.,  J. Burbank,  W. Kasch, Network Time Protocol Version 4: Protocol and Algorithms Specification,  RFC5905. 
-
      
- David L. Mills,  B. Haberman, Ed., Network Time Protocol Version 4: Autokey Specification,  RFC5906. 
-
      
- H. Gerstung,  C. Elliott,  B. Haberman, Ed., Definitions of Managed Objects for Network Time Protocol Version 4: (NTPv4),  RFC5907. 
-
      
- R. Gayraud,  B. Lourdelet, Network Time Protocol (NTP) Server Option for DHCPv6,  RFC5908. 
 
      
 
      
 Next: ,
@@ -1458,16 +981,6 @@ Up: ntpd Invocation
 
 
      ntpd Bugs
      
 
-
      The
-ntpd
-utility has gotten rather fat. 
-While not huge, it has gotten
-larger than might be desirable for an elevated-priority
-ntpd
-running on a workstation, particularly since many of
-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,
@@ -1477,9 +990,6 @@ Up: ntpd Invocation
 
 
      ntpd Notes
      
 
-
      This document corresponds to version 4.2.7p345 of NTP. 
-Portions of this document came from FreeBSD.
-
 
      
 
      
 
diff --git a/ntpd/ntpd.man.in b/ntpd/ntpd.man.in
index 2949e5926..8cff1a0b8 100644
--- a/ntpd/ntpd.man.in
+++ b/ntpd/ntpd.man.in
@@ -1,8 +1,8 @@
-.TH ntpd @NTPD_MS@ "06 Jan 2013" "4.2.7p346" "User Commands"
+.TH ntpd @NTPD_MS@ "07 Jan 2013" "4.2.7p347" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  6, 2013 at 06:43:55 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January  7, 2013 at 11:39:51 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -928,7 +928,7 @@ mind.
 .PP
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .SH NOTES
-This document corresponds to version 4.2.7p346 of NTP.
+This document corresponds to version 4.2.7p347 of NTP.
 Portions of this document came from FreeBSD.
 .PP
 This manual page was \fIAutoGen\fP-erated from the \fBntpd\fP
diff --git a/ntpd/ntpd.mdoc.in b/ntpd/ntpd.mdoc.in
index 581696980..b08d6e809 100644
--- a/ntpd/ntpd.mdoc.in
+++ b/ntpd/ntpd.mdoc.in
@@ -1,9 +1,9 @@
-.Dd January 6 2013
+.Dd January 7 2013
 .Dt NTPD @NTPD_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  January  6, 2013 at 06:44:12 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January  7, 2013 at 11:40:07 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -895,7 +895,7 @@ mind.
 .Pp
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .Sh NOTES
-This document corresponds to version 4.2.7p346 of NTP.
+This document corresponds to version 4.2.7p347 of NTP.
 Portions of this document came from FreeBSD.
 .Pp
 This manual page was \fIAutoGen\fP\-erated from the \fBntpd\fP
diff --git a/ntpdc/invoke-ntpdc.texi b/ntpdc/invoke-ntpdc.texi
index b61d0d146..c99d5d8a6 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  January  6, 2013 at 06:44:36 AM by AutoGen 5.17.1pre14
+# It has been AutoGen-ed  January  7, 2013 at 11:40:28 AM by AutoGen 5.17.1pre14
 # 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.7p346
+ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p347
 USAGE:  ntpdc [ - [] | --[@{=| @}] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c
index 295d06470..d9a7675da 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  January  6, 2013 at 06:44:23 AM by AutoGen 5.17.1pre14
+ *  It has been AutoGen-ed  January  7, 2013 at 11:40:16 AM by AutoGen 5.17.1pre14
  *  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.7p346\n"
+/*     0 */ "ntpdc 4.2.7p347\n"
             "Copyright (C) 1970-2013 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.7p346\n"
+/*  1662 */ "ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p347\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.7p346";
+/*  1846 */ "ntpdc 4.2.7p347";
 
 /*
  *  ipv4 option description with
diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h
index fd905360d..6212949f6 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  January  6, 2013 at 06:44:23 AM by AutoGen 5.17.1pre14
+ *  It has been AutoGen-ed  January  7, 2013 at 11:40:16 AM by AutoGen 5.17.1pre14
  *  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.7p346"
-#define NTPDC_FULL_VERSION  "ntpdc 4.2.7p346"
+#define NTPDC_VERSION       "4.2.7p347"
+#define NTPDC_FULL_VERSION  "ntpdc 4.2.7p347"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpdc/ntpdc.1ntpdcman b/ntpdc/ntpdc.1ntpdcman
index 9d8d24af5..d27cadebe 100644
--- a/ntpdc/ntpdc.1ntpdcman
+++ b/ntpdc/ntpdc.1ntpdcman
@@ -1,8 +1,8 @@
-.TH ntpdc 1ntpdcman "06 Jan 2013" "4.2.7p346" "User Commands"
+.TH ntpdc 1ntpdcman "07 Jan 2013" "4.2.7p347" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  6, 2013 at 06:44:32 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January  7, 2013 at 11:40:23 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/ntpdc/ntpdc.1ntpdcmdoc b/ntpdc/ntpdc.1ntpdcmdoc
index a77c760f8..0e992dbee 100644
--- a/ntpdc/ntpdc.1ntpdcmdoc
+++ b/ntpdc/ntpdc.1ntpdcmdoc
@@ -1,9 +1,9 @@
-.Dd January 6 2013
+.Dd January 7 2013
 .Dt NTPDC 1ntpdcmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  January  6, 2013 at 06:44:38 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January  7, 2013 at 11:40:30 AM by AutoGen 5.17.1pre14
 .\"  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 f31825c49..3bd55be59 100644
--- a/ntpdc/ntpdc.html
+++ b/ntpdc/ntpdc.html
@@ -36,7 +36,7 @@ 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.7p346 of ntpdc.
+  
      This document applies to version 4.2.7p347 of ntpdc.
 
   
      The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
@@ -145,7 +145,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.
 
-
      ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p346
+
      ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p347
 USAGE:  ntpdc [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
diff --git a/ntpdc/ntpdc.man.in b/ntpdc/ntpdc.man.in
index 1fc38b445..eab1e52a5 100644
--- a/ntpdc/ntpdc.man.in
+++ b/ntpdc/ntpdc.man.in
@@ -1,8 +1,8 @@
-.TH ntpdc @NTPDC_MS@ "06 Jan 2013" "4.2.7p346" "User Commands"
+.TH ntpdc @NTPDC_MS@ "07 Jan 2013" "4.2.7p347" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  6, 2013 at 06:44:32 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January  7, 2013 at 11:40:23 AM by AutoGen 5.17.1pre14
 .\"  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 4a4260230..2b4149dd8 100644
--- a/ntpdc/ntpdc.mdoc.in
+++ b/ntpdc/ntpdc.mdoc.in
@@ -1,9 +1,9 @@
-.Dd January 6 2013
+.Dd January 7 2013
 .Dt NTPDC @NTPDC_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  January  6, 2013 at 06:44:38 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January  7, 2013 at 11:40:30 AM by AutoGen 5.17.1pre14
 .\"  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 818fd85d6..fc95e9f73 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  January  6, 2013 at 06:45:08 AM by AutoGen 5.17.1pre14
+# It has been AutoGen-ed  January  7, 2013 at 11:40:58 AM by AutoGen 5.17.1pre14
 # From the definitions    ntpq-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -290,7 +290,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntpq - standard NTP query program - Ver. 4.2.7p346
+ntpq - standard NTP query program - Ver. 4.2.7p347
 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 a765f640e..a9657f5b8 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  January  6, 2013 at 06:44:41 AM by AutoGen 5.17.1pre14
+ *  It has been AutoGen-ed  January  7, 2013 at 11:40:32 AM by AutoGen 5.17.1pre14
  *  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.7p346\n"
+/*     0 */ "ntpq 4.2.7p347\n"
             "Copyright (C) 1970-2013 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.7p346\n"
+/*  1648 */ "ntpq - standard NTP query program - Ver. 4.2.7p347\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.7p346";
+/*  1818 */ "ntpq 4.2.7p347";
 
 /*
  *  ipv4 option description with
diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h
index 28c414fdf..9db7b123c 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  January  6, 2013 at 06:44:40 AM by AutoGen 5.17.1pre14
+ *  It has been AutoGen-ed  January  7, 2013 at 11:40:32 AM by AutoGen 5.17.1pre14
  *  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.7p346"
-#define NTPQ_FULL_VERSION  "ntpq 4.2.7p346"
+#define NTPQ_VERSION       "4.2.7p347"
+#define NTPQ_FULL_VERSION  "ntpq 4.2.7p347"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpq/ntpq.1ntpqman b/ntpq/ntpq.1ntpqman
index 76b3293b4..e71de9a07 100644
--- a/ntpq/ntpq.1ntpqman
+++ b/ntpq/ntpq.1ntpqman
@@ -1,8 +1,8 @@
-.TH ntpq 1ntpqman "06 Jan 2013" "4.2.7p346" "User Commands"
+.TH ntpq 1ntpqman "07 Jan 2013" "4.2.7p347" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  6, 2013 at 06:45:04 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January  7, 2013 at 11:40:55 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/ntpq/ntpq.1ntpqmdoc b/ntpq/ntpq.1ntpqmdoc
index c8bf30101..0be6ee717 100644
--- a/ntpq/ntpq.1ntpqmdoc
+++ b/ntpq/ntpq.1ntpqmdoc
@@ -1,9 +1,9 @@
-.Dd January 6 2013
+.Dd January 7 2013
 .Dt NTPQ 1ntpqmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  January  6, 2013 at 06:45:10 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January  7, 2013 at 11:41:00 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpq/ntpq.html b/ntpq/ntpq.html
index b585b1339..ad374b665 100644
--- a/ntpq/ntpq.html
+++ b/ntpq/ntpq.html
@@ -44,7 +44,7 @@ monitor the operational status
 and determine the performance of
 ntpd, the NTP daemon.
 
-  
      This document applies to version 4.2.7p346 of ntpq.
+  
      This document applies to version 4.2.7p347 of ntpq.
 
 
        
 
      • ntpq Description
@@ -377,7 +377,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.
 
-
        ntpq - standard NTP query program - Ver. 4.2.7p345
+
        ntpq - standard NTP query program - Ver. 4.2.7p346
 USAGE:  ntpq [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
diff --git a/ntpq/ntpq.man.in b/ntpq/ntpq.man.in
index 8cfa8ef22..71352f39a 100644
--- a/ntpq/ntpq.man.in
+++ b/ntpq/ntpq.man.in
@@ -1,8 +1,8 @@
-.TH ntpq @NTPQ_MS@ "06 Jan 2013" "4.2.7p346" "User Commands"
+.TH ntpq @NTPQ_MS@ "07 Jan 2013" "4.2.7p347" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  6, 2013 at 06:45:04 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January  7, 2013 at 11:40:55 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/ntpq/ntpq.mdoc.in b/ntpq/ntpq.mdoc.in
index 7b84ee7bc..4c042bf5e 100644
--- a/ntpq/ntpq.mdoc.in
+++ b/ntpq/ntpq.mdoc.in
@@ -1,9 +1,9 @@
-.Dd January 6 2013
+.Dd January 7 2013
 .Dt NTPQ @NTPQ_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  January  6, 2013 at 06:45:10 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January  7, 2013 at 11:41:00 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpsnmpd/invoke-ntpsnmpd.texi b/ntpsnmpd/invoke-ntpsnmpd.texi
index 19414148c..72d114f67 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  January  6, 2013 at 06:45:24 AM by AutoGen 5.17.1pre14
+# It has been AutoGen-ed  January  7, 2013 at 11:41:14 AM by AutoGen 5.17.1pre14
 # 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.7p346
+ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p347
 USAGE:  ntpsnmpd [ - [] | --[@{=| @}] ]...
   Flg Arg Option-Name    Description
    -n no  nofork         Do not fork
diff --git a/ntpsnmpd/ntpsnmpd-opts.c b/ntpsnmpd/ntpsnmpd-opts.c
index b252e583b..92604757f 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  January  6, 2013 at 06:45:12 AM by AutoGen 5.17.1pre14
+ *  It has been AutoGen-ed  January  7, 2013 at 11:41:02 AM by AutoGen 5.17.1pre14
  *  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.7p346\n"
+/*     0 */ "ntpsnmpd 4.2.7p347\n"
             "Copyright (C) 1970-2013 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.7p346\n"
+/*  1385 */ "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p347\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.7p346";
+/*  1542 */ "ntpsnmpd 4.2.7p347";
 
 /*
  *  nofork option description:
diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h
index 0d7d15990..7a6f94fd8 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  January  6, 2013 at 06:45:12 AM by AutoGen 5.17.1pre14
+ *  It has been AutoGen-ed  January  7, 2013 at 11:41:02 AM by AutoGen 5.17.1pre14
  *  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.7p346"
-#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.7p346"
+#define NTPSNMPD_VERSION       "4.2.7p347"
+#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.7p347"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
index 6267ab5e6..9a2b0a821 100644
--- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
+++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
@@ -1,8 +1,8 @@
-.TH ntpsnmpd 1ntpsnmpdman "06 Jan 2013" "4.2.7p346" "User Commands"
+.TH ntpsnmpd 1ntpsnmpdman "07 Jan 2013" "4.2.7p347" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  6, 2013 at 06:45:21 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January  7, 2013 at 11:41:11 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -169,7 +169,7 @@ please fill me in...
 .BR Li ntpEntTimeDistance
 please fill me in...
 .PP
-This document corresponds to version 4.2.7p346 of NTP.
+This document corresponds to version 4.2.7p347 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 7fb9761b6..9c41cfcff 100644
--- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
+++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
@@ -1,9 +1,9 @@
-.Dd January 6 2013
+.Dd January 7 2013
 .Dt NTPSNMPD 1ntpsnmpdmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  January  6, 2013 at 06:45:26 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January  7, 2013 at 11:41:16 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -156,7 +156,7 @@ please fill me in...
 please fill me in...
 .El
 .Pp
-This document corresponds to version 4.2.7p346 of NTP.
+This document corresponds to version 4.2.7p347 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 ae0f27d1f..7e137326a 100644
--- a/ntpsnmpd/ntpsnmpd.html
+++ b/ntpsnmpd/ntpsnmpd.html
@@ -42,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.7p346 of ntpsnmpd.
+  
        This document applies to version 4.2.7p347 of ntpsnmpd.
 
 
          
 
        • ntpsnmpd Description:             Description
diff --git a/ntpsnmpd/ntpsnmpd.man.in b/ntpsnmpd/ntpsnmpd.man.in
index 24ea1de1b..487295280 100644
--- a/ntpsnmpd/ntpsnmpd.man.in
+++ b/ntpsnmpd/ntpsnmpd.man.in
@@ -1,8 +1,8 @@
-.TH ntpsnmpd @NTPSNMPD_MS@ "06 Jan 2013" "4.2.7p346" "User Commands"
+.TH ntpsnmpd @NTPSNMPD_MS@ "07 Jan 2013" "4.2.7p347" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  6, 2013 at 06:45:21 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January  7, 2013 at 11:41:11 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -169,7 +169,7 @@ please fill me in...
 .BR Li ntpEntTimeDistance
 please fill me in...
 .PP
-This document corresponds to version 4.2.7p346 of NTP.
+This document corresponds to version 4.2.7p347 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 9d1937190..16ffe0857 100644
--- a/ntpsnmpd/ntpsnmpd.mdoc.in
+++ b/ntpsnmpd/ntpsnmpd.mdoc.in
@@ -1,9 +1,9 @@
-.Dd January 6 2013
+.Dd January 7 2013
 .Dt NTPSNMPD @NTPSNMPD_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  January  6, 2013 at 06:45:26 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January  7, 2013 at 11:41:16 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -156,7 +156,7 @@ please fill me in...
 please fill me in...
 .El
 .Pp
-This document corresponds to version 4.2.7p346 of NTP.
+This document corresponds to version 4.2.7p347 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 8cff305eb..c23395da5 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=346
+point=347
 
 ### 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 c5f8a6659..d0166f20b 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  January  6, 2013 at 04:36:31 AM by AutoGen 5.17.1pre14
+# It has been AutoGen-ed  January  7, 2013 at 11:36:08 AM by AutoGen 5.17.1pre14
 # From the definitions    ntp-wait-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
diff --git a/scripts/ntp-wait.1ntp-waitman b/scripts/ntp-wait.1ntp-waitman
index a0dc61da9..71cd92fb3 100644
--- a/scripts/ntp-wait.1ntp-waitman
+++ b/scripts/ntp-wait.1ntp-waitman
@@ -1,8 +1,8 @@
-.TH ntp-wait 1ntp-waitman "06 Jan 2013" "ntp (4.2.7p346)" "User Commands"
+.TH ntp-wait 1ntp-waitman "07 Jan 2013" "ntp (4.2.7p347)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  6, 2013 at 04:36:27 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January  7, 2013 at 11:35:45 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -117,7 +117,7 @@ This program is released under the terms of the NTP license, This document applies to version 4.2.7p346 of ntp-wait.
+  
          This document applies to version 4.2.7p347 of ntp-wait.
 
 
          
 
          Short Contents
          
diff --git a/scripts/ntp-wait.man.in b/scripts/ntp-wait.man.in
index ddc4c4f18..54bd31d78 100644
--- a/scripts/ntp-wait.man.in
+++ b/scripts/ntp-wait.man.in
@@ -1,8 +1,8 @@
-.TH ntp-wait @NTP_WAIT_MS@ "06 Jan 2013" "ntp (4.2.7p346)" "User Commands"
+.TH ntp-wait @NTP_WAIT_MS@ "07 Jan 2013" "ntp (4.2.7p347)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  6, 2013 at 04:36:27 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January  7, 2013 at 11:35:45 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -117,7 +117,7 @@ This program is released under the terms of the NTP license,  [] | --[@{=| @}] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description
diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c
index 5f5564c68..435ad93dc 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  January  6, 2013 at 05:23:56 AM by AutoGen 5.17.1pre14
+ *  It has been AutoGen-ed  January  7, 2013 at 11:28:25 AM by AutoGen 5.17.1pre14
  *  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.7p346\n"
+/*     0 */ "sntp 4.2.7p347\n"
             "Copyright (C) 1970-2013 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.7p346\n"
+/*  2272 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p347\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.7p346";
+/*  2485 */ "sntp 4.2.7p347";
 
 /*
  *  ipv4 option description with
diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h
index 543a7c428..873112b30 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  January  6, 2013 at 05:23:55 AM by AutoGen 5.17.1pre14
+ *  It has been AutoGen-ed  January  7, 2013 at 11:28:24 AM by AutoGen 5.17.1pre14
  *  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.7p346"
-#define SNTP_FULL_VERSION  "sntp 4.2.7p346"
+#define SNTP_VERSION       "4.2.7p347"
+#define SNTP_FULL_VERSION  "sntp 4.2.7p347"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/sntp/sntp.1sntpman b/sntp/sntp.1sntpman
index 7ca153a32..2c2558a23 100644
--- a/sntp/sntp.1sntpman
+++ b/sntp/sntp.1sntpman
@@ -1,8 +1,8 @@
-.TH sntp 1sntpman "06 Jan 2013" "4.2.7p346" "User Commands"
+.TH sntp 1sntpman "07 Jan 2013" "4.2.7p347" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  6, 2013 at 06:46:06 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January  7, 2013 at 11:42:07 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -316,7 +316,7 @@ This program is released under the terms of the NTP license, This document applies to version 4.2.7p346 of sntp.
+  
          This document applies to version 4.2.7p347 of sntp.
 
   
          The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
@@ -176,7 +176,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.7p346
+
          sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p347
 USAGE:  sntp [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description
diff --git a/sntp/sntp.man.in b/sntp/sntp.man.in
index aacc6e6f3..82f42de7a 100644
--- a/sntp/sntp.man.in
+++ b/sntp/sntp.man.in
@@ -1,8 +1,8 @@
-.TH sntp @SNTP_MS@ "06 Jan 2013" "4.2.7p346" "User Commands"
+.TH sntp @SNTP_MS@ "07 Jan 2013" "4.2.7p347" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  6, 2013 at 06:46:06 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January  7, 2013 at 11:42:07 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -316,7 +316,7 @@ This program is released under the terms of the NTP license,  [] | --[@{=| @}] ]...
   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 37aa457d6..8fec36ccd 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  January  6, 2013 at 06:45:31 AM by AutoGen 5.17.1pre14
+ *  It has been AutoGen-ed  January  7, 2013 at 11:41:21 AM by AutoGen 5.17.1pre14
  *  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.7p346\n"
+/*     0 */ "ntp-keygen (ntp) 4.2.7p347\n"
             "Copyright (C) 1970-2013 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.7p346\n"
+/*  2163 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p347\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.7p346";
+/*  2331 */ "ntp-keygen (ntp) 4.2.7p347";
 
 /*
  *  imbits option description:
diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h
index ef7eb0a89..c952c11e6 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  January  6, 2013 at 06:45:30 AM by AutoGen 5.17.1pre14
+ *  It has been AutoGen-ed  January  7, 2013 at 11:41:20 AM by AutoGen 5.17.1pre14
  *  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.7p346"
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.7p346"
+#define NTP_KEYGEN_VERSION       "4.2.7p347"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.7p347"
 
 /*
  *  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 7632ff7dd..64535408a 100644
--- a/util/ntp-keygen.1ntp-keygenman
+++ b/util/ntp-keygen.1ntp-keygenman
@@ -1,8 +1,8 @@
-.TH ntp-keygen 1ntp-keygenman "06 Jan 2013" "ntp (4.2.7p346)" "User Commands"
+.TH ntp-keygen 1ntp-keygenman "07 Jan 2013" "ntp (4.2.7p347)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  6, 2013 at 06:45:41 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January  7, 2013 at 11:41:31 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -1109,7 +1109,7 @@ Please report bugs to http://bugs.ntp.org .
 .PP
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .SH NOTES
-This document corresponds to version 4.2.7p346 of NTP.
+This document corresponds to version 4.2.7p347 of NTP.
 Portions of this document came from FreeBSD.
 .PP
 This manual page was \fIAutoGen\fP-erated from the \fBntp-keygen\fP
diff --git a/util/ntp-keygen.1ntp-keygenmdoc b/util/ntp-keygen.1ntp-keygenmdoc
index ba5ee032d..d8399b5af 100644
--- a/util/ntp-keygen.1ntp-keygenmdoc
+++ b/util/ntp-keygen.1ntp-keygenmdoc
@@ -1,9 +1,9 @@
-.Dd January 6 2013
+.Dd January 7 2013
 .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  January  6, 2013 at 06:45:49 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January  7, 2013 at 11:41:39 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -1072,7 +1072,7 @@ Please report bugs to http://bugs.ntp.org .
 .Pp
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .Sh NOTES
-This document corresponds to version 4.2.7p346 of NTP.
+This document corresponds to version 4.2.7p347 of NTP.
 Portions of this document came from FreeBSD.
 .Pp
 This manual page was \fIAutoGen\fP\-erated from the \fBntp\-keygen\fP
diff --git a/util/ntp-keygen.html b/util/ntp-keygen.html
index 5a0cfd231..80eb33532 100644
--- a/util/ntp-keygen.html
+++ b/util/ntp-keygen.html
@@ -70,7 +70,7 @@ 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.7p346 of ntp-keygen.
+  
          This document applies to version 4.2.7p347 of ntp-keygen.
 
 
          
 
          
@@ -1120,7 +1120,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.
 
-
          ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p345
+
          ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p346
 USAGE:  ntp-keygen [ -<flag> [<val>] | --<name>[{=| }<val>] ]...
   Flg Arg Option-Name    Description
    -b Num imbits         identity modulus bits
@@ -1674,18 +1674,6 @@ Up: Cryptographi
 
 
          ntp-keygen Usage
          
 
-
          The
--p -password
-option specifies the write password and
--q -password
-option the read password for previously encrypted files. 
-The
-ntp-keygen
-program prompts for the password if it reads an encrypted file
-and the password is missing or incorrect. 
-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: ,
@@ -1696,8 +1684,6 @@ Up: Cryptographi
 
 
          ntp-keygen Notes
          
 
-
          This document corresponds to version 4.2.7p345 of NTP. 
-Portions of this document came from FreeBSD. 
 
          
 
          
           Previous: ntp-keygen Notes,
@@ -1707,13 +1693,6 @@ Up: Cryptographi
 
 
          ntp-keygen Bugs
          
 
-
          It can take quite a while to generate some cryptographic values,
-from one to several minutes with modern architectures
-such as UltraSPARC and up to tens of minutes to an hour
-with older architectures such as SPARC IPC.
-
-  
          Please report bugs to http://bugs.ntp.org .
-
 
          
 
          
           Next: ,
diff --git a/util/ntp-keygen.man.in b/util/ntp-keygen.man.in
index 0f4a25e95..65ad0ca5d 100644
--- a/util/ntp-keygen.man.in
+++ b/util/ntp-keygen.man.in
@@ -1,8 +1,8 @@
-.TH ntp-keygen @NTP_KEYGEN_MS@ "06 Jan 2013" "ntp (4.2.7p346)" "User Commands"
+.TH ntp-keygen @NTP_KEYGEN_MS@ "07 Jan 2013" "ntp (4.2.7p347)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  6, 2013 at 06:45:41 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January  7, 2013 at 11:41:31 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -1109,7 +1109,7 @@ Please report bugs to http://bugs.ntp.org .
 .PP
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .SH NOTES
-This document corresponds to version 4.2.7p346 of NTP.
+This document corresponds to version 4.2.7p347 of NTP.
 Portions of this document came from FreeBSD.
 .PP
 This manual page was \fIAutoGen\fP-erated from the \fBntp-keygen\fP
diff --git a/util/ntp-keygen.mdoc.in b/util/ntp-keygen.mdoc.in
index 5d2e8a945..4cdabc369 100644
--- a/util/ntp-keygen.mdoc.in
+++ b/util/ntp-keygen.mdoc.in
@@ -1,9 +1,9 @@
-.Dd January 6 2013
+.Dd January 7 2013
 .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  January  6, 2013 at 06:45:49 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January  7, 2013 at 11:41:39 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -1072,7 +1072,7 @@ Please report bugs to http://bugs.ntp.org .
 .Pp
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .Sh NOTES
-This document corresponds to version 4.2.7p346 of NTP.
+This document corresponds to version 4.2.7p347 of NTP.
 Portions of this document came from FreeBSD.
 .Pp
 This manual page was \fIAutoGen\fP\-erated from the \fBntp\-keygen\fP