From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 21 Dec 2010 11:27:17 +0000 (+0000)
Subject: NTP_4_2_7P100
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b86956a98fb29dca6de7455d01cd754ad4f76a99;p=thirdparty%2Fntp.git

NTP_4_2_7P100

bk: 4d108f15Dos9Tah56BwzGlAUxArlxQ
---

diff --git a/ChangeLog b/ChangeLog
index 4fa61c6983..364ebd5838 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+(4.2.7p100) 2010/12/21 Released by Harlan Stenn <stenn@ntp.org>
 (4.2.7p99) 2010/12/21 Released by Harlan Stenn <stenn@ntp.org>
 * Add unit tests for msnprintf().
 (4.2.7p98) 2010/12/20 Released by Harlan Stenn <stenn@ntp.org>
diff --git a/clockstuff/clktest-opts.c b/clockstuff/clktest-opts.c
index 919becd755..773f67d13d 100644
--- a/clockstuff/clktest-opts.c
+++ b/clockstuff/clktest-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (clktest-opts.c)
  *  
- *  It has been AutoGen-ed  December 21, 2010 at 09:35:54 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 21, 2010 at 11:17:42 AM by AutoGen 5.11.6pre5
  *  From the definitions    clktest-opts.def
  *  and the template file   options
  *
@@ -324,8 +324,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  *  Define the Clktest Option Environment
  */
 static char const zPROGNAME[8] = "CLKTEST";
-static char const zUsageTitle[128] =
-"clktest - test the clock line discipline - Ver. 4.2.7p99\n\
+static char const zUsageTitle[129] =
+"clktest - test the clock line discipline - Ver. 4.2.7p100\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... <tty_device>\n";
 static char const zRcName[7] = ".ntprc";
 static char const * const apzHomeList[3] = {
diff --git a/clockstuff/clktest-opts.h b/clockstuff/clktest-opts.h
index ca1e66b091..b6b93c24fd 100644
--- a/clockstuff/clktest-opts.h
+++ b/clockstuff/clktest-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (clktest-opts.h)
  *  
- *  It has been AutoGen-ed  December 21, 2010 at 09:35:54 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 21, 2010 at 11:17:41 AM by AutoGen 5.11.6pre5
  *  From the definitions    clktest-opts.def
  *  and the template file   options
  *
@@ -63,8 +63,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    10
-#define CLKTEST_VERSION       "4.2.7p99"
-#define CLKTEST_FULL_VERSION  "clktest - test the clock line discipline - Ver. 4.2.7p99"
+#define CLKTEST_VERSION       "4.2.7p100"
+#define CLKTEST_FULL_VERSION  "clktest - test the clock line discipline - Ver. 4.2.7p100"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c
index cb21c06fd0..1092feee80 100644
--- a/ntpd/ntpd-opts.c
+++ b/ntpd/ntpd-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpd-opts.c)
  *  
- *  It has been AutoGen-ed  December 21, 2010 at 09:34:47 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 21, 2010 at 11:11:48 AM by AutoGen 5.11.6pre5
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
@@ -1005,8 +1005,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  *  Define the Ntpd Option Environment
  */
 static char const zPROGNAME[5] = "NTPD";
-static char const zUsageTitle[132] =
-"ntpd - NTP daemon program - Ver. 4.2.7p99\n\
+static char const zUsageTitle[133] =
+"ntpd - NTP daemon program - Ver. 4.2.7p100\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n\
 \t\t[ <server1> ... <serverN> ]\n";
 #define zRcName     NULL
diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h
index 1cf9df4ac1..755e367d6c 100644
--- a/ntpd/ntpd-opts.h
+++ b/ntpd/ntpd-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpd-opts.h)
  *  
