NTP_4_2_6P3

bk: 4d2283fam-Th0ZqZEUdkMnugOHMiCw

diff --git a/ChangeLog b/ChangeLog
index 0947fa8044248d6a832429d0c108400b6092741b..6f62d09d61cd1925bc9d90893fa065daf04b418e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 ---
+(4.2.6p3) 2011/01/03 Released by Harlan Stenn <stenn@ntp.org>
 
 * [Bug 1764] Palisade driver doesn't build on Linux
 * Create and use scripts/check--help when generating .texi files.

diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c
index 8277a12c7139037ea50b5eeed3d7d6d715c932ea..eacd4da5d02a53014fefd613542e40d745285f45 100644 (file)
--- a/ntpd/ntpd-opts.c
+++ b/ntpd/ntpd-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpd-opts.c)
  *  
- *  It has been AutoGen-ed  December 25, 2010 at 10:04:36 AM by AutoGen 5.11.6pre7
+ *  It has been AutoGen-ed  January  3, 2011 at 09:15:35 PM by AutoGen 5.11.6pre7
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
@@ -17,7 +17,7 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * ntpd copyright (c) 1970-2010 David L. Mills and/or others - all rights reserved
+ * ntpd copyright (c) 1970-2011 David L. Mills and/or others - all rights reserved
  *
  * see html/copyright.html
  */
@@ -37,7 +37,7 @@ extern "C" {
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
 tSCC zCopyright[] =
-       "ntpd copyright (c) 1970-2010 David L. Mills and/or others, all rights reserved"
+       "ntpd copyright (c) 1970-2011 David L. Mills and/or others, all rights reserved"
 /* extracted from ../include/copyright.def near line 8 */
 ;
 tSCC zCopyrightNotice[24] =
@@ -953,8 +953,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  *  Define the Ntpd Option Environment
  */
 static char const zPROGNAME[5] = "NTPD";
-static char const zUsageTitle[104] =
-"ntpd - NTP daemon program - Ver. 4.2.6p3-RC12\n\
+static char const zUsageTitle[99] =
+"ntpd - NTP daemon program - Ver. 4.2.6p3\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
 #define zRcName     NULL
 #define apzHomeList NULL

diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h
index 0d2a00b8948462116512ca22fab23ae23c1837e0..29cfd109977d9db4ac847eb2a226978426c2c87d 100644 (file)
--- a/ntpd/ntpd-opts.h
+++ b/ntpd/ntpd-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpd-opts.h)
  *  
- *  It has been AutoGen-ed  December 25, 2010 at 10:04:36 AM by AutoGen 5.11.6pre7
+ *  It has been AutoGen-ed  January  3, 2011 at 09:15:35 PM by AutoGen 5.11.6pre7
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
@@ -17,7 +17,7 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * ntpd copyright (c) 1970-2010 David L. Mills and/or others - all rights reserved
+ * ntpd copyright (c) 1970-2011 David L. Mills and/or others - all rights reserved
  *
  * see html/copyright.html
  */
@@ -88,8 +88,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    35
-#define NTPD_VERSION       "4.2.6p3-RC12"
-#define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.6p3-RC12"
+#define NTPD_VERSION       "4.2.6p3"
+#define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.6p3"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi
index ea960fe4daa9789d99c96bf8f21f13815d9ba633..e33f82a6ea8e2a547ff3cdd523a7fb867d4ecdfc 100644 (file)
--- 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 25, 2010 at 10:16:58 AM by AutoGen 5.11.6pre7
+# It has been AutoGen-ed  January  3, 2011 at 09:18:03 PM by AutoGen 5.11.6pre7
 # From the definitions    ntpd-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -63,7 +63,66 @@ This is the automatically generated usage text for ntpd:
 
 @exampleindent 0
 @example
-ntpd is unavailable - no --help
+ntpd - NTP daemon program - Ver. 4.2.6p3
+USAGE:  ntpd [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
+  Flg Arg Option-Name    Description
+   -4 no  ipv4           Force IPv4 DNS name resolution
+                                - prohibits these options:
+                                ipv6
+   -6 no  ipv6           Force IPv6 DNS name resolution
+                                - prohibits these options:
+                                ipv4
+   -a no  authreq        Require crypto authentication
+                                - prohibits these options:
+                                authnoreq
+   -A no  authnoreq      Do not require crypto authentication
+                                - prohibits these options:
+                                authreq
+   -b no  bcastsync      Allow us to sync to broadcast servers
+   -c Str configfile     configuration file name
+   -d no  debug-level    Increase output debug message level
+                                - may appear multiple times
+   -D Str set-debug-level Set the output debug message level
+                                - may appear multiple times
+   -f Str driftfile      frequency drift file name
+   -g no  panicgate      Allow the first adjustment to be Big
+                                - may appear multiple times
+   -i --- jaildir        built without --enable-clockctl or --enable-linuxcaps
+   -I Str interface      Listen on an interface name or address
+                                - may appear multiple times
+   -k Str keyfile        path to symmetric keys
+   -l Str logfile        path to the log file
+   -L no  novirtualips   Do not listen to virtual interfaces
+   -n no  nofork         Do not fork
+   -N no  nice           Run at high priority
+   -p Str pidfile        path to the PID file
+   -P Num priority       Process priority
+   -q no  quit           Set the time and quit
+   -r Str propagationdelay Broadcast/propagation delay
+      Str saveconfigquit Save parsed configuration and quit
+   -s Str statsdir       Statistics file location
+   -t Str trustedkey     Trusted key number
+                                - may appear multiple times
+   -u --- user           built without --enable-clockctl or --enable-linuxcaps
+   -U Num updateinterval interval in seconds between scans for new or dropped interfaces
+      Str var            make ARG an ntp variable (RW)
+                                - may appear multiple times
+      Str dvar           make ARG an ntp variable (RW|DEF)
+                                - may appear multiple times
+   -x no  slew           Slew up to 600 seconds
+      opt version        Output version information and exit
+   -? no  help           Display extended usage information and exit
+   -! no  more-help      Extended usage information passed thru pager
+
+Options are specified by doubled hyphens and their name
+or by a single hyphen and the flag character.
+
+The following option preset mechanisms are supported:
+ - examining environment variables named NTPD_*
+
+
+
+please send bug reports to:  http://bugs.ntp.org, bugs@@ntp.org
 @end example
 @exampleindent 4
 

diff --git a/ntpd/ntpd.1 b/ntpd/ntpd.1
index 9ccab3aa53cff5411a846da4940a2e3a1c65e2ab..bc3a73bb489ad6e5d8db0616c27bcbda8e6e56ad 100644 (file)
--- a/ntpd/ntpd.1
+++ b/ntpd/ntpd.1
@@ -1,7 +1,7 @@
-.TH NTPD 1 2010-12-25 "( 4.2.6p3-RC12)" "Programmer's Manual"
+.TH NTPD 1 2011-01-03 "( 4.2.6p3)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd.1)
 .\"  
-.\"  It has been AutoGen-ed  December 25, 2010 at 10:16:51 AM by AutoGen 5.11.6pre7
+.\"  It has been AutoGen-ed  January  3, 2011 at 09:18:03 PM by AutoGen 5.11.6pre7
 .\"  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 507c2e3bcf27638d3763b5c8b79cfa3b9ccecc48..05ce3d9afa5e2a5cc2ade86eb67ac5aee1e03860 100644 (file)
--- a/ntpdc/ntpdc-opts.c
+++ b/ntpdc/ntpdc-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.c)
  *  
- *  It has been AutoGen-ed  December 25, 2010 at 10:18:44 AM by AutoGen 5.11.6pre7
+ *  It has been AutoGen-ed  January  3, 2011 at 09:18:12 PM by AutoGen 5.11.6pre7
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -17,7 +17,7 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * ntpdc copyright (c) 1970-2010 David L. Mills and/or others - all rights reserved
+ * ntpdc copyright (c) 1970-2011 David L. Mills and/or others - all rights reserved
  *
  * see html/copyright.html
  */
@@ -37,7 +37,7 @@ extern "C" {
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
 tSCC zCopyright[] =
-       "ntpdc copyright (c) 1970-2010 David L. Mills and/or others, all rights reserved"
+       "ntpdc copyright (c) 1970-2011 David L. Mills and/or others, all rights reserved"
 /* extracted from ../include/copyright.def near line 8 */
 ;
 tSCC zCopyrightNotice[24] =
@@ -450,8 +450,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  *  Define the Ntpdc Option Environment
  */
 static char const zPROGNAME[6] = "NTPDC";
-static char const zUsageTitle[132] =
-"ntpdc - vendor-specific NTP query program - Ver. 4.2.6p3-RC12\n\
+static char const zUsageTitle[127] =
+"ntpdc - vendor-specific NTP query program - Ver. 4.2.6p3\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 c270d8afdb5711348b4220402087589c2a304915..f4146cfa7ac23df15dee43fc210cfc2e667551c5 100644 (file)
--- a/ntpdc/ntpdc-opts.h
+++ b/ntpdc/ntpdc-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.h)
  *  
- *  It has been AutoGen-ed  December 25, 2010 at 10:18:44 AM by AutoGen 5.11.6pre7
+ *  It has been AutoGen-ed  January  3, 2011 at 09:18:12 PM by AutoGen 5.11.6pre7
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -17,7 +17,7 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * ntpdc copyright (c) 1970-2010 David L. Mills and/or others - all rights reserved
+ * ntpdc copyright (c) 1970-2011 David L. Mills and/or others - all rights reserved
  *
  * see html/copyright.html
  */
@@ -68,8 +68,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    15
-#define NTPDC_VERSION       "4.2.6p3-RC12"
-#define NTPDC_FULL_VERSION  "ntpdc - vendor-specific NTP query program - Ver. 4.2.6p3-RC12"
+#define NTPDC_VERSION       "4.2.6p3"
+#define NTPDC_FULL_VERSION  "ntpdc - vendor-specific NTP query program - Ver. 4.2.6p3"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi
index 1800cb2f050a92bd37925a8ed42af7c73e6964e0..9a58bf47543e9a107c48f35acb28d1d03c3a8400 100644 (file)
--- 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 25, 2010 at 10:19:24 AM by AutoGen 5.11.6pre7
+# It has been AutoGen-ed  January  3, 2011 at 09:18:22 PM by AutoGen 5.11.6pre7
 # From the definitions    ntpdc-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -58,7 +58,71 @@ This is the automatically generated usage text for ntpdc:
 
 @exampleindent 0
 @example
-ntpdc is unavailable - no --help
+ntpdc - vendor-specific NTP query program - Ver. 4.2.6p3
+USAGE:  ntpdc [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [ host ...]
+  Flg Arg Option-Name    Description
+   -4 no  ipv4           Force IPv4 DNS name resolution
+                                - prohibits these options:
+                                ipv6
+   -6 no  ipv6           Force IPv6 DNS name resolution
+                                - prohibits these options:
+                                ipv4
+   -c Str command        run a command and exit
+                                - may appear multiple times
+   -l no  listpeers      Print a list of the peers
+                                - prohibits these options:
+                                command
+   -p no  peers          Print a list of the peers
+                                - prohibits these options:
+                                command
+   -s no  showpeers      Show a list of the peers
+                                - prohibits these options:
+                                command
+   -i no  interactive    Force ntpq to operate in interactive mode
+                                - prohibits these options:
+                                command
+                                listpeers
+                                peers
+                                showpeers
+   -d no  debug-level    Increase output debug message level
+                                - may appear multiple times
+   -D Str set-debug-level Set the output debug message level
+                                - may appear multiple times
+   -n no  numeric        numeric host addresses
+      opt version        Output version information and exit
+   -? no  help           Display extended usage information and exit
+   -! no  more-help      Extended usage information passed thru pager
+   -> opt save-opts      Save the option state to a config file
+   -< Str load-opts      Load options from a config file
+                                - disabled as --no-load-opts
+                                - may appear multiple times
+
+Options are specified by doubled hyphens and their name
+or by a single hyphen and the flag character.
+
+The following option preset mechanisms are supported:
+ - reading file $HOME/.ntprc
+ - reading file ./.ntprc
+ - examining environment variables named NTPDC_*
+
+The
+[= prog-name =]
+utility program is used to query an NTP daemon about its
+current state and to request changes in that state.
+It uses NTP mode 7 control message formats described in the source code.
+The program may
+be run either in interactive mode or controlled using command line
+arguments.
+Extensive state and statistics information is available
+through the
+[= prog-name =]
+interface.
+In addition, nearly all the
+configuration options which can be specified at startup using
+ntpd's configuration file may also be specified at run time using
+[= prog-name =] .
+
+please send bug reports to:  http://bugs.ntp.org, bugs@@ntp.org
 @end example
 @exampleindent 4
 

diff --git a/ntpdc/ntpdc.1 b/ntpdc/ntpdc.1
index d8f78fb0b7b5493310537e07232af2ce4ea63f8c..5aa0298007d3d6f812d7136d40d265b65313773b 100644 (file)
--- a/ntpdc/ntpdc.1
+++ b/ntpdc/ntpdc.1
@@ -1,7 +1,7 @@
-.TH NTPDC 1 2010-12-25 "( 4.2.6p3-RC12)" "Programmer's Manual"
+.TH NTPDC 1 2011-01-03 "( 4.2.6p3)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc.1)
 .\"  
-.\"  It has been AutoGen-ed  December 25, 2010 at 10:19:23 AM by AutoGen 5.11.6pre7
+.\"  It has been AutoGen-ed  January  3, 2011 at 09:18:22 PM by AutoGen 5.11.6pre7
 .\"  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 40256a2a6bddd42f083e3bb91679674d5832b285..a9d5cb997318d90aa160d68e7f77d265681d9557 100644 (file)
--- a/ntpq/ntpq-opts.c
+++ b/ntpq/ntpq-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpq-opts.c)
  *  
- *  It has been AutoGen-ed  December 25, 2010 at 10:19:26 AM by AutoGen 5.11.6pre7
+ *  It has been AutoGen-ed  January  3, 2011 at 09:18:23 PM by AutoGen 5.11.6pre7
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -17,7 +17,7 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * ntpq copyright (c) 1970-2010 David L. Mills and/or others - all rights reserved
+ * ntpq copyright (c) 1970-2011 David L. Mills and/or others - all rights reserved
  *
  * see html/copyright.html
  */
@@ -37,7 +37,7 @@ extern "C" {
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
 tSCC zCopyright[] =
-       "ntpq copyright (c) 1970-2010 David L. Mills and/or others, all rights reserved"
+       "ntpq copyright (c) 1970-2011 David L. Mills and/or others, all rights reserved"
 /* extracted from ../include/copyright.def near line 8 */
 ;
 tSCC zCopyrightNotice[24] =
@@ -427,8 +427,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  *  Define the Ntpq Option Environment
  */
 static char const zPROGNAME[5] = "NTPQ";
-static char const zUsageTitle[124] =
-"ntpq - standard NTP query program - Ver. 4.2.6p3-RC12\n\
+static char const zUsageTitle[119] =
+"ntpq - standard NTP query program - Ver. 4.2.6p3\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 b3d0de0f6c108119a701d95a3de5c6f6ce0385f8..bec8e2b395feed61dbf93c8062fdab462118126a 100644 (file)
--- a/ntpq/ntpq-opts.h
+++ b/ntpq/ntpq-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpq-opts.h)
  *  
- *  It has been AutoGen-ed  December 25, 2010 at 10:19:26 AM by AutoGen 5.11.6pre7
+ *  It has been AutoGen-ed  January  3, 2011 at 09:18:22 PM by AutoGen 5.11.6pre7
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -17,7 +17,7 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * ntpq copyright (c) 1970-2010 David L. Mills and/or others - all rights reserved
+ * ntpq copyright (c) 1970-2011 David L. Mills and/or others - all rights reserved
  *
  * see html/copyright.html
  */
@@ -67,8 +67,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    14
-#define NTPQ_VERSION       "4.2.6p3-RC12"
-#define NTPQ_FULL_VERSION  "ntpq - standard NTP query program - Ver. 4.2.6p3-RC12"
+#define NTPQ_VERSION       "4.2.6p3"
+#define NTPQ_FULL_VERSION  "ntpq - standard NTP query program - Ver. 4.2.6p3"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi
index 540704b621e084536e4c81eab15f175d1638d2d8..65d318f5e0f24a721a89da1f1874e2cef9f728ef 100644 (file)
--- 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 25, 2010 at 10:20:38 AM by AutoGen 5.11.6pre7
+# It has been AutoGen-ed  January  3, 2011 at 09:18:38 PM by AutoGen 5.11.6pre7
 # From the definitions    ntpq-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -47,7 +47,56 @@ This is the automatically generated usage text for ntpq:
 
 @exampleindent 0
 @example
-ntpq is unavailable - no --help
+ntpq - standard NTP query program - Ver. 4.2.6p3
+USAGE:  ntpq [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [ host ...]
+  Flg Arg Option-Name    Description
+   -4 no  ipv4           Force IPv4 DNS name resolution
+                                - prohibits these options:
+                                ipv6
+   -6 no  ipv6           Force IPv6 DNS name resolution
+                                - prohibits these options:
+                                ipv4
+   -c Str command        run a command and exit
+                                - may appear multiple times
+   -d no  debug-level    Increase output debug message level
+                                - may appear multiple times
+   -D Str set-debug-level Set the output debug message level
+                                - may appear multiple times
+   -p no  peers          Print a list of the peers
+                                - prohibits these options:
+                                interactive
+   -i no  interactive    Force ntpq to operate in interactive mode
+                                - prohibits these options:
+                                command
+                                peers
+   -n no  numeric        numeric host addresses
+      no  old-rv         Always output status line with readvar
+      opt version        Output version information and exit
+   -? no  help           Display extended usage information and exit
+   -! no  more-help      Extended usage information passed thru pager
+   -> opt save-opts      Save the option state to a config file
+   -< Str load-opts      Load options from a config file
+                                - disabled as --no-load-opts
+                                - may appear multiple times
+
+Options are specified by doubled hyphens and their name
+or by a single hyphen and the flag character.
+
+The following option preset mechanisms are supported:
+ - reading file $HOME/.ntprc
+ - reading file ./.ntprc
+ - examining environment variables named NTPQ_*
+
+The
+[= prog-name =]
+utility program is used to query NTP servers which
+implement the standard NTP mode 6 control message formats defined
+in Appendix B of the NTPv3 specification RFC1305, requesting
+information about current state and/or changes in that state.
+The same formats are used in NTPv4, although some of the
+variables have changed and new ones added.
+
+please send bug reports to:  http://bugs.ntp.org, bugs@@ntp.org
 @end example
 @exampleindent 4
 

diff --git a/ntpq/ntpq.1 b/ntpq/ntpq.1
index 381a1b82cf42fa97fbd774322177e74cf725ee1b..1dea6e07e0ae31d8359390787f490f249f2fa671 100644 (file)
--- a/ntpq/ntpq.1
+++ b/ntpq/ntpq.1
@@ -1,7 +1,7 @@
-.TH NTPQ 1 2010-12-25 "( 4.2.6p3-RC12)" "Programmer's Manual"
+.TH NTPQ 1 2011-01-03 "( 4.2.6p3)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq.1)
 .\"  
-.\"  It has been AutoGen-ed  December 25, 2010 at 10:20:37 AM by AutoGen 5.11.6pre7
+.\"  It has been AutoGen-ed  January  3, 2011 at 09:18:38 PM by AutoGen 5.11.6pre7
 .\"  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 c122bb91498feb64e237b78a2180272e24cce1e6..4ac2cbb2178c5b2d466495882ef58559d03d41d7 100644 (file)
--- a/ntpsnmpd/ntpsnmpd-opts.c
+++ b/ntpsnmpd/ntpsnmpd-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.c)
  *  
- *  It has been AutoGen-ed  December 25, 2010 at 10:20:42 AM by AutoGen 5.11.6pre7
+ *  It has been AutoGen-ed  January  3, 2011 at 09:18:39 PM by AutoGen 5.11.6pre7
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -17,7 +17,7 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * ntpsnmpd copyright (c) 1970-2010 David L. Mills and/or others - all rights reserved
+ * ntpsnmpd copyright (c) 1970-2011 David L. Mills and/or others - all rights reserved
  *
  * see html/copyright.html
  */
