calc_tickadj User's Manual

This document describes the configuration file for the NTP Project's ntpd program. -
Short Contents

diff --git a/ntpd/ntp.conf.man.in b/ntpd/ntp.conf.man.in index cd6faaab7..d873f1a32 100644 --- a/ntpd/ntp.conf.man.in +++ b/ntpd/ntp.conf.man.in @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntp.conf 5 "21 Mar 2017" "4.2.8p10-beta" "File Formats" +.TH ntp.conf 5 "19 May 2017" "4.2.8p10" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-UAaqtC/ag-6AaisC) +.\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed March 21, 2017 at 10:30:48 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed May 19, 2017 at 12:33:01 PM by AutoGen 5.18.5 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/ntpd/ntp.conf.mdoc.in b/ntpd/ntp.conf.mdoc.in index 1d5d3b622..9da9142d1 100644 --- a/ntpd/ntp.conf.mdoc.in +++ b/ntpd/ntp.conf.mdoc.in @@ -1,9 +1,9 @@ -.Dd March 21 2017 +.Dd May 19 2017 .Dt NTP_CONF 5 File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed March 21, 2017 at 10:31:09 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed May 19, 2017 at 12:32:52 PM by AutoGen 5.18.5 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/ntpd/ntp.keys.5man b/ntpd/ntp.keys.5man index 9daf75f03..61b64b654 100644 --- a/ntpd/ntp.keys.5man +++ b/ntpd/ntp.keys.5man @@ -1,8 +1,8 @@ -.TH ntp.keys 5man "21 Mar 2017" "4.2.8p10" "File Formats" +.TH ntp.keys 5man "19 May 2017" "4.2.8p10" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed March 21, 2017 at 10:44:10 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed May 19, 2017 at 12:33:02 PM by AutoGen 5.18.5 .\" From the definitions ntp.keys.def .\" and the template file agman-file.tpl .Sh NAME diff --git a/ntpd/ntp.keys.5mdoc b/ntpd/ntp.keys.5mdoc index 02664dbe0..d9cf51dc0 100644 --- a/ntpd/ntp.keys.5mdoc +++ b/ntpd/ntp.keys.5mdoc @@ -1,9 +1,9 @@ -.Dd March 21 2017 +.Dd May 19 2017 .Dt NTP_KEYS 5mdoc File Formats -.Os SunOS 5.10 +.Os Linux 3.2.0-4-686-pae .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed March 21, 2017 at 10:44:22 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed May 19, 2017 at 12:32:54 PM by AutoGen 5.18.5 .\" From the definitions ntp.keys.def .\" and the template file agmdoc-file.tpl .Sh NAME diff --git a/ntpd/ntp.keys.html b/ntpd/ntp.keys.html index fc743d764..1cdbc6378 100644 --- a/ntpd/ntp.keys.html +++ b/ntpd/ntp.keys.html @@ -35,7 +35,7 @@ Up: (dir)
This document describes the symmetric key file for the NTP Project's ntpd program. -
This document applies to version 4.2.8p9 of ntp.keys. +
This document applies to version 4.2.8p10 of ntp.keys.
Short Contents

diff --git a/ntpd/ntp.keys.man.in b/ntpd/ntp.keys.man.in index a88bf58b5..cf1aa1162 100644 --- a/ntpd/ntp.keys.man.in +++ b/ntpd/ntp.keys.man.in @@ -1,8 +1,8 @@ -.TH ntp.keys 5 "21 Mar 2017" "4.2.8p10" "File Formats" +.TH ntp.keys 5 "19 May 2017" "4.2.8p10" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed March 21, 2017 at 10:44:10 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed May 19, 2017 at 12:33:02 PM by AutoGen 5.18.5 .\" From the definitions ntp.keys.def .\" and the template file agman-file.tpl .Sh NAME diff --git a/ntpd/ntp.keys.mdoc.in b/ntpd/ntp.keys.mdoc.in index fb2f7ea99..f8c9cd325 100644 --- a/ntpd/ntp.keys.mdoc.in +++ b/ntpd/ntp.keys.mdoc.in @@ -1,9 +1,9 @@ -.Dd March 21 2017 +.Dd May 19 2017 .Dt NTP_KEYS 5 File Formats -.Os SunOS 5.10 +.Os Linux 3.2.0-4-686-pae .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed March 21, 2017 at 10:44:22 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed May 19, 2017 at 12:32:54 PM by AutoGen 5.18.5 .\" From the definitions ntp.keys.def .\" and the template file agmdoc-file.tpl .Sh NAME diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index 82ce7542f..c6876eb38 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 March 21, 2017 at 10:42:12 AM by AutoGen 5.18.5 + * It has been AutoGen-ed May 19, 2017 at 12:32:23 PM by AutoGen 5.18.5 * From the definitions ntpd-opts.def * and the template file options * diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index a51185766..7b6712475 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 March 21, 2017 at 10:42:11 AM by AutoGen 5.18.5 + * It has been AutoGen-ed May 19, 2017 at 12:32:23 PM by AutoGen 5.18.5 * From the definitions ntpd-opts.def * and the template file options * diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman index a977bf0d9..8e7ec0cbd 100644 --- a/ntpd/ntpd.1ntpdman +++ b/ntpd/ntpd.1ntpdman @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntpd 1ntpdman "21 Mar 2017" "4.2.8p10" "User Commands" +.TH ntpd 1ntpdman "19 May 2017" "4.2.8p10" "User Commands" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-wcairs/ag-fdaWls) +.\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed March 21, 2017 at 10:44:13 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed May 19, 2017 at 12:33:03 PM by AutoGen 5.18.5 .\" From the definitions ntpd-opts.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/ntpd/ntpd.1ntpdmdoc b/ntpd/ntpd.1ntpdmdoc index 34ec086b1..a54f55139 100644 --- a/ntpd/ntpd.1ntpdmdoc +++ b/ntpd/ntpd.1ntpdmdoc @@ -1,9 +1,9 @@ -.Dd March 21 2017 +.Dd May 19 2017 .Dt NTPD 1ntpdmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed March 21, 2017 at 10:44:23 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed May 19, 2017 at 12:32:56 PM by AutoGen 5.18.5 .\" From the definitions ntpd-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/ntpd/ntpd.html b/ntpd/ntpd.html index dffa1646f..348f3fb1c 100644 --- a/ntpd/ntpd.html +++ b/ntpd/ntpd.html @@ -41,7 +41,7 @@ The program can operate in any of several modes, including client/server, symmetric and broadcast modes, and with both symmetric-key and public-key cryptography. -
This document applies to version 4.2.8p9 of ntpd. +
This document applies to version 4.2.8p10 of ntpd.
ntpd Description: Description @@ -225,7 +225,7 @@ the usage text by passing it through a pager program. used to select the program, defaulting to more. Both will exit with a status code of 0. -
ntpd - NTP daemon program - Ver. 4.2.8p9
+ntpd - NTP daemon program - Ver. 4.2.8p10-x
 Usage:  ntpd [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \
                 [ <server1> ... <serverN> ]
   Flg Arg Option-Name    Description
diff --git a/ntpd/ntpd.man.in b/ntpd/ntpd.man.in
index c4a9200a4..f28f8feec 100644
--- a/ntpd/ntpd.man.in
+++ b/ntpd/ntpd.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpd @NTPD_MS@ "21 Mar 2017" "4.2.8p10" "User Commands"
+.TH ntpd @NTPD_MS@ "19 May 2017" "4.2.8p10" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-wcairs/ag-fdaWls)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed March 21, 2017 at 10:44:13 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed May 19, 2017 at 12:33:03 PM by AutoGen 5.18.5
 .\" From the definitions ntpd-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/ntpd/ntpd.mdoc.in b/ntpd/ntpd.mdoc.in
index 52fcef09e..0df9043f1 100644
--- a/ntpd/ntpd.mdoc.in
+++ b/ntpd/ntpd.mdoc.in
@@ -1,9 +1,9 @@
-.Dd March 21 2017
+.Dd May 19 2017
 .Dt NTPD @NTPD_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  March 21, 2017 at 10:44:23 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  May 19, 2017 at 12:32:56 PM by AutoGen 5.18.5
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpdc/invoke-ntpdc.texi b/ntpdc/invoke-ntpdc.texi
index 953b850ed..8856dee9b 100644
--- a/ntpdc/invoke-ntpdc.texi
+++ b/ntpdc/invoke-ntpdc.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntpdc.texi)
 #
-# It has been AutoGen-ed  March 21, 2017 at 10:44:50 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  May 19, 2017 at 12:33:12 PM by AutoGen 5.18.5
 # From the definitions    ntpdc-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -76,7 +76,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p10-beta
+ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p10
 Usage:  ntpdc [ - [] | --[@{=| @}] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c
index 1b728b40b..a7737b75e 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  March 21, 2017 at 10:44:44 AM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  May 19, 2017 at 12:33:06 PM by AutoGen 5.18.5
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h
index fb23a9678..21a0b692e 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  March 21, 2017 at 10:44:43 AM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  May 19, 2017 at 12:33:06 PM by AutoGen 5.18.5
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
diff --git a/ntpdc/ntpdc.1ntpdcman b/ntpdc/ntpdc.1ntpdcman
index a0cfc1fe5..38246a67b 100644
--- a/ntpdc/ntpdc.1ntpdcman
+++ b/ntpdc/ntpdc.1ntpdcman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpdc 1ntpdcman "21 Mar 2017" "4.2.8p10" "User Commands"
+.TH ntpdc 1ntpdcman "19 May 2017" "4.2.8p10" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-T2aicv/ag-q4aGav)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed March 21, 2017 at 10:44:50 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed May 19, 2017 at 12:33:13 PM by AutoGen 5.18.5
 .\" From the definitions ntpdc-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/ntpdc/ntpdc.1ntpdcmdoc b/ntpdc/ntpdc.1ntpdcmdoc
index 7388d6339..48d445b97 100644
--- a/ntpdc/ntpdc.1ntpdcmdoc
+++ b/ntpdc/ntpdc.1ntpdcmdoc
@@ -1,9 +1,9 @@
-.Dd March 21 2017
+.Dd May 19 2017
 .Dt NTPDC 1ntpdcmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  March 21, 2017 at 10:44:57 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  May 19, 2017 at 12:33:10 PM by AutoGen 5.18.5
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpdc/ntpdc.html b/ntpdc/ntpdc.html
index 9b1fd617d..3d9da3695 100644
--- a/ntpdc/ntpdc.html
+++ b/ntpdc/ntpdc.html
@@ -38,7 +38,7 @@ display the time offset of the system clock relative to the server
 clock.  Run as root, it can correct the system clock to this offset as
 well.  It can be run as an interactive command or from a cron job.
 
-  This document applies to version 4.2.8p9 of ntpdc.
+  
This document applies to version 4.2.8p10 of ntpdc.
 
   
The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
@@ -157,7 +157,7 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
-
ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p9
+ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p10
 Usage:  ntpdc [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
diff --git a/ntpdc/ntpdc.man.in b/ntpdc/ntpdc.man.in
index 19d3da07c..68d8dd1e7 100644
--- a/ntpdc/ntpdc.man.in
+++ b/ntpdc/ntpdc.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpdc @NTPDC_MS@ "21 Mar 2017" "4.2.8p10" "User Commands"
+.TH ntpdc @NTPDC_MS@ "19 May 2017" "4.2.8p10" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-T2aicv/ag-q4aGav)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed March 21, 2017 at 10:44:50 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed May 19, 2017 at 12:33:13 PM by AutoGen 5.18.5
 .\" From the definitions ntpdc-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/ntpdc/ntpdc.mdoc.in b/ntpdc/ntpdc.mdoc.in
index 19facb2a5..fbe0df53b 100644
--- a/ntpdc/ntpdc.mdoc.in
+++ b/ntpdc/ntpdc.mdoc.in
@@ -1,9 +1,9 @@
-.Dd March 21 2017
+.Dd May 19 2017
 .Dt NTPDC @NTPDC_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  March 21, 2017 at 10:44:57 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  May 19, 2017 at 12:33:10 PM by AutoGen 5.18.5
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpq/invoke-ntpq.texi b/ntpq/invoke-ntpq.texi
index 41d4bfce9..ff097550f 100644
--- a/ntpq/invoke-ntpq.texi
+++ b/ntpq/invoke-ntpq.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntpq.texi)
 #
-# It has been AutoGen-ed  March 19, 2017 at 10:10:33 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  May 19, 2017 at 12:33:24 PM by AutoGen 5.18.5
 # From the definitions    ntpq-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -109,7 +109,7 @@ A
 @quoteleft{}?@quoteright{}
 followed by a command name will print function and usage
 information about the command.
