From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 27 Sep 2011 10:41:46 +0000 (+0000)
Subject: NTP_4_2_7P216
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=273f2e3ab57c6db62ee0d89c1929fcc57ecbdeff;p=thirdparty%2Fntp.git

NTP_4_2_7P216

bk: 4e81a86ayszjM1tTw_7PYOU5gDtg1g
---

diff --git a/ChangeLog b/ChangeLog
index 77946be773..84053f4355 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+(4.2.7p216) 2011/09/27 Released by Harlan Stenn <stenn@ntp.org>
 * sntp documentation tag cleanup.
 * mdoc2man improvements.
 (4.2.7p215) 2011/09/24 Released by Harlan Stenn <stenn@ntp.org>
diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c
index b0e8813c51..6411e0b06f 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  September 24, 2011 at 02:01:34 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  September 27, 2011 at 10:35:41 AM by AutoGen 5.12
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
@@ -52,7 +52,7 @@ extern FILE * option_usage_fp;
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
 static char const zCopyright[333] =
-"ntpd 4.2.7p215\n\
+"ntpd 4.2.7p216\n\
 Copyright (C) 1970-2011 The University of Delaware, David L. Mills, and/or others, 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\
@@ -1028,7 +1028,7 @@ static tOptDesc optDesc[OPTION_CT] = {
  */
 static char const zPROGNAME[5] = "NTPD";
 static char const zUsageTitle[133] =
-"ntpd - NTP daemon program - Ver. 4.2.7p215\n\
+"ntpd - NTP daemon program - Ver. 4.2.7p216\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n\
 \t\t[ <server1> ... <serverN> ]\n";
 #define zRcName     NULL
diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h
index 83dfdd7208..25ac59facc 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  September 24, 2011 at 02:01:34 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  September 27, 2011 at 10:35:40 AM by AutoGen 5.12
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
@@ -102,8 +102,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    36
-#define NTPD_VERSION       "4.2.7p215"
-#define NTPD_FULL_VERSION  "ntpd 4.2.7p215"
+#define NTPD_VERSION       "4.2.7p216"
+#define NTPD_FULL_VERSION  "ntpd 4.2.7p216"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi
index a807584639..03cd216050 100644
--- a/ntpd/ntpd-opts.texi
+++ b/ntpd/ntpd-opts.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntpd-opts.texi)
 # 
-# It has been AutoGen-ed  September 24, 2011 at 02:01:51 AM by AutoGen 5.12
+# It has been AutoGen-ed  September 27, 2011 at 10:36:54 AM by AutoGen 5.12
 # From the definitions    ntpd-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -63,7 +63,7 @@ This is the automatically generated usage text for ntpd:
 
 @exampleindent 0
 @example
-ntpd - NTP daemon program - Ver. 4.2.7p215
+ntpd - NTP daemon program - Ver. 4.2.7p216
 USAGE:  ntpd [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... \
                 [ <server1> ... <serverN> ]
   Flg Arg Option-Name    Description
diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman
index 31dde4f0f6..4e54908438 100644
--- a/ntpd/ntpd.1ntpdman
+++ b/ntpd/ntpd.1ntpdman
@@ -1,8 +1,8 @@
-.TH ntpd 1ntpdman "24 Sep 2011" "4.2.7p215" "User Commands"
+.TH ntpd 1ntpdman "27 Sep 2011" "4.2.7p216" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  September 24, 2011 at 02:01:47 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 27, 2011 at 10:36:48 AM by AutoGen 5.12
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/ntpd/ntpd.1ntpdmdoc b/ntpd/ntpd.1ntpdmdoc
index 571388b099..00fff83b23 100644
--- a/ntpd/ntpd.1ntpdmdoc
+++ b/ntpd/ntpd.1ntpdmdoc
@@ -1,9 +1,9 @@
-.Dd September 24 2011
+.Dd September 27 2011
 .Dt NTPD 1ntpdmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  September 24, 2011 at 02:01:51 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 27, 2011 at 10:36:56 AM by AutoGen 5.12
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpd/ntpd.man.in b/ntpd/ntpd.man.in
index db41285a76..a7da89e7f0 100644
--- a/ntpd/ntpd.man.in
+++ b/ntpd/ntpd.man.in
@@ -1,8 +1,8 @@
-.TH ntpd @NTPD_MS@ "24 Sep 2011" "4.2.7p215" "User Commands"
+.TH ntpd @NTPD_MS@ "27 Sep 2011" "4.2.7p216" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  September 24, 2011 at 02:01:47 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 27, 2011 at 10:36:48 AM by AutoGen 5.12
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/ntpd/ntpd.mdoc.in b/ntpd/ntpd.mdoc.in
index b241578a34..1e8bd46c37 100644
--- a/ntpd/ntpd.mdoc.in
+++ b/ntpd/ntpd.mdoc.in
@@ -1,9 +1,9 @@
-.Dd September 24 2011
+.Dd September 27 2011
 .Dt NTPD @NTPD_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  September 24, 2011 at 02:01:51 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 27, 2011 at 10:36:56 AM by AutoGen 5.12
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c
index 52f61e4405..bfc31df2d5 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  September 24, 2011 at 02:01:56 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  September 27, 2011 at 10:37:42 AM by AutoGen 5.12
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -52,7 +52,7 @@ extern FILE * option_usage_fp;
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
 static char const zCopyright[334] =
-"ntpdc 4.2.7p215\n\
+"ntpdc 4.2.7p216\n\
 Copyright (C) 1970-2011 The University of Delaware, David L. Mills, and/or others, 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\
@@ -473,7 +473,7 @@ static tOptDesc optDesc[OPTION_CT] = {
  */
 static char const zPROGNAME[6] = "NTPDC";
 static char const zUsageTitle[132] =
-"ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p215\n\
+"ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p216\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n";
 static char const zRcName[7] = ".ntprc";
 static char const * const apzHomeList[3] = {
diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h
index f52a1ee90c..cba2d52dc6 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  September 24, 2011 at 02:01:56 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  September 27, 2011 at 10:37:41 AM by AutoGen 5.12
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -81,8 +81,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    15
-#define NTPDC_VERSION       "4.2.7p215"
-#define NTPDC_FULL_VERSION  "ntpdc 4.2.7p215"
+#define NTPDC_VERSION       "4.2.7p216"
+#define NTPDC_FULL_VERSION  "ntpdc 4.2.7p216"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi
index 901a1c7b6a..6624c9cc2c 100644
--- a/ntpdc/ntpdc-opts.texi
+++ b/ntpdc/ntpdc-opts.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntpdc-opts.texi)
 # 
-# It has been AutoGen-ed  September 24, 2011 at 02:02:07 AM by AutoGen 5.12
+# It has been AutoGen-ed  September 27, 2011 at 10:38:02 AM by AutoGen 5.12
 # From the definitions    ntpdc-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -40,7 +40,7 @@ This is the automatically generated usage text for ntpdc:
 
 @exampleindent 0
 @example
-ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p215
+ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p216
 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.1ntpdcman b/ntpdc/ntpdc.1ntpdcman
index 1ad08ed6c3..2678d674bc 100644
--- a/ntpdc/ntpdc.1ntpdcman
+++ b/ntpdc/ntpdc.1ntpdcman
@@ -1,8 +1,8 @@
-.TH ntpdc 1ntpdcman "24 Sep 2011" "4.2.7p215" "User Commands"
+.TH ntpdc 1ntpdcman "27 Sep 2011" "4.2.7p216" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  September 24, 2011 at 02:02:04 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 27, 2011 at 10:37:58 AM by AutoGen 5.12
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -586,7 +586,7 @@ The following commands all make authenticated requests.
 .BR Xo Ic addpeer Ar peer_address
 [ "\fIkeyid\fR" ]
 [ "\fIversion\fR" ]
-[ "prefer" ]
+[ "\fIprefer\fR" ]
 .Xc
 Add a configured peer association at the given address and
 operating in symmetric active mode.
@@ -616,7 +616,7 @@ signal.
 .BR Xo Ic addserver Ar peer_address
 [ "\fIkeyid\fR" ]
 [ "\fIversion\fR" ]
-[ "prefer" ]
+[ "\fIprefer\fR" ]
 .Xc
 Identical to the addpeer command, except that the operating
 mode is client.
@@ -624,7 +624,7 @@ mode is client.
 .BR Xo Ic broadcast Ar peer_address
 [ "\fIkeyid\fR" ]
 [ "\fIversion\fR" ]
-[ "prefer" ]
+[ "\fIprefer\fR" ]
 .Xc
 Identical to the addpeer command, except that the operating
 mode is broadcast.
@@ -648,8 +648,8 @@ association may persist in an unconfigured mode if the remote peer
 is willing to continue on in this fashion.
 .TP
 .BR Xo Ic fudge Ar peer_address
-[ "time1" ]
-[ "time2" ]
+[ "\fItime1\fR" ]
+[ "\fItime2\fR" ]
 [ "\fIstratum\fR" ]
 [ "\fIrefid\fR" ]
 .Xc
@@ -750,7 +750,7 @@ configuration file commands of
 Unrestrict the matching entry from the restrict list.
 .TP
 .BR Xo Ic delrestrict Ar address Ar mask
-[ "ntpport" ]
+[ "\fIntpport\fR" ]
 .Xc
 Delete the matching entry from the restrict list.
 .TP
diff --git a/ntpdc/ntpdc.1ntpdcmdoc b/ntpdc/ntpdc.1ntpdcmdoc
index 71a697d642..21a4799c9a 100644
--- a/ntpdc/ntpdc.1ntpdcmdoc
+++ b/ntpdc/ntpdc.1ntpdcmdoc
@@ -1,9 +1,9 @@
-.Dd September 24 2011
+.Dd September 27 2011
 .Dt NTPDC 1ntpdcmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  September 24, 2011 at 02:02:08 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 27, 2011 at 10:38:03 AM by AutoGen 5.12
 .\"  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 c0aa11e03b..7ebfde636c 100644
--- a/ntpdc/ntpdc.html
+++ b/ntpdc/ntpdc.html
@@ -36,7 +36,7 @@ display the time offset of the system clock relative to the server
 clock.  Run as root, it can correct the system clock to this offset as
 well.  It can be run as an interactive command or from a cron job.
 
-  <p>This document applies to version 4.2.7p215 of <code>ntpdc</code>.
+  <p>This document applies to version 4.2.7p216 of <code>ntpdc</code>.
 
   <p>The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
@@ -116,7 +116,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#ntpdc-Invocation">ntpdc Invocation</a>
 <p><a name="index-ntpdc-usage-3"></a>
 This is the automatically generated usage text for ntpdc:
 
-<pre class="example">ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p215
+<pre class="example">ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p216
 USAGE:  ntpdc [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
diff --git a/ntpdc/ntpdc.man.in b/ntpdc/ntpdc.man.in
index e6ff343784..e1ba734f83 100644
--- a/ntpdc/ntpdc.man.in
+++ b/ntpdc/ntpdc.man.in
@@ -1,8 +1,8 @@
-.TH ntpdc @NTPDC_MS@ "24 Sep 2011" "4.2.7p215" "User Commands"
+.TH ntpdc @NTPDC_MS@ "27 Sep 2011" "4.2.7p216" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  September 24, 2011 at 02:02:04 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 27, 2011 at 10:37:58 AM by AutoGen 5.12
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -586,7 +586,7 @@ The following commands all make authenticated requests.
 .BR Xo Ic addpeer Ar peer_address
 [ "\fIkeyid\fR" ]
 [ "\fIversion\fR" ]
-[ "prefer" ]
+[ "\fIprefer\fR" ]
 .Xc
 Add a configured peer association at the given address and
 operating in symmetric active mode.
@@ -616,7 +616,7 @@ signal.
 .BR Xo Ic addserver Ar peer_address
 [ "\fIkeyid\fR" ]
 [ "\fIversion\fR" ]
-[ "prefer" ]
+[ "\fIprefer\fR" ]
 .Xc
 Identical to the addpeer command, except that the operating
 mode is client.
@@ -624,7 +624,7 @@ mode is client.
 .BR Xo Ic broadcast Ar peer_address
 [ "\fIkeyid\fR" ]
 [ "\fIversion\fR" ]
-[ "prefer" ]
+[ "\fIprefer\fR" ]
 .Xc
 Identical to the addpeer command, except that the operating
 mode is broadcast.
@@ -648,8 +648,8 @@ association may persist in an unconfigured mode if the remote peer
 is willing to continue on in this fashion.
 .TP
 .BR Xo Ic fudge Ar peer_address
-[ "time1" ]
-[ "time2" ]
+[ "\fItime1\fR" ]
+[ "\fItime2\fR" ]
 [ "\fIstratum\fR" ]
 [ "\fIrefid\fR" ]
 .Xc
@@ -750,7 +750,7 @@ configuration file commands of
 Unrestrict the matching entry from the restrict list.
 .TP
 .BR Xo Ic delrestrict Ar address Ar mask
-[ "ntpport" ]
+[ "\fIntpport\fR" ]
 .Xc
 Delete the matching entry from the restrict list.
 .TP
diff --git a/ntpdc/ntpdc.mdoc.in b/ntpdc/ntpdc.mdoc.in
index d724e9fb8b..b1cb3dd714 100644
--- a/ntpdc/ntpdc.mdoc.in
+++ b/ntpdc/ntpdc.mdoc.in
@@ -1,9 +1,9 @@
-.Dd September 24 2011
+.Dd September 27 2011
 .Dt NTPDC @NTPDC_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  September 24, 2011 at 02:02:08 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 27, 2011 at 10:38:03 AM by AutoGen 5.12
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpq/ntpq-opts.c b/ntpq/ntpq-opts.c
index ccfe5ba558..379ffd7ef2 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  September 24, 2011 at 02:02:09 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  September 27, 2011 at 10:38:08 AM by AutoGen 5.12
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -52,7 +52,7 @@ extern FILE * option_usage_fp;
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
 static char const zCopyright[333] =
-"ntpq 4.2.7p215\n\
+"ntpq 4.2.7p216\n\
 Copyright (C) 1970-2011 The University of Delaware, David L. Mills, and/or others, 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\
@@ -450,7 +450,7 @@ static tOptDesc optDesc[OPTION_CT] = {
  */
 static char const zPROGNAME[5] = "NTPQ";
 static char const zUsageTitle[121] =
-"ntpq - standard NTP query program - Ver. 4.2.7p215\n\
+"ntpq - standard NTP query program - Ver. 4.2.7p216\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n";
 static char const zRcName[7] = ".ntprc";
 static char const * const apzHomeList[3] = {
diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h
index 03d3226f2f..44ace66b6d 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  September 24, 2011 at 02:02:09 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  September 27, 2011 at 10:38:08 AM by AutoGen 5.12
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -80,8 +80,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    14
-#define NTPQ_VERSION       "4.2.7p215"
-#define NTPQ_FULL_VERSION  "ntpq 4.2.7p215"
+#define NTPQ_VERSION       "4.2.7p216"
+#define NTPQ_FULL_VERSION  "ntpq 4.2.7p216"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi
index 0847175681..6f3da9089d 100644
--- a/ntpq/ntpq-opts.texi
+++ b/ntpq/ntpq-opts.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntpq-opts.texi)
 # 
-# It has been AutoGen-ed  September 24, 2011 at 02:02:21 AM by AutoGen 5.12
+# It has been AutoGen-ed  September 27, 2011 at 10:38:24 AM by AutoGen 5.12
 # From the definitions    ntpq-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -40,7 +40,7 @@ This is the automatically generated usage text for ntpq:
 
 @exampleindent 0
 @example
-ntpq - standard NTP query program - Ver. 4.2.7p215
+ntpq - standard NTP query program - Ver. 4.2.7p216
 USAGE:  ntpq [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
diff --git a/ntpq/ntpq.1ntpqman b/ntpq/ntpq.1ntpqman
index 0d09c6f2f1..68bc899330 100644
--- a/ntpq/ntpq.1ntpqman
+++ b/ntpq/ntpq.1ntpqman
@@ -1,8 +1,8 @@
-.TH ntpq 1ntpqman "24 Sep 2011" "4.2.7p215" "User Commands"
+.TH ntpq 1ntpqman "27 Sep 2011" "4.2.7p216" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  September 24, 2011 at 02:02:18 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 27, 2011 at 10:38:21 AM by AutoGen 5.12
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/ntpq/ntpq.1ntpqmdoc b/ntpq/ntpq.1ntpqmdoc
index 343f0cb9da..00b29d82d1 100644
--- a/ntpq/ntpq.1ntpqmdoc
+++ b/ntpq/ntpq.1ntpqmdoc
@@ -1,9 +1,9 @@
-.Dd September 24 2011
+.Dd September 27 2011
 .Dt NTPQ 1ntpqmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  September 24, 2011 at 02:02:21 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 27, 2011 at 10:38:24 AM by AutoGen 5.12
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpq/ntpq.man.in b/ntpq/ntpq.man.in
index c7988284ec..e26c301ca5 100644
--- a/ntpq/ntpq.man.in
+++ b/ntpq/ntpq.man.in
@@ -1,8 +1,8 @@
-.TH ntpq @NTPQ_MS@ "24 Sep 2011" "4.2.7p215" "User Commands"
+.TH ntpq @NTPQ_MS@ "27 Sep 2011" "4.2.7p216" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  September 24, 2011 at 02:02:18 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 27, 2011 at 10:38:21 AM by AutoGen 5.12
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/ntpq/ntpq.mdoc.in b/ntpq/ntpq.mdoc.in
index eecf6d8779..825341315c 100644
--- a/ntpq/ntpq.mdoc.in
+++ b/ntpq/ntpq.mdoc.in
@@ -1,9 +1,9 @@
-.Dd September 24 2011
+.Dd September 27 2011
 .Dt NTPQ @NTPQ_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  September 24, 2011 at 02:02:21 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 27, 2011 at 10:38:24 AM by AutoGen 5.12
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpsnmpd/ntpsnmpd-opts.c b/ntpsnmpd/ntpsnmpd-opts.c
index 9294587754..79277b8e94 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  September 24, 2011 at 02:02:22 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  September 27, 2011 at 10:38:27 AM by AutoGen 5.12
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -52,7 +52,7 @@ extern FILE * option_usage_fp;
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
 static char const zCopyright[337] =
-"ntpsnmpd 4.2.7p215\n\
+"ntpsnmpd 4.2.7p216\n\
 Copyright (C) 1970-2011 The University of Delaware, David L. Mills, and/or others, 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\
@@ -277,7 +277,7 @@ static tOptDesc optDesc[OPTION_CT] = {
  */
 static char const zPROGNAME[9] = "NTPSNMPD";
 static char const zUsageTitle[105] =
-"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p215\n\
+"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p216\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
 static char const zRcName[7] = ".ntprc";
 static char const * const apzHomeList[3] = {
diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h
index 8d25fdcccc..28628d230c 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  September 24, 2011 at 02:02:22 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  September 27, 2011 at 10:38:27 AM by AutoGen 5.12
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -74,8 +74,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    8
-#define NTPSNMPD_VERSION       "4.2.7p215"
-#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.7p215"
+#define NTPSNMPD_VERSION       "4.2.7p216"
+#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.7p216"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpsnmpd/ntpsnmpd-opts.texi b/ntpsnmpd/ntpsnmpd-opts.texi
index 27b169df39..0f7b22f0ba 100644
--- a/ntpsnmpd/ntpsnmpd-opts.texi
+++ b/ntpsnmpd/ntpsnmpd-opts.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.texi)
 # 
-# It has been AutoGen-ed  September 24, 2011 at 02:02:27 AM by AutoGen 5.12
+# It has been AutoGen-ed  September 27, 2011 at 10:39:12 AM by AutoGen 5.12
 # From the definitions    ntpsnmpd-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -33,7 +33,7 @@ This is the automatically generated usage text for ntpsnmpd:
 
 @exampleindent 0
 @example
-ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p215
+ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p216
 USAGE:  ntpsnmpd [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
   Flg Arg Option-Name    Description
    -n no  nofork         Do not fork
diff --git a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
index b08be7346d..37273f6c9f 100644
--- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
+++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
@@ -1,8 +1,8 @@
-.TH ntpsnmpd 1ntpsnmpdman "24 Sep 2011" "4.2.7p215" "User Commands"
+.TH ntpsnmpd 1ntpsnmpdman "27 Sep 2011" "4.2.7p216" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  September 24, 2011 at 02:02:25 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 27, 2011 at 10:39:09 AM by AutoGen 5.12
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc b/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
index c75fbcd6b8..7657053252 100644
--- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
+++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
@@ -1,9 +1,9 @@
-.Dd September 24 2011
+.Dd September 27 2011
 .Dt NTPSNMPD 1ntpsnmpdmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  September 24, 2011 at 02:02:28 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 27, 2011 at 10:39:14 AM by AutoGen 5.12
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpsnmpd/ntpsnmpd.man.in b/ntpsnmpd/ntpsnmpd.man.in
index a48252c182..eb2c9ae113 100644
--- a/ntpsnmpd/ntpsnmpd.man.in
+++ b/ntpsnmpd/ntpsnmpd.man.in
@@ -1,8 +1,8 @@
-.TH ntpsnmpd @NTPSNMPD_MS@ "24 Sep 2011" "4.2.7p215" "User Commands"
+.TH ntpsnmpd @NTPSNMPD_MS@ "27 Sep 2011" "4.2.7p216" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  September 24, 2011 at 02:02:25 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 27, 2011 at 10:39:09 AM by AutoGen 5.12
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/ntpsnmpd/ntpsnmpd.mdoc.in b/ntpsnmpd/ntpsnmpd.mdoc.in
index cfbec45650..950e2a5d67 100644
--- a/ntpsnmpd/ntpsnmpd.mdoc.in
+++ b/ntpsnmpd/ntpsnmpd.mdoc.in
@@ -1,9 +1,9 @@
-.Dd September 24 2011
+.Dd September 27 2011
 .Dt NTPSNMPD @NTPSNMPD_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  September 24, 2011 at 02:02:28 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 27, 2011 at 10:39:14 AM by AutoGen 5.12
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/packageinfo.sh b/packageinfo.sh
index cc2a68bc6c..55442e0e32 100644
--- a/packageinfo.sh
+++ b/packageinfo.sh
@@ -70,7 +70,7 @@ CLTAG=NTP_4_2_0
 # - Numeric values increment
 # - empty 'increments' to 1
 # - NEW 'increments' to empty
-point=215
+point=216
 
 ### betapoint is normally modified by script.
 # ntp-stable Beta number (betapoint)
diff --git a/scripts/ntp-wait-opts.texi b/scripts/ntp-wait-opts.texi
index d47d7dfcd0..9888923f59 100644
--- a/scripts/ntp-wait-opts.texi
+++ b/scripts/ntp-wait-opts.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.texi)
 # 
-# It has been AutoGen-ed  September 24, 2011 at 02:01:32 AM by AutoGen 5.12
+# It has been AutoGen-ed  September 27, 2011 at 10:35:13 AM by AutoGen 5.12
 # From the definitions    ntp-wait-opts.def
 # and the template file   aginfo.tpl
 @end ignore
diff --git a/scripts/ntp-wait.1ntp-waitman b/scripts/ntp-wait.1ntp-waitman
index 6069b6b80a..ad64951b67 100644
--- a/scripts/ntp-wait.1ntp-waitman
+++ b/scripts/ntp-wait.1ntp-waitman
@@ -1,8 +1,8 @@
-.TH ntp-wait 1ntp-waitman "24 Sep 2011" "ntp (4.2.7p215)" "User Commands"
+.TH ntp-wait 1ntp-waitman "27 Sep 2011" "ntp (4.2.7p216)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  September 24, 2011 at 02:01:30 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 27, 2011 at 10:35:10 AM by AutoGen 5.12
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/scripts/ntp-wait.1ntp-waitmdoc b/scripts/ntp-wait.1ntp-waitmdoc
index c6f7909d2a..49d5c936f7 100644
--- a/scripts/ntp-wait.1ntp-waitmdoc
+++ b/scripts/ntp-wait.1ntp-waitmdoc
@@ -1,9 +1,9 @@
-.Dd September 24 2011
+.Dd September 27 2011
 .Dt NTP_WAIT 1ntp-waitmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  September 24, 2011 at 02:01:33 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 27, 2011 at 10:35:19 AM by AutoGen 5.12
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/scripts/ntp-wait.html b/scripts/ntp-wait.html
index e2f6164299..8e871955ac 100644
--- a/scripts/ntp-wait.html
+++ b/scripts/ntp-wait.html
@@ -36,7 +36,7 @@ display the time offset of the system clock relative to the server
 clock.  Run as root, it can correct the system clock to this offset as
 well.  It can be run as an interactive command or from a cron job.
 
-  <p>This document applies to version 4.2.7p215 of <code>ntp-wait</code>.
+  <p>This document applies to version 4.2.7p216 of <code>ntp-wait</code>.
 
   <p>The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
diff --git a/scripts/ntp-wait.man.in b/scripts/ntp-wait.man.in
index 021d3430ff..ca083096b6 100644
--- a/scripts/ntp-wait.man.in
+++ b/scripts/ntp-wait.man.in
@@ -1,8 +1,8 @@
-.TH ntp-wait @NTP_WAIT_MS@ "24 Sep 2011" "ntp (4.2.7p215)" "User Commands"
+.TH ntp-wait @NTP_WAIT_MS@ "27 Sep 2011" "ntp (4.2.7p216)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  September 24, 2011 at 02:01:30 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 27, 2011 at 10:35:10 AM by AutoGen 5.12
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/scripts/ntp-wait.mdoc.in b/scripts/ntp-wait.mdoc.in
index 099eed1003..3652fd24ee 100644
--- a/scripts/ntp-wait.mdoc.in
+++ b/scripts/ntp-wait.mdoc.in
@@ -1,9 +1,9 @@
-.Dd September 24 2011
+.Dd September 27 2011
 .Dt NTP_WAIT @NTP_WAIT_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  September 24, 2011 at 02:01:33 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 27, 2011 at 10:35:19 AM by AutoGen 5.12
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c
index 5957278d49..07b2d12e8b 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  September 24, 2011 at 01:56:15 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  September 27, 2011 at 10:24:20 AM by AutoGen 5.12
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -52,7 +52,7 @@ extern FILE * option_usage_fp;
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
 static char const zCopyright[333] =
-"sntp 4.2.7p215\n\
+"sntp 4.2.7p216\n\
 Copyright (C) 1970-2011 The University of Delaware, David L. Mills, and/or others, 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\
@@ -116,7 +116,7 @@ static const int
  *  Authentication option description:
  */
 static char const zAuthenticationText[] =
-        "Enable authentication with the key auth-keynumber";
+        "Enable authentication with the key @var{auth-keynumber}";
 static char const zAuthentication_NAME[]     = "AUTHENTICATION";
 static char const zAuthentication_Name[]     = "authentication";
 #define AUTHENTICATION_FLAGS       (OPTST_DISABLED \
@@ -198,7 +198,7 @@ static char const zKodDefaultArg[]             = "/var/db/ntp-kod";
  *  Keyfile option description:
  */
 static char const zKeyfileText[] =
-        "Look in this file for the key specified with -a";
+        "Look in this file for the key specified with @option{-a}";
 static char const zKeyfile_NAME[]            = "KEYFILE";
 static char const zKeyfile_Name[]            = "keyfile";
 #define KEYFILE_FLAGS       (OPTST_DISABLED \
@@ -218,7 +218,7 @@ static char const zLogfile_Name[]            = "logfile";
  *  Steplimit option description:
  */
 static char const zSteplimitText[] =
-        "Adjustments less than @file{steplimit} msec will be slewed";
+        "Adjustments less than @var{steplimit} msec will be slewed";
 static char const zSteplimit_NAME[]          = "STEPLIMIT";
 static char const zSteplimit_Name[]          = "steplimit";
 #define STEPLIMIT_FLAGS       (OPTST_DISABLED \
@@ -228,7 +228,7 @@ static char const zSteplimit_Name[]          = "steplimit";
  *  Ntpversion option description:
  */
 static char const zNtpversionText[] =
-        "Send <int> as our NTP version";
+        "Send @var{int} as our NTP version";
 static char const zNtpversion_NAME[]         = "NTPVERSION";
 static char const zNtpversion_Name[]         = "ntpversion";
 #define zNtpversionDefaultArg        ((char const*)4)
@@ -248,7 +248,7 @@ static char const zUsereservedport_Name[]    = "usereservedport";
  *  Step option description:
  */
 static char const zStepText[] =
-        "OK to 'step' the time with settimeofday(2)";
+        "OK to 'step' the time with @command{settimeofday(2)}";
 static char const zStep_NAME[]               = "STEP";
 static char const zStep_Name[]               = "step";
 #define STEP_FLAGS       (OPTST_DISABLED)
@@ -257,7 +257,7 @@ static char const zStep_Name[]               = "step";
  *  Slew option description:
  */
 static char const zSlewText[] =
-        "OK to 'slew' the time with adjtime(2)";
+        "OK to 'slew' the time with @command{adjtime(2)}";
 static char const zSlew_NAME[]               = "SLEW";
 static char const zSlew_Name[]               = "slew";
 #define SLEW_FLAGS       (OPTST_DISABLED)
@@ -663,7 +663,7 @@ static tOptDesc optDesc[OPTION_CT] = {
  */
 static char const zPROGNAME[5] = "SNTP";
 static char const zUsageTitle[161] =
-"sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p215\n\
+"sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p216\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n\
 \t\t[ hostname-or-IP ...]\n";
 static char const zRcName[7] = ".ntprc";
diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h
index 9cdfc428d2..68a56c82ce 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  September 24, 2011 at 01:56:15 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  September 27, 2011 at 10:24:17 AM by AutoGen 5.12
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -90,8 +90,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    24
-#define SNTP_VERSION       "4.2.7p215"
-#define SNTP_FULL_VERSION  "sntp 4.2.7p215"
+#define SNTP_VERSION       "4.2.7p216"
+#define SNTP_FULL_VERSION  "sntp 4.2.7p216"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi
index d8cbe0038e..0a2f0eb05b 100644
--- a/sntp/sntp-opts.texi
+++ b/sntp/sntp-opts.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (sntp-opts.texi)
 # 
-# It has been AutoGen-ed  September 24, 2011 at 02:02:48 AM by AutoGen 5.12
+# It has been AutoGen-ed  September 27, 2011 at 10:40:00 AM by AutoGen 5.12
 # From the definitions    sntp-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -91,7 +91,7 @@ This is the automatically generated usage text for sntp:
 
 @exampleindent 0
 @example
-sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p215
+sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p216
 USAGE:  sntp [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description
@@ -101,7 +101,7 @@ USAGE:  sntp [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... \
    -6 no  ipv6           Force IPv6 DNS name resolution
                                 - prohibits these options:
                                 ipv4
-   -a Num authentication Enable authentication with the key auth-keynumber
+   -a Num authentication Enable authentication with the key @@var@{auth-keynumber@}
    -B Num bctimeout      The number of seconds to wait for broadcasts
    -b Str broadcast      Listen to the address specified for broadcast time sync
                                 - may appear multiple times
@@ -113,17 +113,17 @@ USAGE:  sntp [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... \
                                 - may appear multiple times
    -g Num gap            The gap (in milliseconds) between time requests
    -K Fil kod            KoD history filename
-   -k Fil keyfile        Look in this file for the key specified with -a
+   -k Fil keyfile        Look in this file for the key specified with @@option@{-a@}
    -l Fil logfile        Log to specified logfile
-   -M Num steplimit      Adjustments less than @@file@{steplimit@} msec will be slewed
+   -M Num steplimit      Adjustments less than @@var@{steplimit@} msec will be slewed
                                 - It must be in the range:
                                   greater than or equal to 0
-   -o Num ntpversion     Send <int> as our NTP version
+   -o Num ntpversion     Send @@var@{int@} as our NTP version
                                 - It must be in the range:
                                   0 to 7
    -r no  usereservedport Use the NTP Reserved Port (port 123)
-   -S no  step           OK to 'step' the time with settimeofday(2)
-   -s no  slew           OK to 'slew' the time with adjtime(2)
+   -S no  step           OK to 'step' the time with @@command@{settimeofday(2)@}
+   -s no  slew           OK to 'slew' the time with @@command@{adjtime(2)@}
    -u Num uctimeout      The number of seconds to wait for unicast responses
       no  wait           Wait for pending replies (if not setting the time)
                                 - disabled as --no-wait
@@ -154,11 +154,11 @@ please send bug reports to:  http://bugs.ntp.org, bugs@@ntp.org
 @subsection authentication option (-a)
 @cindex sntp-authentication
 
-This is the ``enable authentication with the key auth-keynumber'' option.
+This is the ``enable authentication with the key @var{auth-keynumber}'' option.
 This option enables authentication using the key specified in this
 option's argument.  The argument of this option is the keyid, a
 number specified in the keyfile as this key's identifier. See the
-keyfile option (-k) for more details.
+keyfile option (@option{-k}) for more details.
 
 @node sntp bctimeout
 @subsection bctimeout option (-B)
@@ -182,7 +182,7 @@ may appear an unlimited number of times.
 
 If specified @code{sntp} will listen to the specified address
 for NTP broadcasts.  The default maximum wait time
-can be modified with @code{-B}.
+can be modified with @option{-B}.
 
 @node sntp concurrent
 @subsection concurrent option (-c)
@@ -202,7 +202,7 @@ as part of a DNS lookup are assumed to be for a single instance of
 ntpd, and therefore @code{sntp} will send queries to these IPs one
 after another, with a 2-second gap in between each query.
 
-The @code{-c} or @code{--concurrent} flag says that any IPs
+The @option{-c} or @option{--concurrent} flag says that any IPs
 returned for the DNS lookup of the supplied host-name are on
 different machines, so we can send concurrent queries.
 
@@ -266,9 +266,9 @@ to the IPv6 namespace.
 @subsection keyfile option (-k)
 @cindex sntp-keyfile
 
-This is the ``look in this file for the key specified with -a'' option.
+This is the ``look in this file for the key specified with @option{-a}'' option.
 This option specifies the keyfile.
-@code{sntp} will search for the key specified with @code{-a}
+@code{sntp} will search for the key specified with @option{-a}
 @file{keyno} in this file.  Key files follow the following format:
 
 @file{keyid keytype key}
@@ -280,7 +280,7 @@ Where	@file{keyid} is a number identifying this key
 @code{A}  Key is a 1-to-8 character ASCII string.
 @code{M}  Key is a 1-to-8 character ASCII string using the MD5 authentication scheme.
 
-For more information see ntp.keys(5).
+For more information see @command{ntp.keys(5)}.
 
 @node sntp kod
 @subsection kod option (-K)
@@ -302,7 +302,7 @@ This option causes the client to write log messages to the specified
 @subsection ntpversion option (-o)
 @cindex sntp-ntpversion
 
-This is the ``send <int> as our ntp version'' option.
+This is the ``send @var{int} as our ntp version'' option.
 When sending requests to a remote server, tell them we are running
 NTP protocol version @file{ntpversion} .
 
@@ -324,24 +324,24 @@ may appear an unlimited number of times.
 @subsection slew option (-s)
 @cindex sntp-slew
 
-This is the ``ok to 'slew' the time with adjtime(2)'' option.
+This is the ``ok to 'slew' the time with @command{adjtime(2)}'' option.
 
 
 @node sntp step
 @subsection step option (-S)
 @cindex sntp-step
 
-This is the ``ok to 'step' the time with settimeofday(2)'' option.
+This is the ``ok to 'step' the time with @command{settimeofday(2)}'' option.
 
 
 @node sntp steplimit
 @subsection steplimit option (-M)
 @cindex sntp-steplimit
 
-This is the ``adjustments less than @file{steplimit} msec will be slewed'' option.
+This is the ``adjustments less than @var{steplimit} msec will be slewed'' option.
 If the time adjustment is less than @file{steplimit} milliseconds,
-slew the amount using adjtime(2).  Otherwise, step the correction
-using settimeofday(2). 
+slew the amount using @command{adjtime(2)}.  Otherwise, step the
+correction using @command{settimeofday(2)}. 
 
 @node sntp uctimeout
 @subsection uctimeout option (-u)
diff --git a/sntp/sntp.1sntpman b/sntp/sntp.1sntpman
index 22a4375c90..5948cb1d3e 100644
--- a/sntp/sntp.1sntpman
+++ b/sntp/sntp.1sntpman
@@ -1,8 +1,8 @@
-.TH sntp 1sntpman "24 Sep 2011" "4.2.7p215" "User Commands"
+.TH sntp 1sntpman "27 Sep 2011" "4.2.7p216" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  September 24, 2011 at 02:02:46 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 27, 2011 at 10:39:57 AM by AutoGen 5.12
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -73,13 +73,13 @@ Force DNS resolution of the following host names on the command line
 to the IPv6 namespace.
 .TP
 .BR \-a " \fIauth\-keynumber\fP, " \-\-authentication "=" \fIauth\-keynumber\fP
-Enable authentication with the key auth-keynumber.
+Enable authentication with the key @var{auth-keynumber}.
 This option takes an integer number as its argument.
 .sp
 This option enables authentication using the key specified in this
 option's argument.  The argument of this option is the keyid, a
 number specified in the keyfile as this key's identifier. See the
-keyfile option (-k) for more details.
+keyfile option (@option{-k}) for more details.
 .TP
 .BR \-B " \fIseconds\fP, " \-\-bctimeout "=" \fIseconds\fP
 The number of seconds to wait for broadcasts.
@@ -97,7 +97,7 @@ This option may appear an unlimited number of times.
 .sp
 If specified @code{sntp} will listen to the specified address
 for NTP broadcasts.  The default maximum wait time
-can be modified with @code{-B}.
+can be modified with @option{-B}.
 .TP
 .BR \-c " \fIhost\-name\fP, " \-\-concurrent "=" \fIhost\-name\fP
 Concurrently query all IPs returned for host-name.
@@ -108,7 +108,7 @@ more rapidly than one every 2 seconds.  By default, any IPs returned
 as part of a DNS lookup are assumed to be for a single instance of
 ntpd, and therefore @code{sntp} will send queries to these IPs one
 after another, with a 2-second gap in between each query.
-The @code{-c} or @code{--concurrent} flag says that any IPs
+The @option{-c} or @option{--concurrent} flag says that any IPs
 returned for the DNS lookup of the supplied host-name are on
 different machines, so we can send concurrent queries.
 .TP
@@ -144,10 +144,10 @@ Specifies the filename to be used for the persistent history of KoD
 responses received from servers.
 .TP
 .BR \-k " \fIfile\-name\fP, " \-\-keyfile "=" \fIfile\-name\fP
-Look in this file for the key specified with -a.
+Look in this file for the key specified with @option{-a}.
 .sp
 This option specifies the keyfile.
-@code{sntp} will search for the key specified with @code{-a}
+@code{sntp} will search for the key specified with @option{-a}
 @file{keyno} in this file.  Key files follow the following format:
 @file{keyid keytype key}
 Where	@file{keyid} is a number identifying this key
@@ -156,7 +156,7 @@ Where	@file{keyid} is a number identifying this key
 @code{N}  Key is a 64 Bit hexadecimal number as specified in the NTP standard.
 @code{A}  Key is a 1-to-8 character ASCII string.
 @code{M}  Key is a 1-to-8 character ASCII string using the MD5 authentication scheme.
-For more information see ntp.keys(5).
+For more information see @command{ntp.keys(5)}.
 .TP
 .BR \-l " \fIfile\-name\fP, " \-\-logfile "=" \fIfile\-name\fP
 Log to specified logfile.
@@ -165,7 +165,7 @@ This option causes the client to write log messages to the specified
 @file{logfile}.
 .TP
 .BR \-M " \fInumber\fP, " \-\-steplimit "=" \fInumber\fP
-Adjustments less than @file{steplimit} msec will be slewed.
+Adjustments less than @var{steplimit} msec will be slewed.
 This option takes an integer number as its argument.
 The value of \fInumber\fP is constrained to being:
 .in +4
@@ -176,11 +176,11 @@ greater than or equal to 0
 .in -4
 .sp
 If the time adjustment is less than @file{steplimit} milliseconds,
-slew the amount using adjtime(2).  Otherwise, step the correction
-using settimeofday(2). 
+slew the amount using @command{adjtime(2)}.  Otherwise, step the
+correction using @command{settimeofday(2)}. 
 .TP
 .BR \-o " \fInumber\fP, " \-\-ntpversion "=" \fInumber\fP
-Send <int> as our NTP version.
+Send @var{int} as our NTP version.
 This option takes an integer number as its argument.
 The value of \fInumber\fP is constrained to being:
 .in +4
@@ -203,11 +203,11 @@ Use port 123, which is reserved for NTP, for our network
 communications.
 .TP
 .BR \-S ", " -\-step
-OK to 'step' the time with settimeofday(2).
+OK to 'step' the time with @command{settimeofday(2)}.
 .sp
 .TP
 .BR \-s ", " -\-slew
-OK to 'slew' the time with adjtime(2).
+OK to 'slew' the time with @command{adjtime(2)}.
 .sp
 .TP
 .BR \-u " \fIseconds\fP, " \-\-uctimeout "=" \fIseconds\fP
diff --git a/sntp/sntp.1sntpmdoc b/sntp/sntp.1sntpmdoc
index f8147d46a4..064c896c52 100644
--- a/sntp/sntp.1sntpmdoc
+++ b/sntp/sntp.1sntpmdoc
@@ -1,9 +1,9 @@
-.Dd September 24 2011
+.Dd September 27 2011
 .Dt SNTP 1sntpmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  September 24, 2011 at 02:02:49 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 27, 2011 at 10:40:01 AM by AutoGen 5.12
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -75,13 +75,13 @@ ipv4.
 Force DNS resolution of the following host names on the command line
 to the IPv6 namespace.
 .It  \-a " \fIauth\-keynumber\fP, " \-\-authentication "=" \fIauth\-keynumber\fP
-Enable authentication with the key auth-keynumber.
+Enable authentication with the key @var{auth-keynumber}.
 This option takes an integer number as its argument.
 .sp
 This option enables authentication using the key specified in this
 option's argument.  The argument of this option is the keyid, a
 number specified in the keyfile as this key's identifier. See the
-keyfile option (-k) for more details.
+keyfile option (@option{-k}) for more details.
 .It  \-B " \fIseconds\fP, " \-\-bctimeout "=" \fIseconds\fP
 The number of seconds to wait for broadcasts.
 This option takes an integer number as its argument.
@@ -97,7 +97,7 @@ This option may appear an unlimited number of times.
 .sp
 If specified @code{sntp} will listen to the specified address
 for NTP broadcasts.  The default maximum wait time
-can be modified with @code{-B}.
+can be modified with @option{-B}.
 .It  \-c " \fIhost\-name\fP, " \-\-concurrent "=" \fIhost\-name\fP
 Concurrently query all IPs returned for host-name.
 This option may appear an unlimited number of times.
@@ -107,7 +107,7 @@ more rapidly than one every 2 seconds.  By default, any IPs returned
 as part of a DNS lookup are assumed to be for a single instance of
 ntpd, and therefore @code{sntp} will send queries to these IPs one
 after another, with a 2-second gap in between each query.
-The @code{-c} or @code{--concurrent} flag says that any IPs
+The @option{-c} or @option{--concurrent} flag says that any IPs
 returned for the DNS lookup of the supplied host-name are on
 different machines, so we can send concurrent queries.
 .It  \-d ", " -\-debug\-level
@@ -138,10 +138,10 @@ The default \fIfile\-name\fP for this option is:
 Specifies the filename to be used for the persistent history of KoD
 responses received from servers.
 .It  \-k " \fIfile\-name\fP, " \-\-keyfile "=" \fIfile\-name\fP
-Look in this file for the key specified with -a.
+Look in this file for the key specified with @option{-a}.
 .sp
 This option specifies the keyfile.
-@code{sntp} will search for the key specified with @code{-a}
+@code{sntp} will search for the key specified with @option{-a}
 @file{keyno} in this file.  Key files follow the following format:
 @file{keyid keytype key}
 Where	@file{keyid} is a number identifying this key
@@ -150,14 +150,14 @@ Where	@file{keyid} is a number identifying this key
 @code{N}  Key is a 64 Bit hexadecimal number as specified in the NTP standard.
 @code{A}  Key is a 1-to-8 character ASCII string.
 @code{M}  Key is a 1-to-8 character ASCII string using the MD5 authentication scheme.
-For more information see ntp.keys(5).
+For more information see @command{ntp.keys(5)}.
 .It  \-l " \fIfile\-name\fP, " \-\-logfile "=" \fIfile\-name\fP
 Log to specified logfile.
 .sp
 This option causes the client to write log messages to the specified
 @file{logfile}.
 .It  \-M " \fInumber\fP, " \-\-steplimit "=" \fInumber\fP
-Adjustments less than @file{steplimit} msec will be slewed.
+Adjustments less than @var{steplimit} msec will be slewed.
 This option takes an integer number as its argument.
 The value of \fInumber\fP is constrained to being:
 .in +4
@@ -168,10 +168,10 @@ greater than or equal to 0
 .in -4
 .sp
 If the time adjustment is less than @file{steplimit} milliseconds,
-slew the amount using adjtime(2).  Otherwise, step the correction
-using settimeofday(2). 
+slew the amount using @command{adjtime(2)}.  Otherwise, step the
+correction using @command{settimeofday(2)}. 
 .It  \-o " \fInumber\fP, " \-\-ntpversion "=" \fInumber\fP
-Send <int> as our NTP version.
+Send @var{int} as our NTP version.
 This option takes an integer number as its argument.
 The value of \fInumber\fP is constrained to being:
 .in +4
@@ -192,10 +192,10 @@ Use the NTP Reserved Port (port 123).
 Use port 123, which is reserved for NTP, for our network
 communications.
 .It  \-S ", " -\-step
-OK to 'step' the time with settimeofday(2).
+OK to 'step' the time with @command{settimeofday(2)}.
 .sp
 .It  \-s ", " -\-slew
-OK to 'slew' the time with adjtime(2).
+OK to 'slew' the time with @command{adjtime(2)}.
 .sp
 .It  \-u " \fIseconds\fP, " \-\-uctimeout "=" \fIseconds\fP
 The number of seconds to wait for unicast responses.
diff --git a/sntp/sntp.html b/sntp/sntp.html
index 3422b17bd9..7a568e1e05 100644
--- a/sntp/sntp.html
+++ b/sntp/sntp.html
@@ -36,7 +36,7 @@ display the time offset of the system clock relative to the server
 clock.  Run as root, it can correct the system clock to this offset as
 well.  It can be run as an interactive command or from a cron job.
 
-  <p>This document applies to version 4.2.7p215 of <code>sntp</code>.
+  <p>This document applies to version 4.2.7p216 of <code>sntp</code>.
 
   <p>The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
@@ -162,7 +162,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
 <p><a name="index-sntp-usage-3"></a>
 This is the automatically generated usage text for sntp:
 
-<pre class="example">sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p215
+<pre class="example">sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p216
 USAGE:  sntp [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description
@@ -172,7 +172,7 @@ USAGE:  sntp [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ].
    -6 no  ipv6           Force IPv6 DNS name resolution
                                 - prohibits these options:
                                 ipv4
-   -a Num authentication Enable authentication with the key auth-keynumber
+   -a Num authentication Enable authentication with the key @var{auth-keynumber}
    -B Num bctimeout      The number of seconds to wait for broadcasts
    -b Str broadcast      Listen to the address specified for broadcast time sync
                                 - may appear multiple times
@@ -184,17 +184,17 @@ USAGE:  sntp [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ].
                                 - may appear multiple times
    -g Num gap            The gap (in milliseconds) between time requests
    -K Fil kod            KoD history filename
-   -k Fil keyfile        Look in this file for the key specified with -a
+   -k Fil keyfile        Look in this file for the key specified with @option{-a}
    -l Fil logfile        Log to specified logfile
-   -M Num steplimit      Adjustments less than @file{steplimit} msec will be slewed
+   -M Num steplimit      Adjustments less than @var{steplimit} msec will be slewed
                                 - It must be in the range:
                                   greater than or equal to 0
-   -o Num ntpversion     Send &lt;int&gt; as our NTP version
+   -o Num ntpversion     Send @var{int} as our NTP version
                                 - It must be in the range:
                                   0 to 7
    -r no  usereservedport Use the NTP Reserved Port (port 123)
-   -S no  step           OK to 'step' the time with settimeofday(2)
-   -s no  slew           OK to 'slew' the time with adjtime(2)
+   -S no  step           OK to 'step' the time with @command{settimeofday(2)}
+   -s no  slew           OK to 'slew' the time with @command{adjtime(2)}
    -u Num uctimeout      The number of seconds to wait for unicast responses
       no  wait           Wait for pending replies (if not setting the time)
                                 - disabled as --no-wait
@@ -230,11 +230,11 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
 <h4 class="subsection">authentication option (-a)</h4>
 
 <p><a name="index-sntp_002dauthentication-4"></a>
-This is the &ldquo;enable authentication with the key auth-keynumber&rdquo; option. 
+This is the &ldquo;enable authentication with the key <var>auth-keynumber</var>&rdquo; option. 
 This option enables authentication using the key specified in this
 option's argument.  The argument of this option is the keyid, a
 number specified in the keyfile as this key's identifier. See the
-keyfile option (-k) for more details.
+keyfile option (<span class="option">-k</span>) for more details.
 
 <div class="node">
 <p><hr>
@@ -271,7 +271,7 @@ This is the &ldquo;listen to the address specified for broadcast time sync&rdquo
 
   <p>If specified <code>sntp</code> will listen to the specified address
 for NTP broadcasts.  The default maximum wait time
-can be modified with <code>-B</code>.
+can be modified with <span class="option">-B</span>.
 
 <div class="node">
 <p><hr>
@@ -297,7 +297,7 @@ as part of a DNS lookup are assumed to be for a single instance of
 ntpd, and therefore <code>sntp</code> will send queries to these IPs one
 after another, with a 2-second gap in between each query.
 
-  <p>The <code>-c</code> or <code>--concurrent</code> flag says that any IPs
+  <p>The <span class="option">-c</span> or <span class="option">--concurrent</span> flag says that any IPs
 returned for the DNS lookup of the supplied host-name are on
 different machines, so we can send concurrent queries.
 
@@ -391,9 +391,9 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
 <h4 class="subsection">keyfile option (-k)</h4>
 
 <p><a name="index-sntp_002dkeyfile-12"></a>
-This is the &ldquo;look in this file for the key specified with -a&rdquo; option. 
+This is the &ldquo;look in this file for the key specified with <span class="option">-a</span>&rdquo; option. 
 This option specifies the keyfile. 
-<code>sntp</code> will search for the key specified with <code>-a</code>
+<code>sntp</code> will search for the key specified with <span class="option">-a</span>
 <span class="file">keyno</span> in this file.  Key files follow the following format:
 
   <p><span class="file">keyid keytype key</span>
@@ -405,7 +405,7 @@ This option specifies the keyfile.
 <code>A</code>  Key is a 1-to-8 character ASCII string. 
 <code>M</code>  Key is a 1-to-8 character ASCII string using the MD5 authentication scheme.
 
-  <p>For more information see ntp.keys(5).
+  <p>For more information see <span class="command">ntp.keys(5)</span>.
 
 <div class="node">
 <p><hr>
@@ -448,7 +448,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
 <h4 class="subsection">ntpversion option (-o)</h4>
 
 <p><a name="index-sntp_002dntpversion-15"></a>
-This is the &ldquo;send &lt;int&gt; as our ntp version&rdquo; option. 
+This is the &ldquo;send <var>int</var> as our ntp version&rdquo; option. 
 When sending requests to a remote server, tell them we are running
 NTP protocol version <span class="file">ntpversion</span> .
 
@@ -481,7 +481,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
 <h4 class="subsection">slew option (-s)</h4>
 
 <p><a name="index-sntp_002dslew-17"></a>
-This is the &ldquo;ok to 'slew' the time with adjtime(2)&rdquo; option.
+This is the &ldquo;ok to 'slew' the time with <span class="command">adjtime(2)</span>&rdquo; option.
 
 <div class="node">
 <p><hr>
@@ -494,7 +494,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
 <h4 class="subsection">step option (-S)</h4>
 
 <p><a name="index-sntp_002dstep-18"></a>
-This is the &ldquo;ok to 'step' the time with settimeofday(2)&rdquo; option.
+This is the &ldquo;ok to 'step' the time with <span class="command">settimeofday(2)</span>&rdquo; option.
 
 <div class="node">
 <p><hr>
@@ -507,10 +507,10 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
 <h4 class="subsection">steplimit option (-M)</h4>
 
 <p><a name="index-sntp_002dsteplimit-19"></a>
-This is the &ldquo;adjustments less than <span class="file">steplimit</span> msec will be slewed&rdquo; option. 
+This is the &ldquo;adjustments less than <var>steplimit</var> msec will be slewed&rdquo; option. 
 If the time adjustment is less than <span class="file">steplimit</span> milliseconds,
-slew the amount using adjtime(2).  Otherwise, step the correction
-using settimeofday(2).
+slew the amount using <span class="command">adjtime(2)</span>.  Otherwise, step the
+correction using <span class="command">settimeofday(2)</span>.
 
 <div class="node">
 <p><hr>
diff --git a/sntp/sntp.man.in b/sntp/sntp.man.in
index bb32734b75..16ab36d98c 100644
--- a/sntp/sntp.man.in
+++ b/sntp/sntp.man.in
@@ -1,8 +1,8 @@
-.TH sntp @SNTP_MS@ "24 Sep 2011" "4.2.7p215" "User Commands"
+.TH sntp @SNTP_MS@ "27 Sep 2011" "4.2.7p216" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  September 24, 2011 at 02:02:46 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 27, 2011 at 10:39:57 AM by AutoGen 5.12
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -73,13 +73,13 @@ Force DNS resolution of the following host names on the command line
 to the IPv6 namespace.
 .TP
 .BR \-a " \fIauth\-keynumber\fP, " \-\-authentication "=" \fIauth\-keynumber\fP
-Enable authentication with the key auth-keynumber.
+Enable authentication with the key @var{auth-keynumber}.
 This option takes an integer number as its argument.
 .sp
 This option enables authentication using the key specified in this
 option's argument.  The argument of this option is the keyid, a
 number specified in the keyfile as this key's identifier. See the
-keyfile option (-k) for more details.
+keyfile option (@option{-k}) for more details.
 .TP
 .BR \-B " \fIseconds\fP, " \-\-bctimeout "=" \fIseconds\fP
 The number of seconds to wait for broadcasts.
@@ -97,7 +97,7 @@ This option may appear an unlimited number of times.
 .sp
 If specified @code{sntp} will listen to the specified address
 for NTP broadcasts.  The default maximum wait time
-can be modified with @code{-B}.
+can be modified with @option{-B}.
 .TP
 .BR \-c " \fIhost\-name\fP, " \-\-concurrent "=" \fIhost\-name\fP
 Concurrently query all IPs returned for host-name.
@@ -108,7 +108,7 @@ more rapidly than one every 2 seconds.  By default, any IPs returned
 as part of a DNS lookup are assumed to be for a single instance of
 ntpd, and therefore @code{sntp} will send queries to these IPs one
 after another, with a 2-second gap in between each query.
-The @code{-c} or @code{--concurrent} flag says that any IPs
+The @option{-c} or @option{--concurrent} flag says that any IPs
 returned for the DNS lookup of the supplied host-name are on
 different machines, so we can send concurrent queries.
 .TP
@@ -144,10 +144,10 @@ Specifies the filename to be used for the persistent history of KoD
 responses received from servers.
 .TP
 .BR \-k " \fIfile\-name\fP, " \-\-keyfile "=" \fIfile\-name\fP
-Look in this file for the key specified with -a.
+Look in this file for the key specified with @option{-a}.
 .sp
 This option specifies the keyfile.
-@code{sntp} will search for the key specified with @code{-a}
+@code{sntp} will search for the key specified with @option{-a}
 @file{keyno} in this file.  Key files follow the following format:
 @file{keyid keytype key}
 Where	@file{keyid} is a number identifying this key
@@ -156,7 +156,7 @@ Where	@file{keyid} is a number identifying this key
 @code{N}  Key is a 64 Bit hexadecimal number as specified in the NTP standard.
 @code{A}  Key is a 1-to-8 character ASCII string.
 @code{M}  Key is a 1-to-8 character ASCII string using the MD5 authentication scheme.
-For more information see ntp.keys(5).
+For more information see @command{ntp.keys(5)}.
 .TP
 .BR \-l " \fIfile\-name\fP, " \-\-logfile "=" \fIfile\-name\fP
 Log to specified logfile.
@@ -165,7 +165,7 @@ This option causes the client to write log messages to the specified
 @file{logfile}.
 .TP
 .BR \-M " \fInumber\fP, " \-\-steplimit "=" \fInumber\fP
-Adjustments less than @file{steplimit} msec will be slewed.
+Adjustments less than @var{steplimit} msec will be slewed.
 This option takes an integer number as its argument.
 The value of \fInumber\fP is constrained to being:
 .in +4
@@ -176,11 +176,11 @@ greater than or equal to 0
 .in -4
 .sp
 If the time adjustment is less than @file{steplimit} milliseconds,
-slew the amount using adjtime(2).  Otherwise, step the correction
-using settimeofday(2). 
+slew the amount using @command{adjtime(2)}.  Otherwise, step the
+correction using @command{settimeofday(2)}. 
 .TP
 .BR \-o " \fInumber\fP, " \-\-ntpversion "=" \fInumber\fP
-Send <int> as our NTP version.
+Send @var{int} as our NTP version.
 This option takes an integer number as its argument.
 The value of \fInumber\fP is constrained to being:
 .in +4
@@ -203,11 +203,11 @@ Use port 123, which is reserved for NTP, for our network
 communications.
 .TP
 .BR \-S ", " -\-step
-OK to 'step' the time with settimeofday(2).
+OK to 'step' the time with @command{settimeofday(2)}.
 .sp
 .TP
 .BR \-s ", " -\-slew
-OK to 'slew' the time with adjtime(2).
+OK to 'slew' the time with @command{adjtime(2)}.
 .sp
 .TP
 .BR \-u " \fIseconds\fP, " \-\-uctimeout "=" \fIseconds\fP
diff --git a/sntp/sntp.mdoc.in b/sntp/sntp.mdoc.in
index 65eb2cd15b..d07d8e6f8a 100644
--- a/sntp/sntp.mdoc.in
+++ b/sntp/sntp.mdoc.in
@@ -1,9 +1,9 @@
-.Dd September 24 2011
+.Dd September 27 2011
 .Dt SNTP @SNTP_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  September 24, 2011 at 02:02:49 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 27, 2011 at 10:40:01 AM by AutoGen 5.12
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -75,13 +75,13 @@ ipv4.
 Force DNS resolution of the following host names on the command line
 to the IPv6 namespace.
 .It  \-a " \fIauth\-keynumber\fP, " \-\-authentication "=" \fIauth\-keynumber\fP
-Enable authentication with the key auth-keynumber.
+Enable authentication with the key @var{auth-keynumber}.
 This option takes an integer number as its argument.
 .sp
 This option enables authentication using the key specified in this
 option's argument.  The argument of this option is the keyid, a
 number specified in the keyfile as this key's identifier. See the
-keyfile option (-k) for more details.
+keyfile option (@option{-k}) for more details.
 .It  \-B " \fIseconds\fP, " \-\-bctimeout "=" \fIseconds\fP
 The number of seconds to wait for broadcasts.
 This option takes an integer number as its argument.
@@ -97,7 +97,7 @@ This option may appear an unlimited number of times.
 .sp
 If specified @code{sntp} will listen to the specified address
 for NTP broadcasts.  The default maximum wait time
-can be modified with @code{-B}.
+can be modified with @option{-B}.
 .It  \-c " \fIhost\-name\fP, " \-\-concurrent "=" \fIhost\-name\fP
 Concurrently query all IPs returned for host-name.
 This option may appear an unlimited number of times.
@@ -107,7 +107,7 @@ more rapidly than one every 2 seconds.  By default, any IPs returned
 as part of a DNS lookup are assumed to be for a single instance of
 ntpd, and therefore @code{sntp} will send queries to these IPs one
 after another, with a 2-second gap in between each query.
-The @code{-c} or @code{--concurrent} flag says that any IPs
+The @option{-c} or @option{--concurrent} flag says that any IPs
 returned for the DNS lookup of the supplied host-name are on
 different machines, so we can send concurrent queries.
 .It  \-d ", " -\-debug\-level
@@ -138,10 +138,10 @@ The default \fIfile\-name\fP for this option is:
 Specifies the filename to be used for the persistent history of KoD
 responses received from servers.
 .It  \-k " \fIfile\-name\fP, " \-\-keyfile "=" \fIfile\-name\fP
-Look in this file for the key specified with -a.
+Look in this file for the key specified with @option{-a}.
 .sp
 This option specifies the keyfile.
-@code{sntp} will search for the key specified with @code{-a}
+@code{sntp} will search for the key specified with @option{-a}
 @file{keyno} in this file.  Key files follow the following format:
 @file{keyid keytype key}
 Where	@file{keyid} is a number identifying this key
@@ -150,14 +150,14 @@ Where	@file{keyid} is a number identifying this key
 @code{N}  Key is a 64 Bit hexadecimal number as specified in the NTP standard.
 @code{A}  Key is a 1-to-8 character ASCII string.
 @code{M}  Key is a 1-to-8 character ASCII string using the MD5 authentication scheme.
-For more information see ntp.keys(5).
+For more information see @command{ntp.keys(5)}.
 .It  \-l " \fIfile\-name\fP, " \-\-logfile "=" \fIfile\-name\fP
 Log to specified logfile.
 .sp
 This option causes the client to write log messages to the specified
 @file{logfile}.
 .It  \-M " \fInumber\fP, " \-\-steplimit "=" \fInumber\fP
-Adjustments less than @file{steplimit} msec will be slewed.
+Adjustments less than @var{steplimit} msec will be slewed.
 This option takes an integer number as its argument.
 The value of \fInumber\fP is constrained to being:
 .in +4
@@ -168,10 +168,10 @@ greater than or equal to 0
 .in -4
 .sp
 If the time adjustment is less than @file{steplimit} milliseconds,
-slew the amount using adjtime(2).  Otherwise, step the correction
-using settimeofday(2). 
+slew the amount using @command{adjtime(2)}.  Otherwise, step the
+correction using @command{settimeofday(2)}. 
 .It  \-o " \fInumber\fP, " \-\-ntpversion "=" \fInumber\fP
-Send <int> as our NTP version.
+Send @var{int} as our NTP version.
 This option takes an integer number as its argument.
 The value of \fInumber\fP is constrained to being:
 .in +4
@@ -192,10 +192,10 @@ Use the NTP Reserved Port (port 123).
 Use port 123, which is reserved for NTP, for our network
 communications.
 .It  \-S ", " -\-step
-OK to 'step' the time with settimeofday(2).
+OK to 'step' the time with @command{settimeofday(2)}.
 .sp
 .It  \-s ", " -\-slew
-OK to 'slew' the time with adjtime(2).
+OK to 'slew' the time with @command{adjtime(2)}.
 .sp
 .It  \-u " \fIseconds\fP, " \-\-uctimeout "=" \fIseconds\fP
 The number of seconds to wait for unicast responses.
diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c
index 02b010a9ef..45e58f6c0d 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  September 24, 2011 at 02:02:29 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  September 27, 2011 at 10:39:19 AM by AutoGen 5.12
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -52,7 +52,7 @@ extern FILE * option_usage_fp;
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
 static char const zCopyright[345] =
-"ntp-keygen (ntp) 4.2.7p215\n\
+"ntp-keygen (ntp) 4.2.7p216\n\
 Copyright (C) 1970-2011 The University of Delaware, David L. Mills, and/or others, 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\
@@ -778,7 +778,7 @@ static tOptDesc optDesc[OPTION_CT] = {
  */
 static char const zPROGNAME[11] = "NTP_KEYGEN";
 static char const zUsageTitle[116] =
-"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p215\n\
+"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p216\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
 static char const zRcName[7] = ".ntprc";
 static char const * const apzHomeList[3] = {
diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h
index db04357e2c..5b0ddb2751 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  September 24, 2011 at 02:02:29 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  September 27, 2011 at 10:39:19 AM by AutoGen 5.12
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -90,8 +90,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    24
-#define NTP_KEYGEN_VERSION       "4.2.7p215"
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.7p215"
+#define NTP_KEYGEN_VERSION       "4.2.7p216"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.7p216"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/util/ntp-keygen-opts.texi b/util/ntp-keygen-opts.texi
index fa809bd702..15a9b7fb6e 100644
--- a/util/ntp-keygen-opts.texi
+++ b/util/ntp-keygen-opts.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.texi)
 # 
-# It has been AutoGen-ed  September 24, 2011 at 02:02:39 AM by AutoGen 5.12
+# It has been AutoGen-ed  September 27, 2011 at 10:39:32 AM by AutoGen 5.12
 # From the definitions    ntp-keygen-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -49,7 +49,7 @@ This is the automatically generated usage text for ntp-keygen:
 
 @exampleindent 0
 @example
-ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p215
+ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p216
 USAGE:  ntp-keygen [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
   Flg Arg Option-Name    Description
    -c Str certificate    certificate scheme
diff --git a/util/ntp-keygen.1ntp-keygenman b/util/ntp-keygen.1ntp-keygenman
index 026e7c17a2..3069ff1fe9 100644
--- a/util/ntp-keygen.1ntp-keygenman
+++ b/util/ntp-keygen.1ntp-keygenman
@@ -1,8 +1,8 @@
-.TH ntp-keygen 1ntp-keygenman "24 Sep 2011" "ntp (4.2.7p215)" "User Commands"
+.TH ntp-keygen 1ntp-keygenman "27 Sep 2011" "ntp (4.2.7p216)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  September 24, 2011 at 02:02:35 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 27, 2011 at 10:39:28 AM by AutoGen 5.12
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/util/ntp-keygen.1ntp-keygenmdoc b/util/ntp-keygen.1ntp-keygenmdoc
index 0fe692fbf3..06e96611ea 100644
--- a/util/ntp-keygen.1ntp-keygenmdoc
+++ b/util/ntp-keygen.1ntp-keygenmdoc
@@ -1,9 +1,9 @@
-.Dd September 24 2011
+.Dd September 27 2011
 .Dt NTP_KEYGEN 1ntp-keygenmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  September 24, 2011 at 02:02:39 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 27, 2011 at 10:39:32 AM by AutoGen 5.12
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/util/ntp-keygen.man.in b/util/ntp-keygen.man.in
index 14302e674a..4680648c4e 100644
--- a/util/ntp-keygen.man.in
+++ b/util/ntp-keygen.man.in
@@ -1,8 +1,8 @@
-.TH ntp-keygen @NTP_KEYGEN_MS@ "24 Sep 2011" "ntp (4.2.7p215)" "User Commands"
+.TH ntp-keygen @NTP_KEYGEN_MS@ "27 Sep 2011" "ntp (4.2.7p216)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  September 24, 2011 at 02:02:35 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 27, 2011 at 10:39:28 AM by AutoGen 5.12
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/util/ntp-keygen.mdoc.in b/util/ntp-keygen.mdoc.in
index ab2186d8f5..fdf0092434 100644
--- a/util/ntp-keygen.mdoc.in
+++ b/util/ntp-keygen.mdoc.in
@@ -1,9 +1,9 @@
-.Dd September 24 2011
+.Dd September 27 2011
 .Dt NTP_KEYGEN @NTP_KEYGEN_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  September 24, 2011 at 02:02:39 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  September 27, 2011 at 10:39:32 AM by AutoGen 5.12
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME