From: Harlan Stenn Date: Thu, 17 Jan 2013 07:08:22 +0000 (+0000) Subject: NTP_4_2_7P348 X-Git-Tag: NTP_4_2_7P348^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88f6fb0c8132056482b38fad2aec4b1f93156f89;p=thirdparty%2Fntp.git NTP_4_2_7P348 bk: 50f7a366OgCsqYm7rMldPP0oexl9Jg --- diff --git a/ChangeLog b/ChangeLog index 0b56ffa72..926bf2b83 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.2.7p348) 2013/01/17 Released by Harlan Stenn * [Bug 2327] Rename sntp/ag-tpl/:Old to sntp/ag-tpl/Old. * Cleanup to ntpsnmpd-opts.def. * Cleanup to ntpq.texi. diff --git a/ntpd/invoke-ntp.conf.texi b/ntpd/invoke-ntp.conf.texi index 660da5536..96036e73a 100644 --- a/ntpd/invoke-ntp.conf.texi +++ b/ntpd/invoke-ntp.conf.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntp.conf.texi) # -# It has been AutoGen-ed January 7, 2013 at 11:39:56 AM by AutoGen 5.17.1pre14 +# It has been AutoGen-ed January 17, 2013 at 06:15:17 AM by AutoGen 5.17.1pre14 # From the definitions ntp.conf.def # and the template file agtexi-file.tpl @end ignore @@ -2631,6 +2631,22 @@ be set to any positive number in seconds. If set to zero, the stepout pulses will not be suppressed. @end table +@item @code{rlimit}Oo@code{memlock} @kbd{Nmegabytes} |@code{stacklimit} @kbd{N4kPages}Oc +@table @asis + +@item @code{memlock} @kbd{Nmegabytes} +Specify the number of megabytes of memory that can be allocated. +Probably only available under Linux, this option is useful +when dropping root (the +@code{-i} +option). +The default is 32 megabytes. +@item @code{stacklimit} @kbd{N4kPages} +Specifies the maximum size of the process stack on systems with the +@code{mlockall}() +function. +Defaults to 50 4k pages (200 4k pages in OpenBSD). +@end table @item @code{trap} @kbd{host_address}[@code{port} @kbd{port_number}][@code{interface} @kbd{interface_address}] This command configures a trap receiver at the given host address and port number for sending messages with the specified @@ -2686,10 +2702,6 @@ Diffie-Hellman agreement parameters @end table @node ntp.conf See Also @subsection ntp.conf See Also -@node SEE ALSO -@section SEE ALSO - - @code{ntpd(1ntpdmdoc)}, @code{ntpdc(1ntpdcmdoc)}, @code{ntpq(1ntpqmdoc)} diff --git a/ntpd/invoke-ntp.keys.texi b/ntpd/invoke-ntp.keys.texi index 63c9d964c..599a23f20 100644 --- a/ntpd/invoke-ntp.keys.texi +++ b/ntpd/invoke-ntp.keys.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntp.keys.texi) # -# It has been AutoGen-ed January 7, 2013 at 11:39:58 AM by AutoGen 5.17.1pre14 +# It has been AutoGen-ed January 17, 2013 at 06:15:19 AM by AutoGen 5.17.1pre14 # From the definitions ntp.keys.def # and the template file agtexi-file.tpl @end ignore diff --git a/ntpd/invoke-ntpd.texi b/ntpd/invoke-ntpd.texi index a22ba0c37..5f9af74ae 100644 --- a/ntpd/invoke-ntpd.texi +++ b/ntpd/invoke-ntpd.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntpd.texi) # -# It has been AutoGen-ed January 7, 2013 at 11:40:00 AM by AutoGen 5.17.1pre14 +# It has been AutoGen-ed January 17, 2013 at 06:15:21 AM by AutoGen 5.17.1pre14 # From the definitions ntpd-opts.def # and the template file agtexi-cmd.tpl @end ignore @@ -67,9 +67,9 @@ configuration options altered while the @code{ntpd} is running using the -@code{ntpq(8)} +@code{ntpq(1ntpqmdoc)} and -@code{ntpdc(8)} +@code{ntpdc(1ntpdcmdoc)} utility programs. When @@ -141,7 +141,7 @@ with a status code of 0. @exampleindent 0 @example -ntpd - NTP daemon program - Ver. 4.2.7p347 +ntpd - NTP daemon program - Ver. 4.2.7p348 USAGE: ntpd [ - [] | --[@{=| @}] ]... \ [ ... ] Flg Arg Option-Name Description diff --git a/ntpd/ntp.conf.5man b/ntpd/ntp.conf.5man index ad4b70a57..6272d1f8e 100644 --- a/ntpd/ntp.conf.5man +++ b/ntpd/ntp.conf.5man @@ -1,8 +1,8 @@ -.TH ntp.conf 5man "07 Jan 2013" "4.2.7p347" "File Formats" +.TH ntp.conf 5man "17 Jan 2013" "4.2.7p348" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed January 7, 2013 at 11:39:42 AM by AutoGen 5.17.1pre14 +.\" It has been AutoGen-ed January 17, 2013 at 06:15:04 AM by AutoGen 5.17.1pre14 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .\" @@ -2821,6 +2821,29 @@ If set to zero, the stepout pulses will not be suppressed. .in -4 .TP +.BR Xo Ic rlimit +.Oo +.Cm memlock Ar Nmegabytes | +.Cm stacklimit Ar N4kPages +.Oc +.Xc +.in +4 +.ti -4 +.IR Cm memlock Ar Nmegabytes +Specify the number of megabytes of memory that can be allocated. +Probably only available under Linux, this option is useful +when dropping root (the +i +option). +The default is 32 megabytes. +.ti -4 +.IR Cm stacklimit Ar N4kPages +Specifies the maximum size of the process stack on systems with the +.Fn mlockall +function. +Defaults to 50 4k pages (200 4k pages in OpenBSD). +.in -4 +.TP .BR Xo Ic trap Ar host_address [ "\fIport\fR" "\fIport_number\fR" ] [ "\fIinterface\fR" "\fIinterface_address\fR" ] @@ -2919,7 +2942,6 @@ The operation failed or the command syntax was not valid. libopts had an internal operational error. Please report it to autogen-users@lists.sourceforge.net. Thank you. .SH "SEE ALSO" -.SH SEE ALSO .Xr ntpd 1ntpdmdoc , .Xr ntpdc 1ntpdcmdoc , .Xr ntpq 1ntpqmdoc @@ -2954,7 +2976,7 @@ services when they become universally available. .PP Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org .SH NOTES -This document corresponds to version 4.2.7p347 of NTP. +This document corresponds to version 4.2.7p348 of NTP. This document was derived from FreeBSD. .PP This manual page was \fIAutoGen\fP-erated from the \fBntp.conf\fP diff --git a/ntpd/ntp.conf.5mdoc b/ntpd/ntp.conf.5mdoc index 8e513b64a..145aca8c8 100644 --- a/ntpd/ntp.conf.5mdoc +++ b/ntpd/ntp.conf.5mdoc @@ -1,9 +1,9 @@ -.Dd January 7 2013 +.Dd January 17 2013 .Dt NTP_CONF 5mdoc File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed January 7, 2013 at 11:40:02 AM by AutoGen 5.17.1pre14 +.\" It has been AutoGen-ed January 17, 2013 at 06:15:23 AM by AutoGen 5.17.1pre14 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -2657,6 +2657,26 @@ be set to any positive number in seconds. If set to zero, the stepout pulses will not be suppressed. .El +.It Xo Ic rlimit +.Oo +.Cm memlock Ar Nmegabytes | +.Cm stacklimit Ar N4kPages +.Oc +.Xc +.Bl -tag -width indent +.It Cm memlock Ar Nmegabytes +Specify the number of megabytes of memory that can be allocated. +Probably only available under Linux, this option is useful +when dropping root (the +.Fl i +option). +The default is 32 megabytes. +.It Cm stacklimit Ar N4kPages +Specifies the maximum size of the process stack on systems with the +.Fn mlockall +function. +Defaults to 50 4k pages (200 4k pages in OpenBSD). +.El .It Xo Ic trap Ar host_address .Op Cm port Ar port_number .Op Cm interface Ar interface_address @@ -2750,7 +2770,6 @@ libopts had an internal operational error. Please report it to autogen\-users@lists.sourceforge.net. Thank you. .El .Sh "SEE ALSO" -.Sh SEE ALSO .Xr ntpd 1ntpdmdoc , .Xr ntpdc 1ntpdcmdoc , .Xr ntpq 1ntpqmdoc @@ -2785,7 +2804,7 @@ services when they become universally available. .Pp Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org .Sh NOTES -This document corresponds to version 4.2.7p347 of NTP. +This document corresponds to version 4.2.7p348 of NTP. This document was derived from FreeBSD. .Pp This manual page was \fIAutoGen\fP\-erated from the \fBntp.conf\fP diff --git a/ntpd/ntp.conf.html b/ntpd/ntp.conf.html index 4c806e546..80c02334a 100644 --- a/ntpd/ntp.conf.html +++ b/ntpd/ntp.conf.html @@ -33,7 +33,7 @@ Up: (dir)

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

This document applies to version 4.2.7p347 of ntp.conf. +

This document applies to version 4.2.7p348 of ntp.conf.

  • ntp.conf Description diff --git a/ntpd/ntp.conf.man.in b/ntpd/ntp.conf.man.in index d25b75786..855ab14d7 100644 --- a/ntpd/ntp.conf.man.in +++ b/ntpd/ntp.conf.man.in @@ -1,8 +1,8 @@ -.TH ntp.conf 5 "07 Jan 2013" "4.2.7p347" "File Formats" +.TH ntp.conf 5 "17 Jan 2013" "4.2.7p348" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed January 7, 2013 at 11:39:42 AM by AutoGen 5.17.1pre14 +.\" It has been AutoGen-ed January 17, 2013 at 06:15:04 AM by AutoGen 5.17.1pre14 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .\" @@ -2821,6 +2821,29 @@ If set to zero, the stepout pulses will not be suppressed. .in -4 .TP +.BR Xo Ic rlimit +.Oo +.Cm memlock Ar Nmegabytes | +.Cm stacklimit Ar N4kPages +.Oc +.Xc +.in +4 +.ti -4 +.IR Cm memlock Ar Nmegabytes +Specify the number of megabytes of memory that can be allocated. +Probably only available under Linux, this option is useful +when dropping root (the +i +option). +The default is 32 megabytes. +.ti -4 +.IR Cm stacklimit Ar N4kPages +Specifies the maximum size of the process stack on systems with the +.Fn mlockall +function. +Defaults to 50 4k pages (200 4k pages in OpenBSD). +.in -4 +.TP .BR Xo Ic trap Ar host_address [ "\fIport\fR" "\fIport_number\fR" ] [ "\fIinterface\fR" "\fIinterface_address\fR" ] @@ -2919,7 +2942,6 @@ The operation failed or the command syntax was not valid. libopts had an internal operational error. Please report it to autogen-users@lists.sourceforge.net. Thank you. .SH "SEE ALSO" -.SH SEE ALSO .Xr ntpd @NTPD_MS@ , .Xr ntpdc @NTPDC_MS@ , .Xr ntpq @NTPQ_MS@ @@ -2954,7 +2976,7 @@ services when they become universally available. .PP Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org .SH NOTES -This document corresponds to version 4.2.7p347 of NTP. +This document corresponds to version 4.2.7p348 of NTP. This document was derived from FreeBSD. .PP This manual page was \fIAutoGen\fP-erated from the \fBntp.conf\fP diff --git a/ntpd/ntp.conf.mdoc.in b/ntpd/ntp.conf.mdoc.in index f65c05c28..1d11d0459 100644 --- a/ntpd/ntp.conf.mdoc.in +++ b/ntpd/ntp.conf.mdoc.in @@ -1,9 +1,9 @@ -.Dd January 7 2013 +.Dd January 17 2013 .Dt NTP_CONF 5 File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed January 7, 2013 at 11:40:02 AM by AutoGen 5.17.1pre14 +.\" It has been AutoGen-ed January 17, 2013 at 06:15:23 AM by AutoGen 5.17.1pre14 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -2657,6 +2657,26 @@ be set to any positive number in seconds. If set to zero, the stepout pulses will not be suppressed. .El +.It Xo Ic rlimit +.Oo +.Cm memlock Ar Nmegabytes | +.Cm stacklimit Ar N4kPages +.Oc +.Xc +.Bl -tag -width indent +.It Cm memlock Ar Nmegabytes +Specify the number of megabytes of memory that can be allocated. +Probably only available under Linux, this option is useful +when dropping root (the +.Fl i +option). +The default is 32 megabytes. +.It Cm stacklimit Ar N4kPages +Specifies the maximum size of the process stack on systems with the +.Fn mlockall +function. +Defaults to 50 4k pages (200 4k pages in OpenBSD). +.El .It Xo Ic trap Ar host_address .Op Cm port Ar port_number .Op Cm interface Ar interface_address @@ -2750,7 +2770,6 @@ libopts had an internal operational error. Please report it to autogen\-users@lists.sourceforge.net. Thank you. .El .Sh "SEE ALSO" -.Sh SEE ALSO .Xr ntpd @NTPD_MS@ , .Xr ntpdc @NTPDC_MS@ , .Xr ntpq @NTPQ_MS@ @@ -2785,7 +2804,7 @@ services when they become universally available. .Pp Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org .Sh NOTES -This document corresponds to version 4.2.7p347 of NTP. +This document corresponds to version 4.2.7p348 of NTP. This document was derived from FreeBSD. .Pp This manual page was \fIAutoGen\fP\-erated from the \fBntp.conf\fP diff --git a/ntpd/ntp.keys.5man b/ntpd/ntp.keys.5man index 8fc73bb0b..21c668655 100644 --- a/ntpd/ntp.keys.5man +++ b/ntpd/ntp.keys.5man @@ -1,8 +1,8 @@ -.TH ntp.keys 5man "07 Jan 2013" "4.2.7p347" "File Formats" +.TH ntp.keys 5man "17 Jan 2013" "4.2.7p348" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed January 7, 2013 at 11:39:48 AM by AutoGen 5.17.1pre14 +.\" It has been AutoGen-ed January 17, 2013 at 06:15:09 AM by AutoGen 5.17.1pre14 .\" From the definitions ntp.keys.def .\" and the template file agman-file.tpl .\" @@ -133,7 +133,7 @@ This program is released under the terms of the NTP license, (dir)

    This document describes the symmetric key file for the NTP Project's ntpd program. -

    This document applies to version 4.2.7p347 of ntp.keys. +

    This document applies to version 4.2.7p348 of ntp.keys.

    Short Contents

    diff --git a/ntpd/ntp.keys.man.in b/ntpd/ntp.keys.man.in index 7c58be2e2..820b0f951 100644 --- a/ntpd/ntp.keys.man.in +++ b/ntpd/ntp.keys.man.in @@ -1,8 +1,8 @@ -.TH ntp.keys 5 "07 Jan 2013" "4.2.7p347" "File Formats" +.TH ntp.keys 5 "17 Jan 2013" "4.2.7p348" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed January 7, 2013 at 11:39:48 AM by AutoGen 5.17.1pre14 +.\" It has been AutoGen-ed January 17, 2013 at 06:15:09 AM by AutoGen 5.17.1pre14 .\" From the definitions ntp.keys.def .\" and the template file agman-file.tpl .\" @@ -133,7 +133,7 @@ This program is released under the terms of the NTP license, [] | --[{=| }] ]... \\\n" "\t\t[ ... ]\n\0" /* 2935 */ "http://bugs.ntp.org, bugs@ntp.org\0" /* 2969 */ "\n\n\0" -/* 2972 */ "ntpd 4.2.7p347"; +/* 2972 */ "ntpd 4.2.7p348"; /* * ipv4 option description with diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 4cbf8c969..35b9ee00b 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 January 7, 2013 at 11:38:11 AM by AutoGen 5.17.1pre14 + * It has been AutoGen-ed January 17, 2013 at 06:14:20 AM by AutoGen 5.17.1pre14 * From the definitions ntpd-opts.def * and the template file options * @@ -104,8 +104,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 37 -#define NTPD_VERSION "4.2.7p347" -#define NTPD_FULL_VERSION "ntpd 4.2.7p347" +#define NTPD_VERSION "4.2.7p348" +#define NTPD_FULL_VERSION "ntpd 4.2.7p348" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman index 16ef9d192..df5c3296d 100644 --- a/ntpd/ntpd.1ntpdman +++ b/ntpd/ntpd.1ntpdman @@ -1,8 +1,8 @@ -.TH ntpd 1ntpdman "07 Jan 2013" "4.2.7p347" "User Commands" +.TH ntpd 1ntpdman "17 Jan 2013" "4.2.7p348" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.man) .\" -.\" It has been AutoGen-ed January 7, 2013 at 11:39:51 AM by AutoGen 5.17.1pre14 +.\" It has been AutoGen-ed January 17, 2013 at 06:15:13 AM by AutoGen 5.17.1pre14 .\" From the definitions ntpd-opts.def .\" and the template file agman-cmd.tpl .\" @@ -68,9 +68,9 @@ configuration options altered while the .B is running using the -.Xr ntpq 8 +.Xr ntpq 1ntpqmdoc and -.Xr ntpdc 8 +.Xr ntpdc 1ntpdcmdoc utility programs. .PP When @@ -568,13 +568,13 @@ when you have permission to do so from the owner of the target host. .PP Finally, in the past many startup scripts would run -.Xr ntpdate 8 +.Xr ntpdate 1ntpdatemdoc to get the system clock close to correct before starting -.Xr ntpd 8 , +.Xr ntpd 1ntpdmdoc , but this was never more than a mediocre hack and is no longer needed. .PP There is a way to start -.Xr ntpd 8 +.Xr ntpd 1ntpdmdoc that often addresses all of the problems mentioned above. .SS "Starting NTP (Best Current Practice)" First, use the @@ -586,12 +586,12 @@ entries. If you can also keep a good .Pa ntp.drift file then -.Xr ntpd 8 +.Xr ntpd 1ntpdmdoc will effectively "warm-start" and your system's clock will be stable in under 11 seconds' time. .PP As soon as possible in the startup sequence, start -.Xr ntpd 8 +.Xr ntpd 1ntpdmdoc with at least the g and perhaps the @@ -600,7 +600,7 @@ options. Then, start the rest of your "normal" processes. This will give -.Xr ntpd 8 +.Xr ntpd 1ntpdmdoc as much time as possible to get the system's clock synchronized and stable. .PP Finally, @@ -610,13 +610,13 @@ or database servers that require monotonically-increasing time, run -.Xr ntp-wait 8 +.Xr ntp-wait 1ntp-waitmdoc as late as possible in the boot sequence (perhaps with the v flag) and after -.Xr ntp-wait 8 +.Xr ntp-wait 1ntp-waitmdoc exits successfully it is as safe as it will ever be to start any process that require stable time. @@ -698,7 +698,7 @@ In some cases it may not be practical for to run continuously. A common workaround has been to run the -.Xr ntpdate 8 +.Xr ntpdate 1ntpdatemdoc program from a .Xr cron 8 job at designated @@ -727,7 +727,7 @@ If nothing is heard after a couple of minutes, the daemon times out and exits. After a suitable period of mourning, the -.Xr ntpdate 8 +.Xr ntpdate 1ntpdatemdoc program may be retired. .PP @@ -857,9 +857,9 @@ libopts had an internal operational error. Please report it to autogen-users@lists.sourceforge.net. Thank you. .SH "SEE ALSO" .Xr ntp.conf 5 , -.Xr ntpdate 8 , -.Xr ntpdc 8 , -.Xr ntpq 8 +.Xr ntpdate 1ntpdatemdoc , +.Xr ntpdc 1ntpdcmdoc , +.Xr ntpq 1ntpqmdoc .PP In addition to the manual pages provided, comprehensive documentation is available on the world wide web @@ -928,7 +928,7 @@ mind. .PP Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org .SH NOTES -This document corresponds to version 4.2.7p347 of NTP. +This document corresponds to version 4.2.7p348 of NTP. Portions of this document came from FreeBSD. .PP This manual page was \fIAutoGen\fP-erated from the \fBntpd\fP diff --git a/ntpd/ntpd.1ntpdmdoc b/ntpd/ntpd.1ntpdmdoc index d9010a7f0..59a6ab027 100644 --- a/ntpd/ntpd.1ntpdmdoc +++ b/ntpd/ntpd.1ntpdmdoc @@ -1,9 +1,9 @@ -.Dd January 7 2013 +.Dd January 17 2013 .Dt NTPD 1ntpdmdoc User Commands .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed January 7, 2013 at 11:40:07 AM by AutoGen 5.17.1pre14 +.\" It has been AutoGen-ed January 17, 2013 at 06:15:28 AM by AutoGen 5.17.1pre14 .\" From the definitions ntpd-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -72,9 +72,9 @@ configuration options altered while the .Nm is running using the -.Xr ntpq 8 +.Xr ntpq 1ntpqmdoc and -.Xr ntpdc 8 +.Xr ntpdc 1ntpdcmdoc utility programs. .Pp When @@ -537,13 +537,13 @@ when you have permission to do so from the owner of the target host. .Pp Finally, in the past many startup scripts would run -.Xr ntpdate 8 +.Xr ntpdate 1ntpdatemdoc to get the system clock close to correct before starting -.Xr ntpd 8 , +.Xr ntpd 1ntpdmdoc , but this was never more than a mediocre hack and is no longer needed. .Pp There is a way to start -.Xr ntpd 8 +.Xr ntpd 1ntpdmdoc that often addresses all of the problems mentioned above. .Ss "Starting NTP (Best Current Practice)" First, use the @@ -555,12 +555,12 @@ entries. If you can also keep a good .Pa ntp.drift file then -.Xr ntpd 8 +.Xr ntpd 1ntpdmdoc will effectively "warm\-start" and your system's clock will be stable in under 11 seconds' time. .Pp As soon as possible in the startup sequence, start -.Xr ntpd 8 +.Xr ntpd 1ntpdmdoc with at least the .Fl g and perhaps the @@ -569,7 +569,7 @@ options. Then, start the rest of your "normal" processes. This will give -.Xr ntpd 8 +.Xr ntpd 1ntpdmdoc as much time as possible to get the system's clock synchronized and stable. .Pp Finally, @@ -579,13 +579,13 @@ or database servers that require monotonically\-increasing time, run -.Xr ntp\-wait 8 +.Xr ntp\-wait 1ntp\-waitmdoc as late as possible in the boot sequence (perhaps with the .Fl v flag) and after -.Xr ntp\-wait 8 +.Xr ntp\-wait 1ntp\-waitmdoc exits successfully it is as safe as it will ever be to start any process that require stable time. @@ -667,7 +667,7 @@ In some cases it may not be practical for to run continuously. A common workaround has been to run the -.Xr ntpdate 8 +.Xr ntpdate 1ntpdatemdoc program from a .Xr cron 8 job at designated @@ -696,7 +696,7 @@ If nothing is heard after a couple of minutes, the daemon times out and exits. After a suitable period of mourning, the -.Xr ntpdate 8 +.Xr ntpdate 1ntpdatemdoc program may be retired. .Pp @@ -824,9 +824,9 @@ it to autogen\-users@lists.sourceforge.net. Thank you. .El .Sh "SEE ALSO" .Xr ntp.conf 5 , -.Xr ntpdate 8 , -.Xr ntpdc 8 , -.Xr ntpq 8 +.Xr ntpdate 1ntpdatemdoc , +.Xr ntpdc 1ntpdcmdoc , +.Xr ntpq 1ntpqmdoc .Pp In addition to the manual pages provided, comprehensive documentation is available on the world wide web @@ -895,7 +895,7 @@ mind. .Pp Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org .Sh NOTES -This document corresponds to version 4.2.7p347 of NTP. +This document corresponds to version 4.2.7p348 of NTP. Portions of this document came from FreeBSD. .Pp This manual page was \fIAutoGen\fP\-erated from the \fBntpd\fP diff --git a/ntpd/ntpd.html b/ntpd/ntpd.html index 01d0766f3..408d202d6 100644 --- a/ntpd/ntpd.html +++ b/ntpd/ntpd.html @@ -39,7 +39,7 @@ The program can operate in any of several modes, including client/server, symmetric and broadcast modes, and with both symmetric-key and public-key cryptography. -

    This document applies to version 4.2.7p347 of ntpd. +

    This document applies to version 4.2.7p348 of ntpd.

    • ntpd Description: Description @@ -219,7 +219,7 @@ the usage text by passing it through a pager program. used to select the program, defaulting to more. Both will exit with a status code of 0. -
      ntpd - NTP daemon program - Ver. 4.2.7p346
+
      ntpd - NTP daemon program - Ver. 4.2.7p347
 USAGE:  ntpd [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \
                 [ <server1> ... <serverN> ]
   Flg Arg Option-Name    Description
diff --git a/ntpd/ntpd.man.in b/ntpd/ntpd.man.in
index 8cff1a0b8..045f4bc05 100644
--- a/ntpd/ntpd.man.in
+++ b/ntpd/ntpd.man.in
@@ -1,8 +1,8 @@
-.TH ntpd @NTPD_MS@ "07 Jan 2013" "4.2.7p347" "User Commands"
+.TH ntpd @NTPD_MS@ "17 Jan 2013" "4.2.7p348" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  7, 2013 at 11:39:51 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January 17, 2013 at 06:15:13 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -68,9 +68,9 @@ configuration options altered while the
 .B 
 is running
 using the
-.Xr ntpq 8
+.Xr ntpq @NTPQ_MS@
 and
-.Xr ntpdc 8
+.Xr ntpdc @NTPDC_MS@
 utility programs.
 .PP
 When
@@ -568,13 +568,13 @@ when you have permission to do so from the owner of the target host.
 .PP
 Finally,
 in the past many startup scripts would run
-.Xr ntpdate 8
+.Xr ntpdate @NTPDATE_MS@
 to get the system clock close to correct before starting
-.Xr ntpd 8 ,
+.Xr ntpd @NTPD_MS@ ,
 but this was never more than a mediocre hack and is no longer needed.
 .PP
 There is a way to start
-.Xr ntpd 8
+.Xr ntpd @NTPD_MS@
 that often addresses all of the problems mentioned above.
 .SS "Starting NTP (Best Current Practice)"
 First, use the
@@ -586,12 +586,12 @@ entries.
 If you can also keep a good
 .Pa ntp.drift
 file then
-.Xr ntpd 8
+.Xr ntpd @NTPD_MS@
 will effectively "warm-start" and your system's clock will
 be stable in under 11 seconds' time.
 .PP
 As soon as possible in the startup sequence, start
-.Xr ntpd 8
+.Xr ntpd @NTPD_MS@
 with at least the
 g
 and perhaps the
@@ -600,7 +600,7 @@ options.
 Then,
 start the rest of your "normal" processes.
 This will give
-.Xr ntpd 8
+.Xr ntpd @NTPD_MS@
 as much time as possible to get the system's clock synchronized and stable.
 .PP
 Finally,
@@ -610,13 +610,13 @@ or database servers
 that require
 monotonically-increasing time,
 run
-.Xr ntp-wait 8
+.Xr ntp-wait @NTP_WAIT_MS@
 as late as possible in the boot sequence
 (perhaps with the
 v
 flag)
 and after
-.Xr ntp-wait 8
+.Xr ntp-wait @NTP_WAIT_MS@
 exits successfully
 it is as safe as it will ever be to start any process that require
 stable time.
@@ -698,7 +698,7 @@ In some cases it may not be practical for
 to run
 continuously.
 A common workaround has been to run the
-.Xr ntpdate 8
+.Xr ntpdate @NTPDATE_MS@
 program from a
 .Xr cron 8
 job at designated
@@ -727,7 +727,7 @@ If nothing is heard after a
 couple of minutes, the daemon times out and exits.
 After a suitable
 period of mourning, the
-.Xr ntpdate 8
+.Xr ntpdate @NTPDATE_MS@
 program may be
 retired.
 .PP
@@ -857,9 +857,9 @@ libopts had an internal operational error.  Please report
 it to autogen-users@lists.sourceforge.net.  Thank you.
 .SH "SEE ALSO"
 .Xr ntp.conf 5 ,
-.Xr ntpdate 8 ,
-.Xr ntpdc 8 ,
-.Xr ntpq 8
+.Xr ntpdate @NTPDATE_MS@ ,
+.Xr ntpdc @NTPDC_MS@ ,
+.Xr ntpq @NTPQ_MS@
 .PP
 In addition to the manual pages provided,
 comprehensive documentation is available on the world wide web
@@ -928,7 +928,7 @@ mind.
 .PP
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .SH NOTES
-This document corresponds to version 4.2.7p347 of NTP.
+This document corresponds to version 4.2.7p348 of NTP.
 Portions of this document came from FreeBSD.
 .PP
 This manual page was \fIAutoGen\fP-erated from the \fBntpd\fP
diff --git a/ntpd/ntpd.mdoc.in b/ntpd/ntpd.mdoc.in
index b08d6e809..dd4793a28 100644
--- a/ntpd/ntpd.mdoc.in
+++ b/ntpd/ntpd.mdoc.in
@@ -1,9 +1,9 @@
-.Dd January 7 2013
+.Dd January 17 2013
 .Dt NTPD @NTPD_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  January  7, 2013 at 11:40:07 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January 17, 2013 at 06:15:28 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -72,9 +72,9 @@ configuration options altered while the
 .Nm
 is running
 using the
-.Xr ntpq 8
+.Xr ntpq @NTPQ_MS@
 and
-.Xr ntpdc 8
+.Xr ntpdc @NTPDC_MS@
 utility programs.
 .Pp
 When
@@ -537,13 +537,13 @@ when you have permission to do so from the owner of the target host.
 .Pp
 Finally,
 in the past many startup scripts would run
-.Xr ntpdate 8
+.Xr ntpdate @NTPDATE_MS@
 to get the system clock close to correct before starting
-.Xr ntpd 8 ,
+.Xr ntpd @NTPD_MS@ ,
 but this was never more than a mediocre hack and is no longer needed.
 .Pp
 There is a way to start
-.Xr ntpd 8
+.Xr ntpd @NTPD_MS@
 that often addresses all of the problems mentioned above.
 .Ss "Starting NTP (Best Current Practice)"
 First, use the
@@ -555,12 +555,12 @@ entries.
 If you can also keep a good
 .Pa ntp.drift
 file then
-.Xr ntpd 8
+.Xr ntpd @NTPD_MS@
 will effectively "warm\-start" and your system's clock will
 be stable in under 11 seconds' time.
 .Pp
 As soon as possible in the startup sequence, start
-.Xr ntpd 8
+.Xr ntpd @NTPD_MS@
 with at least the
 .Fl g
 and perhaps the
@@ -569,7 +569,7 @@ options.
 Then,
 start the rest of your "normal" processes.
 This will give
-.Xr ntpd 8
+.Xr ntpd @NTPD_MS@
 as much time as possible to get the system's clock synchronized and stable.
 .Pp
 Finally,
@@ -579,13 +579,13 @@ or database servers
 that require
 monotonically\-increasing time,
 run
-.Xr ntp\-wait 8
+.Xr ntp\-wait 1ntp\-waitmdoc
 as late as possible in the boot sequence
 (perhaps with the
 .Fl v
 flag)
 and after
-.Xr ntp\-wait 8
+.Xr ntp\-wait 1ntp\-waitmdoc
 exits successfully
 it is as safe as it will ever be to start any process that require
 stable time.
@@ -667,7 +667,7 @@ In some cases it may not be practical for
 to run
 continuously.
 A common workaround has been to run the
-.Xr ntpdate 8
+.Xr ntpdate @NTPDATE_MS@
 program from a
 .Xr cron 8
 job at designated
@@ -696,7 +696,7 @@ If nothing is heard after a
 couple of minutes, the daemon times out and exits.
 After a suitable
 period of mourning, the
-.Xr ntpdate 8
+.Xr ntpdate @NTPDATE_MS@
 program may be
 retired.
 .Pp
@@ -824,9 +824,9 @@ it to autogen\-users@lists.sourceforge.net.  Thank you.
 .El
 .Sh "SEE ALSO"
 .Xr ntp.conf 5 ,
-.Xr ntpdate 8 ,
-.Xr ntpdc 8 ,
-.Xr ntpq 8
+.Xr ntpdate @NTPDATE_MS@ ,
+.Xr ntpdc @NTPDC_MS@ ,
+.Xr ntpq @NTPQ_MS@
 .Pp
 In addition to the manual pages provided,
 comprehensive documentation is available on the world wide web
@@ -895,7 +895,7 @@ mind.
 .Pp
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .Sh NOTES
-This document corresponds to version 4.2.7p347 of NTP.
+This document corresponds to version 4.2.7p348 of NTP.
 Portions of this document came from FreeBSD.
 .Pp
 This manual page was \fIAutoGen\fP\-erated from the \fBntpd\fP
diff --git a/ntpdc/invoke-ntpdc.texi b/ntpdc/invoke-ntpdc.texi
index c99d5d8a6..a1ce130eb 100644
--- a/ntpdc/invoke-ntpdc.texi
+++ b/ntpdc/invoke-ntpdc.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (invoke-ntpdc.texi)
 # 
-# It has been AutoGen-ed  January  7, 2013 at 11:40:28 AM by AutoGen 5.17.1pre14
+# It has been AutoGen-ed  January 17, 2013 at 06:15:46 AM by AutoGen 5.17.1pre14
 # From the definitions    ntpdc-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -15,7 +15,7 @@
 
 @code{ntpdc}
 is a utility program used to query
-@code{ntpd(8)}
+@code{ntpd(1ntpdmdoc)}
 about its
 current state and to request changes in that state.
 It uses NTP mode 7 control message formats described in the source code.
@@ -69,7 +69,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p347
+ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p348
 USAGE:  ntpdc [ - [] | --[@{=| @}] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c
index d9a7675da..03575d09a 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  January  7, 2013 at 11:40:16 AM by AutoGen 5.17.1pre14
+ *  It has been AutoGen-ed  January 17, 2013 at 06:15:37 AM by AutoGen 5.17.1pre14
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -72,7 +72,7 @@ extern FILE * option_usage_fp;
  *  ntpdc option static const strings
  */
 static char const ntpdc_opt_strs[1862] =
