From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 28 May 2011 11:03:38 +0000 (+0000)
Subject: NTP_4_2_7P174
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4dcee87ac4c1642edfa1e97531854c27bb979ea3;p=thirdparty%2Fntp.git

NTP_4_2_7P174

bk: 4de0d68aWUuFhL5moDEYTNxs4Ije0g
---

diff --git a/ChangeLog b/ChangeLog
index 8b15780faa..c6dbdd2f6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+(4.2.7p174) 2011/05/28 Released by Harlan Stenn <stenn@ntp.org>
 * ntpdc documentation cleanup.
 * sntp documentation cleanup.
 * Don't build libevent with openssl support.  Right now, libevent
diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c
index 2c2dc8c7cb..b6b345c6c0 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  May 25, 2011 at 07:27:54 PM by AutoGen 5.11.9
+ *  It has been AutoGen-ed  May 28, 2011 at 10:58:18 AM by AutoGen 5.11.9
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
@@ -17,9 +17,9 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * ntpd copyright (c) 1970-2011 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
+ * See html/copyright.html
  * 
  */
 
@@ -40,10 +40,10 @@ extern FILE * option_usage_fp;
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
 static char const zCopyright[40] =
-"ntpd 4.2.7p173\n\
-see html/copyright.html\n";
+"ntpd 4.2.7p174\n\
+See html/copyright.html\n";
 static char const zLicenseDescrip[25] =
-"see html/copyright.html\n";
+"See html/copyright.html\n";
 
 extern tUsageProc optionUsage;
 
@@ -1002,7 +1002,7 @@ static tOptDesc optDesc[OPTION_CT] = {
  */
 static char const zPROGNAME[5] = "NTPD";
 static char const zUsageTitle[133] =
-"ntpd - NTP daemon program - Ver. 4.2.7p173\n\
+"ntpd - NTP daemon program - Ver. 4.2.7p174\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 0974cb8ca7..8e3b3eee08 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  May 25, 2011 at 07:27:54 PM by AutoGen 5.11.9
+ *  It has been AutoGen-ed  May 28, 2011 at 10:58:17 AM by AutoGen 5.11.9
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
@@ -17,9 +17,9 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * ntpd copyright (c) 1970-2011 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
+ * See html/copyright.html
  * 
  */
 /*
@@ -90,8 +90,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    36
-#define NTPD_VERSION       "4.2.7p173"
-#define NTPD_FULL_VERSION  "ntpd 4.2.7p173"
+#define NTPD_VERSION       "4.2.7p174"
+#define NTPD_FULL_VERSION  "ntpd 4.2.7p174"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi
index 380fdd4965..479d93166e 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  May 25, 2011 at 07:28:16 PM by AutoGen 5.11.9
+# It has been AutoGen-ed  May 28, 2011 at 10:59:14 AM by AutoGen 5.11.9
 # From the definitions    ntpd-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -64,7 +64,7 @@ This is the automatically generated usage text for ntpd:
 
 @exampleindent 0
 @example
-ntpd - NTP daemon program - Ver. 4.2.7p173
+ntpd - NTP daemon program - Ver. 4.2.7p174
 USAGE:  ntpd [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... \
                 [ <server1> ... <serverN> ]
   Flg Arg Option-Name    Description
diff --git a/ntpd/ntpd.1 b/ntpd/ntpd.1
index ae707e46cc..ec561fc610 100644
--- a/ntpd/ntpd.1
+++ b/ntpd/ntpd.1
@@ -1,7 +1,7 @@
-.TH NTPD 1 2011-05-25 "( 4.2.7p173)" "Programmer's Manual"
+.TH NTPD 1 2011-05-28 "( 4.2.7p174)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd.1)
 .\"  
-.\"  It has been AutoGen-ed  May 25, 2011 at 07:28:16 PM by AutoGen 5.11.9
+.\"  It has been AutoGen-ed  May 28, 2011 at 10:59:13 AM by AutoGen 5.11.9
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agman1.tpl
 .\"
@@ -346,14 +346,14 @@ by loading values from environment variables named:
 .fi
 .ad
 .SH AUTHOR
-David L. Mills and/or others
+David L. Mills and/or others.
 .br
 Please send bug reports to:  http://bugs.ntp.org, bugs@ntp.org
 
 .PP
 .nf
 .na
-see html/copyright.html
+See html/copyright.html
 
 .fi
 .ad
diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c
index eed2d26a66..5d7e06ab65 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  May 25, 2011 at 07:28:26 PM by AutoGen 5.11.9
+ *  It has been AutoGen-ed  May 28, 2011 at 10:59:40 AM by AutoGen 5.11.9
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -17,9 +17,9 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * ntpdc copyright (c) 1970-2011 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
+ * See html/copyright.html
  * 
  */
 
@@ -40,10 +40,10 @@ extern FILE * option_usage_fp;
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
 static char const zCopyright[41] =
-"ntpdc 4.2.7p173\n\
-see html/copyright.html\n";
+"ntpdc 4.2.7p174\n\
+See html/copyright.html\n";
 static char const zLicenseDescrip[25] =
-"see html/copyright.html\n";
+"See html/copyright.html\n";
 
 extern tUsageProc optionUsage;
 
@@ -96,6 +96,41 @@ static char const zCommand_Name[]            = "command";
 #define COMMAND_FLAGS       (OPTST_DISABLED | OPTST_STACKED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
+/*
+ *  Debug_Level option description:
+ */
+static char const zDebug_LevelText[] =
+        "Increase debug verbosity level";
+static char const zDebug_Level_NAME[]        = "DEBUG_LEVEL";
+static char const zDebug_Level_Name[]        = "debug-level";
+#define DEBUG_LEVEL_FLAGS       (OPTST_DISABLED)
+
+/*
+ *  Set_Debug_Level option description:
+ */
+static char const zSet_Debug_LevelText[] =
+        "Set the debug verbosity level";
+static char const zSet_Debug_Level_NAME[]    = "SET_DEBUG_LEVEL";
+static char const zSet_Debug_Level_Name[]    = "set-debug-level";
+#define SET_DEBUG_LEVEL_FLAGS       (OPTST_DISABLED \
+        | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
+
+/*
+ *  Interactive option description with
+ *  "Must also have options" and "Incompatible options":
+ */
+static char const zInteractiveText[] =
+        "Force ntpq to operate in interactive mode";
+static char const zInteractive_NAME[]        = "INTERACTIVE";
+static char const zInteractive_Name[]        = "interactive";
+static const int
+    aInteractiveCantList[] = {
+    INDEX_OPT_COMMAND,
+    INDEX_OPT_LISTPEERS,
+    INDEX_OPT_PEERS,
+    INDEX_OPT_SHOWPEERS, NO_EQUIVALENT };
+#define INTERACTIVE_FLAGS       (OPTST_DISABLED)
+
 /*
  *  Listpeers option description with
  *  "Must also have options" and "Incompatible options":
@@ -109,6 +144,15 @@ static const int
     INDEX_OPT_COMMAND, NO_EQUIVALENT };
 #define LISTPEERS_FLAGS       (OPTST_DISABLED)
 
+/*
+ *  Numeric option description:
+ */
+static char const zNumericText[] =
+        "numeric host addresses";
+static char const zNumeric_NAME[]            = "NUMERIC";
+static char const zNumeric_Name[]            = "numeric";
+#define NUMERIC_FLAGS       (OPTST_DISABLED)
+
 /*
  *  Peers option description with
  *  "Must also have options" and "Incompatible options":
@@ -135,50 +179,6 @@ static const int
     INDEX_OPT_COMMAND, NO_EQUIVALENT };
 #define SHOWPEERS_FLAGS       (OPTST_DISABLED)
 
-/*
- *  Interactive option description with
- *  "Must also have options" and "Incompatible options":
- */
-static char const zInteractiveText[] =
-        "Force ntpq to operate in interactive mode";
-static char const zInteractive_NAME[]        = "INTERACTIVE";
-static char const zInteractive_Name[]        = "interactive";
-static const int
-    aInteractiveCantList[] = {
-    INDEX_OPT_COMMAND,
-    INDEX_OPT_LISTPEERS,
-    INDEX_OPT_PEERS,
-    INDEX_OPT_SHOWPEERS, NO_EQUIVALENT };
-#define INTERACTIVE_FLAGS       (OPTST_DISABLED)
-
-/*
- *  Debug_Level option description:
- */
-static char const zDebug_LevelText[] =
-        "Increase output debug message level";
-static char const zDebug_Level_NAME[]        = "DEBUG_LEVEL";
-static char const zDebug_Level_Name[]        = "debug-level";
-#define DEBUG_LEVEL_FLAGS       (OPTST_DISABLED)
-
-/*
- *  Set_Debug_Level option description:
- */
-static char const zSet_Debug_LevelText[] =
-        "Set the output debug message level";
-static char const zSet_Debug_Level_NAME[]    = "SET_DEBUG_LEVEL";
-static char const zSet_Debug_Level_Name[]    = "set-debug-level";
-#define SET_DEBUG_LEVEL_FLAGS       (OPTST_DISABLED \
-        | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-
-/*
- *  Numeric option description:
- */
-static char const zNumericText[] =
-        "numeric host addresses";
-static char const zNumeric_NAME[]            = "NUMERIC";
-static char const zNumeric_Name[]            = "numeric";
-#define NUMERIC_FLAGS       (OPTST_DISABLED)
-
 /*
  *  Help/More_Help/Version option descriptions:
  */
@@ -292,88 +292,88 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ zCommandText, zCommand_NAME, zCommand_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 3, VALUE_OPT_LISTPEERS,
-     /* equiv idx, value */ 3, VALUE_OPT_LISTPEERS,
+  {  /* entry idx, value */ 3, VALUE_OPT_DEBUG_LEVEL,
+     /* equiv idx, value */ 3, VALUE_OPT_DEBUG_LEVEL,
      /* equivalenced to  */ NO_EQUIVALENT,
-     /* min, max, act ct */ 0, 1, 0,
-     /* opt state flags  */ LISTPEERS_FLAGS, 0,
+     /* min, max, act ct */ 0, NOLIMIT, 0,
+     /* opt state flags  */ DEBUG_LEVEL_FLAGS, 0,
      /* last opt argumnt */ { NULL },
      /* arg list/cookie  */ NULL,
-     /* must/cannot opts */ NULL, aListpeersCantList,
+     /* must/cannot opts */ NULL, NULL,
      /* option proc      */ NULL,
-     /* desc, NAME, name */ zListpeersText, zListpeers_NAME, zListpeers_Name,
+     /* desc, NAME, name */ zDebug_LevelText, zDebug_Level_NAME, zDebug_Level_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 4, VALUE_OPT_PEERS,
-     /* equiv idx, value */ 4, VALUE_OPT_PEERS,
+  {  /* entry idx, value */ 4, VALUE_OPT_SET_DEBUG_LEVEL,
+     /* equiv idx, value */ 4, VALUE_OPT_SET_DEBUG_LEVEL,
      /* equivalenced to  */ NO_EQUIVALENT,
-     /* min, max, act ct */ 0, 1, 0,
-     /* opt state flags  */ PEERS_FLAGS, 0,
+     /* min, max, act ct */ 0, NOLIMIT, 0,
+     /* opt state flags  */ SET_DEBUG_LEVEL_FLAGS, 0,
      /* last opt argumnt */ { NULL },
      /* arg list/cookie  */ NULL,
-     /* must/cannot opts */ NULL, aPeersCantList,
-     /* option proc      */ NULL,
-     /* desc, NAME, name */ zPeersText, zPeers_NAME, zPeers_Name,
+     /* must/cannot opts */ NULL, NULL,
+     /* option proc      */ SET_DEBUG_LEVEL_OPT_PROC,
+     /* desc, NAME, name */ zSet_Debug_LevelText, zSet_Debug_Level_NAME, zSet_Debug_Level_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 5, VALUE_OPT_SHOWPEERS,
-     /* equiv idx, value */ 5, VALUE_OPT_SHOWPEERS,
+  {  /* entry idx, value */ 5, VALUE_OPT_INTERACTIVE,
+     /* equiv idx, value */ 5, VALUE_OPT_INTERACTIVE,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
-     /* opt state flags  */ SHOWPEERS_FLAGS, 0,
+     /* opt state flags  */ INTERACTIVE_FLAGS, 0,
      /* last opt argumnt */ { NULL },
      /* arg list/cookie  */ NULL,
-     /* must/cannot opts */ NULL, aShowpeersCantList,
+     /* must/cannot opts */ NULL, aInteractiveCantList,
      /* option proc      */ NULL,
-     /* desc, NAME, name */ zShowpeersText, zShowpeers_NAME, zShowpeers_Name,
+     /* desc, NAME, name */ zInteractiveText, zInteractive_NAME, zInteractive_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 6, VALUE_OPT_INTERACTIVE,
-     /* equiv idx, value */ 6, VALUE_OPT_INTERACTIVE,
+  {  /* entry idx, value */ 6, VALUE_OPT_LISTPEERS,
+     /* equiv idx, value */ 6, VALUE_OPT_LISTPEERS,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
-     /* opt state flags  */ INTERACTIVE_FLAGS, 0,
+     /* opt state flags  */ LISTPEERS_FLAGS, 0,
      /* last opt argumnt */ { NULL },
      /* arg list/cookie  */ NULL,
-     /* must/cannot opts */ NULL, aInteractiveCantList,
+     /* must/cannot opts */ NULL, aListpeersCantList,
      /* option proc      */ NULL,
-     /* desc, NAME, name */ zInteractiveText, zInteractive_NAME, zInteractive_Name,
+     /* desc, NAME, name */ zListpeersText, zListpeers_NAME, zListpeers_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 7, VALUE_OPT_DEBUG_LEVEL,
-     /* equiv idx, value */ 7, VALUE_OPT_DEBUG_LEVEL,
+  {  /* entry idx, value */ 7, VALUE_OPT_NUMERIC,
+     /* equiv idx, value */ 7, VALUE_OPT_NUMERIC,
      /* equivalenced to  */ NO_EQUIVALENT,
-     /* min, max, act ct */ 0, NOLIMIT, 0,
-     /* opt state flags  */ DEBUG_LEVEL_FLAGS, 0,
+     /* min, max, act ct */ 0, 1, 0,
+     /* opt state flags  */ NUMERIC_FLAGS, 0,
      /* last opt argumnt */ { NULL },
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
      /* option proc      */ NULL,
-     /* desc, NAME, name */ zDebug_LevelText, zDebug_Level_NAME, zDebug_Level_Name,
+     /* desc, NAME, name */ zNumericText, zNumeric_NAME, zNumeric_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 8, VALUE_OPT_SET_DEBUG_LEVEL,
-     /* equiv idx, value */ 8, VALUE_OPT_SET_DEBUG_LEVEL,
+  {  /* entry idx, value */ 8, VALUE_OPT_PEERS,
+     /* equiv idx, value */ 8, VALUE_OPT_PEERS,
      /* equivalenced to  */ NO_EQUIVALENT,
-     /* min, max, act ct */ 0, NOLIMIT, 0,
-     /* opt state flags  */ SET_DEBUG_LEVEL_FLAGS, 0,
+     /* min, max, act ct */ 0, 1, 0,
+     /* opt state flags  */ PEERS_FLAGS, 0,
      /* last opt argumnt */ { NULL },
      /* arg list/cookie  */ NULL,
-     /* must/cannot opts */ NULL, NULL,
-     /* option proc      */ SET_DEBUG_LEVEL_OPT_PROC,
-     /* desc, NAME, name */ zSet_Debug_LevelText, zSet_Debug_Level_NAME, zSet_Debug_Level_Name,
+     /* must/cannot opts */ NULL, aPeersCantList,
+     /* option proc      */ NULL,
+     /* desc, NAME, name */ zPeersText, zPeers_NAME, zPeers_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 9, VALUE_OPT_NUMERIC,
-     /* equiv idx, value */ 9, VALUE_OPT_NUMERIC,
+  {  /* entry idx, value */ 9, VALUE_OPT_SHOWPEERS,
+     /* equiv idx, value */ 9, VALUE_OPT_SHOWPEERS,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
-     /* opt state flags  */ NUMERIC_FLAGS, 0,
+     /* opt state flags  */ SHOWPEERS_FLAGS, 0,
      /* last opt argumnt */ { NULL },
      /* arg list/cookie  */ NULL,
-     /* must/cannot opts */ NULL, NULL,
+     /* must/cannot opts */ NULL, aShowpeersCantList,
      /* option proc      */ NULL,
-     /* desc, NAME, name */ zNumericText, zNumeric_NAME, zNumeric_Name,
+     /* desc, NAME, name */ zShowpeersText, zShowpeers_NAME, zShowpeers_Name,
      /* disablement strs */ NULL, NULL },
 
   {  /* entry idx, value */ INDEX_OPT_VERSION, VALUE_OPT_VERSION,
@@ -446,8 +446,8 @@ static tOptDesc optDesc[OPTION_CT] = {
  *  Define the Ntpdc Option Environment
  */
 static char const zPROGNAME[6] = "NTPDC";
-static char const zUsageTitle[129] =
-"ntpdc - vendor-specific NTP query program - Ver. 4.2.7p173\n\
+static char const zUsageTitle[132] =
+"ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p174\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n";
 static char const zRcName[7] = ".ntprc";
 static char const * const apzHomeList[3] = {
@@ -457,8 +457,8 @@ static char const * const apzHomeList[3] = {
 
 static char const zBugsAddr[34]    = "http://bugs.ntp.org, bugs@ntp.org";
 #define zExplain NULL
-static char const zDetail[601] = "\n\
-The [= prog-name =] utility program is used to query an NTP daemon about\n\
+static char const zDetail[603] = "\n\
+The [+: prog-name :+] utility program is used to query an NTP daemon about\n\
 its current state and to request changes in that state.  It uses NTP mode\n\
 7 control message formats described in the source code.  The program may\n\
 be run either in interactive mode or controlled using command line\n\
@@ -553,7 +553,7 @@ doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc)
 static void
 doOptSet_Debug_Level(tOptions* pOptions, tOptDesc* pOptDesc)
 {
-    /* extracted from debug-opt.def, line 27 */
+    /* extracted from debug-opt.def, line 26 */
 DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg );
 }
 #endif /* defined(TEST_NTPDC_OPTS) */
diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h
index 9b181ab022..e27ebc710d 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  May 25, 2011 at 07:28:26 PM by AutoGen 5.11.9
+ *  It has been AutoGen-ed  May 28, 2011 at 10:59:39 AM by AutoGen 5.11.9
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -17,9 +17,9 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * ntpdc copyright (c) 1970-2011 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
+ * See html/copyright.html
  * 
  */
 /*
@@ -54,13 +54,13 @@ typedef enum {
     INDEX_OPT_IPV4             =  0,
     INDEX_OPT_IPV6             =  1,
     INDEX_OPT_COMMAND          =  2,
-    INDEX_OPT_LISTPEERS        =  3,
-    INDEX_OPT_PEERS            =  4,
-    INDEX_OPT_SHOWPEERS        =  5,
-    INDEX_OPT_INTERACTIVE      =  6,
-    INDEX_OPT_DEBUG_LEVEL      =  7,
-    INDEX_OPT_SET_DEBUG_LEVEL  =  8,
-    INDEX_OPT_NUMERIC          =  9,
+    INDEX_OPT_DEBUG_LEVEL      =  3,
+    INDEX_OPT_SET_DEBUG_LEVEL  =  4,
+    INDEX_OPT_INTERACTIVE      =  5,
+    INDEX_OPT_LISTPEERS        =  6,
+    INDEX_OPT_NUMERIC          =  7,
+    INDEX_OPT_PEERS            =  8,
+    INDEX_OPT_SHOWPEERS        =  9,
     INDEX_OPT_VERSION          = 10,
     INDEX_OPT_HELP             = 11,
     INDEX_OPT_MORE_HELP        = 12,
@@ -69,8 +69,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    15
-#define NTPDC_VERSION       "4.2.7p173"
-#define NTPDC_FULL_VERSION  "ntpdc 4.2.7p173"
+#define NTPDC_VERSION       "4.2.7p174"
+#define NTPDC_FULL_VERSION  "ntpdc 4.2.7p174"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
@@ -117,22 +117,6 @@ typedef enum {
 #  warning undefining COMMAND due to option name conflict
 #  undef   COMMAND
 # endif
-# ifdef    LISTPEERS
-#  warning undefining LISTPEERS due to option name conflict
-#  undef   LISTPEERS
-# endif
-# ifdef    PEERS
-#  warning undefining PEERS due to option name conflict
-#  undef   PEERS
-# endif
-# ifdef    SHOWPEERS
-#  warning undefining SHOWPEERS due to option name conflict
-#  undef   SHOWPEERS
-# endif
-# ifdef    INTERACTIVE
-#  warning undefining INTERACTIVE due to option name conflict
-#  undef   INTERACTIVE
-# endif
 # ifdef    DEBUG_LEVEL
 #  warning undefining DEBUG_LEVEL due to option name conflict
 #  undef   DEBUG_LEVEL
@@ -141,21 +125,37 @@ typedef enum {
 #  warning undefining SET_DEBUG_LEVEL due to option name conflict
 #  undef   SET_DEBUG_LEVEL
 # endif
+# ifdef    INTERACTIVE
+#  warning undefining INTERACTIVE due to option name conflict
+#  undef   INTERACTIVE
+# endif
+# ifdef    LISTPEERS
+#  warning undefining LISTPEERS due to option name conflict
+#  undef   LISTPEERS
+# endif
 # ifdef    NUMERIC
 #  warning undefining NUMERIC due to option name conflict
 #  undef   NUMERIC
 # endif
+# ifdef    PEERS
+#  warning undefining PEERS due to option name conflict
+#  undef   PEERS
+# endif
+# ifdef    SHOWPEERS
+#  warning undefining SHOWPEERS due to option name conflict
+#  undef   SHOWPEERS
+# endif
 #else  /* NO_OPTION_NAME_WARNINGS */
 # undef IPV4
 # undef IPV6
 # undef COMMAND
-# undef LISTPEERS
-# undef PEERS
-# undef SHOWPEERS
-# undef INTERACTIVE
 # undef DEBUG_LEVEL
 # undef SET_DEBUG_LEVEL
+# undef INTERACTIVE
+# undef LISTPEERS
 # undef NUMERIC
+# undef PEERS
+# undef SHOWPEERS
 #endif  /*  NO_OPTION_NAME_WARNINGS */
 
 /* * * * * *
@@ -165,13 +165,13 @@ typedef enum {
 #define VALUE_OPT_IPV4           '4'
 #define VALUE_OPT_IPV6           '6'
 #define VALUE_OPT_COMMAND        'c'
-#define VALUE_OPT_LISTPEERS      'l'
-#define VALUE_OPT_PEERS          'p'
-#define VALUE_OPT_SHOWPEERS      's'
-#define VALUE_OPT_INTERACTIVE    'i'
 #define VALUE_OPT_DEBUG_LEVEL    'd'
 #define VALUE_OPT_SET_DEBUG_LEVEL 'D'
+#define VALUE_OPT_INTERACTIVE    'i'
+#define VALUE_OPT_LISTPEERS      'l'
 #define VALUE_OPT_NUMERIC        'n'
+#define VALUE_OPT_PEERS          'p'
+#define VALUE_OPT_SHOWPEERS      's'
 #define VALUE_OPT_HELP          '?'
 #define VALUE_OPT_MORE_HELP     '!'
 #define VALUE_OPT_VERSION       INDEX_OPT_VERSION
diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi
index 20d4b42967..0cb94cee4c 100644
--- a/ntpdc/ntpdc-opts.texi
+++ b/ntpdc/ntpdc-opts.texi
@@ -1,19 +1,19 @@
 @node ntpdc Invocation
 @section Invoking ntpdc
 @pindex ntpdc
-@cindex vendor-specific NTP query program
+@cindex vendor-specific NTPD control program
 @ignore
 # 
 # EDIT THIS FILE WITH CAUTION  (ntpdc-opts.texi)
 # 
-# It has been AutoGen-ed  May 25, 2011 at 07:28:35 PM by AutoGen 5.11.9
+# It has been AutoGen-ed  May 28, 2011 at 11:00:20 AM by AutoGen 5.11.9
 # From the definitions    ntpdc-opts.def
 # and the template file   aginfo.tpl
 @end ignore
 This program has no explanation.
 
 The
-[= prog-name =]
+[+: 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.
@@ -30,7 +30,6 @@ ntpd's configuration file may also be specified at run time using
 [= prog-name =] .
 
 
-
 This section was generated by @strong{AutoGen},
 the aginfo template and the option descriptions for the @command{ntpdc} program.  It documents the ntpdc usage text and option meanings.
 
@@ -58,7 +57,7 @@ This is the automatically generated usage text for ntpdc:
 
 @exampleindent 0
 @example
-ntpdc - vendor-specific NTP query program - Ver. 4.2.7p173
+ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p174
 USAGE:  ntpdc [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
@@ -69,26 +68,26 @@ USAGE:  ntpdc [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [ host ...]
                                 ipv4
    -c Str command        run a command and exit
                                 - may appear multiple times
+   -d no  debug-level    Increase debug verbosity level
+                                - may appear multiple times
+   -D Str set-debug-level Set the debug verbosity level
+                                - may appear multiple times
+   -i no  interactive    Force ntpq to operate in interactive mode
+                                - prohibits these options:
+                                command
+                                listpeers
+                                peers
+                                showpeers
    -l no  listpeers      Print a list of the peers
                                 - prohibits these options:
                                 command
+   -n no  numeric        numeric host addresses
    -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
@@ -105,7 +104,7 @@ The following option preset mechanisms are supported:
  - reading file ./.ntprc
  - examining environment variables named NTPDC_*
 
-The [= prog-name =] utility program is used to query an NTP daemon about
+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
@@ -139,7 +138,7 @@ host(s).
 @subsection debug-level option (-d)
 @cindex ntpdc-debug-level
 
-This is the ``increase output debug message level'' option.
+This is the ``increase debug verbosity level'' option.
 
 This option has some usage constraints.  It:
 @itemize @bullet
@@ -147,7 +146,7 @@ This option has some usage constraints.  It:
 may appear an unlimited number of times.
 @end itemize
 
-Increase the debugging message output level.
+
 
 @node ntpdc interactive
 @subsection interactive option (-i)
@@ -241,7 +240,7 @@ of their state. This is equivalent to the 'peers' interactive command.
 @subsection set-debug-level option (-D)
 @cindex ntpdc-set-debug-level
 
-This is the ``set the output debug message level'' option.
+This is the ``set the debug verbosity level'' option.
 
 This option has some usage constraints.  It:
 @itemize @bullet
@@ -249,8 +248,7 @@ This option has some usage constraints.  It:
 may appear an unlimited number of times.
 @end itemize
 
-Set the output debugging level.  Can be supplied multiple times,
-but each overrides the previous value(s).
+
 
 @node ntpdc showpeers
 @subsection showpeers option (-s)
diff --git a/ntpdc/ntpdc.1 b/ntpdc/ntpdc.1
index e20d7dd05a..a5e040f8e3 100644
--- a/ntpdc/ntpdc.1
+++ b/ntpdc/ntpdc.1
@@ -1,24 +1,26 @@
-.TH NTPDC 1 2011-05-25 "( 4.2.7p173)" "Programmer's Manual"
-.\"  EDIT THIS FILE WITH CAUTION  (ntpdc.1)
+.Dd May 28 2011
+.Dt NTPDC 1 User Commands
+.Os SunOS 5.10
+.\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  May 25, 2011 at 07:28:34 PM by AutoGen 5.11.9
+.\"  It has been AutoGen-ed  May 28, 2011 at 11:00:18 AM by AutoGen 5.11.9
 .\"  From the definitions    ntpdc-opts.def
-.\"  and the template file   agman1.tpl
-.\"
-.SH NAME
-ntpdc \- vendor-specific NTP query program
-.SH SYNOPSIS
-.B ntpdc
+.\"  and the template file   agmdoc-cmd.tpl
+.Sh NAME
+.Nm ntpdc
+.Nd vendor-specific NTPD control program
+.Sh SYNOPSIS
+.Nm 
 .\" Mixture of short (flag) options and long options
-.RB [ \-\fIflag\fP " [\fIvalue\fP]]... [" \--\fIopt-name\fP " [[=| ]\fIvalue\fP]]..."
-.br
-.in +8
-[ host ...]
-.SH "DESCRIPTION"
-This manual page briefly documents the \fBntpdc\fP command.
-The
-[= prog-name =]
-utility program is used to query an NTP daemon about its
+.Op Fl flags
+.Op Fl flag Ar value
+.Op Fl \-option-name Ar value[ host ...]
+.Pp
+.Sh DESCRIPTION
+.Nm
+is a utility program used to query
+.Xr ntpd 8
+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
@@ -26,112 +28,94 @@ be run either in interactive mode or controlled using command line
 arguments.
 Extensive state and statistics information is available
 through the
-[= prog-name =]
+.Nm
 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 =] .
-
-
-.SH OPTIONS
-.TP
-.BR \-4 ", " \--ipv4
+.Nm .
+.Sh OPTIONS
+.Bl -tag
+.It  \-4 ", " -\-ipv4
 Force IPv4 DNS name resolution.
 This option must not appear in combination with any of the following options:
 ipv6.
 .sp
 Force DNS resolution of following host names on the command line
 to the IPv4 namespace.
-.TP
-.BR \-6 ", " \--ipv6
+.It  \-6 ", " -\-ipv6
 Force IPv6 DNS name resolution.
 This option must not appear in combination with any of the following options:
 ipv4.
 .sp
 Force DNS resolution of following host names on the command line
 to the IPv6 namespace.
-.TP
-.BR \-c " \fIcmd\fP, " \--command "=" \fIcmd\fP
+.It  \-c " \fIcmd\fP, " \-\-command "=" \fIcmd\fP
 run a command and exit.
 This option may appear an unlimited number of times.
 .sp
 The following argument is interpreted as an interactive format command
 and is added to the list of commands to be executed on the specified
 host(s).
-.TP
-.BR \-l ", " \--listpeers
+.It  \-d ", " -\-debug\-level
+Increase debug verbosity level.
+This option may appear an unlimited number of times.
+.sp
+.It  \-D " \fIstring\fP, " \-\-set\-debug\-level "=" \fIstring\fP
+Set the debug verbosity level.
+This option may appear an unlimited number of times.
+.sp
+.It  \-i ", " -\-interactive
+Force ntpq to operate in interactive mode.
+This option must not appear in combination with any of the following options:
+command, listpeers, peers, showpeers.
+.sp
+Force ntpq to operate in interactive mode.  Prompts will be written
+to the standard output and commands read from the standard input.
+.It  \-l ", " -\-listpeers
 Print a list of the peers.
 This option must not appear in combination with any of the following options:
 command.
 .sp
 Print a list of the peers known to the server as well as a summary of
 their state. This is equivalent to the 'listpeers' interactive command.
-.TP
-.BR \-p ", " \--peers
+.It  \-n ", " -\-numeric
+numeric host addresses.
+.sp
+Output all host addresses in dotted-quad numeric format rather than
+converting to the canonical host names. 
+.It  \-p ", " -\-peers
 Print a list of the peers.
 This option must not appear in combination with any of the following options:
 command.
 .sp
 Print a list of the peers known to the server as well as a summary
 of their state. This is equivalent to the 'peers' interactive command.
-.TP
-.BR \-s ", " \--showpeers
+.It  \-s ", " -\-showpeers
 Show a list of the peers.
 This option must not appear in combination with any of the following options:
 command.
 .sp
 Print a list of the peers known to the server as well as a summary
 of their state. This is equivalent to the 'dmpeers' interactive command.
-.TP
-.BR \-i ", " \--interactive
-Force ntpq to operate in interactive mode.
-This option must not appear in combination with any of the following options:
-command, listpeers, peers, showpeers.
-.sp
-Force ntpq to operate in interactive mode.  Prompts will be written
-to the standard output and commands read from the standard input.
-.TP
-.BR \-d ", " \--debug-level
-Increase output debug message level.
-This option may appear an unlimited number of times.
-.sp
-Increase the debugging message output level.
-.TP
-.BR \-D " \fIstring\fP, " \--set-debug-level "=" \fIstring\fP
-Set the output debug message level.
-This option may appear an unlimited number of times.
-.sp
-Set the output debugging level.  Can be supplied multiple times,
-but each overrides the previous value(s).
-.TP
-.BR \-n ", " \--numeric
-numeric host addresses.
-.sp
-Output all host addresses in dotted-quad numeric format rather than
-converting to the canonical host names. 
-.TP
-.BR \-? , " \--help"
-Display extended usage information and exit.
-.TP
-.BR \-! , " \--more-help"
-Extended usage information passed thru pager.
-.TP
-.BR \-> " [\fIrcfile\fP]," " \--save-opts" "[=\fIrcfile\fP]"
+.It \-? , " \-\-help"
+Display usage information and exit.
+.It \-! , " \-\-more-help"
+Pass the extended usage information through a pager.
+.It \-> " [\fIrcfile\fP]," " \-\-save-opts" "[=\fIrcfile\fP]"
 Save the option state to \fIrcfile\fP.  The default is the \fIlast\fP
 configuration file listed in the \fBOPTION PRESETS\fP section, below.
-.TP
-.BR \-< " \fIrcfile\fP," " \--load-opts" "=\fIrcfile\fP," " \--no-load-opts"
+.It \-< " \fIrcfile\fP," " \-\-load-opts" "=\fIrcfile\fP," " \-\-no-load-opts"
 Load options from \fIrcfile\fP.
 The \fIno-load-opts\fP form will disable the loading
-of earlier RC/INI files.  \fI--no-load-opts\fP is handled early,
+of earlier RC/INI files.  \fI\-\-no-load-opts\fP is handled early,
 out of order.
-.TP
-.BR \- " [{\fIv|c|n\fP}]," " \--version" "[=\fI{v|c|n}\fP]"
+.It \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.
-.SH OPTION PRESETS
+.El
+.Sh "OPTION PRESETS"
 Any option that is not marked as \fInot presettable\fP may be preset
 by loading values from configuration ("RC" or ".INI") file(s) and values from
 environment variables named:
@@ -144,18 +128,667 @@ the configuration files.
 The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
 If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
-.SH AUTHOR
-David L. Mills and/or others
-.br
-Please send bug reports to:  http://bugs.ntp.org, bugs@ntp.org
-
-.PP
+.Sh USAGE
+If one or more request options are included on the command line
+when
+.Nm
+is executed, each of the requests will be sent
+to the NTP servers running on each of the hosts given as command
+line arguments, or on localhost by default.
+If no request options
+are given,
+.Nm
+will attempt to read commands from the
+standard input and execute these on the NTP server running on the
+first host given on the command line, again defaulting to localhost
+when no other host is specified.
+The
+.Nm
+utility will prompt for
+commands if the standard input is a terminal device.
+.Pp
+The
+.Nm
+utility uses NTP mode 7 packets to communicate with the
+NTP server, and hence can be used to query any compatible server on
+the network which permits it.
+Note that since NTP is a UDP protocol
+this communication will be somewhat unreliable, especially over
+large distances in terms of network topology.
+The
+.Nm
+utility makes
+no attempt to retransmit requests, and will time requests out if
+the remote host is not heard from within a suitable timeout
+time.
+.Pp
+The operation of
+.Nm
+are specific to the particular
+implementation of the
+.Xr ntpd 8
+daemon and can be expected to
+work only with this and maybe some previous versions of the daemon.
+Requests from a remote
+.Nm
+utility which affect the
+state of the local server must be authenticated, which requires
+both the remote program and local server share a common key and key
+identifier.
+.Pp
+Note that in contexts where a host name is expected, a
+.Fl 4
+qualifier preceding the host name forces DNS resolution to the IPv4 namespace,
+while a
+.Fl 6
+qualifier forces DNS resolution to the IPv6 namespace.
+Specifying a command line option other than
+.Fl i
+or
+.Fl n
+will cause the specified query (queries) to be sent to
+the indicated host(s) immediately.
+Otherwise,
+.Nm
+will
+attempt to read interactive format commands from the standard
+input.
+.Ss "Interactive Commands"
+Interactive format commands consist of a keyword followed by zero
+to four arguments.
+Only enough characters of the full keyword to
+uniquely identify the command need be typed.
+The output of a
+command is normally sent to the standard output, but optionally the
+output of individual commands may be sent to a file by appending a
+.Ql \&> ,
+followed by a file name, to the command line.
+.Pp
+A number of interactive format commands are executed entirely
+within the
+.Nm
+utility itself and do not result in NTP
+mode 7 requests being sent to a server.
+These are described
+following.
+.Bl -tag -width indent
+.It Ic \&? Ar command_keyword
+.It Ic help Ar command_keyword
+A
+.Sq Ic \&?
+will print a list of all the command
+keywords known to this incarnation of
+.Nm .
+A
+.Sq Ic \&?
+followed by a command keyword will print function and usage
+information about the command.
+This command is probably a better
+source of information about
+.Xr ntpq 8
+than this manual
+page.
+.It Ic delay Ar milliseconds
+Specify a time interval to be added to timestamps included in
+requests which require authentication.
+This is used to enable
+(unreliable) server reconfiguration over long delay network paths
+or between machines whose clocks are unsynchronized.
+Actually the
+server does not now require timestamps in authenticated requests,
+so this command may be obsolete.
+.It Ic host Ar hostname
+Set the host to which future queries will be sent.
+Hostname may
+be either a host name or a numeric address.
+.It Ic hostnames Op Cm yes | Cm no
+If
+.Cm yes
+is specified, host names are printed in
+information displays.
+If
+.Cm no
+is specified, numeric
+addresses are printed instead.
+The default is
+.Cm yes ,
+unless
+modified using the command line
+.Fl n
+switch.
+.It Ic keyid Ar keyid
+This command allows the specification of a key number to be
+used to authenticate configuration requests.
+This must correspond
+to a key number the server has been configured to use for this
+purpose.
+.It Ic quit
+Exit
+.Nm .
+.It Ic passwd
+This command prompts you to type in a password (which will not
+be echoed) which will be used to authenticate configuration
+requests.
+The password must correspond to the key configured for
+use by the NTP server for this purpose if such requests are to be
+successful.
+.It Ic timeout Ar milliseconds
+Specify a timeout period for responses to server queries.
+The
+default is about 8000 milliseconds.
+Note that since
+.Nm
+retries each query once after a timeout, the total waiting time for
+a timeout will be twice the timeout value set.
+.El
+.Ss "Control Message Commands"
+Query commands result in NTP mode 7 packets containing requests for
+information being sent to the server.
+These are read-only commands
+in that they make no modification of the server configuration
+state.
+.Bl -tag -width indent
+.It Ic listpeers
+Obtains and prints a brief list of the peers for which the
+server is maintaining state.
+These should include all configured
+peer associations as well as those peers whose stratum is such that
+they are considered by the server to be possible future
+synchronization candidates.
+.It Ic peers
+Obtains a list of peers for which the server is maintaining
+state, along with a summary of that state.
+Summary information
+includes the address of the remote peer, the local interface
+address (0.0.0.0 if a local address has yet to be determined), the
+stratum of the remote peer (a stratum of 16 indicates the remote
+peer is unsynchronized), the polling interval, in seconds, the
+reachability register, in octal, and the current estimated delay,
+offset and dispersion of the peer, all in seconds.
+.Pp
+The character in the left margin indicates the mode this peer
+entry is operating in.
+A
+.Ql \&+
+denotes symmetric active, a
+.Ql \&-
+indicates symmetric passive, a
+.Ql \&=
+means the
+remote server is being polled in client mode, a
+.Ql \&^
+indicates that the server is broadcasting to this address, a
+.Ql \&~
+denotes that the remote peer is sending broadcasts and a
+.Ql \&~
+denotes that the remote peer is sending broadcasts and a
+.Ql \&*
+marks the peer the server is currently synchronizing
+to.
+.Pp
+The contents of the host field may be one of four forms.
+It may
+be a host name, an IP address, a reference clock implementation
+name with its parameter or
+.Fn REFCLK "implementation_number" "parameter" .
+On
+.Ic hostnames
+.Cm no
+only IP-addresses
+will be displayed.
+.It Ic dmpeers
+A slightly different peer summary list.
+Identical to the output
+of the
+.Ic peers
+command, except for the character in the
+leftmost column.
+Characters only appear beside peers which were
+included in the final stage of the clock selection algorithm.
+A
+.Ql \&.
+indicates that this peer was cast off in the falseticker
+detection, while a
+.Ql \&+
+indicates that the peer made it
+through.
+A
+.Ql \&*
+denotes the peer the server is currently
+synchronizing with.
+.It Ic showpeer Ar peer_address Oo Ar ... Oc
+Shows a detailed display of the current peer variables for one
+or more peers.
+Most of these values are described in the NTP
+Version 2 specification.
+.It Ic pstats Ar peer_address Oo Ar ... Oc
+Show per-peer statistic counters associated with the specified
+peer(s).
+.It Ic clockinfo Ar clock_peer_address Oo Ar ... Oc
+Obtain and print information concerning a peer clock.
+The
+values obtained provide information on the setting of fudge factors
+and other clock performance information.
+.It Ic kerninfo
+Obtain and print kernel phase-lock loop operating parameters.
+This information is available only if the kernel has been specially
+modified for a precision timekeeping function.
+.It Ic loopinfo Op Cm oneline | Cm multiline
+Print the values of selected loop filter variables.
+The loop
+filter is the part of NTP which deals with adjusting the local
+system clock.
+The
+.Sq offset
+is the last offset given to the
+loop filter by the packet processing code.
+The
+.Sq frequency
+is the frequency error of the local clock in parts-per-million
+(ppm).
+The
+.Sq time_const
+controls the stiffness of the
+phase-lock loop and thus the speed at which it can adapt to
+oscillator drift.
+The
+.Sq watchdog timer
+value is the number
+of seconds which have elapsed since the last sample offset was
+given to the loop filter.
+The
+.Cm oneline
+and
+.Cm multiline
+options specify the format in which this
+information is to be printed, with
+.Cm multiline
+as the
+default.
+.It Ic sysinfo
+Print a variety of system state variables, i.e., state related
+to the local server.
+All except the last four lines are described
+in the NTP Version 3 specification, RFC-1305.
+.Pp
+The
+.Sq system flags
+show various system flags, some of
+which can be set and cleared by the
+.Ic enable
+and
+.Ic disable
+configuration commands, respectively.
+These are
+the
+.Cm auth ,
+.Cm bclient ,
+.Cm monitor ,
+.Cm pll ,
+.Cm pps
+and
+.Cm stats
+flags.
+See the
+.Xr ntpd 8
+documentation for the meaning of these flags.
+There
+are two additional flags which are read only, the
+.Cm kernel_pll
+and
+.Cm kernel_pps .
+These flags indicate
+the synchronization status when the precision time kernel
+modifications are in use.
+The
+.Sq kernel_pll
+indicates that
+the local clock is being disciplined by the kernel, while the
+.Sq kernel_pps
+indicates the kernel discipline is provided by the PPS
+signal.
+.Pp
+The
+.Sq stability
+is the residual frequency error remaining
+after the system frequency correction is applied and is intended for
+maintenance and debugging.
+In most architectures, this value will
+initially decrease from as high as 500 ppm to a nominal value in
+the range .01 to 0.1 ppm.
+If it remains high for some time after
+starting the daemon, something may be wrong with the local clock,
+or the value of the kernel variable
+.Va kern.clockrate.tick
+may be
+incorrect.
+.Pp
+The
+.Sq broadcastdelay
+shows the default broadcast delay,
+as set by the
+.Ic broadcastdelay
+configuration command.
+.Pp
+The
+.Sq authdelay
+shows the default authentication delay,
+as set by the
+.Ic authdelay
+configuration command.
+.It Ic sysstats
+Print statistics counters maintained in the protocol
+module.
+.It Ic memstats
+Print statistics counters related to memory allocation
+code.
+.It Ic iostats
+Print statistics counters maintained in the input-output
+module.
+.It Ic timerstats
+Print statistics counters maintained in the timer/event queue
+support code.
+.It Ic reslist
+Obtain and print the server's restriction list.
+This list is
+(usually) printed in sorted order and may help to understand how
+the restrictions are applied.
+.It Ic monlist Op Ar version
+Obtain and print traffic counts collected and maintained by the
+monitor facility.
+The version number should not normally need to be
+specified.
+.It Ic clkbug Ar clock_peer_address Oo Ar ... Oc
+Obtain debugging information for a reference clock driver.
+This
+information is provided only by some clock drivers and is mostly
+undecodable without a copy of the driver source in hand.
+.El
+.Ss "Runtime Configuration Requests"
+All requests which cause state changes in the server are
+authenticated by the server using a configured NTP key (the
+facility can also be disabled by the server by not configuring a
+key).
+The key number and the corresponding key must also be made
+known to
+.Nm .
+This can be done using the
+.Ic keyid
+and
+.Ic passwd
+commands, the latter of which will prompt at the terminal for a
+password to use as the encryption key.
+You will also be prompted
+automatically for both the key number and password the first time a
+command which would result in an authenticated request to the
+server is given.
+Authentication not only provides verification that
+the requester has permission to make such changes, but also gives
+an extra degree of protection again transmission errors.
+.Pp
+Authenticated requests always include a timestamp in the packet
+data, which is included in the computation of the authentication
+code.
+This timestamp is compared by the server to its receive time
+stamp.
+If they differ by more than a small amount the request is
+rejected.
+This is done for two reasons.
+First, it makes simple
+replay attacks on the server, by someone who might be able to
+overhear traffic on your LAN, much more difficult.
+Second, it makes
+it more difficult to request configuration changes to your server
+from topologically remote hosts.
+While the reconfiguration facility
+will work well with a server on the local host, and may work
+adequately between time-synchronized hosts on the same LAN, it will
+work very poorly for more distant hosts.
+As such, if reasonable
+passwords are chosen, care is taken in the distribution and
+protection of keys and appropriate source address restrictions are
+applied, the run time reconfiguration facility should provide an
+adequate level of security.
+.Pp
+The following commands all make authenticated requests.
+.Bl -tag -width indent
+.It Xo Ic addpeer Ar peer_address
+.Op Ar keyid
+.Op Ar version
+.Op Cm prefer
+.Xc
+Add a configured peer association at the given address and
+operating in symmetric active mode.
+Note that an existing
+association with the same peer may be deleted when this command is
+executed, or may simply be converted to conform to the new
+configuration, as appropriate.
+If the optional
+.Ar keyid
+is a
+nonzero integer, all outgoing packets to the remote server will
+have an authentication field attached encrypted with this key.
+If
+the value is 0 (or not given) no authentication will be done.
+The
+.Ar version
+can be 1, 2 or 3 and defaults to 3.
+The
+.Cm prefer
+keyword indicates a preferred peer (and thus will
+be used primarily for clock synchronisation if possible).
+The
+preferred peer also determines the validity of the PPS signal - if
+the preferred peer is suitable for synchronisation so is the PPS
+signal.
+.It Xo Ic addserver Ar peer_address
+.Op Ar keyid
+.Op Ar version
+.Op Cm prefer
+.Xc
+Identical to the addpeer command, except that the operating
+mode is client.
+.It Xo Ic broadcast Ar peer_address
+.Op Ar keyid
+.Op Ar version
+.Op Cm prefer
+.Xc
+Identical to the addpeer command, except that the operating
+mode is broadcast.
+In this case a valid key identifier and key are
+required.
+The
+.Ar peer_address
+parameter can be the broadcast
+address of the local network or a multicast group address assigned
+to NTP.
+If a multicast address, a multicast-capable kernel is
+required.
+.It Ic unconfig Ar peer_address Oo Ar ... Oc
+This command causes the configured bit to be removed from the
+specified peer(s).
+In many cases this will cause the peer
+association to be deleted.
+When appropriate, however, the
+association may persist in an unconfigured mode if the remote peer
+is willing to continue on in this fashion.
+.It Xo Ic fudge Ar peer_address
+.Op Cm time1
+.Op Cm time2
+.Op Ar stratum
+.Op Ar refid
+.Xc
+This command provides a way to set certain data for a reference
+clock.
+See the source listing for further information.
+.It Xo Ic enable
+.Oo
+.Cm auth | Cm bclient |
+.Cm calibrate | Cm kernel |
+.Cm monitor | Cm ntp |
+.Cm pps | Cm stats
+.Oc
+.Xc
+.It Xo Ic disable
+.Oo
+.Cm auth | Cm bclient |
+.Cm calibrate | Cm kernel |
+.Cm monitor | Cm ntp |
+.Cm pps | Cm stats
+.Oc
+.Xc
+These commands operate in the same way as the
+.Ic enable
+and
+.Ic disable
+configuration file commands of
+.Xr ntpd 8 .
+.Bl -tag -width indent
+.It Cm auth
+Enables the server to synchronize with unconfigured peers only
+if the peer has been correctly authenticated using either public key
+or private key cryptography.
+The default for this flag is enable.
+.It Cm bclient
+Enables the server to listen for a message from a broadcast or
+multicast server, as in the multicastclient command with
+default address.
+The default for this flag is disable.
+.It Cm calibrate
+Enables the calibrate feature for reference clocks.
+The default for this flag is disable.
+.It Cm kernel
+Enables the kernel time discipline, if available.
+The default for this flag is enable if support is available, otherwise disable.
+.It Cm monitor
+Enables the monitoring facility.
+See the
+.Xr ntpdc 8 .
+program and the monlist command or further information.
+The default for this flag is enable.
+.It Cm ntp
+Enables time and frequency discipline.
+In effect, this switch opens and closes the feedback loop,
+which is useful for testing.
+The default for this flag is enable.
+.It Cm pps
+Enables the pulse-per-second (PPS) signal when frequency
+and time is disciplined by the precision time kernel modifications.
+See the
+.Qq A Kernel Model for Precision Timekeeping
+(available as part of the HTML documentation
+provided in
+.Pa /usr/share/doc/ntp )
+page for further information.
+The default for this flag is disable.
+.It Cm stats
+Enables the statistics facility.
+See the
+.Sx Monitoring Options
+section of
+.Xr ntp.conf 5
+for further information.
+The default for this flag is disable.
+.El
+.It Xo Ic restrict Ar address Ar mask
+.Ar flag Oo Ar ... Oc
+.Xc
+This command operates in the same way as the
+.Ic restrict
+configuration file commands of
+.Xr ntpd 8 .
+.It Xo Ic unrestrict Ar address Ar mask
+.Ar flag Oo Ar ... Oc
+.Xc
+Unrestrict the matching entry from the restrict list.
+.It Xo Ic delrestrict Ar address Ar mask
+.Op Cm ntpport
+.Xc
+Delete the matching entry from the restrict list.
+.It Ic readkeys
+Causes the current set of authentication keys to be purged and
+a new set to be obtained by rereading the keys file (which must
+have been specified in the
+.Xr ntpd 8
+configuration file).
+This
+allows encryption keys to be changed without restarting the
+server.
+.It Ic trustedkey Ar keyid Oo Ar ... Oc
+.It Ic untrustedkey Ar keyid Oo Ar ... Oc
+These commands operate in the same way as the
+.Ic trustedkey
+and
+.Ic untrustedkey
+configuration file
+commands of
+.Xr ntpd 8 .
+.It Ic authinfo
+Returns information concerning the authentication module,
+including known keys and counts of encryptions and decryptions
+which have been done.
+.It Ic traps
+Display the traps set in the server.
+See the source listing for
+further information.
+.It Xo Ic addtrap Ar address
+.Op Ar port
+.Op Ar interface
+.Xc
+Set a trap for asynchronous messages.
+See the source listing
+for further information.
+.It Xo Ic clrtrap Ar address
+.Op Ar port
+.Op Ar interface
+.Xc
+Clear a trap for asynchronous messages.
+See the source listing
+for further information.
+.It Ic reset
+Clear the statistics counters in various modules of the server.
+See the source listing for further information.
+.El
+.Sh ENVIRONMENT
+See \fBOPTION PRESETS\fP for configuration environment variables.
+.Sh FILES
+See \fBOPTION PRESETS\fP for configuration files.
+.Sh "EXIT STATUS"
+One of the following exit values will be returned:
+.Bl -tag
+.It 0
+Successful program execution.
+.It 1
+The operation failed or the command syntax was not valid.
+.El
+.Sh "SEE ALSO"
+.Xr ntp.conf 5 ,
+.Xr ntpd 8
+.Rs
+.%A David L. Mills
+.%T Network Time Protocol (Version 3)
+.%O RFC1305
+.Re
+.Pp
 .nf
 .na
-see html/copyright.html
-
+See html/copyright.html
 .fi
 .ad
-.PP
-This manual page was \fIAutoGen\fP-erated from the \fBntpdc\fP
+.Pp
+This manual page was \fIAutoGen\fP-erated from the
+.Nm
 option definitions.
+.Sh BUGS
+The
+.Nm
+utility is a crude hack.
+Much of the information it shows is
+deadly boring and could only be loved by its implementer.
+The
+program was designed so that new (and temporary) features were easy
+to hack in, at great expense to the program's ease of use.
+Despite
+this, the program is occasionally useful.
+.Pp
+Please report bugs to http://bugs.ntp.org .
diff --git a/ntpdc/ntpdc.html b/ntpdc/ntpdc.html
index 07d3802d10..2332100632 100644
--- a/ntpdc/ntpdc.html
+++ b/ntpdc/ntpdc.html
@@ -3,7 +3,7 @@
 <title>ntpdc: NTPD Control User's Manual</title>
 <meta http-equiv="Content-Type" content="text/html">
 <meta name="description" content="ntpdc: NTPD Control User's Manual">
-<meta name="generator" content="makeinfo 4.13">
+<meta name="generator" content="makeinfo 4.7">
 <link title="Top" rel="top" href="#Top">
 <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
 <meta http-equiv="Content-Style-Type" content="text/css">
@@ -14,20 +14,18 @@
   pre.smallformat  { font-family:inherit; font-size:smaller }
   pre.smallexample { font-size:smaller }
   pre.smalllisp    { font-size:smaller }
-  span.sc    { font-variant:small-caps }
-  span.roman { font-family:serif; font-weight:normal; } 
-  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+  span.sc { font-variant:small-caps }
+  span.roman { font-family: serif; font-weight: normal; } 
 --></style>
 </head>
 <body>
 <h1 class="settitle">ntpdc: NTPD Control User's Manual</h1>
 <div class="node">
-<a name="Top"></a>
 <p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-Description">ntpdc Description</a>,
+<a name="Top"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-Description">ntpdc Description</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#dir">(dir)</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#dir">(dir)</a>
-
+<br>
 </div>
 
 <h2 class="unnumbered">ntpdc: NTPD Control User Manual</h2>
@@ -38,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 {No value for `VERSION'} of <code>ntpdc</code>.
+  <p>This document applies to version 4.2.7p174 of <code>ntpdc</code>.
 
   <p>The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
@@ -57,10 +55,9 @@ IETF specification.
 </ul>
 
 <div class="node">
-<a name="ntpdc-Description"></a>
 <p><hr>
-
-
+<a name="ntpdc-Description"></a>
+<br>
 </div>
 
 <!-- node-name,  next,  previous,  up -->
@@ -79,15 +76,14 @@ the +4.567 +/- 0.089 secs indicates the time offset and
 error bound of the system clock relative to the server clock.
 
 <div class="node">
-<a name="ntpdc-Invocation"></a>
 <p><hr>
-
-
+<a name="ntpdc-Invocation"></a>
+<br>
 </div>
 
 <h3 class="section">Invoking ntpdc</h3>
 
-<p><a name="index-ntpdc-1"></a><a name="index-vendor_002dspecific-NTP-query-program-2"></a>This program has no explanation.
+<p><a name="index-ntpdc-1"></a><a name="index-vendor_002dspecific-NTPD-control-program-2"></a>This program has no explanation.
 
   <p>The
 [+: prog-name :+]
@@ -107,7 +103,7 @@ ntpd's configuration file may also be specified at run time using
 [= prog-name =] .
 
   <p>This section was generated by <strong>AutoGen</strong>,
-the aginfo template and the option descriptions for the <samp><span class="command">ntpdc</span></samp> program.  It documents the ntpdc usage text and option meanings.
+the aginfo template and the option descriptions for the <span class="command">ntpdc</span> program.  It documents the ntpdc usage text and option meanings.
 
   <p>This software is released under a specialized copyright license.
 
@@ -126,11 +122,10 @@ the aginfo template and the option descriptions for the <samp><span class="comma
 </ul>
 
 <div class="node">
-<a name="ntpdc-usage"></a>
 <p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-command">ntpdc command</a>,
+<a name="ntpdc-usage"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-command">ntpdc command</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#ntpdc-Invocation">ntpdc Invocation</a>
-
+<br>
 </div>
 
 <h4 class="subsection">ntpdc usage help (-?)</h4>
@@ -138,7 +133,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#ntpdc-Invocation">ntpdc Invocation</a>
 <p><a name="index-ntpdc-usage-3"></a>
 This is the automatically generated usage text for ntpdc:
 
-<pre class="example">ntpdc - vendor-specific NTP query program - Ver. 4.2.7p167
+<pre class="example">ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p174
 USAGE:  ntpdc [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
@@ -149,9 +144,9 @@ USAGE:  ntpdc [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]
                                 ipv4
    -c Str command        run a command and exit
                                 - may appear multiple times
-   -d no  debug-level    Increase output debug message level
+   -d no  debug-level    Increase debug verbosity level
                                 - may appear multiple times
-   -D Str set-debug-level Set the output debug message level
+   -D Str set-debug-level Set the debug verbosity level
                                 - may appear multiple times
    -i no  interactive    Force ntpq to operate in interactive mode
                                 - prohibits these options:
@@ -185,25 +180,24 @@ The following option preset mechanisms are supported:
  - 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 =] .
+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
 </pre>
   <div class="node">
-<a name="ntpdc-command"></a>
 <p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-debug_002dlevel">ntpdc debug-level</a>,
+<a name="ntpdc-command"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-debug_002dlevel">ntpdc debug-level</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntpdc-usage">ntpdc usage</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#ntpdc-Invocation">ntpdc Invocation</a>
-
+<br>
 </div>
 
 <h4 class="subsection">command option (-c)</h4>
@@ -221,34 +215,29 @@ and is added to the list of commands to be executed on the specified
 host(s).
 
 <div class="node">
-<a name="ntpdc-debug-level"></a>
-<a name="ntpdc-debug_002dlevel"></a>
 <p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-interactive">ntpdc interactive</a>,
+<a name="ntpdc-debug_002dlevel"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-interactive">ntpdc interactive</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntpdc-command">ntpdc command</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#ntpdc-Invocation">ntpdc Invocation</a>
-
+<br>
 </div>
 
 <h4 class="subsection">debug-level option (-d)</h4>
 
 <p><a name="index-ntpdc_002ddebug_002dlevel-5"></a>
-This is the &ldquo;increase output debug message level&rdquo; option.
+This is the &ldquo;increase debug verbosity level&rdquo; option.
 
   <p>This option has some usage constraints.  It:
      <ul>
 <li>may appear an unlimited number of times. 
 </ul>
 
-  <p>Increase the debugging message output level.
-
 <div class="node">
-<a name="ntpdc-interactive"></a>
 <p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-ipv4">ntpdc ipv4</a>,
+<a name="ntpdc-interactive"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-ipv4">ntpdc ipv4</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntpdc-debug_002dlevel">ntpdc debug-level</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#ntpdc-Invocation">ntpdc Invocation</a>
-
+<br>
 </div>
 
 <h4 class="subsection">interactive option (-i)</h4>
@@ -266,12 +255,11 @@ command, listpeers, peers, showpeers.
 to the standard output and commands read from the standard input.
 
 <div class="node">
-<a name="ntpdc-ipv4"></a>
 <p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-ipv6">ntpdc ipv6</a>,
+<a name="ntpdc-ipv4"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-ipv6">ntpdc ipv6</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntpdc-interactive">ntpdc interactive</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#ntpdc-Invocation">ntpdc Invocation</a>
-
+<br>
 </div>
 
 <h4 class="subsection">ipv4 option (-4)</h4>
@@ -289,12 +277,11 @@ ipv6.
 to the IPv4 namespace.
 
 <div class="node">
-<a name="ntpdc-ipv6"></a>
 <p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-listpeers">ntpdc listpeers</a>,
+<a name="ntpdc-ipv6"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-listpeers">ntpdc listpeers</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntpdc-ipv4">ntpdc ipv4</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#ntpdc-Invocation">ntpdc Invocation</a>
-
+<br>
 </div>
 
 <h4 class="subsection">ipv6 option (-6)</h4>
@@ -312,12 +299,11 @@ ipv4.
 to the IPv6 namespace.
 
 <div class="node">
-<a name="ntpdc-listpeers"></a>
 <p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-numeric">ntpdc numeric</a>,
+<a name="ntpdc-listpeers"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-numeric">ntpdc numeric</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntpdc-ipv6">ntpdc ipv6</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#ntpdc-Invocation">ntpdc Invocation</a>
-
+<br>
 </div>
 
 <h4 class="subsection">listpeers option (-l)</h4>
@@ -335,12 +321,11 @@ command.
 their state. This is equivalent to the 'listpeers' interactive command.
 
 <div class="node">
-<a name="ntpdc-numeric"></a>
 <p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-peers">ntpdc peers</a>,
+<a name="ntpdc-numeric"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-peers">ntpdc peers</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntpdc-listpeers">ntpdc listpeers</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#ntpdc-Invocation">ntpdc Invocation</a>
-
+<br>
 </div>
 
 <h4 class="subsection">numeric option (-n)</h4>
@@ -351,12 +336,11 @@ Output all host addresses in dotted-quad numeric format rather than
 converting to the canonical host names.
 
 <div class="node">
-<a name="ntpdc-peers"></a>
 <p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-set_002ddebug_002dlevel">ntpdc set-debug-level</a>,
+<a name="ntpdc-peers"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-set_002ddebug_002dlevel">ntpdc set-debug-level</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntpdc-numeric">ntpdc numeric</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#ntpdc-Invocation">ntpdc Invocation</a>
-
+<br>
 </div>
 
 <h4 class="subsection">peers option (-p)</h4>
@@ -374,34 +358,28 @@ command.
 of their state. This is equivalent to the 'peers' interactive command.
 
 <div class="node">
-<a name="ntpdc-set-debug-level"></a>
-<a name="ntpdc-set_002ddebug_002dlevel"></a>
 <p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-showpeers">ntpdc showpeers</a>,
+<a name="ntpdc-set_002ddebug_002dlevel"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-showpeers">ntpdc showpeers</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntpdc-peers">ntpdc peers</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#ntpdc-Invocation">ntpdc Invocation</a>
-
+<br>
 </div>
 
 <h4 class="subsection">set-debug-level option (-D)</h4>
 
 <p><a name="index-ntpdc_002dset_002ddebug_002dlevel-12"></a>
-This is the &ldquo;set the output debug message level&rdquo; option.
+This is the &ldquo;set the debug verbosity level&rdquo; option.
 
   <p>This option has some usage constraints.  It:
      <ul>
 <li>may appear an unlimited number of times. 
 </ul>
 
-  <p>Set the output debugging level.  Can be supplied multiple times,
-but each overrides the previous value(s).
-
 <div class="node">
-<a name="ntpdc-showpeers"></a>
 <p><hr>
-Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntpdc-set_002ddebug_002dlevel">ntpdc set-debug-level</a>,
+<a name="ntpdc-showpeers"></a>Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntpdc-set_002ddebug_002dlevel">ntpdc set-debug-level</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#ntpdc-Invocation">ntpdc Invocation</a>
-
+<br>
 </div>
 
 <h4 class="subsection">showpeers option (-s)</h4>
@@ -419,10 +397,9 @@ command.
 of their state. This is equivalent to the 'dmpeers' interactive command.
 
 <div class="node">
-<a name="Usage"></a>
 <p><hr>
-
-
+<a name="Usage"></a>
+<br>
 </div>
 
 <!-- node-name,  next,  previous,  up -->
diff --git a/ntpq/ntpq-opts.c b/ntpq/ntpq-opts.c
index e412a9bc0c..dbd17c03cf 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  May 25, 2011 at 07:28:35 PM by AutoGen 5.11.9
+ *  It has been AutoGen-ed  May 28, 2011 at 11:00:22 AM by AutoGen 5.11.9
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -17,9 +17,9 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * ntpq copyright (c) 1970-2011 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
+ * See html/copyright.html
  * 
  */
 
@@ -40,10 +40,10 @@ extern FILE * option_usage_fp;
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
 static char const zCopyright[40] =
-"ntpq 4.2.7p173\n\
-see html/copyright.html\n";
+"ntpq 4.2.7p174\n\
+See html/copyright.html\n";
 static char const zLicenseDescrip[25] =
-"see html/copyright.html\n";
+"See html/copyright.html\n";
 
 extern tUsageProc optionUsage;
 
@@ -100,7 +100,7 @@ static char const zCommand_Name[]            = "command";
  *  Debug_Level option description:
  */
 static char const zDebug_LevelText[] =
-        "Increase output debug message level";
+        "Increase debug verbosity level";
 static char const zDebug_Level_NAME[]        = "DEBUG_LEVEL";
 static char const zDebug_Level_Name[]        = "debug-level";
 #define DEBUG_LEVEL_FLAGS       (OPTST_DISABLED)
@@ -109,7 +109,7 @@ static char const zDebug_Level_Name[]        = "debug-level";
  *  Set_Debug_Level option description:
  */
 static char const zSet_Debug_LevelText[] =
-        "Set the output debug message level";
+        "Set the debug verbosity level";
 static char const zSet_Debug_Level_NAME[]    = "SET_DEBUG_LEVEL";
 static char const zSet_Debug_Level_Name[]    = "set-debug-level";
 #define SET_DEBUG_LEVEL_FLAGS       (OPTST_DISABLED \
@@ -424,7 +424,7 @@ static tOptDesc optDesc[OPTION_CT] = {
  */
 static char const zPROGNAME[5] = "NTPQ";
 static char const zUsageTitle[121] =
-"ntpq - standard NTP query program - Ver. 4.2.7p173\n\
+"ntpq - standard NTP query program - Ver. 4.2.7p174\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n";
 static char const zRcName[7] = ".ntprc";
 static char const * const apzHomeList[3] = {
@@ -527,7 +527,7 @@ doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc)
 static void
 doOptSet_Debug_Level(tOptions* pOptions, tOptDesc* pOptDesc)
 {
-    /* extracted from debug-opt.def, line 27 */
+    /* extracted from debug-opt.def, line 26 */
 DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg );
 }
 #endif /* defined(TEST_NTPQ_OPTS) */
diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h
index 94b4625d4b..6763a00060 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  May 25, 2011 at 07:28:35 PM by AutoGen 5.11.9
+ *  It has been AutoGen-ed  May 28, 2011 at 11:00:22 AM by AutoGen 5.11.9
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -17,9 +17,9 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * ntpq copyright (c) 1970-2011 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
+ * See html/copyright.html
  * 
  */
 /*
@@ -68,8 +68,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    14
-#define NTPQ_VERSION       "4.2.7p173"
-#define NTPQ_FULL_VERSION  "ntpq 4.2.7p173"
+#define NTPQ_VERSION       "4.2.7p174"
+#define NTPQ_FULL_VERSION  "ntpq 4.2.7p174"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi
index 7d3ac0ffac..a905c9342c 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  May 25, 2011 at 07:28:45 PM by AutoGen 5.11.9
+# It has been AutoGen-ed  May 28, 2011 at 11:00:52 AM by AutoGen 5.11.9
 # From the definitions    ntpq-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -47,7 +47,7 @@ This is the automatically generated usage text for ntpq:
 
 @exampleindent 0
 @example
-ntpq - standard NTP query program - Ver. 4.2.7p173
+ntpq - standard NTP query program - Ver. 4.2.7p174
 USAGE:  ntpq [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
@@ -58,9 +58,9 @@ USAGE:  ntpq [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [ host ...]
                                 ipv4
    -c Str command        run a command and exit
                                 - may appear multiple times
-   -d no  debug-level    Increase output debug message level
+   -d no  debug-level    Increase debug verbosity level
                                 - may appear multiple times
-   -D Str set-debug-level Set the output debug message level
+   -D Str set-debug-level Set the debug verbosity level
                                 - may appear multiple times
    -p no  peers          Print a list of the peers
                                 - prohibits these options:
@@ -118,7 +118,7 @@ host(s).
 @subsection debug-level option (-d)
 @cindex ntpq-debug-level
 
-This is the ``increase output debug message level'' option.
+This is the ``increase debug verbosity level'' option.
 
 This option has some usage constraints.  It:
 @itemize @bullet
@@ -126,7 +126,7 @@ This option has some usage constraints.  It:
 may appear an unlimited number of times.
 @end itemize
 
-Increase the debugging message output level.
+
 
 @node ntpq interactive
 @subsection interactive option (-i)
@@ -217,13 +217,10 @@ of their state. This is equivalent to the 'peers' interactive command.
 @subsection set-debug-level option (-D)
 @cindex ntpq-set-debug-level
 
-This is the ``set the output debug message level'' option.
+This is the ``set the debug verbosity level'' option.
 
 This option has some usage constraints.  It:
 @itemize @bullet
 @item
 may appear an unlimited number of times.
 @end itemize
-
-Set the output debugging level.  Can be supplied multiple times,
-but each overrides the previous value(s).
diff --git a/ntpq/ntpq.1 b/ntpq/ntpq.1
index afc613ba80..647384f356 100644
--- a/ntpq/ntpq.1
+++ b/ntpq/ntpq.1
@@ -1,7 +1,7 @@
-.TH NTPQ 1 2011-05-25 "( 4.2.7p173)" "Programmer's Manual"
+.TH NTPQ 1 2011-05-28 "( 4.2.7p174)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq.1)
 .\"  
-.\"  It has been AutoGen-ed  May 25, 2011 at 07:28:45 PM by AutoGen 5.11.9
+.\"  It has been AutoGen-ed  May 28, 2011 at 11:00:52 AM by AutoGen 5.11.9
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agman1.tpl
 .\"
@@ -304,17 +304,16 @@ and is added to the list of commands to be executed on the specified
 host(s).
 .TP
 .BR \-d ", " \--debug-level
-Increase output debug message level.
+Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
-Increase the debugging message output level.
+
 .TP
 .BR \-D " \fIstring\fP, " \--set-debug-level "=" \fIstring\fP
-Set the output debug message level.
+Set the debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
-Set the output debugging level.  Can be supplied multiple times,
-but each overrides the previous value(s).
+
 .TP
 .BR \-p ", " \--peers
 Print a list of the peers.
@@ -383,14 +382,14 @@ The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
 If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
 .SH AUTHOR
-David L. Mills and/or others
+David L. Mills and/or others.
 .br
 Please send bug reports to:  http://bugs.ntp.org, bugs@ntp.org
 
 .PP
 .nf
 .na
-see html/copyright.html
+See html/copyright.html
 
 .fi
 .ad
diff --git a/ntpsnmpd/ntpsnmpd-opts.c b/ntpsnmpd/ntpsnmpd-opts.c
index f80d2c9ede..6aa26b88f7 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  May 25, 2011 at 07:28:46 PM by AutoGen 5.11.9
+ *  It has been AutoGen-ed  May 28, 2011 at 11:00:55 AM by AutoGen 5.11.9
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -17,9 +17,9 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * ntpsnmpd copyright (c) 1970-2011 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
+ * See html/copyright.html
  * 
  */
 
@@ -40,10 +40,10 @@ extern FILE * option_usage_fp;
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
 static char const zCopyright[44] =
-"ntpsnmpd 4.2.7p173\n\
-see html/copyright.html\n";
+"ntpsnmpd 4.2.7p174\n\
+See html/copyright.html\n";
 static char const zLicenseDescrip[25] =
-"see html/copyright.html\n";
+"See html/copyright.html\n";
 
 extern tUsageProc optionUsage;
 
@@ -251,7 +251,7 @@ static tOptDesc optDesc[OPTION_CT] = {
  */
 static char const zPROGNAME[9] = "NTPSNMPD";
 static char const zUsageTitle[105] =
-"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p173\n\
+"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p174\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 3b77bd6883..5876d39795 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  May 25, 2011 at 07:28:46 PM by AutoGen 5.11.9
+ *  It has been AutoGen-ed  May 28, 2011 at 11:00:54 AM by AutoGen 5.11.9
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -17,9 +17,9 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * ntpsnmpd copyright (c) 1970-2011 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
+ * See html/copyright.html
  * 
  */
 /*
@@ -62,8 +62,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    8
-#define NTPSNMPD_VERSION       "4.2.7p173"
-#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.7p173"
+#define NTPSNMPD_VERSION       "4.2.7p174"
+#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.7p174"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpsnmpd/ntpsnmpd-opts.texi b/ntpsnmpd/ntpsnmpd-opts.texi
index 3c27557abf..452f7922cf 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  May 25, 2011 at 07:28:49 PM by AutoGen 5.11.9
+# It has been AutoGen-ed  May 28, 2011 at 11:01:13 AM by AutoGen 5.11.9
 # From the definitions    ntpsnmpd-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -34,7 +34,7 @@ This is the automatically generated usage text for ntpsnmpd:
 
 @exampleindent 0
 @example
-ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p173
+ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p174
 USAGE:  ntpsnmpd [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
   Flg Arg Option-Name    Description
    -n no  nofork         Do not fork
diff --git a/ntpsnmpd/ntpsnmpd.1 b/ntpsnmpd/ntpsnmpd.1
index 3b2732f90f..d1813653ac 100644
--- a/ntpsnmpd/ntpsnmpd.1
+++ b/ntpsnmpd/ntpsnmpd.1
@@ -1,7 +1,7 @@
-.TH NTPSNMPD 1 2011-05-25 "( 4.2.7p173)" "Programmer's Manual"
+.TH NTPSNMPD 1 2011-05-28 "( 4.2.7p174)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd.1)
 .\"  
-.\"  It has been AutoGen-ed  May 25, 2011 at 07:28:49 PM by AutoGen 5.11.9
+.\"  It has been AutoGen-ed  May 28, 2011 at 11:01:13 AM by AutoGen 5.11.9
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agman1.tpl
 .\"
@@ -71,14 +71,14 @@ The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
 If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
 .SH AUTHOR
-David L. Mills and/or others
+David L. Mills and/or others.
 .br
 Please send bug reports to:  http://bugs.ntp.org, bugs@ntp.org
 
 .PP
 .nf
 .na
-see html/copyright.html
+See html/copyright.html
 
 .fi
 .ad
diff --git a/packageinfo.sh b/packageinfo.sh
index beb8902a06..ceff1c7fc3 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=173
+point=174
 
 ### betapoint is normally modified by script.
 # ntp-stable Beta number (betapoint)
diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c
index 456032d508..01f6f52854 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  May 25, 2011 at 07:25:29 PM by AutoGen 5.11.9
+ *  It has been AutoGen-ed  May 28, 2011 at 10:47:25 AM by AutoGen 5.11.9
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -17,9 +17,9 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * sntp copyright (c) 1970-2011 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
+ * See html/copyright.html
  * 
  */
 
@@ -40,10 +40,10 @@ extern FILE * option_usage_fp;
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
 static char const zCopyright[40] =
-"sntp 4.2.7p173\n\
-see html/copyright.html\n";
+"sntp 4.2.7p174\n\
+See html/copyright.html\n";
 static char const zLicenseDescrip[25] =
-"see html/copyright.html\n";
+"See html/copyright.html\n";
 
 extern tUsageProc optionUsage;
 
@@ -121,7 +121,7 @@ static char const zBroadcast_Name[]          = "broadcast";
  *  Concurrent option description:
  */
 static char const zConcurrentText[] =
-        "Concurrent query all IPs returned for host-name";
+        "Concurrently query all IPs returned for host-name";
 static char const zConcurrent_NAME[]         = "CONCURRENT";
 static char const zConcurrent_Name[]         = "concurrent";
 #define CONCURRENT_FLAGS       (OPTST_DISABLED | OPTST_STACKED \
@@ -131,7 +131,7 @@ static char const zConcurrent_Name[]         = "concurrent";
  *  Debug_Level option description:
  */
 static char const zDebug_LevelText[] =
-        "Increase output debug message level";
+        "Increase debug verbosity level";
 static char const zDebug_Level_NAME[]        = "DEBUG_LEVEL";
 static char const zDebug_Level_Name[]        = "debug-level";
 #define DEBUG_LEVEL_FLAGS       (OPTST_DISABLED)
@@ -140,7 +140,7 @@ static char const zDebug_Level_Name[]        = "debug-level";
  *  Set_Debug_Level option description:
  */
 static char const zSet_Debug_LevelText[] =
-        "Set the output debug message level";
+        "Set the debug verbosity level";
 static char const zSet_Debug_Level_NAME[]    = "SET_DEBUG_LEVEL";
 static char const zSet_Debug_Level_Name[]    = "set-debug-level";
 #define SET_DEBUG_LEVEL_FLAGS       (OPTST_DISABLED \
@@ -192,7 +192,7 @@ static char const zFilelog_Name[]            = "filelog";
  *  Steplimit option description:
  */
 static char const zSteplimitText[] =
-        "Adjustments less than steplimit msec will be slewed.";
+        "Adjustments less than steplimit msec will be slewed";
 static char const zSteplimit_NAME[]          = "STEPLIMIT";
 static char const zSteplimit_Name[]          = "steplimit";
 #define STEPLIMIT_FLAGS       (OPTST_DISABLED \
@@ -637,11 +637,13 @@ static tOptDesc optDesc[OPTION_CT] = {
  */
 static char const zPROGNAME[5] = "SNTP";
 static char const zUsageTitle[154] =
-"sntp - standard Simple Network Time Protocol program - Ver. 4.2.7p173\n\
+"sntp - standard Simple Network Time Protocol program - Ver. 4.2.7p174\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n\
 \t\t[ hostname-or-IP ...]\n";
 static char const zRcName[7] = ".ntprc";
-static char const * const apzHomeList[3] = {
+static char const * const apzHomeList[5] = {
+    "$HOME",
+    ".",
     "$HOME",
     ".",
     NULL };
@@ -742,7 +744,7 @@ doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc)
 static void
 doOptSet_Debug_Level(tOptions* pOptions, tOptDesc* pOptDesc)
 {
-    /* extracted from debug-opt.def, line 27 */
+    /* extracted from debug-opt.def, line 26 */
 DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg );
 }
 #endif /* defined(TEST_SNTP_OPTS) */
diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h
index 681ec29c9c..9f03390aa0 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  May 25, 2011 at 07:25:29 PM by AutoGen 5.11.9
+ *  It has been AutoGen-ed  May 28, 2011 at 10:47:24 AM by AutoGen 5.11.9
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -17,9 +17,9 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * sntp copyright (c) 1970-2011 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
+ * See html/copyright.html
  * 
  */
 /*
@@ -78,8 +78,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    24
-#define SNTP_VERSION       "4.2.7p173"
-#define SNTP_FULL_VERSION  "sntp 4.2.7p173"
+#define SNTP_VERSION       "4.2.7p174"
+#define SNTP_FULL_VERSION  "sntp 4.2.7p174"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi
index da5f6bf35c..0520ca7994 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  May 25, 2011 at 07:29:11 PM by AutoGen 5.11.9
+# It has been AutoGen-ed  May 28, 2011 at 11:01:55 AM by AutoGen 5.11.9
 # From the definitions    sntp-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -76,7 +76,7 @@ This is the automatically generated usage text for sntp:
 
 @exampleindent 0
 @example
-sntp - standard Simple Network Time Protocol program - Ver. 4.2.7p173
+sntp - standard Simple Network Time Protocol program - Ver. 4.2.7p174
 USAGE:  sntp [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description
@@ -90,17 +90,17 @@ USAGE:  sntp [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... \
    -B Num bctimeout      The number of seconds to wait for broadcasts
    -b Str broadcast      Listen to the address specified for broadcast time sync
                                 - may appear multiple times
-   -c Str concurrent     Concurrent query all IPs returned for host-name
+   -c Str concurrent     Concurrently query all IPs returned for host-name
                                 - may appear multiple times
-   -d no  debug-level    Increase output debug message level
+   -d no  debug-level    Increase debug verbosity level
                                 - may appear multiple times
-   -D Str set-debug-level Set the output debug message level
+   -D Str set-debug-level Set the debug verbosity level
                                 - may appear multiple times
    -h Num headspace      The gap (in milliseconds) between time requests
    -K Fil kod            KoD history filename
    -k Fil keyfile        Look in this file for the key specified with -a
    -l Fil filelog        Log to specified logfile
-   -M Num steplimit      Adjustments less than steplimit msec will be slewed.
+   -M Num steplimit      Adjustments less than steplimit msec will be slewed
                                 - It must be in the range:
                                   greater than or equal to 0
    -o Num ntpversion     Send <int> as our NTP version
@@ -127,6 +127,8 @@ hyphen and the flag character.
 
 
 The following option preset mechanisms are supported:
+ - reading file $HOME/.ntprc
+ - reading file ./.ntprc
  - reading file $HOME/.ntprc
  - reading file ./.ntprc
  - examining environment variables named SNTP_*
@@ -182,7 +184,7 @@ for NTP broadcasts.  The default maximum wait time,
 @subsection concurrent option (-c)
 @cindex sntp-concurrent
 
-This is the ``concurrent query all ips returned for host-name'' option.
+This is the ``concurrently query all ips returned for host-name'' option.
 
 This option has some usage constraints.  It:
 @itemize @bullet
@@ -204,7 +206,7 @@ can send concurrent queries.
 @subsection debug-level option (-d)
 @cindex sntp-debug-level
 
-This is the ``increase output debug message level'' option.
+This is the ``increase debug verbosity level'' option.
 
 This option has some usage constraints.  It:
 @itemize @bullet
@@ -212,7 +214,7 @@ This option has some usage constraints.  It:
 may appear an unlimited number of times.
 @end itemize
 
-Increase the debugging message output level.
+
 
 @node sntp filelog
 @subsection filelog option (-l)
@@ -246,7 +248,7 @@ must not appear in combination with any of the following options:
 ipv6.
 @end itemize
 
-Force DNS resolution of following host names on the command line
+Force DNS resolution of the following host names on the command line
 to the IPv4 namespace.
 
 @node sntp ipv6
@@ -262,7 +264,7 @@ must not appear in combination with any of the following options:
 ipv4.
 @end itemize
 
-Force DNS resolution of following host names on the command line
+Force DNS resolution of the following host names on the command line
 to the IPv6 namespace.
 
 @node sntp keyfile
@@ -277,11 +279,11 @@ file. Key files follow the following format:
 keyid keytype key
 
 Where	keyid is a number identifying this key
-keytype is one of the follow:
-S  Key in 64 Bit hexadecimal number as specified in in the DES specification.
-N  Key in 64 Bit hexadecimal number as specified in the NTP standard.
-A  Key in a 1-to-8 character ASCII string.
-M  Key in a 1-to-8 character ASCII string using the MD5 authentication scheme.
+keytype is one of the following:
+S  Key is a 64 Bit hexadecimal number as specified in in the DES specification.
+N  Key ina  64 Bit hexadecimal number as specified in the NTP standard.
+A  Key is a 1-to-8 character ASCII string.
+M  Key is a 1-to-8 character ASCII string using the MD5 authentication scheme.
 
 For more information see ntp.keys(5).
 
@@ -306,7 +308,7 @@ NTP protocol version <ntpversion> .
 @subsection set-debug-level option (-D)
 @cindex sntp-set-debug-level
 
-This is the ``set the output debug message level'' option.
+This is the ``set the debug verbosity level'' option.
 
 This option has some usage constraints.  It:
 @itemize @bullet
@@ -314,8 +316,7 @@ This option has some usage constraints.  It:
 may appear an unlimited number of times.
 @end itemize
 
-Set the output debugging level.  Can be supplied multiple times,
-but each overrides the previous value(s).
+
 
 @node sntp slew
 @subsection slew option (-s)
@@ -335,7 +336,7 @@ This is the ``ok to 'step' the time with settimeofday()'' option.
 @subsection steplimit option (-M)
 @cindex sntp-steplimit
 
-This is the ``adjustments less than steplimit msec will be slewed.'' option.
+This is the ``adjustments less than steplimit msec will be slewed'' option.
 If the time adjustment is less than steplimit milliseconds, slew the
 amount using adjtime().  Otherwise, step the correction using
 settimeofday(). 
diff --git a/sntp/sntp.1 b/sntp/sntp.1
index 4ba50cbd1a..2b0a83ae86 100644
--- a/sntp/sntp.1
+++ b/sntp/sntp.1
@@ -1,9 +1,9 @@
-.Dd May 25 2011
+.Dd May 28 2011
 .Dt SNTP 1 User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  May 25, 2011 at 07:29:10 PM by AutoGen 5.11.9
+.\"  It has been AutoGen-ed  May 28, 2011 at 11:01:54 AM by AutoGen 5.11.9
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -49,14 +49,14 @@ Force IPv4 DNS name resolution.
 This option must not appear in combination with any of the following options:
 ipv6.
 .sp
-Force DNS resolution of following host names on the command line
+Force DNS resolution of the following host names on the command line
 to the IPv4 namespace.
 .It  \-6 ", " -\-ipv6
 Force IPv6 DNS name resolution.
 This option must not appear in combination with any of the following options:
 ipv4.
 .sp
-Force DNS resolution of following host names on the command line
+Force DNS resolution of the following host names on the command line
 to the IPv6 namespace.
 .It  \-a " \fIauth\-keynumber\fP, " \-\-authentication "=" \fIauth\-keynumber\fP
 Enable authentication with the key auth-keynumber.
@@ -83,7 +83,7 @@ If specified SNTP will listen to the specified address
 for NTP broadcasts.  The default maximum wait time,
 68 seconds, can be modified with -B.
 .It  \-c " \fIhost\-name\fP, " \-\-concurrent "=" \fIhost\-name\fP
-Concurrent query all IPs returned for host-name.
+Concurrently query all IPs returned for host-name.
 This option may appear an unlimited number of times.
 .sp
 Requests from an NTP "client" to a "server" should never be sent
@@ -95,16 +95,13 @@ The -c or --concurrent flag says that any IPs returned for the DNS
 lookup of the supplied host-name are on different machines, so we
 can send concurrent queries.
 .It  \-d ", " -\-debug\-level
-Increase output debug message level.
+Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
-Increase the debugging message output level.
 .It  \-D " \fIstring\fP, " \-\-set\-debug\-level "=" \fIstring\fP
-Set the output debug message level.
+Set the debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
-Set the output debugging level.  Can be supplied multiple times,
-but each overrides the previous value(s).
 .It  \-h " \fImilliseconds\fP, " \-\-headspace "=" \fImilliseconds\fP
 The gap (in milliseconds) between time requests.
 This option takes an integer number as its argument.
@@ -134,11 +131,11 @@ SNTP will search for the key specified with -a keyno in this
 file. Key files follow the following format:
 keyid keytype key
 Where	keyid is a number identifying this key
-keytype is one of the follow:
-S  Key in 64 Bit hexadecimal number as specified in in the DES specification.
-N  Key in 64 Bit hexadecimal number as specified in the NTP standard.
-A  Key in a 1-to-8 character ASCII string.
-M  Key in a 1-to-8 character ASCII string using the MD5 authentication scheme.
+keytype is one of the following:
+S  Key is a 64 Bit hexadecimal number as specified in in the DES specification.
+N  Key ina  64 Bit hexadecimal number as specified in the NTP standard.
+A  Key is a 1-to-8 character ASCII string.
+M  Key is a 1-to-8 character ASCII string using the MD5 authentication scheme.
 For more information see ntp.keys(5).
 .It  \-l " \fIfile\-name\fP, " \-\-filelog "=" \fIfile\-name\fP
 Log to specified logfile.
@@ -146,7 +143,7 @@ Log to specified logfile.
 This option causes the client to write log messages to the specified
 logfile.
 .It  \-M " \fInumber\fP, " \-\-steplimit "=" \fInumber\fP
-Adjustments less than steplimit msec will be slewed..
+Adjustments less than steplimit msec will be slewed.
 This option takes an integer number as its argument.
 The value of \fInumber\fP is constrained to being:
 .in +4
@@ -228,17 +225,9 @@ environment variables named:
 .ad
 The environmental presets take precedence (are processed later than)
 the configuration files.
-The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
+The \fIhomerc\fP files are "\fI$HOME\fP", "\fI.\fP", "\fI$HOME\fP", and "\fI.\fP".
 If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
-.Sh "EXIT STATUS"
-One of the following exit values will be returned:
-.Bl -tag
-.It 0
-Successful program execution.
-.It 1
-The operation failed or the command syntax was not valid.
-.El
 .Sh USAGE
 .Bl -tag -width indent
 .It Li "sntp ntpserver.somewhere"
@@ -259,25 +248,27 @@ or
 .Xr rdate 8
 commands.
 .El
-.Sh RETURN VALUE
-The program returns a zero exit
-status for success, and a non-zero one otherwise.
-.Sh BUGS
-Please report bugs to http://bugs.ntp.org .
 .Sh ENVIRONMENT
 See \fBOPTION PRESETS\fP for configuration environment variables.
 .Sh FILES
 See \fBOPTION PRESETS\fP for configuration files.
-.Sh AUTHOR
-David L. Mills and/or others
-.br
-Please send bug reports to:  http://bugs.ntp.org, bugs@ntp.org
+.Sh "EXIT STATUS"
+One of the following exit values will be returned:
+.Bl -tag
+.It 0
+Successful program execution.
+.It 1
+The operation failed or the command syntax was not valid.
+.El
 .Pp
 .nf
 .na
-see html/copyright.html
+See html/copyright.html
 .fi
 .ad
 .Pp
-This manual page was \fIAutoGen\fP-erated from the \fBsntp\fP
+This manual page was \fIAutoGen\fP-erated from the
+.Nm
 option definitions.
+.Sh BUGS
+Please report bugs to http://bugs.ntp.org .
diff --git a/sntp/sntp.html b/sntp/sntp.html
index d7886c6402..2074163388 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.7p173 of <code>sntp</code>.
+  <p>This document applies to version 4.2.7p174 of <code>sntp</code>.
 
   <p>The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
@@ -150,7 +150,7 @@ 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 - standard Simple Network Time Protocol program - Ver. 4.2.7p173
+<pre class="example">sntp - standard Simple Network Time Protocol program - Ver. 4.2.7p174
 USAGE:  sntp [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description
@@ -164,17 +164,17 @@ USAGE:  sntp [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ].
    -B Num bctimeout      The number of seconds to wait for broadcasts
    -b Str broadcast      Listen to the address specified for broadcast time sync
                                 - may appear multiple times
-   -c Str concurrent     Concurrent query all IPs returned for host-name
+   -c Str concurrent     Concurrently query all IPs returned for host-name
                                 - may appear multiple times
-   -d no  debug-level    Increase output debug message level
+   -d no  debug-level    Increase debug verbosity level
                                 - may appear multiple times
-   -D Str set-debug-level Set the output debug message level
+   -D Str set-debug-level Set the debug verbosity level
                                 - may appear multiple times
    -h Num headspace      The gap (in milliseconds) between time requests
    -K Fil kod            KoD history filename
    -k Fil keyfile        Look in this file for the key specified with -a
    -l Fil filelog        Log to specified logfile
-   -M Num steplimit      Adjustments less than steplimit msec will be slewed.
+   -M Num steplimit      Adjustments less than steplimit msec will be slewed
                                 - It must be in the range:
                                   greater than or equal to 0
    -o Num ntpversion     Send &lt;int&gt; as our NTP version
@@ -201,6 +201,8 @@ hyphen and the flag character.
 
 
 The following option preset mechanisms are supported:
+ - reading file $HOME/.ntprc
+ - reading file ./.ntprc
  - reading file $HOME/.ntprc
  - reading file ./.ntprc
  - examining environment variables named SNTP_*
@@ -281,7 +283,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
 <h4 class="subsection">concurrent option (-c)</h4>
 
 <p><a name="index-sntp_002dconcurrent-7"></a>
-This is the &ldquo;concurrent query all ips returned for host-name&rdquo; option.
+This is the &ldquo;concurrently query all ips returned for host-name&rdquo; option.
 
   <p>This option has some usage constraints.  It:
      <ul>
@@ -309,15 +311,13 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
 <h4 class="subsection">debug-level option (-d)</h4>
 
 <p><a name="index-sntp_002ddebug_002dlevel-8"></a>
-This is the &ldquo;increase output debug message level&rdquo; option.
+This is the &ldquo;increase debug verbosity level&rdquo; option.
 
   <p>This option has some usage constraints.  It:
      <ul>
 <li>may appear an unlimited number of times. 
 </ul>
 
-  <p>Increase the debugging message output level.
-
 <div class="node">
 <p><hr>
 <a name="sntp-filelog"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-headspace">sntp headspace</a>,
@@ -370,7 +370,7 @@ This is the &ldquo;force ipv4 dns name resolution&rdquo; option.
 ipv6. 
 </ul>
 
-  <p>Force DNS resolution of following host names on the command line
+  <p>Force DNS resolution of the following host names on the command line
 to the IPv4 namespace.
 
 <div class="node">
@@ -392,7 +392,7 @@ This is the &ldquo;force ipv6 dns name resolution&rdquo; option.
 ipv4. 
 </ul>
 
-  <p>Force DNS resolution of following host names on the command line
+  <p>Force DNS resolution of the following host names on the command line
 to the IPv6 namespace.
 
 <div class="node">
@@ -414,11 +414,11 @@ file. Key files follow the following format:
   <p>keyid keytype key
 
   <p>Where	keyid is a number identifying this key
-keytype is one of the follow:
-S  Key in 64 Bit hexadecimal number as specified in in the DES specification. 
-N  Key in 64 Bit hexadecimal number as specified in the NTP standard. 
-A  Key in a 1-to-8 character ASCII string. 
-M  Key in a 1-to-8 character ASCII string using the MD5 authentication scheme.
+keytype is one of the following:
+S  Key is a 64 Bit hexadecimal number as specified in in the DES specification. 
+N  Key ina  64 Bit hexadecimal number as specified in the NTP standard. 
+A  Key is a 1-to-8 character ASCII string. 
+M  Key is a 1-to-8 character ASCII string using the MD5 authentication scheme.
 
   <p>For more information see ntp.keys(5).
 
@@ -464,16 +464,13 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
 <h4 class="subsection">set-debug-level option (-D)</h4>
 
 <p><a name="index-sntp_002dset_002ddebug_002dlevel-16"></a>
-This is the &ldquo;set the output debug message level&rdquo; option.
+This is the &ldquo;set the debug verbosity level&rdquo; option.
 
   <p>This option has some usage constraints.  It:
      <ul>
 <li>may appear an unlimited number of times. 
 </ul>
 
-  <p>Set the output debugging level.  Can be supplied multiple times,
-but each overrides the previous value(s).
-
 <div class="node">
 <p><hr>
 <a name="sntp-slew"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-step">sntp step</a>,
@@ -511,7 +508,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
 <h4 class="subsection">steplimit option (-M)</h4>
 
 <p><a name="index-sntp_002dsteplimit-19"></a>
-This is the &ldquo;adjustments less than steplimit msec will be slewed.&rdquo; option. 
+This is the &ldquo;adjustments less than steplimit msec will be slewed&rdquo; option. 
 If the time adjustment is less than steplimit milliseconds, slew the
 amount using adjtime().  Otherwise, step the correction using
 settimeofday().
diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c
index db1c29cc5c..0d6f05b69d 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  May 25, 2011 at 07:28:52 PM by AutoGen 5.11.9
+ *  It has been AutoGen-ed  May 28, 2011 at 11:01:18 AM by AutoGen 5.11.9
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -17,9 +17,9 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * ntp-keygen copyright (c) 1970-2011 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
+ * See html/copyright.html
  * 
  */
 
@@ -40,10 +40,10 @@ extern FILE * option_usage_fp;
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
 static char const zCopyright[52] =
-"ntp-keygen (ntp) 4.2.7p173\n\
-see html/copyright.html\n";
+"ntp-keygen (ntp) 4.2.7p174\n\
+See html/copyright.html\n";
 static char const zLicenseDescrip[25] =
-"see html/copyright.html\n";
+"See html/copyright.html\n";
 
 extern tUsageProc optionUsage;
 
@@ -83,7 +83,7 @@ static char const zCertificate_Name[]        = "certificate";
  *  Debug_Level option description:
  */
 static char const zDebug_LevelText[] =
-        "Increase output debug message level";
+        "Increase debug verbosity level";
 static char const zDebug_Level_NAME[]        = "DEBUG_LEVEL";
 static char const zDebug_Level_Name[]        = "debug-level";
 #define DEBUG_LEVEL_FLAGS       (OPTST_DISABLED)
@@ -92,7 +92,7 @@ static char const zDebug_Level_Name[]        = "debug-level";
  *  Set_Debug_Level option description:
  */
 static char const zSet_Debug_LevelText[] =
-        "Set the output debug message level";
+        "Set the debug verbosity level";
 static char const zSet_Debug_Level_NAME[]    = "SET_DEBUG_LEVEL";
 static char const zSet_Debug_Level_Name[]    = "set-debug-level";
 #define SET_DEBUG_LEVEL_FLAGS       (OPTST_DISABLED \
@@ -752,7 +752,7 @@ static tOptDesc optDesc[OPTION_CT] = {
  */
 static char const zPROGNAME[11] = "NTP_KEYGEN";
 static char const zUsageTitle[116] =
-"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p173\n\
+"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p174\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
 static char const zRcName[7] = ".ntprc";
 static char const * const apzHomeList[3] = {
@@ -852,7 +852,7 @@ doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc)
 static void
 doOptSet_Debug_Level(tOptions* pOptions, tOptDesc* pOptDesc)
 {
-    /* extracted from debug-opt.def, line 27 */
+    /* extracted from debug-opt.def, line 26 */
 DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg );
 }
 #endif /* defined(TEST_NTP_KEYGEN_OPTS) */
diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h
index 48012c5075..531c1837cd 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  May 25, 2011 at 07:28:52 PM by AutoGen 5.11.9
+ *  It has been AutoGen-ed  May 28, 2011 at 11:01:17 AM by AutoGen 5.11.9
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -17,9 +17,9 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * ntp-keygen copyright (c) 1970-2011 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
+ * See html/copyright.html
  * 
  */
 /*
@@ -78,8 +78,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    24
-#define NTP_KEYGEN_VERSION       "4.2.7p173"
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.7p173"
+#define NTP_KEYGEN_VERSION       "4.2.7p174"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.7p174"
 
 /*
  *  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 ecaf511ab1..c8986bf086 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  May 25, 2011 at 07:29:03 PM by AutoGen 5.11.9
+# It has been AutoGen-ed  May 28, 2011 at 11:01:34 AM by AutoGen 5.11.9
 # From the definitions    ntp-keygen-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -51,13 +51,13 @@ This is the automatically generated usage text for ntp-keygen:
 
 @exampleindent 0
 @example
-ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p173
+ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p174
 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
+   -d no  debug-level    Increase debug verbosity level
                                 - may appear multiple times
-   -D Str set-debug-level Set the output debug message level
+   -D Str set-debug-level Set the debug verbosity level
                                 - may appear multiple times
    -e no  id-key         Write IFF or GQ identity keys
    -G no  gq-params      Generate GQ parameters and keys
@@ -125,7 +125,7 @@ this option is RSA-MD5.
 @subsection debug-level option (-d)
 @cindex ntp-keygen-debug-level
 
-This is the ``increase output debug message level'' option.
+This is the ``increase debug verbosity level'' option.
 
 This option has some usage constraints.  It:
 @itemize @bullet
@@ -133,7 +133,7 @@ This option has some usage constraints.  It:
 may appear an unlimited number of times.
 @end itemize
 
-Increase the debugging message output level.
+
 
 @node ntp-keygen get-pvt-passwd
 @subsection get-pvt-passwd option (-q)
@@ -321,7 +321,7 @@ password and the DES-CBC algorithm.
 @subsection set-debug-level option (-D)
 @cindex ntp-keygen-set-debug-level
 
-This is the ``set the output debug message level'' option.
+This is the ``set the debug verbosity level'' option.
 
 This option has some usage constraints.  It:
 @itemize @bullet
@@ -329,8 +329,7 @@ This option has some usage constraints.  It:
 may appear an unlimited number of times.
 @end itemize
 
-Set the output debugging level.  Can be supplied multiple times,
-but each overrides the previous value(s).
+
 
 @node ntp-keygen sign-key
 @subsection sign-key option (-S)
diff --git a/util/ntp-keygen.1 b/util/ntp-keygen.1
index cf450b05b9..f23dc31dd3 100644
--- a/util/ntp-keygen.1
+++ b/util/ntp-keygen.1
@@ -1,7 +1,7 @@
-.TH NTP-KEYGEN 1 2011-05-25 "(ntp 4.2.7p173)" "Programmer's Manual"
+.TH NTP-KEYGEN 1 2011-05-28 "(ntp 4.2.7p174)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen.1)
 .\"  
-.\"  It has been AutoGen-ed  May 25, 2011 at 07:29:02 PM by AutoGen 5.11.9
+.\"  It has been AutoGen-ed  May 28, 2011 at 11:01:33 AM by AutoGen 5.11.9
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman1.tpl
 .\"
@@ -32,17 +32,16 @@ schemes must be used with a DSA sign key.  The default without
 this option is RSA-MD5.
 .TP
 .BR \-d ", " \--debug-level
-Increase output debug message level.
+Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
-Increase the debugging message output level.
+
 .TP
 .BR \-D " \fIstring\fP, " \--set-debug-level "=" \fIstring\fP
-Set the output debug message level.
+Set the debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
-Set the output debugging level.  Can be supplied multiple times,
-but each overrides the previous value(s).
+
 .TP
 .BR \-e ", " \--id-key
 Write IFF or GQ identity keys.
@@ -180,14 +179,14 @@ The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
 If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
 .SH AUTHOR
-David L. Mills and/or others
+David L. Mills and/or others.
 .br
 Please send bug reports to:  http://bugs.ntp.org, bugs@ntp.org
 
 .PP
 .nf
 .na
-see html/copyright.html
+See html/copyright.html
 
 .fi
 .ad