From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 27 Jan 2014 09:55:09 +0000 (+0000)
Subject: Require a version string for perl scripts that use autogen
X-Git-Tag: NTP_4_2_7P413~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5bdc0d93df36a4170a28a50d8386d4b2a7ceb848;p=thirdparty%2Fntp.git

Require a version string for perl scripts that use autogen

bk: 52e62cfd23NWH-oT3rQV7YQGYoP8Cg
---

diff --git a/scripts/calc_tickadj/calc_tickadj-opts b/scripts/calc_tickadj/calc_tickadj-opts
index c547a8eec..a1b813c04 100644
--- a/scripts/calc_tickadj/calc_tickadj-opts
+++ b/scripts/calc_tickadj/calc_tickadj-opts
@@ -38,7 +38,7 @@ sub processOptions {
         'help|?', 'more-help'));
 
     $usage = <<'USAGE';
-calc_tickadj - Calculates "optimal" value for tick given ntp drift file.
+calc_tickadj - Calculates "optimal" value for tick given ntp drift file. 4.2.7p411
 USAGE: calc_tickadj [ -<flag> [<val>] | --<name>[{=| }<val>] ]... 
 
     -d, --drift-file=str         Ntp drift file to use
diff --git a/scripts/calc_tickadj/calc_tickadj-opts.def b/scripts/calc_tickadj/calc_tickadj-opts.def
index 5c965b24e..cdb50efeb 100644
--- a/scripts/calc_tickadj/calc_tickadj-opts.def
+++ b/scripts/calc_tickadj/calc_tickadj-opts.def
@@ -1,8 +1,13 @@
+/* -*- Mode: Text -*- */
 AutoGen Definitions perlopt;
+
 #include autogen-version.def
 
-prog-name  = calc_tickadj;
-prog-title = 'Calculates "optimal" value for tick given ntp drift file.';
+prog-name	= calc_tickadj;
+prog-title	= 'Calculates "optimal" value for tick given ntp drift file.';
+package		= ntp;
+#include	version.def
+
 long-opts;
 gnu-usage;
 
diff --git a/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman b/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman
index 5615dda93..613624623 100644
--- a/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman
+++ b/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH calc_tickadj 1calc_tickadjman "16 Dec 2013" "" "User Commands"
+.TH calc_tickadj 1calc_tickadjman "27 Jan 2014" "ntp (4.2.7p411)" "User Commands"
 .\"
 .\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed December 16, 2013 at 09:07:36 PM by AutoGen 5.18.3pre7
+.\" It has been AutoGen-ed January 27, 2014 at 09:00:38 AM by AutoGen 5.18.3pre11
 .\" From the definitions calc_tickadj-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -84,6 +84,11 @@ Display usage information and exit.
 .TP
 .NOP \f\*[B-Font]\-\&!\f[], \f\*[B-Font]\-\-more-help\f[]
 Pass the extended usage information through a pager.
+.TP
+.NOP \f\*[B-Font]\-v\f[] [{\f\*[I-Font]v|c|n\f[] \f\*[B-Font]\-\-version\f[] [{\f\*[I-Font]v|c|n\f[]}]}]
+Output version of program and exit.  The default mode is `v', a simple
+version.  The `c' mode will print copyright information and `n' will
+print the full copyright notice.
 .PP
 .SH "EXIT STATUS"
 One of the following exit values will be returned:
diff --git a/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc b/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc
index 603a72e52..e9c387b33 100644
--- a/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc
+++ b/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc
@@ -1,9 +1,9 @@
-.Dd December 16 2013
+.Dd January 27 2014
 .Dt CALC_TICKADJ 1calc_tickadjmdoc User Commands
 .Os FreeBSD 6.4-STABLE
 .\"  EDIT THIS FILE WITH CAUTION  (calc_tickadj-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  December 16, 2013 at 09:07:38 PM by AutoGen 5.18.3pre7
+.\"  It has been AutoGen-ed  January 27, 2014 at 09:00:40 AM by AutoGen 5.18.3pre11
 .\"  From the definitions    calc_tickadj-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -63,6 +63,10 @@ The current tick which to adjustment will be calculated
 Display usage information and exit.
 .It Fl \&! , Fl \-more\-help
 Pass the extended usage information through a pager.
+.It Fl v Op Brq Ar v|c|n  Fl \-version Op Brq Ar v|c|n
+Output version of program and exit.  The default mode is `v', a simple
+version.  The `c' mode will print copyright information and `n' will
+print the full copyright notice.
 .El
 .Sh "EXIT STATUS"
 One of the following exit values will be returned:
diff --git a/scripts/calc_tickadj/calc_tickadj.html b/scripts/calc_tickadj/calc_tickadj.html
index 9a072fff6..c863aad14 100644
--- a/scripts/calc_tickadj/calc_tickadj.html
+++ b/scripts/calc_tickadj/calc_tickadj.html
@@ -33,7 +33,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#dir">(dir)</a>
 <h2 class="unnumbered">calc_tickadj User's Manual</h2>
 
 <p>This document describes the use of the NTP Project's <code>calc_tickadj</code> program. 
-This document applies to version 4.2.7p401 of <code>calc_tickadj</code>.
+This document applies to version 4.2.7p411 of <code>calc_tickadj</code>.
 
   <div class="shortcontents">
 <h2>Short Contents</h2>
diff --git a/scripts/calc_tickadj/calc_tickadj.mdoc.in b/scripts/calc_tickadj/calc_tickadj.mdoc.in
index 603a72e52..e9c387b33 100644
--- a/scripts/calc_tickadj/calc_tickadj.mdoc.in
+++ b/scripts/calc_tickadj/calc_tickadj.mdoc.in
@@ -1,9 +1,9 @@
-.Dd December 16 2013
+.Dd January 27 2014
 .Dt CALC_TICKADJ 1calc_tickadjmdoc User Commands
 .Os FreeBSD 6.4-STABLE
 .\"  EDIT THIS FILE WITH CAUTION  (calc_tickadj-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  December 16, 2013 at 09:07:38 PM by AutoGen 5.18.3pre7
+.\"  It has been AutoGen-ed  January 27, 2014 at 09:00:40 AM by AutoGen 5.18.3pre11
 .\"  From the definitions    calc_tickadj-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -63,6 +63,10 @@ The current tick which to adjustment will be calculated
 Display usage information and exit.
 .It Fl \&! , Fl \-more\-help
 Pass the extended usage information through a pager.
+.It Fl v Op Brq Ar v|c|n  Fl \-version Op Brq Ar v|c|n
+Output version of program and exit.  The default mode is `v', a simple
+version.  The `c' mode will print copyright information and `n' will
+print the full copyright notice.
 .El
 .Sh "EXIT STATUS"
 One of the following exit values will be returned:
diff --git a/scripts/calc_tickadj/invoke-calc_tickadj.texi b/scripts/calc_tickadj/invoke-calc_tickadj.texi
index 4ad1a3333..3dd8bc086 100644
--- a/scripts/calc_tickadj/invoke-calc_tickadj.texi
+++ b/scripts/calc_tickadj/invoke-calc_tickadj.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-calc_tickadj.texi)
 #
-# It has been AutoGen-ed  December 19, 2013 at 11:28:34 AM by AutoGen 5.18.3pre7
+# It has been AutoGen-ed  January 27, 2014 at 09:00:42 AM by AutoGen 5.18.3pre11
 # From the definitions    calc_tickadj-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
diff --git a/scripts/invoke-plot_summary.texi b/scripts/invoke-plot_summary.texi
index 49df7b7ea..05b66fcf9 100644
--- a/scripts/invoke-plot_summary.texi
+++ b/scripts/invoke-plot_summary.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-plot_summary.texi)
 #
-# It has been AutoGen-ed  January 20, 2014 at 11:10:58 AM by AutoGen 5.18.3pre11
+# It has been AutoGen-ed  January 27, 2014 at 09:51:36 AM by AutoGen 5.18.3pre11
 # From the definitions    plot_summary-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -41,7 +41,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-plot_summary - plot statistics generated by summary script
+plot_summary - plot statistics generated by summary script - Ver. 4.2.7p412
 USAGE: plot_summary [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... 
 
       , --directory=str          Where the summary files are
diff --git a/scripts/invoke-summary.texi b/scripts/invoke-summary.texi
index 0bd616480..4cc5490b2 100644
--- a/scripts/invoke-summary.texi
+++ b/scripts/invoke-summary.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-summary.texi)
 #
-# It has been AutoGen-ed  January 20, 2014 at 11:11:23 AM by AutoGen 5.18.3pre11
+# It has been AutoGen-ed  January 27, 2014 at 09:51:41 AM by AutoGen 5.18.3pre11
 # From the definitions    summary-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -42,7 +42,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-summary - compute various stastics from NTP stat files
+summary - compute various stastics from NTP stat files - Ver. 4.2.7p412
 USAGE: summary [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... 
 
       , --directory=str          Directory containing stat files
diff --git a/scripts/ntp-wait/ntp-wait-opts b/scripts/ntp-wait/ntp-wait-opts
index 49428d2b9..fc0559477 100644
--- a/scripts/ntp-wait/ntp-wait-opts
+++ b/scripts/ntp-wait/ntp-wait-opts
@@ -39,7 +39,7 @@ sub processOptions {
         'help|?', 'more-help'));
 
     $usage = <<'USAGE';
-ntp-wait - Wait for ntpd to stabilize the system clock
+ntp-wait - Wait for ntpd to stabilize the system clock - Ver. 4.2.7p411
 USAGE: ntp-wait [ -<flag> [<val>] | --<name>[{=| }<val>] ]... 
 
     -n, --tries=num              Number of times to check ntpd
diff --git a/scripts/ntp-wait/ntp-wait-opts.def b/scripts/ntp-wait/ntp-wait-opts.def
index e42f9f58b..2a022a2b3 100644
--- a/scripts/ntp-wait/ntp-wait-opts.def
+++ b/scripts/ntp-wait/ntp-wait-opts.def
@@ -1,11 +1,13 @@
 /* -*- Mode: Text -*- */
-autogen definitions perlopt;
+AutoGen Definitions perlopt;
 
 #include autogen-version.def
 
-prog-name      = "ntp-wait";
-prog-title     = "Wait for ntpd to stabilize the system clock";
-package        = ntp;
+prog-name	= "ntp-wait";
+prog-title	= "Wait for ntpd to stabilize the system clock";
+package		= ntp;
+#include	version.def
+
 long-opts;
 gnu-usage;
 
diff --git a/scripts/ntp-wait/ntp-wait.1ntp-waitman b/scripts/ntp-wait/ntp-wait.1ntp-waitman
index b70e6d091..64ecd8fee 100644
--- a/scripts/ntp-wait/ntp-wait.1ntp-waitman
+++ b/scripts/ntp-wait/ntp-wait.1ntp-waitman
@@ -1,123 +1,122 @@
-.TH ntp-wait 1ntp-waitman "30 Nov 2013" "ntp (4.2.7p401)" "User Commands"
+.de1 NOP
+.  it 1 an-trap
+.  if \\n[.$] \,\\$*\/
+..
+.ie t \
+.ds B-Font [CB]
+.ds I-Font [CI]
+.ds R-Font [CR]
+.el \
+.ds B-Font B
+.ds I-Font I
+.ds R-Font R
+.TH ntp-wait 1ntp-waitman "27 Jan 2014" "ntp (4.2.7p411)" "User Commands"
 .\"
-.\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.man)
-.\"
-.\"  It has been AutoGen-ed  November 30, 2013 at 11:24:38 AM by AutoGen 5.18.3pre5
-.\"  From the definitions    ntp-wait-opts.def
-.\"  and the template file   agman-cmd.tpl
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
+.\" It has been AutoGen-ed January 27, 2014 at 09:00:50 AM by AutoGen 5.18.3pre11
+.\" From the definitions ntp-wait-opts.def
+.\" and the template file agman-cmd.tpl
 .SH NAME
-ntp-wait \- Wait for ntpd to stabilize the system clock
+\f\*[B-Font]ntp-wait\fP
+\- Wait for ntpd to stabilize the system clock
 .SH SYNOPSIS
-.B ntp-wait
+\f\*[B-Font]ntp-wait\fP
 .\" Mixture of short (flag) options and long options
-.RB [ \-\fIflag\fP " [\fIvalue\fP]]... [" \-\-\fIopt\-name\fP "[[=| ]\fIvalue\fP]]..."
-.PP
+[\f\*[B-Font]\-flags\f[]]
+[\f\*[B-Font]\-flag\f[] [\f\*[I-Font]value\f[]]]
+[\f\*[B-Font]\-\-option-name\f[][[=| ]\f\*[I-Font]value\f[]]]
+.sp \n(Ppu
+.ne 2
+
 All arguments must be options.
-.PP
+.sp \n(Ppu
+.ne 2
+
 .SH DESCRIPTION
-.B 
+\f\*[B-Font]ntp-wait\fP
 will send at most
-Inum-triesR
+\f\*[I-Font]num-tries\f[]
 queries to
-.Xr ntpd 8 ,
+\fCntpd\fR(8)\f[],
 sleeping for
-Isecs-between-triesR
+\f\*[I-Font]secs-between-tries\f[]
 after each status return that says
-.Xr ntpd 8
+\fCntpd\fR(8)\f[]
 has not yet produced a synchronized and stable system clock.
-.PP
-.B 
+.sp \n(Ppu
+.ne 2
+
+\f\*[B-Font]ntp-wait\fP
 will do this quietly, unless the
- v
+\f\*[B-Font]\-v\f[]
 flag is provided.
+This can be useful at boot time, to delay the boot sequence until after
+\f\*[I-Font]ntpd\f[] \f\*[I-Font]\-g\f[]
+has set the time.
 .SH "OPTIONS"
 .TP
-.BR  \-n " \fInum\-tries\fP, " \-\- "=" \fInum\-tries\fP
+.NOP \f\*[B-Font]\-n\f[] \f\*[I-Font]number\f[], \f\*[B-Font]\-\-tries\f[]=\f\*[I-Font]number\f[]
 Number of times to check ntpd.
 This option takes an integer number as its argument.
-The default \fInum\-tries\fP for this option is:
+The default
+\f\*[I-Font]number\f[]
+for this option is:
 .ti +4
  100
 .sp
-The maximum number of times we will check \fBntpd\fP to see if
-it has been able to synchronize and stabilize the system clock.
+        The maximum number of times we will check \fBntpd\fP to see if
+        it has been able to synchronize and stabilize the system clock.
 .TP
-.BR  \-s " \fIsecs\-between\-tries\fP, " \-\- "=" \fIsecs\-between\-tries\fP
+.NOP \f\*[B-Font]\-s\f[] \f\*[I-Font]secs\-between\-tries\f[], \f\*[B-Font]\-\-sleep\f[]=\f\*[I-Font]secs\-between\-tries\f[]
 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:
+The default
+\f\*[I-Font]secs\-between\-tries\f[]
+for this option is:
 .ti +4
  6
 .sp
-We will sleep for \fIsecs-between-tries\fP after each query
-of \fBntpd\fP that returns "the time is not yet stable".
+        We will sleep for \fIsecs-between-tries\fP after each query
+        of \fBntpd\fP that returns "the time is not yet stable".
 .TP
-.BR  \-v ", " \-\-
+.NOP \f\*[B-Font]\-v\f[], \f\*[B-Font]\-\-verbose\f[]
 Be verbose.
 .sp
-By default, \fBntp-wait\fP is silent.
-With this option, \fBntp-wait\fP will provide status information.
+        By default, \fBntp-wait\fP is silent.
+        With this option, \fBntp-wait\fP will provide status information.
 .TP
-.BR \-? , " \-\-help"
+.NOP \f\*[B-Font]\-\&?\f[], \f\*[B-Font]\-\-help\f[]
 Display usage information and exit.
 .TP
-.BR \-! , " \-\-more-help"
+.NOP \f\*[B-Font]\-\&!\f[], \f\*[B-Font]\-\-more-help\f[]
 Pass the extended usage information through a pager.
 .TP
-.BR \-\-version "[={\fIv|c|n\fP}]"
+.NOP \f\*[B-Font]\-v\f[] [{\f\*[I-Font]v|c|n\f[] \f\*[B-Font]\-\-version\f[] [{\f\*[I-Font]v|c|n\f[]}]}]
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.
-.SH "OPTION PRESETS"
-Any option that is not marked as \fInot presettable\fP may be preset
-by loading values from environment variables named:
-.nf
-  \fBNTP_WAIT_<option-name>\fP or \fBNTP_WAIT\fP
-.fi
-.ad
-cvt_prog='/usr/local/gnu/share/autogen/texi2man'
-cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
-         `/`basename "$cvt_prog"`
-cd $tmp_dir
-test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
-{
-    list='synopsis description options option-presets'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list name
-    list='implementation-notes environment files examples exit-status errors
-        compatibility see-also conforming-to history authors copyright bugs
-        notes'
-    for f in $list ; do cat $f ; echo ; done > .end-doc
-    rm \-f $list
-    list=`ls \-1 *`' .end-doc'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list
-} 1>.doc 2>/dev/null
-sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ 	]*$' | $cvt_prog
-.SH "ENVIRONMENT"
-See \fBOPTION PRESETS\fP for configuration environment variables.
+.PP
 .SH "EXIT STATUS"
 One of the following exit values will be returned:
 .TP
-.BR 0 " (EXIT_SUCCESS)"
+.NOP 0 " (EXIT_SUCCESS)"
 Successful program execution.
 .TP
-.BR 1 " (EXIT_FAILURE)"
+.NOP 1 " (EXIT_FAILURE)"
 The operation failed or the command syntax was not valid.
 .TP
-.BR 70 " (EX_SOFTWARE)"
+.NOP 70 " (EX_SOFTWARE)"
 libopts had an internal operational error.  Please report
 it to autogen-users@lists.sourceforge.net.  Thank you.
+.PP
 .SH AUTHORS
-.An "Harlan Stenn"
-.SH "COPYRIGHT"
-Copyright (C) 1970-2013 The University of Delaware all rights reserved.
-This program is released under the terms of the NTP license, <http://ntp.org/license>.
-.SH "BUGS"
-Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
+.NOP  "Harlan Stenn" 
+.br
 .SH NOTES
-This document corresponds to version 4.2.7p401 of NTP.
-.PP
+This document corresponds to version @VERSION@ of NTP.
+.sp \n(Ppu
+.ne 2
+
 This manual page was \fIAutoGen\fP-erated from the \fBntp-wait\fP
 option definitions.
diff --git a/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc b/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc
index bd0b81e12..a23bff525 100644
--- a/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc
+++ b/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc
@@ -1,9 +1,9 @@
-.Dd November 30 2013
+.Dd January 27 2014
 .Dt NTP_WAIT 1ntp-waitmdoc User Commands
-.Os SunOS 5.10
+.Os FreeBSD 6.4-STABLE
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  November 30, 2013 at 11:24:47 AM by AutoGen 5.18.3pre5
+.\"  It has been AutoGen-ed  January 27, 2014 at 09:00:52 AM by AutoGen 5.18.3pre11
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -13,8 +13,8 @@
 .Nm
 .\" Mixture of short (flag) options and long options
 .Op Fl flags
-.Op Fl flag Ar value
-.Op Fl \-option\-name Ar value
+.Op Fl flag Op Ar value
+.Op Fl \-option\-name Ns Oo Oo Ns "=| " Oc Ns Ar value Oc
 .Pp
 All arguments must be options.
 .Pp
@@ -34,68 +34,47 @@ has not yet produced a synchronized and stable system clock.
 will do this quietly, unless the
 .Fl v
 flag is provided.
+This can be useful at boot time, to delay the boot sequence until after
+.Ar ntpd \-g 
+has set the time.
 .Sh "OPTIONS"
 .Bl -tag
-.It  \-n " \fInum\-tries\fP, " \-\- "=" \fInum\-tries\fP
+.It  Fl n Ar number , Fl \-tries Ns = Ns Ar number 
 Number of times to check ntpd.
 This option takes an integer number as its argument.
-The default \fInum\-tries\fP for this option is:
+The default
+.Ar number
+for this option is:
 .ti +4
  100
 .sp
-The maximum number of times we will check \fBntpd\fP to see if
-it has been able to synchronize and stabilize the system clock.
-.It  \-s " \fIsecs\-between\-tries\fP, " \-\- "=" \fIsecs\-between\-tries\fP
+        The maximum number of times we will check \fBntpd\fP to see if
+        it has been able to synchronize and stabilize the system clock.
+.It  Fl s Ar secs\-between\-tries , Fl \-sleep Ns = Ns Ar secs\-between\-tries 
 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:
+The default
+.Ar secs\-between\-tries
+for this option is:
 .ti +4
  6
 .sp
-We will sleep for \fIsecs\-between\-tries\fP after each query
-of \fBntpd\fP that returns "the time is not yet stable".
-.It  \-v ", " \-\-
+        We will sleep for \fIsecs\-between\-tries\fP after each query
+        of \fBntpd\fP that returns "the time is not yet stable".
+.It  Fl v , Fl \-verbose 
 Be verbose.
 .sp
-By default, \fBntp\-wait\fP is silent.
-With this option, \fBntp\-wait\fP will provide status information.
-.It \-? , " \-\-help"
+        By default, \fBntp\-wait\fP is silent.
+        With this option, \fBntp\-wait\fP will provide status information.
+.It Fl \&? , Fl \-help
 Display usage information and exit.
-.It \-! , " \-\-more\-help"
+.It Fl \&! , Fl \-more\-help
 Pass the extended usage information through a pager.
-.It \-\-version "[={\fIv|c|n\fP}]"
+.It Fl v Op Brq Ar v|c|n  Fl \-version Op Brq Ar v|c|n
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.
 .El
-.Sh "OPTION PRESETS"
-Any option that is not marked as \fInot presettable\fP may be preset
-by loading values from environment variables named:
-.nf
-  \fBNTP_WAIT_<option\-name>\fP or \fBNTP_WAIT\fP
-.fi
-.ad
-cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc'
-cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
-         `/`basename "$cvt_prog"`
-cd $tmp_dir
-test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
-{
-    list='synopsis description options option\-presets'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list name
-    list='implementation\-notes environment files examples exit\-status errors
-        compatibility see\-also conforming\-to history authors copyright bugs
-        notes'
-    for f in $list ; do cat $f ; echo ; done > .end\-doc
-    rm \-f $list
-    list=`ls \-1 *`' .end\-doc'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list
-} 1>.doc 2>/dev/null
-sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ 	]*$' | $cvt_prog
-.Sh "ENVIRONMENT"
-See \fBOPTION PRESETS\fP for configuration environment variables.
 .Sh "EXIT STATUS"
 One of the following exit values will be returned:
 .Bl -tag
@@ -109,13 +88,8 @@ it to autogen\-users@lists.sourceforge.net.  Thank you.
 .El
 .Sh AUTHORS
 .An "Harlan Stenn"
-.Sh "COPYRIGHT"
-Copyright (C) 1970\-2013 The University of Delaware all rights reserved.
-This program is released under the terms of the NTP license, <http://ntp.org/license>.
-.Sh "BUGS"
-Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .Sh NOTES
-This document corresponds to version 4.2.7p401 of NTP.
+This document corresponds to version @VERSION@ of NTP.
 .Pp
 This manual page was \fIAutoGen\fP\-erated from the \fBntp\-wait\fP
 option definitions.
diff --git a/scripts/ntp-wait/ntp-wait.man.in b/scripts/ntp-wait/ntp-wait.man.in
index 40d07537f..5bce6116e 100644
--- a/scripts/ntp-wait/ntp-wait.man.in
+++ b/scripts/ntp-wait/ntp-wait.man.in
@@ -1,123 +1,122 @@
-.TH ntp-wait @NTP_WAIT_MS@ "30 Nov 2013" "ntp (4.2.7p401)" "User Commands"
+.de1 NOP
+.  it 1 an-trap
+.  if \\n[.$] \,\\$*\/
+..
+.ie t \
+.ds B-Font [CB]
+.ds I-Font [CI]
+.ds R-Font [CR]
+.el \
+.ds B-Font B
+.ds I-Font I
+.ds R-Font R
+.TH ntp-wait @NTP_WAIT_MS@ "27 Jan 2014" "ntp (4.2.7p411)" "User Commands"
 .\"
-.\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.man)
-.\"
-.\"  It has been AutoGen-ed  November 30, 2013 at 11:24:38 AM by AutoGen 5.18.3pre5
-.\"  From the definitions    ntp-wait-opts.def
-.\"  and the template file   agman-cmd.tpl
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
+.\" It has been AutoGen-ed January 27, 2014 at 09:00:50 AM by AutoGen 5.18.3pre11
+.\" From the definitions ntp-wait-opts.def
+.\" and the template file agman-cmd.tpl
 .SH NAME
-ntp-wait \- Wait for ntpd to stabilize the system clock
+\f\*[B-Font]ntp-wait\fP
+\- Wait for ntpd to stabilize the system clock
 .SH SYNOPSIS
-.B ntp-wait
+\f\*[B-Font]ntp-wait\fP
 .\" Mixture of short (flag) options and long options
-.RB [ \-\fIflag\fP " [\fIvalue\fP]]... [" \-\-\fIopt\-name\fP "[[=| ]\fIvalue\fP]]..."
-.PP
+[\f\*[B-Font]\-flags\f[]]
+[\f\*[B-Font]\-flag\f[] [\f\*[I-Font]value\f[]]]
+[\f\*[B-Font]\-\-option-name\f[][[=| ]\f\*[I-Font]value\f[]]]
+.sp \n(Ppu
+.ne 2
+
 All arguments must be options.
-.PP
+.sp \n(Ppu
+.ne 2
+
 .SH DESCRIPTION
-.B 
+\f\*[B-Font]ntp-wait\fP
 will send at most
-Inum-triesR
+\f\*[I-Font]num-tries\f[]
 queries to
-.Xr ntpd 8 ,
+\fCntpd\fR(8)\f[],
 sleeping for
-Isecs-between-triesR
+\f\*[I-Font]secs-between-tries\f[]
 after each status return that says
-.Xr ntpd 8
+\fCntpd\fR(8)\f[]
 has not yet produced a synchronized and stable system clock.
-.PP
-.B 
+.sp \n(Ppu
+.ne 2
+
+\f\*[B-Font]ntp-wait\fP
 will do this quietly, unless the
- v
+\f\*[B-Font]\-v\f[]
 flag is provided.
+This can be useful at boot time, to delay the boot sequence until after
+\f\*[I-Font]ntpd\f[] \f\*[I-Font]\-g\f[]
+has set the time.
 .SH "OPTIONS"
 .TP
-.BR  \-n " \fInum\-tries\fP, " \-\- "=" \fInum\-tries\fP
+.NOP \f\*[B-Font]\-n\f[] \f\*[I-Font]number\f[], \f\*[B-Font]\-\-tries\f[]=\f\*[I-Font]number\f[]
 Number of times to check ntpd.
 This option takes an integer number as its argument.
-The default \fInum\-tries\fP for this option is:
+The default
+\f\*[I-Font]number\f[]
+for this option is:
 .ti +4
  100
 .sp
-The maximum number of times we will check \fBntpd\fP to see if
-it has been able to synchronize and stabilize the system clock.
+        The maximum number of times we will check \fBntpd\fP to see if
+        it has been able to synchronize and stabilize the system clock.
 .TP
-.BR  \-s " \fIsecs\-between\-tries\fP, " \-\- "=" \fIsecs\-between\-tries\fP
+.NOP \f\*[B-Font]\-s\f[] \f\*[I-Font]secs\-between\-tries\f[], \f\*[B-Font]\-\-sleep\f[]=\f\*[I-Font]secs\-between\-tries\f[]
 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:
+The default
+\f\*[I-Font]secs\-between\-tries\f[]
+for this option is:
 .ti +4
  6
 .sp
-We will sleep for \fIsecs-between-tries\fP after each query
-of \fBntpd\fP that returns "the time is not yet stable".
+        We will sleep for \fIsecs-between-tries\fP after each query
+        of \fBntpd\fP that returns "the time is not yet stable".
 .TP
-.BR  \-v ", " \-\-
+.NOP \f\*[B-Font]\-v\f[], \f\*[B-Font]\-\-verbose\f[]
 Be verbose.
 .sp
-By default, \fBntp-wait\fP is silent.
-With this option, \fBntp-wait\fP will provide status information.
+        By default, \fBntp-wait\fP is silent.
+        With this option, \fBntp-wait\fP will provide status information.
 .TP
-.BR \-? , " \-\-help"
+.NOP \f\*[B-Font]\-\&?\f[], \f\*[B-Font]\-\-help\f[]
 Display usage information and exit.
 .TP
-.BR \-! , " \-\-more-help"
+.NOP \f\*[B-Font]\-\&!\f[], \f\*[B-Font]\-\-more-help\f[]
 Pass the extended usage information through a pager.
 .TP
-.BR \-\-version "[={\fIv|c|n\fP}]"
+.NOP \f\*[B-Font]\-v\f[] [{\f\*[I-Font]v|c|n\f[] \f\*[B-Font]\-\-version\f[] [{\f\*[I-Font]v|c|n\f[]}]}]
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.
-.SH "OPTION PRESETS"
-Any option that is not marked as \fInot presettable\fP may be preset
-by loading values from environment variables named:
-.nf
-  \fBNTP_WAIT_<option-name>\fP or \fBNTP_WAIT\fP
-.fi
-.ad
-cvt_prog='/usr/local/gnu/share/autogen/texi2man'
-cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
-         `/`basename "$cvt_prog"`
-cd $tmp_dir
-test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
-{
-    list='synopsis description options option-presets'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list name
-    list='implementation-notes environment files examples exit-status errors
-        compatibility see-also conforming-to history authors copyright bugs
-        notes'
-    for f in $list ; do cat $f ; echo ; done > .end-doc
-    rm \-f $list
-    list=`ls \-1 *`' .end-doc'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list
-} 1>.doc 2>/dev/null
-sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ 	]*$' | $cvt_prog
-.SH "ENVIRONMENT"
-See \fBOPTION PRESETS\fP for configuration environment variables.
+.PP
 .SH "EXIT STATUS"
 One of the following exit values will be returned:
 .TP
-.BR 0 " (EXIT_SUCCESS)"
+.NOP 0 " (EXIT_SUCCESS)"
 Successful program execution.
 .TP
-.BR 1 " (EXIT_FAILURE)"
+.NOP 1 " (EXIT_FAILURE)"
 The operation failed or the command syntax was not valid.
 .TP
-.BR 70 " (EX_SOFTWARE)"
+.NOP 70 " (EX_SOFTWARE)"
 libopts had an internal operational error.  Please report
 it to autogen-users@lists.sourceforge.net.  Thank you.
+.PP
 .SH AUTHORS
-.An "Harlan Stenn"
-.SH "COPYRIGHT"
-Copyright (C) 1970-2013 The University of Delaware all rights reserved.
-This program is released under the terms of the NTP license, <http://ntp.org/license>.
-.SH "BUGS"
-Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
+.NOP  "Harlan Stenn" 
+.br
 .SH NOTES
-This document corresponds to version 4.2.7p401 of NTP.
-.PP
+This document corresponds to version @VERSION@ of NTP.
+.sp \n(Ppu
+.ne 2
+
 This manual page was \fIAutoGen\fP-erated from the \fBntp-wait\fP
 option definitions.
diff --git a/scripts/ntp-wait/ntp-wait.mdoc.in b/scripts/ntp-wait/ntp-wait.mdoc.in
index e51c36121..c88f1eac0 100644
--- a/scripts/ntp-wait/ntp-wait.mdoc.in
+++ b/scripts/ntp-wait/ntp-wait.mdoc.in
@@ -1,9 +1,9 @@
-.Dd November 30 2013
+.Dd January 27 2014
 .Dt NTP_WAIT @NTP_WAIT_MS@ User Commands
-.Os SunOS 5.10
+.Os FreeBSD 6.4-STABLE
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  November 30, 2013 at 11:24:47 AM by AutoGen 5.18.3pre5
+.\"  It has been AutoGen-ed  January 27, 2014 at 09:00:52 AM by AutoGen 5.18.3pre11
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -13,8 +13,8 @@
 .Nm
 .\" Mixture of short (flag) options and long options
 .Op Fl flags
-.Op Fl flag Ar value
-.Op Fl \-option\-name Ar value
+.Op Fl flag Op Ar value
+.Op Fl \-option\-name Ns Oo Oo Ns "=| " Oc Ns Ar value Oc
 .Pp
 All arguments must be options.
 .Pp
@@ -34,68 +34,47 @@ has not yet produced a synchronized and stable system clock.
 will do this quietly, unless the
 .Fl v
 flag is provided.
+This can be useful at boot time, to delay the boot sequence until after
+.Ar ntpd \-g 
+has set the time.
 .Sh "OPTIONS"
 .Bl -tag
-.It  \-n " \fInum\-tries\fP, " \-\- "=" \fInum\-tries\fP
+.It  Fl n Ar number , Fl \-tries Ns = Ns Ar number 
 Number of times to check ntpd.
 This option takes an integer number as its argument.
-The default \fInum\-tries\fP for this option is:
+The default
+.Ar number
+for this option is:
 .ti +4
  100
 .sp
-The maximum number of times we will check \fBntpd\fP to see if
-it has been able to synchronize and stabilize the system clock.
-.It  \-s " \fIsecs\-between\-tries\fP, " \-\- "=" \fIsecs\-between\-tries\fP
+        The maximum number of times we will check \fBntpd\fP to see if
+        it has been able to synchronize and stabilize the system clock.
+.It  Fl s Ar secs\-between\-tries , Fl \-sleep Ns = Ns Ar secs\-between\-tries 
 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:
+The default
+.Ar secs\-between\-tries
+for this option is:
 .ti +4
  6
 .sp
-We will sleep for \fIsecs\-between\-tries\fP after each query
-of \fBntpd\fP that returns "the time is not yet stable".
-.It  \-v ", " \-\-
+        We will sleep for \fIsecs\-between\-tries\fP after each query
+        of \fBntpd\fP that returns "the time is not yet stable".
+.It  Fl v , Fl \-verbose 
 Be verbose.
 .sp
-By default, \fBntp\-wait\fP is silent.
-With this option, \fBntp\-wait\fP will provide status information.
-.It \-? , " \-\-help"
+        By default, \fBntp\-wait\fP is silent.
+        With this option, \fBntp\-wait\fP will provide status information.
+.It Fl \&? , Fl \-help
 Display usage information and exit.
-.It \-! , " \-\-more\-help"
+.It Fl \&! , Fl \-more\-help
 Pass the extended usage information through a pager.
-.It \-\-version "[={\fIv|c|n\fP}]"
+.It Fl v Op Brq Ar v|c|n  Fl \-version Op Brq Ar v|c|n
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.
 .El
-.Sh "OPTION PRESETS"
-Any option that is not marked as \fInot presettable\fP may be preset
-by loading values from environment variables named:
-.nf
-  \fBNTP_WAIT_<option\-name>\fP or \fBNTP_WAIT\fP
-.fi
-.ad
-cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc'
-cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
-         `/`basename "$cvt_prog"`
-cd $tmp_dir
-test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
-{
-    list='synopsis description options option\-presets'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list name
-    list='implementation\-notes environment files examples exit\-status errors
-        compatibility see\-also conforming\-to history authors copyright bugs
-        notes'
-    for f in $list ; do cat $f ; echo ; done > .end\-doc
-    rm \-f $list
-    list=`ls \-1 *`' .end\-doc'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list
-} 1>.doc 2>/dev/null
-sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ 	]*$' | $cvt_prog
-.Sh "ENVIRONMENT"
-See \fBOPTION PRESETS\fP for configuration environment variables.
 .Sh "EXIT STATUS"
 One of the following exit values will be returned:
 .Bl -tag
@@ -109,13 +88,8 @@ it to autogen\-users@lists.sourceforge.net.  Thank you.
 .El
 .Sh AUTHORS
 .An "Harlan Stenn"
-.Sh "COPYRIGHT"
-Copyright (C) 1970\-2013 The University of Delaware all rights reserved.
-This program is released under the terms of the NTP license, <http://ntp.org/license>.
-.Sh "BUGS"
-Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .Sh NOTES
-This document corresponds to version 4.2.7p401 of NTP.
+This document corresponds to version @VERSION@ of NTP.
 .Pp
 This manual page was \fIAutoGen\fP\-erated from the \fBntp\-wait\fP
 option definitions.
diff --git a/scripts/ntpsweep/ntpsweep-opts b/scripts/ntpsweep/ntpsweep-opts
index 91dcbd79c..6b8e80828 100644
--- a/scripts/ntpsweep/ntpsweep-opts
+++ b/scripts/ntpsweep/ntpsweep-opts
@@ -42,7 +42,7 @@ sub processOptions {
         'help|?', 'more-help'));
 
     $usage = <<'USAGE';
-ntpsweep - Print various informations about given ntp servers
+ntpsweep - Print various informations about given ntp servers 4.2.7p411
 USAGE: ntpsweep [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [hostfile]
 
     -l, --host-list=str          Host to execute actions on
diff --git a/scripts/ntpsweep/ntpsweep-opts.def b/scripts/ntpsweep/ntpsweep-opts.def
index 50dd537c9..23dc020e9 100644
--- a/scripts/ntpsweep/ntpsweep-opts.def
+++ b/scripts/ntpsweep/ntpsweep-opts.def
@@ -1,10 +1,13 @@
 /* -*- Mode: Text -*- */
 autogen definitions perlopt;
+
 #include autogen-version.def
 
 prog-name      = 'ntpsweep';
 prog-title     = 'Print various informations about given ntp servers';
 package        = ntp;
+#include       version.def
+
 argument       = '[hostfile]';
 long-opts;
 gnu-usage;
diff --git a/scripts/ntpsweep/ntpsweep.1ntpsweepman b/scripts/ntpsweep/ntpsweep.1ntpsweepman
index c71badcce..ffef3acd7 100644
--- a/scripts/ntpsweep/ntpsweep.1ntpsweepman
+++ b/scripts/ntpsweep/ntpsweep.1ntpsweepman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpsweep 1ntpsweepman "29 Nov 2013" "ntp" "User Commands"
+.TH ntpsweep 1ntpsweepman "27 Jan 2014" "ntp (4.2.7p411)" "User Commands"
 .\"
 .\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed November 29, 2013 at 06:39:25 AM by AutoGen 5.18.3pre5
+.\" It has been AutoGen-ed January 27, 2014 at 09:01:01 AM by AutoGen 5.18.3pre11
 .\" From the definitions ntpsweep-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -73,6 +73,11 @@ Display usage information and exit.
 .TP
 .NOP \f\*[B-Font]\-\&!\f[], \f\*[B-Font]\-\-more-help\f[]
 Pass the extended usage information through a pager.
+.TP
+.NOP \f\*[B-Font]\-v\f[] [{\f\*[I-Font]v|c|n\f[] \f\*[B-Font]\-\-version\f[] [{\f\*[I-Font]v|c|n\f[]}]}]
+Output version of program and exit.  The default mode is `v', a simple
+version.  The `c' mode will print copyright information and `n' will
+print the full copyright notice.
 .PP
 .SH "EXIT STATUS"
 One of the following exit values will be returned:
diff --git a/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc b/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc
index 9f6cde554..16b5ab53a 100644
--- a/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc
+++ b/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc
@@ -1,9 +1,9 @@
-.Dd November 29 2013
+.Dd January 27 2014
 .Dt NTPSWEEP 1ntpsweepmdoc User Commands
 .Os FreeBSD 6.4-STABLE
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsweep-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  November 29, 2013 at 06:39:26 AM by AutoGen 5.18.3pre5
+.\"  It has been AutoGen-ed  January 27, 2014 at 09:00:58 AM by AutoGen 5.18.3pre11
 .\"  From the definitions    ntpsweep-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -54,6 +54,10 @@ NOTE: THIS OPTION IS DEPRECATED
 Display usage information and exit.
 .It Fl \&! , Fl \-more\-help
 Pass the extended usage information through a pager.
+.It Fl v Op Brq Ar v|c|n  Fl \-version Op Brq Ar v|c|n
+Output version of program and exit.  The default mode is `v', a simple
+version.  The `c' mode will print copyright information and `n' will
+print the full copyright notice.
 .El
 .Sh "EXIT STATUS"
 One of the following exit values will be returned:
diff --git a/scripts/ntpsweep/ntpsweep.man.in b/scripts/ntpsweep/ntpsweep.man.in
index c71badcce..ffef3acd7 100644
--- a/scripts/ntpsweep/ntpsweep.man.in
+++ b/scripts/ntpsweep/ntpsweep.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpsweep 1ntpsweepman "29 Nov 2013" "ntp" "User Commands"
+.TH ntpsweep 1ntpsweepman "27 Jan 2014" "ntp (4.2.7p411)" "User Commands"
 .\"
 .\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed November 29, 2013 at 06:39:25 AM by AutoGen 5.18.3pre5
+.\" It has been AutoGen-ed January 27, 2014 at 09:01:01 AM by AutoGen 5.18.3pre11
 .\" From the definitions ntpsweep-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -73,6 +73,11 @@ Display usage information and exit.
 .TP
 .NOP \f\*[B-Font]\-\&!\f[], \f\*[B-Font]\-\-more-help\f[]
 Pass the extended usage information through a pager.
+.TP
+.NOP \f\*[B-Font]\-v\f[] [{\f\*[I-Font]v|c|n\f[] \f\*[B-Font]\-\-version\f[] [{\f\*[I-Font]v|c|n\f[]}]}]
+Output version of program and exit.  The default mode is `v', a simple
+version.  The `c' mode will print copyright information and `n' will
+print the full copyright notice.
 .PP
 .SH "EXIT STATUS"
 One of the following exit values will be returned:
diff --git a/scripts/ntpsweep/ntpsweep.mdoc.in b/scripts/ntpsweep/ntpsweep.mdoc.in
index 9f6cde554..16b5ab53a 100644
--- a/scripts/ntpsweep/ntpsweep.mdoc.in
+++ b/scripts/ntpsweep/ntpsweep.mdoc.in
@@ -1,9 +1,9 @@
-.Dd November 29 2013
+.Dd January 27 2014
 .Dt NTPSWEEP 1ntpsweepmdoc User Commands
 .Os FreeBSD 6.4-STABLE
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsweep-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  November 29, 2013 at 06:39:26 AM by AutoGen 5.18.3pre5
+.\"  It has been AutoGen-ed  January 27, 2014 at 09:00:58 AM by AutoGen 5.18.3pre11
 .\"  From the definitions    ntpsweep-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -54,6 +54,10 @@ NOTE: THIS OPTION IS DEPRECATED
 Display usage information and exit.
 .It Fl \&! , Fl \-more\-help
 Pass the extended usage information through a pager.
+.It Fl v Op Brq Ar v|c|n  Fl \-version Op Brq Ar v|c|n
+Output version of program and exit.  The default mode is `v', a simple
+version.  The `c' mode will print copyright information and `n' will
+print the full copyright notice.
 .El
 .Sh "EXIT STATUS"
 One of the following exit values will be returned:
diff --git a/scripts/ntptrace/ntptrace-opts b/scripts/ntptrace/ntptrace-opts
index 27edbdc20..c4ceb9a42 100644
--- a/scripts/ntptrace/ntptrace-opts
+++ b/scripts/ntptrace/ntptrace-opts
@@ -39,7 +39,7 @@ sub processOptions {
         'help|?', 'more-help'));
 
     $usage = <<'USAGE';
-ntptrace - Trace peers of an NTP server
+ntptrace - Trace peers of an NTP server 4.2.7p411
 USAGE: ntptrace [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [host]
 
     -n, --numeric                Print IP addresses instead of hostnames
diff --git a/scripts/ntptrace/ntptrace-opts.def b/scripts/ntptrace/ntptrace-opts.def
index 5b0e585fb..81ddda3b2 100644
--- a/scripts/ntptrace/ntptrace-opts.def
+++ b/scripts/ntptrace/ntptrace-opts.def
@@ -1,12 +1,15 @@
 /* -*- Mode: Text -*- */
-autogen definitions perlopt;
+AutoGen Definitions perlopt;
 
 //#include copyright.def
 #include autogen-version.def
 
-prog-name      = 'ntptrace';
-prog-title     = 'Trace peers of an NTP server';
-argument       = '[host]';
+prog-name	= 'ntptrace';
+prog-title	= 'Trace peers of an NTP server';
+package		= ntp;
+#include	version.def
+argument	= '[host]';
+
 long-opts;
 gnu-usage;
 
diff --git a/scripts/ntptrace/ntptrace.1ntptraceman b/scripts/ntptrace/ntptrace.1ntptraceman
index 47b8594b8..623cc9b2c 100644
--- a/scripts/ntptrace/ntptrace.1ntptraceman
+++ b/scripts/ntptrace/ntptrace.1ntptraceman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntptrace 1ntptraceman "29 Nov 2013" "" "User Commands"
+.TH ntptrace 1ntptraceman "27 Jan 2014" "ntp (4.2.7p411)" "User Commands"
 .\"
 .\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed November 29, 2013 at 06:39:30 AM by AutoGen 5.18.3pre5
+.\" It has been AutoGen-ed January 27, 2014 at 09:01:07 AM by AutoGen 5.18.3pre11
 .\" From the definitions ntptrace-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -90,6 +90,11 @@ Display usage information and exit.
 .TP
 .NOP \f\*[B-Font]\-\&!\f[], \f\*[B-Font]\-\-more-help\f[]
 Pass the extended usage information through a pager.
+.TP
+.NOP \f\*[B-Font]\-v\f[] [{\f\*[I-Font]v|c|n\f[] \f\*[B-Font]\-\-version\f[] [{\f\*[I-Font]v|c|n\f[]}]}]
+Output version of program and exit.  The default mode is `v', a simple
+version.  The `c' mode will print copyright information and `n' will
+print the full copyright notice.
 .PP
 .SH "EXIT STATUS"
 One of the following exit values will be returned:
diff --git a/scripts/ntptrace/ntptrace.1ntptracemdoc b/scripts/ntptrace/ntptrace.1ntptracemdoc
index ea9b24c94..349fc83cc 100644
--- a/scripts/ntptrace/ntptrace.1ntptracemdoc
+++ b/scripts/ntptrace/ntptrace.1ntptracemdoc
@@ -1,9 +1,9 @@
-.Dd November 29 2013
+.Dd January 27 2014
 .Dt NTPTRACE 1ntptracemdoc User Commands
 .Os FreeBSD 6.4-STABLE
 .\"  EDIT THIS FILE WITH CAUTION  (ntptrace-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  November 29, 2013 at 06:39:32 AM by AutoGen 5.18.3pre5
+.\"  It has been AutoGen-ed  January 27, 2014 at 09:01:09 AM by AutoGen 5.18.3pre11
 .\"  From the definitions    ntptrace-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -70,6 +70,10 @@ This option has not been fully documented.
 Display usage information and exit.
 .It Fl \&! , Fl \-more\-help
 Pass the extended usage information through a pager.
+.It Fl v Op Brq Ar v|c|n  Fl \-version Op Brq Ar v|c|n
+Output version of program and exit.  The default mode is `v', a simple
+version.  The `c' mode will print copyright information and `n' will
+print the full copyright notice.
 .El
 .Sh "EXIT STATUS"
 One of the following exit values will be returned:
diff --git a/scripts/ntptrace/ntptrace.man.in b/scripts/ntptrace/ntptrace.man.in
index 3cf7f4de6..5e19fac9c 100644
--- a/scripts/ntptrace/ntptrace.man.in
+++ b/scripts/ntptrace/ntptrace.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntptrace @NTPTRACE_MS@ "29 Nov 2013" "" "User Commands"
+.TH ntptrace @NTPTRACE_MS@ "27 Jan 2014" "ntp (4.2.7p411)" "User Commands"
 .\"
 .\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed November 29, 2013 at 06:39:30 AM by AutoGen 5.18.3pre5
+.\" It has been AutoGen-ed January 27, 2014 at 09:01:07 AM by AutoGen 5.18.3pre11
 .\" From the definitions ntptrace-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -90,6 +90,11 @@ Display usage information and exit.
 .TP
 .NOP \f\*[B-Font]\-\&!\f[], \f\*[B-Font]\-\-more-help\f[]
 Pass the extended usage information through a pager.
+.TP
+.NOP \f\*[B-Font]\-v\f[] [{\f\*[I-Font]v|c|n\f[] \f\*[B-Font]\-\-version\f[] [{\f\*[I-Font]v|c|n\f[]}]}]
+Output version of program and exit.  The default mode is `v', a simple
+version.  The `c' mode will print copyright information and `n' will
+print the full copyright notice.
 .PP
 .SH "EXIT STATUS"
 One of the following exit values will be returned:
diff --git a/scripts/ntptrace/ntptrace.mdoc.in b/scripts/ntptrace/ntptrace.mdoc.in
index 0b60d9673..024026a86 100644
--- a/scripts/ntptrace/ntptrace.mdoc.in
+++ b/scripts/ntptrace/ntptrace.mdoc.in
@@ -1,9 +1,9 @@
-.Dd November 29 2013
+.Dd January 27 2014
 .Dt NTPTRACE @NTPTRACE_MS@ User Commands
 .Os FreeBSD 6.4-STABLE
 .\"  EDIT THIS FILE WITH CAUTION  (ntptrace-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  November 29, 2013 at 06:39:32 AM by AutoGen 5.18.3pre5
+.\"  It has been AutoGen-ed  January 27, 2014 at 09:01:09 AM by AutoGen 5.18.3pre11
 .\"  From the definitions    ntptrace-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -70,6 +70,10 @@ This option has not been fully documented.
 Display usage information and exit.
 .It Fl \&! , Fl \-more\-help
 Pass the extended usage information through a pager.
+.It Fl v Op Brq Ar v|c|n  Fl \-version Op Brq Ar v|c|n
+Output version of program and exit.  The default mode is `v', a simple
+version.  The `c' mode will print copyright information and `n' will
+print the full copyright notice.
 .El
 .Sh "EXIT STATUS"
 One of the following exit values will be returned:
diff --git a/scripts/plot_summary-opts b/scripts/plot_summary-opts
index 1dd327c77..6c2024078 100644
--- a/scripts/plot_summary-opts
+++ b/scripts/plot_summary-opts
@@ -45,7 +45,7 @@ sub processOptions {
         'help|?', 'more-help'));
 
     $usage = <<'USAGE';
-plot_summary - plot statistics generated by summary script
+plot_summary - plot statistics generated by summary script - Ver. 4.2.7p412
 USAGE: plot_summary [ -<flag> [<val>] | --<name>[{=| }<val>] ]... 
 
       , --directory=str          Where the summary files are
diff --git a/scripts/plot_summary-opts.def b/scripts/plot_summary-opts.def
index 7b52115f1..61f028bce 100644
--- a/scripts/plot_summary-opts.def
+++ b/scripts/plot_summary-opts.def
@@ -1,8 +1,13 @@
 /* -*- Mode: Text -*- */
-autogen definitions perlopt;
+AutoGen Definitions perlopt;
+
 #include autogen-version.def
+
 prog-name      = 'plot_summary';
 prog-title     = 'plot statistics generated by summary script';
+package		= ntp;
+#include	version.def
+
 long-opts;
 gnu-usage;
 
diff --git a/scripts/plot_summary.1plot_summaryman b/scripts/plot_summary.1plot_summaryman
index 4ee2c04f4..487287994 100644
--- a/scripts/plot_summary.1plot_summaryman
+++ b/scripts/plot_summary.1plot_summaryman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH plot_summary 1plot_summaryman "20 Jan 2014" "" "User Commands"
+.TH plot_summary 1plot_summaryman "27 Jan 2014" "ntp (4.2.7p412)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-QsaOJq/ag-4sa4Iq)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed January 20, 2014 at 11:11:07 AM by AutoGen 5.18.3pre11
+.\" It has been AutoGen-ed January 27, 2014 at 09:51:38 AM by AutoGen 5.18.3pre11
 .\" From the definitions plot_summary-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -90,37 +90,12 @@ Display usage information and exit.
 .TP
 .NOP \f\*[B-Font]\-\-more-help\f[]
 Pass the extended usage information through a pager.
+.TP
+.NOP \f\*[B-Font]\-\-version\f[] [{\f\*[I-Font]v|c|n\f[]}]
+Output version of program and exit.  The default mode is `v', a simple
+version.  The `c' mode will print copyright information and `n' will
+print the full copyright notice.
 .PP
-.TH plot_summary 1plot_summaryman "20 Jan 2014" "" "User Commands"
-.\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-QsaOJq/ag-4sa4Iq)
-.\"
-.\" It has been AutoGen-ed January 20, 2014 at 11:11:07 AM by AutoGen 5.18.3pre11
-.\" From the definitions plot_summary-opts.def
-.\" and the template file agman-cmd.tpl
-.SH NAME
-\f\*[B-Font]plot_summary\fP plot_summary
-\- plot statistics generated by summary script
-There is no description for this command.
-cvt_prog='/usr/local/gnu/share/autogen/texi2man'
-cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
-         `/`basename "$cvt_prog"`
-cd $tmp_dir
-test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
-{
-    list='synopsis description options option-presets'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list name
-    list='implementation-notes environment files examples exit-status errors
-        compatibility see-also conforming-to history authors copyright bugs
-        notes'
-    for f in $list ; do cat $f ; echo ; done > .end-doc
-    rm \-f $list
-    list=`ls \-1 *`' .end-doc'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list
-} 1>.doc 2>/dev/null
-/opt/csw/bin/ggrep \-E \-v '^[ 	]*$' .doc | $cvt_prog
 .SH "EXIT STATUS"
 One of the following exit values will be returned:
 .TP
diff --git a/scripts/plot_summary.1plot_summarymdoc b/scripts/plot_summary.1plot_summarymdoc
index cdae84788..1d23107b6 100644
--- a/scripts/plot_summary.1plot_summarymdoc
+++ b/scripts/plot_summary.1plot_summarymdoc
@@ -1,9 +1,9 @@
-.Dd January 20 2014
+.Dd January 27 2014
 .Dt PLOT_SUMMARY 1plot_summarymdoc User Commands
-.Os SunOS 5.10
+.Os FreeBSD 6.4-STABLE
 .\"  EDIT THIS FILE WITH CAUTION  (plot_summary-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  January 20, 2014 at 11:11:20 AM by AutoGen 5.18.3pre11
+.\"  It has been AutoGen-ed  January 27, 2014 at 09:51:39 AM by AutoGen 5.18.3pre11
 .\"  From the definitions    plot_summary-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -67,27 +67,11 @@ Don't wait for keystroke between plots.
 Display usage information and exit.
 .It Fl \-more\-help
 Pass the extended usage information through a pager.
+.It Fl \-version Op Brq Ar v|c|n
+Output version of program and exit.  The default mode is `v', a simple
+version.  The `c' mode will print copyright information and `n' will
+print the full copyright notice.
 .El
-There is no description for this command.
-cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc'
-cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
-         `/`basename "$cvt_prog"`
-cd $tmp_dir
-test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
-{
-    list='synopsis description options option\-presets'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list name
-    list='implementation\-notes environment files examples exit\-status errors
-        compatibility see\-also conforming\-to history authors copyright bugs
-        notes'
-    for f in $list ; do cat $f ; echo ; done > .end\-doc
-    rm \-f $list
-    list=`ls \-1 *`' .end\-doc'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list
-} 1>.doc 2>/dev/null
-/opt/csw/bin/ggrep \-E \-v '^[ 	]*$' .doc | $cvt_prog
 .Sh "EXIT STATUS"
 One of the following exit values will be returned:
 .Bl -tag
diff --git a/scripts/plot_summary.html b/scripts/plot_summary.html
index 96eae1ea6..c66442876 100644
--- a/scripts/plot_summary.html
+++ b/scripts/plot_summary.html
@@ -3,7 +3,7 @@
 <title>Plot_summary User's Manual</title>
 <meta http-equiv="Content-Type" content="text/html">
 <meta name="description" content="Plot_summary User's Manual">
-<meta name="generator" content="makeinfo 4.7">
+<meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="top" href="#Top">
 <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
 <meta http-equiv="Content-Style-Type" content="text/css">
@@ -14,18 +14,20 @@
   pre.smallformat  { font-family:inherit; font-size:smaller }
   pre.smallexample { font-size:smaller }
   pre.smalllisp    { font-size:smaller }
-  span.sc { font-variant:small-caps }
-  span.roman { font-family: serif; font-weight: normal; } 
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
 --></style>
 </head>
 <body>
 <h1 class="settitle">Plot_summary User's Manual</h1>
 <div class="node">
+<a name="Top"></a>
 <p><hr>
-<a name="Top"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#plot_005fsummary-Description">plot_summary Description</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#plot_005fsummary-Description">plot_summary Description</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#dir">(dir)</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#dir">(dir)</a>
-<br>
+
 </div>
 
 <h2 class="unnumbered">Plot_summary User Manual</h2>
@@ -46,10 +48,12 @@ This document applies to version 4.2.7p412 of <code>plot_summary</code>.
 </ul>
 
 <div class="node">
+<a name="plot_summary-Invocation"></a>
+<a name="plot_005fsummary-Invocation"></a>
 <p><hr>
-<a name="plot_005fsummary-Invocation"></a>Previous:&nbsp;<a rel="previous" accesskey="p" href="#plot_005fsummary-Description">plot_summary Description</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="#plot_005fsummary-Description">plot_summary Description</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
-<br>
+
 </div>
 
 <h3 class="section">Invoking plot_summary</h3>
@@ -60,7 +64,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
 using the <code>agtexi-cmd</code> template and the option descriptions for the <code>plot_summary</code> program.
 
 <ul class="menu">
-<li><a accesskey="1" href="#plot_005fsummary-usage">plot_summary usage</a>:                   plot_summary help/usage (<span class="option">--help</span>)
+<li><a accesskey="1" href="#plot_005fsummary-usage">plot_summary usage</a>:                   plot_summary help/usage (<samp><span class="option">--help</span></samp>)
 <li><a accesskey="2" href="#plot_005fsummary-directory">plot_summary directory</a>:               directory option
 <li><a accesskey="3" href="#plot_005fsummary-identifier">plot_summary identifier</a>:              identifier option
 <li><a accesskey="4" href="#plot_005fsummary-peer">plot_summary peer</a>:                    peer option
@@ -70,26 +74,28 @@ using the <code>agtexi-cmd</code> template and the option descriptions for the <
 </ul>
 
 <div class="node">
+<a name="plot_summary-usage"></a>
+<a name="plot_005fsummary-usage"></a>
 <p><hr>
-<a name="plot_005fsummary-usage"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#plot_005fsummary-directory">plot_summary directory</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#plot_005fsummary-directory">plot_summary directory</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#plot_005fsummary-Invocation">plot_summary Invocation</a>
-<br>
+
 </div>
 
-<h4 class="subsection">plot_summary help/usage (<span class="option">--help</span>)</h4>
+<h4 class="subsection">plot_summary help/usage (<samp><span class="option">--help</span></samp>)</h4>
 
 <p><a name="index-plot_005fsummary-help-3"></a>
 This is the automatically generated usage text for plot_summary.
 
   <p>The text printed is the same whether selected with the <code>help</code> option
-(<span class="option">--help</span>) or the <code>more-help</code> option (<span class="option">--more-help</span>).  <code>more-help</code> will print
+(<samp><span class="option">--help</span></samp>) or the <code>more-help</code> option (<samp><span class="option">--more-help</span></samp>).  <code>more-help</code> will print
 the usage text by passing it through a pager program. 
 <code>more-help</code> is disabled on platforms without a working
 <code>fork(2)</code> function.  The <code>PAGER</code> environment variable is
-used to select the program, defaulting to <span class="file">more</span>.  Both will exit
+used to select the program, defaulting to <samp><span class="file">more</span></samp>.  Both will exit
 with a status code of 0.
 
-<pre class="example">plot_summary - plot statistics generated by summary script
+<pre class="example">plot_summary - plot statistics generated by summary script - Ver. 4.2.7p412
 USAGE: plot_summary [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]...
 
       , --directory=str          Where the summary files are
@@ -107,11 +113,13 @@ Options are specified by doubled hyphens and their name or by a single
 hyphen and the flag character.
 </pre>
   <div class="node">
+<a name="plot_summary-directory"></a>
+<a name="plot_005fsummary-directory"></a>
 <p><hr>
-<a name="plot_005fsummary-directory"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#plot_005fsummary-identifier">plot_summary identifier</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#plot_005fsummary-identifier">plot_summary identifier</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#plot_005fsummary-usage">plot_summary usage</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#plot_005fsummary-Invocation">plot_summary Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">directory option</h4>
@@ -122,11 +130,13 @@ This option takes a string argument.
         The directory where the <code>plot_summary</code> will search for the
         *_summary files generated by <code>summary</code> script. 
 <div class="node">
+<a name="plot_summary-identifier"></a>
+<a name="plot_005fsummary-identifier"></a>
 <p><hr>
-<a name="plot_005fsummary-identifier"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#plot_005fsummary-peer">plot_summary peer</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#plot_005fsummary-peer">plot_summary peer</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#plot_005fsummary-directory">plot_summary directory</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#plot_005fsummary-Invocation">plot_summary Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">identifier option</h4>
@@ -137,11 +147,13 @@ This option takes a string argument.
         Where does the plotted data come from, default to string "host" plus
         current hostname
 <div class="node">
+<a name="plot_summary-peer"></a>
+<a name="plot_005fsummary-peer"></a>
 <p><hr>
-<a name="plot_005fsummary-peer"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#plot_005fsummary-plot_002dterm">plot_summary plot-term</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#plot_005fsummary-plot_002dterm">plot_summary plot-term</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#plot_005fsummary-identifier">plot_summary identifier</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#plot_005fsummary-Invocation">plot_summary Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">peer option</h4>
@@ -158,11 +170,13 @@ This option takes a string argument.
   <p>By default the peer_summary plots are not generated. Use this option to
         specify list of peers if you want to generate plots for them. 
 <div class="node">
+<a name="plot_summary-plot-term"></a>
+<a name="plot_005fsummary-plot_002dterm"></a>
 <p><hr>
-<a name="plot_005fsummary-plot_002dterm"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#plot_005fsummary-output_002dfile">plot_summary output-file</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#plot_005fsummary-output_002dfile">plot_summary output-file</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#plot_005fsummary-peer">plot_summary peer</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#plot_005fsummary-Invocation">plot_summary Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">plot-term option</h4>
@@ -175,11 +189,13 @@ This option takes a string argument.
         <code>dumb</code> is it's not'. See output from  -e "set
         terminal") for the list of avalaible options. 
 <div class="node">
+<a name="plot_summary-output-file"></a>
+<a name="plot_005fsummary-output_002dfile"></a>
 <p><hr>
-<a name="plot_005fsummary-output_002dfile"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#plot_005fsummary-exit-status">plot_summary exit status</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#plot_005fsummary-exit-status">plot_summary exit status</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#plot_005fsummary-plot_002dterm">plot_summary plot-term</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#plot_005fsummary-Invocation">plot_summary Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">output-file option</h4>
@@ -189,18 +205,20 @@ This is the &ldquo;output file&rdquo; option.
 This option takes a str argument. 
         Output file for <code>gnuplot</code>, default to stdout. 
 <div class="node">
+<a name="plot_summary-exit-status"></a>
+<a name="plot_005fsummary-exit-status"></a>
 <p><hr>
-<a name="plot_005fsummary-exit-status"></a>Previous:&nbsp;<a rel="previous" accesskey="p" href="#plot_005fsummary-output_002dfile">plot_summary output-file</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="#plot_005fsummary-output_002dfile">plot_summary output-file</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#plot_005fsummary-Invocation">plot_summary Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">plot_summary exit status</h4>
 
 <p>One of the following exit values will be returned:
      <dl>
-<dt><span class="samp">0 (EXIT_SUCCESS)</span><dd>Successful program execution. 
-<br><dt><span class="samp">1 (EXIT_FAILURE)</span><dd>The operation failed or the command syntax was not valid. 
+<dt>&lsquo;<samp><span class="samp">0 (EXIT_SUCCESS)</span></samp>&rsquo;<dd>Successful program execution. 
+<br><dt>&lsquo;<samp><span class="samp">1 (EXIT_FAILURE)</span></samp>&rsquo;<dd>The operation failed or the command syntax was not valid. 
 </dl>
 
 </body></html>
diff --git a/scripts/plot_summary.man.in b/scripts/plot_summary.man.in
index 4ee2c04f4..487287994 100644
--- a/scripts/plot_summary.man.in
+++ b/scripts/plot_summary.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH plot_summary 1plot_summaryman "20 Jan 2014" "" "User Commands"
+.TH plot_summary 1plot_summaryman "27 Jan 2014" "ntp (4.2.7p412)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-QsaOJq/ag-4sa4Iq)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed January 20, 2014 at 11:11:07 AM by AutoGen 5.18.3pre11
+.\" It has been AutoGen-ed January 27, 2014 at 09:51:38 AM by AutoGen 5.18.3pre11
 .\" From the definitions plot_summary-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -90,37 +90,12 @@ Display usage information and exit.
 .TP
 .NOP \f\*[B-Font]\-\-more-help\f[]
 Pass the extended usage information through a pager.
+.TP
+.NOP \f\*[B-Font]\-\-version\f[] [{\f\*[I-Font]v|c|n\f[]}]
+Output version of program and exit.  The default mode is `v', a simple
+version.  The `c' mode will print copyright information and `n' will
+print the full copyright notice.
 .PP
-.TH plot_summary 1plot_summaryman "20 Jan 2014" "" "User Commands"
-.\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-QsaOJq/ag-4sa4Iq)
-.\"
-.\" It has been AutoGen-ed January 20, 2014 at 11:11:07 AM by AutoGen 5.18.3pre11
-.\" From the definitions plot_summary-opts.def
-.\" and the template file agman-cmd.tpl
-.SH NAME
-\f\*[B-Font]plot_summary\fP plot_summary
-\- plot statistics generated by summary script
-There is no description for this command.
-cvt_prog='/usr/local/gnu/share/autogen/texi2man'
-cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
-         `/`basename "$cvt_prog"`
-cd $tmp_dir
-test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
-{
-    list='synopsis description options option-presets'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list name
-    list='implementation-notes environment files examples exit-status errors
-        compatibility see-also conforming-to history authors copyright bugs
-        notes'
-    for f in $list ; do cat $f ; echo ; done > .end-doc
-    rm \-f $list
-    list=`ls \-1 *`' .end-doc'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list
-} 1>.doc 2>/dev/null
-/opt/csw/bin/ggrep \-E \-v '^[ 	]*$' .doc | $cvt_prog
 .SH "EXIT STATUS"
 One of the following exit values will be returned:
 .TP
diff --git a/scripts/plot_summary.mdoc.in b/scripts/plot_summary.mdoc.in
index cdae84788..1d23107b6 100644
--- a/scripts/plot_summary.mdoc.in
+++ b/scripts/plot_summary.mdoc.in
@@ -1,9 +1,9 @@
-.Dd January 20 2014
+.Dd January 27 2014
 .Dt PLOT_SUMMARY 1plot_summarymdoc User Commands
-.Os SunOS 5.10
+.Os FreeBSD 6.4-STABLE
 .\"  EDIT THIS FILE WITH CAUTION  (plot_summary-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  January 20, 2014 at 11:11:20 AM by AutoGen 5.18.3pre11
+.\"  It has been AutoGen-ed  January 27, 2014 at 09:51:39 AM by AutoGen 5.18.3pre11
 .\"  From the definitions    plot_summary-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -67,27 +67,11 @@ Don't wait for keystroke between plots.
 Display usage information and exit.
 .It Fl \-more\-help
 Pass the extended usage information through a pager.
+.It Fl \-version Op Brq Ar v|c|n
+Output version of program and exit.  The default mode is `v', a simple
+version.  The `c' mode will print copyright information and `n' will
+print the full copyright notice.
 .El
-There is no description for this command.
-cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc'
-cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
-         `/`basename "$cvt_prog"`
-cd $tmp_dir
-test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
-{
-    list='synopsis description options option\-presets'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list name
-    list='implementation\-notes environment files examples exit\-status errors
-        compatibility see\-also conforming\-to history authors copyright bugs
-        notes'
-    for f in $list ; do cat $f ; echo ; done > .end\-doc
-    rm \-f $list
-    list=`ls \-1 *`' .end\-doc'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list
-} 1>.doc 2>/dev/null
-/opt/csw/bin/ggrep \-E \-v '^[ 	]*$' .doc | $cvt_prog
 .Sh "EXIT STATUS"
 One of the following exit values will be returned:
 .Bl -tag
diff --git a/scripts/summary-opts b/scripts/summary-opts
index 2cbc5cc80..3229caf45 100644
--- a/scripts/summary-opts
+++ b/scripts/summary-opts
@@ -43,7 +43,7 @@ sub processOptions {
         'help|?', 'more-help'));
 
     $usage = <<'USAGE';
-summary - compute various stastics from NTP stat files
+summary - compute various stastics from NTP stat files - Ver. 4.2.7p412
 USAGE: summary [ -<flag> [<val>] | --<name>[{=| }<val>] ]... 
 
       , --directory=str          Directory containing stat files
diff --git a/scripts/summary-opts.def b/scripts/summary-opts.def
index 21bc9223b..82c31eb24 100644
--- a/scripts/summary-opts.def
+++ b/scripts/summary-opts.def
@@ -1,8 +1,13 @@
 /* -*- Mode: Text -*- */
-autogen definitions perlopt;
+AutoGen Definitions perlopt;
+
 #include autogen-version.def
+
 prog-name      = 'summary';
 prog-title     = 'compute various stastics from NTP stat files';
+package		= ntp;
+#include	version.def
+
 long-opts;
 gnu-usage;
 
diff --git a/scripts/summary.1summaryman b/scripts/summary.1summaryman
index 83958514f..c6c77ab7e 100644
--- a/scripts/summary.1summaryman
+++ b/scripts/summary.1summaryman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH summary 1summaryman "20 Jan 2014" "" "User Commands"
+.TH summary 1summaryman "27 Jan 2014" "ntp (4.2.7p412)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-U9aO0q/ag-79a4Zq)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed January 20, 2014 at 11:11:30 AM by AutoGen 5.18.3pre11
+.\" It has been AutoGen-ed January 27, 2014 at 09:51:42 AM by AutoGen 5.18.3pre11
 .\" From the definitions summary-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -99,36 +99,12 @@ Display usage information and exit.
 .TP
 .NOP \f\*[B-Font]\-\-more-help\f[]
 Pass the extended usage information through a pager.
+.TP
+.NOP \f\*[B-Font]\-\-version\f[] [{\f\*[I-Font]v|c|n\f[]}]
+Output version of program and exit.  The default mode is `v', a simple
+version.  The `c' mode will print copyright information and `n' will
+print the full copyright notice.
 .PP
-.TH summary 1summaryman "20 Jan 2014" "" "User Commands"
-.\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-U9aO0q/ag-79a4Zq)
-.\"
-.\" It has been AutoGen-ed January 20, 2014 at 11:11:30 AM by AutoGen 5.18.3pre11
-.\" From the definitions summary-opts.def
-.\" and the template file agman-cmd.tpl
-.SH NAME
-\f\*[B-Font]summary\fP summary
-\- compute various stastics from NTP stat files
-cvt_prog='/usr/local/gnu/share/autogen/texi2man'
-cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
-         `/`basename "$cvt_prog"`
-cd $tmp_dir
-test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
-{
-    list='synopsis description options option-presets'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list name
-    list='implementation-notes environment files examples exit-status errors
-        compatibility see-also conforming-to history authors copyright bugs
-        notes'
-    for f in $list ; do cat $f ; echo ; done > .end-doc
-    rm \-f $list
-    list=`ls \-1 *`' .end-doc'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list
-} 1>.doc 2>/dev/null
-/opt/csw/bin/ggrep \-E \-v '^[ 	]*$' .doc | $cvt_prog
 .SH "EXIT STATUS"
 One of the following exit values will be returned:
 .TP
diff --git a/scripts/summary.1summarymdoc b/scripts/summary.1summarymdoc
index 59940a9ff..649eff318 100644
--- a/scripts/summary.1summarymdoc
+++ b/scripts/summary.1summarymdoc
@@ -1,9 +1,9 @@
-.Dd January 20 2014
+.Dd January 27 2014
 .Dt SUMMARY 1summarymdoc User Commands
-.Os SunOS 5.10
+.Os FreeBSD 6.4-STABLE
 .\"  EDIT THIS FILE WITH CAUTION  (summary-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  January 20, 2014 at 11:11:34 AM by AutoGen 5.18.3pre11
+.\"  It has been AutoGen-ed  January 27, 2014 at 09:51:44 AM by AutoGen 5.18.3pre11
 .\"  From the definitions    summary-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -77,26 +77,11 @@ for this option is:
 Display usage information and exit.
 .It Fl \-more\-help
 Pass the extended usage information through a pager.
+.It Fl \-version Op Brq Ar v|c|n
+Output version of program and exit.  The default mode is `v', a simple
+version.  The `c' mode will print copyright information and `n' will
+print the full copyright notice.
 .El
-cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc'
-cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
-         `/`basename "$cvt_prog"`
-cd $tmp_dir
-test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
-{
-    list='synopsis description options option\-presets'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list name
-    list='implementation\-notes environment files examples exit\-status errors
-        compatibility see\-also conforming\-to history authors copyright bugs
-        notes'
-    for f in $list ; do cat $f ; echo ; done > .end\-doc
-    rm \-f $list
-    list=`ls \-1 *`' .end\-doc'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list
-} 1>.doc 2>/dev/null
-/opt/csw/bin/ggrep \-E \-v '^[ 	]*$' .doc | $cvt_prog
 .Sh "EXIT STATUS"
 One of the following exit values will be returned:
 .Bl -tag
diff --git a/scripts/summary.html b/scripts/summary.html
index 112efe869..f1e9ac594 100644
--- a/scripts/summary.html
+++ b/scripts/summary.html
@@ -3,7 +3,7 @@
 <title>Summary User's Manual</title>
 <meta http-equiv="Content-Type" content="text/html">
 <meta name="description" content="Summary User's Manual">
-<meta name="generator" content="makeinfo 4.7">
+<meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="top" href="#Top">
 <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
 <meta http-equiv="Content-Style-Type" content="text/css">
@@ -14,18 +14,20 @@
   pre.smallformat  { font-family:inherit; font-size:smaller }
   pre.smallexample { font-size:smaller }
   pre.smalllisp    { font-size:smaller }
-  span.sc { font-variant:small-caps }
-  span.roman { font-family: serif; font-weight: normal; } 
+  span.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
 --></style>
 </head>
 <body>
 <h1 class="settitle">Summary User's Manual</h1>
 <div class="node">
+<a name="Top"></a>
 <p><hr>
-<a name="Top"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#summary-Description">summary Description</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#summary-Description">summary Description</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#dir">(dir)</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#dir">(dir)</a>
-<br>
+
 </div>
 
 <h2 class="unnumbered">Summary User Manual</h2>
@@ -46,10 +48,11 @@ This document applies to version 4.2.7p412 of <code>summary</code>.
 </ul>
 
 <div class="node">
+<a name="summary-Invocation"></a>
 <p><hr>
-<a name="summary-Invocation"></a>Previous:&nbsp;<a rel="previous" accesskey="p" href="#summary-Description">summary Description</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="#summary-Description">summary Description</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
-<br>
+
 </div>
 
 <h3 class="section">Invoking summary</h3>
@@ -60,7 +63,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
 using the <code>agtexi-cmd</code> template and the option descriptions for the <code>summary</code> program.
 
 <ul class="menu">
-<li><a accesskey="1" href="#summary-usage">summary usage</a>:                   summary help/usage (<span class="option">--help</span>)
+<li><a accesskey="1" href="#summary-usage">summary usage</a>:                   summary help/usage (<samp><span class="option">--help</span></samp>)
 <li><a accesskey="2" href="#summary-directory">summary directory</a>:               directory option
 <li><a accesskey="3" href="#summary-end_002ddate">summary end-date</a>:                end-date option
 <li><a accesskey="4" href="#summary-output_002ddirectory">summary output-directory</a>:        output-directory option
@@ -69,26 +72,27 @@ using the <code>agtexi-cmd</code> template and the option descriptions for the <
 </ul>
 
 <div class="node">
+<a name="summary-usage"></a>
 <p><hr>
-<a name="summary-usage"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#summary-directory">summary directory</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#summary-directory">summary directory</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#summary-Invocation">summary Invocation</a>
-<br>
+
 </div>
 
-<h4 class="subsection">summary help/usage (<span class="option">--help</span>)</h4>
+<h4 class="subsection">summary help/usage (<samp><span class="option">--help</span></samp>)</h4>
 
 <p><a name="index-summary-help-3"></a>
 This is the automatically generated usage text for summary.
 
   <p>The text printed is the same whether selected with the <code>help</code> option
-(<span class="option">--help</span>) or the <code>more-help</code> option (<span class="option">--more-help</span>).  <code>more-help</code> will print
+(<samp><span class="option">--help</span></samp>) or the <code>more-help</code> option (<samp><span class="option">--more-help</span></samp>).  <code>more-help</code> will print
 the usage text by passing it through a pager program. 
 <code>more-help</code> is disabled on platforms without a working
 <code>fork(2)</code> function.  The <code>PAGER</code> environment variable is
-used to select the program, defaulting to <span class="file">more</span>.  Both will exit
+used to select the program, defaulting to <samp><span class="file">more</span></samp>.  Both will exit
 with a status code of 0.
 
-<pre class="example">summary - compute various stastics from NTP stat files
+<pre class="example">summary - compute various stastics from NTP stat files - Ver. 4.2.7p412
 USAGE: summary [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]...
 
       , --directory=str          Directory containing stat files
@@ -104,11 +108,12 @@ Options are specified by doubled hyphens and their name or by a single
 hyphen and the flag character.
 </pre>
   <div class="node">
+<a name="summary-directory"></a>
 <p><hr>
-<a name="summary-directory"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#summary-end_002ddate">summary end-date</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#summary-end_002ddate">summary end-date</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#summary-usage">summary usage</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#summary-Invocation">summary Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">directory option</h4>
@@ -119,11 +124,13 @@ This option takes a string argument.
         The directory where <code>ntpd</code> will search for .stat files generated
         by <code>ntpd</code>. 
 <div class="node">
+<a name="summary-end-date"></a>
+<a name="summary-end_002ddate"></a>
 <p><hr>
-<a name="summary-end_002ddate"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#summary-output_002ddirectory">summary output-directory</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#summary-output_002ddirectory">summary output-directory</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#summary-directory">summary directory</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#summary-Invocation">summary Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">end-date option</h4>
@@ -135,11 +142,13 @@ This option takes a number argument.
         option.  Defaults to today minus one day (Use <code>date -u +%Y%m%d</code>)
         to get the timestamp. 
 <div class="node">
+<a name="summary-output-directory"></a>
+<a name="summary-output_002ddirectory"></a>
 <p><hr>
-<a name="summary-output_002ddirectory"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#summary-start_002ddate">summary start-date</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#summary-start_002ddate">summary start-date</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#summary-end_002ddate">summary end-date</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#summary-Invocation">summary Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">output-directory option</h4>
@@ -149,11 +158,13 @@ This is the &ldquo;output directory&rdquo; option.
 This option takes a str argument. 
         The output directory <code>summary</code> will write all output files to. 
 <div class="node">
+<a name="summary-start-date"></a>
+<a name="summary-start_002ddate"></a>
 <p><hr>
-<a name="summary-start_002ddate"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#summary-exit-status">summary exit status</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#summary-exit-status">summary exit status</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#summary-output_002ddirectory">summary output-directory</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#summary-Invocation">summary Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">start-date option</h4>
@@ -164,18 +175,19 @@ This option takes a num argument.
         Process all files with the date suffix more or equal to value of
         this option.  Defaults to 197000101. 
 <div class="node">
+<a name="summary-exit-status"></a>
 <p><hr>
-<a name="summary-exit-status"></a>Previous:&nbsp;<a rel="previous" accesskey="p" href="#summary-start_002ddate">summary start-date</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="#summary-start_002ddate">summary start-date</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#summary-Invocation">summary Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">summary exit status</h4>
 
 <p>One of the following exit values will be returned:
      <dl>
-<dt><span class="samp">0 (EXIT_SUCCESS)</span><dd>Successful program execution. 
-<br><dt><span class="samp">1 (EXIT_FAILURE)</span><dd>The operation failed or the command syntax was not valid. 
+<dt>&lsquo;<samp><span class="samp">0 (EXIT_SUCCESS)</span></samp>&rsquo;<dd>Successful program execution. 
+<br><dt>&lsquo;<samp><span class="samp">1 (EXIT_FAILURE)</span></samp>&rsquo;<dd>The operation failed or the command syntax was not valid. 
 </dl>
 
 </body></html>
diff --git a/scripts/summary.man.in b/scripts/summary.man.in
index 83958514f..c6c77ab7e 100644
--- a/scripts/summary.man.in
+++ b/scripts/summary.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH summary 1summaryman "20 Jan 2014" "" "User Commands"
+.TH summary 1summaryman "27 Jan 2014" "ntp (4.2.7p412)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-U9aO0q/ag-79a4Zq)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed January 20, 2014 at 11:11:30 AM by AutoGen 5.18.3pre11
+.\" It has been AutoGen-ed January 27, 2014 at 09:51:42 AM by AutoGen 5.18.3pre11
 .\" From the definitions summary-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -99,36 +99,12 @@ Display usage information and exit.
 .TP
 .NOP \f\*[B-Font]\-\-more-help\f[]
 Pass the extended usage information through a pager.
+.TP
+.NOP \f\*[B-Font]\-\-version\f[] [{\f\*[I-Font]v|c|n\f[]}]
+Output version of program and exit.  The default mode is `v', a simple
+version.  The `c' mode will print copyright information and `n' will
+print the full copyright notice.
 .PP
-.TH summary 1summaryman "20 Jan 2014" "" "User Commands"
-.\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-U9aO0q/ag-79a4Zq)
-.\"
-.\" It has been AutoGen-ed January 20, 2014 at 11:11:30 AM by AutoGen 5.18.3pre11
-.\" From the definitions summary-opts.def
-.\" and the template file agman-cmd.tpl
-.SH NAME
-\f\*[B-Font]summary\fP summary
-\- compute various stastics from NTP stat files
-cvt_prog='/usr/local/gnu/share/autogen/texi2man'
-cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
-         `/`basename "$cvt_prog"`
-cd $tmp_dir
-test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
-{
-    list='synopsis description options option-presets'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list name
-    list='implementation-notes environment files examples exit-status errors
-        compatibility see-also conforming-to history authors copyright bugs
-        notes'
-    for f in $list ; do cat $f ; echo ; done > .end-doc
-    rm \-f $list
-    list=`ls \-1 *`' .end-doc'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list
-} 1>.doc 2>/dev/null
-/opt/csw/bin/ggrep \-E \-v '^[ 	]*$' .doc | $cvt_prog
 .SH "EXIT STATUS"
 One of the following exit values will be returned:
 .TP
diff --git a/scripts/summary.mdoc.in b/scripts/summary.mdoc.in
index 59940a9ff..649eff318 100644
--- a/scripts/summary.mdoc.in
+++ b/scripts/summary.mdoc.in
@@ -1,9 +1,9 @@
-.Dd January 20 2014
+.Dd January 27 2014
 .Dt SUMMARY 1summarymdoc User Commands
-.Os SunOS 5.10
+.Os FreeBSD 6.4-STABLE
 .\"  EDIT THIS FILE WITH CAUTION  (summary-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  January 20, 2014 at 11:11:34 AM by AutoGen 5.18.3pre11
+.\"  It has been AutoGen-ed  January 27, 2014 at 09:51:44 AM by AutoGen 5.18.3pre11
 .\"  From the definitions    summary-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -77,26 +77,11 @@ for this option is:
 Display usage information and exit.
 .It Fl \-more\-help
 Pass the extended usage information through a pager.
+.It Fl \-version Op Brq Ar v|c|n
+Output version of program and exit.  The default mode is `v', a simple
+version.  The `c' mode will print copyright information and `n' will
+print the full copyright notice.
 .El
-cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc'
-cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
-         `/`basename "$cvt_prog"`
-cd $tmp_dir
-test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
-{
-    list='synopsis description options option\-presets'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list name
-    list='implementation\-notes environment files examples exit\-status errors
-        compatibility see\-also conforming\-to history authors copyright bugs
-        notes'
-    for f in $list ; do cat $f ; echo ; done > .end\-doc
-    rm \-f $list
-    list=`ls \-1 *`' .end\-doc'
-    for f in $list ; do cat $f ; echo ; done
-    rm \-f $list
-} 1>.doc 2>/dev/null
-/opt/csw/bin/ggrep \-E \-v '^[ 	]*$' .doc | $cvt_prog
 .Sh "EXIT STATUS"
 One of the following exit values will be returned:
 .Bl -tag