- *  It has been AutoGen-ed  December 21, 2010 at 09:34:47 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 21, 2010 at 11:11:48 AM by AutoGen 5.11.6pre5
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
@@ -89,8 +89,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    36
-#define NTPD_VERSION       "4.2.7p99"
-#define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.7p99"
+#define NTPD_VERSION       "4.2.7p100"
+#define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.7p100"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi
index 0835d751b0..5915227179 100644
--- a/ntpd/ntpd-opts.texi
+++ b/ntpd/ntpd-opts.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntpd-opts.texi)
 # 
-# It has been AutoGen-ed  December 21, 2010 at 09:35:15 AM by AutoGen 5.11.6pre5
+# It has been AutoGen-ed  December 21, 2010 at 11:14:06 AM by AutoGen 5.11.6pre5
 # From the definitions    ntpd-opts.def
 # and the template file   aginfo.tpl
 @end ignore
diff --git a/ntpd/ntpd.1 b/ntpd/ntpd.1
index d0b652535c..975258929b 100644
--- a/ntpd/ntpd.1
+++ b/ntpd/ntpd.1
@@ -1,7 +1,7 @@
-.TH NTPD 1 2010-12-21 "( 4.2.7p99)" "Programmer's Manual"
+.TH NTPD 1 2010-12-21 "( 4.2.7p100)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd.1)
 .\"  
-.\"  It has been AutoGen-ed  December 21, 2010 at 09:35:15 AM by AutoGen 5.11.6pre5
+.\"  It has been AutoGen-ed  December 21, 2010 at 11:14:03 AM by AutoGen 5.11.6pre5
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agman1.tpl
 .\"
diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c
index 21098adb73..b9faad98c8 100644
--- a/ntpdc/ntpdc-opts.c
+++ b/ntpdc/ntpdc-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.c)
  *  
- *  It has been AutoGen-ed  December 21, 2010 at 09:35:22 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 21, 2010 at 11:15:13 AM by AutoGen 5.11.6pre5
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -450,8 +450,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  *  Define the Ntpdc Option Environment
  */
 static char const zPROGNAME[6] = "NTPDC";
-static char const zUsageTitle[128] =
-"ntpdc - vendor-specific NTP query program - Ver. 4.2.7p99\n\
+static char const zUsageTitle[129] =
+"ntpdc - vendor-specific NTP query program - Ver. 4.2.7p100\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n";
 static char const zRcName[7] = ".ntprc";
 static char const * const apzHomeList[3] = {
diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h
index ae3ad5de83..600dfdc36a 100644
--- a/ntpdc/ntpdc-opts.h
+++ b/ntpdc/ntpdc-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.h)
  *  
- *  It has been AutoGen-ed  December 21, 2010 at 09:35:22 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 21, 2010 at 11:15:12 AM by AutoGen 5.11.6pre5
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -68,8 +68,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    15
-#define NTPDC_VERSION       "4.2.7p99"
-#define NTPDC_FULL_VERSION  "ntpdc - vendor-specific NTP query program - Ver. 4.2.7p99"
+#define NTPDC_VERSION       "4.2.7p100"
+#define NTPDC_FULL_VERSION  "ntpdc - vendor-specific NTP query program - Ver. 4.2.7p100"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi
index a19e4e75f1..df547f496a 100644
--- a/ntpdc/ntpdc-opts.texi
+++ b/ntpdc/ntpdc-opts.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntpdc-opts.texi)
 # 
-# It has been AutoGen-ed  December 21, 2010 at 09:35:35 AM by AutoGen 5.11.6pre5
+# It has been AutoGen-ed  December 21, 2010 at 11:16:16 AM by AutoGen 5.11.6pre5
 # From the definitions    ntpdc-opts.def
 # and the template file   aginfo.tpl
 @end ignore
diff --git a/ntpdc/ntpdc.1 b/ntpdc/ntpdc.1
index 83940d4b1a..91e734d493 100644
--- a/ntpdc/ntpdc.1
+++ b/ntpdc/ntpdc.1
@@ -1,7 +1,7 @@
-.TH NTPDC 1 2010-12-21 "( 4.2.7p99)" "Programmer's Manual"
+.TH NTPDC 1 2010-12-21 "( 4.2.7p100)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc.1)
 .\"  
-.\"  It has been AutoGen-ed  December 21, 2010 at 09:35:34 AM by AutoGen 5.11.6pre5
+.\"  It has been AutoGen-ed  December 21, 2010 at 11:16:14 AM by AutoGen 5.11.6pre5
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agman1.tpl
 .\"
diff --git a/ntpq/ntpq-opts.c b/ntpq/ntpq-opts.c
index 16921eb254..15dfe23fe2 100644
--- a/ntpq/ntpq-opts.c
+++ b/ntpq/ntpq-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpq-opts.c)
  *  
- *  It has been AutoGen-ed  December 21, 2010 at 09:35:35 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 21, 2010 at 11:16:19 AM by AutoGen 5.11.6pre5
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -427,8 +427,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  *  Define the Ntpq Option Environment
  */
 static char const zPROGNAME[5] = "NTPQ";
-static char const zUsageTitle[120] =
-"ntpq - standard NTP query program - Ver. 4.2.7p99\n\
+static char const zUsageTitle[121] =
+"ntpq - standard NTP query program - Ver. 4.2.7p100\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n";
 static char const zRcName[7] = ".ntprc";
 static char const * const apzHomeList[3] = {
diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h
index 71d0aeadca..b3ec31100e 100644
--- a/ntpq/ntpq-opts.h
+++ b/ntpq/ntpq-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpq-opts.h)
  *  
- *  It has been AutoGen-ed  December 21, 2010 at 09:35:35 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 21, 2010 at 11:16:18 AM by AutoGen 5.11.6pre5
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -67,8 +67,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    14
-#define NTPQ_VERSION       "4.2.7p99"
-#define NTPQ_FULL_VERSION  "ntpq - standard NTP query program - Ver. 4.2.7p99"
+#define NTPQ_VERSION       "4.2.7p100"
+#define NTPQ_FULL_VERSION  "ntpq - standard NTP query program - Ver. 4.2.7p100"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi
index dbc424210b..060429e42b 100644
--- a/ntpq/ntpq-opts.texi
+++ b/ntpq/ntpq-opts.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntpq-opts.texi)
 # 
-# It has been AutoGen-ed  December 21, 2010 at 09:35:47 AM by AutoGen 5.11.6pre5
+# It has been AutoGen-ed  December 21, 2010 at 11:17:10 AM by AutoGen 5.11.6pre5
 # From the definitions    ntpq-opts.def
 # and the template file   aginfo.tpl
 @end ignore
diff --git a/ntpq/ntpq.1 b/ntpq/ntpq.1
index 820dc93f70..b415feb72b 100644
--- a/ntpq/ntpq.1
+++ b/ntpq/ntpq.1
@@ -1,7 +1,7 @@
-.TH NTPQ 1 2010-12-21 "( 4.2.7p99)" "Programmer's Manual"
+.TH NTPQ 1 2010-12-21 "( 4.2.7p100)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq.1)
 .\"  
-.\"  It has been AutoGen-ed  December 21, 2010 at 09:35:47 AM by AutoGen 5.11.6pre5
+.\"  It has been AutoGen-ed  December 21, 2010 at 11:17:09 AM by AutoGen 5.11.6pre5
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agman1.tpl
 .\"
diff --git a/ntpsnmpd/ntpsnmpd-opts.c b/ntpsnmpd/ntpsnmpd-opts.c
index b3b9bb1dec..6458f4b9b3 100644
--- a/ntpsnmpd/ntpsnmpd-opts.c
+++ b/ntpsnmpd/ntpsnmpd-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.c)
  *  
- *  It has been AutoGen-ed  December 21, 2010 at 09:35:48 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 21, 2010 at 11:17:12 AM by AutoGen 5.11.6pre5
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -254,8 +254,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  *  Define the Ntpsnmpd Option Environment
  */
 static char const zPROGNAME[9] = "NTPSNMPD";
-static char const zUsageTitle[104] =
-"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p99\n\
+static char const zUsageTitle[105] =
+"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p100\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
 static char const zRcName[7] = ".ntprc";
 static char const * const apzHomeList[3] = {
diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h
index c002c68da3..7226628d1b 100644
--- a/ntpsnmpd/ntpsnmpd-opts.h
+++ b/ntpsnmpd/ntpsnmpd-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.h)
  *  
- *  It has been AutoGen-ed  December 21, 2010 at 09:35:47 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 21, 2010 at 11:17:12 AM by AutoGen 5.11.6pre5
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -61,8 +61,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    8
-#define NTPSNMPD_VERSION       "4.2.7p99"
-#define NTPSNMPD_FULL_VERSION  "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p99"
+#define NTPSNMPD_VERSION       "4.2.7p100"
+#define NTPSNMPD_FULL_VERSION  "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p100"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpsnmpd/ntpsnmpd-opts.texi b/ntpsnmpd/ntpsnmpd-opts.texi
index d30a7c5b7f..7deddd8a6c 100644
--- a/ntpsnmpd/ntpsnmpd-opts.texi
+++ b/ntpsnmpd/ntpsnmpd-opts.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.texi)
 # 
-# It has been AutoGen-ed  December 21, 2010 at 09:35:53 AM by AutoGen 5.11.6pre5
+# It has been AutoGen-ed  December 21, 2010 at 11:17:38 AM by AutoGen 5.11.6pre5
 # From the definitions    ntpsnmpd-opts.def
 # and the template file   aginfo.tpl
 @end ignore
diff --git a/ntpsnmpd/ntpsnmpd.1 b/ntpsnmpd/ntpsnmpd.1
index 6c121a367d..27d6dc45ea 100644
--- a/ntpsnmpd/ntpsnmpd.1
+++ b/ntpsnmpd/ntpsnmpd.1
@@ -1,7 +1,7 @@
-.TH NTPSNMPD 1 2010-12-21 "( 4.2.7p99)" "Programmer's Manual"
+.TH NTPSNMPD 1 2010-12-21 "( 4.2.7p100)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd.1)
 .\"  
-.\"  It has been AutoGen-ed  December 21, 2010 at 09:35:53 AM by AutoGen 5.11.6pre5
+.\"  It has been AutoGen-ed  December 21, 2010 at 11:17:37 AM by AutoGen 5.11.6pre5
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agman1.tpl
 .\"
diff --git a/packageinfo.sh b/packageinfo.sh
index e8269291c5..3ae95f485d 100644
--- a/packageinfo.sh
+++ b/packageinfo.sh
@@ -57,7 +57,7 @@ CLTAG=NTP_4_2_0
 # - Numeric values increment
 # - empty 'increments' to 1
 # - NEW 'increments' to empty
-point=99
+point=100
 
 ### betapoint is normally modified by script.
 # ntp-stable Beta number (betapoint)
diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c
index 9174ccba0c..0a339ecbbd 100644
--- a/sntp/sntp-opts.c
+++ b/sntp/sntp-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (sntp-opts.c)
  *  
- *  It has been AutoGen-ed  December 21, 2010 at 09:34:40 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 21, 2010 at 11:10:39 AM by AutoGen 5.11.6pre5
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -472,8 +472,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  *  Define the Sntp Option Environment
  */
 static char const zPROGNAME[5] = "SNTP";
-static char const zUsageTitle[122] =
-"sntp - standard SNTP program - Ver. 4.2.7p99\n\
+static char const zUsageTitle[123] =
+"sntp - standard SNTP program - Ver. 4.2.7p100\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... hostname-or-IP ...\n";
 static char const zRcName[7] = ".ntprc";
 static char const * const apzHomeList[3] = {
diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h
index 0a4708b65f..6c122aac8b 100644
--- a/sntp/sntp-opts.h
+++ b/sntp/sntp-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (sntp-opts.h)
  *  
- *  It has been AutoGen-ed  December 21, 2010 at 09:34:40 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 21, 2010 at 11:10:37 AM by AutoGen 5.11.6pre5
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -70,8 +70,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    17
-#define SNTP_VERSION       "4.2.7p99"
-#define SNTP_FULL_VERSION  "sntp - standard SNTP program - Ver. 4.2.7p99"
+#define SNTP_VERSION       "4.2.7p100"
+#define SNTP_FULL_VERSION  "sntp - standard SNTP program - Ver. 4.2.7p100"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi
index 2e9eba926d..af056924ae 100644
--- a/sntp/sntp-opts.texi
+++ b/sntp/sntp-opts.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (sntp-opts.texi)
 # 
-# It has been AutoGen-ed  December 21, 2010 at 09:34:46 AM by AutoGen 5.11.6pre5
+# It has been AutoGen-ed  December 21, 2010 at 11:11:33 AM by AutoGen 5.11.6pre5
 # From the definitions    sntp-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -25,7 +25,7 @@ are defined and described by RFC 5905.
 The default is to write the estimated correct local date and time (i.e. not
 UTC) to the standard output in a format like
 @example
-1996 Oct 15 20:17:25.123 +4.567 +/- 0.089 secs
+1996-10-15 20:17:25.123 (+0800) +4.567 +/- 0.089 secs
 @end example
 where the
 @example
@@ -33,8 +33,9 @@ where the
 @end example
 indicates the local clock is 4.567 seconds behind the correct time
 (so 4.567 seconds must be added to the local clock to get it to be correct),
-and the time of
-@code{1996 Oct 15 20:17:25.123}
+and the (local) time of
+@code{1996-10-15 20:17:25.123}
+can be converted to UTC time by adding 8 hours and 0 minutes, and
 is believed to be correct to within
 @code{+/- 0.089}
 seconds.
diff --git a/sntp/sntp.1 b/sntp/sntp.1
index 2f9ad42529..59fd57ce98 100644
--- a/sntp/sntp.1
+++ b/sntp/sntp.1
@@ -1,7 +1,7 @@
-.TH SNTP 1 2010-12-21 "( 4.2.7p99)" "Programmer's Manual"
+.TH SNTP 1 2010-12-21 "( 4.2.7p100)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp.1)
 .\"  
-.\"  It has been AutoGen-ed  December 21, 2010 at 09:34:46 AM by AutoGen 5.11.6pre5
+.\"  It has been AutoGen-ed  December 21, 2010 at 11:11:30 AM by AutoGen 5.11.6pre5
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman1.tpl
 .\"
@@ -31,13 +31,17 @@ are defined and described by RFC 5905.
 .PP
 The default is to write the estimated correct local date and time (i.e. not
 UTC) to the standard output in a format like
-.BR "'1996 Oct 15 20:17:25.123 +4.567 +/- 0.089 secs'" ,
+.BR "'1996-10-15 20:17:25.123 (+0800) +4.567 +/- 0.089 secs'" ,
 where the
+.B "'(+0800)'"
+means that to get to UTC from the reported local time one must
+add 8 hours and 0 minutes,
+and the
 .B "'+4.567 +/- 0.089 secs'"
 indicates the local clock is 4.567 seconds behind the correct time
 (so 4.567 seconds must be added to the local clock to get it to be correct),
 and the time of
-'1996 Oct 15 20:17:25.123'
+'1996-10-15 20:17:25.123'
 is believed to be correct to within
 +/- 0.089
 seconds.
diff --git a/sntp/sntp.html b/sntp/sntp.html
index 857154c82f..91e5d71224 100644
--- a/sntp/sntp.html
+++ b/sntp/sntp.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.
 
-  <p>This document applies to version 4.2.7p99 of <code>sntp</code>.
+  <p>This document applies to version 4.2.7p100 of <code>sntp</code>.
 
   <p>The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
@@ -92,15 +92,16 @@ are defined and described by RFC 5905.
 
   <p class="indent">The default is to write the estimated correct local date and time (i.e. not
 UTC) to the standard output in a format like
-<pre class="example">     1996 Oct 15 20:17:25.123 +4.567 +/- 0.089 secs
+<pre class="example">     1996-10-15 20:17:25.123 (+0800) +4.567 +/- 0.089 secs
 </pre>
   <p>where the
 <pre class="example">     +4.567 +/- 0.089 secs
 </pre>
   <p>indicates the local clock is 4.567 seconds behind the correct time
 (so 4.567 seconds must be added to the local clock to get it to be correct),
-and the time of
-<code>1996 Oct 15 20:17:25.123</code>
+and the (local) time of
+<code>1996-10-15 20:17:25.123</code>
+can be converted to UTC time by adding 8 hours and 0 minutes, and
 is believed to be correct to within
 <code>+/- 0.089</code>
 seconds.
diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c
index 01eb55f51b..64958fd496 100644
--- a/util/ntp-keygen-opts.c
+++ b/util/ntp-keygen-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.c)
  *  
- *  It has been AutoGen-ed  December 21, 2010 at 09:35:59 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 21, 2010 at 11:17:45 AM by AutoGen 5.11.6pre5
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -756,8 +756,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  *  Define the Ntp_Keygen Option Environment
  */
 static char const zPROGNAME[11] = "NTP_KEYGEN";
-static char const zUsageTitle[115] =
-"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p99\n\
+static char const zUsageTitle[116] =
+"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p100\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
 static char const zRcName[7] = ".ntprc";
 static char const * const apzHomeList[3] = {
diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h
index 1764b93afe..0f6bc1dced 100644
--- a/util/ntp-keygen-opts.h
+++ b/util/ntp-keygen-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.h)
  *  
- *  It has been AutoGen-ed  December 21, 2010 at 09:35:58 AM by AutoGen 5.11.6pre5
+ *  It has been AutoGen-ed  December 21, 2010 at 11:17:44 AM by AutoGen 5.11.6pre5
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -77,8 +77,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    24
-#define NTP_KEYGEN_VERSION       "4.2.7p99"
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p99"
+#define NTP_KEYGEN_VERSION       "4.2.7p100"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p100"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/util/ntp-keygen-opts.texi b/util/ntp-keygen-opts.texi
index a3f3dcd350..00365dc929 100644
--- a/util/ntp-keygen-opts.texi
+++ b/util/ntp-keygen-opts.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.texi)
 # 
-# It has been AutoGen-ed  December 21, 2010 at 09:36:09 AM by AutoGen 5.11.6pre5
+# It has been AutoGen-ed  December 21, 2010 at 11:17:57 AM by AutoGen 5.11.6pre5
 # From the definitions    ntp-keygen-opts.def
 # and the template file   aginfo.tpl
 @end ignore
diff --git a/util/ntp-keygen.1 b/util/ntp-keygen.1
index 5437669e86..dfe4a66436 100644
--- a/util/ntp-keygen.1
+++ b/util/ntp-keygen.1
@@ -1,7 +1,7 @@
-.TH NTP-KEYGEN 1 2010-12-21 "(ntp 4.2.7p99)" "Programmer's Manual"
+.TH NTP-KEYGEN 1 2010-12-21 "(ntp 4.2.7p100)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen.1)
 .\"  
-.\"  It has been AutoGen-ed  December 21, 2010 at 09:36:08 AM by AutoGen 5.11.6pre5
+.\"  It has been AutoGen-ed  December 21, 2010 at 11:17:56 AM by AutoGen 5.11.6pre5
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman1.tpl
 .\"