@@ -37,7 +37,7 @@ extern "C" {
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
 tSCC zCopyright[] =
-       "ntpsnmpd copyright (c) 1970-2010 David L. Mills and/or others, all rights reserved"
+       "ntpsnmpd copyright (c) 1970-2011 David L. Mills and/or others, all rights reserved"
 /* extracted from ../include/copyright.def near line 8 */
 ;
 tSCC zCopyrightNotice[24] =
@@ -254,8 +254,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  *  Define the Ntpsnmpd Option Environment
  */
 static char const zPROGNAME[9] = "NTPSNMPD";
-static char const zUsageTitle[108] =
-"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.6p3-RC12\n\
+static char const zUsageTitle[103] =
+"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.6p3\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 b9a654fc38c784b71e128bb4f9cb72abe46e7fc2..334bd30ddafd588eac1475344588365b27a0db32 100644 (file)
--- a/ntpsnmpd/ntpsnmpd-opts.h
+++ b/ntpsnmpd/ntpsnmpd-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.h)
  *  
- *  It has been AutoGen-ed  December 25, 2010 at 10:20:41 AM by AutoGen 5.11.6pre7
+ *  It has been AutoGen-ed  January  3, 2011 at 09:18:38 PM by AutoGen 5.11.6pre7
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -17,7 +17,7 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * ntpsnmpd copyright (c) 1970-2010 David L. Mills and/or others - all rights reserved
+ * ntpsnmpd copyright (c) 1970-2011 David L. Mills and/or others - all rights reserved
  *
  * see html/copyright.html
  */
@@ -61,8 +61,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    8
-#define NTPSNMPD_VERSION       "4.2.6p3-RC12"
-#define NTPSNMPD_FULL_VERSION  "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.6p3-RC12"
+#define NTPSNMPD_VERSION       "4.2.6p3"
+#define NTPSNMPD_FULL_VERSION  "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.6p3"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

diff --git a/ntpsnmpd/ntpsnmpd-opts.texi b/ntpsnmpd/ntpsnmpd-opts.texi
index c58d71cd4526d4a7fd143a975cb88593cdef29f6..55acec8d88a1aba47459503e3c3d3da1406401fc 100644 (file)
--- 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 25, 2010 at 10:21:10 AM by AutoGen 5.11.6pre7
+# It has been AutoGen-ed  January  3, 2011 at 09:18:49 PM by AutoGen 5.11.6pre7
 # From the definitions    ntpsnmpd-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -34,7 +34,29 @@ This is the automatically generated usage text for ntpsnmpd:
 
 @exampleindent 0
 @example
-ntpsnmpd is unavailable - no --help
+ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.6p3
+USAGE:  ntpsnmpd [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
+  Flg Arg Option-Name    Description
+   -n no  nofork         Do not fork
+   -p no  syslog         Log to syslog()
+      Str agentxsocket   The socket address ntpsnmpd uses to connect to net-snmpd
+      opt version        Output version information and exit
+   -? no  help           Display extended usage information and exit
+   -! no  more-help      Extended usage information passed thru pager
+   -> opt save-opts      Save the option state to a config file
+   -< Str load-opts      Load options from a config file
+                                - disabled as --no-load-opts
+                                - may appear multiple times
+
+Options are specified by doubled hyphens and their name
+or by a single hyphen and the flag character.
+
+The following option preset mechanisms are supported:
+ - reading file $HOME/.ntprc
+ - reading file ./.ntprc
+ - examining environment variables named NTPSNMPD_*
+
+please send bug reports to:  http://bugs.ntp.org, bugs@@ntp.org
 @end example
 @exampleindent 4
 

diff --git a/ntpsnmpd/ntpsnmpd.1 b/ntpsnmpd/ntpsnmpd.1
index 054f991464fbc9df547d78cab71c5ebb5cc30626..e2b467a01d74b4372929ffe95918e95540abc95d 100644 (file)
--- a/ntpsnmpd/ntpsnmpd.1
+++ b/ntpsnmpd/ntpsnmpd.1
@@ -1,7 +1,7 @@
-.TH NTPSNMPD 1 2010-12-25 "( 4.2.6p3-RC12)" "Programmer's Manual"
+.TH NTPSNMPD 1 2011-01-03 "( 4.2.6p3)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd.1)
 .\"  
-.\"  It has been AutoGen-ed  December 25, 2010 at 10:21:09 AM by AutoGen 5.11.6pre7
+.\"  It has been AutoGen-ed  January  3, 2011 at 09:18:48 PM by AutoGen 5.11.6pre7
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agman1.tpl
 .\"

diff --git a/packageinfo.sh b/packageinfo.sh
index 76764913929b2145e668057810a4a08778f7f5ce..7b0fa74d3503ca210c2e1050fc05b8d281191d41 100644 (file)
--- a/packageinfo.sh
+++ b/packageinfo.sh
@@ -60,7 +60,7 @@ version=${proto}.${major}.${minor}
 special=
 
 # prerelease can be empty, 'beta', or 'rc'.
-prerelease=rc
+prerelease=
 
 # ChangeLog starting tag (see also CommitLog-4.1.0)
 CLTAG=NTP_4_2_0
@@ -77,7 +77,7 @@ point=3
 # Should be zeroed at release, and left at zero until first beta.
 # The first beta is -beta1.
 # betapoint is always zero in ntp-dev.
-betapoint=1
+betapoint=0
 
 ### rcpoint is normally modified by script except for GO.
 # RC number (rcpoint)
@@ -91,4 +91,4 @@ betapoint=1
 # - - prerelease is emptied
 # else (not in RC)
 # - rcpoint is empty and unused (for now).
-rcpoint=GO
+rcpoint=

diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c
index ddbed39056c01918066004b3ab0adaf792a4c0d0..ba701ff009fab305e016bd86d86a62e5f803be01 100644 (file)
--- a/sntp/sntp-opts.c
+++ b/sntp/sntp-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (sntp-opts.c)
  *  
- *  It has been AutoGen-ed  December 25, 2010 at 10:03:48 AM by AutoGen 5.11.6pre7
+ *  It has been AutoGen-ed  January  3, 2011 at 09:07:39 PM by AutoGen 5.11.6pre7
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -17,7 +17,7 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * sntp copyright (c) 1970-2010 David L. Mills and/or others - all rights reserved
+ * sntp copyright (c) 1970-2011 David L. Mills and/or others - all rights reserved
  *
  * see html/copyright.html
  */
@@ -37,7 +37,7 @@ extern "C" {
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
 tSCC zCopyright[] =
-       "sntp copyright (c) 1970-2010 David L. Mills and/or others, all rights reserved"
+       "sntp copyright (c) 1970-2011 David L. Mills and/or others, all rights reserved"
 /* extracted from ../include/copyright.def near line 8 */
 ;
 tSCC zCopyrightNotice[24] =
@@ -472,8 +472,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  *  Define the Sntp Option Environment
  */
 static char const zPROGNAME[5] = "SNTP";
-static char const zUsageTitle[126] =
-"sntp - standard SNTP program - Ver. 4.2.6p3-RC12\n\
+static char const zUsageTitle[121] =
+"sntp - standard SNTP program - Ver. 4.2.6p3\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 386f2d9acbf19d0a19fc968dd90414c4e295ce7c..85d4ebb3925da769892a29efa65e910659771331 100644 (file)
--- a/sntp/sntp-opts.h
+++ b/sntp/sntp-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (sntp-opts.h)
  *  
- *  It has been AutoGen-ed  December 25, 2010 at 10:03:47 AM by AutoGen 5.11.6pre7
+ *  It has been AutoGen-ed  January  3, 2011 at 09:07:39 PM by AutoGen 5.11.6pre7
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -17,7 +17,7 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * sntp copyright (c) 1970-2010 David L. Mills and/or others - all rights reserved
+ * sntp copyright (c) 1970-2011 David L. Mills and/or others - all rights reserved
  *
  * see html/copyright.html
  */
@@ -70,8 +70,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    17
-#define SNTP_VERSION       "4.2.6p3-RC12"
-#define SNTP_FULL_VERSION  "sntp - standard SNTP program - Ver. 4.2.6p3-RC12"
+#define SNTP_VERSION       "4.2.6p3"
+#define SNTP_FULL_VERSION  "sntp - standard SNTP program - Ver. 4.2.6p3"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi
index 05685cdebccd501d5cb5177424382443e6848d5e..0d0252c4c51d8b186e5193d3b9d56c892d171dd8 100644 (file)
--- 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 25, 2010 at 10:04:29 AM by AutoGen 5.11.6pre7
+# It has been AutoGen-ed  January  3, 2011 at 09:15:34 PM by AutoGen 5.11.6pre7
 # From the definitions    sntp-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -69,7 +69,61 @@ This is the automatically generated usage text for sntp:
 
 @exampleindent 0
 @example
-sntp is unavailable - no --help
+sntp - standard SNTP program - Ver. 4.2.6p3
+USAGE:  sntp [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... hostname-or-IP ...
+  Flg Arg Option-Name    Description
+   -4 no  ipv4           Force IPv4 DNS name resolution
+                                - prohibits these options:
+                                ipv6
+   -6 no  ipv6           Force IPv6 DNS name resolution
+                                - prohibits these options:
+                                ipv4
+   -d no  normalverbose  Normal verbose
+   -K Str kod            KoD history filename
+   -p no  syslog         Logging with syslog
+                                - prohibits these options:
+                                filelog
+   -l Str filelog        Log to specified logfile
+                                - prohibits these options:
+                                syslog
+   -s no  settod         Set (step) the time with settimeofday()
+                                - prohibits these options:
+                                adjtime
+   -j no  adjtime        Set (slew) the time with adjtime()
+                                - prohibits these options:
+                                settod
+   -b Str broadcast      Use broadcasts to the address specified for synchronisation
+   -t Num timeout        Specify the number of seconds to wait for broadcasts
+   -a Num authentication Enable authentication with the key auth-keynumber
+   -k Str keyfile        Specify a keyfile. SNTP will look in this file for the key specified with -a
+      opt version        Output version information and exit
+   -? no  help           Display extended usage information and exit
+   -! no  more-help      Extended usage information passed thru pager
+   -> opt save-opts      Save the option state to a config file
+   -< Str load-opts      Load options from a config file
+                                - disabled as --no-load-opts
+                                - may appear multiple times
+
+Options are specified by doubled hyphens and their name
+or by a single hyphen and the flag character.
+
+
+
+The following option preset mechanisms are supported:
+ - reading file $HOME/.ntprc
+ - reading file ./.ntprc
+ - examining environment variables named SNTP_*
+
+sntp implements the Simple Network Time Protocol, and is used to query
+an NTP or SNTP server and either display the time or set the local
+system's time (given suitable privilege).
+
+It can be run interactively from the command line or as a cron job.
+
+NTP and SNTP are defined by RFC 5905, which obsoletes RFC 4330 and RFC
+1305.
+
+please send bug reports to:  http://bugs.ntp.org, bugs@@ntp.org
 @end example
 @exampleindent 4
 

diff --git a/sntp/sntp.1 b/sntp/sntp.1
index 29368dd61ce78c96a149bbae1cb84ec99d9a4bda..d64953ae9188e032bbb10b482449cc11a8c54e97 100644 (file)
--- a/sntp/sntp.1
+++ b/sntp/sntp.1
@@ -1,7 +1,7 @@
-.TH SNTP 1 2010-12-25 "( 4.2.6p3-RC12)" "Programmer's Manual"
+.TH SNTP 1 2011-01-03 "( 4.2.6p3)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp.1)
 .\"  
-.\"  It has been AutoGen-ed  December 25, 2010 at 10:04:27 AM by AutoGen 5.11.6pre7
+.\"  It has been AutoGen-ed  January  3, 2011 at 09:07:46 PM by AutoGen 5.11.6pre7
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman1.tpl
 .\"

diff --git a/sntp/sntp.html b/sntp/sntp.html
index e7e57cd7e9b2c68ea2b279f4a04ffae712681e51..6216dad26fb6b66165cfe0925a0bf430a9e1569d 100644 (file)
--- 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.6p3-RC12 of <code>sntp</code>.
+  <p>This document applies to version 4.2.6p3 of <code>sntp</code>.
 
   <p>The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
@@ -139,7 +139,61 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
 <p><a name="index-sntp-usage-3"></a>
 This is the automatically generated usage text for sntp:
 
-<pre class="example">sntp is unavailable - no --help
+<pre class="example">sntp - standard SNTP program - Ver. 4.2.6p3
+USAGE:  sntp [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]... hostname-or-IP ...
+  Flg Arg Option-Name    Description
+   -4 no  ipv4           Force IPv4 DNS name resolution
+                                - prohibits these options:
+                                ipv6
+   -6 no  ipv6           Force IPv6 DNS name resolution
+                                - prohibits these options:
+                                ipv4
+   -d no  normalverbose  Normal verbose
+   -K Str kod            KoD history filename
+   -p no  syslog         Logging with syslog
+                                - prohibits these options:
+                                filelog
+   -l Str filelog        Log to specified logfile
+                                - prohibits these options:
+                                syslog
+   -s no  settod         Set (step) the time with settimeofday()
+                                - prohibits these options:
+                                adjtime
+   -j no  adjtime        Set (slew) the time with adjtime()
+                                - prohibits these options:
+                                settod
+   -b Str broadcast      Use broadcasts to the address specified for synchronisation
+   -t Num timeout        Specify the number of seconds to wait for broadcasts
+   -a Num authentication Enable authentication with the key auth-keynumber
+   -k Str keyfile        Specify a keyfile. SNTP will look in this file for the key specified with -a
+      opt version        Output version information and exit
+   -? no  help           Display extended usage information and exit
+   -! no  more-help      Extended usage information passed thru pager
+   -&gt; opt save-opts      Save the option state to a config file
+   -&lt; Str load-opts      Load options from a config file
+                                - disabled as --no-load-opts
+                                - may appear multiple times
+
+Options are specified by doubled hyphens and their name
+or by a single hyphen and the flag character.
+
+
+
+The following option preset mechanisms are supported:
+ - reading file $HOME/.ntprc
+ - reading file ./.ntprc
+ - examining environment variables named SNTP_*
+
+sntp implements the Simple Network Time Protocol, and is used to query
+an NTP or SNTP server and either display the time or set the local
+system's time (given suitable privilege).
+
+It can be run interactively from the command line or as a cron job.
+
+NTP and SNTP are defined by RFC 5905, which obsoletes RFC 4330 and RFC
+1305.
+
+please send bug reports to:  http://bugs.ntp.org, bugs@ntp.org
 </pre>
   <div class="node">
 <p><hr>

diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c
index 0a4cbeebd5582fa37c29113f30f10f2faff4fad8..6248df8de3bdeee46684c0907b3344430d3e575f 100644 (file)
--- a/util/ntp-keygen-opts.c
+++ b/util/ntp-keygen-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.c)
  *  
- *  It has been AutoGen-ed  December 25, 2010 at 10:21:14 AM by AutoGen 5.11.6pre7
+ *  It has been AutoGen-ed  January  3, 2011 at 09:18:50 PM by AutoGen 5.11.6pre7
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -17,7 +17,7 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * ntp-keygen copyright (c) 1970-2010 David L. Mills and/or others - all rights reserved
+ * ntp-keygen copyright (c) 1970-2011 David L. Mills and/or others - all rights reserved
  *
  * see html/copyright.html
  */
@@ -38,7 +38,7 @@ extern "C" {
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
 tSCC zCopyright[] =
-       "ntp-keygen copyright (c) 1970-2010 David L. Mills and/or others, all rights reserved"
+       "ntp-keygen copyright (c) 1970-2011 David L. Mills and/or others, all rights reserved"
 /* extracted from ../include/copyright.def near line 8 */
 ;
 tSCC zCopyrightNotice[24] =
@@ -726,8 +726,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  *  Define the Ntp_Keygen Option Environment
  */
 static char const zPROGNAME[11] = "NTP_KEYGEN";
-static char const zUsageTitle[119] =
-"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.6p3-RC12\n\
+static char const zUsageTitle[114] =
+"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.6p3\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 62d82d5712f2ee2fb6927b4420724d9e9c590193..01a3839d67c7b3eabdd96561badda82c6670003c 100644 (file)
--- a/util/ntp-keygen-opts.h
+++ b/util/ntp-keygen-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.h)
  *  
- *  It has been AutoGen-ed  December 25, 2010 at 10:21:14 AM by AutoGen 5.11.6pre7
+ *  It has been AutoGen-ed  January  3, 2011 at 09:18:50 PM by AutoGen 5.11.6pre7
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -17,7 +17,7 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * ntp-keygen copyright (c) 1970-2010 David L. Mills and/or others - all rights reserved
+ * ntp-keygen copyright (c) 1970-2011 David L. Mills and/or others - all rights reserved
  *
  * see html/copyright.html
  */
@@ -76,8 +76,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    23
-#define NTP_KEYGEN_VERSION       "4.2.6p3-RC12"
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.6p3-RC12"
+#define NTP_KEYGEN_VERSION       "4.2.6p3"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.6p3"
 
 /*
  *  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 e22312a59fa66e1160dbdb04395118376b575c7a..175c04985cafa63efdc61e73d0555d57b7ec70e8 100644 (file)
--- 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 25, 2010 at 10:22:06 AM by AutoGen 5.11.6pre7
+# It has been AutoGen-ed  January  3, 2011 at 09:19:07 PM by AutoGen 5.11.6pre7
 # From the definitions    ntp-keygen-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -50,7 +50,50 @@ This is the automatically generated usage text for ntp-keygen:
 
 @exampleindent 0
 @example
-ntp-keygen is unavailable - no --help
+ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.6p3
+USAGE:  ntp-keygen [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
+  Flg Arg Option-Name    Description
+   -c Str certificate    certificate scheme
+   -d no  debug-level    Increase output debug message level
+                                - may appear multiple times
+   -D Str set-debug-level Set the output debug message level
+                                - may appear multiple times
+   -e no  id-key         Write IFF or GQ identity keys
+   -G no  gq-params      Generate GQ parameters and keys
+   -H no  host-key       generate RSA host key
+   -I no  iffkey         generate IFF parameters
+   -i Str issuer-name    set issuer name
+   -M no  md5key         generate MD5 keys
+   -m Num modulus        modulus
+                                - it must be:  256 to 2048
+   -P no  pvt-cert       generate PC private certificate
+   -p Str pvt-passwd     output private password
+   -q Str get-pvt-passwd input private password
+   -S Str sign-key       generate sign key (RSA or DSA)
+   -s Str subject-name   set subject name
+   -T no  trusted-cert   trusted certificate (TC scheme)
+   -V Num mv-params      generate <num> MV parameters
+   -v Num mv-keys        update <num> MV keys
+      opt version        Output version information and exit
+   -? no  help           Display extended usage information and exit
+   -! no  more-help      Extended usage information passed thru pager
+   -> opt save-opts      Save the option state to a config file
+   -< Str load-opts      Load options from a config file
+                                - disabled as --no-load-opts
+                                - may appear multiple times
+
+Options are specified by doubled hyphens and their name
+or by a single hyphen and the flag character.
+
+The following option preset mechanisms are supported:
+ - reading file $HOME/.ntprc
+ - reading file ./.ntprc
+ - examining environment variables named NTP_KEYGEN_*
+
+If there is no new host key, look for an existing one.
+If one is not found, create it.
+
+please send bug reports to:  http://bugs.ntp.org, bugs@@ntp.org
 @end example
 @exampleindent 4
 

diff --git a/util/ntp-keygen.1 b/util/ntp-keygen.1
index 9bec1901b1200a2010d5e8110011204c59650009..ad82ec35a94d30e27d0da0feb00352f1520e6e4b 100644 (file)
--- a/util/ntp-keygen.1
+++ b/util/ntp-keygen.1
@@ -1,7 +1,7 @@
-.TH NTP-KEYGEN 1 2010-12-25 "(ntp 4.2.6p3-RC12)" "Programmer's Manual"
+.TH NTP-KEYGEN 1 2011-01-03 "(ntp 4.2.6p3)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen.1)
 .\"  
-.\"  It has been AutoGen-ed  December 25, 2010 at 10:22:04 AM by AutoGen 5.11.6pre7
+.\"  It has been AutoGen-ed  January  3, 2011 at 09:19:05 PM by AutoGen 5.11.6pre7
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman1.tpl
 .\"