-/*     0 */ "ntpdc 4.2.7p347\n"
+/*     0 */ "ntpdc 4.2.7p348\n"
             "Copyright (C) 1970-2013 The University of Delaware, 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"
@@ -130,14 +130,14 @@ static char const ntpdc_opt_strs[1862] =
 /*  1640 */ "no-load-opts\0"
 /*  1653 */ "no\0"
 /*  1656 */ "NTPDC\0"
-/*  1662 */ "ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p347\n"
+/*  1662 */ "ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p348\n"
             "USAGE:  %s [ - [] | --[{=| }] ]... [ host ...]\n\0"
 /*  1794 */ "$HOME\0"
 /*  1800 */ ".\0"
 /*  1802 */ ".ntprc\0"
 /*  1809 */ "http://bugs.ntp.org, bugs@ntp.org\0"
 /*  1843 */ "\n\n\0"
-/*  1846 */ "ntpdc 4.2.7p347";
+/*  1846 */ "ntpdc 4.2.7p348";
 
 /*
  *  ipv4 option description with
diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h
index 6212949f6..95ace93de 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  January  7, 2013 at 11:40:16 AM by AutoGen 5.17.1pre14
+ *  It has been AutoGen-ed  January 17, 2013 at 06:15:37 AM by AutoGen 5.17.1pre14
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -82,8 +82,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    15
-#define NTPDC_VERSION       "4.2.7p347"
-#define NTPDC_FULL_VERSION  "ntpdc 4.2.7p347"
+#define NTPDC_VERSION       "4.2.7p348"
+#define NTPDC_FULL_VERSION  "ntpdc 4.2.7p348"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpdc/ntpdc.1ntpdcman b/ntpdc/ntpdc.1ntpdcman
index d27cadebe..0383f1c70 100644
--- a/ntpdc/ntpdc.1ntpdcman
+++ b/ntpdc/ntpdc.1ntpdcman
@@ -1,8 +1,8 @@
-.TH ntpdc 1ntpdcman "07 Jan 2013" "4.2.7p347" "User Commands"
+.TH ntpdc 1ntpdcman "17 Jan 2013" "4.2.7p348" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  7, 2013 at 11:40:23 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January 17, 2013 at 06:15:42 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -16,7 +16,7 @@ ntpdc \- vendor-specific NTPD control program
 .SH DESCRIPTION
 .B 
 is a utility program used to query
-.Xr ntpd 8
+.Xr ntpd 1ntpdmdoc
 about its
 current state and to request changes in that state.
 It uses NTP mode 7 control message formats described in the source code.
@@ -196,7 +196,7 @@ The operation of
 .B 
 are specific to the particular
 implementation of the
-.Xr ntpd 8
+.Xr ntpd 1ntpdmdoc
 daemon and can be expected to
 work only with this and maybe some previous versions of the daemon.
 Requests from a remote
@@ -256,7 +256,7 @@ followed by a command keyword will print function and usage
 information about the command.
 This command is probably a better
 source of information about
-.Xr ntpq 8
+.Xr ntpq 1ntpqmdoc
 than this manual
 page.
 .TP
@@ -475,7 +475,7 @@ and
 .Cm stats
 flags.
 See the
-.Xr ntpd 8
+.Xr ntpd 1ntpdmdoc
 documentation for the meaning of these flags.
 There
 are two additional flags which are read only, the
@@ -699,7 +699,7 @@ These commands operate in the same way as the
 and
 .Ic disable
 configuration file commands of
-.Xr ntpd 8 .
+.Xr ntpd 1ntpdmdoc .
 .in +4
 .ti -4
 .IR Cm auth
@@ -724,9 +724,9 @@ The default for this flag is enable if support is available, otherwise disable.
 .ti -4
 .IR Cm monitor
 Enables the monitoring facility.
-See the
-.Xr ntpdc 8 .
-program and the monlist command or further information.
+See the documentation here about the
+.Cm monlist
+command or further information.
 The default for this flag is enable.
 .ti -4
 .IR Cm ntp
@@ -762,7 +762,7 @@ The default for this flag is disable.
 This command operates in the same way as the
 .Ic restrict
 configuration file commands of
-.Xr ntpd 8 .
+.Xr ntpd 1ntpdmdoc .
 .TP
 .BR Xo Ic unrestrict Ar address Ar mask
 \fIflag Oo Ar ... Oc\fR
@@ -778,7 +778,7 @@ Delete the matching entry from the restrict list.
 Causes the current set of authentication keys to be purged and
 a new set to be obtained by rereading the keys file (which must
 have been specified in the
-.Xr ntpd 8
+.Xr ntpd 1ntpdmdoc
 configuration file).
 This
 allows encryption keys to be changed without restarting the
@@ -793,7 +793,7 @@ and
 .Ic untrustedkey
 configuration file
 commands of
-.Xr ntpd 8 .
+.Xr ntpd 1ntpdmdoc .
 .TP
 .BR Ic authinfo
 Returns information concerning the authentication module,
@@ -845,7 +845,7 @@ libopts had an internal operational error.  Please report
 it to autogen-users@lists.sourceforge.net.  Thank you.
 .SH "SEE ALSO"
 .Xr ntp.conf 5 ,
-.Xr ntpd 8
+.Xr ntpd 1ntpdmdoc
 .Rs
 .%A David L. Mills
 .%T Network Time Protocol (Version 3)
diff --git a/ntpdc/ntpdc.1ntpdcmdoc b/ntpdc/ntpdc.1ntpdcmdoc
index 0e992dbee..6095d22d9 100644
--- a/ntpdc/ntpdc.1ntpdcmdoc
+++ b/ntpdc/ntpdc.1ntpdcmdoc
@@ -1,9 +1,9 @@
-.Dd January 7 2013
+.Dd January 17 2013
 .Dt NTPDC 1ntpdcmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  January  7, 2013 at 11:40:30 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January 17, 2013 at 06:15:48 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -20,7 +20,7 @@
 .Sh DESCRIPTION
 .Nm
 is a utility program used to query
-.Xr ntpd 8
+.Xr ntpd 1ntpdmdoc
 about its
 current state and to request changes in that state.
 It uses NTP mode 7 control message formats described in the source code.
@@ -187,7 +187,7 @@ The operation of
 .Nm
 are specific to the particular
 implementation of the
-.Xr ntpd 8
+.Xr ntpd 1ntpdmdoc
 daemon and can be expected to
 work only with this and maybe some previous versions of the daemon.
 Requests from a remote
@@ -246,7 +246,7 @@ followed by a command keyword will print function and usage
 information about the command.
 This command is probably a better
 source of information about
-.Xr ntpq 8
+.Xr ntpq 1ntpqmdoc
 than this manual
 page.
 .It Ic delay Ar milliseconds
@@ -451,7 +451,7 @@ and
 .Cm stats
 flags.
 See the
-.Xr ntpd 8
+.Xr ntpd 1ntpdmdoc
 documentation for the meaning of these flags.
 There
 are two additional flags which are read only, the
@@ -663,7 +663,7 @@ These commands operate in the same way as the
 and
 .Ic disable
 configuration file commands of
-.Xr ntpd 8 .
+.Xr ntpd 1ntpdmdoc .
 .Bl -tag -width indent
 .It Cm auth
 Enables the server to synchronize with unconfigured peers only
@@ -683,9 +683,9 @@ Enables the kernel time discipline, if available.
 The default for this flag is enable if support is available, otherwise disable.
 .It Cm monitor
 Enables the monitoring facility.
-See the
-.Xr ntpdc 8 .
-program and the monlist command or further information.
+See the documentation here about the
+.Cm monlist
+command or further information.
 The default for this flag is enable.
 .It Cm ntp
 Enables time and frequency discipline.
@@ -717,7 +717,7 @@ The default for this flag is disable.
 This command operates in the same way as the
 .Ic restrict
 configuration file commands of
-.Xr ntpd 8 .
+.Xr ntpd 1ntpdmdoc .
 .It Xo Ic unrestrict Ar address Ar mask
 .Ar flag Oo Ar ... Oc
 .Xc
@@ -730,7 +730,7 @@ Delete the matching entry from the restrict list.
 Causes the current set of authentication keys to be purged and
 a new set to be obtained by rereading the keys file (which must
 have been specified in the
-.Xr ntpd 8
+.Xr ntpd 1ntpdmdoc
 configuration file).
 This
 allows encryption keys to be changed without restarting the
@@ -743,7 +743,7 @@ and
 .Ic untrustedkey
 configuration file
 commands of
-.Xr ntpd 8 .
+.Xr ntpd 1ntpdmdoc .
 .It Ic authinfo
 Returns information concerning the authentication module,
 including known keys and counts of encryptions and decryptions
@@ -789,7 +789,7 @@ it to autogen\-users@lists.sourceforge.net.  Thank you.
 .El
 .Sh "SEE ALSO"
 .Xr ntp.conf 5 ,
-.Xr ntpd 8
+.Xr ntpd 1ntpdmdoc
 .Rs
 .%A David L. Mills
 .%T Network Time Protocol (Version 3)
diff --git a/ntpdc/ntpdc.html b/ntpdc/ntpdc.html
index 3bd55be59..633855003 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.7p347 of ntpdc.
+  
      This document applies to version 4.2.7p348 of ntpdc.
 
   
      The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
@@ -87,7 +87,7 @@ error bound of the system clock relative to the server clock.
 
   
      ntpdc
 is a utility program used to query
-ntpd(8)
+ntpd(1ntpdmdoc)
 about its
 current state and to request changes in that state. 
 It uses NTP mode 7 control message formats described in the source code. 
@@ -145,7 +145,7 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
-
      ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p347
+
      ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p348
 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 eab1e52a5..d4fce01db 100644
--- a/ntpdc/ntpdc.man.in
+++ b/ntpdc/ntpdc.man.in
@@ -1,8 +1,8 @@
-.TH ntpdc @NTPDC_MS@ "07 Jan 2013" "4.2.7p347" "User Commands"
+.TH ntpdc @NTPDC_MS@ "17 Jan 2013" "4.2.7p348" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  7, 2013 at 11:40:23 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January 17, 2013 at 06:15:42 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -16,7 +16,7 @@ ntpdc \- vendor-specific NTPD control program
 .SH DESCRIPTION
 .B 
 is a utility program used to query
-.Xr ntpd 8
+.Xr ntpd @NTPD_MS@
 about its
 current state and to request changes in that state.
 It uses NTP mode 7 control message formats described in the source code.
@@ -196,7 +196,7 @@ The operation of
 .B 
 are specific to the particular
 implementation of the
-.Xr ntpd 8
+.Xr ntpd @NTPD_MS@
 daemon and can be expected to
 work only with this and maybe some previous versions of the daemon.
 Requests from a remote
@@ -256,7 +256,7 @@ followed by a command keyword will print function and usage
 information about the command.
 This command is probably a better
 source of information about
-.Xr ntpq 8
+.Xr ntpq @NTPQ_MS@
 than this manual
 page.
 .TP
@@ -475,7 +475,7 @@ and
 .Cm stats
 flags.
 See the
-.Xr ntpd 8
+.Xr ntpd @NTPD_MS@
 documentation for the meaning of these flags.
 There
 are two additional flags which are read only, the
@@ -699,7 +699,7 @@ These commands operate in the same way as the
 and
 .Ic disable
 configuration file commands of
-.Xr ntpd 8 .
+.Xr ntpd @NTPD_MS@ .
 .in +4
 .ti -4
 .IR Cm auth
@@ -724,9 +724,9 @@ The default for this flag is enable if support is available, otherwise disable.
 .ti -4
 .IR Cm monitor
 Enables the monitoring facility.
-See the
-.Xr ntpdc 8 .
-program and the monlist command or further information.
+See the documentation here about the
+.Cm monlist
+command or further information.
 The default for this flag is enable.
 .ti -4
 .IR Cm ntp
@@ -762,7 +762,7 @@ The default for this flag is disable.
 This command operates in the same way as the
 .Ic restrict
 configuration file commands of
-.Xr ntpd 8 .
+.Xr ntpd @NTPD_MS@ .
 .TP
 .BR Xo Ic unrestrict Ar address Ar mask
 \fIflag Oo Ar ... Oc\fR
@@ -778,7 +778,7 @@ Delete the matching entry from the restrict list.
 Causes the current set of authentication keys to be purged and
 a new set to be obtained by rereading the keys file (which must
 have been specified in the
-.Xr ntpd 8
+.Xr ntpd @NTPD_MS@
 configuration file).
 This
 allows encryption keys to be changed without restarting the
@@ -793,7 +793,7 @@ and
 .Ic untrustedkey
 configuration file
 commands of
-.Xr ntpd 8 .
+.Xr ntpd @NTPD_MS@ .
 .TP
 .BR Ic authinfo
 Returns information concerning the authentication module,
@@ -845,7 +845,7 @@ libopts had an internal operational error.  Please report
 it to autogen-users@lists.sourceforge.net.  Thank you.
 .SH "SEE ALSO"
 .Xr ntp.conf 5 ,
-.Xr ntpd 8
+.Xr ntpd @NTPD_MS@
 .Rs
 .%A David L. Mills
 .%T Network Time Protocol (Version 3)
diff --git a/ntpdc/ntpdc.mdoc.in b/ntpdc/ntpdc.mdoc.in
index 2b4149dd8..6bfb51b46 100644
--- a/ntpdc/ntpdc.mdoc.in
+++ b/ntpdc/ntpdc.mdoc.in
@@ -1,9 +1,9 @@
-.Dd January 7 2013
+.Dd January 17 2013
 .Dt NTPDC @NTPDC_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  January  7, 2013 at 11:40:30 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January 17, 2013 at 06:15:48 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -20,7 +20,7 @@
 .Sh DESCRIPTION
 .Nm
 is a utility program used to query
-.Xr ntpd 8
+.Xr ntpd @NTPD_MS@
 about its
 current state and to request changes in that state.
 It uses NTP mode 7 control message formats described in the source code.
@@ -187,7 +187,7 @@ The operation of
 .Nm
 are specific to the particular
 implementation of the
-.Xr ntpd 8
+.Xr ntpd @NTPD_MS@
 daemon and can be expected to
 work only with this and maybe some previous versions of the daemon.
 Requests from a remote
@@ -246,7 +246,7 @@ followed by a command keyword will print function and usage
 information about the command.
 This command is probably a better
 source of information about
-.Xr ntpq 8
+.Xr ntpq @NTPQ_MS@
 than this manual
 page.
 .It Ic delay Ar milliseconds
@@ -451,7 +451,7 @@ and
 .Cm stats
 flags.
 See the
-.Xr ntpd 8
+.Xr ntpd @NTPD_MS@
 documentation for the meaning of these flags.
 There
 are two additional flags which are read only, the
@@ -663,7 +663,7 @@ These commands operate in the same way as the
 and
 .Ic disable
 configuration file commands of
-.Xr ntpd 8 .
+.Xr ntpd @NTPD_MS@ .
 .Bl -tag -width indent
 .It Cm auth
 Enables the server to synchronize with unconfigured peers only
@@ -683,9 +683,9 @@ Enables the kernel time discipline, if available.
 The default for this flag is enable if support is available, otherwise disable.
 .It Cm monitor
 Enables the monitoring facility.
-See the
-.Xr ntpdc 8 .
-program and the monlist command or further information.
+See the documentation here about the
+.Cm monlist
+command or further information.
 The default for this flag is enable.
 .It Cm ntp
 Enables time and frequency discipline.
@@ -717,7 +717,7 @@ The default for this flag is disable.
 This command operates in the same way as the
 .Ic restrict
 configuration file commands of
-.Xr ntpd 8 .
+.Xr ntpd @NTPD_MS@ .
 .It Xo Ic unrestrict Ar address Ar mask
 .Ar flag Oo Ar ... Oc
 .Xc
@@ -730,7 +730,7 @@ Delete the matching entry from the restrict list.
 Causes the current set of authentication keys to be purged and
 a new set to be obtained by rereading the keys file (which must
 have been specified in the
-.Xr ntpd 8
+.Xr ntpd @NTPD_MS@
 configuration file).
 This
 allows encryption keys to be changed without restarting the
@@ -743,7 +743,7 @@ and
 .Ic untrustedkey
 configuration file
 commands of
-.Xr ntpd 8 .
+.Xr ntpd @NTPD_MS@ .
 .It Ic authinfo
 Returns information concerning the authentication module,
 including known keys and counts of encryptions and decryptions
@@ -789,7 +789,7 @@ it to autogen\-users@lists.sourceforge.net.  Thank you.
 .El
 .Sh "SEE ALSO"
 .Xr ntp.conf 5 ,
-.Xr ntpd 8
+.Xr ntpd @NTPD_MS@
 .Rs
 .%A David L. Mills
 .%T Network Time Protocol (Version 3)
diff --git a/ntpq/invoke-ntpq.texi b/ntpq/invoke-ntpq.texi
index fc95e9f73..2867c3554 100644
--- a/ntpq/invoke-ntpq.texi
+++ b/ntpq/invoke-ntpq.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (invoke-ntpq.texi)
 # 
-# It has been AutoGen-ed  January  7, 2013 at 11:40:58 AM by AutoGen 5.17.1pre14
+# It has been AutoGen-ed  January 17, 2013 at 06:16:01 AM by AutoGen 5.17.1pre14
 # From the definitions    ntpq-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -290,7 +290,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntpq - standard NTP query program - Ver. 4.2.7p347
+ntpq - standard NTP query program - Ver. 4.2.7p348
 USAGE:  ntpq [ - [] | --[@{=| @}] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
@@ -413,8 +413,9 @@ must not appear in combination with any of the following options:
 command, peers.
 @end itemize
 
-Force ntpq to operate in interactive mode.  Prompts will be written
-to the standard output and commands read from the standard input.
+Force @code{ntpq} to operate in interactive mode.
+Prompts will be written to the standard output and
+commands read from the standard input.
 @node ntpq numeric
 @subsection numeric option (-n)
 @cindex ntpq-numeric
@@ -427,13 +428,15 @@ converting to the canonical host names.
 @cindex ntpq-old-rv
 
 This is the ``always output status line with readvar'' option.
-By default, ntpq now suppresses the associd=... line that
-precedes the output of "readvar" (alias "rv") when a single
-variable is requested, such as ntpq -c "rv 0 offset".  This
-option causes ntpq to include both lines of output for a
-single-variable readvar.  Using an environment variable to
+By default, @code{ntpq} now suppresses the @code{associd=...}
+line that precedes the output of @code{readvar}
+(alias @code{rv}) when a single variable is requested, such as
+@code{ntpq -c "rv 0 offset"}.
+This option causes @code{ntpq} to include both lines of output
+for a single-variable @code{readvar}.
+Using an environment variable to
 preset this option in a script will enable both older and
-newer ntpq to behave identically in this regard.
+newer @code{ntpq} to behave identically in this regard.
 
 
 @node ntpq config
diff --git a/ntpq/ntpq-opts.c b/ntpq/ntpq-opts.c
index a9657f5b8..676ca65e2 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  January  7, 2013 at 11:40:32 AM by AutoGen 5.17.1pre14
+ *  It has been AutoGen-ed  January 17, 2013 at 06:15:51 AM by AutoGen 5.17.1pre14
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -72,7 +72,7 @@ extern FILE * option_usage_fp;
  *  ntpq option static const strings
  */
 static char const ntpq_opt_strs[1833] =
-/*     0 */ "ntpq 4.2.7p347\n"
+/*     0 */ "ntpq 4.2.7p348\n"
             "Copyright (C) 1970-2013 The University of Delaware, 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"
@@ -128,13 +128,13 @@ static char const ntpq_opt_strs[1833] =
 /*  1627 */ "no-load-opts\0"
 /*  1640 */ "no\0"
 /*  1643 */ "NTPQ\0"
-/*  1648 */ "ntpq - standard NTP query program - Ver. 4.2.7p347\n"
+/*  1648 */ "ntpq - standard NTP query program - Ver. 4.2.7p348\n"
             "USAGE:  %s [ - [] | --[{=| }] ]... [ host ...]\n\0"
 /*  1769 */ "$HOME\0"
 /*  1775 */ ".\0"
 /*  1777 */ ".ntprc\0"
 /*  1784 */ "http://bugs.ntp.org, bugs@ntp.org\0"
-/*  1818 */ "ntpq 4.2.7p347";
+/*  1818 */ "ntpq 4.2.7p348";
 
 /*
  *  ipv4 option description with
diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h
index 9db7b123c..abdbccaae 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  January  7, 2013 at 11:40:32 AM by AutoGen 5.17.1pre14
+ *  It has been AutoGen-ed  January 17, 2013 at 06:15:50 AM by AutoGen 5.17.1pre14
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -81,8 +81,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    14
-#define NTPQ_VERSION       "4.2.7p347"
-#define NTPQ_FULL_VERSION  "ntpq 4.2.7p347"
+#define NTPQ_VERSION       "4.2.7p348"
+#define NTPQ_FULL_VERSION  "ntpq 4.2.7p348"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpq/ntpq.1ntpqman b/ntpq/ntpq.1ntpqman
index e71de9a07..1072c743f 100644
--- a/ntpq/ntpq.1ntpqman
+++ b/ntpq/ntpq.1ntpqman
@@ -1,8 +1,8 @@
-.TH ntpq 1ntpqman "07 Jan 2013" "4.2.7p347" "User Commands"
+.TH ntpq 1ntpqman "17 Jan 2013" "4.2.7p348" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  7, 2013 at 11:40:55 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January 17, 2013 at 06:15:57 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -321,8 +321,9 @@ Force ntpq to operate in interactive mode.
 This option must not appear in combination with any of the following options:
 command, peers.
 .sp
-Force ntpq to operate in interactive mode.  Prompts will be written
-to the standard output and commands read from the standard input.
+Force \fBntpq\fP to operate in interactive mode.
+Prompts will be written to the standard output and
+commands read from the standard input.
 .TP
 .BR \-n ", " \-\-numeric
 numeric host addresses.
@@ -333,13 +334,15 @@ converting to the canonical host names.
 .BR \-\-old\-rv
 Always output status line with readvar.
 .sp
-By default, ntpq now suppresses the associd=... line that
-precedes the output of "readvar" (alias "rv") when a single
-variable is requested, such as ntpq \-c "rv 0 offset".  This
-option causes ntpq to include both lines of output for a
-single-variable readvar.  Using an environment variable to
+By default, \fBntpq\fP now suppresses the \fBassocid=...\fP
+line that precedes the output of \fBreadvar\fP
+(alias \fBrv\fP) when a single variable is requested, such as
+\fBntpq \-c "rv 0 offset"\fP.
+This option causes \fBntpq\fP to include both lines of output
+for a single-variable \fBreadvar\fP.
+Using an environment variable to
 preset this option in a script will enable both older and
-newer ntpq to behave identically in this regard.
+newer \fBntpq\fP to behave identically in this regard.
 .TP
 .BR \-? , " \-\-help"
 Display usage information and exit.
diff --git a/ntpq/ntpq.1ntpqmdoc b/ntpq/ntpq.1ntpqmdoc
index 0be6ee717..ed26d37b4 100644
--- a/ntpq/ntpq.1ntpqmdoc
+++ b/ntpq/ntpq.1ntpqmdoc
@@ -1,9 +1,9 @@
-.Dd January 7 2013
+.Dd January 17 2013
 .Dt NTPQ 1ntpqmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  January  7, 2013 at 11:41:00 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January 17, 2013 at 06:16:02 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -305,8 +305,9 @@ Force ntpq to operate in interactive mode.
 This option must not appear in combination with any of the following options:
 command, peers.
 .sp
-Force ntpq to operate in interactive mode.  Prompts will be written
-to the standard output and commands read from the standard input.
+Force \fBntpq\fP to operate in interactive mode.
+Prompts will be written to the standard output and
+commands read from the standard input.
 .It  \-n ", " \-\-numeric
 numeric host addresses.
 .sp
@@ -315,13 +316,15 @@ converting to the canonical host names.
 .It  \-\-old\-rv
 Always output status line with readvar.
 .sp
-By default, ntpq now suppresses the associd=... line that
-precedes the output of "readvar" (alias "rv") when a single
-variable is requested, such as ntpq \-c "rv 0 offset".  This
-option causes ntpq to include both lines of output for a
-single\-variable readvar.  Using an environment variable to
+By default, \fBntpq\fP now suppresses the \fBassocid=...\fP
+line that precedes the output of \fBreadvar\fP
+(alias \fBrv\fP) when a single variable is requested, such as
+\fBntpq \-c "rv 0 offset"\fP.
+This option causes \fBntpq\fP to include both lines of output
+for a single\-variable \fBreadvar\fP.
+Using an environment variable to
 preset this option in a script will enable both older and
-newer ntpq to behave identically in this regard.
+newer \fBntpq\fP to behave identically in this regard.
 .It \-? , " \-\-help"
 Display usage information and exit.
 .It \-! , " \-\-more\-help"
diff --git a/ntpq/ntpq.html b/ntpq/ntpq.html
index ad374b665..2a3f1d781 100644
--- a/ntpq/ntpq.html
+++ b/ntpq/ntpq.html
@@ -44,7 +44,7 @@ monitor the operational status
 and determine the performance of
 ntpd, the NTP daemon.
 
-  
      This document applies to version 4.2.7p347 of ntpq.
+  
      This document applies to version 4.2.7p348 of ntpq.
 
 
        
 
      • ntpq Description
@@ -377,7 +377,7 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
-
        ntpq - standard NTP query program - Ver. 4.2.7p346
+
        ntpq - standard NTP query program - Ver. 4.2.7p347
 USAGE:  ntpq [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
@@ -1412,28 +1412,5 @@ Up: Top
 driver flags
   
        
 
-  
        ===
-
-  
        <h4>Synopsis</h4>
-ntpq [-inp] [-c command] [host] [...]
-
-  
        <p>Command line options are described following.  Specifying a command line option other than -i or -n will cause the specified query (queries) to be sent to the indicated host(s) immediately.  Otherwise, ntpq will attempt to read interactive format commands from the standard input.</p>
-<dl>
-  <dt>-4</dt>
-  <dd>Force DNS resolution of following host names on the command line to the IPv4 namespace.</dd>
-  <dt>-6</dt>
-  <dd>Force DNS resolution of following host names on the command line to the IPv6 namespace.</dd>
-  <dt>-c</dt>
-  <dd>The following argument is interpreted as an interactive format command and is added to the list of commands to be executed on the specified host(s).  Multiple -c options may be given.</dd>
-  <dt>-d</dt>
-  <dd>Turn on debugging mode.</dd>
-  <dt>-i</dt>
-  <dd>Force ntpq to operate in interactive mode.  Prompts will be written to the standard output and commands read from the standard input.</dd>
-  <dt>-n</dt>
-  <dd>Output all host addresses in dotted-quad numeric format rather than converting to the canonical host names.</dd>
-  <dt>-p</dt>
-  <dd>Print a list of the peers known to the server as well as a summary of their state.  This is equivalent to the peers interactive command.</dd>
-</dl>
-
 
 
diff --git a/ntpq/ntpq.man.in b/ntpq/ntpq.man.in
index 71352f39a..e3be7e0f0 100644
--- a/ntpq/ntpq.man.in
+++ b/ntpq/ntpq.man.in
@@ -1,8 +1,8 @@
-.TH ntpq @NTPQ_MS@ "07 Jan 2013" "4.2.7p347" "User Commands"
+.TH ntpq @NTPQ_MS@ "17 Jan 2013" "4.2.7p348" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  7, 2013 at 11:40:55 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January 17, 2013 at 06:15:57 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -321,8 +321,9 @@ Force ntpq to operate in interactive mode.
 This option must not appear in combination with any of the following options:
 command, peers.
 .sp
-Force ntpq to operate in interactive mode.  Prompts will be written
-to the standard output and commands read from the standard input.
+Force \fBntpq\fP to operate in interactive mode.
+Prompts will be written to the standard output and
+commands read from the standard input.
 .TP
 .BR \-n ", " \-\-numeric
 numeric host addresses.
@@ -333,13 +334,15 @@ converting to the canonical host names.
 .BR \-\-old\-rv
 Always output status line with readvar.
 .sp
-By default, ntpq now suppresses the associd=... line that
-precedes the output of "readvar" (alias "rv") when a single
-variable is requested, such as ntpq \-c "rv 0 offset".  This
-option causes ntpq to include both lines of output for a
-single-variable readvar.  Using an environment variable to
+By default, \fBntpq\fP now suppresses the \fBassocid=...\fP
+line that precedes the output of \fBreadvar\fP
+(alias \fBrv\fP) when a single variable is requested, such as
+\fBntpq \-c "rv 0 offset"\fP.
+This option causes \fBntpq\fP to include both lines of output
+for a single-variable \fBreadvar\fP.
+Using an environment variable to
 preset this option in a script will enable both older and
-newer ntpq to behave identically in this regard.
+newer \fBntpq\fP to behave identically in this regard.
 .TP
 .BR \-? , " \-\-help"
 Display usage information and exit.
diff --git a/ntpq/ntpq.mdoc.in b/ntpq/ntpq.mdoc.in
index 4c042bf5e..27d5f898c 100644
--- a/ntpq/ntpq.mdoc.in
+++ b/ntpq/ntpq.mdoc.in
@@ -1,9 +1,9 @@
-.Dd January 7 2013
+.Dd January 17 2013
 .Dt NTPQ @NTPQ_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  January  7, 2013 at 11:41:00 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January 17, 2013 at 06:16:02 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -305,8 +305,9 @@ Force ntpq to operate in interactive mode.
 This option must not appear in combination with any of the following options:
 command, peers.
 .sp
-Force ntpq to operate in interactive mode.  Prompts will be written
-to the standard output and commands read from the standard input.
+Force \fBntpq\fP to operate in interactive mode.
+Prompts will be written to the standard output and
+commands read from the standard input.
 .It  \-n ", " \-\-numeric
 numeric host addresses.
 .sp
@@ -315,13 +316,15 @@ converting to the canonical host names.
 .It  \-\-old\-rv
 Always output status line with readvar.
 .sp
-By default, ntpq now suppresses the associd=... line that
-precedes the output of "readvar" (alias "rv") when a single
-variable is requested, such as ntpq \-c "rv 0 offset".  This
-option causes ntpq to include both lines of output for a
-single\-variable readvar.  Using an environment variable to
+By default, \fBntpq\fP now suppresses the \fBassocid=...\fP
+line that precedes the output of \fBreadvar\fP
+(alias \fBrv\fP) when a single variable is requested, such as
+\fBntpq \-c "rv 0 offset"\fP.
+This option causes \fBntpq\fP to include both lines of output
+for a single\-variable \fBreadvar\fP.
+Using an environment variable to
 preset this option in a script will enable both older and
-newer ntpq to behave identically in this regard.
+newer \fBntpq\fP to behave identically in this regard.
 .It \-? , " \-\-help"
 Display usage information and exit.
 .It \-! , " \-\-more\-help"
diff --git a/ntpsnmpd/invoke-ntpsnmpd.texi b/ntpsnmpd/invoke-ntpsnmpd.texi
index 72d114f67..bddaba8c5 100644
--- a/ntpsnmpd/invoke-ntpsnmpd.texi
+++ b/ntpsnmpd/invoke-ntpsnmpd.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (invoke-ntpsnmpd.texi)
 # 
-# It has been AutoGen-ed  January  7, 2013 at 11:41:14 AM by AutoGen 5.17.1pre14
+# It has been AutoGen-ed  January 17, 2013 at 07:08:10 AM by AutoGen 5.17.1pre14
 # From the definitions    ntpsnmpd-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -47,7 +47,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p347
+ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p348
 USAGE:  ntpsnmpd [ - [] | --[@{=| @}] ]...
   Flg Arg Option-Name    Description
    -n no  nofork         Do not fork
diff --git a/ntpsnmpd/ntpsnmpd-opts.c b/ntpsnmpd/ntpsnmpd-opts.c
index 92604757f..6451441b9 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  January  7, 2013 at 11:41:02 AM by AutoGen 5.17.1pre14
+ *  It has been AutoGen-ed  January 17, 2013 at 07:08:03 AM by AutoGen 5.17.1pre14
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -64,7 +64,7 @@ extern FILE * option_usage_fp;
  *  ntpsnmpd option static const strings
  */
 static char const ntpsnmpd_opt_strs[1561] =
-/*     0 */ "ntpsnmpd 4.2.7p347\n"
+/*     0 */ "ntpsnmpd 4.2.7p348\n"
             "Copyright (C) 1970-2013 The University of Delaware, 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"
@@ -103,14 +103,14 @@ static char const ntpsnmpd_opt_strs[1561] =
 /*  1360 */ "no-load-opts\0"
 /*  1373 */ "no\0"
 /*  1376 */ "NTPSNMPD\0"
-/*  1385 */ "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p347\n"
+/*  1385 */ "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p348\n"
             "USAGE:  %s [ - [] | --[{=| }] ]...\n\0"
 /*  1490 */ "$HOME\0"
 /*  1496 */ ".\0"
 /*  1498 */ ".ntprc\0"
 /*  1505 */ "http://bugs.ntp.org, bugs@ntp.org\0"
 /*  1539 */ "\n\n\0"
-/*  1542 */ "ntpsnmpd 4.2.7p347";
+/*  1542 */ "ntpsnmpd 4.2.7p348";
 
 /*
  *  nofork option description:
diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h
index 7a6f94fd8..d3a82b6a7 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  January  7, 2013 at 11:41:02 AM by AutoGen 5.17.1pre14
+ *  It has been AutoGen-ed  January 17, 2013 at 07:08:03 AM by AutoGen 5.17.1pre14
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -75,8 +75,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    8
-#define NTPSNMPD_VERSION       "4.2.7p347"
-#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.7p347"
+#define NTPSNMPD_VERSION       "4.2.7p348"
+#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.7p348"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
index 9a2b0a821..f259b3f1b 100644
--- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
+++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
@@ -1,8 +1,8 @@
-.TH ntpsnmpd 1ntpsnmpdman "07 Jan 2013" "4.2.7p347" "User Commands"
+.TH ntpsnmpd 1ntpsnmpdman "17 Jan 2013" "4.2.7p348" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  7, 2013 at 11:41:11 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January 17, 2013 at 07:08:06 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -169,7 +169,7 @@ please fill me in...
 .BR Li ntpEntTimeDistance
 please fill me in...
 .PP
-This document corresponds to version 4.2.7p347 of NTP.
+This document corresponds to version 4.2.7p348 of NTP.
 .PP
 This manual page was \fIAutoGen\fP-erated from the \fBntpsnmpd\fP
 option definitions.
diff --git a/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc b/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
index 9c41cfcff..b84618b01 100644
--- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
+++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
@@ -1,9 +1,9 @@
-.Dd January 7 2013
+.Dd January 17 2013
 .Dt NTPSNMPD 1ntpsnmpdmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  January  7, 2013 at 11:41:16 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January 17, 2013 at 07:08:12 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -156,7 +156,7 @@ please fill me in...
 please fill me in...
 .El
 .Pp
-This document corresponds to version 4.2.7p347 of NTP.
+This document corresponds to version 4.2.7p348 of NTP.
 .Pp
 This manual page was \fIAutoGen\fP\-erated from the \fBntpsnmpd\fP
 option definitions.
diff --git a/ntpsnmpd/ntpsnmpd.html b/ntpsnmpd/ntpsnmpd.html
index 7e137326a..51d6bb1f1 100644
--- a/ntpsnmpd/ntpsnmpd.html
+++ b/ntpsnmpd/ntpsnmpd.html
@@ -42,7 +42,7 @@ Up: (dir)
 
        The ntpsnmpd utility program is used to monitor NTP daemon ntpd
 operations and determine performance.  It uses the standard NTP mode 6 control
 
-  
        This document applies to version 4.2.7p347 of ntpsnmpd.
+  
        This document applies to version 4.2.7p348 of ntpsnmpd.
 
 
          
 
        • ntpsnmpd Description:             Description
diff --git a/ntpsnmpd/ntpsnmpd.man.in b/ntpsnmpd/ntpsnmpd.man.in
index 487295280..6957e864d 100644
--- a/ntpsnmpd/ntpsnmpd.man.in
+++ b/ntpsnmpd/ntpsnmpd.man.in
@@ -1,8 +1,8 @@
-.TH ntpsnmpd @NTPSNMPD_MS@ "07 Jan 2013" "4.2.7p347" "User Commands"
+.TH ntpsnmpd @NTPSNMPD_MS@ "17 Jan 2013" "4.2.7p348" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  7, 2013 at 11:41:11 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January 17, 2013 at 07:08:06 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -169,7 +169,7 @@ please fill me in...
 .BR Li ntpEntTimeDistance
 please fill me in...
 .PP
-This document corresponds to version 4.2.7p347 of NTP.
+This document corresponds to version 4.2.7p348 of NTP.
 .PP
 This manual page was \fIAutoGen\fP-erated from the \fBntpsnmpd\fP
 option definitions.
diff --git a/ntpsnmpd/ntpsnmpd.mdoc.in b/ntpsnmpd/ntpsnmpd.mdoc.in
index 16ffe0857..4763bc45d 100644
--- a/ntpsnmpd/ntpsnmpd.mdoc.in
+++ b/ntpsnmpd/ntpsnmpd.mdoc.in
@@ -1,9 +1,9 @@
-.Dd January 7 2013
+.Dd January 17 2013
 .Dt NTPSNMPD @NTPSNMPD_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  January  7, 2013 at 11:41:16 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January 17, 2013 at 07:08:12 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -156,7 +156,7 @@ please fill me in...
 please fill me in...
 .El
 .Pp
-This document corresponds to version 4.2.7p347 of NTP.
+This document corresponds to version 4.2.7p348 of NTP.
 .Pp
 This manual page was \fIAutoGen\fP\-erated from the \fBntpsnmpd\fP
 option definitions.
diff --git a/packageinfo.sh b/packageinfo.sh
index c23395da5..af986da2b 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=347
+point=348
 
 ### betapoint is normally modified by script.
 # ntp-stable Beta number (betapoint)
diff --git a/scripts/invoke-ntp-wait.texi b/scripts/invoke-ntp-wait.texi
index d0166f20b..d0a19690d 100644
--- a/scripts/invoke-ntp-wait.texi
+++ b/scripts/invoke-ntp-wait.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (invoke-ntp-wait.texi)
 # 
-# It has been AutoGen-ed  January  7, 2013 at 11:36:08 AM by AutoGen 5.17.1pre14
+# It has been AutoGen-ed  January 17, 2013 at 06:13:10 AM by AutoGen 5.17.1pre14
 # From the definitions    ntp-wait-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -82,23 +82,23 @@ Space is not required between options and their arguments.
 
 This is the ``number of times to check ntpd'' option.
 This option takes an argument number @file{num-tries}.
-The maximum number of times we will check ntpd to see if it
-has been able to synchronize and stabilize the system clock.
+The maximum number of times we will check @code{ntpd} to see if
+it has been able to synchronize and stabilize the system clock.
 @node ntp-wait 
 @subsection  option (-s)
 @cindex ntp-wait-
 
 This is the ``how long to sleep between tries'' option.
 This option takes an argument number @file{secs-between-tries}.
-We will sleep for @file{secs-between-tries} after each query of ntpd
-that returns "the time is not yet stable".
+We will sleep for @file{secs-between-tries} after each query
+of @code{ntpd} that returns "the time is not yet stable".
 @node ntp-wait 
 @subsection  option (-v)
 @cindex ntp-wait-
 
 This is the ``be verbose'' option.
-By default, ntp-wait is silent.  With this option, ntp-wait
-will provide status information.
+By default, @code{ntp-wait} is silent.
+With this option, @code{ntp-wait} will provide status information.
 
 
 @node ntp-wait config
diff --git a/scripts/ntp-wait.1ntp-waitman b/scripts/ntp-wait.1ntp-waitman
index 71cd92fb3..cddb6dbc0 100644
--- a/scripts/ntp-wait.1ntp-waitman
+++ b/scripts/ntp-wait.1ntp-waitman
@@ -1,8 +1,8 @@
-.TH ntp-wait 1ntp-waitman "07 Jan 2013" "ntp (4.2.7p347)" "User Commands"
+.TH ntp-wait 1ntp-waitman "17 Jan 2013" "ntp (4.2.7p348)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  7, 2013 at 11:35:45 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January 17, 2013 at 06:13:07 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -40,8 +40,8 @@ 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 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
 How long to sleep between tries.
@@ -50,14 +50,14 @@ The default \fIsecs\-between\-tries\fP for this option is:
 .ti +4
  6
 .sp
-We will sleep for \fIsecs-between-tries\fP after each query of ntpd
-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 ", " \-\-
 Be verbose.
 .sp
-By default, ntp-wait is silent.  With this option, ntp-wait
-will provide status information.
+By default, \fBntp-wait\fP is silent.
+With this option, \fBntp-wait\fP will provide status information.
 .TP
 .BR \-? , " \-\-help"
 Display usage information and exit.
@@ -117,7 +117,7 @@ This program is released under the terms of the NTP license, This document applies to version 4.2.7p347 of ntp-wait.
+  
          This document applies to version 4.2.7p348 of ntp-wait.
 
 
          
 
          Short Contents
          
@@ -156,8 +156,8 @@ Up: ntp-wait Invo
 
          
 This is the “number of times to check ntpd” option. 
 This option takes an argument number num-tries. 
-The maximum number of times we will check ntpd to see if it
-has been able to synchronize and stabilize the system clock. 
+The maximum number of times we will check ntpd to see if
+it has been able to synchronize and stabilize the system clock. 
 
          
 
          
 Next: ,
@@ -171,8 +171,8 @@ Up: ntp-wait Invo
 
          
 This is the “how long to sleep between tries” option. 
 This option takes an argument number secs-between-tries. 
-We will sleep for secs-between-tries after each query of ntpd
-that returns "the time is not yet stable". 
+We will sleep for secs-between-tries after each query
+of ntpd that returns "the time is not yet stable". 
 
          
 
          
 Next: ,
@@ -185,8 +185,8 @@ Up: ntp-wait Invo
 
 
          
 This is the “be verbose” option. 
-By default, ntp-wait is silent.  With this option, ntp-wait
-will provide status information.
+By default, ntp-wait is silent. 
+With this option, ntp-wait will provide status information.
 
 
          
 
          
diff --git a/scripts/ntp-wait.man.in b/scripts/ntp-wait.man.in
index 54bd31d78..1e893d0be 100644
--- a/scripts/ntp-wait.man.in
+++ b/scripts/ntp-wait.man.in
@@ -1,8 +1,8 @@
-.TH ntp-wait @NTP_WAIT_MS@ "07 Jan 2013" "ntp (4.2.7p347)" "User Commands"
+.TH ntp-wait @NTP_WAIT_MS@ "17 Jan 2013" "ntp (4.2.7p348)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  7, 2013 at 11:35:45 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January 17, 2013 at 06:13:07 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -40,8 +40,8 @@ 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 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
 How long to sleep between tries.
@@ -50,14 +50,14 @@ The default \fIsecs\-between\-tries\fP for this option is:
 .ti +4
  6
 .sp
-We will sleep for \fIsecs-between-tries\fP after each query of ntpd
-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 ", " \-\-
 Be verbose.
 .sp
-By default, ntp-wait is silent.  With this option, ntp-wait
-will provide status information.
+By default, \fBntp-wait\fP is silent.
+With this option, \fBntp-wait\fP will provide status information.
 .TP
 .BR \-? , " \-\-help"
 Display usage information and exit.
@@ -117,7 +117,7 @@ This program is released under the terms of the NTP license,  [] | --[@{=| @}] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description
diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c
index 435ad93dc..97ced95bb 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  January  7, 2013 at 11:28:25 AM by AutoGen 5.17.1pre14
+ *  It has been AutoGen-ed  January 17, 2013 at 06:40:28 AM by AutoGen 5.17.1pre14
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -73,7 +73,7 @@ extern FILE * option_usage_fp;
  *  sntp option static const strings
  */
 static char const sntp_opt_strs[2500] =
-/*     0 */ "sntp 4.2.7p347\n"
+/*     0 */ "sntp 4.2.7p348\n"
             "Copyright (C) 1970-2013 The University of Delaware, 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"
@@ -157,7 +157,7 @@ static char const sntp_opt_strs[2500] =
 /*  2244 */ "LOAD_OPTS\0"
 /*  2254 */ "no-load-opts\0"
 /*  2267 */ "SNTP\0"
-/*  2272 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p347\n"
+/*  2272 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p348\n"
             "USAGE:  %s [ - [] | --[{=| }] ]... \\\n"
             "\t\t[ hostname-or-IP ...]\n\0"
 /*  2433 */ "$HOME\0"
@@ -165,7 +165,7 @@ static char const sntp_opt_strs[2500] =
 /*  2441 */ ".ntprc\0"
 /*  2448 */ "http://bugs.ntp.org, bugs@ntp.org\0"
 /*  2482 */ "\n\n\0"
-/*  2485 */ "sntp 4.2.7p347";
+/*  2485 */ "sntp 4.2.7p348";
 
 /*
  *  ipv4 option description with
diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h
index 873112b30..139e7493b 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  January  7, 2013 at 11:28:24 AM by AutoGen 5.17.1pre14
+ *  It has been AutoGen-ed  January 17, 2013 at 06:40:27 AM by AutoGen 5.17.1pre14
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -90,8 +90,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    23
-#define SNTP_VERSION       "4.2.7p347"
-#define SNTP_FULL_VERSION  "sntp 4.2.7p347"
+#define SNTP_VERSION       "4.2.7p348"
+#define SNTP_FULL_VERSION  "sntp 4.2.7p348"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/sntp/sntp.1sntpman b/sntp/sntp.1sntpman
index 2c2558a23..36ee575cb 100644
--- a/sntp/sntp.1sntpman
+++ b/sntp/sntp.1sntpman
@@ -1,8 +1,8 @@
-.TH sntp 1sntpman "07 Jan 2013" "4.2.7p347" "User Commands"
+.TH sntp 1sntpman "17 Jan 2013" "4.2.7p348" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  7, 2013 at 11:42:07 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January 17, 2013 at 02:01:45 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -316,7 +316,7 @@ This program is released under the terms of the NTP license, This document applies to version 4.2.7p347 of sntp.
+  
          This document applies to version 4.2.7p348 of sntp.
 
   
          The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
@@ -176,7 +176,7 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
-
          sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p347
+
          sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p348
 USAGE:  sntp [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description
diff --git a/sntp/sntp.man.in b/sntp/sntp.man.in
index 82f42de7a..cef5d0ffd 100644
--- a/sntp/sntp.man.in
+++ b/sntp/sntp.man.in
@@ -1,8 +1,8 @@
-.TH sntp @SNTP_MS@ "07 Jan 2013" "4.2.7p347" "User Commands"
+.TH sntp @SNTP_MS@ "17 Jan 2013" "4.2.7p348" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  7, 2013 at 11:42:07 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January 17, 2013 at 02:01:45 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -316,7 +316,7 @@ This program is released under the terms of the NTP license,  [] | --[@{=| @}] ]...
   Flg Arg Option-Name    Description
    -b Num imbits         identity modulus bits
diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c
index 8fec36ccd..5a72aa31b 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  January  7, 2013 at 11:41:21 AM by AutoGen 5.17.1pre14
+ *  It has been AutoGen-ed  January 17, 2013 at 02:01:16 AM by AutoGen 5.17.1pre14
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -75,7 +75,7 @@ extern FILE * option_usage_fp;
  *  ntp-keygen option static const strings
  */
 static char const ntp_keygen_opt_strs[2358] =
-/*     0 */ "ntp-keygen (ntp) 4.2.7p347\n"
+/*     0 */ "ntp-keygen (ntp) 4.2.7p348\n"
             "Copyright (C) 1970-2013 The University of Delaware, 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"
@@ -166,14 +166,14 @@ static char const ntp_keygen_opt_strs[2358] =
 /*  2136 */ "no-load-opts\0"
 /*  2149 */ "no\0"
 /*  2152 */ "NTP_KEYGEN\0"
-/*  2163 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p347\n"
+/*  2163 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p348\n"
             "USAGE:  %s [ - [] | --[{=| }] ]...\n\0"
 /*  2279 */ "$HOME\0"
 /*  2285 */ ".\0"
 /*  2287 */ ".ntprc\0"
 /*  2294 */ "http://bugs.ntp.org, bugs@ntp.org\0"
 /*  2328 */ "\n\n\0"
-/*  2331 */ "ntp-keygen (ntp) 4.2.7p347";
+/*  2331 */ "ntp-keygen (ntp) 4.2.7p348";
 
 /*
  *  imbits option description:
diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h
index c952c11e6..fa3f9b91f 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  January  7, 2013 at 11:41:20 AM by AutoGen 5.17.1pre14
+ *  It has been AutoGen-ed  January 17, 2013 at 02:01:15 AM by AutoGen 5.17.1pre14
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -93,8 +93,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    26
-#define NTP_KEYGEN_VERSION       "4.2.7p347"
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.7p347"
+#define NTP_KEYGEN_VERSION       "4.2.7p348"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.7p348"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/util/ntp-keygen.1ntp-keygenman b/util/ntp-keygen.1ntp-keygenman
index 64535408a..62d445406 100644
--- a/util/ntp-keygen.1ntp-keygenman
+++ b/util/ntp-keygen.1ntp-keygenman
@@ -1,8 +1,8 @@
-.TH ntp-keygen 1ntp-keygenman "07 Jan 2013" "ntp (4.2.7p347)" "User Commands"
+.TH ntp-keygen 1ntp-keygenman "17 Jan 2013" "ntp (4.2.7p348)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  7, 2013 at 11:41:31 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January 17, 2013 at 02:01:25 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -1109,7 +1109,7 @@ Please report bugs to http://bugs.ntp.org .
 .PP
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .SH NOTES
-This document corresponds to version 4.2.7p347 of NTP.
+This document corresponds to version 4.2.7p348 of NTP.
 Portions of this document came from FreeBSD.
 .PP
 This manual page was \fIAutoGen\fP-erated from the \fBntp-keygen\fP
diff --git a/util/ntp-keygen.1ntp-keygenmdoc b/util/ntp-keygen.1ntp-keygenmdoc
index d8399b5af..5b6820b7c 100644
--- a/util/ntp-keygen.1ntp-keygenmdoc
+++ b/util/ntp-keygen.1ntp-keygenmdoc
@@ -1,9 +1,9 @@
-.Dd January 7 2013
+.Dd January 17 2013
 .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  January  7, 2013 at 11:41:39 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January 17, 2013 at 02:01:32 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -1072,7 +1072,7 @@ Please report bugs to http://bugs.ntp.org .
 .Pp
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .Sh NOTES
-This document corresponds to version 4.2.7p347 of NTP.
+This document corresponds to version 4.2.7p348 of NTP.
 Portions of this document came from FreeBSD.
 .Pp
 This manual page was \fIAutoGen\fP\-erated from the \fBntp\-keygen\fP
diff --git a/util/ntp-keygen.html b/util/ntp-keygen.html
index 80eb33532..b391293c9 100644
--- a/util/ntp-keygen.html
+++ b/util/ntp-keygen.html
@@ -70,7 +70,7 @@ All other files are in PEM-encoded
 printable ASCII format so they can be embedded as MIME attachments in
 mail to other sites.
 
-  
          This document applies to version 4.2.7p347 of ntp-keygen.
+  
          This document applies to version 4.2.7p348 of ntp-keygen.
 
 
          
 
          
@@ -1120,7 +1120,7 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
-
          ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p346
+
          ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p347
 USAGE:  ntp-keygen [ -<flag> [<val>] | --<name>[{=| }<val>] ]...
   Flg Arg Option-Name    Description
    -b Num imbits         identity modulus bits
diff --git a/util/ntp-keygen.man.in b/util/ntp-keygen.man.in
index 65ad0ca5d..4a10c9880 100644
--- a/util/ntp-keygen.man.in
+++ b/util/ntp-keygen.man.in
@@ -1,8 +1,8 @@
-.TH ntp-keygen @NTP_KEYGEN_MS@ "07 Jan 2013" "ntp (4.2.7p347)" "User Commands"
+.TH ntp-keygen @NTP_KEYGEN_MS@ "17 Jan 2013" "ntp (4.2.7p348)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  7, 2013 at 11:41:31 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January 17, 2013 at 02:01:25 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -1109,7 +1109,7 @@ Please report bugs to http://bugs.ntp.org .
 .PP
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .SH NOTES
-This document corresponds to version 4.2.7p347 of NTP.
+This document corresponds to version 4.2.7p348 of NTP.
 Portions of this document came from FreeBSD.
 .PP
 This manual page was \fIAutoGen\fP-erated from the \fBntp-keygen\fP
diff --git a/util/ntp-keygen.mdoc.in b/util/ntp-keygen.mdoc.in
index 4cdabc369..e10787418 100644
--- a/util/ntp-keygen.mdoc.in
+++ b/util/ntp-keygen.mdoc.in
@@ -1,9 +1,9 @@
-.Dd January 7 2013
+.Dd January 17 2013
 .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  January  7, 2013 at 11:41:39 AM by AutoGen 5.17.1pre14
+.\"  It has been AutoGen-ed  January 17, 2013 at 02:01:32 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -1072,7 +1072,7 @@ Please report bugs to http://bugs.ntp.org .
 .Pp
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .Sh NOTES
-This document corresponds to version 4.2.7p347 of NTP.
+This document corresponds to version 4.2.7p348 of NTP.
 Portions of this document came from FreeBSD.
 .Pp
 This manual page was \fIAutoGen\fP\-erated from the \fBntp\-keygen\fP