From: Harlan Stenn Date: Tue, 12 Nov 2013 11:30:49 +0000 (+0000) Subject: NTP_4_2_7P395 X-Git-Tag: NTP_4_2_7P395^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c89c9faab351e33e26e438699bf1ec7bcf30f09;p=thirdparty%2Fntp.git NTP_4_2_7P395 bk: 528211697XpcKkbx3W9j5GlWuewffA --- diff --git a/ChangeLog b/ChangeLog index c0ae2d2b1..e1d4267a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.2.7p395) 2013/11/12 Released by Harlan Stenn * Upgrade to autogen-5.18.3pre5 and libopts-40.1.15. (4.2.7p394) 2013/11/05 Released by Harlan Stenn * [Bug 1050] Change ONCORE log message for leap second announcement diff --git a/ntpd/invoke-ntp.conf.texi b/ntpd/invoke-ntp.conf.texi index f47cff66b..bd4d9199f 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 November 5, 2013 at 11:34:37 AM by AutoGen 5.18.1pre5 +# It has been AutoGen-ed November 12, 2013 at 11:28:29 AM by AutoGen 5.18.3pre5 # 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 c2d395f98..c0a3fcc5d 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 November 5, 2013 at 11:34:39 AM by AutoGen 5.18.1pre5 +# It has been AutoGen-ed November 12, 2013 at 11:28:31 AM by AutoGen 5.18.3pre5 # 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 c30e511a5..a4c7e2348 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 November 5, 2013 at 11:34:41 AM by AutoGen 5.18.1pre5 +# It has been AutoGen-ed November 12, 2013 at 11:28:33 AM by AutoGen 5.18.3pre5 # 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.7p394 +ntpd - NTP daemon program - Ver. 4.2.7p395 Usage: ntpd [ - [] | --[@{=| @}] ]... \ [ ... ] Flg Arg Option-Name Description @@ -285,7 +285,7 @@ This is almost never a good idea. @cindex ntpd-configfile This is the ``configuration file name'' option. -This option takes an argument string. +This option takes a string argument. The name and path of the configuration file, @file{/etc/ntp.conf} by default. @@ -294,7 +294,7 @@ by default. @cindex ntpd-driftfile This is the ``frequency drift file name'' option. -This option takes an argument string. +This option takes a string argument. The name and path of the frequency file, @file{/etc/ntp.drift} by default. @@ -333,7 +333,7 @@ configuration file directive for other options. @cindex ntpd-jaildir This is the ``jail directory'' option. -This option takes an argument string. +This option takes a string argument. @noindent This option has some usage constraints. It: @@ -359,7 +359,7 @@ This option is supported under NetBSD (configure with @cindex ntpd-interface This is the ``listen on an interface name or address'' option. -This option takes an argument string @file{iface}. +This option takes a string argument @file{iface}. @noindent This option has some usage constraints. It: @@ -378,7 +378,7 @@ This option is deprecated. Please consider using the configuration file @cindex ntpd-keyfile This is the ``path to symmetric keys'' option. -This option takes an argument string. +This option takes a string argument. Specify the name and path of the symmetric key file. @file{/etc/ntp.keys} is the default. @@ -390,7 +390,7 @@ configuration file directive. @cindex ntpd-logfile This is the ``path to the log file'' option. -This option takes an argument string. +This option takes a string argument. Specify the name and path of the log file. The default is the system log file. This is the same operation as the @@ -434,7 +434,7 @@ at the highest priority. @cindex ntpd-pidfile This is the ``path to the pid file'' option. -This option takes an argument string. +This option takes a string argument. Specify the name and path of the file used to record @code{ntpd}'s process ID. @@ -446,7 +446,7 @@ configuration file directive. @cindex ntpd-priority This is the ``process priority'' option. -This option takes an argument number. +This option takes a number argument. To the extent permitted by the operating system, run @code{ntpd} at the specified @@ -482,14 +482,14 @@ Note: The kernel time discipline is disabled with this option. @cindex ntpd-propagationdelay This is the ``broadcast/propagation delay'' option. -This option takes an argument string. +This option takes a string argument. 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. @node ntpd saveconfigquit @subsection saveconfigquit option @cindex ntpd-saveconfigquit This is the ``save parsed configuration and quit'' option. -This option takes an argument string. +This option takes a string argument. @noindent This option has some usage constraints. It: @@ -509,7 +509,7 @@ designed for automated testing. @cindex ntpd-statsdir This is the ``statistics file location'' option. -This option takes an argument string. +This option takes a string argument. Specify the directory path for files created by the statistics facility. This is the same operation as the @code{statsdir} @kbd{statsdir} @@ -519,7 +519,7 @@ configuration file directive. @cindex ntpd-trustedkey This is the ``trusted key number'' option. -This option takes an argument string @file{tkey}. +This option takes a string argument @file{tkey}. @noindent This option has some usage constraints. It: @@ -534,7 +534,7 @@ Add the specified key number to the trusted key list. @cindex ntpd-user This is the ``run as userid (or userid:groupid)'' option. -This option takes an argument string. +This option takes a string argument. @noindent This option has some usage constraints. It: @@ -554,7 +554,7 @@ This option is supported under NetBSD (configure with @cindex ntpd-updateinterval This is the ``interval in seconds between scans for new or dropped interfaces'' option. -This option takes an argument number. +This option takes a number argument. Give the time in seconds between two scans for new or dropped interfaces. For systems with routing socket support the scans will be performed shortly after the interface change has been detected by the system. @@ -564,7 +564,7 @@ Use 0 to disable scanning. 60 seconds is the minimum time between scans. @cindex ntpd-wait-sync This is the ``seconds to wait for first clock sync'' option. -This option takes an argument number. +This option takes a number argument. @noindent This option has some usage constraints. It: @@ -624,7 +624,7 @@ used directly, saving the overhead of a system call. @cindex ntpd-pccfreq This is the ``force cpu cycle counter use (windows only)'' option. -This option takes an argument string. +This option takes a string argument. @noindent This option has some usage constraints. It: diff --git a/ntpd/ntp.conf.5man b/ntpd/ntp.conf.5man index fad0ecaee..50974d369 100644 --- a/ntpd/ntp.conf.5man +++ b/ntpd/ntp.conf.5man @@ -1,8 +1,8 @@ -.TH ntp.conf 5man "05 Nov 2013" "4.2.7p394" "File Formats" +.TH ntp.conf 5man "12 Nov 2013" "4.2.7p395" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed November 5, 2013 at 11:34:23 AM by AutoGen 5.18.1pre5 +.\" It has been AutoGen-ed November 12, 2013 at 11:28:16 AM by AutoGen 5.18.3pre5 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .\" @@ -2980,7 +2980,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.7p394 of NTP. +This document corresponds to version 4.2.7p395 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 ec2eae20b..9d26fac94 100644 --- a/ntpd/ntp.conf.5mdoc +++ b/ntpd/ntp.conf.5mdoc @@ -1,9 +1,9 @@ -.Dd November 5 2013 +.Dd November 12 2013 .Dt NTP_CONF 5mdoc File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed November 5, 2013 at 11:34:43 AM by AutoGen 5.18.1pre5 +.\" It has been AutoGen-ed November 12, 2013 at 11:28:35 AM by AutoGen 5.18.3pre5 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -2807,7 +2807,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.7p394 of NTP. +This document corresponds to version 4.2.7p395 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 329e304e6..afd958136 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.7p394 of ntp.conf. +

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

  • ntp.conf Description diff --git a/ntpd/ntp.conf.man.in b/ntpd/ntp.conf.man.in index 22fa0e91b..1f9894f73 100644 --- a/ntpd/ntp.conf.man.in +++ b/ntpd/ntp.conf.man.in @@ -1,8 +1,8 @@ -.TH ntp.conf 5 "05 Nov 2013" "4.2.7p394" "File Formats" +.TH ntp.conf 5 "12 Nov 2013" "4.2.7p395" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed November 5, 2013 at 11:34:23 AM by AutoGen 5.18.1pre5 +.\" It has been AutoGen-ed November 12, 2013 at 11:28:16 AM by AutoGen 5.18.3pre5 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .\" @@ -2980,7 +2980,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.7p394 of NTP. +This document corresponds to version 4.2.7p395 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 a9631ae23..d74a5c885 100644 --- a/ntpd/ntp.conf.mdoc.in +++ b/ntpd/ntp.conf.mdoc.in @@ -1,9 +1,9 @@ -.Dd November 5 2013 +.Dd November 12 2013 .Dt NTP_CONF 5 File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed November 5, 2013 at 11:34:43 AM by AutoGen 5.18.1pre5 +.\" It has been AutoGen-ed November 12, 2013 at 11:28:35 AM by AutoGen 5.18.3pre5 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -2807,7 +2807,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.7p394 of NTP. +This document corresponds to version 4.2.7p395 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 5283b5742..35dc2bc0b 100644 --- a/ntpd/ntp.keys.5man +++ b/ntpd/ntp.keys.5man @@ -1,8 +1,8 @@ -.TH ntp.keys 5man "05 Nov 2013" "4.2.7p394" "File Formats" +.TH ntp.keys 5man "12 Nov 2013" "4.2.7p395" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed November 5, 2013 at 11:34:28 AM by AutoGen 5.18.1pre5 +.\" It has been AutoGen-ed November 12, 2013 at 11:28:21 AM by AutoGen 5.18.3pre5 .\" 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.7p394 of ntp.keys. +

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

    Short Contents

    diff --git a/ntpd/ntp.keys.man.in b/ntpd/ntp.keys.man.in index 4bd4538a7..aa5ac5855 100644 --- a/ntpd/ntp.keys.man.in +++ b/ntpd/ntp.keys.man.in @@ -1,8 +1,8 @@ -.TH ntp.keys 5 "05 Nov 2013" "4.2.7p394" "File Formats" +.TH ntp.keys 5 "12 Nov 2013" "4.2.7p395" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed November 5, 2013 at 11:34:28 AM by AutoGen 5.18.1pre5 +.\" It has been AutoGen-ed November 12, 2013 at 11:28:21 AM by AutoGen 5.18.3pre5 .\" 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" /* 2960 */ "http://bugs.ntp.org, bugs@ntp.org\0" /* 2994 */ "\n\0" -/* 2996 */ "ntpd 4.2.7p394"; +/* 2996 */ "ntpd 4.2.7p395"; /** * ipv4 option description with @@ -764,7 +764,7 @@ static int const aWait_SyncCantList[] = { /** * Declare option callback procedures */ -/* extracted from optmain.tlib near line 745 */ +/* extracted from optmain.tlib near line 723 */ #if defined(TEST_NTPD_OPTS) /* @@ -1304,6 +1304,7 @@ doUsageOpt(tOptions * opts, tOptDesc * od) ex_code = NTPD_EXIT_SUCCESS; optionUsage(&ntpdOptions, ex_code); /* NOTREACHED */ + exit(1); (void)opts; (void)od; } @@ -1358,7 +1359,7 @@ main(int argc, char ** argv) return res; } #endif /* TEST_NTPD_OPTS END-TEST-MAIN-PROCEDURE */ -/* extracted from optmain.tlib near line 1266 */ +/* extracted from optmain.tlib near line 1245 */ /** * The directory containing the data associated with ntpd. @@ -1557,7 +1558,7 @@ static void bogus_function(void) { translate option names. */ /* referenced via ntpdOptions.pzCopyright */ - puts(_("ntpd 4.2.7p394\n\ + puts(_("ntpd 4.2.7p395\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\ @@ -1694,7 +1695,7 @@ provided \"as is\" without express or implied warranty.\n")); puts(_("output version information and exit")); /* referenced via ntpdOptions.pzUsageTitle */ - puts(_("ntpd - NTP daemon program - Ver. 4.2.7p394\n\ + puts(_("ntpd - NTP daemon program - Ver. 4.2.7p395\n\ Usage: %s [ - [] | --[{=| }] ]... \\\n\ \t\t[ ... ]\n")); @@ -1702,7 +1703,7 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ puts(_("\n")); /* referenced via ntpdOptions.pzFullVersion */ - puts(_("ntpd 4.2.7p394")); + puts(_("ntpd 4.2.7p395")); /* referenced via ntpdOptions.pzFullUsage */ puts(_("<<>>")); diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 7828bdb77..139a43a1e 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 November 5, 2013 at 11:32:06 AM by AutoGen 5.18.1pre5 + * It has been AutoGen-ed November 12, 2013 at 11:27:30 AM by AutoGen 5.18.3pre5 * From the definitions ntpd-opts.def * and the template file options * @@ -105,9 +105,9 @@ typedef enum { /** count of all options for ntpd */ #define OPTION_CT 37 /** ntpd version */ -#define NTPD_VERSION "4.2.7p394" +#define NTPD_VERSION "4.2.7p395" /** Full ntpd version text */ -#define NTPD_FULL_VERSION "ntpd 4.2.7p394" +#define NTPD_FULL_VERSION "ntpd 4.2.7p395" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman index c7c40093a..dfb9e9a9d 100644 --- a/ntpd/ntpd.1ntpdman +++ b/ntpd/ntpd.1ntpdman @@ -1,8 +1,8 @@ -.TH ntpd 1ntpdman "05 Nov 2013" "4.2.7p394" "User Commands" +.TH ntpd 1ntpdman "12 Nov 2013" "4.2.7p395" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.man) .\" -.\" It has been AutoGen-ed November 5, 2013 at 11:34:32 AM by AutoGen 5.18.1pre5 +.\" It has been AutoGen-ed November 12, 2013 at 11:28:24 AM by AutoGen 5.18.3pre5 .\" 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.7p394 of NTP. +This document corresponds to version 4.2.7p395 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 87c80eedf..47ff0d510 100644 --- a/ntpd/ntpd.1ntpdmdoc +++ b/ntpd/ntpd.1ntpdmdoc @@ -1,9 +1,9 @@ -.Dd November 5 2013 +.Dd November 12 2013 .Dt NTPD 1ntpdmdoc User Commands .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed November 5, 2013 at 11:34:48 AM by AutoGen 5.18.1pre5 +.\" It has been AutoGen-ed November 12, 2013 at 11:28:41 AM by AutoGen 5.18.3pre5 .\" 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.7p394 of NTP. +This document corresponds to version 4.2.7p395 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 d569456c2..40a8c8055 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.7p394 of ntpd. +

    This document applies to version 4.2.7p395 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.7p393
+
      ntpd - NTP daemon program - Ver. 4.2.7p394
 Usage:  ntpd [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \
                 [ <server1> ... <serverN> ]
   Flg Arg Option-Name    Description
diff --git a/ntpd/ntpd.man.in b/ntpd/ntpd.man.in
index 811da4d1a..4cbc223c1 100644
--- a/ntpd/ntpd.man.in
+++ b/ntpd/ntpd.man.in
@@ -1,8 +1,8 @@
-.TH ntpd @NTPD_MS@ "05 Nov 2013" "4.2.7p394" "User Commands"
+.TH ntpd @NTPD_MS@ "12 Nov 2013" "4.2.7p395" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd-opts.man)
 .\"
-.\"  It has been AutoGen-ed  November  5, 2013 at 11:34:32 AM by AutoGen 5.18.1pre5
+.\"  It has been AutoGen-ed  November 12, 2013 at 11:28:24 AM by AutoGen 5.18.3pre5
 .\"  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.7p394 of NTP.
+This document corresponds to version 4.2.7p395 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 d6e3df8f9..f18498f44 100644
--- a/ntpd/ntpd.mdoc.in
+++ b/ntpd/ntpd.mdoc.in
@@ -1,9 +1,9 @@
-.Dd November 5 2013
+.Dd November 12 2013
 .Dt NTPD @NTPD_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  November  5, 2013 at 11:34:48 AM by AutoGen 5.18.1pre5
+.\"  It has been AutoGen-ed  November 12, 2013 at 11:28:41 AM by AutoGen 5.18.3pre5
 .\"  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.7p394 of NTP.
+This document corresponds to version 4.2.7p395 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 2c411c6dc..deebdfccb 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  November  5, 2013 at 11:35:15 AM by AutoGen 5.18.1pre5
+# It has been AutoGen-ed  November 12, 2013 at 11:28:58 AM by AutoGen 5.18.3pre5
 # 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.7p394
+ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p395
 Usage:  ntpdc [ - [] | --[@{=| @}] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
@@ -155,7 +155,7 @@ to the IPv6 namespace.
 @cindex ntpdc-command
 
 This is the ``run a command and exit'' option.
-This option takes an argument string @file{cmd}.
+This option takes a string argument @file{cmd}.
 
 @noindent
 This option has some usage constraints.  It:
diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c
index 8d08e8ec9..571e72557 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  November  5, 2013 at 11:35:00 AM by AutoGen 5.18.1pre5
+ *  It has been AutoGen-ed  November 12, 2013 at 11:28:49 AM by AutoGen 5.18.3pre5
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -69,7 +69,7 @@ extern FILE * option_usage_fp;
  *  static const strings for ntpdc options
  */
 static char const ntpdc_opt_strs[1861] =
-/*     0 */ "ntpdc 4.2.7p394\n"
+/*     0 */ "ntpdc 4.2.7p395\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"
@@ -127,14 +127,14 @@ static char const ntpdc_opt_strs[1861] =
 /*  1640 */ "no-load-opts\0"
 /*  1653 */ "no\0"
 /*  1656 */ "NTPDC\0"
-/*  1662 */ "ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p394\n"
+/*  1662 */ "ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p395\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\0"
-/*  1845 */ "ntpdc 4.2.7p394";
+/*  1845 */ "ntpdc 4.2.7p395";
 
 /**
  *  ipv4 option description with
@@ -317,7 +317,7 @@ static int const aShowpeersCantList[] = {
 /**
  *  Declare option callback procedures
  */
-/* extracted from optmain.tlib near line 745 */
+/* extracted from optmain.tlib near line 723 */
 
 #if defined(TEST_NTPDC_OPTS)
 /*
@@ -598,6 +598,7 @@ doUsageOpt(tOptions * opts, tOptDesc * od)
     ex_code = NTPDC_EXIT_SUCCESS;
     optionUsage(&ntpdcOptions, ex_code);
     /* NOTREACHED */
+    exit(1);
     (void)opts;
     (void)od;
 }
@@ -652,7 +653,7 @@ main(int argc, char ** argv)
     return res;
 }
 #endif  /* TEST_NTPDC_OPTS END-TEST-MAIN-PROCEDURE */
-/* extracted from optmain.tlib near line 1266 */
+/* extracted from optmain.tlib near line 1245 */
 
 /**
  * The directory containing the data associated with ntpdc.
@@ -851,7 +852,7 @@ static void bogus_function(void) {
      translate option names.
    */
   /* referenced via ntpdcOptions.pzCopyright */
-  puts(_("ntpdc 4.2.7p394\n\
+  puts(_("ntpdc 4.2.7p395\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\
@@ -916,14 +917,14 @@ provided \"as is\" without express or implied warranty.\n"));
   puts(_("load options from a config file"));
 
   /* referenced via ntpdcOptions.pzUsageTitle */
-  puts(_("ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p394\n\
+  puts(_("ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p395\n\
 Usage:  %s [ - [] | --[{=| }] ]... [ host ...]\n"));
 
   /* referenced via ntpdcOptions.pzExplain */
   puts(_("\n"));
 
   /* referenced via ntpdcOptions.pzFullVersion */
-  puts(_("ntpdc 4.2.7p394"));
+  puts(_("ntpdc 4.2.7p395"));
 
   /* referenced via ntpdcOptions.pzFullUsage */
   puts(_("<<>>"));
diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h
index 24fa6206d..0e2654be8 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  November  5, 2013 at 11:35:00 AM by AutoGen 5.18.1pre5
+ *  It has been AutoGen-ed  November 12, 2013 at 11:28:48 AM by AutoGen 5.18.3pre5
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -83,9 +83,9 @@ typedef enum {
 /** count of all options for ntpdc */
 #define OPTION_CT    15
 /** ntpdc version */
-#define NTPDC_VERSION       "4.2.7p394"
+#define NTPDC_VERSION       "4.2.7p395"
 /** Full ntpdc version text */
-#define NTPDC_FULL_VERSION  "ntpdc 4.2.7p394"
+#define NTPDC_FULL_VERSION  "ntpdc 4.2.7p395"
 
 /**
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpdc/ntpdc.1ntpdcman b/ntpdc/ntpdc.1ntpdcman
index 14abe3195..6b6cced49 100644
--- a/ntpdc/ntpdc.1ntpdcman
+++ b/ntpdc/ntpdc.1ntpdcman
@@ -1,8 +1,8 @@
-.TH ntpdc 1ntpdcman "05 Nov 2013" "4.2.7p394" "User Commands"
+.TH ntpdc 1ntpdcman "12 Nov 2013" "4.2.7p395" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.man)
 .\"
-.\"  It has been AutoGen-ed  November  5, 2013 at 11:35:11 AM by AutoGen 5.18.1pre5
+.\"  It has been AutoGen-ed  November 12, 2013 at 11:28:54 AM by AutoGen 5.18.3pre5
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/ntpdc/ntpdc.1ntpdcmdoc b/ntpdc/ntpdc.1ntpdcmdoc
index 2dd11debe..54659e33b 100644
--- a/ntpdc/ntpdc.1ntpdcmdoc
+++ b/ntpdc/ntpdc.1ntpdcmdoc
@@ -1,9 +1,9 @@
-.Dd November 5 2013
+.Dd November 12 2013
 .Dt NTPDC 1ntpdcmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  November  5, 2013 at 11:35:17 AM by AutoGen 5.18.1pre5
+.\"  It has been AutoGen-ed  November 12, 2013 at 11:29:00 AM by AutoGen 5.18.3pre5
 .\"  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 7b8d5a138..05c2c9543 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.7p394 of ntpdc.
+  
      This document applies to version 4.2.7p395 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.7p394
+
      ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p395
 Usage:  ntpdc [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
@@ -246,7 +246,7 @@ Up: ntpdc Invocation
 
 
      
 This is the “run a command and exit” option. 
-This option takes an argument string cmd.
+This option takes a string argument cmd.
 
 
      This option has some usage constraints.  It:
      
        
diff --git a/ntpdc/ntpdc.man.in b/ntpdc/ntpdc.man.in
index 7c28e9244..7969b28a7 100644
--- a/ntpdc/ntpdc.man.in
+++ b/ntpdc/ntpdc.man.in
@@ -1,8 +1,8 @@
-.TH ntpdc @NTPDC_MS@ "05 Nov 2013" "4.2.7p394" "User Commands"
+.TH ntpdc @NTPDC_MS@ "12 Nov 2013" "4.2.7p395" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.man)
 .\"
-.\"  It has been AutoGen-ed  November  5, 2013 at 11:35:11 AM by AutoGen 5.18.1pre5
+.\"  It has been AutoGen-ed  November 12, 2013 at 11:28:54 AM by AutoGen 5.18.3pre5
 .\"  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 a089d8320..6f8853f83 100644
--- a/ntpdc/ntpdc.mdoc.in
+++ b/ntpdc/ntpdc.mdoc.in
@@ -1,9 +1,9 @@
-.Dd November 5 2013
+.Dd November 12 2013
 .Dt NTPDC @NTPDC_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  November  5, 2013 at 11:35:17 AM by AutoGen 5.18.1pre5
+.\"  It has been AutoGen-ed  November 12, 2013 at 11:29:00 AM by AutoGen 5.18.3pre5
 .\"  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 f7001460c..b11e7a3b1 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  November  5, 2013 at 11:35:46 AM by AutoGen 5.18.1pre5
+# It has been AutoGen-ed  November 12, 2013 at 11:29:13 AM by AutoGen 5.18.3pre5
 # 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.7p394
+ntpq - standard NTP query program - Ver. 4.2.7p395
 Usage:  ntpq [ - [] | --[@{=| @}] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
@@ -370,7 +370,7 @@ to the IPv6 namespace.
 @cindex ntpq-command
 
 This is the ``run a command and exit'' option.
-This option takes an argument string @file{cmd}.
+This option takes a string argument @file{cmd}.
 
 @noindent
 This option has some usage constraints.  It:
diff --git a/ntpq/ntpq-opts.c b/ntpq/ntpq-opts.c
index da9a0a1d5..8efa647ac 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  November  5, 2013 at 11:35:20 AM by AutoGen 5.18.1pre5
+ *  It has been AutoGen-ed  November 12, 2013 at 11:29:03 AM by AutoGen 5.18.3pre5
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -69,7 +69,7 @@ extern FILE * option_usage_fp;
  *  static const strings for ntpq options
  */
 static char const ntpq_opt_strs[1833] =
-/*     0 */ "ntpq 4.2.7p394\n"
+/*     0 */ "ntpq 4.2.7p395\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"
@@ -125,13 +125,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.7p394\n"
+/*  1648 */ "ntpq - standard NTP query program - Ver. 4.2.7p395\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.7p394";
+/*  1818 */ "ntpq 4.2.7p395";
 
 /**
  *  ipv4 option description with
@@ -292,7 +292,7 @@ static int const aInteractiveCantList[] = {
 /**
  *  Declare option callback procedures
  */
-/* extracted from optmain.tlib near line 745 */
+/* extracted from optmain.tlib near line 723 */
 
 #if defined(TEST_NTPQ_OPTS)
 /*
@@ -568,6 +568,7 @@ doUsageOpt(tOptions * opts, tOptDesc * od)
     ex_code = NTPQ_EXIT_SUCCESS;
     optionUsage(&ntpqOptions, ex_code);
     /* NOTREACHED */
+    exit(1);
     (void)opts;
     (void)od;
 }
@@ -622,7 +623,7 @@ main(int argc, char ** argv)
     return res;
 }
 #endif  /* TEST_NTPQ_OPTS END-TEST-MAIN-PROCEDURE */
-/* extracted from optmain.tlib near line 1266 */
+/* extracted from optmain.tlib near line 1245 */
 
 /**
  * The directory containing the data associated with ntpq.
@@ -821,7 +822,7 @@ static void bogus_function(void) {
      translate option names.
    */
   /* referenced via ntpqOptions.pzCopyright */
-  puts(_("ntpq 4.2.7p394\n\
+  puts(_("ntpq 4.2.7p395\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\
@@ -883,11 +884,11 @@ provided \"as is\" without express or implied warranty.\n"));
   puts(_("load options from a config file"));
 
   /* referenced via ntpqOptions.pzUsageTitle */
-  puts(_("ntpq - standard NTP query program - Ver. 4.2.7p394\n\
+  puts(_("ntpq - standard NTP query program - Ver. 4.2.7p395\n\
 Usage:  %s [ - [] | --[{=| }] ]... [ host ...]\n"));
 
   /* referenced via ntpqOptions.pzFullVersion */
-  puts(_("ntpq 4.2.7p394"));
+  puts(_("ntpq 4.2.7p395"));
 
   /* referenced via ntpqOptions.pzFullUsage */
   puts(_("<<>>"));
diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h
index ac9f528f0..ed35488e1 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  November  5, 2013 at 11:35:19 AM by AutoGen 5.18.1pre5
+ *  It has been AutoGen-ed  November 12, 2013 at 11:29:03 AM by AutoGen 5.18.3pre5
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -82,9 +82,9 @@ typedef enum {
 /** count of all options for ntpq */
 #define OPTION_CT    14
 /** ntpq version */
-#define NTPQ_VERSION       "4.2.7p394"
+#define NTPQ_VERSION       "4.2.7p395"
 /** Full ntpq version text */
-#define NTPQ_FULL_VERSION  "ntpq 4.2.7p394"
+#define NTPQ_FULL_VERSION  "ntpq 4.2.7p395"
 
 /**
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpq/ntpq.1ntpqman b/ntpq/ntpq.1ntpqman
index 6bb9aac70..bb199ed31 100644
--- a/ntpq/ntpq.1ntpqman
+++ b/ntpq/ntpq.1ntpqman
@@ -1,8 +1,8 @@
-.TH ntpq 1ntpqman "05 Nov 2013" "4.2.7p394" "User Commands"
+.TH ntpq 1ntpqman "12 Nov 2013" "4.2.7p395" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.man)
 .\"
-.\"  It has been AutoGen-ed  November  5, 2013 at 11:35:42 AM by AutoGen 5.18.1pre5
+.\"  It has been AutoGen-ed  November 12, 2013 at 11:29:09 AM by AutoGen 5.18.3pre5
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/ntpq/ntpq.1ntpqmdoc b/ntpq/ntpq.1ntpqmdoc
index 1b7079a2a..b127ada8a 100644
--- a/ntpq/ntpq.1ntpqmdoc
+++ b/ntpq/ntpq.1ntpqmdoc
@@ -1,9 +1,9 @@
-.Dd November 5 2013
+.Dd November 12 2013
 .Dt NTPQ 1ntpqmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  November  5, 2013 at 11:35:48 AM by AutoGen 5.18.1pre5
+.\"  It has been AutoGen-ed  November 12, 2013 at 11:29:15 AM by AutoGen 5.18.3pre5
 .\"  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 4be93b824..5cfabca5d 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.7p394 of ntpq.
+  
        This document applies to version 4.2.7p395 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.7p393
+
          ntpq - standard NTP query program - Ver. 4.2.7p394
 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 f18aad2ee..d3d4011a9 100644
--- a/ntpq/ntpq.man.in
+++ b/ntpq/ntpq.man.in
@@ -1,8 +1,8 @@
-.TH ntpq @NTPQ_MS@ "05 Nov 2013" "4.2.7p394" "User Commands"
+.TH ntpq @NTPQ_MS@ "12 Nov 2013" "4.2.7p395" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.man)
 .\"
-.\"  It has been AutoGen-ed  November  5, 2013 at 11:35:42 AM by AutoGen 5.18.1pre5
+.\"  It has been AutoGen-ed  November 12, 2013 at 11:29:09 AM by AutoGen 5.18.3pre5
 .\"  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 ee23f61ac..67f2c458b 100644
--- a/ntpq/ntpq.mdoc.in
+++ b/ntpq/ntpq.mdoc.in
@@ -1,9 +1,9 @@
-.Dd November 5 2013
+.Dd November 12 2013
 .Dt NTPQ @NTPQ_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  November  5, 2013 at 11:35:48 AM by AutoGen 5.18.1pre5
+.\"  It has been AutoGen-ed  November 12, 2013 at 11:29:15 AM by AutoGen 5.18.3pre5
 .\"  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 15e304b30..9d3ce99a0 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  November  5, 2013 at 11:36:02 AM by AutoGen 5.18.1pre5
+# It has been AutoGen-ed  November 12, 2013 at 11:29:28 AM by AutoGen 5.18.3pre5
 # 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.7p394
+ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p395
 Usage:  ntpsnmpd [ - [] | --[@{=| @}] ]...
   Flg Arg Option-Name    Description
    -n no  nofork         Do not fork
@@ -81,7 +81,7 @@ exit 0
 @cindex ntpsnmpd-agentxsocket
 
 This is the ``the socket address ntpsnmpd uses to connect to net-snmpd'' option.
-This option takes an argument string.
+This option takes a string argument.
 [:]
 The default "agent X socket" is the Unix Domain socket
 @file{unix:/var/agentx/master}.
diff --git a/ntpsnmpd/ntpsnmpd-opts.c b/ntpsnmpd/ntpsnmpd-opts.c
index 79775e949..425348b79 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  November  5, 2013 at 11:35:50 AM by AutoGen 5.18.1pre5
+ *  It has been AutoGen-ed  November 12, 2013 at 11:29:17 AM by AutoGen 5.18.3pre5
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -61,7 +61,7 @@ extern FILE * option_usage_fp;
  *  static const strings for ntpsnmpd options
  */
 static char const ntpsnmpd_opt_strs[1560] =
-/*     0 */ "ntpsnmpd 4.2.7p394\n"
+/*     0 */ "ntpsnmpd 4.2.7p395\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"
@@ -100,14 +100,14 @@ static char const ntpsnmpd_opt_strs[1560] =
 /*  1360 */ "no-load-opts\0"
 /*  1373 */ "no\0"
 /*  1376 */ "NTPSNMPD\0"
-/*  1385 */ "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p394\n"
+/*  1385 */ "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p395\n"
             "Usage:  %s [ - [] | --[{=| }] ]...\n\0"
 /*  1490 */ "$HOME\0"
 /*  1496 */ ".\0"
 /*  1498 */ ".ntprc\0"
 /*  1505 */ "http://bugs.ntp.org, bugs@ntp.org\0"
 /*  1539 */ "\n\0"
-/*  1541 */ "ntpsnmpd 4.2.7p394";
+/*  1541 */ "ntpsnmpd 4.2.7p395";
 
 /**
  *  nofork option description:
@@ -180,7 +180,7 @@ static char const ntpsnmpd_opt_strs[1560] =
 /**
  *  Declare option callback procedures
  */
-/* extracted from optmain.tlib near line 745 */
+/* extracted from optmain.tlib near line 723 */
 
 #if defined(TEST_NTPSNMPD_OPTS)
 /*
@@ -365,6 +365,7 @@ doUsageOpt(tOptions * opts, tOptDesc * od)
     ex_code = NTPSNMPD_EXIT_SUCCESS;
     optionUsage(&ntpsnmpdOptions, ex_code);
     /* NOTREACHED */
+    exit(1);
     (void)opts;
     (void)od;
 }
@@ -394,7 +395,7 @@ main(int argc, char ** argv)
     return res;
 }
 #endif  /* TEST_NTPSNMPD_OPTS END-TEST-MAIN-PROCEDURE */
-/* extracted from optmain.tlib near line 1266 */
+/* extracted from optmain.tlib near line 1245 */
 
 /**
  * The directory containing the data associated with ntpsnmpd.
@@ -594,7 +595,7 @@ static void bogus_function(void) {
      translate option names.
    */
   /* referenced via ntpsnmpdOptions.pzCopyright */
-  puts(_("ntpsnmpd 4.2.7p394\n\
+  puts(_("ntpsnmpd 4.2.7p395\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\
@@ -638,14 +639,14 @@ provided \"as is\" without express or implied warranty.\n"));
   puts(_("load options from a config file"));
 
   /* referenced via ntpsnmpdOptions.pzUsageTitle */
-  puts(_("ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p394\n\
+  puts(_("ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p395\n\
 Usage:  %s [ - [] | --[{=| }] ]...\n"));
 
   /* referenced via ntpsnmpdOptions.pzExplain */
   puts(_("\n"));
 
   /* referenced via ntpsnmpdOptions.pzFullVersion */
-  puts(_("ntpsnmpd 4.2.7p394"));
+  puts(_("ntpsnmpd 4.2.7p395"));
 
   /* referenced via ntpsnmpdOptions.pzFullUsage */
   puts(_("<<>>"));
diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h
index d5fb2daff..c3232176c 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  November  5, 2013 at 11:35:50 AM by AutoGen 5.18.1pre5
+ *  It has been AutoGen-ed  November 12, 2013 at 11:29:17 AM by AutoGen 5.18.3pre5
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -76,9 +76,9 @@ typedef enum {
 /** count of all options for ntpsnmpd */
 #define OPTION_CT    8
 /** ntpsnmpd version */
-#define NTPSNMPD_VERSION       "4.2.7p394"
+#define NTPSNMPD_VERSION       "4.2.7p395"
 /** Full ntpsnmpd version text */
-#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.7p394"
+#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.7p395"
 
 /**
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
index 758562ea2..2830d6887 100644
--- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
+++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
@@ -1,8 +1,8 @@
-.TH ntpsnmpd 1ntpsnmpdman "05 Nov 2013" "4.2.7p394" "User Commands"
+.TH ntpsnmpd 1ntpsnmpdman "12 Nov 2013" "4.2.7p395" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.man)
 .\"
-.\"  It has been AutoGen-ed  November  5, 2013 at 11:35:59 AM by AutoGen 5.18.1pre5
+.\"  It has been AutoGen-ed  November 12, 2013 at 11:29:24 AM by AutoGen 5.18.3pre5
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -170,7 +170,7 @@ please fill me in...
 .BR Li ntpEntTimeDistance
 please fill me in...
 .PP
-This document corresponds to version 4.2.7p394 of NTP.
+This document corresponds to version 4.2.7p395 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 70ddbb3cb..0dc2484a3 100644
--- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
+++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
@@ -1,9 +1,9 @@
-.Dd November 5 2013
+.Dd November 12 2013
 .Dt NTPSNMPD 1ntpsnmpdmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  November  5, 2013 at 11:36:04 AM by AutoGen 5.18.1pre5
+.\"  It has been AutoGen-ed  November 12, 2013 at 11:29:30 AM by AutoGen 5.18.3pre5
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -157,7 +157,7 @@ please fill me in...
 please fill me in...
 .El
 .Pp
-This document corresponds to version 4.2.7p394 of NTP.
+This document corresponds to version 4.2.7p395 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 93808912c..f547dd201 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.7p394 of ntpsnmpd.
+  
          This document applies to version 4.2.7p395 of ntpsnmpd.
 
 
            
 
          • ntpsnmpd Description:             Description
diff --git a/ntpsnmpd/ntpsnmpd.man.in b/ntpsnmpd/ntpsnmpd.man.in
index c83ec1b3d..af6e4ba7a 100644
--- a/ntpsnmpd/ntpsnmpd.man.in
+++ b/ntpsnmpd/ntpsnmpd.man.in
@@ -1,8 +1,8 @@
-.TH ntpsnmpd @NTPSNMPD_MS@ "05 Nov 2013" "4.2.7p394" "User Commands"
+.TH ntpsnmpd @NTPSNMPD_MS@ "12 Nov 2013" "4.2.7p395" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.man)
 .\"
-.\"  It has been AutoGen-ed  November  5, 2013 at 11:35:59 AM by AutoGen 5.18.1pre5
+.\"  It has been AutoGen-ed  November 12, 2013 at 11:29:24 AM by AutoGen 5.18.3pre5
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -170,7 +170,7 @@ please fill me in...
 .BR Li ntpEntTimeDistance
 please fill me in...
 .PP
-This document corresponds to version 4.2.7p394 of NTP.
+This document corresponds to version 4.2.7p395 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 e4576e8bd..f1020c852 100644
--- a/ntpsnmpd/ntpsnmpd.mdoc.in
+++ b/ntpsnmpd/ntpsnmpd.mdoc.in
@@ -1,9 +1,9 @@
-.Dd November 5 2013
+.Dd November 12 2013
 .Dt NTPSNMPD @NTPSNMPD_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  November  5, 2013 at 11:36:04 AM by AutoGen 5.18.1pre5
+.\"  It has been AutoGen-ed  November 12, 2013 at 11:29:30 AM by AutoGen 5.18.3pre5
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -157,7 +157,7 @@ please fill me in...
 please fill me in...
 .El
 .Pp
-This document corresponds to version 4.2.7p394 of NTP.
+This document corresponds to version 4.2.7p395 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 a8c2094a2..2c46ac312 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=394
+point=395
 
 ### 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 65f1c2f59..a2a09e64b 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  November  5, 2013 at 11:30:18 AM by AutoGen 5.18.1pre5
+# It has been AutoGen-ed  November 12, 2013 at 11:25:57 AM by AutoGen 5.18.3pre5
 # From the definitions    ntp-wait-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -81,7 +81,7 @@ Space is not required between options and their arguments.
 @cindex ntp-wait-
 
 This is the ``number of times to check ntpd'' option.
-This option takes an argument number @file{num-tries}.
+This option takes a number argument @file{num-tries}.
 The maximum number of times we will check @code{ntpd} to see if
 it has been able to synchronize and stabilize the system clock.
 @node ntp-wait 
@@ -89,7 +89,7 @@ it has been able to synchronize and stabilize the system clock.
 @cindex ntp-wait-
 
 This is the ``how long to sleep between tries'' option.
-This option takes an argument number @file{secs-between-tries}.
+This option takes a number argument @file{secs-between-tries}.
 We will sleep for @file{secs-between-tries} after each query
 of @code{ntpd} that returns "the time is not yet stable".
 @node ntp-wait 
diff --git a/scripts/ntp-wait.1ntp-waitman b/scripts/ntp-wait.1ntp-waitman
index dabed2140..0a720ba87 100644
--- a/scripts/ntp-wait.1ntp-waitman
+++ b/scripts/ntp-wait.1ntp-waitman
@@ -1,8 +1,8 @@
-.TH ntp-wait 1ntp-waitman "05 Nov 2013" "ntp (4.2.7p394)" "User Commands"
+.TH ntp-wait 1ntp-waitman "12 Nov 2013" "ntp (4.2.7p395)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.man)
 .\"
-.\"  It has been AutoGen-ed  November  5, 2013 at 11:30:14 AM by AutoGen 5.18.1pre5
+.\"  It has been AutoGen-ed  November 12, 2013 at 11:25:53 AM by AutoGen 5.18.3pre5
 .\"  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.7p394 of ntp-wait.
+  
            This document applies to version 4.2.7p395 of ntp-wait.
 
 
            
 
            Short Contents
            
@@ -155,7 +155,7 @@ Up: ntp-wait Invo
 
 
            
 This is the “number of times to check ntpd” option. 
-This option takes an argument number num-tries. 
+This option takes a number argument 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. 
 
            
@@ -170,7 +170,7 @@ Up: ntp-wait Invo
 
 
            
 This is the “how long to sleep between tries” option. 
-This option takes an argument number secs-between-tries. 
+This option takes a number argument secs-between-tries. 
 We will sleep for secs-between-tries after each query
 of ntpd that returns "the time is not yet stable". 
 
            
diff --git a/scripts/ntp-wait.man.in b/scripts/ntp-wait.man.in
index 583a16616..a124fde0f 100644
--- a/scripts/ntp-wait.man.in
+++ b/scripts/ntp-wait.man.in
@@ -1,8 +1,8 @@
-.TH ntp-wait @NTP_WAIT_MS@ "05 Nov 2013" "ntp (4.2.7p394)" "User Commands"
+.TH ntp-wait @NTP_WAIT_MS@ "12 Nov 2013" "ntp (4.2.7p395)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.man)
 .\"
-.\"  It has been AutoGen-ed  November  5, 2013 at 11:30:14 AM by AutoGen 5.18.1pre5
+.\"  It has been AutoGen-ed  November 12, 2013 at 11:25:53 AM by AutoGen 5.18.3pre5
 .\"  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
@@ -195,7 +195,7 @@ to the IPv6 namespace.
 @cindex sntp-authentication
 
 This is the ``enable authentication with the key @var{auth-keynumber}'' option.
-This option takes an argument number @file{auth-keynumber}.
+This option takes a number argument @file{auth-keynumber}.
 Enable authentication using the key specified in this option's
 argument.  The argument of this option is the @option{keyid}, a
 number specified in the @option{keyfile} as this key's identifier.
@@ -205,7 +205,7 @@ See the @option{keyfile} option (@option{-k}) for more details.
 @cindex sntp-broadcast
 
 This is the ``listen to the address specified for broadcast time sync'' option.
-This option takes an argument string @file{broadcast-address}.
+This option takes a string argument @file{broadcast-address}.
 
 @noindent
 This option has some usage constraints.  It:
@@ -222,7 +222,7 @@ can (and probably should) be modified with @option{-t}.
 @cindex sntp-concurrent
 
 This is the ``concurrently query all ips returned for host-name'' option.
-This option takes an argument string @file{host-name}.
+This option takes a string argument @file{host-name}.
 
 @noindent
 This option has some usage constraints.  It:
@@ -245,7 +245,7 @@ different machines, so we can send concurrent queries.
 @cindex sntp-gap
 
 This is the ``the gap (in milliseconds) between time requests'' option.
-This option takes an argument number @file{milliseconds}.
+This option takes a number argument @file{milliseconds}.
 Since we're only going to use the first valid response we get and
 there is benefit to specifying a good number of servers to query,
 separate the queries we send out by the specified number of
@@ -255,7 +255,7 @@ milliseconds.
 @cindex sntp-kod
 
 This is the ``kod history filename'' option.
-This option takes an argument file @file{file-name}.
+This option takes a file argument @file{file-name}.
 Specifies the filename to be used for the persistent history of KoD
 responses received from servers.
 @node sntp keyfile
@@ -263,7 +263,7 @@ responses received from servers.
 @cindex sntp-keyfile
 
 This is the ``look in this file for the key specified with @option{-a}'' option.
-This option takes an argument file @file{file-name}.
+This option takes a file argument @file{file-name}.
 This option specifies the keyfile.
 @code{sntp} will search for the key specified with @option{-a}
 @file{keyno} in this file.  See @command{ntp.keys(5)} for more
@@ -273,7 +273,7 @@ information.
 @cindex sntp-logfile
 
 This is the ``log to specified logfile'' option.
-This option takes an argument file @file{file-name}.
+This option takes a file argument @file{file-name}.
 This option causes the client to write log messages to the specified
 @file{logfile}.
 @node sntp steplimit
@@ -281,7 +281,7 @@ This option causes the client to write log messages to the specified
 @cindex sntp-steplimit
 
 This is the ``adjustments less than @var{steplimit} msec will be slewed'' option.
-This option takes an argument number.
+This option takes a number argument.
 If the time adjustment is less than @file{steplimit} milliseconds,
 slew the amount using @command{adjtime(2)}.  Otherwise, step the
 correction using @command{settimeofday(2)}. 
@@ -290,7 +290,7 @@ correction using @command{settimeofday(2)}.
 @cindex sntp-ntpversion
 
 This is the ``send @var{int} as our ntp protocol version'' option.
-This option takes an argument number.
+This option takes a number argument.
 When sending requests to a remote server, tell them we are running
 NTP protocol version @file{ntpversion} .
 @node sntp usereservedport
@@ -305,7 +305,7 @@ communications.
 @cindex sntp-timeout
 
 This is the ``the number of seconds to wait for responses'' option.
-This option takes an argument number @file{seconds}.
+This option takes a number argument @file{seconds}.
 When waiting for a reply, @code{sntp} will wait the number
 of seconds specified before giving up.  The default should be
 more than enough for a unicast response.  If @code{sntp} is
@@ -321,7 +321,9 @@ This is the ``wait for pending replies (if not setting the time)'' option.
 This option has some usage constraints.  It:
 @itemize @bullet
 @item
-is enabled by default.
+can be disabled with --no-wait.
+@item
+It is enabled by default.
 @end itemize
 
 If we are not setting the time, wait for all pending responses.
diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c
index 2a2db4eb5..22a378784 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  November  5, 2013 at 11:27:32 AM by AutoGen 5.18.1pre5
+ *  It has been AutoGen-ed  November 12, 2013 at 11:18:50 AM by AutoGen 5.18.3pre5
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -70,7 +70,7 @@ extern FILE * option_usage_fp;
  *  static const strings for sntp options
  */
 static char const sntp_opt_strs[2499] =
-/*     0 */ "sntp 4.2.7p394\n"
+/*     0 */ "sntp 4.2.7p395\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"
@@ -154,7 +154,7 @@ static char const sntp_opt_strs[2499] =
 /*  2244 */ "LOAD_OPTS\0"
 /*  2254 */ "no-load-opts\0"
 /*  2267 */ "SNTP\0"
-/*  2272 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p394\n"
+/*  2272 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p395\n"
             "Usage:  %s [ - [] | --[{=| }] ]... \\\n"
             "\t\t[ hostname-or-IP ...]\n\0"
 /*  2433 */ "$HOME\0"
@@ -162,7 +162,7 @@ static char const sntp_opt_strs[2499] =
 /*  2441 */ ".ntprc\0"
 /*  2448 */ "http://bugs.ntp.org, bugs@ntp.org\0"
 /*  2482 */ "\n\0"
-/*  2484 */ "sntp 4.2.7p394";
+/*  2484 */ "sntp 4.2.7p395";
 
 /**
  *  ipv4 option description with
@@ -443,7 +443,7 @@ static int const aIpv6CantList[] = {
 /**
  *  Declare option callback procedures
  */
-/* extracted from optmain.tlib near line 745 */
+/* extracted from optmain.tlib near line 723 */
 
 #if defined(TEST_SNTP_OPTS)
 /*
@@ -822,6 +822,7 @@ doUsageOpt(tOptions * opts, tOptDesc * od)
     ex_code = SNTP_EXIT_SUCCESS;
     optionUsage(&sntpOptions, ex_code);
     /* NOTREACHED */
+    exit(1);
     (void)opts;
     (void)od;
 }
@@ -1026,7 +1027,7 @@ main(int argc, char ** argv)
     return res;
 }
 #endif  /* TEST_SNTP_OPTS END-TEST-MAIN-PROCEDURE */
-/* extracted from optmain.tlib near line 1266 */
+/* extracted from optmain.tlib near line 1245 */
 
 /**
  * The directory containing the data associated with sntp.
@@ -1226,7 +1227,7 @@ static void bogus_function(void) {
      translate option names.
    */
   /* referenced via sntpOptions.pzCopyright */
-  puts(_("sntp 4.2.7p394\n\
+  puts(_("sntp 4.2.7p395\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\
@@ -1315,7 +1316,7 @@ provided \"as is\" without express or implied warranty.\n"));
   puts(_("load options from a config file"));
 
   /* referenced via sntpOptions.pzUsageTitle */
-  puts(_("sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p394\n\
+  puts(_("sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p395\n\
 Usage:  %s [ - [] | --[{=| }] ]... \\\n\
 \t\t[ hostname-or-IP ...]\n"));
 
@@ -1323,7 +1324,7 @@ Usage:  %s [ - [] | --[{=| }] ]... \\\n\
   puts(_("\n"));
 
   /* referenced via sntpOptions.pzFullVersion */
-  puts(_("sntp 4.2.7p394"));
+  puts(_("sntp 4.2.7p395"));
 
   /* referenced via sntpOptions.pzFullUsage */
   puts(_("<<>>"));
diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h
index 245a7d70f..9648bb30f 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  November  5, 2013 at 11:27:31 AM by AutoGen 5.18.1pre5
+ *  It has been AutoGen-ed  November 12, 2013 at 11:18:48 AM by AutoGen 5.18.3pre5
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -91,9 +91,9 @@ typedef enum {
 /** count of all options for sntp */
 #define OPTION_CT    23
 /** sntp version */
-#define SNTP_VERSION       "4.2.7p394"
+#define SNTP_VERSION       "4.2.7p395"
 /** Full sntp version text */
-#define SNTP_FULL_VERSION  "sntp 4.2.7p394"
+#define SNTP_FULL_VERSION  "sntp 4.2.7p395"
 
 /**
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/sntp/sntp.1sntpman b/sntp/sntp.1sntpman
index 8713d0178..b89c988b5 100644
--- a/sntp/sntp.1sntpman
+++ b/sntp/sntp.1sntpman
@@ -1,8 +1,8 @@
-.TH sntp 1sntpman "05 Nov 2013" "4.2.7p394" "User Commands"
+.TH sntp 1sntpman "12 Nov 2013" "4.2.7p395" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.man)
 .\"
-.\"  It has been AutoGen-ed  November  5, 2013 at 11:36:44 AM by AutoGen 5.18.1pre5
+.\"  It has been AutoGen-ed  November 12, 2013 at 11:30:19 AM by AutoGen 5.18.3pre5
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -317,7 +317,7 @@ This program is released under the terms of the NTP license, This document applies to version 4.2.7p394 of sntp.
+  
            This document applies to version 4.2.7p395 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.7p394
+
            sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p395
 Usage:  sntp [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description
@@ -285,7 +285,7 @@ Up: sntp Invocation
 
 
            
 This is the “enable authentication with the key auth-keynumber” option. 
-This option takes an argument number auth-keynumber. 
+This option takes a number argument auth-keynumber. 
 Enable authentication using the key specified in this option's
 argument.  The argument of this option is the keyid, a
 number specified in the keyfile as this key's identifier. 
@@ -302,7 +302,7 @@ Up: sntp Invocation
 
 
            
 This is the “listen to the address specified for broadcast time sync” option. 
-This option takes an argument string broadcast-address.
+This option takes a string argument broadcast-address.
 
 
            This option has some usage constraints.  It:
      
              
@@ -324,7 +324,7 @@ Up: sntp Invocation
 
 
              
 This is the “concurrently query all ips returned for host-name” option. 
-This option takes an argument string host-name.
+This option takes a string argument host-name.
 
 
              This option has some usage constraints.  It:
      
                
@@ -352,7 +352,7 @@ Up: sntp Invocation
 
 
                
 This is the “the gap (in milliseconds) between time requests” option. 
-This option takes an argument number milliseconds. 
+This option takes a number argument milliseconds. 
 Since we're only going to use the first valid response we get and
 there is benefit to specifying a good number of servers to query,
 separate the queries we send out by the specified number of
@@ -369,7 +369,7 @@ Up: sntp Invocation
 
 
                
 This is the “kod history filename” option. 
-This option takes an argument file file-name. 
+This option takes a file argument file-name. 
 Specifies the filename to be used for the persistent history of KoD
 responses received from servers. 
 
                
@@ -384,7 +384,7 @@ Up: sntp Invocation
 
 
                
 This is the “look in this file for the key specified with -a” option. 
-This option takes an argument file file-name. 
+This option takes a file argument file-name. 
 This option specifies the keyfile. 
 sntp will search for the key specified with -a
 keyno in this file.  See ntp.keys(5) for more
@@ -401,7 +401,7 @@ Up: sntp Invocation
 
 
                
 This is the “log to specified logfile” option. 
-This option takes an argument file file-name. 
+This option takes a file argument file-name. 
 This option causes the client to write log messages to the specified
 logfile. 
 
                
@@ -416,7 +416,7 @@ Up: sntp Invocation
 
 
                
 This is the “adjustments less than steplimit msec will be slewed” option. 
-This option takes an argument number. 
+This option takes a number argument. 
 If the time adjustment is less than steplimit milliseconds,
 slew the amount using adjtime(2).  Otherwise, step the
 correction using settimeofday(2). 
@@ -432,7 +432,7 @@ Up: sntp Invocation
 
 
                
 This is the “send int as our ntp protocol version” option. 
-This option takes an argument number. 
+This option takes a number argument. 
 When sending requests to a remote server, tell them we are running
 NTP protocol version ntpversion . 
 
                
@@ -461,7 +461,7 @@ Up: sntp Invocation
 
 
                
 This is the “the number of seconds to wait for responses” option. 
-This option takes an argument number seconds. 
+This option takes a number argument seconds. 
 When waiting for a reply, sntp will wait the number
 of seconds specified before giving up.  The default should be
 more than enough for a unicast response.  If sntp is
@@ -482,7 +482,8 @@ This is the “wait for pending replies (if not setting the time)” opt
 
 
                This option has some usage constraints.  It:
      
                  
-
                • is enabled by default. 
+
                • can be disabled with –no-wait. 
+
                • It is enabled by default. 
 
                
 
   
                If we are not setting the time, wait for all pending responses.
diff --git a/sntp/sntp.man.in b/sntp/sntp.man.in
index 0e53a0164..b0b147f52 100644
--- a/sntp/sntp.man.in
+++ b/sntp/sntp.man.in
@@ -1,8 +1,8 @@
-.TH sntp @SNTP_MS@ "05 Nov 2013" "4.2.7p394" "User Commands"
+.TH sntp @SNTP_MS@ "12 Nov 2013" "4.2.7p395" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.man)
 .\"
-.\"  It has been AutoGen-ed  November  5, 2013 at 11:36:44 AM by AutoGen 5.18.1pre5
+.\"  It has been AutoGen-ed  November 12, 2013 at 11:30:19 AM by AutoGen 5.18.3pre5
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -317,7 +317,7 @@ This program is released under the terms of the NTP license,  [] | --[@{=| @}] ]...
   Flg Arg Option-Name    Description
    -b Num imbits         identity modulus bits
@@ -966,7 +966,7 @@ exit 0
 @cindex ntp-keygen-imbits
 
 This is the ``identity modulus bits'' option.
-This option takes an argument number @file{imbits}.
+This option takes a number argument @file{imbits}.
 
 @noindent
 This option has some usage constraints.  It:
@@ -981,7 +981,7 @@ The number of bits in the identity modulus.  The default is 256.
 @cindex ntp-keygen-certificate
 
 This is the ``certificate scheme'' option.
-This option takes an argument string @file{scheme}.
+This option takes a string argument @file{scheme}.
 
 @noindent
 This option has some usage constraints.  It:
@@ -1003,7 +1003,7 @@ this option is RSA-MD5.
 @cindex ntp-keygen-cipher
 
 This is the ``privatekey cipher'' option.
-This option takes an argument string @file{cipher}.
+This option takes a string argument @file{cipher}.
 
 @noindent
 This option has some usage constraints.  It:
@@ -1080,7 +1080,7 @@ any that may exist.
 @cindex ntp-keygen-ident
 
 This is the ``set autokey group name'' option.
-This option takes an argument string @file{group}.
+This option takes a string argument @file{group}.
 
 @noindent
 This option has some usage constraints.  It:
@@ -1103,7 +1103,7 @@ issuer names in the form @code{host@group} and should match the
 @cindex ntp-keygen-lifetime
 
 This is the ``set certificate lifetime'' option.
-This option takes an argument number @file{lifetime}.
+This option takes a number argument @file{lifetime}.
 
 @noindent
 This option has some usage constraints.  It:
@@ -1124,7 +1124,7 @@ Generate MD5 keys, obsoleting any that may exist.
 @cindex ntp-keygen-modulus
 
 This is the ``modulus'' option.
-This option takes an argument number @file{modulus}.
+This option takes a number argument @file{modulus}.
 
 @noindent
 This option has some usage constraints.  It:
@@ -1154,7 +1154,7 @@ public certificates.
 @cindex ntp-keygen-pvt-passwd
 
 This is the ``output private password'' option.
-This option takes an argument string @file{passwd}.
+This option takes a string argument @file{passwd}.
 
 @noindent
 This option has some usage constraints.  It:
@@ -1170,7 +1170,7 @@ password and the cipher selected with @code{-C/--cipher}.
 @cindex ntp-keygen-get-pvt-passwd
 
 This is the ``input private password'' option.
-This option takes an argument string @file{passwd}.
+This option takes a string argument @file{passwd}.
 
 @noindent
 This option has some usage constraints.  It:
@@ -1185,7 +1185,7 @@ Set the password for reading files to the specified password.
 @cindex ntp-keygen-sign-key
 
 This is the ``generate sign key (rsa or dsa)'' option.
-This option takes an argument string @file{sign}.
+This option takes a string argument @file{sign}.
 
 @noindent
 This option has some usage constraints.  It:
@@ -1202,7 +1202,7 @@ sign key.
 @cindex ntp-keygen-subject-name
 
 This is the ``set host and optionally group name'' option.
-This option takes an argument string @file{host@@group}.
+This option takes a string argument @file{host@@group}.
 
 @noindent
 This option has some usage constraints.  It:
@@ -1241,7 +1241,7 @@ a non-trusted certificate.
 @cindex ntp-keygen-mv-params
 
 This is the ``generate  mv parameters'' option.
-This option takes an argument number @file{num}.
+This option takes a number argument @file{num}.
 
 @noindent
 This option has some usage constraints.  It:
@@ -1257,7 +1257,7 @@ identification scheme.
 @cindex ntp-keygen-mv-keys
 
 This is the ``update  mv keys'' option.
-This option takes an argument number @file{num}.
+This option takes a number argument @file{num}.
 
 @noindent
 This option has some usage constraints.  It:
diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c
index f852359f4..eaa8d836d 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  November  5, 2013 at 11:36:09 AM by AutoGen 5.18.1pre5
+ *  It has been AutoGen-ed  November 12, 2013 at 11:29:34 AM by AutoGen 5.18.3pre5
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -72,7 +72,7 @@ extern FILE * option_usage_fp;
  *  static const strings for ntp-keygen options
  */
 static char const ntp_keygen_opt_strs[2357] =
-/*     0 */ "ntp-keygen (ntp) 4.2.7p394\n"
+/*     0 */ "ntp-keygen (ntp) 4.2.7p395\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"
@@ -163,14 +163,14 @@ static char const ntp_keygen_opt_strs[2357] =
 /*  2136 */ "no-load-opts\0"
 /*  2149 */ "no\0"
 /*  2152 */ "NTP_KEYGEN\0"
-/*  2163 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p394\n"
+/*  2163 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p395\n"
             "Usage:  %s [ - [] | --[{=| }] ]...\n\0"
 /*  2279 */ "$HOME\0"
 /*  2285 */ ".\0"
 /*  2287 */ ".ntprc\0"
 /*  2294 */ "http://bugs.ntp.org, bugs@ntp.org\0"
 /*  2328 */ "\n\0"
-/*  2330 */ "ntp-keygen (ntp) 4.2.7p394";
+/*  2330 */ "ntp-keygen (ntp) 4.2.7p395";
 
 /**
  *  imbits option description:
@@ -623,7 +623,7 @@ static char const ntp_keygen_opt_strs[2357] =
 #else /* not AUTOKEY */
 # define doOptModulus NULL
 #endif /* def/not AUTOKEY */
-/* extracted from optmain.tlib near line 745 */
+/* extracted from optmain.tlib near line 723 */
 
 #if defined(TEST_NTP_KEYGEN_OPTS)
 /*
@@ -1036,6 +1036,7 @@ doUsageOpt(tOptions * opts, tOptDesc * od)
     ex_code = NTP_KEYGEN_EXIT_SUCCESS;
     optionUsage(&ntp_keygenOptions, ex_code);
     /* NOTREACHED */
+    exit(1);
     (void)opts;
     (void)od;
 }
@@ -1164,7 +1165,7 @@ main(int argc, char ** argv)
     return res;
 }
 #endif  /* TEST_NTP_KEYGEN_OPTS END-TEST-MAIN-PROCEDURE */
-/* extracted from optmain.tlib near line 1266 */
+/* extracted from optmain.tlib near line 1245 */
 
 /**
  * The directory containing the data associated with ntp-keygen.
@@ -1364,7 +1365,7 @@ static void bogus_function(void) {
      translate option names.
    */
   /* referenced via ntp_keygenOptions.pzCopyright */
-  puts(_("ntp-keygen (ntp) 4.2.7p394\n\
+  puts(_("ntp-keygen (ntp) 4.2.7p395\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\
@@ -1462,14 +1463,14 @@ provided \"as is\" without express or implied warranty.\n"));
   puts(_("load options from a config file"));
 
   /* referenced via ntp_keygenOptions.pzUsageTitle */
-  puts(_("ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p394\n\
+  puts(_("ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p395\n\
 Usage:  %s [ - [] | --[{=| }] ]...\n"));
 
   /* referenced via ntp_keygenOptions.pzExplain */
   puts(_("\n"));
 
   /* referenced via ntp_keygenOptions.pzFullVersion */
-  puts(_("ntp-keygen (ntp) 4.2.7p394"));
+  puts(_("ntp-keygen (ntp) 4.2.7p395"));
 
   /* referenced via ntp_keygenOptions.pzFullUsage */
   puts(_("<<>>"));
diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h
index 733402228..c14c8b366 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  November  5, 2013 at 11:36:08 AM by AutoGen 5.18.1pre5
+ *  It has been AutoGen-ed  November 12, 2013 at 11:29:33 AM by AutoGen 5.18.3pre5
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -94,9 +94,9 @@ typedef enum {
 /** count of all options for ntp-keygen */
 #define OPTION_CT    26
 /** ntp-keygen version */
-#define NTP_KEYGEN_VERSION       "4.2.7p394"
+#define NTP_KEYGEN_VERSION       "4.2.7p395"
 /** Full ntp-keygen version text */
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.7p394"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.7p395"
 
 /**
  *  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 b1e354879..8da5dacab 100644
--- a/util/ntp-keygen.1ntp-keygenman
+++ b/util/ntp-keygen.1ntp-keygenman
@@ -1,8 +1,8 @@
-.TH ntp-keygen 1ntp-keygenman "05 Nov 2013" "ntp (4.2.7p394)" "User Commands"
+.TH ntp-keygen 1ntp-keygenman "12 Nov 2013" "ntp (4.2.7p395)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.man)
 .\"
-.\"  It has been AutoGen-ed  November  5, 2013 at 11:36:22 AM by AutoGen 5.18.1pre5
+.\"  It has been AutoGen-ed  November 12, 2013 at 11:29:42 AM by AutoGen 5.18.3pre5
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -1110,7 +1110,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.7p394 of NTP.
+This document corresponds to version 4.2.7p395 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 ac5818064..7ad82c35e 100644
--- a/util/ntp-keygen.1ntp-keygenmdoc
+++ b/util/ntp-keygen.1ntp-keygenmdoc
@@ -1,9 +1,9 @@
-.Dd November 5 2013
+.Dd November 12 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  November  5, 2013 at 11:36:28 AM by AutoGen 5.18.1pre5
+.\"  It has been AutoGen-ed  November 12, 2013 at 11:29:49 AM by AutoGen 5.18.3pre5
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -1073,7 +1073,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.7p394 of NTP.
+This document corresponds to version 4.2.7p395 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 007171b2c..5f4dd1198 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.7p394 of ntp-keygen.
+  
                This document applies to version 4.2.7p395 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.7p393
+
                ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p394
 Usage:  ntp-keygen [ -<flag> [<val>] | --<name>[{=| }<val>] ]...
   Flg Arg Option-Name    Description
    -b Num imbits         identity modulus bits
diff --git a/util/ntp-keygen.man.in b/util/ntp-keygen.man.in
index d14e70feb..1c6549344 100644
--- a/util/ntp-keygen.man.in
+++ b/util/ntp-keygen.man.in
@@ -1,8 +1,8 @@
-.TH ntp-keygen @NTP_KEYGEN_MS@ "05 Nov 2013" "ntp (4.2.7p394)" "User Commands"
+.TH ntp-keygen @NTP_KEYGEN_MS@ "12 Nov 2013" "ntp (4.2.7p395)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.man)
 .\"
-.\"  It has been AutoGen-ed  November  5, 2013 at 11:36:22 AM by AutoGen 5.18.1pre5
+.\"  It has been AutoGen-ed  November 12, 2013 at 11:29:42 AM by AutoGen 5.18.3pre5
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -1110,7 +1110,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.7p394 of NTP.
+This document corresponds to version 4.2.7p395 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 c243b4bb0..5160dd290 100644
--- a/util/ntp-keygen.mdoc.in
+++ b/util/ntp-keygen.mdoc.in
@@ -1,9 +1,9 @@
-.Dd November 5 2013
+.Dd November 12 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  November  5, 2013 at 11:36:28 AM by AutoGen 5.18.1pre5
+.\"  It has been AutoGen-ed  November 12, 2013 at 11:29:49 AM by AutoGen 5.18.3pre5
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -1073,7 +1073,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.7p394 of NTP.
+This document corresponds to version 4.2.7p395 of NTP.
 Portions of this document came from FreeBSD.
 .Pp
 This manual page was \fIAutoGen\fP\-erated from the \fBntp\-keygen\fP