From: Harlan Stenn Date: Sat, 1 Sep 2012 00:34:01 +0000 (+0000) Subject: NTP_4_2_7P297 X-Git-Tag: NTP_4_2_7P297^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdac107104c785ab96c028fd06cedb7f7014ef4c;p=thirdparty%2Fntp.git NTP_4_2_7P297 bk: 504157f9AN47BksT4MA2DR1p8QaM3w --- diff --git a/ChangeLog b/ChangeLog index 66e76b4d6..b8807a9aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.2.7p297) 2012/09/01 Released by Harlan Stenn * Fix mdoc2man. * Distribute ntp.conf.def and ntp.keys.def. (4.2.7p296) 2012/08/31 Released by Harlan Stenn diff --git a/ntpd/invoke-ntpd.texi b/ntpd/invoke-ntpd.texi index 16564261a..2c24814bd 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 August 30, 2012 at 11:39:54 PM by AutoGen 5.16.2 +# It has been AutoGen-ed September 1, 2012 at 12:31:13 AM by AutoGen 5.16.2 # From the definitions ntpd-opts.def # and the template file agtexi-cmd.tpl @end ignore @@ -142,7 +142,7 @@ with a status code of 0. @exampleindent 0 @example -ntpd - NTP daemon program - Ver. 4.2.7p296 +ntpd - NTP daemon program - Ver. 4.2.7p297 USAGE: ntpd [ - [] | --[@{=| @}] ]... \ [ ... ] Flg Arg Option-Name Description diff --git a/ntpd/ntp.conf.5man b/ntpd/ntp.conf.5man index 027b04726..3ca5943fc 100644 --- a/ntpd/ntp.conf.5man +++ b/ntpd/ntp.conf.5man @@ -1,8 +1,8 @@ -.TH ntp.conf 5man "31 Aug 2012" "4.2.7p296" "File Formats" +.TH ntp.conf 5man "01 Sep 2012" "4.2.7p297" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed August 31, 2012 at 02:59:03 AM by AutoGen 5.16.2 +.\" It has been AutoGen-ed September 1, 2012 at 12:31:00 AM by AutoGen 5.16.2 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .\" @@ -11,7 +11,7 @@ ntp.conf \- Network Time Protocol (NTP) daemon configuration file format .SH SYNOPSIS .B ntp.conf .\" Long options only -.RB [ \-\- Iopt\-name P [ = "| ] Ivalue P]]..." +.RB [ \-\-\fIopt\-name\fP [ = "| ] \fIvalue\fP]]..." .PP All arguments must be options. .PP @@ -24,19 +24,19 @@ Display usage information and exit. .BR \-\-more-help Pass the extended usage information through a pager. .TP -.BR \-\-version "[= I{v|c|n} P]" +.BR \-\-version "[=\fI{v|c|n}\fP]" 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 Inot presettable P may be preset +Any option that is not marked as \fInot presettable\fP may be preset by loading values from environment variables named: .nf - BNTP_CONF_ P or BNTP_CONF P + \fBNTP_CONF_\fP or \fBNTP_CONF\fP .fi .ad .SH "ENVIRONMENT" -See BOPTION PRESETS P for configuration environment variables. +See \fBOPTION PRESETS\fP for configuration environment variables. .SH FILES .SH "EXIT STATUS" One of the following exit values will be returned: @@ -56,5 +56,5 @@ This program is released under the terms of the NTP license, P or BNTP_CONF P + \fBNTP_CONF_\fP or \fBNTP_CONF\fP .fi .ad .SH "ENVIRONMENT" -See BOPTION PRESETS P for configuration environment variables. +See \fBOPTION PRESETS\fP for configuration environment variables. .SH FILES .SH "EXIT STATUS" One of the following exit values will be returned: @@ -56,5 +56,5 @@ This program is released under the terms of the NTP license, P or BNTP_KEYS P + \fBNTP_KEYS_\fP or \fBNTP_KEYS\fP .fi .ad .SH "ENVIRONMENT" -See BOPTION PRESETS P for configuration environment variables. +See \fBOPTION PRESETS\fP for configuration environment variables. .SH FILES .SH "EXIT STATUS" One of the following exit values will be returned: @@ -56,5 +56,5 @@ This program is released under the terms of the NTP license, P or BNTP_KEYS P + \fBNTP_KEYS_\fP or \fBNTP_KEYS\fP .fi .ad .SH "ENVIRONMENT" -See BOPTION PRESETS P for configuration environment variables. +See \fBOPTION PRESETS\fP for configuration environment variables. .SH FILES .SH "EXIT STATUS" One of the following exit values will be returned: @@ -56,5 +56,5 @@ This program is released under the terms of the NTP license, [] | --[{=| }] ]... \\\n" "\t\t[ ... ]\n\0" /* 3003 */ "http://bugs.ntp.org, bugs@ntp.org\0" /* 3037 */ "\n\n\0" -/* 3040 */ "ntpd 4.2.7p296"; +/* 3040 */ "ntpd 4.2.7p297"; /* * ipv4 option description with diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 6331f3dd2..b2e61d27a 100644 --- a/ntpd/ntpd-opts.h +++ b/ntpd/ntpd-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.h) * - * It has been AutoGen-ed August 31, 2012 at 02:57:36 AM by AutoGen 5.16.2 + * It has been AutoGen-ed September 1, 2012 at 12:29:37 AM by AutoGen 5.16.2 * 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.7p296" -#define NTPD_FULL_VERSION "ntpd 4.2.7p296" +#define NTPD_VERSION "4.2.7p297" +#define NTPD_FULL_VERSION "ntpd 4.2.7p297" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman index 0879302a3..540eaf86e 100644 --- a/ntpd/ntpd.1ntpdman +++ b/ntpd/ntpd.1ntpdman @@ -1,8 +1,8 @@ -.TH ntpd 1ntpdman "31 Aug 2012" "4.2.7p296" "User Commands" +.TH ntpd 1ntpdman "01 Sep 2012" "4.2.7p297" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.man) .\" -.\" It has been AutoGen-ed August 31, 2012 at 02:59:10 AM by AutoGen 5.16.2 +.\" It has been AutoGen-ed September 1, 2012 at 12:31:07 AM by AutoGen 5.16.2 .\" From the definitions ntpd-opts.def .\" and the template file agman-cmd.tpl .\" @@ -11,7 +11,7 @@ ntpd \- NTP daemon program .SH SYNOPSIS .B ntpd .\" Mixture of short (flag) options and long options -.RB [ \- Iflag P " [ Ivalue P]]... [" \-\- Iopt\-name P " [[=| ] Ivalue P]]..." [ ... ] +.RB [ \-\fIflag\fP " [\fIvalue\fP]]... [" \-\-\fIopt\-name\fP " [[=| ]\fIvalue\fP]]..." [ ... ] .PP .SH DESCRIPTION .SH "OPTIONS" @@ -54,7 +54,7 @@ This is almost never a good idea. Allow us to sync to broadcast servers. .sp .TP -.BR \-c " Istring P, " \-\-configfile "=" Istring P +.BR \-c " \fIstring\fP, " \-\-configfile "=" \fIstring\fP configuration file name. .sp The name and path of the configuration file, @@ -67,14 +67,14 @@ This option may appear an unlimited number of times. .sp Increase the debugging message output level. .TP -.BR \-D " Istring P, " \-\-set\-debug\-level "=" Istring P +.BR \-D " \fIstring\fP, " \-\-set\-debug\-level "=" \fIstring\fP Set the output debug message level. This option may appear an unlimited number of times. .sp Set the output debugging level. Can be supplied multiple times, but each overrides the previous value(s). .TP -.BR \-f " Istring P, " \-\-driftfile "=" Istring P +.BR \-f " \fIstring\fP, " \-\-driftfile "=" \fIstring\fP frequency drift file name. .sp The name and path of the frequency file, @@ -103,7 +103,7 @@ See the tinker configuration file directive for other options. .TP -.BR \-i " Istring P, " \-\-jaildir "=" Istring P +.BR \-i " \fIstring\fP, " \-\-jaildir "=" \fIstring\fP Jail directory. .sp Chroot the server to the directory @@ -121,7 +121,7 @@ This option is supported under NetBSD (configure with --enable-linuxcaps ). .TP -.BR \-I " Iiface P, " \-\-interface "=" Iiface P +.BR \-I " \fIiface\fP, " \-\-interface "=" \fIiface\fP Listen on an interface name or address. This option may appear an unlimited number of times. .sp @@ -131,7 +131,7 @@ also implies not opening other addresses, except wildcard and localhost. This option is deprecated. Please consider using the configuration file interface command, which is more versatile. .TP -.BR \-k " Istring P, " \-\-keyfile "=" Istring P +.BR \-k " \fIstring\fP, " \-\-keyfile "=" \fIstring\fP path to symmetric keys. .sp Specify the name and path of the symmetric key file. @@ -141,7 +141,7 @@ This is the same operation as the keys keyfile configuration file directive. .TP -.BR \-l " Istring P, " \-\-logfile "=" Istring P +.BR \-l " \fIstring\fP, " \-\-logfile "=" \fIstring\fP path to the log file. .sp Specify the name and path of the log file. @@ -178,7 +178,7 @@ To the extent permitted by the operating system, run ntpd at the highest priority. .TP -.BR \-p " Istring P, " \-\-pidfile "=" Istring P +.BR \-p " \fIstring\fP, " \-\-pidfile "=" \fIstring\fP path to the PID file. .sp Specify the name and path of the file used to record @@ -188,7 +188,7 @@ This is the same operation as the pidfile pidfile configuration file directive. .TP -.BR \-P " Inumber P, " \-\-priority "=" Inumber P +.BR \-P " \fInumber\fP, " \-\-priority "=" \fInumber\fP Process priority. This option takes an integer number as its argument. .sp @@ -215,12 +215,12 @@ and options can be used with this option. Note: The kernel time discipline is disabled with this option. .TP -.BR \-r " Istring P, " \-\-propagationdelay "=" Istring P +.BR \-r " \fIstring\fP, " \-\-propagationdelay "=" \fIstring\fP Broadcast/propagation delay. .sp Specify the default propagation delay from the broadcast/multicast server to this client. This is necessary only if the delay cannot be computed automatically by the protocol. .TP -.BR \-\-saveconfigquit "= Istring P" +.BR \-\-saveconfigquit "=\fIstring\fP" Save parsed configuration and quit. This option must not appear in combination with any of the following options: quit, wait-sync. @@ -229,7 +229,7 @@ Cause ntpd to parse its startup configuration file and save an equivalent to the given filename and exit. This option was designed for automated testing. .TP -.BR \-s " Istring P, " \-\-statsdir "=" Istring P +.BR \-s " \fIstring\fP, " \-\-statsdir "=" \fIstring\fP Statistics file location. .sp Specify the directory path for files created by the statistics facility. @@ -237,13 +237,13 @@ This is the same operation as the statsdir statsdir configuration file directive. .TP -.BR \-t " Itkey P, " \-\-trustedkey "=" Itkey P +.BR \-t " \fItkey\fP, " \-\-trustedkey "=" \fItkey\fP Trusted key number. This option may appear an unlimited number of times. .sp Add a key number to the trusted key list. .TP -.BR \-u " Istring P, " \-\-user "=" Istring P +.BR \-u " \fIstring\fP, " \-\-user "=" \fIstring\fP Run as userid (or userid:groupid). .sp Specify a user, and optionally a group, to switch to. @@ -255,7 +255,7 @@ This option is supported under NetBSD (configure with --enable-linuxcaps ). .TP -.BR \-U " Inumber P, " \-\-updateinterval "=" Inumber P +.BR \-U " \fInumber\fP, " \-\-updateinterval "=" \fInumber\fP interval in seconds between scans for new or dropped interfaces. This option takes an integer number as its argument. .sp @@ -264,17 +264,17 @@ For systems with routing socket support the scans will be performed shortly afte has been detected by the system. Use 0 to disable scanning. 60 seconds is the minimum time between scans. .TP -.BR \-\-var "= Invar P" +.BR \-\-var "=\fInvar\fP" make ARG an ntp variable (RW). This option may appear an unlimited number of times. .sp .TP -.BR \-\-dvar "= Indvar P" +.BR \-\-dvar "=\fIndvar\fP" make ARG an ntp variable (RW|DEF). This option may appear an unlimited number of times. .sp .TP -.BR \-w " Inumber P, " \-\-wait\-sync "=" Inumber P +.BR \-w " \fInumber\fP, " \-\-wait\-sync "=" \fInumber\fP Seconds to wait for first clock sync. This option must not appear in combination with any of the following options: nofork, quit, saveconfigquit. @@ -314,7 +314,7 @@ The CPU counter and QueryPerformanceCounter are compared, and if they have the same frequency, the CPU counter (RDTSC on x86) is used directly, saving the overhead of a system call. .TP -.BR \-\-pccfreq "= Istring P" +.BR \-\-pccfreq "=\fIstring\fP" Force CPU cycle counter use (Windows only). .sp Force substitution the CPU counter for QueryPerformanceCounter. @@ -333,20 +333,20 @@ Display usage information and exit. .BR \-! , " \-\-more-help" Pass the extended usage information through a pager. .TP -.BR \- " [{ Iv|c|n P}]," " \-\-version" "[= I{v|c|n} P]" +.BR \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]" 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 Inot presettable P may be preset +Any option that is not marked as \fInot presettable\fP may be preset by loading values from environment variables named: .nf - BNTPD_ P or BNTPD P + \fBNTPD_\fP or \fBNTPD\fP .fi .ad .SH USAGE .SH "ENVIRONMENT" -See BOPTION PRESETS P for configuration environment variables. +See \fBOPTION PRESETS\fP for configuration environment variables. .SH FILES .SH "EXIT STATUS" One of the following exit values will be returned: @@ -366,5 +366,5 @@ This program is released under the terms of the NTP license, ... ] +.RB [ \-\fIflag\fP " [\fIvalue\fP]]... [" \-\-\fIopt\-name\fP " [[=| ]\fIvalue\fP]]..." [ ... ] .PP .SH DESCRIPTION .SH "OPTIONS" @@ -54,7 +54,7 @@ This is almost never a good idea. Allow us to sync to broadcast servers. .sp .TP -.BR \-c " Istring P, " \-\-configfile "=" Istring P +.BR \-c " \fIstring\fP, " \-\-configfile "=" \fIstring\fP configuration file name. .sp The name and path of the configuration file, @@ -67,14 +67,14 @@ This option may appear an unlimited number of times. .sp Increase the debugging message output level. .TP -.BR \-D " Istring P, " \-\-set\-debug\-level "=" Istring P +.BR \-D " \fIstring\fP, " \-\-set\-debug\-level "=" \fIstring\fP Set the output debug message level. This option may appear an unlimited number of times. .sp Set the output debugging level. Can be supplied multiple times, but each overrides the previous value(s). .TP -.BR \-f " Istring P, " \-\-driftfile "=" Istring P +.BR \-f " \fIstring\fP, " \-\-driftfile "=" \fIstring\fP frequency drift file name. .sp The name and path of the frequency file, @@ -103,7 +103,7 @@ See the tinker configuration file directive for other options. .TP -.BR \-i " Istring P, " \-\-jaildir "=" Istring P +.BR \-i " \fIstring\fP, " \-\-jaildir "=" \fIstring\fP Jail directory. .sp Chroot the server to the directory @@ -121,7 +121,7 @@ This option is supported under NetBSD (configure with --enable-linuxcaps ). .TP -.BR \-I " Iiface P, " \-\-interface "=" Iiface P +.BR \-I " \fIiface\fP, " \-\-interface "=" \fIiface\fP Listen on an interface name or address. This option may appear an unlimited number of times. .sp @@ -131,7 +131,7 @@ also implies not opening other addresses, except wildcard and localhost. This option is deprecated. Please consider using the configuration file interface command, which is more versatile. .TP -.BR \-k " Istring P, " \-\-keyfile "=" Istring P +.BR \-k " \fIstring\fP, " \-\-keyfile "=" \fIstring\fP path to symmetric keys. .sp Specify the name and path of the symmetric key file. @@ -141,7 +141,7 @@ This is the same operation as the keys keyfile configuration file directive. .TP -.BR \-l " Istring P, " \-\-logfile "=" Istring P +.BR \-l " \fIstring\fP, " \-\-logfile "=" \fIstring\fP path to the log file. .sp Specify the name and path of the log file. @@ -178,7 +178,7 @@ To the extent permitted by the operating system, run ntpd at the highest priority. .TP -.BR \-p " Istring P, " \-\-pidfile "=" Istring P +.BR \-p " \fIstring\fP, " \-\-pidfile "=" \fIstring\fP path to the PID file. .sp Specify the name and path of the file used to record @@ -188,7 +188,7 @@ This is the same operation as the pidfile pidfile configuration file directive. .TP -.BR \-P " Inumber P, " \-\-priority "=" Inumber P +.BR \-P " \fInumber\fP, " \-\-priority "=" \fInumber\fP Process priority. This option takes an integer number as its argument. .sp @@ -215,12 +215,12 @@ and options can be used with this option. Note: The kernel time discipline is disabled with this option. .TP -.BR \-r " Istring P, " \-\-propagationdelay "=" Istring P +.BR \-r " \fIstring\fP, " \-\-propagationdelay "=" \fIstring\fP Broadcast/propagation delay. .sp Specify the default propagation delay from the broadcast/multicast server to this client. This is necessary only if the delay cannot be computed automatically by the protocol. .TP -.BR \-\-saveconfigquit "= Istring P" +.BR \-\-saveconfigquit "=\fIstring\fP" Save parsed configuration and quit. This option must not appear in combination with any of the following options: quit, wait-sync. @@ -229,7 +229,7 @@ Cause ntpd to parse its startup configuration file and save an equivalent to the given filename and exit. This option was designed for automated testing. .TP -.BR \-s " Istring P, " \-\-statsdir "=" Istring P +.BR \-s " \fIstring\fP, " \-\-statsdir "=" \fIstring\fP Statistics file location. .sp Specify the directory path for files created by the statistics facility. @@ -237,13 +237,13 @@ This is the same operation as the statsdir statsdir configuration file directive. .TP -.BR \-t " Itkey P, " \-\-trustedkey "=" Itkey P +.BR \-t " \fItkey\fP, " \-\-trustedkey "=" \fItkey\fP Trusted key number. This option may appear an unlimited number of times. .sp Add a key number to the trusted key list. .TP -.BR \-u " Istring P, " \-\-user "=" Istring P +.BR \-u " \fIstring\fP, " \-\-user "=" \fIstring\fP Run as userid (or userid:groupid). .sp Specify a user, and optionally a group, to switch to. @@ -255,7 +255,7 @@ This option is supported under NetBSD (configure with --enable-linuxcaps ). .TP -.BR \-U " Inumber P, " \-\-updateinterval "=" Inumber P +.BR \-U " \fInumber\fP, " \-\-updateinterval "=" \fInumber\fP interval in seconds between scans for new or dropped interfaces. This option takes an integer number as its argument. .sp @@ -264,17 +264,17 @@ For systems with routing socket support the scans will be performed shortly afte has been detected by the system. Use 0 to disable scanning. 60 seconds is the minimum time between scans. .TP -.BR \-\-var "= Invar P" +.BR \-\-var "=\fInvar\fP" make ARG an ntp variable (RW). This option may appear an unlimited number of times. .sp .TP -.BR \-\-dvar "= Indvar P" +.BR \-\-dvar "=\fIndvar\fP" make ARG an ntp variable (RW|DEF). This option may appear an unlimited number of times. .sp .TP -.BR \-w " Inumber P, " \-\-wait\-sync "=" Inumber P +.BR \-w " \fInumber\fP, " \-\-wait\-sync "=" \fInumber\fP Seconds to wait for first clock sync. This option must not appear in combination with any of the following options: nofork, quit, saveconfigquit. @@ -314,7 +314,7 @@ The CPU counter and QueryPerformanceCounter are compared, and if they have the same frequency, the CPU counter (RDTSC on x86) is used directly, saving the overhead of a system call. .TP -.BR \-\-pccfreq "= Istring P" +.BR \-\-pccfreq "=\fIstring\fP" Force CPU cycle counter use (Windows only). .sp Force substitution the CPU counter for QueryPerformanceCounter. @@ -333,20 +333,20 @@ Display usage information and exit. .BR \-! , " \-\-more-help" Pass the extended usage information through a pager. .TP -.BR \- " [{ Iv|c|n P}]," " \-\-version" "[= I{v|c|n} P]" +.BR \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]" 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 Inot presettable P may be preset +Any option that is not marked as \fInot presettable\fP may be preset by loading values from environment variables named: .nf - BNTPD_ P or BNTPD P + \fBNTPD_\fP or \fBNTPD\fP .fi .ad .SH USAGE .SH "ENVIRONMENT" -See BOPTION PRESETS P for configuration environment variables. +See \fBOPTION PRESETS\fP for configuration environment variables. .SH FILES .SH "EXIT STATUS" One of the following exit values will be returned: @@ -366,5 +366,5 @@ This program is released under the terms of the NTP license, [] | --[@{=| @}] ]... [ 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 6ec275e05..9fa2d515d 100644 --- a/ntpdc/ntpdc-opts.c +++ b/ntpdc/ntpdc-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpdc-opts.c) * - * It has been AutoGen-ed August 30, 2012 at 11:40:14 PM by AutoGen 5.16.2 + * It has been AutoGen-ed September 1, 2012 at 12:31:33 AM by AutoGen 5.16.2 * 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.7p296\n" +/* 0 */ "ntpdc 4.2.7p297\n" "Copyright (C) 1970-2012 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.7p296\n" +/* 1662 */ "ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p297\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.7p296"; +/* 1846 */ "ntpdc 4.2.7p297"; /* * ipv4 option description with diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index 8146fed07..373306149 100644 --- a/ntpdc/ntpdc-opts.h +++ b/ntpdc/ntpdc-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpdc-opts.h) * - * It has been AutoGen-ed August 30, 2012 at 11:40:14 PM by AutoGen 5.16.2 + * It has been AutoGen-ed September 1, 2012 at 12:31:33 AM by AutoGen 5.16.2 * 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.7p296" -#define NTPDC_FULL_VERSION "ntpdc 4.2.7p296" +#define NTPDC_VERSION "4.2.7p297" +#define NTPDC_FULL_VERSION "ntpdc 4.2.7p297" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpdc/ntpdc.1ntpdcman b/ntpdc/ntpdc.1ntpdcman index c52626cbd..831f0ca3f 100644 --- a/ntpdc/ntpdc.1ntpdcman +++ b/ntpdc/ntpdc.1ntpdcman @@ -1,8 +1,8 @@ -.TH ntpdc 1ntpdcman "30 Aug 2012" "4.2.7p296" "User Commands" +.TH ntpdc 1ntpdcman "01 Sep 2012" "4.2.7p297" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntpdc-opts.man) .\" -.\" It has been AutoGen-ed August 30, 2012 at 11:40:26 PM by AutoGen 5.16.2 +.\" It has been AutoGen-ed September 1, 2012 at 12:31:46 AM by AutoGen 5.16.2 .\" From the definitions ntpdc-opts.def .\" and the template file agman-cmd.tpl .\" @@ -11,7 +11,7 @@ ntpdc \- vendor-specific NTPD control program .SH SYNOPSIS .B ntpdc .\" Mixture of short (flag) options and long options -.RB [ \- Iflag P " [ Ivalue P]]... [" \-\- Iopt\-name P " [[=| ] Ivalue P]]..." [ host ...] +.RB [ \-\fIflag\fP " [\fIvalue\fP]]... [" \-\-\fIopt\-name\fP " [[=| ]\fIvalue\fP]]..." [ host ...] .PP .SH DESCRIPTION .SH "OPTIONS" @@ -32,7 +32,7 @@ ipv4. Force DNS resolution of following host names on the command line to the IPv6 namespace. .TP -.BR \-c " Icmd P, " \-\-command "=" Icmd P +.BR \-c " \fIcmd\fP, " \-\-command "=" \fIcmd\fP run a command and exit. This option may appear an unlimited number of times. .sp @@ -45,7 +45,7 @@ Increase debug verbosity level. This option may appear an unlimited number of times. .sp .TP -.BR \-D " Istring P, " \-\-set\-debug\-level "=" Istring P +.BR \-D " \fIstring\fP, " \-\-set\-debug\-level "=" \fIstring\fP Set the debug verbosity level. This option may appear an unlimited number of times. .sp @@ -94,38 +94,38 @@ Display usage information and exit. .BR \-! , " \-\-more-help" Pass the extended usage information through a pager. .TP -.BR \-> " [ Ircfile P]," " \-\-save-opts" "[= Ircfile P]" -Save the option state to Ircfile P. The default is the Ilast P -configuration file listed in the BOPTION PRESETS P section, below. +.BR \-> " [\fIrcfile\fP]," " \-\-save-opts" "[=\fIrcfile\fP]" +Save the option state to \fIrcfile\fP. The default is the \fIlast\fP +configuration file listed in the \fBOPTION PRESETS\fP section, below. .TP -.BR \-< " Ircfile P," " \-\-load-opts" "= Ircfile P," " \-\-no-load-opts" -Load options from Ircfile P. -The Ino-load-opts P form will disable the loading -of earlier RC/INI files. I\-\-no-load-opts P is handled early, +.BR \-< " \fIrcfile\fP," " \-\-load-opts" "=\fIrcfile\fP," " \-\-no-load-opts" +Load options from \fIrcfile\fP. +The \fIno-load-opts\fP form will disable the loading +of earlier RC/INI files. \fI\-\-no-load-opts\fP is handled early, out of order. .TP -.BR \- " [{ Iv|c|n P}]," " \-\-version" "[= I{v|c|n} P]" +.BR \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]" 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 Inot presettable P may be preset +Any option that is not marked as \fInot presettable\fP may be preset by loading values from configuration ("RC" or ".INI") file(s) and values from environment variables named: .nf - BNTPDC_ P or BNTPDC P + \fBNTPDC_\fP or \fBNTPDC\fP .fi .ad The environmental presets take precedence (are processed later than) the configuration files. -The Ihomerc P files are " I$HOME P", and " I. P". -If any of these are directories, then the file I.ntprc P +The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP". +If any of these are directories, then the file \fI.ntprc\fP is searched for within those directories. .SH USAGE .SH "ENVIRONMENT" -See BOPTION PRESETS P for configuration environment variables. +See \fBOPTION PRESETS\fP for configuration environment variables. .SH "FILES" -See BOPTION PRESETS P for configuration files. +See \fBOPTION PRESETS\fP for configuration files. .SH "EXIT STATUS" One of the following exit values will be returned: .TP @@ -149,5 +149,5 @@ This program is released under the terms of the NTP license, This document applies to version 4.2.7p296 of ntpdc. +

This document applies to version 4.2.7p297 of ntpdc.

The program implements the SNTP protocol as defined by RFC 5905, the NTPv4 IETF specification. @@ -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.7p296
+
ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p297
 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 cd8fa2550..10d8cf6f6 100644
--- a/ntpdc/ntpdc.man.in
+++ b/ntpdc/ntpdc.man.in
@@ -1,8 +1,8 @@
-.TH ntpdc @NTPDC_MS@ "30 Aug 2012" "4.2.7p296" "User Commands"
+.TH ntpdc @NTPDC_MS@ "01 Sep 2012" "4.2.7p297" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  August 30, 2012 at 11:40:26 PM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  September  1, 2012 at 12:31:46 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -11,7 +11,7 @@ ntpdc \- vendor-specific NTPD control program
 .SH SYNOPSIS
 .B ntpdc
 .\" Mixture of short (flag) options and long options
-.RB [ \-IflagP " [IvalueP]]... [" \-\-Iopt\-nameP " [[=| ]IvalueP]]..." [ host ...]
+.RB [ \-\fIflag\fP " [\fIvalue\fP]]... [" \-\-\fIopt\-name\fP " [[=| ]\fIvalue\fP]]..." [ host ...]
 .PP
 .SH DESCRIPTION
 .SH "OPTIONS"
@@ -32,7 +32,7 @@ ipv4.
 Force DNS resolution of following host names on the command line
 to the IPv6 namespace.
 .TP
-.BR \-c " IcmdP, " \-\-command "=" IcmdP
+.BR \-c " \fIcmd\fP, " \-\-command "=" \fIcmd\fP
 run a command and exit.
 This option may appear an unlimited number of times.
 .sp
@@ -45,7 +45,7 @@ Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
 .TP
-.BR \-D " IstringP, " \-\-set\-debug\-level "=" IstringP
+.BR \-D " \fIstring\fP, " \-\-set\-debug\-level "=" \fIstring\fP
 Set the debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
@@ -94,38 +94,38 @@ Display usage information and exit.
 .BR \-! , " \-\-more-help"
 Pass the extended usage information through a pager.
 .TP
-.BR \-> " [IrcfileP]," " \-\-save-opts" "[=IrcfileP]"
-Save the option state to IrcfileP.  The default is the IlastP
-configuration file listed in the BOPTION PRESETSP section, below.
+.BR \-> " [\fIrcfile\fP]," " \-\-save-opts" "[=\fIrcfile\fP]"
+Save the option state to \fIrcfile\fP.  The default is the \fIlast\fP
+configuration file listed in the \fBOPTION PRESETS\fP section, below.
 .TP
-.BR \-< " IrcfileP," " \-\-load-opts" "=IrcfileP," " \-\-no-load-opts"
-Load options from IrcfileP.
-The Ino-load-optsP form will disable the loading
-of earlier RC/INI files.  I\-\-no-load-optsP is handled early,
+.BR \-< " \fIrcfile\fP," " \-\-load-opts" "=\fIrcfile\fP," " \-\-no-load-opts"
+Load options from \fIrcfile\fP.
+The \fIno-load-opts\fP form will disable the loading
+of earlier RC/INI files.  \fI\-\-no-load-opts\fP is handled early,
 out of order.
 .TP
-.BR \- " [{Iv|c|nP}]," " \-\-version" "[=I{v|c|n}P]"
+.BR \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
 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 Inot presettableP may be preset
+Any option that is not marked as \fInot presettable\fP may be preset
 by loading values from configuration ("RC" or ".INI") file(s) and values from
 environment variables named:
 .nf
-  BNTPDC_P or BNTPDCP
+  \fBNTPDC_\fP or \fBNTPDC\fP
 .fi
 .ad
 The environmental presets take precedence (are processed later than)
 the configuration files.
-The IhomercP files are "I$HOMEP", and "I.P".
-If any of these are directories, then the file I.ntprcP
+The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
+If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
 .SH USAGE
 .SH "ENVIRONMENT"
-See BOPTION PRESETSP for configuration environment variables.
+See \fBOPTION PRESETS\fP for configuration environment variables.
 .SH "FILES"
-See BOPTION PRESETSP for configuration files.
+See \fBOPTION PRESETS\fP for configuration files.
 .SH "EXIT STATUS"
 One of the following exit values will be returned:
 .TP
@@ -149,5 +149,5 @@ This program is released under the terms of the NTP license,  [] | --[@{=| @}] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
diff --git a/ntpq/ntpq-opts.c b/ntpq/ntpq-opts.c
index 608be1aee..7d8149ba0 100644
--- a/ntpq/ntpq-opts.c
+++ b/ntpq/ntpq-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpq-opts.c)
  *  
- *  It has been AutoGen-ed  August 30, 2012 at 11:40:35 PM by AutoGen 5.16.2
+ *  It has been AutoGen-ed  September  1, 2012 at 12:31:55 AM by AutoGen 5.16.2
  *  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.7p296\n"
+/*     0 */ "ntpq 4.2.7p297\n"
             "Copyright (C) 1970-2012 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.7p296\n"
+/*  1648 */ "ntpq - standard NTP query program - Ver. 4.2.7p297\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.7p296";
+/*  1818 */ "ntpq 4.2.7p297";
 
 /*
  *  ipv4 option description with
diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h
index 79bad2301..a13853a0a 100644
--- a/ntpq/ntpq-opts.h
+++ b/ntpq/ntpq-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpq-opts.h)
  *  
- *  It has been AutoGen-ed  August 30, 2012 at 11:40:35 PM by AutoGen 5.16.2
+ *  It has been AutoGen-ed  September  1, 2012 at 12:31:55 AM by AutoGen 5.16.2
  *  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.7p296"
-#define NTPQ_FULL_VERSION  "ntpq 4.2.7p296"
+#define NTPQ_VERSION       "4.2.7p297"
+#define NTPQ_FULL_VERSION  "ntpq 4.2.7p297"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpq/ntpq.1ntpqman b/ntpq/ntpq.1ntpqman
index 9914cbeaa..6df39db5c 100644
--- a/ntpq/ntpq.1ntpqman
+++ b/ntpq/ntpq.1ntpqman
@@ -1,8 +1,8 @@
-.TH ntpq 1ntpqman "30 Aug 2012" "4.2.7p296" "User Commands"
+.TH ntpq 1ntpqman "01 Sep 2012" "4.2.7p297" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  August 30, 2012 at 11:41:01 PM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  September  1, 2012 at 12:32:18 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -11,7 +11,7 @@ ntpq \- standard NTP query program
 .SH SYNOPSIS
 .B ntpq
 .\" Mixture of short (flag) options and long options
-.RB [ \-IflagP " [IvalueP]]... [" \-\-Iopt\-nameP " [[=| ]IvalueP]]..." [ host ...]
+.RB [ \-\fIflag\fP " [\fIvalue\fP]]... [" \-\-\fIopt\-name\fP " [[=| ]\fIvalue\fP]]..." [ host ...]
 .SH DESCRIPTION
 .SH "OPTIONS"
 .TP
@@ -31,7 +31,7 @@ ipv4.
 Force DNS resolution of following host names on the command line
 to the IPv6 namespace.
 .TP
-.BR \-c " IcmdP, " \-\-command "=" IcmdP
+.BR \-c " \fIcmd\fP, " \-\-command "=" \fIcmd\fP
 run a command and exit.
 This option may appear an unlimited number of times.
 .sp
@@ -44,7 +44,7 @@ Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
 .TP
-.BR \-D " IstringP, " \-\-set\-debug\-level "=" IstringP
+.BR \-D " \fIstring\fP, " \-\-set\-debug\-level "=" \fIstring\fP
 Set the debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
@@ -88,37 +88,37 @@ Display usage information and exit.
 .BR \-! , " \-\-more-help"
 Pass the extended usage information through a pager.
 .TP
-.BR \-> " [IrcfileP]," " \-\-save-opts" "[=IrcfileP]"
-Save the option state to IrcfileP.  The default is the IlastP
-configuration file listed in the BOPTION PRESETSP section, below.
+.BR \-> " [\fIrcfile\fP]," " \-\-save-opts" "[=\fIrcfile\fP]"
+Save the option state to \fIrcfile\fP.  The default is the \fIlast\fP
+configuration file listed in the \fBOPTION PRESETS\fP section, below.
 .TP
-.BR \-< " IrcfileP," " \-\-load-opts" "=IrcfileP," " \-\-no-load-opts"
-Load options from IrcfileP.
-The Ino-load-optsP form will disable the loading
-of earlier RC/INI files.  I\-\-no-load-optsP is handled early,
+.BR \-< " \fIrcfile\fP," " \-\-load-opts" "=\fIrcfile\fP," " \-\-no-load-opts"
+Load options from \fIrcfile\fP.
+The \fIno-load-opts\fP form will disable the loading
+of earlier RC/INI files.  \fI\-\-no-load-opts\fP is handled early,
 out of order.
 .TP
-.BR \- " [{Iv|c|nP}]," " \-\-version" "[=I{v|c|n}P]"
+.BR \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
 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 Inot presettableP may be preset
+Any option that is not marked as \fInot presettable\fP may be preset
 by loading values from configuration ("RC" or ".INI") file(s) and values from
 environment variables named:
 .nf
-  BNTPQ_P or BNTPQP
+  \fBNTPQ_\fP or \fBNTPQ\fP
 .fi
 .ad
 The environmental presets take precedence (are processed later than)
 the configuration files.
-The IhomercP files are "I$HOMEP", and "I.P".
-If any of these are directories, then the file I.ntprcP
+The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
+If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
 .SH "ENVIRONMENT"
-See BOPTION PRESETSP for configuration environment variables.
+See \fBOPTION PRESETS\fP for configuration environment variables.
 .SH "FILES"
-See BOPTION PRESETSP for configuration files.
+See \fBOPTION PRESETS\fP for configuration files.
 .SH "EXIT STATUS"
 One of the following exit values will be returned:
 .TP
@@ -142,5 +142,5 @@ This program is released under the terms of the NTP license,  " [IrcfileP]," " \-\-save-opts" "[=IrcfileP]"
-Save the option state to IrcfileP.  The default is the IlastP
-configuration file listed in the BOPTION PRESETSP section, below.
+.BR \-> " [\fIrcfile\fP]," " \-\-save-opts" "[=\fIrcfile\fP]"
+Save the option state to \fIrcfile\fP.  The default is the \fIlast\fP
+configuration file listed in the \fBOPTION PRESETS\fP section, below.
 .TP
-.BR \-< " IrcfileP," " \-\-load-opts" "=IrcfileP," " \-\-no-load-opts"
-Load options from IrcfileP.
-The Ino-load-optsP form will disable the loading
-of earlier RC/INI files.  I\-\-no-load-optsP is handled early,
+.BR \-< " \fIrcfile\fP," " \-\-load-opts" "=\fIrcfile\fP," " \-\-no-load-opts"
+Load options from \fIrcfile\fP.
+The \fIno-load-opts\fP form will disable the loading
+of earlier RC/INI files.  \fI\-\-no-load-opts\fP is handled early,
 out of order.
 .TP
-.BR \- " [{Iv|c|nP}]," " \-\-version" "[=I{v|c|n}P]"
+.BR \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
 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 Inot presettableP may be preset
+Any option that is not marked as \fInot presettable\fP may be preset
 by loading values from configuration ("RC" or ".INI") file(s) and values from
 environment variables named:
 .nf
-  BNTPQ_P or BNTPQP
+  \fBNTPQ_\fP or \fBNTPQ\fP
 .fi
 .ad
 The environmental presets take precedence (are processed later than)
 the configuration files.
-The IhomercP files are "I$HOMEP", and "I.P".
-If any of these are directories, then the file I.ntprcP
+The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
+If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
 .SH "ENVIRONMENT"
-See BOPTION PRESETSP for configuration environment variables.
+See \fBOPTION PRESETS\fP for configuration environment variables.
 .SH "FILES"
-See BOPTION PRESETSP for configuration files.
+See \fBOPTION PRESETS\fP for configuration files.
 .SH "EXIT STATUS"
 One of the following exit values will be returned:
 .TP
@@ -142,5 +142,5 @@ This program is released under the terms of the NTP license,  [] | --[@{=| @}] ]...
   Flg Arg Option-Name    Description
    -n no  nofork         Do not fork
diff --git a/ntpsnmpd/ntpsnmpd-opts.c b/ntpsnmpd/ntpsnmpd-opts.c
index 3ff44fba4..d0190f3c7 100644
--- a/ntpsnmpd/ntpsnmpd-opts.c
+++ b/ntpsnmpd/ntpsnmpd-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.c)
  *  
- *  It has been AutoGen-ed  August 30, 2012 at 11:41:09 PM by AutoGen 5.16.2
+ *  It has been AutoGen-ed  September  1, 2012 at 12:32:27 AM by AutoGen 5.16.2
  *  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.7p296\n"
+/*     0 */ "ntpsnmpd 4.2.7p297\n"
             "Copyright (C) 1970-2012 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.7p296\n"
+/*  1385 */ "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p297\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.7p296";
+/*  1542 */ "ntpsnmpd 4.2.7p297";
 
 /*
  *  nofork option description:
diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h
index 96da162d3..cdf828db4 100644
--- a/ntpsnmpd/ntpsnmpd-opts.h
+++ b/ntpsnmpd/ntpsnmpd-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.h)
  *  
- *  It has been AutoGen-ed  August 30, 2012 at 11:41:09 PM by AutoGen 5.16.2
+ *  It has been AutoGen-ed  September  1, 2012 at 12:32:26 AM by AutoGen 5.16.2
  *  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.7p296"
-#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.7p296"
+#define NTPSNMPD_VERSION       "4.2.7p297"
+#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.7p297"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
index 6187ba106..1fa6e6385 100644
--- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
+++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
@@ -1,8 +1,8 @@
-.TH ntpsnmpd 1ntpsnmpdman "30 Aug 2012" "4.2.7p296" "User Commands"
+.TH ntpsnmpd 1ntpsnmpdman "01 Sep 2012" "4.2.7p297" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  August 30, 2012 at 11:41:20 PM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  September  1, 2012 at 12:32:36 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -11,7 +11,7 @@ ntpsnmpd \- NTP SNMP MIB agent
 .SH SYNOPSIS
 .B ntpsnmpd
 .\" Mixture of short (flag) options and long options
-.RB [ \-IflagP " [IvalueP]]... [" \-\-Iopt\-nameP " [[=| ]IvalueP]]..."
+.RB [ \-\fIflag\fP " [\fIvalue\fP]]... [" \-\-\fIopt\-name\fP " [[=| ]\fIvalue\fP]]..."
 .PP
 All arguments must be options.
 .PP
@@ -26,9 +26,9 @@ Do not fork.
 Log to syslog().
 .sp
 .TP
-.BR \-\-agentxsocket "=IstringP"
+.BR \-\-agentxsocket "=\fIstring\fP"
 The socket address ntpsnmpd uses to connect to net-snmpd.
-The default IstringP for this option is:
+The default \fIstring\fP for this option is:
 .ti +4
  unix:/var/agentx/master
 .sp
@@ -41,37 +41,37 @@ Display usage information and exit.
 .BR \-! , " \-\-more-help"
 Pass the extended usage information through a pager.
 .TP
-.BR \-> " [IrcfileP]," " \-\-save-opts" "[=IrcfileP]"
-Save the option state to IrcfileP.  The default is the IlastP
-configuration file listed in the BOPTION PRESETSP section, below.
+.BR \-> " [\fIrcfile\fP]," " \-\-save-opts" "[=\fIrcfile\fP]"
+Save the option state to \fIrcfile\fP.  The default is the \fIlast\fP
+configuration file listed in the \fBOPTION PRESETS\fP section, below.
 .TP
-.BR \-< " IrcfileP," " \-\-load-opts" "=IrcfileP," " \-\-no-load-opts"
-Load options from IrcfileP.
-The Ino-load-optsP form will disable the loading
-of earlier RC/INI files.  I\-\-no-load-optsP is handled early,
+.BR \-< " \fIrcfile\fP," " \-\-load-opts" "=\fIrcfile\fP," " \-\-no-load-opts"
+Load options from \fIrcfile\fP.
+The \fIno-load-opts\fP form will disable the loading
+of earlier RC/INI files.  \fI\-\-no-load-opts\fP is handled early,
 out of order.
 .TP
-.BR \- " [{Iv|c|nP}]," " \-\-version" "[=I{v|c|n}P]"
+.BR \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
 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 Inot presettableP may be preset
+Any option that is not marked as \fInot presettable\fP may be preset
 by loading values from configuration ("RC" or ".INI") file(s) and values from
 environment variables named:
 .nf
-  BNTPSNMPD_P or BNTPSNMPDP
+  \fBNTPSNMPD_\fP or \fBNTPSNMPD\fP
 .fi
 .ad
 The environmental presets take precedence (are processed later than)
 the configuration files.
-The IhomercP files are "I$HOMEP", and "I.P".
-If any of these are directories, then the file I.ntprcP
+The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
+If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
 .SH "ENVIRONMENT"
-See BOPTION PRESETSP for configuration environment variables.
+See \fBOPTION PRESETS\fP for configuration environment variables.
 .SH "FILES"
-See BOPTION PRESETSP for configuration files.
+See \fBOPTION PRESETS\fP for configuration files.
 .SH "EXIT STATUS"
 One of the following exit values will be returned:
 .TP
@@ -94,5 +94,5 @@ This program is released under the terms of the NTP license,  " [IrcfileP]," " \-\-save-opts" "[=IrcfileP]"
-Save the option state to IrcfileP.  The default is the IlastP
-configuration file listed in the BOPTION PRESETSP section, below.
+.BR \-> " [\fIrcfile\fP]," " \-\-save-opts" "[=\fIrcfile\fP]"
+Save the option state to \fIrcfile\fP.  The default is the \fIlast\fP
+configuration file listed in the \fBOPTION PRESETS\fP section, below.
 .TP
-.BR \-< " IrcfileP," " \-\-load-opts" "=IrcfileP," " \-\-no-load-opts"
-Load options from IrcfileP.
-The Ino-load-optsP form will disable the loading
-of earlier RC/INI files.  I\-\-no-load-optsP is handled early,
+.BR \-< " \fIrcfile\fP," " \-\-load-opts" "=\fIrcfile\fP," " \-\-no-load-opts"
+Load options from \fIrcfile\fP.
+The \fIno-load-opts\fP form will disable the loading
+of earlier RC/INI files.  \fI\-\-no-load-opts\fP is handled early,
 out of order.
 .TP
-.BR \- " [{Iv|c|nP}]," " \-\-version" "[=I{v|c|n}P]"
+.BR \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
 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 Inot presettableP may be preset
+Any option that is not marked as \fInot presettable\fP may be preset
 by loading values from configuration ("RC" or ".INI") file(s) and values from
 environment variables named:
 .nf
-  BNTPSNMPD_P or BNTPSNMPDP
+  \fBNTPSNMPD_\fP or \fBNTPSNMPD\fP
 .fi
 .ad
 The environmental presets take precedence (are processed later than)
 the configuration files.
-The IhomercP files are "I$HOMEP", and "I.P".
-If any of these are directories, then the file I.ntprcP
+The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
+If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
 .SH "ENVIRONMENT"
-See BOPTION PRESETSP for configuration environment variables.
+See \fBOPTION PRESETS\fP for configuration environment variables.
 .SH "FILES"
-See BOPTION PRESETSP for configuration files.
+See \fBOPTION PRESETS\fP for configuration files.
 .SH "EXIT STATUS"
 One of the following exit values will be returned:
 .TP
@@ -94,5 +94,5 @@ This program is released under the terms of the NTP license, P or BNTP_WAITP
+  \fBNTP_WAIT_\fP or \fBNTP_WAIT\fP
 .fi
 .ad
 .SH "ENVIRONMENT"
-See BOPTION PRESETSP for configuration environment variables.
+See \fBOPTION PRESETS\fP for configuration environment variables.
 .SH "EXIT STATUS"
 One of the following exit values will be returned:
 .TP
@@ -78,5 +78,5 @@ This program is released under the terms of the NTP license, This document applies to version 4.2.7p296 of ntp-wait.
+  
This document applies to version 4.2.7p297 of ntp-wait.
 
   
The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
diff --git a/scripts/ntp-wait.man.in b/scripts/ntp-wait.man.in
index f198debfe..1066e40e9 100644
--- a/scripts/ntp-wait.man.in
+++ b/scripts/ntp-wait.man.in
@@ -1,8 +1,8 @@
-.TH ntp-wait @NTP_WAIT_MS@ "31 Aug 2012" "ntp (4.2.7p296)" "User Commands"
+.TH ntp-wait @NTP_WAIT_MS@ "01 Sep 2012" "ntp (4.2.7p297)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  August 31, 2012 at 02:56:56 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  September  1, 2012 at 12:28:27 AM by AutoGen 5.16.2
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -11,31 +11,31 @@ ntp-wait \- Wait for ntpd to stabilize the system clock
 .SH SYNOPSIS
 .B ntp-wait
 .\" Mixture of short (flag) options and long options
-.RB [ \-IflagP " [IvalueP]]... [" \-\-Iopt\-nameP " [[=| ]IvalueP]]..."
+.RB [ \-\fIflag\fP " [\fIvalue\fP]]... [" \-\-\fIopt\-name\fP " [[=| ]\fIvalue\fP]]..."
 .PP
 All arguments must be options.
 .PP
 .SH DESCRIPTION
 .SH "OPTIONS"
 .TP
-.BR \-n " Inum\-triesP, " \-\- "=" Inum\-triesP
+.BR \-n " \fInum\-tries\fP, " \-\- "=" \fInum\-tries\fP
 Number of times to check ntpd.
 This option takes an integer number as its argument.
-The default Inum\-triesP for this option is:
+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.
 .TP
-.BR \-s " Isecs\-between\-triesP, " \-\- "=" Isecs\-between\-triesP
+.BR \-s " \fIsecs\-between\-tries\fP, " \-\- "=" \fIsecs\-between\-tries\fP
 How long to sleep between tries.
 This option takes an integer number as its argument.
-The default Isecs\-between\-triesP for this option is:
+The default \fIsecs\-between\-tries\fP for this option is:
 .ti +4
  6
 .sp
-We will sleep for Isecs-between-triesP after each query of ntpd
+We will sleep for \fIsecs-between-tries\fP after each query of ntpd
 that returns "the time is not yet stable".
 .TP
 .BR \-v ", " -\-
@@ -50,19 +50,19 @@ Display usage information and exit.
 .BR \-! , " \-\-more-help"
 Pass the extended usage information through a pager.
 .TP
-.BR \- " [{Iv|c|nP}]," " \-\-version" "[=I{v|c|n}P]"
+.BR \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
 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 Inot presettableP may be preset
+Any option that is not marked as \fInot presettable\fP may be preset
 by loading values from environment variables named:
 .nf
-  BNTP_WAIT_P or BNTP_WAITP
+  \fBNTP_WAIT_\fP or \fBNTP_WAIT\fP
 .fi
 .ad
 .SH "ENVIRONMENT"
-See BOPTION PRESETSP for configuration environment variables.
+See \fBOPTION PRESETS\fP for configuration environment variables.
 .SH "EXIT STATUS"
 One of the following exit values will be returned:
 .TP
@@ -78,5 +78,5 @@ 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 e9c3577fb..97bd1d84f 100644
--- a/sntp/sntp-opts.c
+++ b/sntp/sntp-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (sntp-opts.c)
  *  
- *  It has been AutoGen-ed  August 31, 2012 at 02:54:19 AM by AutoGen 5.16.2
+ *  It has been AutoGen-ed  September  1, 2012 at 12:25:57 AM by AutoGen 5.16.2
  *  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[2568] =
-/*     0 */ "sntp 4.2.7p296\n"
+/*     0 */ "sntp 4.2.7p297\n"
             "Copyright (C) 1970-2012 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"
@@ -160,7 +160,7 @@ static char const sntp_opt_strs[2568] =
 /*  2312 */ "LOAD_OPTS\0"
 /*  2322 */ "no-load-opts\0"
 /*  2335 */ "SNTP\0"
-/*  2340 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p296\n"
+/*  2340 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p297\n"
             "USAGE:  %s [ - [] | --[{=| }] ]... \\\n"
             "\t\t[ hostname-or-IP ...]\n\0"
 /*  2501 */ "$HOME\0"
@@ -168,7 +168,7 @@ static char const sntp_opt_strs[2568] =
 /*  2509 */ ".ntprc\0"
 /*  2516 */ "http://bugs.ntp.org, bugs@ntp.org\0"
 /*  2550 */ "\n\n\0"
-/*  2553 */ "sntp 4.2.7p296";
+/*  2553 */ "sntp 4.2.7p297";
 
 /*
  *  ipv4 option description with
diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h
index a9bb93891..77f6326e8 100644
--- a/sntp/sntp-opts.h
+++ b/sntp/sntp-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (sntp-opts.h)
  *  
- *  It has been AutoGen-ed  August 31, 2012 at 02:54:19 AM by AutoGen 5.16.2
+ *  It has been AutoGen-ed  September  1, 2012 at 12:25:56 AM by AutoGen 5.16.2
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -91,8 +91,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    24
-#define SNTP_VERSION       "4.2.7p296"
-#define SNTP_FULL_VERSION  "sntp 4.2.7p296"
+#define SNTP_VERSION       "4.2.7p297"
+#define SNTP_FULL_VERSION  "sntp 4.2.7p297"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/sntp/sntp.1sntpman b/sntp/sntp.1sntpman
index 7ecbc94c3..c471b85ed 100644
--- a/sntp/sntp.1sntpman
+++ b/sntp/sntp.1sntpman
@@ -1,8 +1,8 @@
-.TH sntp 1sntpman "30 Aug 2012" "4.2.7p296" "User Commands"
+.TH sntp 1sntpman "01 Sep 2012" "4.2.7p297" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  August 30, 2012 at 11:42:07 PM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  September  1, 2012 at 12:33:34 AM by AutoGen 5.16.2
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -11,7 +11,7 @@ sntp \- standard Simple Network Time Protocol client program
 .SH SYNOPSIS
 .B sntp
 .\" Mixture of short (flag) options and long options
-.RB [ \-IflagP " [IvalueP]]... [" \-\-Iopt\-nameP " [[=| ]IvalueP]]..." [ hostname-or-IP ...]
+.RB [ \-\fIflag\fP " [\fIvalue\fP]]... [" \-\-\fIopt\-name\fP " [[=| ]\fIvalue\fP]]..." [ hostname-or-IP ...]
 .PP
 .SH DESCRIPTION
 .SH "OPTIONS"
@@ -32,43 +32,43 @@ ipv4.
 Force DNS resolution of the following host names on the command line
 to the IPv6 namespace.
 .TP
-.BR \-a " Iauth\-keynumberP, " \-\-authentication "=" Iauth\-keynumberP
-Enable authentication with the key Bauth-keynumberP.
+.BR \-a " \fIauth\-keynumber\fP, " \-\-authentication "=" \fIauth\-keynumber\fP
+Enable authentication with the key \fBauth-keynumber\fP.
 This option takes an integer number as its argument.
 .sp
 This option enables authentication using the key specified in this
 option's argument.  The argument of this option is the keyid, a
 number specified in the keyfile as this key's identifier. See the
-keyfile option (B-kP) for more details.
+keyfile option (\fB-k\fP) for more details.
 .TP
-.BR \-B " IsecondsP, " \-\-bctimeout "=" IsecondsP
+.BR \-B " \fIseconds\fP, " \-\-bctimeout "=" \fIseconds\fP
 The number of seconds to wait for broadcasts.
 This option takes an integer number as its argument.
-The default IsecondsP for this option is:
+The default \fIseconds\fP for this option is:
 .ti +4
  68
 .sp
-When waiting for a broadcast packet BsntpP will wait the number
+When waiting for a broadcast packet \fBsntp\fP will wait the number
 of seconds specified before giving up.
 .TP
-.BR \-b " Ibroadcast\-addressP, " \-\-broadcast "=" Ibroadcast\-addressP
+.BR \-b " \fIbroadcast\-address\fP, " \-\-broadcast "=" \fIbroadcast\-address\fP
 Listen to the address specified for broadcast time sync.
 This option may appear an unlimited number of times.
 .sp
-If specified BsntpP will listen to the specified address
+If specified \fBsntp\fP will listen to the specified address
 for NTP broadcasts.  The default maximum wait time
-can be modified with B-BP.
+can be modified with \fB-B\fP.
 .TP
-.BR \-c " Ihost\-nameP, " \-\-concurrent "=" Ihost\-nameP
+.BR \-c " \fIhost\-name\fP, " \-\-concurrent "=" \fIhost\-name\fP
 Concurrently query all IPs returned for host-name.
 This option may appear an unlimited number of times.
 .sp
 Requests from an NTP "client" to a "server" should never be sent
 more rapidly than one every 2 seconds.  By default, any IPs returned
 as part of a DNS lookup are assumed to be for a single instance of
-ntpd, and therefore BsntpP will send queries to these IPs one
+ntpd, and therefore \fBsntp\fP will send queries to these IPs one
 after another, with a 2-second gap in between each query.
-The B-cP or B--concurrentP flag says that any IPs
+The \fB-c\fP or \fB--concurrent\fP flag says that any IPs
 returned for the DNS lookup of the supplied host-name are on
 different machines, so we can send concurrent queries.
 .TP
@@ -77,15 +77,15 @@ Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
 .TP
-.BR \-D " IstringP, " \-\-set\-debug\-level "=" IstringP
+.BR \-D " \fIstring\fP, " \-\-set\-debug\-level "=" \fIstring\fP
 Set the debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
 .TP
-.BR \-g " ImillisecondsP, " \-\-gap "=" ImillisecondsP
+.BR \-g " \fImilliseconds\fP, " \-\-gap "=" \fImilliseconds\fP
 The gap (in milliseconds) between time requests.
 This option takes an integer number as its argument.
-The default ImillisecondsP for this option is:
+The default \fImilliseconds\fP for this option is:
 .ti +4
  50
 .sp
@@ -94,40 +94,40 @@ there is benefit to specifying a good number of servers to query,
 separate the queries we send out by the specified number of
 milliseconds.
 .TP
-.BR \-K " Ifile\-nameP, " \-\-kod "=" Ifile\-nameP
+.BR \-K " \fIfile\-name\fP, " \-\-kod "=" \fIfile\-name\fP
 KoD history filename.
-The default Ifile\-nameP for this option is:
+The default \fIfile\-name\fP for this option is:
 .ti +4
  /var/db/ntp-kod
 .sp
 Specifies the filename to be used for the persistent history of KoD
 responses received from servers.
 .TP
-.BR \-k " Ifile\-nameP, " \-\-keyfile "=" Ifile\-nameP
-Look in this file for the key specified with B-aP.
+.BR \-k " \fIfile\-name\fP, " \-\-keyfile "=" \fIfile\-name\fP
+Look in this file for the key specified with \fB-a\fP.
 .sp
 This option specifies the keyfile.
-BsntpP will search for the key specified with B-aP
-IkeynoP in this file.  Key files follow the following format:
-Ikeyid keytype keyP
-Where	IkeyidP is a number identifying this key
-IkeytypeP is one of the following:
-BSP  Key is a 64 Bit hexadecimal number as specified in in the DES specification.
-BNP  Key is a 64 Bit hexadecimal number as specified in the NTP standard.
-BAP  Key is a 1-to-8 character ASCII string.
-BMP  Key is a 1-to-8 character ASCII string using the MD5 authentication scheme.
-For more information see Bntp.keys(5)P.
-.TP
-.BR \-l " Ifile\-nameP, " \-\-logfile "=" Ifile\-nameP
+\fBsntp\fP will search for the key specified with \fB-a\fP
+\fIkeyno\fP in this file.  Key files follow the following format:
+\fIkeyid keytype key\fP
+Where	\fIkeyid\fP is a number identifying this key
+\fIkeytype\fP is one of the following:
+\fBS\fP  Key is a 64 Bit hexadecimal number as specified in in the DES specification.
+\fBN\fP  Key is a 64 Bit hexadecimal number as specified in the NTP standard.
+\fBA\fP  Key is a 1-to-8 character ASCII string.
+\fBM\fP  Key is a 1-to-8 character ASCII string using the MD5 authentication scheme.
+For more information see \fBntp.keys(5)\fP.
+.TP
+.BR \-l " \fIfile\-name\fP, " \-\-logfile "=" \fIfile\-name\fP
 Log to specified logfile.
 .sp
 This option causes the client to write log messages to the specified
-IlogfileP.
+\fIlogfile\fP.
 .TP
-.BR \-M " InumberP, " \-\-steplimit "=" InumberP
-Adjustments less than BsteplimitP msec will be slewed.
+.BR \-M " \fInumber\fP, " \-\-steplimit "=" \fInumber\fP
+Adjustments less than \fBsteplimit\fP msec will be slewed.
 This option takes an integer number as its argument.
-The value of InumberP is constrained to being:
+The value of \fInumber\fP is constrained to being:
 .in +4
 .nf
 .na
@@ -135,26 +135,26 @@ greater than or equal to 0
 .fi
 .in -4
 .sp
-If the time adjustment is less than IsteplimitP milliseconds,
-slew the amount using Badjtime(2)P.  Otherwise, step the
-correction using Bsettimeofday(2)P.
+If the time adjustment is less than \fIsteplimit\fP milliseconds,
+slew the amount using \fBadjtime(2)\fP.  Otherwise, step the
+correction using \fBsettimeofday(2)\fP.
 .TP
-.BR \-o " InumberP, " \-\-ntpversion "=" InumberP
-Send BintP as our NTP version.
+.BR \-o " \fInumber\fP, " \-\-ntpversion "=" \fInumber\fP
+Send \fBint\fP as our NTP version.
 This option takes an integer number as its argument.
-The value of InumberP is constrained to being:
+The value of \fInumber\fP is constrained to being:
 .in +4
 .nf
 .na
 in the range  0 through 7
 .fi
 .in -4
-The default InumberP for this option is:
+The default \fInumber\fP for this option is:
 .ti +4
  4
 .sp
 When sending requests to a remote server, tell them we are running
-NTP protocol version IntpversionP .
+NTP protocol version \fIntpversion\fP .
 .TP
 .BR \-r ", " -\-usereservedport
 Use the NTP Reserved Port (port 123).
@@ -163,26 +163,26 @@ Use port 123, which is reserved for NTP, for our network
 communications.
 .TP
 .BR \-S ", " -\-step
-OK to 'step' the time with Bsettimeofday(2)P.
+OK to 'step' the time with \fBsettimeofday(2)\fP.
 .sp
 .TP
 .BR \-s ", " -\-slew
-OK to 'slew' the time with Badjtime(2)P.
+OK to 'slew' the time with \fBadjtime(2)\fP.
 .sp
 .TP
-.BR \-u " IsecondsP, " \-\-uctimeout "=" IsecondsP
+.BR \-u " \fIseconds\fP, " \-\-uctimeout "=" \fIseconds\fP
 The number of seconds to wait for unicast responses.
 This option takes an integer number as its argument.
-The default IsecondsP for this option is:
+The default \fIseconds\fP for this option is:
 .ti +4
  5
 .sp
-When waiting for a unicast reply, BsntpP will wait the number
+When waiting for a unicast reply, \fBsntp\fP will wait the number
 of seconds specified before giving up.
 .TP
-.BR \-\-wait, " B\-\-no\-waitP"
+.BR \-\-wait, " \fB\-\-no\-wait\fP"
 Wait for pending replies (if not setting the time).
-The Ino\-waitP form will disable the option.
+The \fIno\-wait\fP form will disable the option.
 This option is enabled by default.
 .sp
 If we are not setting the time, wait for all pending responses.
@@ -193,38 +193,38 @@ Display usage information and exit.
 .BR \-! , " \-\-more-help"
 Pass the extended usage information through a pager.
 .TP
-.BR \-> " [IrcfileP]," " \-\-save-opts" "[=IrcfileP]"
-Save the option state to IrcfileP.  The default is the IlastP
-configuration file listed in the BOPTION PRESETSP section, below.
+.BR \-> " [\fIrcfile\fP]," " \-\-save-opts" "[=\fIrcfile\fP]"
+Save the option state to \fIrcfile\fP.  The default is the \fIlast\fP
+configuration file listed in the \fBOPTION PRESETS\fP section, below.
 .TP
-.BR \-< " IrcfileP," " \-\-load-opts" "=IrcfileP," " \-\-no-load-opts"
-Load options from IrcfileP.
-The Ino-load-optsP form will disable the loading
-of earlier RC/INI files.  I\-\-no-load-optsP is handled early,
+.BR \-< " \fIrcfile\fP," " \-\-load-opts" "=\fIrcfile\fP," " \-\-no-load-opts"
+Load options from \fIrcfile\fP.
+The \fIno-load-opts\fP form will disable the loading
+of earlier RC/INI files.  \fI\-\-no-load-opts\fP is handled early,
 out of order.
 .TP
-.BR \- " [{Iv|c|nP}]," " \-\-version" "[=I{v|c|n}P]"
+.BR \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
 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 Inot presettableP may be preset
+Any option that is not marked as \fInot presettable\fP may be preset
 by loading values from configuration ("RC" or ".INI") file(s) and values from
 environment variables named:
 .nf
-  BSNTP_P or BSNTPP
+  \fBSNTP_\fP or \fBSNTP\fP
 .fi
 .ad
 The environmental presets take precedence (are processed later than)
 the configuration files.
-The IhomercP files are "I$HOMEP", and "I.P".
-If any of these are directories, then the file I.ntprcP
+The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
+If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
 .SH USAGE
 .SH "ENVIRONMENT"
-See BOPTION PRESETSP for configuration environment variables.
+See \fBOPTION PRESETS\fP for configuration environment variables.
 .SH "FILES"
-See BOPTION PRESETSP for configuration files.
+See \fBOPTION PRESETS\fP for configuration files.
 .SH "EXIT STATUS"
 One of the following exit values will be returned:
 .TP
@@ -247,5 +247,5 @@ This program is released under the terms of the NTP license, This document applies to version 4.2.7p296 of sntp.
+  
This document applies to version 4.2.7p297 of sntp.
 
   
The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
@@ -202,7 +202,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.7p296
+
sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p297
 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 84e0f8946..f0081ee33 100644
--- a/sntp/sntp.man.in
+++ b/sntp/sntp.man.in
@@ -1,8 +1,8 @@
-.TH sntp @SNTP_MS@ "30 Aug 2012" "4.2.7p296" "User Commands"
+.TH sntp @SNTP_MS@ "01 Sep 2012" "4.2.7p297" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  August 30, 2012 at 11:42:07 PM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  September  1, 2012 at 12:33:34 AM by AutoGen 5.16.2
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -11,7 +11,7 @@ sntp \- standard Simple Network Time Protocol client program
 .SH SYNOPSIS
 .B sntp
 .\" Mixture of short (flag) options and long options
-.RB [ \-IflagP " [IvalueP]]... [" \-\-Iopt\-nameP " [[=| ]IvalueP]]..." [ hostname-or-IP ...]
+.RB [ \-\fIflag\fP " [\fIvalue\fP]]... [" \-\-\fIopt\-name\fP " [[=| ]\fIvalue\fP]]..." [ hostname-or-IP ...]
 .PP
 .SH DESCRIPTION
 .SH "OPTIONS"
@@ -32,43 +32,43 @@ ipv4.
 Force DNS resolution of the following host names on the command line
 to the IPv6 namespace.
 .TP
-.BR \-a " Iauth\-keynumberP, " \-\-authentication "=" Iauth\-keynumberP
-Enable authentication with the key Bauth-keynumberP.
+.BR \-a " \fIauth\-keynumber\fP, " \-\-authentication "=" \fIauth\-keynumber\fP
+Enable authentication with the key \fBauth-keynumber\fP.
 This option takes an integer number as its argument.
 .sp
 This option enables authentication using the key specified in this
 option's argument.  The argument of this option is the keyid, a
 number specified in the keyfile as this key's identifier. See the
-keyfile option (B-kP) for more details.
+keyfile option (\fB-k\fP) for more details.
 .TP
-.BR \-B " IsecondsP, " \-\-bctimeout "=" IsecondsP
+.BR \-B " \fIseconds\fP, " \-\-bctimeout "=" \fIseconds\fP
 The number of seconds to wait for broadcasts.
 This option takes an integer number as its argument.
-The default IsecondsP for this option is:
+The default \fIseconds\fP for this option is:
 .ti +4
  68
 .sp
-When waiting for a broadcast packet BsntpP will wait the number
+When waiting for a broadcast packet \fBsntp\fP will wait the number
 of seconds specified before giving up.
 .TP
-.BR \-b " Ibroadcast\-addressP, " \-\-broadcast "=" Ibroadcast\-addressP
+.BR \-b " \fIbroadcast\-address\fP, " \-\-broadcast "=" \fIbroadcast\-address\fP
 Listen to the address specified for broadcast time sync.
 This option may appear an unlimited number of times.
 .sp
-If specified BsntpP will listen to the specified address
+If specified \fBsntp\fP will listen to the specified address
 for NTP broadcasts.  The default maximum wait time
-can be modified with B-BP.
+can be modified with \fB-B\fP.
 .TP
-.BR \-c " Ihost\-nameP, " \-\-concurrent "=" Ihost\-nameP
+.BR \-c " \fIhost\-name\fP, " \-\-concurrent "=" \fIhost\-name\fP
 Concurrently query all IPs returned for host-name.
 This option may appear an unlimited number of times.
 .sp
 Requests from an NTP "client" to a "server" should never be sent
 more rapidly than one every 2 seconds.  By default, any IPs returned
 as part of a DNS lookup are assumed to be for a single instance of
-ntpd, and therefore BsntpP will send queries to these IPs one
+ntpd, and therefore \fBsntp\fP will send queries to these IPs one
 after another, with a 2-second gap in between each query.
-The B-cP or B--concurrentP flag says that any IPs
+The \fB-c\fP or \fB--concurrent\fP flag says that any IPs
 returned for the DNS lookup of the supplied host-name are on
 different machines, so we can send concurrent queries.
 .TP
@@ -77,15 +77,15 @@ Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
 .TP
-.BR \-D " IstringP, " \-\-set\-debug\-level "=" IstringP
+.BR \-D " \fIstring\fP, " \-\-set\-debug\-level "=" \fIstring\fP
 Set the debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
 .TP
-.BR \-g " ImillisecondsP, " \-\-gap "=" ImillisecondsP
+.BR \-g " \fImilliseconds\fP, " \-\-gap "=" \fImilliseconds\fP
 The gap (in milliseconds) between time requests.
 This option takes an integer number as its argument.
-The default ImillisecondsP for this option is:
+The default \fImilliseconds\fP for this option is:
 .ti +4
  50
 .sp
@@ -94,40 +94,40 @@ there is benefit to specifying a good number of servers to query,
 separate the queries we send out by the specified number of
 milliseconds.
 .TP
-.BR \-K " Ifile\-nameP, " \-\-kod "=" Ifile\-nameP
+.BR \-K " \fIfile\-name\fP, " \-\-kod "=" \fIfile\-name\fP
 KoD history filename.
-The default Ifile\-nameP for this option is:
+The default \fIfile\-name\fP for this option is:
 .ti +4
  /var/db/ntp-kod
 .sp
 Specifies the filename to be used for the persistent history of KoD
 responses received from servers.
 .TP
-.BR \-k " Ifile\-nameP, " \-\-keyfile "=" Ifile\-nameP
-Look in this file for the key specified with B-aP.
+.BR \-k " \fIfile\-name\fP, " \-\-keyfile "=" \fIfile\-name\fP
+Look in this file for the key specified with \fB-a\fP.
 .sp
 This option specifies the keyfile.
-BsntpP will search for the key specified with B-aP
-IkeynoP in this file.  Key files follow the following format:
-Ikeyid keytype keyP
-Where	IkeyidP is a number identifying this key
-IkeytypeP is one of the following:
-BSP  Key is a 64 Bit hexadecimal number as specified in in the DES specification.
-BNP  Key is a 64 Bit hexadecimal number as specified in the NTP standard.
-BAP  Key is a 1-to-8 character ASCII string.
-BMP  Key is a 1-to-8 character ASCII string using the MD5 authentication scheme.
-For more information see Bntp.keys(5)P.
-.TP
-.BR \-l " Ifile\-nameP, " \-\-logfile "=" Ifile\-nameP
+\fBsntp\fP will search for the key specified with \fB-a\fP
+\fIkeyno\fP in this file.  Key files follow the following format:
+\fIkeyid keytype key\fP
+Where	\fIkeyid\fP is a number identifying this key
+\fIkeytype\fP is one of the following:
+\fBS\fP  Key is a 64 Bit hexadecimal number as specified in in the DES specification.
+\fBN\fP  Key is a 64 Bit hexadecimal number as specified in the NTP standard.
+\fBA\fP  Key is a 1-to-8 character ASCII string.
+\fBM\fP  Key is a 1-to-8 character ASCII string using the MD5 authentication scheme.
+For more information see \fBntp.keys(5)\fP.
+.TP
+.BR \-l " \fIfile\-name\fP, " \-\-logfile "=" \fIfile\-name\fP
 Log to specified logfile.
 .sp
 This option causes the client to write log messages to the specified
-IlogfileP.
+\fIlogfile\fP.
 .TP
-.BR \-M " InumberP, " \-\-steplimit "=" InumberP
-Adjustments less than BsteplimitP msec will be slewed.
+.BR \-M " \fInumber\fP, " \-\-steplimit "=" \fInumber\fP
+Adjustments less than \fBsteplimit\fP msec will be slewed.
 This option takes an integer number as its argument.
-The value of InumberP is constrained to being:
+The value of \fInumber\fP is constrained to being:
 .in +4
 .nf
 .na
@@ -135,26 +135,26 @@ greater than or equal to 0
 .fi
 .in -4
 .sp
-If the time adjustment is less than IsteplimitP milliseconds,
-slew the amount using Badjtime(2)P.  Otherwise, step the
-correction using Bsettimeofday(2)P.
+If the time adjustment is less than \fIsteplimit\fP milliseconds,
+slew the amount using \fBadjtime(2)\fP.  Otherwise, step the
+correction using \fBsettimeofday(2)\fP.
 .TP
-.BR \-o " InumberP, " \-\-ntpversion "=" InumberP
-Send BintP as our NTP version.
+.BR \-o " \fInumber\fP, " \-\-ntpversion "=" \fInumber\fP
+Send \fBint\fP as our NTP version.
 This option takes an integer number as its argument.
-The value of InumberP is constrained to being:
+The value of \fInumber\fP is constrained to being:
 .in +4
 .nf
 .na
 in the range  0 through 7
 .fi
 .in -4
-The default InumberP for this option is:
+The default \fInumber\fP for this option is:
 .ti +4
  4
 .sp
 When sending requests to a remote server, tell them we are running
-NTP protocol version IntpversionP .
+NTP protocol version \fIntpversion\fP .
 .TP
 .BR \-r ", " -\-usereservedport
 Use the NTP Reserved Port (port 123).
@@ -163,26 +163,26 @@ Use port 123, which is reserved for NTP, for our network
 communications.
 .TP
 .BR \-S ", " -\-step
-OK to 'step' the time with Bsettimeofday(2)P.
+OK to 'step' the time with \fBsettimeofday(2)\fP.
 .sp
 .TP
 .BR \-s ", " -\-slew
-OK to 'slew' the time with Badjtime(2)P.
+OK to 'slew' the time with \fBadjtime(2)\fP.
 .sp
 .TP
-.BR \-u " IsecondsP, " \-\-uctimeout "=" IsecondsP
+.BR \-u " \fIseconds\fP, " \-\-uctimeout "=" \fIseconds\fP
 The number of seconds to wait for unicast responses.
 This option takes an integer number as its argument.
-The default IsecondsP for this option is:
+The default \fIseconds\fP for this option is:
 .ti +4
  5
 .sp
-When waiting for a unicast reply, BsntpP will wait the number
+When waiting for a unicast reply, \fBsntp\fP will wait the number
 of seconds specified before giving up.
 .TP
-.BR \-\-wait, " B\-\-no\-waitP"
+.BR \-\-wait, " \fB\-\-no\-wait\fP"
 Wait for pending replies (if not setting the time).
-The Ino\-waitP form will disable the option.
+The \fIno\-wait\fP form will disable the option.
 This option is enabled by default.
 .sp
 If we are not setting the time, wait for all pending responses.
@@ -193,38 +193,38 @@ Display usage information and exit.
 .BR \-! , " \-\-more-help"
 Pass the extended usage information through a pager.
 .TP
-.BR \-> " [IrcfileP]," " \-\-save-opts" "[=IrcfileP]"
-Save the option state to IrcfileP.  The default is the IlastP
-configuration file listed in the BOPTION PRESETSP section, below.
+.BR \-> " [\fIrcfile\fP]," " \-\-save-opts" "[=\fIrcfile\fP]"
+Save the option state to \fIrcfile\fP.  The default is the \fIlast\fP
+configuration file listed in the \fBOPTION PRESETS\fP section, below.
 .TP
-.BR \-< " IrcfileP," " \-\-load-opts" "=IrcfileP," " \-\-no-load-opts"
-Load options from IrcfileP.
-The Ino-load-optsP form will disable the loading
-of earlier RC/INI files.  I\-\-no-load-optsP is handled early,
+.BR \-< " \fIrcfile\fP," " \-\-load-opts" "=\fIrcfile\fP," " \-\-no-load-opts"
+Load options from \fIrcfile\fP.
+The \fIno-load-opts\fP form will disable the loading
+of earlier RC/INI files.  \fI\-\-no-load-opts\fP is handled early,
 out of order.
 .TP
-.BR \- " [{Iv|c|nP}]," " \-\-version" "[=I{v|c|n}P]"
+.BR \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
 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 Inot presettableP may be preset
+Any option that is not marked as \fInot presettable\fP may be preset
 by loading values from configuration ("RC" or ".INI") file(s) and values from
 environment variables named:
 .nf
-  BSNTP_P or BSNTPP
+  \fBSNTP_\fP or \fBSNTP\fP
 .fi
 .ad
 The environmental presets take precedence (are processed later than)
 the configuration files.
-The IhomercP files are "I$HOMEP", and "I.P".
-If any of these are directories, then the file I.ntprcP
+The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
+If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
 .SH USAGE
 .SH "ENVIRONMENT"
-See BOPTION PRESETSP for configuration environment variables.
+See \fBOPTION PRESETS\fP for configuration environment variables.
 .SH "FILES"
-See BOPTION PRESETSP for configuration files.
+See \fBOPTION PRESETS\fP for configuration files.
 .SH "EXIT STATUS"
 One of the following exit values will be returned:
 .TP
@@ -247,5 +247,5 @@ This program is released under the terms of the NTP license,  [] | --[@{=| @}] ]...
   Flg Arg Option-Name    Description
    -c Str certificate    certificate scheme
diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c
index a9fadff29..aa2ea9964 100644
--- a/util/ntp-keygen-opts.c
+++ b/util/ntp-keygen-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.c)
  *  
- *  It has been AutoGen-ed  August 30, 2012 at 11:41:30 PM by AutoGen 5.16.2
+ *  It has been AutoGen-ed  September  1, 2012 at 12:32:46 AM by AutoGen 5.16.2
  *  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[2322] =
-/*     0 */ "ntp-keygen (ntp) 4.2.7p296\n"
+/*     0 */ "ntp-keygen (ntp) 4.2.7p297\n"
             "Copyright (C) 1970-2012 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"
@@ -163,14 +163,14 @@ static char const ntp_keygen_opt_strs[2322] =
 /*  2100 */ "no-load-opts\0"
 /*  2113 */ "no\0"
 /*  2116 */ "NTP_KEYGEN\0"
-/*  2127 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p296\n"
+/*  2127 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p297\n"
             "USAGE:  %s [ - [] | --[{=| }] ]...\n\0"
 /*  2243 */ "$HOME\0"
 /*  2249 */ ".\0"
 /*  2251 */ ".ntprc\0"
 /*  2258 */ "http://bugs.ntp.org, bugs@ntp.org\0"
 /*  2292 */ "\n\n\0"
-/*  2295 */ "ntp-keygen (ntp) 4.2.7p296";
+/*  2295 */ "ntp-keygen (ntp) 4.2.7p297";
 
 /*
  *  certificate option description:
diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h
index 4296d9913..d737ea5f9 100644
--- a/util/ntp-keygen-opts.h
+++ b/util/ntp-keygen-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.h)
  *  
- *  It has been AutoGen-ed  August 30, 2012 at 11:41:30 PM by AutoGen 5.16.2
+ *  It has been AutoGen-ed  September  1, 2012 at 12:32:45 AM by AutoGen 5.16.2
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -92,8 +92,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    25
-#define NTP_KEYGEN_VERSION       "4.2.7p296"
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.7p296"
+#define NTP_KEYGEN_VERSION       "4.2.7p297"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.7p297"
 
 /*
  *  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 4206bc42b..38e8fe008 100644
--- a/util/ntp-keygen.1ntp-keygenman
+++ b/util/ntp-keygen.1ntp-keygenman
@@ -1,8 +1,8 @@
-.TH ntp-keygen 1ntp-keygenman "30 Aug 2012" "ntp (4.2.7p296)" "User Commands"
+.TH ntp-keygen 1ntp-keygenman "01 Sep 2012" "ntp (4.2.7p297)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  August 30, 2012 at 11:41:43 PM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  September  1, 2012 at 12:32:59 AM by AutoGen 5.16.2
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -11,14 +11,14 @@ ntp-keygen \- Create a NTP host key
 .SH SYNOPSIS
 .B ntp-keygen
 .\" Mixture of short (flag) options and long options
-.RB [ \-IflagP " [IvalueP]]... [" \-\-Iopt\-nameP " [[=| ]IvalueP]]..."
+.RB [ \-\fIflag\fP " [\fIvalue\fP]]... [" \-\-\fIopt\-name\fP " [[=| ]\fIvalue\fP]]..."
 .PP
 All arguments must be options.
 .PP
 .SH DESCRIPTION
 .SH "OPTIONS"
 .TP
-.BR \-c " IschemeP, " \-\-certificate "=" IschemeP
+.BR \-c " \fIscheme\fP, " \-\-certificate "=" \fIscheme\fP
 certificate scheme.
 .sp
 scheme is one of
@@ -29,7 +29,7 @@ Note that RSA schemes must be used with a RSA sign key and DSA
 schemes must be used with a DSA sign key.  The default without
 this option is RSA-MD5.
 .TP
-.BR \-C " IcipherP, " \-\-cipher "=" IcipherP
+.BR \-C " \fIcipher\fP, " \-\-cipher "=" \fIcipher\fP
 privatekey cipher.
 .sp
 Select the cipher which is used to encrypt the files containing
@@ -42,7 +42,7 @@ Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
 .TP
-.BR \-D " IstringP, " \-\-set\-debug\-level "=" IstringP
+.BR \-D " \fIstring\fP, " \-\-set\-debug\-level "=" \fIstring\fP
 Set the debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
@@ -70,7 +70,7 @@ generate IFF parameters.
 Generate parameters for the IFF identification scheme, obsoleting
 any that may exist.
 .TP
-.BR \-i " IgroupP, " \-\-ident "=" IgroupP
+.BR \-i " \fIgroup\fP, " \-\-ident "=" \fIgroup\fP
 set Autokey group name.
 .sp
 Set the optional Autokey group name to name.  This is used in
@@ -82,7 +82,7 @@ part of the self-signed host certificate's subject and issuer
 names in the form host@group and should match the 'crypto ident'
 or 'server ident' configuration in ntpd's configuration file.
 .TP
-.BR \-l " IlifetimeP, " \-\-lifetime "=" IlifetimeP
+.BR \-l " \fIlifetime\fP, " \-\-lifetime "=" \fIlifetime\fP
 set certificate lifetime.
 This option takes an integer number as its argument.
 .sp
@@ -93,10 +93,10 @@ generate MD5 keys.
 .sp
 Generate MD5 keys, obsoleting any that may exist.
 .TP
-.BR \-m " ImodulusP, " \-\-modulus "=" ImodulusP
+.BR \-m " \fImodulus\fP, " \-\-modulus "=" \fImodulus\fP
 modulus.
 This option takes an integer number as its argument.
-The value of ImodulusP is constrained to being:
+The value of \fImodulus\fP is constrained to being:
 .in +4
 .nf
 .na
@@ -112,25 +112,25 @@ generate PC private certificate.
 Generate a private certificate.  By default, the program generates
 public certificates.
 .TP
-.BR \-p " IpasswdP, " \-\-pvt\-passwd "=" IpasswdP
+.BR \-p " \fIpasswd\fP, " \-\-pvt\-passwd "=" \fIpasswd\fP
 output private password.
 .sp
 Encrypt generated files containing private data with the specified
 password and the cipher selected with \-C/--cipher.
 .TP
-.BR \-q " IpasswdP, " \-\-get\-pvt\-passwd "=" IpasswdP
+.BR \-q " \fIpasswd\fP, " \-\-get\-pvt\-passwd "=" \fIpasswd\fP
 input private password.
 .sp
 Set the password for reading files to the specified password.
 .TP
-.BR \-S " IsignP, " \-\-sign\-key "=" IsignP
+.BR \-S " \fIsign\fP, " \-\-sign\-key "=" \fIsign\fP
 generate sign key (RSA or DSA).
 .sp
 Generate a new sign key of the designated type, obsoleting any
 that may exist.  By default, the program uses the host key as the
 sign key.
 .TP
-.BR \-s " Ihost@groupP, " \-\-subject\-name "=" Ihost@groupP
+.BR \-s " \fIhost@group\fP, " \-\-subject\-name "=" \fIhost@group\fP
 set host and optionally group name.
 .sp
 Set the Autokey host name, and optionally, group name specified
@@ -150,14 +150,14 @@ trusted certificate (TC scheme).
 Generate a trusted certificate.  By default, the program generates
 a non-trusted certificate.
 .TP
-.BR \-V " InumP, " \-\-mv\-params "=" InumP
+.BR \-V " \fInum\fP, " \-\-mv\-params "=" \fInum\fP
 generate  MV parameters.
 This option takes an integer number as its argument.
 .sp
 Generate parameters and keys for the Mu-Varadharajan (MV)
 identification scheme.
 .TP
-.BR \-v " InumP, " \-\-mv\-keys "=" InumP
+.BR \-v " \fInum\fP, " \-\-mv\-keys "=" \fInum\fP
 update  MV keys.
 This option takes an integer number as its argument.
 .sp
@@ -169,38 +169,38 @@ Display usage information and exit.
 .BR \-! , " \-\-more-help"
 Pass the extended usage information through a pager.
 .TP
-.BR \-> " [IrcfileP]," " \-\-save-opts" "[=IrcfileP]"
-Save the option state to IrcfileP.  The default is the IlastP
-configuration file listed in the BOPTION PRESETSP section, below.
+.BR \-> " [\fIrcfile\fP]," " \-\-save-opts" "[=\fIrcfile\fP]"
+Save the option state to \fIrcfile\fP.  The default is the \fIlast\fP
+configuration file listed in the \fBOPTION PRESETS\fP section, below.
 .TP
-.BR \-< " IrcfileP," " \-\-load-opts" "=IrcfileP," " \-\-no-load-opts"
-Load options from IrcfileP.
-The Ino-load-optsP form will disable the loading
-of earlier RC/INI files.  I\-\-no-load-optsP is handled early,
+.BR \-< " \fIrcfile\fP," " \-\-load-opts" "=\fIrcfile\fP," " \-\-no-load-opts"
+Load options from \fIrcfile\fP.
+The \fIno-load-opts\fP form will disable the loading
+of earlier RC/INI files.  \fI\-\-no-load-opts\fP is handled early,
 out of order.
 .TP
-.BR \- " [{Iv|c|nP}]," " \-\-version" "[=I{v|c|n}P]"
+.BR \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
 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 Inot presettableP may be preset
+Any option that is not marked as \fInot presettable\fP may be preset
 by loading values from configuration ("RC" or ".INI") file(s) and values from
 environment variables named:
 .nf
-  BNTP_KEYGEN_P or BNTP_KEYGENP
+  \fBNTP_KEYGEN_\fP or \fBNTP_KEYGEN\fP
 .fi
 .ad
 The environmental presets take precedence (are processed later than)
 the configuration files.
-The IhomercP files are "I$HOMEP", and "I.P".
-If any of these are directories, then the file I.ntprcP
+The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
+If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
 .SH USAGE
 .SH "ENVIRONMENT"
-See BOPTION PRESETSP for configuration environment variables.
+See \fBOPTION PRESETS\fP for configuration environment variables.
 .SH "FILES"
-See BOPTION PRESETSP for configuration files.
+See \fBOPTION PRESETS\fP for configuration files.
 .SH "EXIT STATUS"
 One of the following exit values will be returned:
 .TP
@@ -225,5 +225,5 @@ This program is released under the terms of the NTP license,  " [IrcfileP]," " \-\-save-opts" "[=IrcfileP]"
-Save the option state to IrcfileP.  The default is the IlastP
-configuration file listed in the BOPTION PRESETSP section, below.
+.BR \-> " [\fIrcfile\fP]," " \-\-save-opts" "[=\fIrcfile\fP]"
+Save the option state to \fIrcfile\fP.  The default is the \fIlast\fP
+configuration file listed in the \fBOPTION PRESETS\fP section, below.
 .TP
-.BR \-< " IrcfileP," " \-\-load-opts" "=IrcfileP," " \-\-no-load-opts"
-Load options from IrcfileP.
-The Ino-load-optsP form will disable the loading
-of earlier RC/INI files.  I\-\-no-load-optsP is handled early,
+.BR \-< " \fIrcfile\fP," " \-\-load-opts" "=\fIrcfile\fP," " \-\-no-load-opts"
+Load options from \fIrcfile\fP.
+The \fIno-load-opts\fP form will disable the loading
+of earlier RC/INI files.  \fI\-\-no-load-opts\fP is handled early,
 out of order.
 .TP
-.BR \- " [{Iv|c|nP}]," " \-\-version" "[=I{v|c|n}P]"
+.BR \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
 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 Inot presettableP may be preset
+Any option that is not marked as \fInot presettable\fP may be preset
 by loading values from configuration ("RC" or ".INI") file(s) and values from
 environment variables named:
 .nf
-  BNTP_KEYGEN_P or BNTP_KEYGENP
+  \fBNTP_KEYGEN_\fP or \fBNTP_KEYGEN\fP
 .fi
 .ad
 The environmental presets take precedence (are processed later than)
 the configuration files.
-The IhomercP files are "I$HOMEP", and "I.P".
-If any of these are directories, then the file I.ntprcP
+The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
+If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
 .SH USAGE
 .SH "ENVIRONMENT"
-See BOPTION PRESETSP for configuration environment variables.
+See \fBOPTION PRESETS\fP for configuration environment variables.
 .SH "FILES"
-See BOPTION PRESETSP for configuration files.
+See \fBOPTION PRESETS\fP for configuration files.
 .SH "EXIT STATUS"
 One of the following exit values will be returned:
 .TP
@@ -225,5 +225,5 @@ This program is released under the terms of the NTP license,