-@item @code{addvars} @kbd{name}@code{[=@kbd{value}@code{[,...]}
+@item @code{addvars} @kbd{name}@code{[=@kbd{value}]}@code{[,...]}
 @item @code{rmvars} @kbd{name}@code{[,...]}
 @item @code{clearvars}
 @item @code{showvars}
@@ -942,7 +942,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntpq - standard NTP query program - Ver. 4.2.8p9
+ntpq - standard NTP query program - Ver. 4.2.8p10
 Usage:  ntpq [ - [] | --[@{=| @}] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 name resolution
diff --git a/ntpq/ntpq-opts.c b/ntpq/ntpq-opts.c
index 7e70f45c3..959fb39b4 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  March 19, 2017 at 10:10:23 AM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  May 19, 2017 at 12:33:14 PM by AutoGen 5.18.5
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -50,7 +50,7 @@ extern "C" {
 #endif
 extern FILE * option_usage_fp;
 #define zCopyright      (ntpq_opt_strs+0)
-#define zLicenseDescrip (ntpq_opt_strs+340)
+#define zLicenseDescrip (ntpq_opt_strs+341)
 
 /*
  *  global included definitions
@@ -68,15 +68,15 @@ extern FILE * option_usage_fp;
 /**
  *  static const strings for ntpq options
  */
-static char const ntpq_opt_strs[1974] =
-/*     0 */ "ntpq 4.2.8p9\n"
+static char const ntpq_opt_strs[1977] =
+/*     0 */ "ntpq 4.2.8p10\n"
             "Copyright (C) 1992-2017 The University of Delaware and Network Time Foundation, all rights reserved.\n"
             "This is free software. It is licensed for use, modification and\n"
             "redistribution under the terms of the NTP License, copies of which\n"
             "can be seen at:\n"
             "  \n"
             "  \n\0"
-/*   340 */ "Permission to use, copy, modify, and distribute this software and its\n"
+/*   341 */ "Permission to use, copy, modify, and distribute this software and its\n"
             "documentation for any purpose with or without fee is hereby granted,\n"
             "provided that the above copyright notice appears in all copies and that\n"
             "both the copyright notice and this permission notice appear in supporting\n"
@@ -86,71 +86,71 @@ static char const ntpq_opt_strs[1974] =
             "Time Foundation makes no representations about the suitability this\n"
             "software for any purpose.  It is provided \"as is\" without express or\n"
             "implied warranty.\n\0"
-/*  1008 */ "Force IPv4 name resolution\0"
-/*  1035 */ "IPV4\0"
-/*  1040 */ "ipv4\0"
-/*  1045 */ "Force IPv6 name resolution\0"
-/*  1072 */ "IPV6\0"
-/*  1077 */ "ipv6\0"
-/*  1082 */ "run a command and exit\0"
-/*  1105 */ "COMMAND\0"
-/*  1113 */ "command\0"
-/*  1121 */ "Increase debug verbosity level\0"
-/*  1152 */ "DEBUG_LEVEL\0"
-/*  1164 */ "debug-level\0"
-/*  1176 */ "Set the debug verbosity level\0"
-/*  1206 */ "SET_DEBUG_LEVEL\0"
-/*  1222 */ "set-debug-level\0"
-/*  1238 */ "Force ntpq to operate in interactive mode\0"
-/*  1280 */ "INTERACTIVE\0"
-/*  1292 */ "interactive\0"
-/*  1304 */ "numeric host addresses\0"
-/*  1327 */ "NUMERIC\0"
-/*  1335 */ "numeric\0"
-/*  1343 */ "Always output status line with readvar\0"
-/*  1382 */ "OLD_RV\0"
-/*  1389 */ "old-rv\0"
-/*  1396 */ "Print a list of the peers\0"
-/*  1422 */ "PEERS\0"
-/*  1428 */ "peers\0"
-/*  1434 */ "Set default display type for S2+ refids\0"
-/*  1474 */ "REFID\0"
-/*  1480 */ "refid\0"
-/*  1486 */ "Display the full 'remote' value\0"
-/*  1518 */ "WIDE\0"
-/*  1523 */ "wide\0"
-/*  1528 */ "display extended usage information and exit\0"
-/*  1572 */ "help\0"
-/*  1577 */ "extended usage information passed thru pager\0"
-/*  1622 */ "more-help\0"
-/*  1632 */ "output version information and exit\0"
-/*  1668 */ "version\0"
-/*  1676 */ "save the option state to a config file\0"
-/*  1715 */ "save-opts\0"
-/*  1725 */ "load options from a config file\0"
-/*  1757 */ "LOAD_OPTS\0"
-/*  1767 */ "no-load-opts\0"
-/*  1780 */ "no\0"
-/*  1783 */ "NTPQ\0"
-/*  1788 */ "ntpq - standard NTP query program - Ver. 4.2.8p9\n"
+/*  1009 */ "Force IPv4 name resolution\0"
+/*  1036 */ "IPV4\0"
+/*  1041 */ "ipv4\0"
+/*  1046 */ "Force IPv6 name resolution\0"
+/*  1073 */ "IPV6\0"
+/*  1078 */ "ipv6\0"
+/*  1083 */ "run a command and exit\0"
+/*  1106 */ "COMMAND\0"
+/*  1114 */ "command\0"
+/*  1122 */ "Increase debug verbosity level\0"
+/*  1153 */ "DEBUG_LEVEL\0"
+/*  1165 */ "debug-level\0"
+/*  1177 */ "Set the debug verbosity level\0"
+/*  1207 */ "SET_DEBUG_LEVEL\0"
+/*  1223 */ "set-debug-level\0"
+/*  1239 */ "Force ntpq to operate in interactive mode\0"
+/*  1281 */ "INTERACTIVE\0"
+/*  1293 */ "interactive\0"
+/*  1305 */ "numeric host addresses\0"
+/*  1328 */ "NUMERIC\0"
+/*  1336 */ "numeric\0"
+/*  1344 */ "Always output status line with readvar\0"
+/*  1383 */ "OLD_RV\0"
+/*  1390 */ "old-rv\0"
+/*  1397 */ "Print a list of the peers\0"
+/*  1423 */ "PEERS\0"
+/*  1429 */ "peers\0"
+/*  1435 */ "Set default display type for S2+ refids\0"
+/*  1475 */ "REFID\0"
+/*  1481 */ "refid\0"
+/*  1487 */ "Display the full 'remote' value\0"
+/*  1519 */ "WIDE\0"
+/*  1524 */ "wide\0"
+/*  1529 */ "display extended usage information and exit\0"
+/*  1573 */ "help\0"
+/*  1578 */ "extended usage information passed thru pager\0"
+/*  1623 */ "more-help\0"
+/*  1633 */ "output version information and exit\0"
+/*  1669 */ "version\0"
+/*  1677 */ "save the option state to a config file\0"
+/*  1716 */ "save-opts\0"
+/*  1726 */ "load options from a config file\0"
+/*  1758 */ "LOAD_OPTS\0"
+/*  1768 */ "no-load-opts\0"
+/*  1781 */ "no\0"
+/*  1784 */ "NTPQ\0"
+/*  1789 */ "ntpq - standard NTP query program - Ver. 4.2.8p10\n"
             "Usage:  %s [ - [] | --[{=| }] ]... [ host ...]\n\0"
-/*  1907 */ "$HOME\0"
-/*  1913 */ ".\0"
-/*  1915 */ ".ntprc\0"
-/*  1922 */ "http://bugs.ntp.org, bugs@ntp.org\0"
-/*  1956 */ "ntpq 4.2.8p9\0"
-/*  1969 */ "hash";
+/*  1909 */ "$HOME\0"
+/*  1915 */ ".\0"
+/*  1917 */ ".ntprc\0"
+/*  1924 */ "http://bugs.ntp.org, bugs@ntp.org\0"
+/*  1958 */ "ntpq 4.2.8p10\0"
+/*  1972 */ "hash";
 
 /**
  *  ipv4 option description with
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the ipv4 option */
-#define IPV4_DESC      (ntpq_opt_strs+1008)
+#define IPV4_DESC      (ntpq_opt_strs+1009)
 /** Upper-cased name for the ipv4 option */
-#define IPV4_NAME      (ntpq_opt_strs+1035)
+#define IPV4_NAME      (ntpq_opt_strs+1036)
 /** Name string for the ipv4 option */
-#define IPV4_name      (ntpq_opt_strs+1040)
+#define IPV4_name      (ntpq_opt_strs+1041)
 /** Other options that appear in conjunction with the ipv4 option */
 static int const aIpv4CantList[] = {
     INDEX_OPT_IPV6, NO_EQUIVALENT };
@@ -162,11 +162,11 @@ static int const aIpv4CantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the ipv6 option */
-#define IPV6_DESC      (ntpq_opt_strs+1045)
+#define IPV6_DESC      (ntpq_opt_strs+1046)
 /** Upper-cased name for the ipv6 option */
-#define IPV6_NAME      (ntpq_opt_strs+1072)
+#define IPV6_NAME      (ntpq_opt_strs+1073)
 /** Name string for the ipv6 option */
-#define IPV6_name      (ntpq_opt_strs+1077)
+#define IPV6_name      (ntpq_opt_strs+1078)
 /** Other options that appear in conjunction with the ipv6 option */
 static int const aIpv6CantList[] = {
     INDEX_OPT_IPV4, NO_EQUIVALENT };
@@ -177,11 +177,11 @@ static int const aIpv6CantList[] = {
  *  command option description:
  */
 /** Descriptive text for the command option */
-#define COMMAND_DESC      (ntpq_opt_strs+1082)
+#define COMMAND_DESC      (ntpq_opt_strs+1083)
 /** Upper-cased name for the command option */
-#define COMMAND_NAME      (ntpq_opt_strs+1105)
+#define COMMAND_NAME      (ntpq_opt_strs+1106)
 /** Name string for the command option */
-#define COMMAND_name      (ntpq_opt_strs+1113)
+#define COMMAND_name      (ntpq_opt_strs+1114)
 /** Compiled in flag settings for the command option */
 #define COMMAND_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -190,11 +190,11 @@ static int const aIpv6CantList[] = {
  *  debug-level option description:
  */
 /** Descriptive text for the debug-level option */
-#define DEBUG_LEVEL_DESC      (ntpq_opt_strs+1121)
+#define DEBUG_LEVEL_DESC      (ntpq_opt_strs+1122)
 /** Upper-cased name for the debug-level option */
-#define DEBUG_LEVEL_NAME      (ntpq_opt_strs+1152)
+#define DEBUG_LEVEL_NAME      (ntpq_opt_strs+1153)
 /** Name string for the debug-level option */
-#define DEBUG_LEVEL_name      (ntpq_opt_strs+1164)
+#define DEBUG_LEVEL_name      (ntpq_opt_strs+1165)
 /** Compiled in flag settings for the debug-level option */
 #define DEBUG_LEVEL_FLAGS     (OPTST_DISABLED)
 
@@ -202,11 +202,11 @@ static int const aIpv6CantList[] = {
  *  set-debug-level option description:
  */
 /** Descriptive text for the set-debug-level option */
-#define SET_DEBUG_LEVEL_DESC      (ntpq_opt_strs+1176)
+#define SET_DEBUG_LEVEL_DESC      (ntpq_opt_strs+1177)
 /** Upper-cased name for the set-debug-level option */
-#define SET_DEBUG_LEVEL_NAME      (ntpq_opt_strs+1206)
+#define SET_DEBUG_LEVEL_NAME      (ntpq_opt_strs+1207)
 /** Name string for the set-debug-level option */
-#define SET_DEBUG_LEVEL_name      (ntpq_opt_strs+1222)
+#define SET_DEBUG_LEVEL_name      (ntpq_opt_strs+1223)
 /** Compiled in flag settings for the set-debug-level option */
 #define SET_DEBUG_LEVEL_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -216,11 +216,11 @@ static int const aIpv6CantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the interactive option */
-#define INTERACTIVE_DESC      (ntpq_opt_strs+1238)
+#define INTERACTIVE_DESC      (ntpq_opt_strs+1239)
 /** Upper-cased name for the interactive option */
-#define INTERACTIVE_NAME      (ntpq_opt_strs+1280)
+#define INTERACTIVE_NAME      (ntpq_opt_strs+1281)
 /** Name string for the interactive option */
-#define INTERACTIVE_name      (ntpq_opt_strs+1292)
+#define INTERACTIVE_name      (ntpq_opt_strs+1293)
 /** Other options that appear in conjunction with the interactive option */
 static int const aInteractiveCantList[] = {
     INDEX_OPT_COMMAND,
@@ -232,11 +232,11 @@ static int const aInteractiveCantList[] = {
  *  numeric option description:
  */
 /** Descriptive text for the numeric option */
-#define NUMERIC_DESC      (ntpq_opt_strs+1304)
+#define NUMERIC_DESC      (ntpq_opt_strs+1305)
 /** Upper-cased name for the numeric option */
-#define NUMERIC_NAME      (ntpq_opt_strs+1327)
+#define NUMERIC_NAME      (ntpq_opt_strs+1328)
 /** Name string for the numeric option */
-#define NUMERIC_name      (ntpq_opt_strs+1335)
+#define NUMERIC_name      (ntpq_opt_strs+1336)
 /** Compiled in flag settings for the numeric option */
 #define NUMERIC_FLAGS     (OPTST_DISABLED)
 
@@ -244,11 +244,11 @@ static int const aInteractiveCantList[] = {
  *  old-rv option description:
  */
 /** Descriptive text for the old-rv option */
-#define OLD_RV_DESC      (ntpq_opt_strs+1343)
+#define OLD_RV_DESC      (ntpq_opt_strs+1344)
 /** Upper-cased name for the old-rv option */
-#define OLD_RV_NAME      (ntpq_opt_strs+1382)
+#define OLD_RV_NAME      (ntpq_opt_strs+1383)
 /** Name string for the old-rv option */
-#define OLD_RV_name      (ntpq_opt_strs+1389)
+#define OLD_RV_name      (ntpq_opt_strs+1390)
 /** Compiled in flag settings for the old-rv option */
 #define OLD_RV_FLAGS     (OPTST_DISABLED)
 
@@ -257,11 +257,11 @@ static int const aInteractiveCantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the peers option */
-#define PEERS_DESC      (ntpq_opt_strs+1396)
+#define PEERS_DESC      (ntpq_opt_strs+1397)
 /** Upper-cased name for the peers option */
-#define PEERS_NAME      (ntpq_opt_strs+1422)
+#define PEERS_NAME      (ntpq_opt_strs+1423)
 /** Name string for the peers option */
-#define PEERS_name      (ntpq_opt_strs+1428)
+#define PEERS_name      (ntpq_opt_strs+1429)
 /** Other options that appear in conjunction with the peers option */
 static int const aPeersCantList[] = {
     INDEX_OPT_INTERACTIVE, NO_EQUIVALENT };
@@ -272,11 +272,11 @@ static int const aPeersCantList[] = {
  *  refid option description:
  */
 /** Descriptive text for the refid option */
-#define REFID_DESC      (ntpq_opt_strs+1434)
+#define REFID_DESC      (ntpq_opt_strs+1435)
 /** Upper-cased name for the refid option */
-#define REFID_NAME      (ntpq_opt_strs+1474)
+#define REFID_NAME      (ntpq_opt_strs+1475)
 /** Name string for the refid option */
-#define REFID_name      (ntpq_opt_strs+1480)
+#define REFID_name      (ntpq_opt_strs+1481)
 /** The compiled in default value for the refid option argument */
 #define REFID_DFT_ARG   ((char const*)REFID_IPV4)
 /** Compiled in flag settings for the refid option */
@@ -287,22 +287,22 @@ static int const aPeersCantList[] = {
  *  wide option description:
  */
 /** Descriptive text for the wide option */
-#define WIDE_DESC      (ntpq_opt_strs+1486)
+#define WIDE_DESC      (ntpq_opt_strs+1487)
 /** Upper-cased name for the wide option */
-#define WIDE_NAME      (ntpq_opt_strs+1518)
+#define WIDE_NAME      (ntpq_opt_strs+1519)
 /** Name string for the wide option */
-#define WIDE_name      (ntpq_opt_strs+1523)
+#define WIDE_name      (ntpq_opt_strs+1524)
 /** Compiled in flag settings for the wide option */
 #define WIDE_FLAGS     (OPTST_DISABLED)
 
 /*
  *  Help/More_Help/Version option descriptions:
  */
-#define HELP_DESC       (ntpq_opt_strs+1528)
-#define HELP_name       (ntpq_opt_strs+1572)
+#define HELP_DESC       (ntpq_opt_strs+1529)
+#define HELP_name       (ntpq_opt_strs+1573)
 #ifdef HAVE_WORKING_FORK
-#define MORE_HELP_DESC  (ntpq_opt_strs+1577)
-#define MORE_HELP_name  (ntpq_opt_strs+1622)
+#define MORE_HELP_DESC  (ntpq_opt_strs+1578)
+#define MORE_HELP_name  (ntpq_opt_strs+1623)
 #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
 #else
 #define MORE_HELP_DESC  HELP_DESC
@@ -315,14 +315,14 @@ static int const aPeersCantList[] = {
 #  define VER_FLAGS     (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \
                          OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT)
 #endif
-#define VER_DESC        (ntpq_opt_strs+1632)
-#define VER_name        (ntpq_opt_strs+1668)
-#define SAVE_OPTS_DESC  (ntpq_opt_strs+1676)
-#define SAVE_OPTS_name  (ntpq_opt_strs+1715)
-#define LOAD_OPTS_DESC     (ntpq_opt_strs+1725)
-#define LOAD_OPTS_NAME     (ntpq_opt_strs+1757)
-#define NO_LOAD_OPTS_name  (ntpq_opt_strs+1767)
-#define LOAD_OPTS_pfx      (ntpq_opt_strs+1780)
+#define VER_DESC        (ntpq_opt_strs+1633)
+#define VER_name        (ntpq_opt_strs+1669)
+#define SAVE_OPTS_DESC  (ntpq_opt_strs+1677)
+#define SAVE_OPTS_name  (ntpq_opt_strs+1716)
+#define LOAD_OPTS_DESC     (ntpq_opt_strs+1726)
+#define LOAD_OPTS_NAME     (ntpq_opt_strs+1758)
+#define NO_LOAD_OPTS_name  (ntpq_opt_strs+1768)
+#define LOAD_OPTS_pfx      (ntpq_opt_strs+1781)
 #define LOAD_OPTS_name     (NO_LOAD_OPTS_name + 3)
 /**
  *  Declare option callback procedures
@@ -543,24 +543,24 @@ static tOptDesc optDesc[OPTION_CT] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /** Reference to the upper cased version of ntpq. */
-#define zPROGNAME       (ntpq_opt_strs+1783)
+#define zPROGNAME       (ntpq_opt_strs+1784)
 /** Reference to the title line for ntpq usage. */
-#define zUsageTitle     (ntpq_opt_strs+1788)
+#define zUsageTitle     (ntpq_opt_strs+1789)
 /** ntpq configuration file name. */
-#define zRcName         (ntpq_opt_strs+1915)
+#define zRcName         (ntpq_opt_strs+1917)
 /** Directories to search for ntpq config files. */
 static char const * const apzHomeList[3] = {
-    ntpq_opt_strs+1907,
-    ntpq_opt_strs+1913,
+    ntpq_opt_strs+1909,
+    ntpq_opt_strs+1915,
     NULL };
 /** The ntpq program bug email address. */
-#define zBugsAddr       (ntpq_opt_strs+1922)
+#define zBugsAddr       (ntpq_opt_strs+1924)
 /** Clarification/explanation of what ntpq does. */
 #define zExplain        (NULL)
 /** Extra detail explaining what ntpq does. */
 #define zDetail         (NULL)
 /** The full version string for ntpq. */
-#define zFullVersion    (ntpq_opt_strs+1956)
+#define zFullVersion    (ntpq_opt_strs+1958)
 /* extracted from optcode.tlib near line 364 */
 
 #if defined(ENABLE_NLS)
@@ -633,7 +633,7 @@ doOptRefid(tOptions* pOptions, tOptDesc* pOptDesc)
 
 /* extracted from optmain.tlib near line 945 */
     static char const * const names[2] = {
-        ntpq_opt_strs+1969, ntpq_opt_strs+1040 };
+        ntpq_opt_strs+1972, ntpq_opt_strs+1041 };
 
     if (pOptions <= OPTPROC_EMIT_LIMIT) {
         (void) optionEnumerationVal(pOptions, pOptDesc, names, 2);
@@ -841,7 +841,7 @@ static void bogus_function(void) {
      translate option names.
    */
   /* referenced via ntpqOptions.pzCopyright */
-  puts(_("ntpq 4.2.8p9\n\
+  puts(_("ntpq 4.2.8p10\n\
 Copyright (C) 1992-2017 The University of Delaware and Network Time Foundation, all rights reserved.\n\
 This is free software. It is licensed for use, modification and\n\
 redistribution under the terms of the NTP License, copies of which\n\
@@ -910,11 +910,11 @@ implied warranty.\n"));
   puts(_("load options from a config file"));
 
   /* referenced via ntpqOptions.pzUsageTitle */
-  puts(_("ntpq - standard NTP query program - Ver. 4.2.8p9\n\
+  puts(_("ntpq - standard NTP query program - Ver. 4.2.8p10\n\
 Usage:  %s [ - [] | --[{=| }] ]... [ host ...]\n"));
 
   /* referenced via ntpqOptions.pzFullVersion */
-  puts(_("ntpq 4.2.8p9"));
+  puts(_("ntpq 4.2.8p10"));
 
   /* referenced via ntpqOptions.pzFullUsage */
   puts(_("<<>>"));
diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h
index 19d394a59..569e985bb 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  March 19, 2017 at 10:10:23 AM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  May 19, 2017 at 12:33:14 PM by AutoGen 5.18.5
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -84,9 +84,9 @@ typedef enum {
 /** count of all options for ntpq */
 #define OPTION_CT    16
 /** ntpq version */
-#define NTPQ_VERSION       "4.2.8p9"
+#define NTPQ_VERSION       "4.2.8p10"
 /** Full ntpq version text */
-#define NTPQ_FULL_VERSION  "ntpq 4.2.8p9"
+#define NTPQ_FULL_VERSION  "ntpq 4.2.8p10"
 
 /**
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpq/ntpq.1ntpqman b/ntpq/ntpq.1ntpqman
index 0d27313ec..4a62426b0 100644
--- a/ntpq/ntpq.1ntpqman
+++ b/ntpq/ntpq.1ntpqman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpq 1ntpqman "19 Mar 2017" "4.2.8p9" "User Commands"
+.TH ntpq 1ntpqman "19 May 2017" "4.2.8p10" "User Commands"
 .\"
 .\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed March 19, 2017 at 10:10:34 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed May 19, 2017 at 12:33:25 PM by AutoGen 5.18.5
 .\" From the definitions ntpq-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -148,7 +148,7 @@ information about the command.
 .br
 .ns
 .TP 15
-.NOP \f\*[B-Font]addvars\f[] \f\*[I-Font]name\f[][\&=\f\*[I-Font]value\f[][,...]
+.NOP \f\*[B-Font]addvars\f[] \f\*[I-Font]name\f[][\&=\f\*[I-Font]value\f[]][,...]
 .br
 .ns
 .TP 15
diff --git a/ntpq/ntpq.1ntpqmdoc b/ntpq/ntpq.1ntpqmdoc
index 1fb748a1f..3b133adfd 100644
--- a/ntpq/ntpq.1ntpqmdoc
+++ b/ntpq/ntpq.1ntpqmdoc
@@ -1,9 +1,9 @@
-.Dd March 19 2017
+.Dd May 19 2017
 .Dt NTPQ 1ntpqmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  March 19, 2017 at 10:10:31 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  May 19, 2017 at 12:33:22 PM by AutoGen 5.18.5
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -115,7 +115,7 @@ A
 .Ql \&?
 followed by a command name will print function and usage
 information about the command.
-.It Ic addvars Ar name Ns Oo \&= Ns Ar value Ns Op ,...
+.It Ic addvars Ar name Ns Oo \&= Ns Ar value Oc Ns Op ,...
 .It Ic rmvars Ar name Ns Op ,...
 .It Ic clearvars
 .It Ic showvars
diff --git a/ntpq/ntpq.html b/ntpq/ntpq.html
index bc87546d1..ef0773857 100644
--- a/ntpq/ntpq.html
+++ b/ntpq/ntpq.html
@@ -46,7 +46,7 @@ monitor the operational status
 and determine the performance of
 ntpd, the NTP daemon.
 
-  This document applies to version 4.2.8p9 of ntpq.
+  
This document applies to version 4.2.8p10 of ntpq.
 
 

 ntpq Description
@@ -101,13 +101,9 @@ The description on this page is for the NTPv4 variables.
 
   The
 ntpq
-utility program is used to query NTP servers which
-implement the standard NTP mode 6 control message formats defined
-in Appendix B of the NTPv3 specification RFC1305, requesting
+utility program is used to query NTP servers to monitor NTP operations
+and performance, requesting
 information about current state and/or changes in that state. 
-The same formats are used in NTPv4, although some of the
-variables have changed and new ones added. The description on this
-page is for the NTPv4 variables. 
 The program may be run either in interactive mode or controlled using
 command line arguments. 
 Requests to read and write arbitrary
@@ -151,6 +147,16 @@ one attempt to retransmit requests, and will time requests out if
 the remote host is not heard from within a suitable timeout
 time.
 
+  
Note that in contexts where a host name is expected, a
+-4
+qualifier preceding the host name forces resolution to the IPv4
+namespace, while a
+-6
+qualifier forces resolution to the IPv6 namespace. 
+For examples and usage, see the
+“NTP Debugging Techniques”
+page.
+
   
Specifying a
 command line option other than
 -i
@@ -175,35 +181,30 @@ uniquely identify the command need be typed.
 number of interactive format commands are executed entirely within
 the
 ntpq
-utility itself and do not result in NTP mode 6
+utility itself and do not result in NTP
 requests being sent to a server. 
 These are described following.
      

-? [command_keyword]
help [command_keyword]
A
+
? [command]
help [command]
A
 ‘?’
-by itself will print a list of all the command
-keywords known to this incarnation of
+by itself will print a list of all the commands
+known to
 ntpq
 A
 ‘?’
-followed by a command keyword will print function and usage
+followed by a command name will print function and usage
 information about the command. 
-This command is probably a better
-source of information about
-ntpq
-than this manual
-page. 
-
addvars variable_name[=value] ...
rmvars variable_name ...
clearvars
showvars
The data carried by NTP mode 6 messages consists of a list of
+
addvars name[=value][,...]
rmvars name[,...]
clearvars
showvars
The arguments to this command consist of a list of
 items of the form
-‘variable_name=value’,
+name[=value],
 where the
-‘=value’
+.No = Ns Ar value
 is ignored, and can be omitted,
 in requests to the server to read variables. 
 The
 ntpq
-utility maintains an internal list in which data to be included in control
-messages can be assembled, and sent using the
+utility maintains an internal list in which data to be included in
+messages can be assembled, and displayed or set using the
 readlist
 and
 writelist
@@ -218,34 +219,30 @@ The
 rmvars
 command can be used to remove individual variables from the list,
 while the
-clearlist
+clearvars
 command removes all variables from the
 list. 
 The
 showvars
 command displays the current list of optional variables. 
-
authenticate [yes | no]
Normally
+
authenticate [yes|no]
Normally
 ntpq
 does not authenticate requests unless
 they are write requests. 
 The command
-‘authenticate yes’
+authenticate yes
 causes
 ntpq
 to send authentication with all requests it
 makes. 
 Authenticated requests causes some servers to handle
-requests slightly differently, and can occasionally melt the CPU in
-fuzzballs if you turn authentication on before doing a
-peer
-display. 
+requests slightly differently. 
 The command
-‘authenticate’
+authenticate
 causes
 ntpq
 to display whether or not
-ntpq
-is currently autheinticating requests. 
+it is currently authenticating requests. 
 
cooked
Causes output from query commands to be "cooked", so that
 variables which are recognized by
 ntpq
@@ -253,12 +250,12 @@ will have their
 values reformatted for human consumption. 
 Variables which
 ntpq
-thinks should have a decodable value but didn't are
+could not decode completely are
 marked with a trailing
 ‘?’. 
-
debug [more | less | off]
With no argument, displays the current debug level. 
-Otherwise, the debug level is changed to the indicated level. 
-
delay milliseconds
Specify a time interval to be added to timestamps included in
+
debug [more|less|off]
With no argument, displays the current debug level. 
+Otherwise, the debugging level is changed as indicated. 
+
delay [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
@@ -266,12 +263,18 @@ or between machines whose clocks are unsynchronized.
 Actually the
 server does not now require timestamps in authenticated requests,
 so this command may be obsolete. 
+Without any arguments, displays the current delay. 
+
drefid [hash|ipv4]
Display refids as IPv4 or hash. 
+Without any arguments, displays whether refids are shown as IPv4
+addresses or hashes. 
 
exit
Exit
 ntpq
-
host hostname
Set the host to which future queries will be sent. 
-hostname
+
host [name]
Set the host to which future queries will be sent. 
+The
+name
 may be either a host name or a numeric address. 
-
hostnames [yes | no]
If
+Without any arguments, displays the current host. 
+
hostnames [yes|no]
If
 yes
 is specified, host names are printed in
 information displays. 
@@ -285,24 +288,28 @@ unless
 modified using the command line
 -n
 switch. 
-
keyid keyid
This command allows the specification of a key number to be
+Without any arguments, displays whether host names or numeric addresses
+are shown. 
+
keyid [keyid]
This command allows the specification of a key number to be
 used to authenticate configuration requests. 
 This must correspond
 to the
 controlkey
 key number the server has been configured to use for this
 purpose. 
-
keytype [md5 | OpenSSLDigestType]
Specify the type of key to use for authenticating requests. 
-md5
-is alway supported. 
+Without any arguments, displays the current
+keyid. 
+
keytype [digest]
Specify the digest algorithm to use for authenticating requests, with default
+MD5. 
 If
 ntpq
-was built with OpenSSL support,
-any digest type supported by OpenSSL can also be provided. 
+was built with OpenSSL support, and OpenSSL is installed,
+digest
+can be any message digest algorithm supported by OpenSSL. 
 If no argument is given, the current
-keytype
-is displayed. 
-
ntpversion [1 | 2 | 3 | 4]
Sets the NTP version number which
+keytype digest
+algorithm used is displayed. 
+
ntpversion [1|2|3|4]
Sets the NTP version number which
 ntpq
 claims in
 packets. 
@@ -318,9 +325,10 @@ 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. 
-poll
+
poll [n] [verbose]
Poll an NTP server in client mode
 n
-verbose
+times. 
+Poll not implemented yet. 
 
quit
Exit
 ntpq
 
raw
Causes all output from query commands is printed as received
@@ -328,23 +336,27 @@ from the remote server.
 The only formating/interpretation done on
 the data is to transform nonascii data into a printable (but barely
 understandable) form. 
-
timeout milliseconds
Specify a timeout period for responses to server queries. 
+
timeout [milliseconds]
Specify a timeout period for responses to server queries. 
 The
 default is about 5000 milliseconds. 
+Without any arguments, displays the current timeout period. 
 Note that since
 ntpq
 retries each query once after a timeout, the total waiting time for
 a timeout will be twice the timeout value set. 
-
version
Print the version of the
+
version
Display the version of the
 ntpq
 program. 
 
 
 Control Message Commands
 
-Association IDs are used to identify system, peer and clock variables. 
-System variables are assigned an association ID of zero and system name space, while each association is assigned a nonzero association ID and peer namespace. 
-Most control commands send a single mode-6 message to the server and expect a single response message. 
+
Association ids are used to identify system, peer and clock variables. 
+System variables are assigned an association id of zero and system name
+space, while each association is assigned a nonzero association id and
+peer namespace. 
+Most control commands send a single message to the server and expect a
+single response message. 
 The exceptions are the
 peers
 command, which sends a series of messages,
@@ -354,38 +366,87 @@ and
 mreadvar
 commands, which iterate over a range of associations.
      

-associations
Display a list of mobilized associations in the form:
+
apeers
Display a list of peers in the form:
+               [tally]remote refid assid st t when pool reach delay offset jitter
+
+     where the output is just like the
+peers
+command except that the
+refid
+is displayed in hex format and the association number is also displayed. 
+
associations
Display a list of mobilized associations in the form:
                ind assid status conf reach auth condition last_event cnt
 
           
-Sy String Ta Sy Description
ind Ta index on this list
assid Ta association ID
status Ta peer status word
conf Ta yes: persistent, no: ephemeral
reach Ta yes: reachable, no: unreachable
auth Ta ok, yes, bad and none
condition Ta selection status (see the select field of the peer status word)
last_event Ta event report (see the event field of the peer status word)
cnt Ta event count (see the count field of the peer status word)

-     
authinfo
Display the authentication statistics. 
-
clockvar assocID [name[=value]] [...]
cv assocID [name[=value]] [...]
Display a list of clock variables for those associations supporting a reference clock. 
-
:config [...]
Send the remainder of the command line, including whitespace, to the server as a run-time configuration command in the same format as a line in the configuration file. This command is experimental until further notice and clarification. Authentication is of course required. 
-
config-from-file filename
Send the each line of
+
Sy Variable Ta Sy Description
ind Ta index on this list
assid Ta association id
status Ta peer status word
conf Ta yes: No persistent, no: No ephemeral
reach Ta yes: No reachable, no: No unreachable
auth Ta ok, yes, bad No and none
condition Ta selection status (see the select No field of the peer status word)
last_event Ta event report (see the event No field of the peer status word)
cnt Ta event count (see the count No field of the peer status word)

+     
authinfo
Display the authentication statistics counters:
+time since reset, stored keys, free keys, key lookups, keys not found,
+uncached keys, expired keys, encryptions, decryptions. 
+
clocklist [associd]
cl [associd]
Display all clock variables in the variable list for those associations
+supporting a reference clock. 
+
clockvar [associd] [name[=value]][,...]
cv [associd] [name[=value]][,...]
Display a list of clock variables for those associations supporting a
+reference clock. 
+
:config configuration command line
Send the remainder of the command line, including whitespace, to the
+server as a run-time configuration command in the same format as a line
+in the configuration file. 
+This command is experimental until further notice and clarification. 
+Authentication is of course required. 
+
config-from-file filename
Send each line of
 filename
-to the server as run-time configuration commands in the same format as a line in the configuration file. This command is experimental until further notice and clarification. Authentication is required. 
-
ifstats
Display statistics for each local network address. Authentication is required. 
-
iostats
Display network and reference clock I/O statistics. 
-
kerninfo
Display kernel loop and PPS statistics. As with other ntpq output, times are in milliseconds. The precision value displayed is in milliseconds as well, unlike the precision system variable. 
-
lassociations
Perform the same function as the associations command, except display mobilized and unmobilized associations. 
-
lopeers [-4 | -6]
Obtain and print a list of all peers and clients showing
-dstadr
-(associated with any given IP version). 
-
lpeers [-4 | -6]
Print a peer spreadsheet for the appropriate IP version(s). 
-dstadr
-(associated with any given IP version). 
-
monstats
Display monitor facility statistics. 
-
mrulist [limited | kod | mincount=count | laddr=localaddr | sort=sortorder | resany=hexmask | resall=hexmask]
Obtain and print traffic counts collected and maintained by the monitor facility. 
+to the server as run-time configuration commands in the same format as
+lines in the configuration file. 
+This command is experimental until further notice and clarification. 
+Authentication is required. 
+
ifstats
Display status and statistics counters for each local network interface address:
+interface number, interface name and address or broadcast, drop, flag,
+ttl, mc, received, sent, send failed, peers, uptime. 
+Authentication is required. 
+
iostats
Display network and reference clock I/O statistics:
+time since reset, receive buffers, free receive buffers, used receive buffers,
+low water refills, dropped packets, ignored packets, received packets,
+packets sent, packet send failures, input wakeups, useful input wakeups. 
+
kerninfo
Display kernel loop and PPS statistics:
+associd, status, pll offset, pll frequency, maximum error,
+estimated error, kernel status, pll time constant, precision,
+frequency tolerance, pps frequency, pps stability, pps jitter,
+calibration interval, calibration cycles, jitter exceeded,
+stability exceeded, calibration errors. 
+As with other ntpq output, times are in milliseconds; very small values
+may be shown as exponentials. 
+The precision value displayed is in milliseconds as well, unlike the
+precision system variable. 
+
lassociations
Perform the same function as the associations command, except display
+mobilized and unmobilized associations, including all clients. 
+
lopeers [-4|-6]
Display a list of all peers and clients showing
+dstadr
+(associated with the given IP version). 
+
lpassociations
Display the last obtained list of associations, including all clients. 
+
lpeers [-4|-6]
Display a list of all peers and clients (associated with the given IP version). 
+
monstats
Display monitor facility status, statistics, and limits:
+enabled, addresses, peak addresses, maximum addresses,
+reclaim above count, reclaim older than, kilobytes, maximum kilobytes. 
+
mreadlist associdlo associdhi
mrl associdlo associdhi
Perform the same function as the
+readlist
+command for a range of association ids. 
+
mreadvar associdlo associdhi [name][,...]
This range may be determined from the list displayed by any
+command showing associations. 
+
mrv associdlo associdhi [name][,...]
Perform the same function as the
+readvar
+command for a range of association ids. 
+This range may be determined from the list displayed by any
+command showing associations. 
+
mrulist [limited | kod | mincount=count | laddr=localaddr | sort=[-]sortorder | resany=hexmask | resall=hexmask]
Display traffic counts of the most recently seen source addresses
+collected and maintained by the monitor facility. 
 With the exception of
-sort=sortorder,
+sort=[-]sortorder,
 the options filter the list returned by
-ntpd.
+ntpd(8). 
 The
 limited
 and
 kod
-options return only entries representing client addresses from which the last packet received triggered either discarding or a KoD response. 
+options return only entries representing client addresses from which the
+last packet received triggered either discarding or a KoD response. 
 The
 mincount=count
 option filters entries representing less than
@@ -406,22 +467,26 @@ The
 sortorder
 defaults to
 lstint
-and may be any of
+and may be
 addr,
-count,
 avgint,
+count,
 lstint,
-or any of those preceded by a minus sign (hyphen) to reverse the sort order. 
+or any of those preceded by
+‘-’
+to reverse the sort order. 
 The output columns are:
           
 Column
Description
-
lstint
Interval in s between the receipt of the most recent packet from this address and the completion of the retrieval of the MRU list by
+
lstint
Interval in seconds between the receipt of the most recent packet from
+this address and the completion of the retrieval of the MRU list by
 ntpq
 
avgint
Average interval in s between packets from this address. 
 
rstr
Restriction flags associated with this address. 
 Most are copied unchanged from the matching
 restrict
-command, however 0x400 (kod) and 0x20 (limited) flags are cleared unless the last packet from this address triggered a rate control response. 
+command, however 0x400 (kod) and 0x20 (limited) flags are cleared unless
+the last packet from this address triggered a rate control response. 
 
r
Rate control indicator, either
 a period,
 L
@@ -433,20 +498,14 @@ rate limiting by discarding, or rate limiting with a KoD response, respectively.
 
v
Packet version number. 
 
count
Packets received from this address. 
 
rport
Source port of last packet from this address. 
-
remote address
DNS name, numeric address, or address followed by
+
remote address
host or DNS name, numeric address, or address followed by
 claimed DNS name which could not be verified in parentheses. 
 
-     
mreadvar assocID assocID [variable_name[=value] ...]
mrv assocID assocID [variable_name[=value] ...]
Perform the same function as the
-readvar
-command, except for a range of association IDs. 
-This range is determined from the association list cached by the most recent
-associations
-command. 
-
opeers [-4 | -6]
Obtain and print the old-style list of all peers and clients showing
-dstadr
-(associated with any given IP version),
+     
opeers [-4 | -6]
Obtain and print the old-style list of all peers and clients showing
+dstadr
+(associated with the given IP version),
 rather than the
-refid. 
+refid. 
 
passociations
Perform the same function as the
 associations
 command,
@@ -461,14 +520,16 @@ except that it uses previously stored data rather than making a new query.
 field of the
 .Lk decode.html#peer "peer status word"
 
remote
host name (or IP number) of peer. 
-The value displayed will be truncated to 15 characters  unless the
+The value displayed will be truncated to 15 characters unless the
+ntpq
 -w
-flag is given, in which case the full value will be displayed
-on the first line,
-and the remaining data is displayed on the next line. 
-
refid
association ID or
+option is given, in which case the full value will be displayed
+on the first line, and if too long,
+the remaining data will be displayed on the next line. 
+
refid
source IP address or
 .Lk decode.html#kiss "'kiss code"
-
st
stratum
+
st
stratum: 0 for local reference clocks, 1 for servers with local
+reference clocks, ..., 16 for unsynchronized server clocks
 
t
u:
 unicast or manycast client,
 b:
@@ -483,89 +544,108 @@ manycast server,
 broadcast server,
 M:
 multicast server
-
when
sec/min/hr since last received packet
-
poll
poll interval (log2 s)
+
when
time in seconds, minutes, hours, or days since the last packet
+was received, or
+‘-’
+if a packet has never been received
+
poll
poll interval (s)
 
reach
reach shift register (octal)
 
delay
roundtrip delay
 
offset
offset of server relative to this host
-
jitter
jitter
+
jitter
offset RMS error estimate. 
 
-     
apeers
Display a list of peers in the form:
-               [tally]remote refid assid st t when pool reach delay offset jitter
-
-     where the output is just like the
-peers
-command except that the
-refid
-is displayed in hex format and the association number is also displayed. 
-
pstats assocID
Show the statistics for the peer with the given
-assocID. 
-
readlist assocID
rl assocID
Read the system or peer variables included in the variable list. 
-
readvar assocID name[=value] [, ...]
rv assocID name[=value] [, ...]
Display the specified variables. 
+     
pstats associd
Display the statistics for the peer with the given
+associd:
+associd, status, remote host, local address, time last received,
+time until next send, reachability change, packets sent,
+packets received, bad authentication, bogus origin, duplicate,
+bad dispersion, bad reference time, candidate order. 
+
readlist [associd]
rl [associd]
Display all system or peer variables. 
+If the
+associd
+is omitted, it is assumed to be zero. 
+
readvar [associd name[=value] [, ...]]
rv [associd name[=value] [, ...]]
Display the specified system or peer variables. 
 If
-assocID
+associd
 is zero, the variables are from the
 System Variables
 name space, otherwise they are from the
 Peer Variables
 name space. 
 The
-assocID
+associd
 is required, as the same name can occur in both spaces. 
 If no
 name
-is included, all operative variables in the name space are displayed.
-
-     In this case only, if the
-assocID
-is omitted, it is assumed zero. 
+is included, all operative variables in the name space are displayed. 
+In this case only, if the
+associd
+is omitted, it is assumed to be zero. 
 Multiple names are specified with comma separators and without whitespace. 
 Note that time values are represented in milliseconds
 and frequency values in parts-per-million (PPM). 
 Some NTP timestamps are represented in the format
-YYYYMMDDTTTT ,
-where YYYY is the year,
-MM the month of year,
-DD the day of month and
-TTTT the time of day. 
-
reslist
Show the access control (restrict) list for
+YYYYMM DD TTTT,
+where
+YYYY
+is the year,
+MM
+the month of year,
+DD
+the day of month and
+TTTT
+the time of day. 
+
reslist
Display the access control (restrict) list for
 ntpq
-
-     
saveconfig filename
Write the current configuration,
-including any runtime modifications given with
+Authentication is required. 
+
saveconfig filename
Save the current configuration,
+including any runtime modifications made by
 :config
 or
 config-from-file,
-to the ntpd host's file
+to the NTP server host file
 filename. 
 This command will be rejected by the server unless
 .Lk miscopt.html#saveconfigdir "saveconfigdir"
 appears in the
-ntpd
+ntpd(8)
 configuration file. 
 filename
 can use
-strftime()
-format specifies to substitute the current date and time, for example,
-q]saveconfig ntp-%Y%m%d-%H%M%S.confq]. 
-The filename used is stored in system variable
+date(1)
+format specifiers to substitute the current date and time, for
+example,
+               saveconfig ntp-%Y%m%d-%H%M%S.conf.
+
+     The filename used is stored in system variable
 savedconfig. 
 Authentication is required. 
-
timerstats
Display interval timer counters. 
-
writelist assocID
Write the system or peer variables included in the variable list. 
-
writevar assocID name=value [, ...]
Write the specified variables. 
+
sysinfo
Display system operational summary:
+associd, status, system peer, system peer mode, leap indicator,
+stratum, log2 precision, root delay, root dispersion,
+reference id, reference time, system jitter, clock jitter,
+clock wander, broadcast delay, symm. auth. delay. 
+
sysstats
Display system uptime and packet counts maintained in the
+protocol module:
+uptime, sysstats reset, packets received, current version,
+older version, bad length or format, authentication failed,
+declined, restricted, rate limited, KoD responses,
+processed for time. 
+
timerstats
Display interval timer counters:
+time since reset, timer overruns, calls to transmit. 
+
writelist associd
Set all system or peer variables included in the variable list. 
+
writevar associd name=value [, ...]
Set the specified variables in the variable list. 
 If the
-assocID
+associd
 is zero, the variables are from the
 System Variables
 name space, otherwise they are from the
 Peer Variables
 name space. 
 The
-assocID
+associd
 is required, as the same name can occur in both spaces. 
-
sysinfo
Display operational summary. 
-
sysstats
Print statistics counters maintained in the protocol module. 
+Authentication is required. 
 
 
 Status Words and Kiss Codes
@@ -574,10 +654,10 @@ is required, as the same name can occur in both spaces.
 in a set of status words
 maintained by the system. 
 Status information is also available on a per-association basis. 
-These words are displayed in the
-rv
+These words are displayed by the
+readlist
 and
-as
+associations
 commands both in hexadecimal and in decoded short tip strings. 
 The codes, tips and short explanations are documented on the
 .Lk decode.html "Event Messages and Status Words"
@@ -596,9 +676,10 @@ in the reference identifier field in various billboards.
 System Variables
 
 The following system variables appear in the
-rv
+readlist
 billboard. 
 Not all variables are displayed in some configurations.
+
      

 Variable
Description
 
status
.Lk decode.html#sys "system status word"
@@ -610,16 +691,16 @@ Not all variables are displayed in some configurations.
 
precision
precision (log2 s)
 
rootdelay
total roundtrip delay to the primary reference clock
 
rootdisp
total dispersion to the primary reference clock
-
peer
system peer association ID
-
tc
time constant and poll exponent (log2 s) (3-17)
-
mintc
minimum time constant (log2 s) (3-10)
-
clock
date and time of day
-
refid
reference ID or
+
refid
reference id or
 .Lk decode.html#kiss "kiss code"
 
reftime
reference time
-
offset
combined  offset of server relative to this host
+
clock
date and time of day
+
peer
system peer association id
+
tc
time constant and poll exponent (log2 s) (3-17)
+
mintc
minimum time constant (log2 s) (3-10)
+
offset
combined offset of server relative to this host
+
frequency
frequency drift (PPM) relative to hardware clock
 
sys_jitter
combined system jitter
-
frequency
frequency offset (PPM) relative to hardware clock
 
clk_wander
clock frequency wander (PPM)
 
clk_jitter
clock jitter
 
tai
TAI-UTC offset (s)
@@ -634,7 +715,6 @@ the clock jitter statistic is computed by the clock discipline module.
 additional system variables are displayed,
 including some or all of the following,
 depending on the particular Autokey dance:
-
      
 Variable
Description
 
host
Autokey host name for this host
@@ -650,13 +730,13 @@ depending on the particular Autokey dance:
 Peer Variables
 
 The following peer variables appear in the
-rv
+readlist
 billboard for each association. 
 Not all variables are displayed in some configurations.
 
      

 Variable
Description
-
associd
association ID
+
associd
association id
 
status
.Lk decode.html#peer "peer status word"
 
srcadr
source (remote) IP address
 
srcport
source (remote) port
@@ -667,9 +747,10 @@ Not all variables are displayed in some configurations.
 
precision
precision (log2 s)
 
rootdelay
total roundtrip delay to the primary reference clock
 
rootdisp
total root dispersion to the primary reference clock
-
refid
reference ID or
+
refid
reference id or
 .Lk decode.html#kiss "kiss code"
 
reftime
reference time
+
rec
last packet received time
 
reach
reach register (octal)
 
unreach
unreach counter
 
hmode
host mode (1-6)
@@ -679,11 +760,11 @@ Not all variables are displayed in some configurations.
 
headway
headway (see
 .Lk rate.html "Rate Management and the Kiss-o'-Death Packet" )
 
flash
.Lk decode.html#flash "flash status word"
+
keyid
symmetric key id
 
offset
filter offset
 
delay
filter delay
 
dispersion
filter dispersion
 
jitter
filter jitter
-
ident
Autokey group name for this association
 
bias
unicast/broadcast bias
 
xleave
interleave delay (see
 .Lk xleave.html "NTP Interleaved Modes" )
@@ -692,7 +773,8 @@ Not all variables are displayed in some configurations.
 bias
 variable is calculated when the first broadcast packet is received
 after the calibration volley. 
-It represents the offset of the broadcast subgraph relative to the unicast subgraph. 
+It represents the offset of the broadcast subgraph relative to the
+unicast subgraph. 
 The
 xleave
 variable appears only for the interleaved symmetric and interleaved modes. 
@@ -707,20 +789,21 @@ additional peer variables are displayed, including the following:
 
host
Autokey server name
 
flags
peer flags (see Autokey specification)
 
signature
OpenSSL digest/signature scheme
-
initsequence
initial key ID
+
initsequence
initial key id
 
initkey
initial key index
 
timestamp
Autokey signature timestamp
+
ident
Autokey group name for this association
 
 
 Clock Variables
 
 The following clock variables appear in the
-cv
+clocklist
 billboard for each association with a reference clock. 
 Not all variables are displayed in some configurations.
      

 Variable
Description
-
associd
association ID
+
associd
association id
 
status
.Lk decode.html#clock "clock status word"
 
device
device description
 
timecode
ASCII time code string (specific to device)
@@ -731,7 +814,7 @@ Not all variables are displayed in some configurations.
 
fudgetime1
fudge time 1
 
fudgetime2
fudge time 2
 
stratum
driver stratum
-
refid
driver reference ID
+
refid
driver reference id
 
flags
driver flags
 
 
@@ -775,12 +858,12 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
-ntpq - standard NTP query program - Ver. 4.2.8p9
+ntpq - standard NTP query program - Ver. 4.2.8p10-x
 Usage:  ntpq [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
-   -4 no  ipv4           Force IPv4 DNS name resolution
+   -4 no  ipv4           Force IPv4 name resolution
                                 - prohibits the option 'ipv6'
-   -6 no  ipv6           Force IPv6 DNS name resolution
+   -6 no  ipv6           Force IPv6 name resolution
                                 - prohibits the option 'ipv4'
    -c Str command        run a command and exit
                                 - may appear multiple times
@@ -832,7 +915,7 @@ Up: ntpq Invocation
 ipv4 option (-4)
 
 
-This is the “force ipv4 dns name resolution” option.
+This is the “force ipv4 name resolution” option.
 
 
This option has some usage constraints.  It:
      

@@ -840,7 +923,7 @@ This is the “force ipv4 dns name resolution” option.
 ipv6. 
 
 
-  Force DNS resolution of following host names on the command line
+  
Force resolution of following host names on the command line
 to the IPv4 namespace. 
 

 
@@ -854,7 +937,7 @@ Up: ntpq Invocation
 ipv6 option (-6)
 
 
-This is the “force ipv6 dns name resolution” option.
+This is the “force ipv6 name resolution” option.
 
 
This option has some usage constraints.  It:
      

@@ -862,7 +945,7 @@ This is the “force ipv6 dns name resolution” option.
 ipv4. 
 
 
-  Force DNS resolution of following host names on the command line
+  
Force resolution of following host names on the command line
 to the IPv6 namespace. 
 

 
diff --git a/ntpq/ntpq.man.in b/ntpq/ntpq.man.in
index 10259de54..49ddc0bb7 100644
--- a/ntpq/ntpq.man.in
+++ b/ntpq/ntpq.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpq @NTPQ_MS@ "19 Mar 2017" "4.2.8p9" "User Commands"
+.TH ntpq @NTPQ_MS@ "19 May 2017" "4.2.8p10" "User Commands"
 .\"
 .\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed March 19, 2017 at 10:10:34 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed May 19, 2017 at 12:33:25 PM by AutoGen 5.18.5
 .\" From the definitions ntpq-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -148,7 +148,7 @@ information about the command.
 .br
 .ns
 .TP 15
-.NOP \f\*[B-Font]addvars\f[] \f\*[I-Font]name\f[][\&=\f\*[I-Font]value\f[][,...]
+.NOP \f\*[B-Font]addvars\f[] \f\*[I-Font]name\f[][\&=\f\*[I-Font]value\f[]][,...]
 .br
 .ns
 .TP 15
diff --git a/ntpq/ntpq.mdoc.in b/ntpq/ntpq.mdoc.in
index 9f0be92fa..2b04e2161 100644
--- a/ntpq/ntpq.mdoc.in
+++ b/ntpq/ntpq.mdoc.in
@@ -1,9 +1,9 @@
-.Dd March 19 2017
+.Dd May 19 2017
 .Dt NTPQ @NTPQ_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  March 19, 2017 at 10:10:31 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  May 19, 2017 at 12:33:22 PM by AutoGen 5.18.5
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -115,7 +115,7 @@ A
 .Ql \&?
 followed by a command name will print function and usage
 information about the command.
-.It Ic addvars Ar name Ns Oo \&= Ns Ar value Ns Op ,...
+.It Ic addvars Ar name Ns Oo \&= Ns Ar value Oc Ns Op ,...
 .It Ic rmvars Ar name Ns Op ,...
 .It Ic clearvars
 .It Ic showvars
diff --git a/ntpsnmpd/invoke-ntpsnmpd.texi b/ntpsnmpd/invoke-ntpsnmpd.texi
index 10d06c2ae..43819ec88 100644
--- a/ntpsnmpd/invoke-ntpsnmpd.texi
+++ b/ntpsnmpd/invoke-ntpsnmpd.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntpsnmpd.texi)
 #
-# It has been AutoGen-ed  March 21, 2017 at 10:45:40 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  May 19, 2017 at 12:27:12 PM by AutoGen 5.18.5
 # From the definitions    ntpsnmpd-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -47,31 +47,30 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p245
-USAGE:  ntpsnmpd [ - [] | --[@{=| @}] ]...
+ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.8p10-x
+Usage:  ntpsnmpd [ - [] | --[@{=| @}] ]...
   Flg Arg Option-Name    Description
    -n no  nofork         Do not fork
    -p no  syslog         Log to syslog()
       Str agentxsocket   The socket address ntpsnmpd uses to connect to net-snmpd
-      opt version        Output version information and exit
-   -? no  help           Display extended usage information and exit
-   -! no  more-help      Extended usage information passed thru pager
-   -> opt save-opts      Save the option state to a config file
-   -< Str load-opts      Load options from a config file
-                                - disabled as --no-load-opts
+      opt version        output version information and exit
+   -? no  help           display extended usage information and exit
+   -! no  more-help      extended usage information passed thru pager
+   -> opt save-opts      save the option state to a config file
+   -< Str load-opts      load options from a config file
+                                - disabled as '--no-load-opts'
                                 - may appear multiple times
 
 Options are specified by doubled hyphens and their name or by a single
 hyphen and the flag character.
 
 
-
 The following option preset mechanisms are supported:
  - reading file $HOME/.ntprc
  - reading file ./.ntprc
  - examining environment variables named NTPSNMPD_*
 
-please send bug reports to:  http://bugs.ntp.org, bugs@@ntp.org
+Please send bug reports to:  
 @end example
 @exampleindent 4
 
diff --git a/ntpsnmpd/ntpsnmpd-opts.c b/ntpsnmpd/ntpsnmpd-opts.c
index 215c6c8ad..a6363b957 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  March 21, 2017 at 10:45:37 AM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  May 19, 2017 at 12:33:26 PM by AutoGen 5.18.5
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h
index 1008250d7..42b82796d 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  March 21, 2017 at 10:45:36 AM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  May 19, 2017 at 12:33:26 PM by AutoGen 5.18.5
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
diff --git a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
index 7454f577b..ad3486082 100644
--- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
+++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpsnmpd 1ntpsnmpdman "21 Mar 2017" "4.2.8p10" "User Commands"
+.TH ntpsnmpd 1ntpsnmpdman "19 May 2017" "4.2.8p10-x" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-yhaGex/ag-6haacx)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed March 21, 2017 at 10:45:40 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed May 19, 2017 at 12:27:13 PM by AutoGen 5.18.5
 .\" From the definitions ntpsnmpd-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc b/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
index ca3b71060..28805cd4b 100644
--- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
+++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
@@ -1,9 +1,9 @@
-.Dd March 21 2017
+.Dd May 19 2017
 .Dt NTPSNMPD 1ntpsnmpdmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  March 21, 2017 at 10:45:40 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  May 19, 2017 at 12:27:10 PM by AutoGen 5.18.5
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpsnmpd/ntpsnmpd.html b/ntpsnmpd/ntpsnmpd.html
index 707d69df6..cfd504a89 100644
--- a/ntpsnmpd/ntpsnmpd.html
+++ b/ntpsnmpd/ntpsnmpd.html
@@ -44,7 +44,7 @@ Up: (dir)
 The ntpsnmpd utility program is used to monitor NTP daemon ntpd
 operations and determine performance.  It uses the standard NTP mode 6 control
 
-  
This document applies to version 4.2.8p9 of ntpsnmpd.
+  
This document applies to version 4.2.8p10 of ntpsnmpd.
 
 

 ntpsnmpd Description:             Description
diff --git a/ntpsnmpd/ntpsnmpd.man.in b/ntpsnmpd/ntpsnmpd.man.in
index cbd322821..40c621ac6 100644
--- a/ntpsnmpd/ntpsnmpd.man.in
+++ b/ntpsnmpd/ntpsnmpd.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpsnmpd @NTPSNMPD_MS@ "21 Mar 2017" "4.2.8p10" "User Commands"
+.TH ntpsnmpd @NTPSNMPD_MS@ "19 May 2017" "4.2.8p10-x" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-yhaGex/ag-6haacx)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed March 21, 2017 at 10:45:40 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed May 19, 2017 at 12:27:13 PM by AutoGen 5.18.5
 .\" From the definitions ntpsnmpd-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/ntpsnmpd/ntpsnmpd.mdoc.in b/ntpsnmpd/ntpsnmpd.mdoc.in
index fec785a5f..c91cebad1 100644
--- a/ntpsnmpd/ntpsnmpd.mdoc.in
+++ b/ntpsnmpd/ntpsnmpd.mdoc.in
@@ -1,9 +1,9 @@
-.Dd March 21 2017
+.Dd May 19 2017
 .Dt NTPSNMPD @NTPSNMPD_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  March 21, 2017 at 10:45:40 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  May 19, 2017 at 12:27:10 PM by AutoGen 5.18.5
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman b/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman
index d4cef9e8f..8fd0028d1 100644
--- a/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman
+++ b/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH calc_tickadj 1calc_tickadjman "21 Mar 2017" "ntp (4.2.8p10)" "User Commands"
+.TH calc_tickadj 1calc_tickadjman "19 May 2017" "ntp (4.2.8p10)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-bsaa0i/ag-osaiZi)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed March 21, 2017 at 10:39:52 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed May 19, 2017 at 12:31:37 PM by AutoGen 5.18.5
 .\" From the definitions calc_tickadj-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc b/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc
index 7ddf50764..0b1b08823 100644
--- a/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc
+++ b/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc
@@ -1,9 +1,9 @@
-.Dd March 21 2017
+.Dd May 19 2017
 .Dt CALC_TICKADJ 1calc_tickadjmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (calc_tickadj-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  March 21, 2017 at 10:39:54 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  May 19, 2017 at 12:31:38 PM by AutoGen 5.18.5
 .\"  From the definitions    calc_tickadj-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/scripts/calc_tickadj/calc_tickadj.html b/scripts/calc_tickadj/calc_tickadj.html
index 82286ea20..2474db630 100644
--- a/scripts/calc_tickadj/calc_tickadj.html
+++ b/scripts/calc_tickadj/calc_tickadj.html
@@ -3,7 +3,7 @@
 calc_tickadj User's Manual
 
 
-
+
 
 
 
@@ -14,18 +14,20 @@
   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.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
 -->
 
 
 calc_tickadj User's Manual
 
+
 

-Next: calc_tickadj Description,
+Next: calc_tickadj Description,
 Previous: (dir),
 Up: (dir)
-

+
 
 
 calc_tickadj User's Manual
@@ -46,10 +48,12 @@ This document applies to version 4.2.8p10 of calc_tickadj.
 
 
 
+
+
 

-Previous: calc_tickadj Description,
+Previous: calc_tickadj Description,
 Up: Top
-

+
 
 
 Invoking calc_tickadj
@@ -82,30 +86,32 @@ current tick manually on command line.
 using the agtexi-cmd template and the option descriptions for the calc_tickadj program.
 
 
-calc_tickadj usage:                   calc_tickadj help/usage (--help)
+
calc_tickadj usage:                   calc_tickadj help/usage (--help)
 
calc_tickadj drift-file:              drift-file option (-d)
 
calc_tickadj tick:                    tick option (-t)
 
calc_tickadj exit status:             exit status
 
 
 
+
+
 

-Next: calc_tickadj drift-file,
+Next: calc_tickadj drift-file,
 Up: calc_tickadj Invocation
-

+
 
 
-calc_tickadj help/usage (--help)
+calc_tickadj help/usage (--help)
 
 
 This is the automatically generated usage text for calc_tickadj.
 
   
The text printed is the same whether selected with the help option
-(--help) or the more-help option (--more-help).  more-help will print
+(--help) or the more-help option (--more-help).  more-help will print
 the usage text by passing it through a pager program. 
 more-help is disabled on platforms without a working
 fork(2) function.  The PAGER environment variable is
-used to select the program, defaulting to more.  Both will exit
+used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
 
calc_tickadj - Calculates "optimal" value for tick given ntp drift file. - Ver. 4.2.7p467
@@ -120,11 +126,13 @@ Options are specified by doubled hyphens and their name or by a single
 hyphen and the flag character.
 
   
+
+
 

-Next: calc_tickadj tick,
+Next: calc_tickadj tick,
 Previous: calc_tickadj usage,
 Up: calc_tickadj Invocation
-

+
 
 
 drift-file option (-d)
@@ -134,11 +142,13 @@ This is the “ntp drift file to use” option.
 This option takes a string argument. 
 Use the specified drift file for calculations
 
+
+
 

-Next: calc_tickadj exit status,
+Next: calc_tickadj exit status,
 Previous: calc_tickadj drift-file,
 Up: calc_tickadj Invocation
-

+
 
 
 tick option (-t)
@@ -148,18 +158,20 @@ This is the “tick value of this host” option.
 This option takes a number argument. 
 The current tick which to adjustment will be calculated
 
+
+
 

-Previous: calc_tickadj tick,
+Previous: calc_tickadj tick,
 Up: calc_tickadj Invocation
-

+
 
 
 calc_tickadj exit status
 
 One of the following exit values will be returned:
      

-0 (EXIT_SUCCESS)
Successful program execution. 
-
1 (EXIT_FAILURE)
The operation failed or the command syntax was not valid. 
+
‘0 (EXIT_SUCCESS)’
Successful program execution. 
+
‘1 (EXIT_FAILURE)’
The operation failed or the command syntax was not valid. 
 
 
 
diff --git a/scripts/calc_tickadj/calc_tickadj.man.in b/scripts/calc_tickadj/calc_tickadj.man.in
index d4cef9e8f..8fd0028d1 100644
--- a/scripts/calc_tickadj/calc_tickadj.man.in
+++ b/scripts/calc_tickadj/calc_tickadj.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH calc_tickadj 1calc_tickadjman "21 Mar 2017" "ntp (4.2.8p10)" "User Commands"
+.TH calc_tickadj 1calc_tickadjman "19 May 2017" "ntp (4.2.8p10)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-bsaa0i/ag-osaiZi)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed March 21, 2017 at 10:39:52 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed May 19, 2017 at 12:31:37 PM by AutoGen 5.18.5
 .\" From the definitions calc_tickadj-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/scripts/calc_tickadj/calc_tickadj.mdoc.in b/scripts/calc_tickadj/calc_tickadj.mdoc.in
index 7ddf50764..0b1b08823 100644
--- a/scripts/calc_tickadj/calc_tickadj.mdoc.in
+++ b/scripts/calc_tickadj/calc_tickadj.mdoc.in
@@ -1,9 +1,9 @@
-.Dd March 21 2017
+.Dd May 19 2017
 .Dt CALC_TICKADJ 1calc_tickadjmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (calc_tickadj-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  March 21, 2017 at 10:39:54 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  May 19, 2017 at 12:31:38 PM by AutoGen 5.18.5
 .\"  From the definitions    calc_tickadj-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/scripts/calc_tickadj/invoke-calc_tickadj.texi b/scripts/calc_tickadj/invoke-calc_tickadj.texi
index 74898f8f4..6fa2efdc1 100644
--- a/scripts/calc_tickadj/invoke-calc_tickadj.texi
+++ b/scripts/calc_tickadj/invoke-calc_tickadj.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-calc_tickadj.texi)
 #
-# It has been AutoGen-ed  March 21, 2017 at 10:39:57 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  May 19, 2017 at 12:31:40 PM by AutoGen 5.18.5
 # From the definitions    calc_tickadj-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
diff --git a/scripts/invoke-plot_summary.texi b/scripts/invoke-plot_summary.texi
index aea5cd45b..3bde8b808 100644
--- a/scripts/invoke-plot_summary.texi
+++ b/scripts/invoke-plot_summary.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-plot_summary.texi)
 #
-# It has been AutoGen-ed  March 21, 2017 at 10:40:40 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  May 19, 2017 at 12:31:59 PM by AutoGen 5.18.5
 # From the definitions    plot_summary-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
diff --git a/scripts/invoke-summary.texi b/scripts/invoke-summary.texi
index ab56bea72..3edd613ac 100644
--- a/scripts/invoke-summary.texi
+++ b/scripts/invoke-summary.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-summary.texi)
 #
-# It has been AutoGen-ed  March 21, 2017 at 10:40:46 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  May 19, 2017 at 12:32:02 PM by AutoGen 5.18.5
 # From the definitions    summary-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
diff --git a/scripts/ntp-wait/invoke-ntp-wait.texi b/scripts/ntp-wait/invoke-ntp-wait.texi
index f7e2751bc..d47108332 100644
--- a/scripts/ntp-wait/invoke-ntp-wait.texi
+++ b/scripts/ntp-wait/invoke-ntp-wait.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntp-wait.texi)
 #
-# It has been AutoGen-ed  March 21, 2017 at 10:40:05 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  May 19, 2017 at 12:31:43 PM by AutoGen 5.18.5
 # From the definitions    ntp-wait-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
diff --git a/scripts/ntp-wait/ntp-wait-opts b/scripts/ntp-wait/ntp-wait-opts
index fbb996b55..64e931a65 100644
--- a/scripts/ntp-wait/ntp-wait-opts
+++ b/scripts/ntp-wait/ntp-wait-opts
@@ -1,6 +1,6 @@
 # EDIT THIS FILE WITH CAUTION  (ntp-wait-opts)
 #
-# It has been AutoGen-ed  March 21, 2017 at 10:40:00 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  May 19, 2017 at 12:31:41 PM by AutoGen 5.18.5
 # From the definitions    ntp-wait-opts.def
 # and the template file   perlopt
 
diff --git a/scripts/ntp-wait/ntp-wait.1ntp-waitman b/scripts/ntp-wait/ntp-wait.1ntp-waitman
index afe765e56..64c64c07b 100644
--- a/scripts/ntp-wait/ntp-wait.1ntp-waitman
+++ b/scripts/ntp-wait/ntp-wait.1ntp-waitman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntp-wait 1ntp-waitman "21 Mar 2017" "ntp (4.2.8p10)" "User Commands"
+.TH ntp-wait 1ntp-waitman "19 May 2017" "ntp (4.2.8p10)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-xOaq.j/ag-KOay9j)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed March 21, 2017 at 10:40:02 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed May 19, 2017 at 12:31:44 PM by AutoGen 5.18.5
 .\" From the definitions ntp-wait-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc b/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc
index 4a4e70e2d..4e63f9f5f 100644
--- a/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc
+++ b/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc
@@ -1,9 +1,9 @@
-.Dd March 21 2017
+.Dd May 19 2017
 .Dt NTP_WAIT 1ntp-waitmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  March 21, 2017 at 10:40:07 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  May 19, 2017 at 12:31:42 PM by AutoGen 5.18.5
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/scripts/ntp-wait/ntp-wait.html b/scripts/ntp-wait/ntp-wait.html
index 76490c2d6..ce1a4ba37 100644
--- a/scripts/ntp-wait/ntp-wait.html
+++ b/scripts/ntp-wait/ntp-wait.html
@@ -41,7 +41,7 @@ until the system's time has stabilized and synchronized,
 and only then start any applicaitons (like database servers) that require
 accurate and stable time.
 
-  This document applies to version 4.2.8p9 of ntp-wait.
+  
This document applies to version 4.2.8p10 of ntp-wait.
 
 

 Short Contents
@@ -120,7 +120,7 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
-ntp-wait - Wait for ntpd to stabilize the system clock - Ver. 4.2.8p9
+ntp-wait - Wait for ntpd to stabilize the system clock - Ver. 4.2.8p10
 USAGE: ntp-wait [ -<flag> [<val>] | --<name>[{=| }<val>] ]...
 
     -n, --tries=num              Number of times to check ntpd
diff --git a/scripts/ntp-wait/ntp-wait.man.in b/scripts/ntp-wait/ntp-wait.man.in
index 29abed7a8..ccf073cd4 100644
--- a/scripts/ntp-wait/ntp-wait.man.in
+++ b/scripts/ntp-wait/ntp-wait.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntp-wait @NTP_WAIT_MS@ "21 Mar 2017" "ntp (4.2.8p10)" "User Commands"
+.TH ntp-wait @NTP_WAIT_MS@ "19 May 2017" "ntp (4.2.8p10)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-xOaq.j/ag-KOay9j)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed March 21, 2017 at 10:40:02 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed May 19, 2017 at 12:31:44 PM by AutoGen 5.18.5
 .\" From the definitions ntp-wait-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/scripts/ntp-wait/ntp-wait.mdoc.in b/scripts/ntp-wait/ntp-wait.mdoc.in
index db53d4449..507c4c3ea 100644
--- a/scripts/ntp-wait/ntp-wait.mdoc.in
+++ b/scripts/ntp-wait/ntp-wait.mdoc.in
@@ -1,9 +1,9 @@
-.Dd March 21 2017
+.Dd May 19 2017
 .Dt NTP_WAIT @NTP_WAIT_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  March 21, 2017 at 10:40:07 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  May 19, 2017 at 12:31:42 PM by AutoGen 5.18.5
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/scripts/ntpsweep/invoke-ntpsweep.texi b/scripts/ntpsweep/invoke-ntpsweep.texi
index d926bf6cb..d8cac824e 100644
--- a/scripts/ntpsweep/invoke-ntpsweep.texi
+++ b/scripts/ntpsweep/invoke-ntpsweep.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntpsweep.texi)
 #
-# It has been AutoGen-ed  March 21, 2017 at 10:40:11 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  May 19, 2017 at 12:31:47 PM by AutoGen 5.18.5
 # From the definitions    ntpsweep-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
diff --git a/scripts/ntpsweep/ntpsweep-opts b/scripts/ntpsweep/ntpsweep-opts
index 46a566be9..ddaf2aef5 100644
--- a/scripts/ntpsweep/ntpsweep-opts
+++ b/scripts/ntpsweep/ntpsweep-opts
@@ -1,6 +1,6 @@
 # EDIT THIS FILE WITH CAUTION  (ntpsweep-opts)
 #
-# It has been AutoGen-ed  March 21, 2017 at 10:40:09 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  May 19, 2017 at 12:31:45 PM by AutoGen 5.18.5
 # From the definitions    ntpsweep-opts.def
 # and the template file   perlopt
 
diff --git a/scripts/ntpsweep/ntpsweep.1ntpsweepman b/scripts/ntpsweep/ntpsweep.1ntpsweepman
index 7aa27dda2..e642a08b6 100644
--- a/scripts/ntpsweep/ntpsweep.1ntpsweepman
+++ b/scripts/ntpsweep/ntpsweep.1ntpsweepman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpsweep 1ntpsweepman "21 Mar 2017" "ntp (4.2.8p10)" "User Commands"
+.TH ntpsweep 1ntpsweepman "19 May 2017" "ntp (4.2.8p10)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-cxaykl/ag-pxaGjl)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed March 21, 2017 at 10:40:13 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed May 19, 2017 at 12:31:48 PM by AutoGen 5.18.5
 .\" From the definitions ntpsweep-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc b/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc
index e0b10088a..2169785f2 100644
--- a/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc
+++ b/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc
@@ -1,9 +1,9 @@
-.Dd March 21 2017
+.Dd May 19 2017
 .Dt NTPSWEEP 1ntpsweepmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsweep-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  March 21, 2017 at 10:40:16 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  May 19, 2017 at 12:31:46 PM by AutoGen 5.18.5
 .\"  From the definitions    ntpsweep-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/scripts/ntpsweep/ntpsweep.html b/scripts/ntpsweep/ntpsweep.html
index b4321dd5a..a2d13293f 100644
--- a/scripts/ntpsweep/ntpsweep.html
+++ b/scripts/ntpsweep/ntpsweep.html
@@ -32,7 +32,7 @@ Up: (dir)
 
   This document describes the use of the NTP Project's ntpsweep program.
 
-  
This document applies to version 4.2.8p9 of ntpsweep.
+  
This document applies to version 4.2.8p10 of ntpsweep.
 
   

 Short Contents
@@ -94,7 +94,7 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
-ntpsweep - Print various informations about given ntp servers - Ver. 4.2.8p9
+ntpsweep - Print various informations about given ntp servers - Ver. 4.2.8p10
 USAGE: ntpsweep [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [hostfile]
 
     -l, --host-list=str          Host to execute actions on
diff --git a/scripts/ntpsweep/ntpsweep.man.in b/scripts/ntpsweep/ntpsweep.man.in
index 7aa27dda2..e642a08b6 100644
--- a/scripts/ntpsweep/ntpsweep.man.in
+++ b/scripts/ntpsweep/ntpsweep.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpsweep 1ntpsweepman "21 Mar 2017" "ntp (4.2.8p10)" "User Commands"
+.TH ntpsweep 1ntpsweepman "19 May 2017" "ntp (4.2.8p10)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-cxaykl/ag-pxaGjl)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed March 21, 2017 at 10:40:13 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed May 19, 2017 at 12:31:48 PM by AutoGen 5.18.5
 .\" From the definitions ntpsweep-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/scripts/ntpsweep/ntpsweep.mdoc.in b/scripts/ntpsweep/ntpsweep.mdoc.in
index e0b10088a..2169785f2 100644
--- a/scripts/ntpsweep/ntpsweep.mdoc.in
+++ b/scripts/ntpsweep/ntpsweep.mdoc.in
@@ -1,9 +1,9 @@
-.Dd March 21 2017
+.Dd May 19 2017
 .Dt NTPSWEEP 1ntpsweepmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsweep-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  March 21, 2017 at 10:40:16 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  May 19, 2017 at 12:31:46 PM by AutoGen 5.18.5
 .\"  From the definitions    ntpsweep-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/scripts/ntptrace/invoke-ntptrace.texi b/scripts/ntptrace/invoke-ntptrace.texi
index 01f84be69..f9dca8d85 100644
--- a/scripts/ntptrace/invoke-ntptrace.texi
+++ b/scripts/ntptrace/invoke-ntptrace.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntptrace.texi)
 #
-# It has been AutoGen-ed  March 21, 2017 at 10:40:23 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  May 19, 2017 at 12:31:51 PM by AutoGen 5.18.5
 # From the definitions    ntptrace-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
diff --git a/scripts/ntptrace/ntptrace-opts b/scripts/ntptrace/ntptrace-opts
index dd37d7b80..ad1e06fb1 100644
--- a/scripts/ntptrace/ntptrace-opts
+++ b/scripts/ntptrace/ntptrace-opts
@@ -1,6 +1,6 @@
 # EDIT THIS FILE WITH CAUTION  (ntptrace-opts)
 #
-# It has been AutoGen-ed  March 21, 2017 at 10:40:18 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  May 19, 2017 at 12:31:50 PM by AutoGen 5.18.5
 # From the definitions    ntptrace-opts.def
 # and the template file   perlopt
 
diff --git a/scripts/ntptrace/ntptrace.1ntptraceman b/scripts/ntptrace/ntptrace.1ntptraceman
index 0cab9602a..fd93ce59d 100644
--- a/scripts/ntptrace/ntptrace.1ntptraceman
+++ b/scripts/ntptrace/ntptrace.1ntptraceman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntptrace 1ntptraceman "21 Mar 2017" "ntp (4.2.8p10)" "User Commands"
+.TH ntptrace 1ntptraceman "19 May 2017" "ntp (4.2.8p10)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-y.a4mm/ag-W.aamm)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed March 21, 2017 at 10:40:19 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed May 19, 2017 at 12:31:52 PM by AutoGen 5.18.5
 .\" From the definitions ntptrace-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/scripts/ntptrace/ntptrace.1ntptracemdoc b/scripts/ntptrace/ntptrace.1ntptracemdoc
index 9f1776620..123792da9 100644
--- a/scripts/ntptrace/ntptrace.1ntptracemdoc
+++ b/scripts/ntptrace/ntptrace.1ntptracemdoc
@@ -1,9 +1,9 @@
-.Dd March 21 2017
+.Dd May 19 2017
 .Dt NTPTRACE 1ntptracemdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntptrace-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  March 21, 2017 at 10:40:25 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  May 19, 2017 at 12:31:50 PM by AutoGen 5.18.5
 .\"  From the definitions    ntptrace-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/scripts/ntptrace/ntptrace.html b/scripts/ntptrace/ntptrace.html
index da4f013ae..2e88fb477 100644
--- a/scripts/ntptrace/ntptrace.html
+++ b/scripts/ntptrace/ntptrace.html
@@ -33,7 +33,7 @@ Up: (dir)
 Simple Network Time Protocol User Manual
 
 This document describes the use of the NTP Project's ntptrace program. 
-This document applies to version 4.2.8p9 of ntptrace.
+This document applies to version 4.2.8p10 of ntptrace.
 
   

 Short Contents
@@ -111,7 +111,7 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
-ntptrace - Trace peers of an NTP server - Ver. 4.2.8p9
+ntptrace - Trace peers of an NTP server - Ver. 4.2.8p10
 USAGE: ntptrace [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [host]
 
     -n, --numeric                Print IP addresses instead of hostnames
diff --git a/scripts/ntptrace/ntptrace.man.in b/scripts/ntptrace/ntptrace.man.in
index 50519ead2..8f1a0278d 100644
--- a/scripts/ntptrace/ntptrace.man.in
+++ b/scripts/ntptrace/ntptrace.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntptrace @NTPTRACE_MS@ "21 Mar 2017" "ntp (4.2.8p10)" "User Commands"
+.TH ntptrace @NTPTRACE_MS@ "19 May 2017" "ntp (4.2.8p10)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-y.a4mm/ag-W.aamm)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed March 21, 2017 at 10:40:19 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed May 19, 2017 at 12:31:52 PM by AutoGen 5.18.5
 .\" From the definitions ntptrace-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/scripts/ntptrace/ntptrace.mdoc.in b/scripts/ntptrace/ntptrace.mdoc.in
index 7736e8bdf..5c33e4927 100644
--- a/scripts/ntptrace/ntptrace.mdoc.in
+++ b/scripts/ntptrace/ntptrace.mdoc.in
@@ -1,9 +1,9 @@
-.Dd March 21 2017
+.Dd May 19 2017
 .Dt NTPTRACE @NTPTRACE_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntptrace-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  March 21, 2017 at 10:40:25 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  May 19, 2017 at 12:31:50 PM by AutoGen 5.18.5
 .\"  From the definitions    ntptrace-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/scripts/plot_summary-opts b/scripts/plot_summary-opts
index 26cafd4ed..b7dfd8bb5 100644
--- a/scripts/plot_summary-opts
+++ b/scripts/plot_summary-opts
@@ -1,6 +1,6 @@
 # EDIT THIS FILE WITH CAUTION  (plot_summary-opts)
 #
-# It has been AutoGen-ed  March 21, 2017 at 10:40:37 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  May 19, 2017 at 12:31:58 PM by AutoGen 5.18.5
 # From the definitions    plot_summary-opts.def
 # and the template file   perlopt
 
diff --git a/scripts/plot_summary.1plot_summaryman b/scripts/plot_summary.1plot_summaryman
index b13c3cf03..f3475569f 100644
--- a/scripts/plot_summary.1plot_summaryman
+++ b/scripts/plot_summary.1plot_summaryman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH plot_summary 1plot_summaryman "21 Mar 2017" "ntp (4.2.8p10)" "User Commands"
+.TH plot_summary 1plot_summaryman "19 May 2017" "ntp (4.2.8p10)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-BEaaJo/ag-OEaiIo)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed March 21, 2017 at 10:40:42 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed May 19, 2017 at 12:32:00 PM by AutoGen 5.18.5
 .\" From the definitions plot_summary-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/scripts/plot_summary.1plot_summarymdoc b/scripts/plot_summary.1plot_summarymdoc
index d7647a706..883d2a329 100644
--- a/scripts/plot_summary.1plot_summarymdoc
+++ b/scripts/plot_summary.1plot_summarymdoc
@@ -1,9 +1,9 @@
-.Dd March 21 2017
+.Dd May 19 2017
 .Dt PLOT_SUMMARY 1plot_summarymdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (plot_summary-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  March 21, 2017 at 10:40:44 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  May 19, 2017 at 12:32:01 PM by AutoGen 5.18.5
 .\"  From the definitions    plot_summary-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/scripts/plot_summary.html b/scripts/plot_summary.html
index 4a3c42340..2696c4078 100644
--- a/scripts/plot_summary.html
+++ b/scripts/plot_summary.html
@@ -33,7 +33,7 @@ Up: (dir)
 Plot_summary User Manual
 
 This document describes the use of the NTP Project's plot_summary program. 
-This document applies to version 4.2.8p9 of plot_summary.
+This document applies to version 4.2.8p10 of plot_summary.
 
   

 Short Contents
@@ -95,7 +95,7 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
-plot_summary - plot statistics generated by summary script - Ver. 4.2.8p9
+plot_summary - plot statistics generated by summary script - Ver. 4.2.8p10
 USAGE: plot_summary [ -<flag> [<val>] | --<name>[{=| }<val>] ]...
 
         --directory=str          Where the summary files are
diff --git a/scripts/plot_summary.man.in b/scripts/plot_summary.man.in
index b13c3cf03..f3475569f 100644
--- a/scripts/plot_summary.man.in
+++ b/scripts/plot_summary.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH plot_summary 1plot_summaryman "21 Mar 2017" "ntp (4.2.8p10)" "User Commands"
+.TH plot_summary 1plot_summaryman "19 May 2017" "ntp (4.2.8p10)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-BEaaJo/ag-OEaiIo)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed March 21, 2017 at 10:40:42 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed May 19, 2017 at 12:32:00 PM by AutoGen 5.18.5
 .\" From the definitions plot_summary-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/scripts/plot_summary.mdoc.in b/scripts/plot_summary.mdoc.in
index d7647a706..883d2a329 100644
--- a/scripts/plot_summary.mdoc.in
+++ b/scripts/plot_summary.mdoc.in
@@ -1,9 +1,9 @@
-.Dd March 21 2017
+.Dd May 19 2017
 .Dt PLOT_SUMMARY 1plot_summarymdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (plot_summary-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  March 21, 2017 at 10:40:44 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  May 19, 2017 at 12:32:01 PM by AutoGen 5.18.5
 .\"  From the definitions    plot_summary-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/scripts/summary-opts b/scripts/summary-opts
index 336d2e131..31e6108bc 100644
--- a/scripts/summary-opts
+++ b/scripts/summary-opts
@@ -1,6 +1,6 @@
 # EDIT THIS FILE WITH CAUTION  (summary-opts)
 #
-# It has been AutoGen-ed  March 21, 2017 at 10:40:38 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  May 19, 2017 at 12:31:58 PM by AutoGen 5.18.5
 # From the definitions    summary-opts.def
 # and the template file   perlopt
 
diff --git a/scripts/summary.1summaryman b/scripts/summary.1summaryman
index c1cdeb5a9..4af50b6d0 100644
--- a/scripts/summary.1summaryman
+++ b/scripts/summary.1summaryman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH summary 1summaryman "21 Mar 2017" "ntp (4.2.8p10)" "User Commands"
+.TH summary 1summaryman "19 May 2017" "ntp (4.2.8p10)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-41aOWo/ag-h2aWVo)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed March 21, 2017 at 10:40:48 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed May 19, 2017 at 12:32:03 PM by AutoGen 5.18.5
 .\" From the definitions summary-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/scripts/summary.1summarymdoc b/scripts/summary.1summarymdoc
index b9a95d9ea..8356a9fa5 100644
--- a/scripts/summary.1summarymdoc
+++ b/scripts/summary.1summarymdoc
@@ -1,9 +1,9 @@
-.Dd March 21 2017
+.Dd May 19 2017
 .Dt SUMMARY 1summarymdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (summary-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  March 21, 2017 at 10:40:49 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  May 19, 2017 at 12:32:04 PM by AutoGen 5.18.5
 .\"  From the definitions    summary-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/scripts/summary.html b/scripts/summary.html
index 7965dc7ca..13e1b0d32 100644
--- a/scripts/summary.html
+++ b/scripts/summary.html
@@ -33,7 +33,7 @@ Up: (dir)
 Summary User Manual
 
 This document describes the use of the NTP Project's summary program. 
-This document applies to version 4.2.8p9 of summary.
+This document applies to version 4.2.8p10 of summary.
 
   

 Short Contents
@@ -92,7 +92,7 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
-summary - compute various stastics from NTP stat files - Ver. 4.2.8p9
+summary - compute various stastics from NTP stat files - Ver. 4.2.8p10
 USAGE: summary [ -<flag> [<val>] | --<name>[{=| }<val>] ]...
 
         --directory=str          Directory containing stat files
diff --git a/scripts/summary.man.in b/scripts/summary.man.in
index c1cdeb5a9..4af50b6d0 100644
--- a/scripts/summary.man.in
+++ b/scripts/summary.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH summary 1summaryman "21 Mar 2017" "ntp (4.2.8p10)" "User Commands"
+.TH summary 1summaryman "19 May 2017" "ntp (4.2.8p10)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-41aOWo/ag-h2aWVo)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed March 21, 2017 at 10:40:48 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed May 19, 2017 at 12:32:03 PM by AutoGen 5.18.5
 .\" From the definitions summary-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/scripts/summary.mdoc.in b/scripts/summary.mdoc.in
index b9a95d9ea..8356a9fa5 100644
--- a/scripts/summary.mdoc.in
+++ b/scripts/summary.mdoc.in
@@ -1,9 +1,9 @@
-.Dd March 21 2017
+.Dd May 19 2017
 .Dt SUMMARY 1summarymdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (summary-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  March 21, 2017 at 10:40:49 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  May 19, 2017 at 12:32:04 PM by AutoGen 5.18.5
 .\"  From the definitions    summary-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/scripts/update-leap/invoke-update-leap.texi b/scripts/update-leap/invoke-update-leap.texi
index 6e76564f7..c173cb792 100644
--- a/scripts/update-leap/invoke-update-leap.texi
+++ b/scripts/update-leap/invoke-update-leap.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-update-leap.texi)
 #
-# It has been AutoGen-ed  March 21, 2017 at 10:40:30 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  May 19, 2017 at 12:31:55 PM by AutoGen 5.18.5
 # From the definitions    update-leap-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
diff --git a/scripts/update-leap/update-leap-opts b/scripts/update-leap/update-leap-opts
index 6e7d957a6..84ffe7557 100644
--- a/scripts/update-leap/update-leap-opts
+++ b/scripts/update-leap/update-leap-opts
@@ -1,6 +1,6 @@
 # EDIT THIS FILE WITH CAUTION  (update-leap-opts)
 #
-# It has been AutoGen-ed  March 21, 2017 at 10:40:36 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  May 19, 2017 at 12:31:58 PM by AutoGen 5.18.5
 # From the definitions    update-leap-opts.def
 # and the template file   perlopt
 
diff --git a/scripts/update-leap/update-leap.1update-leapman b/scripts/update-leap/update-leap.1update-leapman
index bd628712a..fae10dd39 100644
--- a/scripts/update-leap/update-leap.1update-leapman
+++ b/scripts/update-leap/update-leap.1update-leapman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH update-leap 1update-leapman "21 Mar 2017" "ntp (4.2.8p10)" "User Commands"
+.TH update-leap 1update-leapman "19 May 2017" "ntp (4.2.8p10)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-6XaW6m/ag-hYa45m)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed March 21, 2017 at 10:40:27 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed May 19, 2017 at 12:31:57 PM by AutoGen 5.18.5
 .\" From the definitions update-leap-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/scripts/update-leap/update-leap.1update-leapmdoc b/scripts/update-leap/update-leap.1update-leapmdoc
index 2bb1d59e2..1ee6e67af 100644
--- a/scripts/update-leap/update-leap.1update-leapmdoc
+++ b/scripts/update-leap/update-leap.1update-leapmdoc
@@ -1,9 +1,9 @@
-.Dd March 21 2017
+.Dd May 19 2017
 .Dt UPDATE_LEAP 1update-leapmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (update-leap-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  March 21, 2017 at 10:40:35 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  May 19, 2017 at 12:31:54 PM by AutoGen 5.18.5
 .\"  From the definitions    update-leap-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/scripts/update-leap/update-leap.html b/scripts/update-leap/update-leap.html
index 178acc6c9..90600346e 100644
--- a/scripts/update-leap/update-leap.html
+++ b/scripts/update-leap/update-leap.html
@@ -32,7 +32,7 @@ Up: (dir)
 
   This document describes the use of the NTP Project's update-leap program.
 
-  
This document applies to version 4.2.8p9 of update-leap.
+  
This document applies to version 4.2.8p10 of update-leap.
 
 

 Short Contents
diff --git a/scripts/update-leap/update-leap.man.in b/scripts/update-leap/update-leap.man.in
index bd628712a..fae10dd39 100644
--- a/scripts/update-leap/update-leap.man.in
+++ b/scripts/update-leap/update-leap.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH update-leap 1update-leapman "21 Mar 2017" "ntp (4.2.8p10)" "User Commands"
+.TH update-leap 1update-leapman "19 May 2017" "ntp (4.2.8p10)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-6XaW6m/ag-hYa45m)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed March 21, 2017 at 10:40:27 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed May 19, 2017 at 12:31:57 PM by AutoGen 5.18.5
 .\" From the definitions update-leap-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/scripts/update-leap/update-leap.mdoc.in b/scripts/update-leap/update-leap.mdoc.in
index 2bb1d59e2..1ee6e67af 100644
--- a/scripts/update-leap/update-leap.mdoc.in
+++ b/scripts/update-leap/update-leap.mdoc.in
@@ -1,9 +1,9 @@
-.Dd March 21 2017
+.Dd May 19 2017
 .Dt UPDATE_LEAP 1update-leapmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (update-leap-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  March 21, 2017 at 10:40:35 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  May 19, 2017 at 12:31:54 PM by AutoGen 5.18.5
 .\"  From the definitions    update-leap-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/sntp/invoke-sntp.texi b/sntp/invoke-sntp.texi
index ec2ff9a19..0def3fe31 100644
--- a/sntp/invoke-sntp.texi
+++ b/sntp/invoke-sntp.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-sntp.texi)
 #
-# It has been AutoGen-ed  March 21, 2017 at 10:36:49 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  May 19, 2017 at 12:30:29 PM by AutoGen 5.18.5
 # From the definitions    sntp-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c
index 09c260042..ad2449319 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  March 21, 2017 at 10:36:29 AM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  May 19, 2017 at 12:30:19 PM by AutoGen 5.18.5
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h
index 4117ee730..ba9617948 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  March 21, 2017 at 10:36:28 AM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  May 19, 2017 at 12:30:19 PM by AutoGen 5.18.5
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
diff --git a/sntp/sntp.1sntpman b/sntp/sntp.1sntpman
index 029f1883e..4de3513ba 100644
--- a/sntp/sntp.1sntpman
+++ b/sntp/sntp.1sntpman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH sntp 1sntpman "21 Mar 2017" "4.2.8p10" "User Commands"
+.TH sntp 1sntpman "19 May 2017" "4.2.8p10" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-aQaqbX/ag-nQaiaX)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed March 21, 2017 at 10:36:45 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed May 19, 2017 at 12:30:30 PM by AutoGen 5.18.5
 .\" From the definitions sntp-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/sntp/sntp.1sntpmdoc b/sntp/sntp.1sntpmdoc
index 02ad1993d..1eb5fe8a8 100644
--- a/sntp/sntp.1sntpmdoc
+++ b/sntp/sntp.1sntpmdoc
@@ -1,9 +1,9 @@
-.Dd March 21 2017
+.Dd May 19 2017
 .Dt SNTP 1sntpmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  March 21, 2017 at 10:36:52 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  May 19, 2017 at 12:30:27 PM by AutoGen 5.18.5
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/sntp/sntp.html b/sntp/sntp.html
index e47ed539a..dd7139101 100644
--- a/sntp/sntp.html
+++ b/sntp/sntp.html
@@ -38,7 +38,7 @@ display the time offset of the system clock relative to the server
 clock.  Run as root, it can correct the system clock to this offset as
 well.  It can be run as an interactive command or from a cron job.
 
-  This document applies to version 4.2.8p9 of sntp.
+  
This document applies to version 4.2.8p10 of sntp.
 
   
The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
@@ -181,7 +181,7 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
-
sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p9
+sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p10
 Usage:  sntp [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description
diff --git a/sntp/sntp.man.in b/sntp/sntp.man.in
index 518f69019..38df06db8 100644
--- a/sntp/sntp.man.in
+++ b/sntp/sntp.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH sntp @SNTP_MS@ "21 Mar 2017" "4.2.8p10" "User Commands"
+.TH sntp @SNTP_MS@ "19 May 2017" "4.2.8p10" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-aQaqbX/ag-nQaiaX)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed March 21, 2017 at 10:36:45 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed May 19, 2017 at 12:30:30 PM by AutoGen 5.18.5
 .\" From the definitions sntp-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/sntp/sntp.mdoc.in b/sntp/sntp.mdoc.in
index 81a3ff5e6..61a32eb5b 100644
--- a/sntp/sntp.mdoc.in
+++ b/sntp/sntp.mdoc.in
@@ -1,9 +1,9 @@
-.Dd March 21 2017
+.Dd May 19 2017
 .Dt SNTP @SNTP_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  March 21, 2017 at 10:36:52 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  May 19, 2017 at 12:30:27 PM by AutoGen 5.18.5
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/util/invoke-ntp-keygen.texi b/util/invoke-ntp-keygen.texi
index 3fccb05f8..705c0dee2 100644
--- a/util/invoke-ntp-keygen.texi
+++ b/util/invoke-ntp-keygen.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntp-keygen.texi)
 #
-# It has been AutoGen-ed  March 19, 2017 at 10:10:41 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  May 19, 2017 at 12:27:20 PM by AutoGen 5.18.5
 # From the definitions    ntp-keygen-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -1056,7 +1056,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p9
+ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p10-x
 Usage:  ntp-keygen [ - [] | --[@{=| @}] ]...
   Flg Arg Option-Name    Description
    -b Num imbits         identity modulus bits
diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c
index f292848f4..8dd53c773 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  March 19, 2017 at 10:10:36 AM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  May 19, 2017 at 12:27:15 PM by AutoGen 5.18.5
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -51,7 +51,7 @@ extern "C" {
 #endif
 extern FILE * option_usage_fp;
 #define zCopyright      (ntp_keygen_opt_strs+0)
-#define zLicenseDescrip (ntp_keygen_opt_strs+352)
+#define zLicenseDescrip (ntp_keygen_opt_strs+355)
 
 /*
  *  global included definitions
@@ -71,15 +71,15 @@ extern FILE * option_usage_fp;
 /**
  *  static const strings for ntp-keygen options
  */
-static char const ntp_keygen_opt_strs[2439] =
-/*     0 */ "ntp-keygen (ntp) 4.2.8p9\n"
+static char const ntp_keygen_opt_strs[2448] =
+/*     0 */ "ntp-keygen (ntp) 4.2.8p10-x\n"
             "Copyright (C) 1992-2017 The University of Delaware and Network Time Foundation, all rights reserved.\n"
             "This is free software. It is licensed for use, modification and\n"
             "redistribution under the terms of the NTP License, copies of which\n"
             "can be seen at:\n"
             "  \n"
             "  \n\0"
-/*   352 */ "Permission to use, copy, modify, and distribute this software and its\n"
+/*   355 */ "Permission to use, copy, modify, and distribute this software and its\n"
             "documentation for any purpose with or without fee is hereby granted,\n"
             "provided that the above copyright notice appears in all copies and that\n"
             "both the copyright notice and this permission notice appear in supporting\n"
@@ -89,101 +89,101 @@ static char const ntp_keygen_opt_strs[2439] =
             "Time Foundation makes no representations about the suitability this\n"
             "software for any purpose.  It is provided \"as is\" without express or\n"
             "implied warranty.\n\0"
-/*  1020 */ "identity modulus bits\0"
-/*  1042 */ "IMBITS\0"
-/*  1049 */ "imbits\0"
-/*  1056 */ "certificate scheme\0"
-/*  1075 */ "CERTIFICATE\0"
-/*  1087 */ "certificate\0"
-/*  1099 */ "privatekey cipher\0"
-/*  1117 */ "CIPHER\0"
-/*  1124 */ "cipher\0"
-/*  1131 */ "Increase debug verbosity level\0"
-/*  1162 */ "DEBUG_LEVEL\0"
-/*  1174 */ "debug-level\0"
-/*  1186 */ "Set the debug verbosity level\0"
-/*  1216 */ "SET_DEBUG_LEVEL\0"
-/*  1232 */ "set-debug-level\0"
-/*  1248 */ "Write IFF or GQ identity keys\0"
-/*  1278 */ "ID_KEY\0"
-/*  1285 */ "id-key\0"
-/*  1292 */ "Generate GQ parameters and keys\0"
-/*  1324 */ "GQ_PARAMS\0"
-/*  1334 */ "gq-params\0"
-/*  1344 */ "generate RSA host key\0"
-/*  1366 */ "HOST_KEY\0"
-/*  1375 */ "host-key\0"
-/*  1384 */ "generate IFF parameters\0"
-/*  1408 */ "IFFKEY\0"
-/*  1415 */ "iffkey\0"
-/*  1422 */ "set Autokey group name\0"
-/*  1445 */ "IDENT\0"
-/*  1451 */ "ident\0"
-/*  1457 */ "set certificate lifetime\0"
-/*  1482 */ "LIFETIME\0"
-/*  1491 */ "lifetime\0"
-/*  1500 */ "prime modulus\0"
-/*  1514 */ "MODULUS\0"
-/*  1522 */ "modulus\0"
-/*  1530 */ "generate symmetric keys\0"
-/*  1554 */ "MD5KEY\0"
-/*  1561 */ "md5key\0"
-/*  1568 */ "generate PC private certificate\0"
-/*  1600 */ "PVT_CERT\0"
-/*  1609 */ "pvt-cert\0"
-/*  1618 */ "local private password\0"
-/*  1641 */ "PASSWORD\0"
-/*  1650 */ "password\0"
-/*  1659 */ "export IFF or GQ group keys with password\0"
-/*  1701 */ "EXPORT_PASSWD\0"
-/*  1715 */ "export-passwd\0"
-/*  1729 */ "set host and optionally group name\0"
-/*  1764 */ "SUBJECT_NAME\0"
-/*  1777 */ "subject-name\0"
-/*  1790 */ "generate sign key (RSA or DSA)\0"
-/*  1821 */ "SIGN_KEY\0"
-/*  1830 */ "sign-key\0"
-/*  1839 */ "trusted certificate (TC scheme)\0"
-/*  1871 */ "TRUSTED_CERT\0"
-/*  1884 */ "trusted-cert\0"
-/*  1897 */ "generate  MV parameters\0"
-/*  1926 */ "MV_PARAMS\0"
-/*  1936 */ "mv-params\0"
-/*  1946 */ "update  MV keys\0"
-/*  1967 */ "MV_KEYS\0"
-/*  1975 */ "mv-keys\0"
-/*  1983 */ "display extended usage information and exit\0"
-/*  2027 */ "help\0"
-/*  2032 */ "extended usage information passed thru pager\0"
-/*  2077 */ "more-help\0"
-/*  2087 */ "output version information and exit\0"
-/*  2123 */ "version\0"
-/*  2131 */ "save the option state to a config file\0"
-/*  2170 */ "save-opts\0"
-/*  2180 */ "load options from a config file\0"
-/*  2212 */ "LOAD_OPTS\0"
-/*  2222 */ "no-load-opts\0"
-/*  2235 */ "no\0"
-/*  2238 */ "NTP_KEYGEN\0"
-/*  2249 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p9\n"
+/*  1023 */ "identity modulus bits\0"
+/*  1045 */ "IMBITS\0"
+/*  1052 */ "imbits\0"
+/*  1059 */ "certificate scheme\0"
+/*  1078 */ "CERTIFICATE\0"
+/*  1090 */ "certificate\0"
+/*  1102 */ "privatekey cipher\0"
+/*  1120 */ "CIPHER\0"
+/*  1127 */ "cipher\0"
+/*  1134 */ "Increase debug verbosity level\0"
+/*  1165 */ "DEBUG_LEVEL\0"
+/*  1177 */ "debug-level\0"
+/*  1189 */ "Set the debug verbosity level\0"
+/*  1219 */ "SET_DEBUG_LEVEL\0"
+/*  1235 */ "set-debug-level\0"
+/*  1251 */ "Write IFF or GQ identity keys\0"
+/*  1281 */ "ID_KEY\0"
+/*  1288 */ "id-key\0"
+/*  1295 */ "Generate GQ parameters and keys\0"
+/*  1327 */ "GQ_PARAMS\0"
+/*  1337 */ "gq-params\0"
+/*  1347 */ "generate RSA host key\0"
+/*  1369 */ "HOST_KEY\0"
+/*  1378 */ "host-key\0"
+/*  1387 */ "generate IFF parameters\0"
+/*  1411 */ "IFFKEY\0"
+/*  1418 */ "iffkey\0"
+/*  1425 */ "set Autokey group name\0"
+/*  1448 */ "IDENT\0"
+/*  1454 */ "ident\0"
+/*  1460 */ "set certificate lifetime\0"
+/*  1485 */ "LIFETIME\0"
+/*  1494 */ "lifetime\0"
+/*  1503 */ "prime modulus\0"
+/*  1517 */ "MODULUS\0"
+/*  1525 */ "modulus\0"
+/*  1533 */ "generate symmetric keys\0"
+/*  1557 */ "MD5KEY\0"
+/*  1564 */ "md5key\0"
+/*  1571 */ "generate PC private certificate\0"
+/*  1603 */ "PVT_CERT\0"
+/*  1612 */ "pvt-cert\0"
+/*  1621 */ "local private password\0"
+/*  1644 */ "PASSWORD\0"
+/*  1653 */ "password\0"
+/*  1662 */ "export IFF or GQ group keys with password\0"
+/*  1704 */ "EXPORT_PASSWD\0"
+/*  1718 */ "export-passwd\0"
+/*  1732 */ "set host and optionally group name\0"
+/*  1767 */ "SUBJECT_NAME\0"
+/*  1780 */ "subject-name\0"
+/*  1793 */ "generate sign key (RSA or DSA)\0"
+/*  1824 */ "SIGN_KEY\0"
+/*  1833 */ "sign-key\0"
+/*  1842 */ "trusted certificate (TC scheme)\0"
+/*  1874 */ "TRUSTED_CERT\0"
+/*  1887 */ "trusted-cert\0"
+/*  1900 */ "generate  MV parameters\0"
+/*  1929 */ "MV_PARAMS\0"
+/*  1939 */ "mv-params\0"
+/*  1949 */ "update  MV keys\0"
+/*  1970 */ "MV_KEYS\0"
+/*  1978 */ "mv-keys\0"
+/*  1986 */ "display extended usage information and exit\0"
+/*  2030 */ "help\0"
+/*  2035 */ "extended usage information passed thru pager\0"
+/*  2080 */ "more-help\0"
+/*  2090 */ "output version information and exit\0"
+/*  2126 */ "version\0"
+/*  2134 */ "save the option state to a config file\0"
+/*  2173 */ "save-opts\0"
+/*  2183 */ "load options from a config file\0"
+/*  2215 */ "LOAD_OPTS\0"
+/*  2225 */ "no-load-opts\0"
+/*  2238 */ "no\0"
+/*  2241 */ "NTP_KEYGEN\0"
+/*  2252 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p10-x\n"
             "Usage:  %s [ - [] | --[{=| }] ]...\n\0"
-/*  2363 */ "$HOME\0"
-/*  2369 */ ".\0"
-/*  2371 */ ".ntprc\0"
-/*  2378 */ "http://bugs.ntp.org, bugs@ntp.org\0"
-/*  2412 */ "\n\0"
-/*  2414 */ "ntp-keygen (ntp) 4.2.8p9";
+/*  2369 */ "$HOME\0"
+/*  2375 */ ".\0"
+/*  2377 */ ".ntprc\0"
+/*  2384 */ "http://bugs.ntp.org, bugs@ntp.org\0"
+/*  2418 */ "\n\0"
+/*  2420 */ "ntp-keygen (ntp) 4.2.8p10-x";
 
 /**
  *  imbits option description:
  */
 #ifdef AUTOKEY
 /** Descriptive text for the imbits option */
-#define IMBITS_DESC      (ntp_keygen_opt_strs+1020)
+#define IMBITS_DESC      (ntp_keygen_opt_strs+1023)
 /** Upper-cased name for the imbits option */
-#define IMBITS_NAME      (ntp_keygen_opt_strs+1042)
+#define IMBITS_NAME      (ntp_keygen_opt_strs+1045)
 /** Name string for the imbits option */
-#define IMBITS_name      (ntp_keygen_opt_strs+1049)
+#define IMBITS_name      (ntp_keygen_opt_strs+1052)
 /** Compiled in flag settings for the imbits option */
 #define IMBITS_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -200,11 +200,11 @@ static char const ntp_keygen_opt_strs[2439] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the certificate option */
-#define CERTIFICATE_DESC      (ntp_keygen_opt_strs+1056)
+#define CERTIFICATE_DESC      (ntp_keygen_opt_strs+1059)
 /** Upper-cased name for the certificate option */
-#define CERTIFICATE_NAME      (ntp_keygen_opt_strs+1075)
+#define CERTIFICATE_NAME      (ntp_keygen_opt_strs+1078)
 /** Name string for the certificate option */
-#define CERTIFICATE_name      (ntp_keygen_opt_strs+1087)
+#define CERTIFICATE_name      (ntp_keygen_opt_strs+1090)
 /** Compiled in flag settings for the certificate option */
 #define CERTIFICATE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -221,11 +221,11 @@ static char const ntp_keygen_opt_strs[2439] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the cipher option */
-#define CIPHER_DESC      (ntp_keygen_opt_strs+1099)
+#define CIPHER_DESC      (ntp_keygen_opt_strs+1102)
 /** Upper-cased name for the cipher option */
-#define CIPHER_NAME      (ntp_keygen_opt_strs+1117)
+#define CIPHER_NAME      (ntp_keygen_opt_strs+1120)
 /** Name string for the cipher option */
-#define CIPHER_name      (ntp_keygen_opt_strs+1124)
+#define CIPHER_name      (ntp_keygen_opt_strs+1127)
 /** Compiled in flag settings for the cipher option */
 #define CIPHER_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -241,11 +241,11 @@ static char const ntp_keygen_opt_strs[2439] =
  *  debug-level option description:
  */
 /** Descriptive text for the debug-level option */
-#define DEBUG_LEVEL_DESC      (ntp_keygen_opt_strs+1131)
+#define DEBUG_LEVEL_DESC      (ntp_keygen_opt_strs+1134)
 /** Upper-cased name for the debug-level option */
-#define DEBUG_LEVEL_NAME      (ntp_keygen_opt_strs+1162)
+#define DEBUG_LEVEL_NAME      (ntp_keygen_opt_strs+1165)
 /** Name string for the debug-level option */
-#define DEBUG_LEVEL_name      (ntp_keygen_opt_strs+1174)
+#define DEBUG_LEVEL_name      (ntp_keygen_opt_strs+1177)
 /** Compiled in flag settings for the debug-level option */
 #define DEBUG_LEVEL_FLAGS     (OPTST_DISABLED)
 
@@ -253,11 +253,11 @@ static char const ntp_keygen_opt_strs[2439] =
  *  set-debug-level option description:
  */
 /** Descriptive text for the set-debug-level option */
-#define SET_DEBUG_LEVEL_DESC      (ntp_keygen_opt_strs+1186)
+#define SET_DEBUG_LEVEL_DESC      (ntp_keygen_opt_strs+1189)
 /** Upper-cased name for the set-debug-level option */
-#define SET_DEBUG_LEVEL_NAME      (ntp_keygen_opt_strs+1216)
+#define SET_DEBUG_LEVEL_NAME      (ntp_keygen_opt_strs+1219)
 /** Name string for the set-debug-level option */
-#define SET_DEBUG_LEVEL_name      (ntp_keygen_opt_strs+1232)
+#define SET_DEBUG_LEVEL_name      (ntp_keygen_opt_strs+1235)
 /** Compiled in flag settings for the set-debug-level option */
 #define SET_DEBUG_LEVEL_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -267,11 +267,11 @@ static char const ntp_keygen_opt_strs[2439] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the id-key option */
-#define ID_KEY_DESC      (ntp_keygen_opt_strs+1248)
+#define ID_KEY_DESC      (ntp_keygen_opt_strs+1251)
 /** Upper-cased name for the id-key option */
-#define ID_KEY_NAME      (ntp_keygen_opt_strs+1278)
+#define ID_KEY_NAME      (ntp_keygen_opt_strs+1281)
 /** Name string for the id-key option */
-#define ID_KEY_name      (ntp_keygen_opt_strs+1285)
+#define ID_KEY_name      (ntp_keygen_opt_strs+1288)
 /** Compiled in flag settings for the id-key option */
 #define ID_KEY_FLAGS     (OPTST_DISABLED)
 
@@ -287,11 +287,11 @@ static char const ntp_keygen_opt_strs[2439] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the gq-params option */
-#define GQ_PARAMS_DESC      (ntp_keygen_opt_strs+1292)
+#define GQ_PARAMS_DESC      (ntp_keygen_opt_strs+1295)
 /** Upper-cased name for the gq-params option */
-#define GQ_PARAMS_NAME      (ntp_keygen_opt_strs+1324)
+#define GQ_PARAMS_NAME      (ntp_keygen_opt_strs+1327)
 /** Name string for the gq-params option */
-#define GQ_PARAMS_name      (ntp_keygen_opt_strs+1334)
+#define GQ_PARAMS_name      (ntp_keygen_opt_strs+1337)
 /** Compiled in flag settings for the gq-params option */
 #define GQ_PARAMS_FLAGS     (OPTST_DISABLED)
 
@@ -307,11 +307,11 @@ static char const ntp_keygen_opt_strs[2439] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the host-key option */
-#define HOST_KEY_DESC      (ntp_keygen_opt_strs+1344)
+#define HOST_KEY_DESC      (ntp_keygen_opt_strs+1347)
 /** Upper-cased name for the host-key option */
-#define HOST_KEY_NAME      (ntp_keygen_opt_strs+1366)
+#define HOST_KEY_NAME      (ntp_keygen_opt_strs+1369)
 /** Name string for the host-key option */
-#define HOST_KEY_name      (ntp_keygen_opt_strs+1375)
+#define HOST_KEY_name      (ntp_keygen_opt_strs+1378)
 /** Compiled in flag settings for the host-key option */
 #define HOST_KEY_FLAGS     (OPTST_DISABLED)
 
@@ -327,11 +327,11 @@ static char const ntp_keygen_opt_strs[2439] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the iffkey option */
-#define IFFKEY_DESC      (ntp_keygen_opt_strs+1384)
+#define IFFKEY_DESC      (ntp_keygen_opt_strs+1387)
 /** Upper-cased name for the iffkey option */
-#define IFFKEY_NAME      (ntp_keygen_opt_strs+1408)
+#define IFFKEY_NAME      (ntp_keygen_opt_strs+1411)
 /** Name string for the iffkey option */
-#define IFFKEY_name      (ntp_keygen_opt_strs+1415)
+#define IFFKEY_name      (ntp_keygen_opt_strs+1418)
 /** Compiled in flag settings for the iffkey option */
 #define IFFKEY_FLAGS     (OPTST_DISABLED)
 
@@ -347,11 +347,11 @@ static char const ntp_keygen_opt_strs[2439] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the ident option */
-#define IDENT_DESC      (ntp_keygen_opt_strs+1422)
+#define IDENT_DESC      (ntp_keygen_opt_strs+1425)
 /** Upper-cased name for the ident option */
-#define IDENT_NAME      (ntp_keygen_opt_strs+1445)
+#define IDENT_NAME      (ntp_keygen_opt_strs+1448)
 /** Name string for the ident option */
-#define IDENT_name      (ntp_keygen_opt_strs+1451)
+#define IDENT_name      (ntp_keygen_opt_strs+1454)
 /** Compiled in flag settings for the ident option */
 #define IDENT_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -368,11 +368,11 @@ static char const ntp_keygen_opt_strs[2439] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the lifetime option */
-#define LIFETIME_DESC      (ntp_keygen_opt_strs+1457)
+#define LIFETIME_DESC      (ntp_keygen_opt_strs+1460)
 /** Upper-cased name for the lifetime option */
-#define LIFETIME_NAME      (ntp_keygen_opt_strs+1482)
+#define LIFETIME_NAME      (ntp_keygen_opt_strs+1485)
 /** Name string for the lifetime option */
-#define LIFETIME_name      (ntp_keygen_opt_strs+1491)
+#define LIFETIME_name      (ntp_keygen_opt_strs+1494)
 /** Compiled in flag settings for the lifetime option */
 #define LIFETIME_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -389,11 +389,11 @@ static char const ntp_keygen_opt_strs[2439] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the modulus option */
-#define MODULUS_DESC      (ntp_keygen_opt_strs+1500)
+#define MODULUS_DESC      (ntp_keygen_opt_strs+1503)
 /** Upper-cased name for the modulus option */
-#define MODULUS_NAME      (ntp_keygen_opt_strs+1514)
+#define MODULUS_NAME      (ntp_keygen_opt_strs+1517)
 /** Name string for the modulus option */
-#define MODULUS_name      (ntp_keygen_opt_strs+1522)
+#define MODULUS_name      (ntp_keygen_opt_strs+1525)
 /** Compiled in flag settings for the modulus option */
 #define MODULUS_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -409,11 +409,11 @@ static char const ntp_keygen_opt_strs[2439] =
  *  md5key option description:
  */
 /** Descriptive text for the md5key option */
-#define MD5KEY_DESC      (ntp_keygen_opt_strs+1530)
+#define MD5KEY_DESC      (ntp_keygen_opt_strs+1533)
 /** Upper-cased name for the md5key option */
-#define MD5KEY_NAME      (ntp_keygen_opt_strs+1554)
+#define MD5KEY_NAME      (ntp_keygen_opt_strs+1557)
 /** Name string for the md5key option */
-#define MD5KEY_name      (ntp_keygen_opt_strs+1561)
+#define MD5KEY_name      (ntp_keygen_opt_strs+1564)
 /** Compiled in flag settings for the md5key option */
 #define MD5KEY_FLAGS     (OPTST_DISABLED)
 
@@ -422,11 +422,11 @@ static char const ntp_keygen_opt_strs[2439] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the pvt-cert option */
-#define PVT_CERT_DESC      (ntp_keygen_opt_strs+1568)
+#define PVT_CERT_DESC      (ntp_keygen_opt_strs+1571)
 /** Upper-cased name for the pvt-cert option */
-#define PVT_CERT_NAME      (ntp_keygen_opt_strs+1600)
+#define PVT_CERT_NAME      (ntp_keygen_opt_strs+1603)
 /** Name string for the pvt-cert option */
-#define PVT_CERT_name      (ntp_keygen_opt_strs+1609)
+#define PVT_CERT_name      (ntp_keygen_opt_strs+1612)
 /** Compiled in flag settings for the pvt-cert option */
 #define PVT_CERT_FLAGS     (OPTST_DISABLED)
 
@@ -442,11 +442,11 @@ static char const ntp_keygen_opt_strs[2439] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the password option */
-#define PASSWORD_DESC      (ntp_keygen_opt_strs+1618)
+#define PASSWORD_DESC      (ntp_keygen_opt_strs+1621)
 /** Upper-cased name for the password option */
-#define PASSWORD_NAME      (ntp_keygen_opt_strs+1641)
+#define PASSWORD_NAME      (ntp_keygen_opt_strs+1644)
 /** Name string for the password option */
-#define PASSWORD_name      (ntp_keygen_opt_strs+1650)
+#define PASSWORD_name      (ntp_keygen_opt_strs+1653)
 /** Compiled in flag settings for the password option */
 #define PASSWORD_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -463,11 +463,11 @@ static char const ntp_keygen_opt_strs[2439] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the export-passwd option */
-#define EXPORT_PASSWD_DESC      (ntp_keygen_opt_strs+1659)
+#define EXPORT_PASSWD_DESC      (ntp_keygen_opt_strs+1662)
 /** Upper-cased name for the export-passwd option */
-#define EXPORT_PASSWD_NAME      (ntp_keygen_opt_strs+1701)
+#define EXPORT_PASSWD_NAME      (ntp_keygen_opt_strs+1704)
 /** Name string for the export-passwd option */
-#define EXPORT_PASSWD_name      (ntp_keygen_opt_strs+1715)
+#define EXPORT_PASSWD_name      (ntp_keygen_opt_strs+1718)
 /** Compiled in flag settings for the export-passwd option */
 #define EXPORT_PASSWD_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -484,11 +484,11 @@ static char const ntp_keygen_opt_strs[2439] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the subject-name option */
-#define SUBJECT_NAME_DESC      (ntp_keygen_opt_strs+1729)
+#define SUBJECT_NAME_DESC      (ntp_keygen_opt_strs+1732)
 /** Upper-cased name for the subject-name option */
-#define SUBJECT_NAME_NAME      (ntp_keygen_opt_strs+1764)
+#define SUBJECT_NAME_NAME      (ntp_keygen_opt_strs+1767)
 /** Name string for the subject-name option */
-#define SUBJECT_NAME_name      (ntp_keygen_opt_strs+1777)
+#define SUBJECT_NAME_name      (ntp_keygen_opt_strs+1780)
 /** Compiled in flag settings for the subject-name option */
 #define SUBJECT_NAME_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -505,11 +505,11 @@ static char const ntp_keygen_opt_strs[2439] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the sign-key option */
-#define SIGN_KEY_DESC      (ntp_keygen_opt_strs+1790)
+#define SIGN_KEY_DESC      (ntp_keygen_opt_strs+1793)
 /** Upper-cased name for the sign-key option */
-#define SIGN_KEY_NAME      (ntp_keygen_opt_strs+1821)
+#define SIGN_KEY_NAME      (ntp_keygen_opt_strs+1824)
 /** Name string for the sign-key option */
-#define SIGN_KEY_name      (ntp_keygen_opt_strs+1830)
+#define SIGN_KEY_name      (ntp_keygen_opt_strs+1833)
 /** Compiled in flag settings for the sign-key option */
 #define SIGN_KEY_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -526,11 +526,11 @@ static char const ntp_keygen_opt_strs[2439] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the trusted-cert option */
-#define TRUSTED_CERT_DESC      (ntp_keygen_opt_strs+1839)
+#define TRUSTED_CERT_DESC      (ntp_keygen_opt_strs+1842)
 /** Upper-cased name for the trusted-cert option */
-#define TRUSTED_CERT_NAME      (ntp_keygen_opt_strs+1871)
+#define TRUSTED_CERT_NAME      (ntp_keygen_opt_strs+1874)
 /** Name string for the trusted-cert option */
-#define TRUSTED_CERT_name      (ntp_keygen_opt_strs+1884)
+#define TRUSTED_CERT_name      (ntp_keygen_opt_strs+1887)
 /** Compiled in flag settings for the trusted-cert option */
 #define TRUSTED_CERT_FLAGS     (OPTST_DISABLED)
 
@@ -546,11 +546,11 @@ static char const ntp_keygen_opt_strs[2439] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the mv-params option */
-#define MV_PARAMS_DESC      (ntp_keygen_opt_strs+1897)
+#define MV_PARAMS_DESC      (ntp_keygen_opt_strs+1900)
 /** Upper-cased name for the mv-params option */
-#define MV_PARAMS_NAME      (ntp_keygen_opt_strs+1926)
+#define MV_PARAMS_NAME      (ntp_keygen_opt_strs+1929)
 /** Name string for the mv-params option */
-#define MV_PARAMS_name      (ntp_keygen_opt_strs+1936)
+#define MV_PARAMS_name      (ntp_keygen_opt_strs+1939)
 /** Compiled in flag settings for the mv-params option */
 #define MV_PARAMS_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -567,11 +567,11 @@ static char const ntp_keygen_opt_strs[2439] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the mv-keys option */
-#define MV_KEYS_DESC      (ntp_keygen_opt_strs+1946)
+#define MV_KEYS_DESC      (ntp_keygen_opt_strs+1949)
 /** Upper-cased name for the mv-keys option */
-#define MV_KEYS_NAME      (ntp_keygen_opt_strs+1967)
+#define MV_KEYS_NAME      (ntp_keygen_opt_strs+1970)
 /** Name string for the mv-keys option */
-#define MV_KEYS_name      (ntp_keygen_opt_strs+1975)
+#define MV_KEYS_name      (ntp_keygen_opt_strs+1978)
 /** Compiled in flag settings for the mv-keys option */
 #define MV_KEYS_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -586,11 +586,11 @@ static char const ntp_keygen_opt_strs[2439] =
 /*
  *  Help/More_Help/Version option descriptions:
  */
-#define HELP_DESC       (ntp_keygen_opt_strs+1983)
-#define HELP_name       (ntp_keygen_opt_strs+2027)
+#define HELP_DESC       (ntp_keygen_opt_strs+1986)
+#define HELP_name       (ntp_keygen_opt_strs+2030)
 #ifdef HAVE_WORKING_FORK
-#define MORE_HELP_DESC  (ntp_keygen_opt_strs+2032)
-#define MORE_HELP_name  (ntp_keygen_opt_strs+2077)
+#define MORE_HELP_DESC  (ntp_keygen_opt_strs+2035)
+#define MORE_HELP_name  (ntp_keygen_opt_strs+2080)
 #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
 #else
 #define MORE_HELP_DESC  HELP_DESC
@@ -603,14 +603,14 @@ static char const ntp_keygen_opt_strs[2439] =
 #  define VER_FLAGS     (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \
                          OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT)
 #endif
-#define VER_DESC        (ntp_keygen_opt_strs+2087)
-#define VER_name        (ntp_keygen_opt_strs+2123)
-#define SAVE_OPTS_DESC  (ntp_keygen_opt_strs+2131)
-#define SAVE_OPTS_name  (ntp_keygen_opt_strs+2170)
-#define LOAD_OPTS_DESC     (ntp_keygen_opt_strs+2180)
-#define LOAD_OPTS_NAME     (ntp_keygen_opt_strs+2212)
-#define NO_LOAD_OPTS_name  (ntp_keygen_opt_strs+2222)
-#define LOAD_OPTS_pfx      (ntp_keygen_opt_strs+2235)
+#define VER_DESC        (ntp_keygen_opt_strs+2090)
+#define VER_name        (ntp_keygen_opt_strs+2126)
+#define SAVE_OPTS_DESC  (ntp_keygen_opt_strs+2134)
+#define SAVE_OPTS_name  (ntp_keygen_opt_strs+2173)
+#define LOAD_OPTS_DESC     (ntp_keygen_opt_strs+2183)
+#define LOAD_OPTS_NAME     (ntp_keygen_opt_strs+2215)
+#define NO_LOAD_OPTS_name  (ntp_keygen_opt_strs+2225)
+#define LOAD_OPTS_pfx      (ntp_keygen_opt_strs+2238)
 #define LOAD_OPTS_name     (NO_LOAD_OPTS_name + 3)
 /**
  *  Declare option callback procedures
@@ -961,24 +961,24 @@ static tOptDesc optDesc[OPTION_CT] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /** Reference to the upper cased version of ntp-keygen. */
-#define zPROGNAME       (ntp_keygen_opt_strs+2238)
+#define zPROGNAME       (ntp_keygen_opt_strs+2241)
 /** Reference to the title line for ntp-keygen usage. */
-#define zUsageTitle     (ntp_keygen_opt_strs+2249)
+#define zUsageTitle     (ntp_keygen_opt_strs+2252)
 /** ntp-keygen configuration file name. */
-#define zRcName         (ntp_keygen_opt_strs+2371)
+#define zRcName         (ntp_keygen_opt_strs+2377)
 /** Directories to search for ntp-keygen config files. */
 static char const * const apzHomeList[3] = {
-    ntp_keygen_opt_strs+2363,
     ntp_keygen_opt_strs+2369,
+    ntp_keygen_opt_strs+2375,
     NULL };
 /** The ntp-keygen program bug email address. */
-#define zBugsAddr       (ntp_keygen_opt_strs+2378)
+#define zBugsAddr       (ntp_keygen_opt_strs+2384)
 /** Clarification/explanation of what ntp-keygen does. */
-#define zExplain        (ntp_keygen_opt_strs+2412)
+#define zExplain        (ntp_keygen_opt_strs+2418)
 /** Extra detail explaining what ntp-keygen does. */
 #define zDetail         (NULL)
 /** The full version string for ntp-keygen. */
-#define zFullVersion    (ntp_keygen_opt_strs+2414)
+#define zFullVersion    (ntp_keygen_opt_strs+2420)
 /* extracted from optcode.tlib near line 364 */
 
 #if defined(ENABLE_NLS)
@@ -1310,7 +1310,7 @@ static void bogus_function(void) {
      translate option names.
    */
   /* referenced via ntp_keygenOptions.pzCopyright */
-  puts(_("ntp-keygen (ntp) 4.2.8p9\n\
+  puts(_("ntp-keygen (ntp) 4.2.8p10-x\n\
 Copyright (C) 1992-2017 The University of Delaware and Network Time Foundation, all rights reserved.\n\
 This is free software. It is licensed for use, modification and\n\
 redistribution under the terms of the NTP License, copies of which\n\
@@ -1409,14 +1409,14 @@ implied warranty.\n"));
   puts(_("load options from a config file"));
 
   /* referenced via ntp_keygenOptions.pzUsageTitle */
-  puts(_("ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p9\n\
+  puts(_("ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p10-x\n\
 Usage:  %s [ - [] | --[{=| }] ]...\n"));
 
   /* referenced via ntp_keygenOptions.pzExplain */
   puts(_("\n"));
 
   /* referenced via ntp_keygenOptions.pzFullVersion */
-  puts(_("ntp-keygen (ntp) 4.2.8p9"));
+  puts(_("ntp-keygen (ntp) 4.2.8p10-x"));
 
   /* referenced via ntp_keygenOptions.pzFullUsage */
   puts(_("<<>>"));
diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h
index 3efe2a099..af8ca86c0 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  March 19, 2017 at 10:10:36 AM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  May 19, 2017 at 12:27:15 PM by AutoGen 5.18.5
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -94,9 +94,9 @@ typedef enum {
 /** count of all options for ntp-keygen */
 #define OPTION_CT    26
 /** ntp-keygen version */
-#define NTP_KEYGEN_VERSION       "4.2.8p9"
+#define NTP_KEYGEN_VERSION       "4.2.8p10-x"
 /** Full ntp-keygen version text */
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.8p9"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.8p10-x"
 
 /**
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/util/ntp-keygen.1ntp-keygenman b/util/ntp-keygen.1ntp-keygenman
index 3d6dafff6..0b74f13fc 100644
--- a/util/ntp-keygen.1ntp-keygenman
+++ b/util/ntp-keygen.1ntp-keygenman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntp-keygen 1ntp-keygenman "19 Mar 2017" "ntp (4.2.8p9)" "User Commands"
+.TH ntp-keygen 1ntp-keygenman "19 May 2017" "ntp (4.2.8p10-x)" "User Commands"
 .\"
 .\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed March 19, 2017 at 10:10:42 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed May 19, 2017 at 12:27:21 PM by AutoGen 5.18.5
 .\" From the definitions ntp-keygen-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/util/ntp-keygen.1ntp-keygenmdoc b/util/ntp-keygen.1ntp-keygenmdoc
index 0fcc2029e..b39380606 100644
--- a/util/ntp-keygen.1ntp-keygenmdoc
+++ b/util/ntp-keygen.1ntp-keygenmdoc
@@ -1,9 +1,9 @@
-.Dd March 19 2017
+.Dd May 19 2017
 .Dt NTP_KEYGEN 1ntp-keygenmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  March 19, 2017 at 10:10:39 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  May 19, 2017 at 12:27:18 PM by AutoGen 5.18.5
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/util/ntp-keygen.html b/util/ntp-keygen.html
index e6086f65a..52110afd8 100644
--- a/util/ntp-keygen.html
+++ b/util/ntp-keygen.html
@@ -73,7 +73,7 @@ All other files are in PEM-encoded
 printable ASCII format so they can be embedded as MIME attachments in
 mail to other sites.
 
-  This document applies to version 4.2.8p9 of ntp-keygen.
+  
This document applies to version 4.2.8p10 of ntp-keygen.
 
 

 
@@ -224,26 +224,29 @@ Autokey Public-Key Authentication page.
 
   This program generates cryptographic data files used by the NTPv4
 authentication and identification schemes. 
-It generates MD5 key files used in symmetric key cryptography. 
-In addition, if the OpenSSL software library has been installed,
-it generates keys, certificate and identity files used in public key
-cryptography. 
+It can generate message digest keys used in symmetric key cryptography and,
+if the OpenSSL software library has been installed, it can generate host keys,
+signing keys, certificates, and identity keys and parameters used in Autokey
+public key cryptography. 
 These files are used for cookie encryption,
-digital signature and challenge/response identification algorithms
+digital signature, and challenge/response identification algorithms
 compatible with the Internet standard security infrastructure.
 
-  
All files are in PEM-encoded printable ASCII format,
-so they can be embedded as MIME attachments in mail to other sites
+  
The message digest symmetric keys file is generated in a format
+compatible with NTPv3. 
+All other files are in PEM-encoded printable ASCII format,
+so they can be embedded as MIME attachments in email to other sites
 and certificate authorities. 
 By default, files are not encrypted.
 
-  
When used to generate message digest keys, the program produces a file
-containing ten pseudo-random printable ASCII strings suitable for the
-MD5 message digest algorithm included in the distribution. 
+  
When used to generate message digest symmetric keys, the program
+produces a file containing ten pseudo-random printable ASCII strings
+suitable for the MD5 message digest algorithm included in the
+distribution. 
 If the OpenSSL library is installed, it produces an additional ten
-hex-encoded random bit strings suitable for the SHA1 and other message
-digest algorithms. 
-The message digest keys file must be distributed and stored
+hex-encoded random bit strings suitable for SHA1, AES-128-CMAC, and
+other message digest algorithms. 
+The message digest symmetric keys file must be distributed and stored
 using secure means beyond the scope of NTP itself. 
 Besides the keys used for ordinary NTP associations, additional keys
 can be defined as passwords for the
@@ -263,223 +266,133 @@ other than Autokey.
   
Some files used by this program are encrypted using a private password. 
 The
 -p
-option specifies the password for local encrypted files and the
+option specifies the read password for local encrypted files and the
 -q
-option the password for encrypted files sent to remote sites. 
+option the write password for encrypted files sent to remote sites. 
 If no password is specified, the host name returned by the Unix
-gethostname()
-function, normally the DNS name of the host is used.
+hostname(1)
+command, normally the DNS name of the host, is used as the the default read
+password, for convenience. 
+The
+ntp-keygen
+program prompts for the password if it reads an encrypted file
+and the password is missing or incorrect. 
+If an encrypted file is read successfully and
+no write password is specified, the read password is used
+as the write password by default.
 
   
The
-pw
+pw
 option of the
-crypto
+crypto
+ntpd(1ntpdmdoc)
 configuration command specifies the read
 password for previously encrypted local files. 
-This must match the local password used by this program. 
+This must match the local read password used by this program. 
 If not specified, the host name is used. 
-Thus, if files are generated by this program without password,
+Thus, if files are generated by this program without an explicit password,
 they can be read back by
-ntpd
-without password but only on the same host.
+ntpd(1ntpdmdoc)
+without specifying an explicit password but only on the same host. 
+If the write password used for encryption is specified as the host name,
+these files can be read by that host with no explicit password.
 
   
Normally, encrypted files for each host are generated by that host and
 used only by that host, although exceptions exist as noted later on
 this page. 
 The symmetric keys file, normally called
-ntp.keys,
+ntp.keys,
 is usually installed in
 /etc. 
 Other files and links are usually installed in
 /usr/local/etc,
 which is normally in a shared filesystem in
 NFS-mounted networks and cannot be changed by shared clients. 
-The location of the keys directory can be changed by the
-keysdir
-configuration command in such cases. 
-Normally, this is in
-/etc.
+In these cases, NFS clients can specify the files in another
+directory such as
+/etc
+using the
+keysdir
+ntpd(1ntpdmdoc)
+configuration file command.
 
   
This program directs commentary and error messages to the standard
 error stream
-stderr
+stderr
 and remote files to the standard output stream
-stdout
+stdout
 where they can be piped to other applications or redirected to files. 
 The names used for generated files and links all begin with the
 string
-ntpkey
+ntpkey*
 and include the file type, generating host and filestamp,
 as described in the
-“Cryptographic Data Files”
+Cryptographic Data Files
 section below.
 
 
Running the Program
 
-To test and gain experience with Autokey concepts, log in as root and
-change to the keys directory, usually
-/usr/local/etc
-When run for the first time, or if all files with names beginning with
-ntpkey
-have been removed, use the
-ntp-keygen
-command without arguments to generate a
-default RSA host key and matching RSA-MD5 certificate with expiration
-date one year hence. 
-If run again without options, the program uses the
-existing keys and parameters and generates only a new certificate with
-new expiration date one year hence.
-
-  
Run the command on as many hosts as necessary. 
-Designate one of them as the trusted host (TH) using
-ntp-keygen
-with the
--T
-option and configure it to synchronize from reliable Internet servers. 
-Then configure the other hosts to synchronize to the TH directly or
-indirectly. 
-A certificate trail is created when Autokey asks the immediately
-ascendant host towards the TH to sign its certificate, which is then
-provided to the immediately descendant host on request. 
-All group hosts should have acyclic certificate trails ending on the TH.
-
-  
The host key is used to encrypt the cookie when required and so must be
-RSA type. 
-By default, the host key is also the sign key used to encrypt
-signatures. 
-A different sign key can be assigned using the
--S
-option and this can be either RSA or DSA type. 
-By default, the signature
-message digest type is MD5, but any combination of sign key type and
-message digest type supported by the OpenSSL library can be specified
-using the
--c
-option. 
-The rules say cryptographic media should be generated with proventic
-filestamps, which means the host should already be synchronized before
-this program is run. 
-This of course creates a chicken-and-egg problem
-when the host is started for the first time. 
-Accordingly, the host time
-should be set by some other means, such as eyeball-and-wristwatch, at
-least so that the certificate lifetime is within the current year. 
-After that and when the host is synchronized to a proventic source, the
-certificate should be re-generated.
-
-  
Additional information on trusted groups and identity schemes is on the
-“Autokey Public-Key Authentication”
-page.
-
-  
The
-ntpd(1ntpdmdoc)
-configuration command
-crypto pw password
-specifies the read password for previously encrypted files. 
-The daemon expires on the spot if the password is missing
-or incorrect. 
-For convenience, if a file has been previously encrypted,
-the default read password is the name of the host running
-the program. 
-If the previous write password is specified as the host name,
-these files can be read by that host with no explicit password.
-
-  
File names begin with the prefix
-ntpkey_
-and end with the postfix
-_hostname.filestamp,
-where
-hostname
-is the owner name, usually the string returned
-by the Unix gethostname() routine, and
-filestamp
-is the NTP seconds when the file was generated, in decimal digits. 
-This both guarantees uniqueness and simplifies maintenance
-procedures, since all files can be quickly removed
-by a
-rm ntpkey*
-command or all files generated
-at a specific time can be removed by a
-rm
-*filestamp
-command. 
-To further reduce the risk of misconfiguration,
-the first two lines of a file contain the file name
-and generation date and time as comments.
-
-  
All files are installed by default in the keys directory
-/usr/local/etc,
-which is normally in a shared filesystem
-in NFS-mounted networks. 
-The actual location of the keys directory
-and each file can be overridden by configuration commands,
-but this is not recommended. 
-Normally, the files for each host are generated by that host
-and used only by that host, although exceptions exist
-as noted later on this page.
-
-  
Normally, files containing private values,
-including the host key, sign key and identification parameters,
-are permitted root read/write-only;
-while others containing public values are permitted world readable. 
-Alternatively, files containing private values can be encrypted
-and these files permitted world readable,
-which simplifies maintenance in shared file systems. 
-Since uniqueness is insured by the hostname and
-file name extensions, the files for a NFS server and
-dependent clients can all be installed in the same shared directory.
-
-  
The recommended practice is to keep the file name extensions
-when installing a file and to install a soft link
-from the generic names specified elsewhere on this page
-to the generated files. 
-This allows new file generations to be activated simply
-by changing the link. 
-If a link is present, ntpd follows it to the file name
-to extract the filestamp. 
-If a link is not present,
-ntpd(1ntpdmdoc)
-extracts the filestamp from the file itself. 
-This allows clients to verify that the file and generation times
-are always current. 
-The
-ntp-keygen
-program uses the same timestamp extension for all files generated
-at one time, so each generation is distinct and can be readily
-recognized in monitoring data.
-
-
Running the program
-
 The safest way to run the
 ntp-keygen
 program is logged in directly as root. 
-The recommended procedure is change to the keys directory,
-usually
+The recommended procedure is change to the
+keys
+directory, usually
 /usr/local/etc,
-then run the program. 
-When run for the first time,
-or if all
-ntpkey
-files have been removed,
-the program generates a RSA host key file and matching RSA-MD5 certificate file,
+then run the program.
+
+  
To test and gain experience with Autokey concepts, log in as root and
+change to the
+keys
+directory, usually
+/usr/local/etc. 
+When run for the first time, or if all files with names beginning with
+ntpkey*
+have been removed, use the
+ntp-keygen
+command without arguments to generate a default
+RSA
+host key and matching
+RSA-MD5
+certificate file with expiration date one year hence,
 which is all that is necessary in many cases. 
 The program also generates soft links from the generic names
 to the respective files. 
-If run again, the program uses the same host key file,
-but generates a new certificate file and link.
+If run again without options, the program uses the
+existing keys and parameters and generates a new certificate file with
+new expiration date one year hence, and soft link.
 
-  
The host key is used to encrypt the cookie when required and so must be RSA type. 
+  
The host key is used to encrypt the cookie when required and so must be
+RSA
+type. 
 By default, the host key is also the sign key used to encrypt signatures. 
 When necessary, a different sign key can be specified and this can be
-either RSA or DSA type. 
-By default, the message digest type is MD5, but any combination
+either
+RSA
+or
+DSA
+type. 
+By default, the message digest type is
+MD5,
+but any combination
 of sign key type and message digest type supported by the OpenSSL library
-can be specified, including those using the MD2, MD5, SHA, SHA1, MDC2
-and RIPE160 message digest algorithms. 
+can be specified, including those using the
+AES128CMAC, MD2, MD5, MDC2, SHA, SHA1
+and
+RIPE160
+message digest algorithms. 
 However, the scheme specified in the certificate must be compatible
 with the sign key. 
-Certificates using any digest algorithm are compatible with RSA sign keys;
-however, only SHA and SHA1 certificates are compatible with DSA sign keys.
+Certificates using any digest algorithm are compatible with
+RSA
+sign keys;
+however, only
+SHA
+and
+SHA1
+certificates are compatible with
+DSA
+sign keys.
 
   
Private/public key files and certificates are compatible with
 other OpenSSL applications and very likely other libraries as well. 
@@ -490,19 +403,19 @@ However, the identification parameter files, although encoded
 as the other files, are probably not compatible with anything other than Autokey.
 
   
Running the program as other than root and using the Unix
-su
+su(1)
 command
 to assume root may not work properly, since by default the OpenSSL library
 looks for the random seed file
-.rnd
+.rnd
 in the user home directory. 
 However, there should be only one
-.rnd,
+.rnd,
 most conveniently
 in the root directory, so it is convenient to define the
-$RANDFILE
+.Ev RANDFILE
 environment variable used by the OpenSSL library as the path to
-/.rnd.
+.rnd.
 
   
Installing the keys as root might not work in NFS-mounted
 shared file systems, as NFS clients may not be able to write
@@ -512,7 +425,8 @@ directory such as
 /etc
 using the
 keysdir
-command. 
+ntpd(1ntpdmdoc)
+configuration file command. 
 There is no need for one client to read the keys and certificates
 of other clients or servers, as these data are obtained automatically
 by the Autokey protocol.
@@ -545,8 +459,11 @@ while others containing public values are permitted world readable.
 Alternatively, files containing private values can be encrypted
 and these files permitted world readable,
 which simplifies maintenance in shared file systems. 
-Since uniqueness is insured by the hostname and
-file name extensions, the files for a NFS server and
+Since uniqueness is insured by the
+hostname
+and
+filestamp
+file name extensions, the files for an NTP server and
 dependent clients can all be installed in the same shared directory.
 
   
The recommended practice is to keep the file name extensions
@@ -555,109 +472,113 @@ from the generic names specified elsewhere on this page
 to the generated files. 
 This allows new file generations to be activated simply
 by changing the link. 
-If a link is present, ntpd follows it to the file name
-to extract the filestamp. 
+If a link is present,
+ntpd(1ntpdmdoc)
+follows it to the file name to extract the
+filestamp. 
 If a link is not present,
 ntpd(1ntpdmdoc)
-extracts the filestamp from the file itself. 
+extracts the
+filestamp
+from the file itself. 
 This allows clients to verify that the file and generation times
 are always current. 
 The
 ntp-keygen
-program uses the same timestamp extension for all files generated
+program uses the same
+filestamp
+extension for all files generated
 at one time, so each generation is distinct and can be readily
 recognized in monitoring data.
 
-
Running the program
-
-The safest way to run the
+  
Run the command on as many hosts as necessary. 
+Designate one of them as the trusted host (TH) using
 ntp-keygen
-program is logged in directly as root. 
-The recommended procedure is change to the keys directory,
-usually
-/usr/local/etc,
-then run the program. 
-When run for the first time,
-or if all
-ntpkey
-files have been removed,
-the program generates a RSA host key file and matching RSA-MD5 certificate file,
-which is all that is necessary in many cases. 
-The program also generates soft links from the generic names
-to the respective files. 
-If run again, the program uses the same host key file,
-but generates a new certificate file and link.
+with the
+-T
+option and configure it to synchronize from reliable Internet servers. 
+Then configure the other hosts to synchronize to the TH directly or
+indirectly. 
+A certificate trail is created when Autokey asks the immediately
+ascendant host towards the TH to sign its certificate, which is then
+provided to the immediately descendant host on request. 
+All group hosts should have acyclic certificate trails ending on the TH.
 
-  
The host key is used to encrypt the cookie when required and so must be RSA type. 
-By default, the host key is also the sign key used to encrypt signatures. 
-When necessary, a different sign key can be specified and this can be
-either RSA or DSA type. 
-By default, the message digest type is MD5, but any combination
-of sign key type and message digest type supported by the OpenSSL library
-can be specified, including those using the MD2, MD5, SHA, SHA1, MDC2
-and RIPE160 message digest algorithms. 
-However, the scheme specified in the certificate must be compatible
-with the sign key. 
-Certificates using any digest algorithm are compatible with RSA sign keys;
-however, only SHA and SHA1 certificates are compatible with DSA sign keys.
+  
The host key is used to encrypt the cookie when required and so must be
+RSA type. 
+By default, the host key is also the sign key used to encrypt
+signatures. 
+A different sign key can be assigned using the
+-S
+option and this can be either
+RSA
+or
+DSA
+type. 
+By default, the signature
+message digest type is
+MD5,
+but any combination of sign key type and
+message digest type supported by the OpenSSL library can be specified
+using the
+-c
+option.
 
-  
Private/public key files and certificates are compatible with
-other OpenSSL applications and very likely other libraries as well. 
-Certificates or certificate requests derived from them should be compatible
-with extant industry practice, although some users might find
-the interpretation of X509v3 extension fields somewhat liberal. 
-However, the identification parameter files, although encoded
-as the other files, are probably not compatible with anything other than Autokey.
+  
The rules say cryptographic media should be generated with proventic
+filestamps, which means the host should already be synchronized before
+this program is run. 
+This of course creates a chicken-and-egg problem
+when the host is started for the first time. 
+Accordingly, the host time
+should be set by some other means, such as eyeball-and-wristwatch, at
+least so that the certificate lifetime is within the current year. 
+After that and when the host is synchronized to a proventic source, the
+certificate should be re-generated.
 
-  
Running the program as other than root and using the Unix
-su
-command
-to assume root may not work properly, since by default the OpenSSL library
-looks for the random seed file
-.rnd
-in the user home directory. 
-However, there should be only one
-.rnd,
-most conveniently
-in the root directory, so it is convenient to define the
-$RANDFILE
-environment variable used by the OpenSSL library as the path to
-/.rnd.
+  
Additional information on trusted groups and identity schemes is on the
+“Autokey Public-Key Authentication”
+page.
 
-  
Installing the keys as root might not work in NFS-mounted
-shared file systems, as NFS clients may not be able to write
-to the shared keys directory, even as root. 
-In this case, NFS clients can specify the files in another
-directory such as
-/etc
-using the
-keysdir
+  
File names begin with the prefix
+ntpkey_
+and end with the suffix
+_hostname. filestamp,
+where
+hostname
+is the owner name, usually the string returned
+by the Unix
+hostname(1)
+command, and
+filestamp
+is the NTP seconds when the file was generated, in decimal digits. 
+This both guarantees uniqueness and simplifies maintenance
+procedures, since all files can be quickly removed
+by a
+rm ntpkey*
+command or all files generated
+at a specific time can be removed by a
+rm *filestamp
 command. 
-There is no need for one client to read the keys and certificates
-of other clients or servers, as these data are obtained automatically
-by the Autokey protocol.
+To further reduce the risk of misconfiguration,
+the first two lines of a file contain the file name
+and generation date and time as comments.
 
-  
Ordinarily, cryptographic files are generated by the host that uses them,
-but it is possible for a trusted agent (TA) to generate these files
-for other hosts; however, in such cases files should always be encrypted. 
-The subject name and trusted name default to the hostname
-of the host generating the files, but can be changed by command line options. 
-It is convenient to designate the owner name and trusted name
-as the subject and issuer fields, respectively, of the certificate. 
-The owner name is also used for the host and sign key files,
-while the trusted name is used for the identity files. 
-seconds. 
-seconds.
+
Trusted Hosts and Groups
 
-  s Trusted Hosts and Groups
-Each cryptographic configuration involves selection of a signature scheme
+
Each cryptographic configuration involves selection of a signature scheme
 and identification scheme, called a cryptotype,
 as explained in the
 Authentication Options
 section of
 ntp.conf(5). 
-The default cryptotype uses RSA encryption, MD5 message digest
-and TC identification. 
+The default cryptotype uses
+RSA
+encryption,
+MD5
+message digest
+and
+TC
+identification. 
 First, configure a NTP subnet including one or more low-stratum
 trusted hosts from which all other hosts derive synchronization
 directly or indirectly. 
@@ -675,7 +596,7 @@ section of
 
   
On each trusted host as root, change to the keys directory. 
 To insure a fresh fileset, remove all
-ntpkey
+ntpkey
 files. 
 Then run
 ntp-keygen
@@ -700,7 +621,9 @@ is either
 RSA
 or
 DSA. 
-The most often need to do this is when a DSA-signed certificate is used. 
+The most frequent need to do this is when a
+DSA-signed
+certificate is used. 
 If it is necessary to use a different certificate scheme than the default,
 run
 ntp-keygen
@@ -709,17 +632,17 @@ with the
 option and selected
 scheme
 as needed. 
-f
+If
 ntp-keygen
 is run again without these options, it generates a new certificate
-using the same scheme and sign key.
+using the same scheme and sign key, and soft link.
 
   
After setting up the environment it is advisable to update certificates
 from time to time, if only to extend the validity interval. 
 Simply run
 ntp-keygen
 with the same flags as before to generate new certificates
-using existing keys. 
+using existing keys, and soft links. 
 However, if the host or sign key is changed,
 ntpd(1ntpdmdoc)
 should be restarted. 
@@ -732,13 +655,15 @@ at which time the protocol is restarted.
 
Identity Schemes
 
 As mentioned on the Autonomous Authentication page,
-the default TC identity scheme is vulnerable to a middleman attack. 
+the default
+TC
+identity scheme is vulnerable to a middleman attack. 
 However, there are more secure identity schemes available,
-including PC, IFF, GQ and MV described on the
-"Identification Schemes"
-page
-(maybe available at
-http://www.eecis.udel.edu/%7emills/keygen.html). 
+including
+PC, IFF, GQ
+and
+MV
+schemes described below. 
 These schemes are based on a TA, one or more trusted hosts
 and some number of nontrusted hosts. 
 Trusted hosts prove identity using values provided by the TA,
@@ -763,12 +688,15 @@ On trusted host alice run
 -P
 -p password
 to generate the host key file
-ntpkey_RSAkey_alice.filestamp
+ntpkey_ RSA key_alice. filestamp
 and trusted private certificate file
-ntpkey_RSA-MD5_cert_alice.filestamp. 
+ntpkey_ RSA-MD5 _ cert_alice. filestamp,
+and soft links. 
 Copy both files to all group hosts;
 they replace the files which would be generated in other schemes. 
-On each host bob install a soft link from the generic name
+On each host
+bob
+install a soft link from the generic name
 ntpkey_host_bob
 to the host key file and soft link
 ntpkey_cert_bob
@@ -777,26 +705,34 @@ Note the generic links are on bob, but point to files generated
 by trusted host alice. 
 In this scheme it is not possible to refresh
 either the keys or certificates without copying them
-to all other hosts in the group.
+to all other hosts in the group, and recreating the soft links.
 
-  
For the IFF scheme proceed as in the TC scheme to generate keys
+  
For the
+IFF
+scheme proceed as in the
+TC
+scheme to generate keys
 and certificates for all group hosts, then for every trusted host in the group,
-generate the IFF parameter file. 
+generate the
+IFF
+parameter file. 
 On trusted host alice run
 ntp-keygen
 -T
 -I
 -p password
 to produce her parameter file
-ntpkey_IFFpar_alice.filestamp,
+ntpkey_IFFpar_alice.filestamp,
 which includes both server and client keys. 
 Copy this file to all group hosts that operate as both servers
 and clients and install a soft link from the generic
-ntpkey_iff_alice
+ntpkey_iff_alice
 to this file. 
 If there are no hosts restricted to operate only as clients,
 there is nothing further to do. 
-As the IFF scheme is independent
+As the
+IFF
+scheme is independent
 of keys and certificates, these files can be refreshed as needed.
 
   
If a rogue client has the parameter file, it could masquerade
@@ -806,37 +742,53 @@ from the parameter file and distributed to all restricted clients.
 After generating the parameter file, on alice run
 ntp-keygen
 -e
-and pipe the output to a file or mail program. 
-Copy or mail this file to all restricted clients. 
+and pipe the output to a file or email program. 
+Copy or email this file to all restricted clients. 
 On these clients install a soft link from the generic
-ntpkey_iff_alice
+ntpkey_iff_alice
 to this file. 
 To further protect the integrity of the keys,
 each file can be encrypted with a secret password.
 
-  
For the GQ scheme proceed as in the TC scheme to generate keys
+  
For the
+GQ
+scheme proceed as in the
+TC
+scheme to generate keys
 and certificates for all group hosts, then for every trusted host
-in the group, generate the IFF parameter file. 
+in the group, generate the
+IFF
+parameter file. 
 On trusted host alice run
 ntp-keygen
 -T
 -G
 -p password
 to produce her parameter file
-ntpkey_GQpar_alice.filestamp,
+ntpkey_GQpar_alice.filestamp,
 which includes both server and client keys. 
 Copy this file to all group hosts and install a soft link
 from the generic
-ntpkey_gq_alice
+ntpkey_gq_alice
 to this file. 
-In addition, on each host bob install a soft link
+In addition, on each host
+bob
+install a soft link
 from generic
 ntpkey_gq_bob
 to this file. 
-As the GQ scheme updates the GQ parameters file and certificate
+As the
+GQ
+scheme updates the
+GQ
+parameters file and certificate
 at the same time, keys and certificates can be regenerated as needed.
 
-  
For the MV scheme, proceed as in the TC scheme to generate keys
+  
For the
+MV
+scheme, proceed as in the
+TC
+scheme to generate keys
 and certificates for all group hosts. 
 For illustration assume trish is the TA, alice one of several trusted hosts
 and bob one of her clients. 
@@ -848,9 +800,9 @@ where
 n
 is the number of revokable keys (typically 5) to produce
 the parameter file
-ntpkeys_MVpar_trish.filestamp
+ntpkeys_MVpar_trish.filestamp
 and client key files
-ntpkeys_MVkeyd_trish.filestamp
+ntpkeys_MVkeyd _ trish. filestamp
 where
 d
 is the key number (0 <
@@ -859,66 +811,199 @@ is the key number (0 <
 n). 
 Copy the parameter file to alice and install a soft link
 from the generic
-ntpkey_mv_alice
+ntpkey_mv_alice
 to this file. 
 Copy one of the client key files to alice for later distribution
 to her clients. 
-It doesn't matter which client key file goes to alice,
+It does not matter which client key file goes to alice,
 since they all work the same way. 
-Alice copies the client key file to all of her cliens. 
+Alice copies the client key file to all of her clients. 
 On client bob install a soft link from generic
-ntpkey_mvkey_bob
+ntpkey_mvkey_bob
 to the client key file. 
-As the MV scheme is independent of keys and certificates,
+As the
+MV
+scheme is independent of keys and certificates,
 these files can be refreshed as needed.
 
 
Command Line Options
 
      
--c scheme
Select certificate message digest/signature encryption scheme. 
+
-b --imbits= modulus
Set the number of bits in the identity modulus for generating identity keys to
+modulus
+bits. 
+The number of bits in the identity modulus defaults to 256, but can be set to
+values from 256 to 2048 (32 to 256 octets). 
+Use the larger moduli with caution, as this can consume considerable computing
+resources and increases the size of authenticated packets. 
+
-c --certificate= scheme
Select certificate signature encryption/message digest scheme. 
 The
 scheme
 can be one of the following:
-. Cm RSA-MD2 , RSA-MD5 , RSA-SHA , RSA-SHA1 , RSA-MDC2 , RSA-RIPEMD160 , DSA-SHA ,
+RSA-MD2, RSA-MD5, RSA-MDC2, RSA-SHA, RSA-SHA1, RSA-RIPEMD160, DSA-SHA,
 or
 DSA-SHA1. 
-Note that RSA schemes must be used with a RSA sign key and DSA
-schemes must be used with a DSA sign key. 
+Note that
+RSA
+schemes must be used with an
+RSA
+sign key and
+DSA
+schemes must be used with a
+DSA
+sign key. 
 The default without this option is
 RSA-MD5. 
-
-d
Enable debugging. 
+If compatibility with FIPS 140-2 is required, either the
+DSA-SHA
+or
+DSA-SHA1
+scheme must be used. 
+
-C --cipher= cipher
Select the OpenSSL cipher to encrypt the files containing private keys. 
+The default without this option is three-key triple DES in CBC mode,
+des-ede3-cbc. 
+The
+openssl -h
+command provided with OpenSSL displays available ciphers. 
+
-d --debug-level
Increase debugging verbosity level. 
 This option displays the cryptographic data produced in eye-friendly billboards. 
-
-e
Write the IFF client keys to the standard output. 
-This is intended for automatic key distribution by mail. 
-
-G
Generate parameters and keys for the GQ identification scheme,
-obsoleting any that may exist. 
-
-g
Generate keys for the GQ identification scheme
-using the existing GQ parameters. 
-If the GQ parameters do not yet exist, create them first. 
-
-H
Generate new host keys, obsoleting any that may exist. 
-
-I
Generate parameters for the IFF identification scheme,
-obsoleting any that may exist. 
-
-i name
Set the suject name to
-name. 
-This is used as the subject field in certificates
-and in the file name for host and sign keys. 
-
-M
Generate MD5 keys, obsoleting any that may exist. 
-
-P
Generate a private certificate. 
+
-D --set-debug-level= level
Set the debugging verbosity to
+level. 
+This option displays the cryptographic data produced in eye-friendly billboards. 
+
-e --id-key
Write the
+IFF
+or
+GQ
+public parameters from the
+IFFkey or GQkey
+client keys file previously specified
+as unencrypted data to the standard output stream
+stdout. 
+This is intended for automatic key distribution by email. 
+
-G --gq-params
Generate a new encrypted
+GQ
+parameters and key file for the Guillou-Quisquater (GQ) identity scheme. 
+This option is mutually exclusive with the
+-I
+and
+-V
+options. 
+
-H --host-key
Generate a new encrypted
+RSA
+public/private host key file. 
+
-I --iffkey
Generate a new encrypted
+IFF
+key file for the Schnorr (IFF) identity scheme. 
+This option is mutually exclusive with the
+-G
+and
+Fl V
+options. 
+
-i --ident= group
Set the optional Autokey group name to
+group. 
+This is used in the identity scheme parameter file names of
+IFF, GQ,
+and
+MV
+client parameters files. 
+In that role, the default is the host name if no group is provided. 
+The group name, if specified using
+-i
+or
+-s
+following an
+‘@’
+character, is also used in certificate subject and issuer names in the form
+host @ group
+and should match the group specified via
+crypto ident
+or
+server ident
+in the ntpd configuration file. 
+
-l --lifetime= days
Set the lifetime for certificate expiration to
+days. 
+The default lifetime is one year (365 days). 
+
-m --modulus= bits
Set the number of bits in the prime modulus for generating files to
+bits. 
+The modulus defaults to 512, but can be set from 256 to 2048 (32 to 256 octets). 
+Use the larger moduli with caution, as this can consume considerable computing
+resources and increases the size of authenticated packets. 
+
-M --md5key
Generate a new symmetric keys file containing 10
+MD5
+keys, and if OpenSSL is available, 10
+SHA
+keys. 
+An
+MD5
+key is a string of 20 random printable ASCII characters, while a
+SHA
+key is a string of 40 random hex digits. 
+The file can be edited using a text editor to change the key type or key content. 
+This option is mutually exclusive with all other options. 
+
-p --password= passwd
Set the password for reading and writing encrypted files to
+passwd. 
+These include the host, sign and identify key files. 
+By default, the password is the string returned by the Unix
+hostname
+command. 
+
-P --pvt-cert
Generate a new private certificate used by the
+PC
+identity scheme. 
 By default, the program generates public certificates. 
-
-p password
Encrypt generated files containing private data with
-password
-and the DES-CBC algorithm. 
-
-q
Set the password for reading files to password. 
-
-S [RSA | DSA]
Generate a new sign key of the designated type,
-obsoleting any that may exist. 
-By default, the program uses the host key as the sign key. 
-
-s name
Set the issuer name to
-name. 
-This is used for the issuer field in certificates
-and in the file name for identity files. 
-
-T
Generate a trusted certificate. 
+Note: the PC identity scheme is not recommended for new installations. 
+
-q --export-passwd= passwd
Set the password for writing encrypted
+IFF, GQ and MV
+identity files redirected to
+stdout
+to
+passwd. 
+In effect, these files are decrypted with the
+-p
+password, then encrypted with the
+-q
+password. 
+By default, the password is the string returned by the Unix
+hostname
+command. 
+
-s --subject-key= [host] [@ group]
Specify the Autokey host name, where
+host
+is the optional host name and
+group
+is the optional group name. 
+The host name, and if provided, group name are used in
+host @ group
+form as certificate subject and issuer. 
+Specifying
+-s -@ group
+is allowed, and results in leaving the host name unchanged, as with
+-i group. 
+The group name, or if no group is provided, the host name are also used in the
+file names of
+IFF, GQ,
+and
+MV
+identity scheme client parameter files. 
+If
+host
+is not specified, the default host name is the string returned by the Unix
+hostname
+command. 
+
-S --sign-key= [RSA | DSA]
Generate a new encrypted public/private sign key file of the specified type. 
+By default, the sign key is the host key and has the same type. 
+If compatibility with FIPS 140-2 is required, the sign key type must be
+DSA. 
+
-T --trusted-cert
Generate a trusted certificate. 
 By default, the program generates a non-trusted certificate. 
-
-V nkeys
Generate parameters and keys for the Mu-Varadharajan (MV) identification scheme. 
+
-V --mv-params nkeys
Generate
+nkeys
+encrypted server keys and parameters for the Mu-Varadharajan (MV)
+identity scheme. 
+This option is mutually exclusive with the
+-I
+and
+-G
+options. 
+Note: support for this option should be considered a work in progress. 
 
 
 Random Seed File
@@ -944,7 +1029,7 @@ but are outside the scope of this page.
 
   The entropy seed used by the OpenSSL library is contained in a file,
 usually called
-.rnd,
+.rnd,
 which must be available when starting the NTP daemon
 or the
 ntp-keygen
@@ -967,47 +1052,121 @@ If the
 .Ev RANDFILE
 environment variable is not present,
 the library will look for the
-.rnd
+.rnd
 file in the user home directory. 
+Since both the
+ntp-keygen
+program and
+ntpd(1ntpdmdoc)
+daemon must run as root, the logical place to put this file is in
+/.rnd
+or
+/root/.rnd. 
 If the file is not available or cannot be written,
 the daemon exits with a message to the system log and the program
 exits with a suitable error message.
 
 
Cryptographic Data Files
 
-All other file formats begin with two lines. 
-The first contains the file name, including the generated host name
-and filestamp. 
-The second contains the datestamp in conventional Unix date format. 
-Lines beginning with # are considered comments and ignored by the
+
All file formats begin with two nonencrypted lines. 
+The first line contains the file name, including the generated host name
+and filestamp, in the format
+ntpkey_key _ name. filestamp,
+where
+key
+is the key or parameter type,
+name
+is the host or group name and
+filestamp
+is the filestamp (NTP seconds) when the file was created. 
+By convention,
+key
+names in generated file names include both upper and lower case
+characters, while
+key
+names in generated link names include only lower case characters. 
+The filestamp is not used in generated link names. 
+The second line contains the datestamp in conventional Unix
+date
+format. 
+Lines beginning with
+‘#’
+are considered comments and ignored by the
 ntp-keygen
 program and
 ntpd(1ntpdmdoc)
-daemon. 
-Cryptographic values are encoded first using ASN.1 rules,
-then encrypted if necessary, and finally written PEM-encoded
-printable ASCII format preceded and followed by MIME content identifier lines.
-
-  
The format of the symmetric keys file is somewhat different
-than the other files in the interest of backward compatibility. 
-Since DES-CBC is deprecated in NTPv4, the only key format of interest
-is MD5 alphanumeric strings. 
-Following hte heard the keys are
-entered one per line in the format
+daemon.
+
+  
The remainder of the file contains cryptographic data, encoded first using ASN.1
+rules, then encrypted if necessary, and finally written in PEM-encoded
+printable ASCII text, preceded and followed by MIME content identifier lines.
+
+  
The format of the symmetric keys file, ordinarily named
+ntp.keys,
+is somewhat different than the other files in the interest of backward compatibility. 
+Ordinarily, the file is generated by this program, but it can be constructed
+and edited using an ordinary text editor.
+
# ntpkey_MD5key_bk.ntp.org.3595864945
+# Thu Dec 12 19:22:25 2013
+
+1  MD5 L";Nw<\`.I<f4U0)247"i  # MD5 key
+2  MD5 &>l0%XXK9O'51VwV<xq~  # MD5 key
+3  MD5 lb4zLW~d^!K:]RsD'qb6  # MD5 key
+4  MD5 Yue:tL[+vR)M\`n~bY,'?  # MD5 key
+5  MD5 B;fx'Kgr/&4ZTbL6=RxA  # MD5 key
+6  MD5 4eYwa\`o@}3i@@@@V@@..R9!l  # MD5 key
+7  MD5 \`A.([h+;wTQ|xfi%Sn_!  # MD5 key
+8  MD5 45:V,r4]l6y^JH6"Sh?F  # MD5 key
+9  MD5 3-5vcn*6l29DS?Xdsg)*  # MD5 key
+10 MD5 2late4Me              # MD5 key
+11 SHA1 a27872d3030a9025b8446c751b4551a7629af65c  # SHA1 key
+12 SHA1 21bc3b4865dbb9e920902abdccb3e04ff97a5e74  # SHA1 key
+13 SHA1 2b7736fe24fef5ba85ae11594132ab5d6f6daba9  # SHA1 key
+14 SHA  a5332809c8878dd3a5b918819108a111509aeceb  # SHA  key
+15 MD2  2fe16c88c760ff2f16d4267e36c1aa6c926e6964  # MD2  key
+16 MD4  b2691811dc19cfc0e2f9bcacd74213f29812183d  # MD4  key
+17 MD5  e4d6735b8bdad58ec5ffcb087300a17f7fef1f7c  # MD5  key
+18 MDC2 a8d5e2315c025bf3a79174c87fbd10477de2eabc  # MDC2 key
+19 RIPEMD160 77ca332cafb30e3cafb174dcd5b80ded7ba9b3d2  # RIPEMD160 key
+20 AES128CMAC f92ff73eee86c1e7dc638d6489a04e4e555af878  # AES128CMAC key
+
+     Figure 1. Typical Symmetric Key File
+
+  Figure 1 shows a typical symmetric keys file used by the reference
+implementation. 
+Following the header the keys are entered one per line in the format
 
     keyno type key
 
   where
 keyno
-is a positive integer in the range 1-65,535,
+is a positive integer in the range 1-65534;
 type
-is the string MD5 defining the key format and
+is the key type for the message digest algorithm, which in the absence of the
+OpenSSL library must be
+MD5
+to designate the MD5 message digest algorithm;
+if the OpenSSL library is installed, the key type can be any
+message digest algorithm supported by that library;
+however, if compatibility with FIPS 140-2 is required,
+the key type must be either
+SHA
+or
+SHA1;
 key
 is the key itself,
-which is a printable ASCII string 16 characters or less in length. 
-Each character is chosen from the 93 printable characters
-in the range 0x21 through 0x7f excluding space and the
+which is a printable ASCII string 20 characters or less in length:
+each character is chosen from the 93 printable characters
+in the range 0x21 through 0x7e (
+‘’! 
+through
+‘~’
+) excluding space and the
 ‘#’
-character.
+character, and terminated by whitespace or a
+‘#’
+character. 
+An OpenSSL key consists of a hex-encoded ASCII string of 40 characters, which
+is truncated as necessary.
 
   
Note that the keys used by the
 ntpq(1ntpqmdoc)
@@ -1020,8 +1179,8 @@ in human readable ASCII format.
 
   
The
 ntp-keygen
-program generates a MD5 symmetric keys file
-ntpkey_MD5key_hostname.filestamp. 
+program generates a symmetric keys file
+ntpkey_MD5key_hostname. filestamp. 
 Since the file contains private shared keys,
 it should be visible only to root and distributed by secure means
 to other subnet hosts. 
@@ -1055,13 +1214,13 @@ This software is released under the NTP license, <http://ntp.org/license>.
 
ntp-keygen iffkey:                  iffkey option (-I)
 
ntp-keygen ident:                   ident option (-i)
 
ntp-keygen lifetime:                lifetime option (-l)
-
ntp-keygen md5key:                  md5key option (-M)
 
ntp-keygen modulus:                 modulus option (-m)
+
ntp-keygen md5key:                  md5key option (-M)
 
ntp-keygen pvt-cert:                pvt-cert option (-P)
 
ntp-keygen password:                password option (-p)
 
ntp-keygen export-passwd:           export-passwd option (-q)
-
ntp-keygen sign-key:                sign-key option (-S)
 
ntp-keygen subject-name:            subject-name option (-s)
+
ntp-keygen sign-key:                sign-key option (-S)
 
ntp-keygen trusted-cert:            trusted-cert option (-T)
 
ntp-keygen mv-params:               mv-params option (-V)
 
ntp-keygen mv-keys:                 mv-keys option (-v)
@@ -1094,7 +1253,7 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
-ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p9
+ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p10-x
 Usage:  ntp-keygen [ -<flag> [<val>] | --<name>[{=| }<val>] ]...
   Flg Arg Option-Name    Description
    -b Num imbits         identity modulus bits
@@ -1112,15 +1271,15 @@ Usage:  ntp-keygen [ -<flag> [<val>] | --<name>[{=| }<val&g
    -I no  iffkey         generate IFF parameters
    -i Str ident          set Autokey group name
    -l Num lifetime       set certificate lifetime
-   -M no  md5key         generate MD5 keys
-   -m Num modulus        modulus
+   -m Num modulus        prime modulus
                                 - it must be in the range:
                                   256 to 2048
+   -M no  md5key         generate symmetric keys
    -P no  pvt-cert       generate PC private certificate
    -p Str password       local private password
    -q Str export-passwd  export IFF or GQ group keys with password
-   -S Str sign-key       generate sign key (RSA or DSA)
    -s Str subject-name   set host and optionally group name
+   -S Str sign-key       generate sign key (RSA or DSA)
    -T no  trusted-cert   trusted certificate (TC scheme)
    -V Num mv-params      generate <num> MV parameters
    -v Num mv-keys        update <num> MV keys
@@ -1187,10 +1346,10 @@ This option takes a string argument scheme
 
   scheme is one of
-RSA-MD2, RSA-MD5, RSA-SHA, RSA-SHA1, RSA-MDC2, RSA-RIPEMD160,
+RSA-MD2, RSA-MD5, RSA-MDC2, RSA-SHA, RSA-SHA1, RSA-RIPEMD160,
 DSA-SHA, or DSA-SHA1.
 
-  
Select the certificate message digest/signature encryption scheme. 
+  
Select the certificate signature encryption/message digest scheme. 
 Note that RSA schemes must be used with a RSA sign key and DSA
 schemes must be used with a DSA sign key.  The default without
 this option is RSA-MD5. 
@@ -1217,9 +1376,9 @@ This option takes a string argument cipherSelect the cipher which is used to encrypt the files containing
 private keys.  The default is three-key triple DES in CBC mode,
-equivalent to "-C des-ede3-cbc".  The openssl tool lists ciphers
-available in "openssl -h" output. 
-

+equivalent to "-C des-ede3-cbc".  The openssl tool lists ciphers
+available in "openssl -h" output. 
+
 
 
 

@@ -1239,8 +1398,9 @@ This is the “write iff or gq identity keys” option.
 must be compiled in by defining AUTOKEY during the compilation. 
 
 
-  Write the IFF or GQ client keys to the standard output.  This is
-intended for automatic key distribution by mail. 
+  
Write the public parameters from the IFF or GQ client keys to
+the standard output. 
+This is intended for automatic key distribution by email. 
 

 
 
@@ -1331,16 +1491,16 @@ This option takes a string argument group
 the file name of IFF, GQ, and MV client parameters files.  In
 that role, the default is the host name if this option is not
 provided.  The group name, if specified using -i/--ident or
-using -s/--subject-name following an '}' character,
-is also a part of the self-signed host certificate's subject and
-issuer names in the form host
-  'crypto ident' or 'server ident' configuration in
-ntpd's configuration file. 
-

+using -s/--subject-name following an '@' character,
+is also a part of the self-signed host certificate subject and
+issuer names in the form host@group and should match the
+'crypto ident' or 'server ident' configuration in the
+ntpd configuration file. 
+
 
 
 

-Next: ntp-keygen md5key,
+Next: ntp-keygen modulus,
 Previous: ntp-keygen ident,
 Up: ntp-keygen Invocation
 
@@ -1349,7 +1509,7 @@ Up: ntp-keygen
 lifetime option (-l)
 
 
-This is the ``set certificate lifetime'' option. 
+This is the “set certificate lifetime” option. 
 This option takes a number argument lifetime.
 
 
This option has some usage constraints.  It:
@@ -1359,34 +1519,19 @@ This option takes a number argument lifetimeSet the certificate expiration to lifetime days from now. 
 

-
-
-

-Next: ntp-keygen modulus,
-Previous: ntp-keygen lifetime,
-Up: ntp-keygen Invocation
-
-
-
-md5key option (-M)
-
-
-This is the ``generate md5 keys'' option. 
-Generate MD5 keys, obsoleting any that may exist. 
-

 
 
 

-Next: ntp-keygen pvt-cert,
-Previous: ntp-keygen md5key,
+Next: ntp-keygen md5key,
+Previous: ntp-keygen lifetime,
 Up: ntp-keygen Invocation
 
 
 
 modulus option (-m)
 
-
-This is the ``modulus'' option. 
+

+This is the “prime modulus” option. 
 This option takes a number argument modulus.
 
 
This option has some usage constraints.  It:
@@ -1396,11 +1541,26 @@ This option takes a number argument modulusThe number of bits in the prime modulus.  The default is 512. 
 

+
+
+

+Next: ntp-keygen pvt-cert,
+Previous: ntp-keygen modulus,
+Up: ntp-keygen Invocation
+
+
+
+md5key option (-M)
+
+
+This is the “generate symmetric keys” option. 
+Generate symmetric keys, obsoleting any that may exist. 
+

 
 
 

 Next: ntp-keygen password,
-Previous: ntp-keygen modulus,
+Previous: ntp-keygen md5key,
 Up: ntp-keygen Invocation
 
 
@@ -1408,7 +1568,7 @@ Up: ntp-keygen
 pvt-cert option (-P)
 
 
-This is the ``generate pc private certificate'' option.
+This is the “generate pc private certificate” option.
 
 
This option has some usage constraints.  It:
      

@@ -1430,7 +1590,7 @@ Up: ntp-keygen
 password option (-p)
 
 
-This is the ``local private password'' option. 
+This is the “local private password” option. 
 This option takes a string argument passwd.
 
 
This option has some usage constraints.  It:
@@ -1447,7 +1607,7 @@ hostname.
 
 
 

-Next: ntp-keygen sign-key,
+Next: ntp-keygen subject-name,
 Previous: ntp-keygen password,
 Up: ntp-keygen Invocation
 
@@ -1456,7 +1616,7 @@ Up: ntp-keygen
 export-passwd option (-q)
 
 
-This is the ``export iff or gq group keys with password'' option. 
+This is the “export iff or gq group keys with password” option. 
 This option takes a string argument passwd.
 
 
This option has some usage constraints.  It:
@@ -1468,68 +1628,68 @@ This option takes a string argument passwd
-
-
+
+
 

-Next: ntp-keygen subject-name,
+Next: ntp-keygen sign-key,
 Previous: ntp-keygen export-passwd,
 Up: ntp-keygen Invocation
 
 
 
-sign-key option (-S)
+subject-name option (-s)
 
-
-This is the ``generate sign key (rsa or dsa)'' option. 
-This option takes a string argument sign.
+

+This is the “set host and optionally group name” option. 
+This option takes a string argument host@group.
 
 
This option has some usage constraints.  It:
      

 must be compiled in by defining AUTOKEY during the compilation. 
 
 
-  Generate a new sign key of the designated type, obsoleting any
-that may exist.  By default, the program uses the host key as the
-sign key. 
+  
Set the Autokey host name, and optionally, group name specified
+following an '@' character.  The host name is used in the file
+name of generated host and signing certificates, without the
+group name.  The host name, and if provided, group name are used
+in host@group form for the host certificate subject and issuer
+fields.  Specifying '-s @group' is allowed, and results in
+leaving the host name unchanged while appending @group to the
+subject and issuer fields, as with -i group.  The group name, or
+if not provided, the host name are also used in the file names
+of IFF, GQ, and MV client parameter files. 
 

-
-
+
+
 

 Next: ntp-keygen trusted-cert,
-Previous: ntp-keygen sign-key,
+Previous: ntp-keygen subject-name,
 Up: ntp-keygen Invocation
 
 
 
-subject-name option (-s)
+sign-key option (-S)
 
-
-This is the ``set host and optionally group name'' option. 
-This option takes a string argument host@group.
+

+This is the “generate sign key (rsa or dsa)” option. 
+This option takes a string argument sign.
 
 
This option has some usage constraints.  It:
      

 must be compiled in by defining AUTOKEY during the compilation. 
 
 
-  Set the Autokey host name, and optionally, group name specified
-following an '}' character.  The host name is used in the file
-name of generated host and signing certificates, without the
-group name.  The host name, and if provided, group name are used
-in host
-  
fields.  Specifying '-s
-  
leaving the host name unchanged while appending
-  
subject and issuer fields, as with -i group.  The group name, or
-if not provided, the host name are also used in the file names
-of IFF, GQ, and MV client parameter files. 
-

+  Generate a new sign key of the designated type, obsoleting any
+that may exist.  By default, the program uses the host key as the
+sign key. 
+

 
 
 

 Next: ntp-keygen mv-params,
-Previous: ntp-keygen subject-name,
+Previous: ntp-keygen sign-key,
 Up: ntp-keygen Invocation
 
 
@@ -1537,7 +1697,7 @@ Up: ntp-keygen
 trusted-cert option (-T)
 
 
-This is the ``trusted certificate (tc scheme)'' option.
+This is the “trusted certificate (tc scheme)” option.
 
 
This option has some usage constraints.  It:
      

@@ -1559,7 +1719,7 @@ Up: ntp-keygen
 mv-params option (-V)
 
 
-This is the ``generate <num> mv parameters'' option. 
+This is the “generate <num> mv parameters” option. 
 This option takes a number argument num.
 
 
This option has some usage constraints.  It:
@@ -1582,7 +1742,7 @@ Up: ntp-keygen
 
mv-keys option (-v)

 
 
-This is the ``update <num> mv keys'' option. 
+This is the “update <num> mv keys” option. 
 This option takes a number argument num.
 
 
This option has some usage constraints.  It:
diff --git a/util/ntp-keygen.man.in b/util/ntp-keygen.man.in
index b22209e9d..79967b8f1 100644
--- a/util/ntp-keygen.man.in
+++ b/util/ntp-keygen.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntp-keygen @NTP_KEYGEN_MS@ "19 Mar 2017" "ntp (4.2.8p9)" "User Commands"
+.TH ntp-keygen @NTP_KEYGEN_MS@ "19 May 2017" "ntp (4.2.8p10-x)" "User Commands"
 .\"
 .\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed March 19, 2017 at 10:10:42 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed May 19, 2017 at 12:27:21 PM by AutoGen 5.18.5
 .\" From the definitions ntp-keygen-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/util/ntp-keygen.mdoc.in b/util/ntp-keygen.mdoc.in
index a3ea71a2f..63068ec31 100644
--- a/util/ntp-keygen.mdoc.in
+++ b/util/ntp-keygen.mdoc.in
@@ -1,9 +1,9 @@
-.Dd March 19 2017
+.Dd May 19 2017
 .Dt NTP_KEYGEN @NTP_KEYGEN_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  March 19, 2017 at 10:10:39 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  May 19, 2017 at 12:27:18 PM by AutoGen 5.18.5
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME