From: Harlan Stenn Date: Sat, 20 Aug 2011 06:04:34 +0000 (+0000) Subject: NTP_4_2_7P206 X-Git-Tag: NTP_4_2_7P206^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d416e530ebbbe1b53cee3a67275f2578ce7e7907;p=thirdparty%2Fntp.git NTP_4_2_7P206 bk: 4e4f4e72_6ohjsKRiMVyeasbPtdv8w --- diff --git a/ChangeLog b/ChangeLog index 16a2a4f10..1738f34a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.2.7p206) 2011/08/20 Released by Harlan Stenn * [Bug 1993] ntpd Windows port adj_systime() broken in 4.2.7p203. * sntp documentation and behavior improvements suggested by Steven Sommars. diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index ca2f29d89..73fe752a3 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 August 19, 2011 at 07:40:24 AM by AutoGen 5.12 + * It has been AutoGen-ed August 20, 2011 at 05:56:36 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.7p205\n\ +"ntpd 4.2.7p206\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.7p205\n\ +"ntpd - NTP daemon program - Ver. 4.2.7p206\n\ USAGE: %s [ - [] | --[{=| }] ]... \\\n\ \t\t[ ... ]\n"; #define zRcName NULL diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index ee7f75fc1..d9949bdee 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 August 19, 2011 at 07:40:23 AM by AutoGen 5.12 + * It has been AutoGen-ed August 20, 2011 at 05:56:35 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.7p205" -#define NTPD_FULL_VERSION "ntpd 4.2.7p205" +#define NTPD_VERSION "4.2.7p206" +#define NTPD_FULL_VERSION "ntpd 4.2.7p206" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi index 2c41dc132..447873272 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 August 19, 2011 at 07:41:01 AM by AutoGen 5.12 +# It has been AutoGen-ed August 20, 2011 at 05:57:34 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.7p205 +ntpd - NTP daemon program - Ver. 4.2.7p206 USAGE: ntpd [ - [] | --[@{=| @}] ]... \ [ ... ] Flg Arg Option-Name Description diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman index bfa121802..df92a7641 100644 --- a/ntpd/ntpd.1ntpdman +++ b/ntpd/ntpd.1ntpdman @@ -1,8 +1,8 @@ -.TH ntpd 1ntpdman "19 Aug 2011" "4.2.7p205" "User Commands" +.TH ntpd 1ntpdman "20 Aug 2011" "4.2.7p206" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.man) .\" -.\" It has been AutoGen-ed August 19, 2011 at 07:40:47 AM by AutoGen 5.12 +.\" It has been AutoGen-ed August 20, 2011 at 05:57:12 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 7d1a16b13..bae63015f 100644 --- a/ntpd/ntpd.1ntpdmdoc +++ b/ntpd/ntpd.1ntpdmdoc @@ -1,9 +1,9 @@ -.Dd August 19 2011 +.Dd August 20 2011 .Dt NTPD 1ntpdmdoc User Commands .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed August 19, 2011 at 07:41:03 AM by AutoGen 5.12 +.\" It has been AutoGen-ed August 20, 2011 at 05:57:36 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 b746a8cd6..faceb15b3 100644 --- a/ntpd/ntpd.man.in +++ b/ntpd/ntpd.man.in @@ -1,8 +1,8 @@ -.TH ntpd @NTPD_MS@ "19 Aug 2011" "4.2.7p205" "User Commands" +.TH ntpd @NTPD_MS@ "20 Aug 2011" "4.2.7p206" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.man) .\" -.\" It has been AutoGen-ed August 19, 2011 at 07:40:47 AM by AutoGen 5.12 +.\" It has been AutoGen-ed August 20, 2011 at 05:57:12 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 d47160035..7f0ff1a16 100644 --- a/ntpd/ntpd.mdoc.in +++ b/ntpd/ntpd.mdoc.in @@ -1,9 +1,9 @@ -.Dd August 19 2011 +.Dd August 20 2011 .Dt NTPD @NTPD_MS@ User Commands .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed August 19, 2011 at 07:41:03 AM by AutoGen 5.12 +.\" It has been AutoGen-ed August 20, 2011 at 05:57:36 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 6b919ab67..093a9e88c 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 August 19, 2011 at 07:41:13 AM by AutoGen 5.12 + * It has been AutoGen-ed August 20, 2011 at 05:57:50 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.7p205\n\ +"ntpdc 4.2.7p206\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.7p205\n\ +"ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p206\n\ USAGE: %s [ - [] | --[{=| }] ]... [ 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 92f267f5c..41984cff8 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 August 19, 2011 at 07:41:12 AM by AutoGen 5.12 + * It has been AutoGen-ed August 20, 2011 at 05:57:50 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.7p205" -#define NTPDC_FULL_VERSION "ntpdc 4.2.7p205" +#define NTPDC_VERSION "4.2.7p206" +#define NTPDC_FULL_VERSION "ntpdc 4.2.7p206" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi index 4688f444d..d8a197bba 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 August 19, 2011 at 07:42:39 AM by AutoGen 5.12 +# It has been AutoGen-ed August 20, 2011 at 05:59:31 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.7p205 +ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p206 USAGE: ntpdc [ - [] | --[@{=| @}] ]... [ 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 07d2b61c3..9a4cb298a 100644 --- a/ntpdc/ntpdc.1ntpdcman +++ b/ntpdc/ntpdc.1ntpdcman @@ -1,8 +1,8 @@ -.TH ntpdc 1ntpdcman "19 Aug 2011" "4.2.7p205" "User Commands" +.TH ntpdc 1ntpdcman "20 Aug 2011" "4.2.7p206" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntpdc-opts.man) .\" -.\" It has been AutoGen-ed August 19, 2011 at 07:41:30 AM by AutoGen 5.12 +.\" It has been AutoGen-ed August 20, 2011 at 05:58:15 AM by AutoGen 5.12 .\" From the definitions ntpdc-opts.def .\" and the template file agman-cmd.tpl .\" diff --git a/ntpdc/ntpdc.1ntpdcmdoc b/ntpdc/ntpdc.1ntpdcmdoc index 175f2e98c..1283c3087 100644 --- a/ntpdc/ntpdc.1ntpdcmdoc +++ b/ntpdc/ntpdc.1ntpdcmdoc @@ -1,9 +1,9 @@ -.Dd August 19 2011 +.Dd August 20 2011 .Dt NTPDC 1ntpdcmdoc User Commands .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntpdc-opts.mdoc) .\" -.\" It has been AutoGen-ed August 19, 2011 at 07:42:41 AM by AutoGen 5.12 +.\" It has been AutoGen-ed August 20, 2011 at 05:59:33 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 9fba5c804..2f99f279d 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. -

This document applies to version 4.2.7p205 of ntpdc. +

This document applies to version 4.2.7p206 of ntpdc.

The program implements the SNTP protocol as defined by RFC 5905, the NTPv4 IETF specification. @@ -116,7 +116,7 @@ Up: ntpdc Invocation

This is the automatically generated usage text for ntpdc: -

ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p205
+
ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p206
 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 24ad04c9e..f83fd8113 100644
--- a/ntpdc/ntpdc.man.in
+++ b/ntpdc/ntpdc.man.in
@@ -1,8 +1,8 @@
-.TH ntpdc @NTPDC_MS@ "19 Aug 2011" "4.2.7p205" "User Commands"
+.TH ntpdc @NTPDC_MS@ "20 Aug 2011" "4.2.7p206" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  August 19, 2011 at 07:41:30 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  August 20, 2011 at 05:58:15 AM by AutoGen 5.12
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/ntpdc/ntpdc.mdoc.in b/ntpdc/ntpdc.mdoc.in
index 6c09712c6..b65180e80 100644
--- a/ntpdc/ntpdc.mdoc.in
+++ b/ntpdc/ntpdc.mdoc.in
@@ -1,9 +1,9 @@
-.Dd August 19 2011
+.Dd August 20 2011
 .Dt NTPDC @NTPDC_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  August 19, 2011 at 07:42:41 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  August 20, 2011 at 05:59:33 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 08a1cabf0..f63262439 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  August 19, 2011 at 07:42:44 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  August 20, 2011 at 05:59:38 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.7p205\n\
+"ntpq 4.2.7p206\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.7p205\n\
+"ntpq - standard NTP query program - Ver. 4.2.7p206\n\
 USAGE:  %s [ - [] | --[{=| }] ]... [ 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 cec9ea081..775877fd6 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  August 19, 2011 at 07:42:43 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  August 20, 2011 at 05:59:37 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.7p205"
-#define NTPQ_FULL_VERSION  "ntpq 4.2.7p205"
+#define NTPQ_VERSION       "4.2.7p206"
+#define NTPQ_FULL_VERSION  "ntpq 4.2.7p206"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi
index e9e47a33a..ebd421ba3 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  August 19, 2011 at 07:43:31 AM by AutoGen 5.12
+# It has been AutoGen-ed  August 20, 2011 at 06:00:41 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.7p205
+ntpq - standard NTP query program - Ver. 4.2.7p206
 USAGE:  ntpq [ - [] | --[@{=| @}] ]... [ 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 0f7a69392..8e4eb9c5e 100644
--- a/ntpq/ntpq.1ntpqman
+++ b/ntpq/ntpq.1ntpqman
@@ -1,8 +1,8 @@
-.TH ntpq 1ntpqman "19 Aug 2011" "4.2.7p205" "User Commands"
+.TH ntpq 1ntpqman "20 Aug 2011" "4.2.7p206" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  August 19, 2011 at 07:43:13 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  August 20, 2011 at 06:00:19 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 72f380034..d1d1145b1 100644
--- a/ntpq/ntpq.1ntpqmdoc
+++ b/ntpq/ntpq.1ntpqmdoc
@@ -1,9 +1,9 @@
-.Dd August 19 2011
+.Dd August 20 2011
 .Dt NTPQ 1ntpqmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  August 19, 2011 at 07:43:33 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  August 20, 2011 at 06:00:43 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 5add41a89..73fb39c7f 100644
--- a/ntpq/ntpq.man.in
+++ b/ntpq/ntpq.man.in
@@ -1,8 +1,8 @@
-.TH ntpq @NTPQ_MS@ "19 Aug 2011" "4.2.7p205" "User Commands"
+.TH ntpq @NTPQ_MS@ "20 Aug 2011" "4.2.7p206" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  August 19, 2011 at 07:43:13 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  August 20, 2011 at 06:00:19 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 3b3c3857a..531fb6891 100644
--- a/ntpq/ntpq.mdoc.in
+++ b/ntpq/ntpq.mdoc.in
@@ -1,9 +1,9 @@
-.Dd August 19 2011
+.Dd August 20 2011
 .Dt NTPQ @NTPQ_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  August 19, 2011 at 07:43:33 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  August 20, 2011 at 06:00:43 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 dbaab22c3..a6a5624c0 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  August 19, 2011 at 07:43:35 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  August 20, 2011 at 06:00:47 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.7p205\n\
+"ntpsnmpd 4.2.7p206\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.7p205\n\
+"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p206\n\
 USAGE:  %s [ - [] | --[{=| }] ]...\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 1011d161a..eb5e60514 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  August 19, 2011 at 07:43:35 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  August 20, 2011 at 06:00:46 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.7p205"
-#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.7p205"
+#define NTPSNMPD_VERSION       "4.2.7p206"
+#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.7p206"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpsnmpd/ntpsnmpd-opts.texi b/ntpsnmpd/ntpsnmpd-opts.texi
index d90872b8d..3fe00670f 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  August 19, 2011 at 07:44:01 AM by AutoGen 5.12
+# It has been AutoGen-ed  August 20, 2011 at 06:01:19 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.7p205
+ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p206
 USAGE:  ntpsnmpd [ - [] | --[@{=| @}] ]...
   Flg Arg Option-Name    Description
    -n no  nofork         Do not fork
diff --git a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
index 1c0477bef..59f89236c 100644
--- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
+++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
@@ -1,8 +1,8 @@
-.TH ntpsnmpd 1ntpsnmpdman "19 Aug 2011" "4.2.7p205" "User Commands"
+.TH ntpsnmpd 1ntpsnmpdman "20 Aug 2011" "4.2.7p206" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  August 19, 2011 at 07:43:46 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  August 20, 2011 at 06:01:00 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 a5f631679..2bc41e1b3 100644
--- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
+++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
@@ -1,9 +1,9 @@
-.Dd August 19 2011
+.Dd August 20 2011
 .Dt NTPSNMPD 1ntpsnmpdmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  August 19, 2011 at 07:44:02 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  August 20, 2011 at 06:01:21 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 cf86ab48d..08018c1b9 100644
--- a/ntpsnmpd/ntpsnmpd.man.in
+++ b/ntpsnmpd/ntpsnmpd.man.in
@@ -1,8 +1,8 @@
-.TH ntpsnmpd @NTPSNMPD_MS@ "19 Aug 2011" "4.2.7p205" "User Commands"
+.TH ntpsnmpd @NTPSNMPD_MS@ "20 Aug 2011" "4.2.7p206" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  August 19, 2011 at 07:43:46 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  August 20, 2011 at 06:01:00 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 a9783bb5b..bf4510ce5 100644
--- a/ntpsnmpd/ntpsnmpd.mdoc.in
+++ b/ntpsnmpd/ntpsnmpd.mdoc.in
@@ -1,9 +1,9 @@
-.Dd August 19 2011
+.Dd August 20 2011
 .Dt NTPSNMPD @NTPSNMPD_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  August 19, 2011 at 07:44:02 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  August 20, 2011 at 06:01:21 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 809ecbd2f..978147315 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=205
+point=206
 
 ### 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 1fd54fbdc..743e8814f 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  August 19, 2011 at 07:40:19 AM by AutoGen 5.12
+# It has been AutoGen-ed  August 20, 2011 at 05:56:30 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 d84524521..18c4cb0a1 100644
--- a/scripts/ntp-wait.1ntp-waitman
+++ b/scripts/ntp-wait.1ntp-waitman
@@ -1,8 +1,8 @@
-.TH ntp-wait 1ntp-waitman "19 Aug 2011" "ntp (4.2.7p205)" "User Commands"
+.TH ntp-wait 1ntp-waitman "20 Aug 2011" "ntp (4.2.7p206)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  August 19, 2011 at 07:40:10 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  August 20, 2011 at 05:56:15 AM by AutoGen 5.12
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -35,18 +35,22 @@ flag is provided.
 .BR \-n " \fInum\-tries\fP, " \-\- "=" \fInum\-tries\fP
 Number of times to check ntpd.
 This option takes an integer number as its argument.
+The default \fInum\-tries\fP for this option is:
+.ti +4
+ 100
 .sp
 The maximum number of times we will check ntpd to see if it
 has been able to synchronize and stabilize the system clock.
-The default is 100 times.
 .TP
 .BR \-s " \fIsecs\-between\-tries\fP, " \-\- "=" \fIsecs\-between\-tries\fP
 How long to sleep between tries.
 This option takes an integer number as its argument.
+The default \fIsecs\-between\-tries\fP for this option is:
+.ti +4
+ 6
 .sp
-We will sleep for secs-between-tries after each query of ntpd
+We will sleep for @file{secs-between-tries} after each query of ntpd
 that returns "the time is not yet stable".
-The default is 6 seconds.
 .TP
 .BR \-v ", " -\-
 Be verbose.
diff --git a/scripts/ntp-wait.1ntp-waitmdoc b/scripts/ntp-wait.1ntp-waitmdoc
index 04eb89867..c19587a5e 100644
--- a/scripts/ntp-wait.1ntp-waitmdoc
+++ b/scripts/ntp-wait.1ntp-waitmdoc
@@ -1,9 +1,9 @@
-.Dd August 19 2011
+.Dd August 20 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  August 19, 2011 at 07:40:21 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  August 20, 2011 at 05:56:33 AM by AutoGen 5.12
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -38,17 +38,21 @@ flag is provided.
 .It  \-n " \fInum\-tries\fP, " \-\- "=" \fInum\-tries\fP
 Number of times to check ntpd.
 This option takes an integer number as its argument.
+The default \fInum\-tries\fP for this option is:
+.ti +4
+ 100
 .sp
 The maximum number of times we will check ntpd to see if it
 has been able to synchronize and stabilize the system clock.
-The default is 100 times.
 .It  \-s " \fIsecs\-between\-tries\fP, " \-\- "=" \fIsecs\-between\-tries\fP
 How long to sleep between tries.
 This option takes an integer number as its argument.
+The default \fIsecs\-between\-tries\fP for this option is:
+.ti +4
+ 6
 .sp
-We will sleep for secs-between-tries after each query of ntpd
+We will sleep for @file{secs-between-tries} after each query of ntpd
 that returns "the time is not yet stable".
-The default is 6 seconds.
 .It  \-v ", " -\-
 Be verbose.
 .sp
diff --git a/scripts/ntp-wait.html b/scripts/ntp-wait.html
index 9a4e3fab9..f6eb59324 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.
 
-  
This document applies to version 4.2.7p205 of ntp-wait.
+  
This document applies to version 4.2.7p206 of ntp-wait.
 
   
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 36dad87b4..42077135f 100644
--- a/scripts/ntp-wait.man.in
+++ b/scripts/ntp-wait.man.in
@@ -1,8 +1,8 @@
-.TH ntp-wait @NTP_WAIT_MS@ "19 Aug 2011" "ntp (4.2.7p205)" "User Commands"
+.TH ntp-wait @NTP_WAIT_MS@ "20 Aug 2011" "ntp (4.2.7p206)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  August 19, 2011 at 07:40:10 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  August 20, 2011 at 05:56:15 AM by AutoGen 5.12
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -35,18 +35,22 @@ flag is provided.
 .BR \-n " \fInum\-tries\fP, " \-\- "=" \fInum\-tries\fP
 Number of times to check ntpd.
 This option takes an integer number as its argument.
+The default \fInum\-tries\fP for this option is:
+.ti +4
+ 100
 .sp
 The maximum number of times we will check ntpd to see if it
 has been able to synchronize and stabilize the system clock.
-The default is 100 times.
 .TP
 .BR \-s " \fIsecs\-between\-tries\fP, " \-\- "=" \fIsecs\-between\-tries\fP
 How long to sleep between tries.
 This option takes an integer number as its argument.
+The default \fIsecs\-between\-tries\fP for this option is:
+.ti +4
+ 6
 .sp
-We will sleep for secs-between-tries after each query of ntpd
+We will sleep for @file{secs-between-tries} after each query of ntpd
 that returns "the time is not yet stable".
-The default is 6 seconds.
 .TP
 .BR \-v ", " -\-
 Be verbose.
diff --git a/scripts/ntp-wait.mdoc.in b/scripts/ntp-wait.mdoc.in
index bd3857c89..95db8ffc4 100644
--- a/scripts/ntp-wait.mdoc.in
+++ b/scripts/ntp-wait.mdoc.in
@@ -1,9 +1,9 @@
-.Dd August 19 2011
+.Dd August 20 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  August 19, 2011 at 07:40:21 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  August 20, 2011 at 05:56:33 AM by AutoGen 5.12
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -38,17 +38,21 @@ flag is provided.
 .It  \-n " \fInum\-tries\fP, " \-\- "=" \fInum\-tries\fP
 Number of times to check ntpd.
 This option takes an integer number as its argument.
+The default \fInum\-tries\fP for this option is:
+.ti +4
+ 100
 .sp
 The maximum number of times we will check ntpd to see if it
 has been able to synchronize and stabilize the system clock.
-The default is 100 times.
 .It  \-s " \fIsecs\-between\-tries\fP, " \-\- "=" \fIsecs\-between\-tries\fP
 How long to sleep between tries.
 This option takes an integer number as its argument.
+The default \fIsecs\-between\-tries\fP for this option is:
+.ti +4
+ 6
 .sp
-We will sleep for secs-between-tries after each query of ntpd
+We will sleep for @file{secs-between-tries} after each query of ntpd
 that returns "the time is not yet stable".
-The default is 6 seconds.
 .It  \-v ", " -\-
 Be verbose.
 .sp
diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c
index c464ff38e..1f750d9f2 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  August 19, 2011 at 07:34:07 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  August 20, 2011 at 05:47:21 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.7p205\n\
+"sntp 4.2.7p206\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\
@@ -218,7 +218,7 @@ static char const zLogfile_Name[]            = "logfile";
  *  Steplimit option description:
  */
 static char const zSteplimitText[] =
-        "Adjustments less than steplimit msec will be slewed";
+        "Adjustments less than @file{steplimit} msec will be slewed";
 static char const zSteplimit_NAME[]          = "STEPLIMIT";
 static char const zSteplimit_Name[]          = "steplimit";
 #define STEPLIMIT_FLAGS       (OPTST_DISABLED \
@@ -248,7 +248,7 @@ static char const zUsereservedport_Name[]    = "usereservedport";
  *  Step option description:
  */
 static char const zStepText[] =
-        "OK to 'step' the time with settimeofday()";
+        "OK to 'step' the time with 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()";
+        "OK to 'slew' the time with adjtime(2)";
 static char const zSlew_NAME[]               = "SLEW";
 static char const zSlew_Name[]               = "slew";
 #define SLEW_FLAGS       (OPTST_DISABLED)
@@ -662,8 +662,8 @@ static tOptDesc optDesc[OPTION_CT] = {
  *  Define the Sntp Option Environment
  */
 static char const zPROGNAME[5] = "SNTP";
-static char const zUsageTitle[154] =
-"sntp - standard Simple Network Time Protocol program - Ver. 4.2.7p205\n\
+static char const zUsageTitle[161] =
+"sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p206\n\
 USAGE:  %s [ - [] | --[{=| }] ]... \\\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 6639a1b01..dceacbb61 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  August 19, 2011 at 07:34:06 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  August 20, 2011 at 05:47:21 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.7p205"
-#define SNTP_FULL_VERSION  "sntp 4.2.7p205"
+#define SNTP_VERSION       "4.2.7p206"
+#define SNTP_FULL_VERSION  "sntp 4.2.7p206"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi
index a6db99e02..415447e23 100644
--- a/sntp/sntp-opts.texi
+++ b/sntp/sntp-opts.texi
@@ -1,12 +1,12 @@
 @node sntp Invocation
 @section Invoking sntp
 @pindex sntp
-@cindex standard Simple Network Time Protocol program
+@cindex standard Simple Network Time Protocol client program
 @ignore
 # 
 # EDIT THIS FILE WITH CAUTION  (sntp-opts.texi)
 # 
-# It has been AutoGen-ed  August 19, 2011 at 07:45:32 AM by AutoGen 5.12
+# It has been AutoGen-ed  August 20, 2011 at 06:03:29 AM by AutoGen 5.12
 # From the definitions    sntp-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -25,20 +25,35 @@ are defined and described by RFC 5905.
 The default is to write the estimated correct local date and time (i.e. not
 UTC) to the standard output in a format like
 @example
-1996-10-15 20:17:25.123 (+0800) +4.567 +/- 0.089 secs
+1996-10-15 20:17:25.123 (+0800) +4.567 +/- 0.089 [host] IP sN
 @end example
 where the
 @example
-+4.567 +/- 0.089 secs
+(+0800)
+@end example
+means that to get to UTC from the reported local time one must
+add 8 hours and 0 minutes,
+the
+@example
++4.567
 @end example
 indicates the local clock is 4.567 seconds behind the correct time
-(so 4.567 seconds must be added to the local clock to get it to be correct),
-and the (local) time of
-@code{1996-10-15 20:17:25.123}
-can be converted to UTC time by adding 8 hours and 0 minutes, and
-is believed to be correct to within
-@code{+/- 0.089}
-seconds.
+(so 4.567 seconds must be added to the local clock to get it to be correct).
+Note that the number of decimals printed for this value will change
+based on the reported precision of the server.
+@example
++/- 0.089
+@end example
+is the reported @file{synchronization distance} (in seconds),
+which represents the maximum error due to all causes.
+If the server does not report valid data needed to calculate the
+synchronization distance, this will be reported as
+@example
++/- ?
+@end example
+If the @file{host} is different from the @file{IP}, both will be displayed.
+Otherwise, only the @file{IP} is displayed.
+Finally, the @file{stratum} is reported.
 
 This section was generated by @strong{AutoGen},
 the aginfo template and the option descriptions for the @command{sntp} program.  It documents the @command{sntp} usage text and option meanings.
@@ -76,7 +91,7 @@ This is the automatically generated usage text for sntp:
 
 @exampleindent 0
 @example
-sntp - standard Simple Network Time Protocol program - Ver. 4.2.7p205
+sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p206
 USAGE:  sntp [ - [] | --[@{=| @}] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description
@@ -100,15 +115,15 @@ USAGE:  sntp [ - [] | --[@{=| @}] ]... \
    -K Fil kod            KoD history filename
    -k Fil keyfile        Look in this file for the key specified with -a
    -l Fil logfile        Log to specified logfile
-   -M Num steplimit      Adjustments less than steplimit msec will be slewed
+   -M Num steplimit      Adjustments less than @@file@{steplimit@} msec will be slewed
                                 - It must be in the range:
                                   greater than or equal to 0
    -o Num ntpversion     Send  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()
-   -s no  slew           OK to 'slew' the time with adjtime()
+   -S no  step           OK to 'step' the time with settimeofday(2)
+   -s no  slew           OK to 'slew' the time with 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
@@ -184,12 +199,12 @@ may appear an unlimited number of times.
 Requests from an NTP "client" to a "server" should never be sent
 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.
+ntpd, and therefore @code{sntp} will send queries to these IPs one
+after another, with a 2-second gap in between each query.
 
-The -c or --concurrent flag says that any IPs returned for the DNS
-lookup of the supplied host-name are on different machines, so we
-can send concurrent queries.
+The @code{-c} or @code{--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.
 
 @node sntp debug-level
 @subsection debug-level option (-d)
@@ -253,17 +268,17 @@ to the IPv6 namespace.
 
 This is the ``look in this file for the key specified with -a'' option.
 This option specifies the keyfile.
-@code{sntp} will search for the key specified with -a keyno in this
-file. Key files follow the following format:
+@code{sntp} will search for the key specified with @code{-a}
+@file{keyno} in this file.  Key files follow the following format:
 
-keyid keytype key
+@file{keyid keytype key}
 
-Where	keyid is a number identifying this key
-keytype is one of the following:
-S  Key is a 64 Bit hexadecimal number as specified in in the DES specification.
-N  Key is a 64 Bit hexadecimal number as specified in the NTP standard.
-A  Key is a 1-to-8 character ASCII string.
-M  Key is a 1-to-8 character ASCII string using the MD5 authentication scheme.
+Where	@file{keyid} is a number identifying this key
+@file{keytype} is one of the following:
+@code{S}  Key is a 64 Bit hexadecimal number as specified in in the DES specification.
+@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).
 
@@ -281,7 +296,7 @@ responses received from servers.
 
 This is the ``log to specified logfile'' option.
 This option causes the client to write log messages to the specified
-logfile.
+@file{logfile}.
 
 @node sntp ntpversion
 @subsection ntpversion option (-o)
@@ -289,7 +304,7 @@ logfile.
 
 This is the ``send  as our ntp version'' option.
 When sending requests to a remote server, tell them we are running
-NTP protocol version  .
+NTP protocol version @file{ntpversion} .
 
 @node sntp set-debug-level
 @subsection set-debug-level option (-D)
@@ -309,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()'' option.
+This is the ``ok to 'slew' the time with adjtime(2)'' option.
 
 
 @node sntp step
 @subsection step option (-S)
 @cindex sntp-step
 
-This is the ``ok to 'step' the time with settimeofday()'' option.
+This is the ``ok to 'step' the time with settimeofday(2)'' option.
 
 
 @node sntp steplimit
 @subsection steplimit option (-M)
 @cindex sntp-steplimit
 
-This is the ``adjustments less than steplimit msec will be slewed'' option.
-If the time adjustment is less than steplimit milliseconds, slew the
-amount using adjtime().  Otherwise, step the correction using
-settimeofday(). 
+This is the ``adjustments less than @file{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). 
 
 @node sntp uctimeout
 @subsection uctimeout option (-u)
diff --git a/sntp/sntp.1sntpman b/sntp/sntp.1sntpman
index 2b54ecb50..6927af5b3 100644
--- a/sntp/sntp.1sntpman
+++ b/sntp/sntp.1sntpman
@@ -1,13 +1,13 @@
-.TH sntp 1sntpman "19 Aug 2011" "4.2.7p205" "User Commands"
+.TH sntp 1sntpman "20 Aug 2011" "4.2.7p206" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  August 19, 2011 at 07:45:15 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  August 20, 2011 at 06:03:08 AM by AutoGen 5.12
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
 .SH NAME
-sntp \- standard Simple Network Time Protocol program
+sntp \- standard Simple Network Time Protocol client program
 .SH SYNOPSIS
 .B sntp
 .\" Mixture of short (flag) options and long options
@@ -17,7 +17,7 @@ sntp \- standard Simple Network Time Protocol program
 .B 
 can be used as an SNTP client to query a NTP or SNTP server and either display
 the time or set the local system's time (given suitable privilege).  It can be
-run as an interactive command or in a
+run as an interactive command or from a
 .Ic cron
 job.
 NTP (the Network Time Protocol) and SNTP (the Simple Network Time Protocol)
@@ -25,20 +25,35 @@ are defined and described by RFC 5905.
 .PP
 The default is to write the estimated correct local date and time (i.e. not
 UTC) to the standard output in a format like:
-.Ic "'1996-10-15 20:17:25.123 (+0800) +4.567 +/- 0.089 secs'"
+.Ic "'1996-10-15 20:17:25.123 (+0800) +4.567 +/- 0.089 [host] IP sN'"
 where the
 .Ic "'(+0800)'"
 means that to get to UTC from the reported local time one must
 add 8 hours and 0 minutes,
-and the
-.Ic "'+4.567 +/- 0.089 secs'"
+the
+.Ic "'+4.567'"
 indicates the local clock is 4.567 seconds behind the correct time
-(so 4.567 seconds must be added to the local clock to get it to be correct),
-and the date/time of
-'1996-10-15 20:17:25.123'
-is believed to be correct to within
-+/- 0.089
-seconds.
+(so 4.567 seconds must be added to the local clock to get it to be correct).
+Note that the number of decimals printed for this value will change
+based on the reported precision of the server.
+.Ic "'+/- 0.089'"
+is the reported
+.I synchronization distance
+(in seconds), which represents the maximum error due to all causes.
+If the server does not report valid data needed to calculate the
+synchronization distance, this will be reported as
+.Ic "'+/- ?'" .
+If the
+.I host
+is different from the
+.I IP ,
+both will be displayed.
+Otherwise, only the 
+.I IP
+is displayed.
+Finally, the
+.I stratum
+of the host is reported.
 .SH "OPTIONS"
 .TP
 .BR \-4 ", " -\-ipv4
@@ -91,11 +106,11 @@ This option may appear an unlimited number of times.
 Requests from an NTP "client" to a "server" should never be sent
 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 -c or --concurrent flag says that any IPs returned for the DNS
-lookup of the supplied host-name are on different machines, so we
-can send concurrent queries.
+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
+returned for the DNS lookup of the supplied host-name are on
+different machines, so we can send concurrent queries.
 .TP
 .BR \-d ", " -\-debug\-level
 Increase debug verbosity level.
@@ -132,25 +147,25 @@ responses received from servers.
 Look in this file for the key specified with -a.
 .sp
 This option specifies the keyfile.
-@code{sntp} will search for the key specified with -a keyno in this
-file. Key files follow the following format:
-keyid keytype key
-Where	keyid is a number identifying this key
-keytype is one of the following:
-S  Key is a 64 Bit hexadecimal number as specified in in the DES specification.
-N  Key is a 64 Bit hexadecimal number as specified in the NTP standard.
-A  Key is a 1-to-8 character ASCII string.
-M  Key is a 1-to-8 character ASCII string using the MD5 authentication scheme.
+@code{sntp} will search for the key specified with @code{-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
+@file{keytype} is one of the following:
+@code{S}  Key is a 64 Bit hexadecimal number as specified in in the DES specification.
+@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).
 .TP
 .BR \-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
-logfile.
+@file{logfile}.
 .TP
 .BR \-M " \fInumber\fP, " \-\-steplimit "=" \fInumber\fP
-Adjustments less than steplimit msec will be slewed.
+Adjustments less than @file{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
@@ -160,9 +175,9 @@ greater than or equal to 0
 .fi
 .in -4
 .sp
-If the time adjustment is less than steplimit milliseconds, slew the
-amount using adjtime().  Otherwise, step the correction using
-settimeofday(). 
+If the time adjustment is less than @file{steplimit} milliseconds,
+slew the amount using adjtime(2).  Otherwise, step the correction
+using settimeofday(2). 
 .TP
 .BR \-o " \fInumber\fP, " \-\-ntpversion "=" \fInumber\fP
 Send  as our NTP version.
@@ -179,7 +194,7 @@ The default \fInumber\fP for this option is:
  4
 .sp
 When sending requests to a remote server, tell them we are running
-NTP protocol version  .
+NTP protocol version @file{ntpversion} .
 .TP
 .BR \-r ", " -\-usereservedport
 Use the NTP Reserved Port (port 123).
@@ -188,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().
+OK to 'step' the time with settimeofday(2).
 .sp
 .TP
 .BR \-s ", " -\-slew
-OK to 'slew' the time with adjtime().
+OK to 'slew' the time with adjtime(2).
 .sp
 .TP
 .BR \-u " \fIseconds\fP, " \-\-uctimeout "=" \fIseconds\fP
diff --git a/sntp/sntp.1sntpmdoc b/sntp/sntp.1sntpmdoc
index 766757599..8b8e904aa 100644
--- a/sntp/sntp.1sntpmdoc
+++ b/sntp/sntp.1sntpmdoc
@@ -1,14 +1,14 @@
-.Dd August 19 2011
+.Dd August 20 2011
 .Dt SNTP 1sntpmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  August 19, 2011 at 07:45:34 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  August 20, 2011 at 06:03:31 AM by AutoGen 5.12
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
 .Nm sntp
-.Nd standard Simple Network Time Protocol program
+.Nd standard Simple Network Time Protocol client program
 .Sh SYNOPSIS
 .Nm
 .\" Mixture of short (flag) options and long options
@@ -21,7 +21,7 @@
 .Nm
 can be used as an SNTP client to query a NTP or SNTP server and either display
 the time or set the local system's time (given suitable privilege).  It can be
-run as an interactive command or in a
+run as an interactive command or from a
 .Ic cron
 job.
 NTP (the Network Time Protocol) and SNTP (the Simple Network Time Protocol)
@@ -29,20 +29,35 @@ are defined and described by RFC 5905.
 .PP
 The default is to write the estimated correct local date and time (i.e. not
 UTC) to the standard output in a format like:
-.Ic "'1996-10-15 20:17:25.123 (+0800) +4.567 +/- 0.089 secs'"
+.Ic "'1996-10-15 20:17:25.123 (+0800) +4.567 +/- 0.089 [host] IP sN'"
 where the
 .Ic "'(+0800)'"
 means that to get to UTC from the reported local time one must
 add 8 hours and 0 minutes,
-and the
-.Ic "'+4.567 +/- 0.089 secs'"
+the
+.Ic "'+4.567'"
 indicates the local clock is 4.567 seconds behind the correct time
-(so 4.567 seconds must be added to the local clock to get it to be correct),
-and the date/time of
-'1996-10-15 20:17:25.123'
-is believed to be correct to within
-+/- 0.089
-seconds.
+(so 4.567 seconds must be added to the local clock to get it to be correct).
+Note that the number of decimals printed for this value will change
+based on the reported precision of the server.
+.Ic "'+/- 0.089'"
+is the reported
+.Em synchronization distance
+(in seconds), which represents the maximum error due to all causes.
+If the server does not report valid data needed to calculate the
+synchronization distance, this will be reported as
+.Ic "'+/- ?'" .
+If the
+.Em host
+is different from the
+.Em IP ,
+both will be displayed.
+Otherwise, only the 
+.Em IP
+is displayed.
+Finally, the
+.Em stratum
+of the host is reported.
 .Sh "OPTIONS"
 .Bl -tag
 .It  \-4 ", " -\-ipv4
@@ -90,11 +105,11 @@ This option may appear an unlimited number of times.
 Requests from an NTP "client" to a "server" should never be sent
 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 -c or --concurrent flag says that any IPs returned for the DNS
-lookup of the supplied host-name are on different machines, so we
-can send concurrent queries.
+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
+returned for the DNS lookup of the supplied host-name are on
+different machines, so we can send concurrent queries.
 .It  \-d ", " -\-debug\-level
 Increase debug verbosity level.
 This option may appear an unlimited number of times.
@@ -126,23 +141,23 @@ responses received from servers.
 Look in this file for the key specified with -a.
 .sp
 This option specifies the keyfile.
-@code{sntp} will search for the key specified with -a keyno in this
-file. Key files follow the following format:
-keyid keytype key
-Where	keyid is a number identifying this key
-keytype is one of the following:
-S  Key is a 64 Bit hexadecimal number as specified in in the DES specification.
-N  Key is a 64 Bit hexadecimal number as specified in the NTP standard.
-A  Key is a 1-to-8 character ASCII string.
-M  Key is a 1-to-8 character ASCII string using the MD5 authentication scheme.
+@code{sntp} will search for the key specified with @code{-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
+@file{keytype} is one of the following:
+@code{S}  Key is a 64 Bit hexadecimal number as specified in in the DES specification.
+@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).
 .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
-logfile.
+@file{logfile}.
 .It  \-M " \fInumber\fP, " \-\-steplimit "=" \fInumber\fP
-Adjustments less than steplimit msec will be slewed.
+Adjustments less than @file{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
@@ -152,9 +167,9 @@ greater than or equal to 0
 .fi
 .in -4
 .sp
-If the time adjustment is less than steplimit milliseconds, slew the
-amount using adjtime().  Otherwise, step the correction using
-settimeofday(). 
+If the time adjustment is less than @file{steplimit} milliseconds,
+slew the amount using adjtime(2).  Otherwise, step the correction
+using settimeofday(2). 
 .It  \-o " \fInumber\fP, " \-\-ntpversion "=" \fInumber\fP
 Send  as our NTP version.
 This option takes an integer number as its argument.
@@ -170,17 +185,17 @@ The default \fInumber\fP for this option is:
  4
 .sp
 When sending requests to a remote server, tell them we are running
-NTP protocol version  .
+NTP protocol version @file{ntpversion} .
 .It  \-r ", " -\-usereservedport
 Use the NTP Reserved Port (port 123).
 .sp
 Use port 123, which is reserved for NTP, for our network
 communications.
 .It  \-S ", " -\-step
-OK to 'step' the time with settimeofday().
+OK to 'step' the time with settimeofday(2).
 .sp
 .It  \-s ", " -\-slew
-OK to 'slew' the time with adjtime().
+OK to 'slew' the time with 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 c07836f82..0091a3326 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.
 
-  
This document applies to version 4.2.7p205 of sntp.
+  
This document applies to version 4.2.7p206 of sntp.
 
   
The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
@@ -83,7 +83,7 @@ error bound of the system clock relative to the server clock.
 
 
Invoking sntp

 
-

+

 sntp
 can be used as an SNTP client to query a NTP or SNTP server and either display
 the time or set the local system's time (given suitable privilege).  It can be
@@ -96,19 +96,31 @@ are defined and described by RFC 5905.
 
   
The default is to write the estimated correct local date and time (i.e. not
 UTC) to the standard output in a format like
-
     1996-10-15 20:17:25.123 (+0800) +4.567 +/- 0.089 secs
+
     1996-10-15 20:17:25.123 (+0800) +4.567 +/- 0.089 [host] IP sN
 

   
where the
-
     +4.567 +/- 0.089 secs
+
     (+0800)
+

+  
means that to get to UTC from the reported local time one must
+add 8 hours and 0 minutes,
+the
+
     +4.567
 

   
indicates the local clock is 4.567 seconds behind the correct time
-(so 4.567 seconds must be added to the local clock to get it to be correct),
-and the (local) time of
-1996-10-15 20:17:25.123
-can be converted to UTC time by adding 8 hours and 0 minutes, and
-is believed to be correct to within
-+/- 0.089
-seconds.
+(so 4.567 seconds must be added to the local clock to get it to be correct). 
+Note that the number of decimals printed for this value will change
+based on the reported precision of the server.
+
     +/- 0.089
+

+  
is the reported synchronization distance (in seconds),
+which represents the maximum error due to all causes. 
+If the server does not report valid data needed to calculate the
+synchronization distance, this will be reported as
+
     +/- ?
+

+  
If the host is different from the IP, both will be displayed. 
+Otherwise, only the IP is displayed. 
+Finally, the stratum is reported.
 
   
This section was generated by AutoGen,
 the aginfo template and the option descriptions for the sntp program.  It documents the sntp usage text and option meanings.
@@ -150,7 +162,7 @@ Up: sntp Invocation
 

 This is the automatically generated usage text for sntp:
 
-
sntp - standard Simple Network Time Protocol program - Ver. 4.2.7p205
+
sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p206
 USAGE:  sntp [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description
@@ -174,15 +186,15 @@ USAGE:  sntp [ -<flag> [<val>] | --<name>[{=| }<val>] ].
    -K Fil kod            KoD history filename
    -k Fil keyfile        Look in this file for the key specified with -a
    -l Fil logfile        Log to specified logfile
-   -M Num steplimit      Adjustments less than steplimit msec will be slewed
+   -M Num steplimit      Adjustments less than @file{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
                                 - 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()
-   -s no  slew           OK to 'slew' the time with adjtime()
+   -S no  step           OK to 'step' the time with settimeofday(2)
+   -s no  slew           OK to 'slew' the time with 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
@@ -282,12 +294,12 @@ This is the “concurrently query all ips returned for host-name” opti
   
Requests from an NTP "client" to a "server" should never be sent
 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 sntp will send queries to these IPs one after
-another, with a 2-second gap in between each query.
+ntpd, and therefore sntp will send queries to these IPs one
+after another, with a 2-second gap in between each query.
 
-  
The -c or –concurrent flag says that any IPs returned for the DNS
-lookup of the supplied host-name are on different machines, so we
-can send concurrent queries.
+  
The -c or --concurrent flag says that any IPs
+returned for the DNS lookup of the supplied host-name are on
+different machines, so we can send concurrent queries.
 
 

 

@@ -381,17 +393,17 @@ Up: sntp Invocation
 

 This is the “look in this file for the key specified with -a” option. 
 This option specifies the keyfile. 
-sntp will search for the key specified with -a keyno in this
-file. Key files follow the following format:
+sntp will search for the key specified with -a
+keyno in this file.  Key files follow the following format:
 
-  
keyid keytype key
+  
keyid keytype key
 
-  
Where	keyid is a number identifying this key
-keytype is one of the following:
-S  Key is a 64 Bit hexadecimal number as specified in in the DES specification. 
-N  Key is a 64 Bit hexadecimal number as specified in the NTP standard. 
-A  Key is a 1-to-8 character ASCII string. 
-M  Key is a 1-to-8 character ASCII string using the MD5 authentication scheme.
+  
Where	keyid is a number identifying this key
+keytype is one of the following:
+S  Key is a 64 Bit hexadecimal number as specified in in the DES specification. 
+N  Key is a 64 Bit hexadecimal number as specified in the NTP standard. 
+A  Key is a 1-to-8 character ASCII string. 
+M  Key is a 1-to-8 character ASCII string using the MD5 authentication scheme.
 
   
For more information see ntp.keys(5).
 
@@ -423,7 +435,7 @@ Up: sntp Invocation
 

 This is the “log to specified logfile” option. 
 This option causes the client to write log messages to the specified
-logfile.
+logfile.
 
 

 

@@ -438,7 +450,7 @@ Up: sntp Invocation
 

 This is the “send <int> as our ntp version” option. 
 When sending requests to a remote server, tell them we are running
-NTP protocol version <ntpversion> .
+NTP protocol version ntpversion .
 
 

 

@@ -469,7 +481,7 @@ Up: sntp Invocation
 
slew option (-s)

 
 

-This is the “ok to 'slew' the time with adjtime()” option.
+This is the “ok to 'slew' the time with adjtime(2)” option.
 
 

 

@@ -482,7 +494,7 @@ Up: sntp Invocation
 
step option (-S)

 
 

-This is the “ok to 'step' the time with settimeofday()” option.
+This is the “ok to 'step' the time with settimeofday(2)” option.
 
 

 

@@ -495,10 +507,10 @@ Up: sntp Invocation
 
steplimit option (-M)

 
 

-This is the “adjustments less than steplimit msec will be slewed” option. 
-If the time adjustment is less than steplimit milliseconds, slew the
-amount using adjtime().  Otherwise, step the correction using
-settimeofday().
+This is the “adjustments less than steplimit msec will be slewed” option. 
+If the time adjustment is less than steplimit milliseconds,
+slew the amount using adjtime(2).  Otherwise, step the correction
+using settimeofday(2).
 
 

 

diff --git a/sntp/sntp.man.in b/sntp/sntp.man.in
index e5a62751c..d85fc1848 100644
--- a/sntp/sntp.man.in
+++ b/sntp/sntp.man.in
@@ -1,13 +1,13 @@
-.TH sntp @SNTP_MS@ "19 Aug 2011" "4.2.7p205" "User Commands"
+.TH sntp @SNTP_MS@ "20 Aug 2011" "4.2.7p206" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  August 19, 2011 at 07:45:15 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  August 20, 2011 at 06:03:08 AM by AutoGen 5.12
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
 .SH NAME
-sntp \- standard Simple Network Time Protocol program
+sntp \- standard Simple Network Time Protocol client program
 .SH SYNOPSIS
 .B sntp
 .\" Mixture of short (flag) options and long options
@@ -17,7 +17,7 @@ sntp \- standard Simple Network Time Protocol program
 .B 
 can be used as an SNTP client to query a NTP or SNTP server and either display
 the time or set the local system's time (given suitable privilege).  It can be
-run as an interactive command or in a
+run as an interactive command or from a
 .Ic cron
 job.
 NTP (the Network Time Protocol) and SNTP (the Simple Network Time Protocol)
@@ -25,20 +25,35 @@ are defined and described by RFC 5905.
 .PP
 The default is to write the estimated correct local date and time (i.e. not
 UTC) to the standard output in a format like:
-.Ic "'1996-10-15 20:17:25.123 (+0800) +4.567 +/- 0.089 secs'"
+.Ic "'1996-10-15 20:17:25.123 (+0800) +4.567 +/- 0.089 [host] IP sN'"
 where the
 .Ic "'(+0800)'"
 means that to get to UTC from the reported local time one must
 add 8 hours and 0 minutes,
-and the
-.Ic "'+4.567 +/- 0.089 secs'"
+the
+.Ic "'+4.567'"
 indicates the local clock is 4.567 seconds behind the correct time
-(so 4.567 seconds must be added to the local clock to get it to be correct),
-and the date/time of
-'1996-10-15 20:17:25.123'
-is believed to be correct to within
-+/- 0.089
-seconds.
+(so 4.567 seconds must be added to the local clock to get it to be correct).
+Note that the number of decimals printed for this value will change
+based on the reported precision of the server.
+.Ic "'+/- 0.089'"
+is the reported
+.I synchronization distance
+(in seconds), which represents the maximum error due to all causes.
+If the server does not report valid data needed to calculate the
+synchronization distance, this will be reported as
+.Ic "'+/- ?'" .
+If the
+.I host
+is different from the
+.I IP ,
+both will be displayed.
+Otherwise, only the 
+.I IP
+is displayed.
+Finally, the
+.I stratum
+of the host is reported.
 .SH "OPTIONS"
 .TP
 .BR \-4 ", " -\-ipv4
@@ -91,11 +106,11 @@ This option may appear an unlimited number of times.
 Requests from an NTP "client" to a "server" should never be sent
 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 -c or --concurrent flag says that any IPs returned for the DNS
-lookup of the supplied host-name are on different machines, so we
-can send concurrent queries.
+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
+returned for the DNS lookup of the supplied host-name are on
+different machines, so we can send concurrent queries.
 .TP
 .BR \-d ", " -\-debug\-level
 Increase debug verbosity level.
@@ -132,25 +147,25 @@ responses received from servers.
 Look in this file for the key specified with -a.
 .sp
 This option specifies the keyfile.
-@code{sntp} will search for the key specified with -a keyno in this
-file. Key files follow the following format:
-keyid keytype key
-Where	keyid is a number identifying this key
-keytype is one of the following:
-S  Key is a 64 Bit hexadecimal number as specified in in the DES specification.
-N  Key is a 64 Bit hexadecimal number as specified in the NTP standard.
-A  Key is a 1-to-8 character ASCII string.
-M  Key is a 1-to-8 character ASCII string using the MD5 authentication scheme.
+@code{sntp} will search for the key specified with @code{-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
+@file{keytype} is one of the following:
+@code{S}  Key is a 64 Bit hexadecimal number as specified in in the DES specification.
+@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).
 .TP
 .BR \-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
-logfile.
+@file{logfile}.
 .TP
 .BR \-M " \fInumber\fP, " \-\-steplimit "=" \fInumber\fP
-Adjustments less than steplimit msec will be slewed.
+Adjustments less than @file{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
@@ -160,9 +175,9 @@ greater than or equal to 0
 .fi
 .in -4
 .sp
-If the time adjustment is less than steplimit milliseconds, slew the
-amount using adjtime().  Otherwise, step the correction using
-settimeofday(). 
+If the time adjustment is less than @file{steplimit} milliseconds,
+slew the amount using adjtime(2).  Otherwise, step the correction
+using settimeofday(2). 
 .TP
 .BR \-o " \fInumber\fP, " \-\-ntpversion "=" \fInumber\fP
 Send  as our NTP version.
@@ -179,7 +194,7 @@ The default \fInumber\fP for this option is:
  4
 .sp
 When sending requests to a remote server, tell them we are running
-NTP protocol version  .
+NTP protocol version @file{ntpversion} .
 .TP
 .BR \-r ", " -\-usereservedport
 Use the NTP Reserved Port (port 123).
@@ -188,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().
+OK to 'step' the time with settimeofday(2).
 .sp
 .TP
 .BR \-s ", " -\-slew
-OK to 'slew' the time with adjtime().
+OK to 'slew' the time with adjtime(2).
 .sp
 .TP
 .BR \-u " \fIseconds\fP, " \-\-uctimeout "=" \fIseconds\fP
diff --git a/sntp/sntp.mdoc.in b/sntp/sntp.mdoc.in
index fe3778ee0..8260a5860 100644
--- a/sntp/sntp.mdoc.in
+++ b/sntp/sntp.mdoc.in
@@ -1,14 +1,14 @@
-.Dd August 19 2011
+.Dd August 20 2011
 .Dt SNTP @SNTP_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  August 19, 2011 at 07:45:34 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  August 20, 2011 at 06:03:31 AM by AutoGen 5.12
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
 .Nm sntp
-.Nd standard Simple Network Time Protocol program
+.Nd standard Simple Network Time Protocol client program
 .Sh SYNOPSIS
 .Nm
 .\" Mixture of short (flag) options and long options
@@ -21,7 +21,7 @@
 .Nm
 can be used as an SNTP client to query a NTP or SNTP server and either display
 the time or set the local system's time (given suitable privilege).  It can be
-run as an interactive command or in a
+run as an interactive command or from a
 .Ic cron
 job.
 NTP (the Network Time Protocol) and SNTP (the Simple Network Time Protocol)
@@ -29,20 +29,35 @@ are defined and described by RFC 5905.
 .PP
 The default is to write the estimated correct local date and time (i.e. not
 UTC) to the standard output in a format like:
-.Ic "'1996-10-15 20:17:25.123 (+0800) +4.567 +/- 0.089 secs'"
+.Ic "'1996-10-15 20:17:25.123 (+0800) +4.567 +/- 0.089 [host] IP sN'"
 where the
 .Ic "'(+0800)'"
 means that to get to UTC from the reported local time one must
 add 8 hours and 0 minutes,
-and the
-.Ic "'+4.567 +/- 0.089 secs'"
+the
+.Ic "'+4.567'"
 indicates the local clock is 4.567 seconds behind the correct time
-(so 4.567 seconds must be added to the local clock to get it to be correct),
-and the date/time of
-'1996-10-15 20:17:25.123'
-is believed to be correct to within
-+/- 0.089
-seconds.
+(so 4.567 seconds must be added to the local clock to get it to be correct).
+Note that the number of decimals printed for this value will change
+based on the reported precision of the server.
+.Ic "'+/- 0.089'"
+is the reported
+.Em synchronization distance
+(in seconds), which represents the maximum error due to all causes.
+If the server does not report valid data needed to calculate the
+synchronization distance, this will be reported as
+.Ic "'+/- ?'" .
+If the
+.Em host
+is different from the
+.Em IP ,
+both will be displayed.
+Otherwise, only the 
+.Em IP
+is displayed.
+Finally, the
+.Em stratum
+of the host is reported.
 .Sh "OPTIONS"
 .Bl -tag
 .It  \-4 ", " -\-ipv4
@@ -90,11 +105,11 @@ This option may appear an unlimited number of times.
 Requests from an NTP "client" to a "server" should never be sent
 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 -c or --concurrent flag says that any IPs returned for the DNS
-lookup of the supplied host-name are on different machines, so we
-can send concurrent queries.
+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
+returned for the DNS lookup of the supplied host-name are on
+different machines, so we can send concurrent queries.
 .It  \-d ", " -\-debug\-level
 Increase debug verbosity level.
 This option may appear an unlimited number of times.
@@ -126,23 +141,23 @@ responses received from servers.
 Look in this file for the key specified with -a.
 .sp
 This option specifies the keyfile.
-@code{sntp} will search for the key specified with -a keyno in this
-file. Key files follow the following format:
-keyid keytype key
-Where	keyid is a number identifying this key
-keytype is one of the following:
-S  Key is a 64 Bit hexadecimal number as specified in in the DES specification.
-N  Key is a 64 Bit hexadecimal number as specified in the NTP standard.
-A  Key is a 1-to-8 character ASCII string.
-M  Key is a 1-to-8 character ASCII string using the MD5 authentication scheme.
+@code{sntp} will search for the key specified with @code{-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
+@file{keytype} is one of the following:
+@code{S}  Key is a 64 Bit hexadecimal number as specified in in the DES specification.
+@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).
 .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
-logfile.
+@file{logfile}.
 .It  \-M " \fInumber\fP, " \-\-steplimit "=" \fInumber\fP
-Adjustments less than steplimit msec will be slewed.
+Adjustments less than @file{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
@@ -152,9 +167,9 @@ greater than or equal to 0
 .fi
 .in -4
 .sp
-If the time adjustment is less than steplimit milliseconds, slew the
-amount using adjtime().  Otherwise, step the correction using
-settimeofday(). 
+If the time adjustment is less than @file{steplimit} milliseconds,
+slew the amount using adjtime(2).  Otherwise, step the correction
+using settimeofday(2). 
 .It  \-o " \fInumber\fP, " \-\-ntpversion "=" \fInumber\fP
 Send  as our NTP version.
 This option takes an integer number as its argument.
@@ -170,17 +185,17 @@ The default \fInumber\fP for this option is:
  4
 .sp
 When sending requests to a remote server, tell them we are running
-NTP protocol version  .
+NTP protocol version @file{ntpversion} .
 .It  \-r ", " -\-usereservedport
 Use the NTP Reserved Port (port 123).
 .sp
 Use port 123, which is reserved for NTP, for our network
 communications.
 .It  \-S ", " -\-step
-OK to 'step' the time with settimeofday().
+OK to 'step' the time with settimeofday(2).
 .sp
 .It  \-s ", " -\-slew
-OK to 'slew' the time with adjtime().
+OK to 'slew' the time with 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 4ee4a50d5..8ae6a7c5f 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  August 19, 2011 at 07:44:06 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  August 20, 2011 at 06:01:26 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.7p205\n\
+"ntp-keygen (ntp) 4.2.7p206\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.7p205\n\
+"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p206\n\
 USAGE:  %s [ - [] | --[{=| }] ]...\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 154b8030b..518412033 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  August 19, 2011 at 07:44:05 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  August 20, 2011 at 06:01:25 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.7p205"
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.7p205"
+#define NTP_KEYGEN_VERSION       "4.2.7p206"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.7p206"
 
 /*
  *  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 7ee53b19a..3a65693e5 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  August 19, 2011 at 07:44:47 AM by AutoGen 5.12
+# It has been AutoGen-ed  August 20, 2011 at 06:02:19 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.7p205
+ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p206
 USAGE:  ntp-keygen [ - [] | --[@{=| @}] ]...
   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 751ccd655..e6fef7f5f 100644
--- a/util/ntp-keygen.1ntp-keygenman
+++ b/util/ntp-keygen.1ntp-keygenman
@@ -1,8 +1,8 @@
-.TH ntp-keygen 1ntp-keygenman "19 Aug 2011" "ntp (4.2.7p205)" "User Commands"
+.TH ntp-keygen 1ntp-keygenman "20 Aug 2011" "ntp (4.2.7p206)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  August 19, 2011 at 07:44:24 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  August 20, 2011 at 06:01:50 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 df23181bc..4542a2578 100644
--- a/util/ntp-keygen.1ntp-keygenmdoc
+++ b/util/ntp-keygen.1ntp-keygenmdoc
@@ -1,9 +1,9 @@
-.Dd August 19 2011
+.Dd August 20 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  August 19, 2011 at 07:44:48 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  August 20, 2011 at 06:02:21 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 470cc84e0..d95504c10 100644
--- a/util/ntp-keygen.man.in
+++ b/util/ntp-keygen.man.in
@@ -1,8 +1,8 @@
-.TH ntp-keygen @NTP_KEYGEN_MS@ "19 Aug 2011" "ntp (4.2.7p205)" "User Commands"
+.TH ntp-keygen @NTP_KEYGEN_MS@ "20 Aug 2011" "ntp (4.2.7p206)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  August 19, 2011 at 07:44:24 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  August 20, 2011 at 06:01:50 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 a96219297..7a2dd0c63 100644
--- a/util/ntp-keygen.mdoc.in
+++ b/util/ntp-keygen.mdoc.in
@@ -1,9 +1,9 @@
-.Dd August 19 2011
+.Dd August 20 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  August 19, 2011 at 07:44:48 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  August 20, 2011 at 06:02:21 AM by AutoGen 5.12
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME