From: Harlan Stenn Date: Sun, 18 Oct 2009 10:46:43 +0000 (-0400) Subject: NTP_4_2_5P235_RC X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f9f73c2cec459f594607d69c0cd7cf8a2c73e5a;p=thirdparty%2Fntp.git NTP_4_2_5P235_RC bk: 4adaf213jTWX_7otmAVV1qHJQ2iznw --- diff --git a/ChangeLog b/ChangeLog index 4fa396f90c..9a62b14a67 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.2.5p235-RC) 2009/10/18 Released by Harlan Stenn * [Bug 1343] lib/isc build breaks on systems without IPv6 headers. (4.2.5p234-RC) 2009/10/16 Released by Harlan Stenn * [Bug 1339] redux, use unmodified lib/isc/win32/strerror.c and diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index 291314107d..b119957392 100644 --- a/ntpd/ntpd-opts.c +++ b/ntpd/ntpd-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.c) * - * It has been AutoGen-ed October 16, 2009 at 06:37:30 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed October 18, 2009 at 06:37:04 AM by AutoGen 5.9.9pre5 * From the definitions ntpd-opts.def * and the template file options * @@ -949,7 +949,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPD"; tSCC zUsageTitle[] = -"ntpd - NTP daemon program - Ver. 4.2.5p234-RC\n\ +"ntpd - NTP daemon program - Ver. 4.2.5p235-RC\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; #define zRcName NULL #define apzHomeList NULL diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index f60515bce6..689ae8e688 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 October 16, 2009 at 06:37:28 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed October 18, 2009 at 06:37:03 AM by AutoGen 5.9.9pre5 * From the definitions ntpd-opts.def * and the template file options * @@ -90,8 +90,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 35 -#define NTPD_VERSION "4.2.5p234-RC" -#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.5p234-RC" +#define NTPD_VERSION "4.2.5p235-RC" +#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.5p235-RC" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi index c4bd67c0c6..a4bba601e3 100644 --- a/ntpd/ntpd-opts.texi +++ b/ntpd/ntpd-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (ntpd-opts.texi) # -# It has been AutoGen-ed October 16, 2009 at 06:37:33 AM by AutoGen 5.9.9pre5 +# It has been AutoGen-ed October 18, 2009 at 06:37:06 AM by AutoGen 5.9.9pre5 # From the definitions ntpd-opts.def # and the template file aginfo.tpl @end ignore diff --git a/ntpd/ntpd.1 b/ntpd/ntpd.1 index 97fad3e04c..0cb8043f04 100644 --- a/ntpd/ntpd.1 +++ b/ntpd/ntpd.1 @@ -1,7 +1,7 @@ -.TH NTPD 1 2009-10-16 "( 4.2.5p234-RC)" "Programmer's Manual" +.TH NTPD 1 2009-10-18 "( 4.2.5p235-RC)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpd.1) .\" -.\" It has been AutoGen-ed October 16, 2009 at 06:37:32 AM by AutoGen 5.9.9pre5 +.\" It has been AutoGen-ed October 18, 2009 at 06:37:05 AM by AutoGen 5.9.9pre5 .\" From the definitions ntpd-opts.def .\" and the template file agman1.tpl .\" diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c index 430d5097d1..5f70fd692c 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 October 16, 2009 at 06:39:52 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed October 18, 2009 at 06:39:04 AM by AutoGen 5.9.9pre5 * From the definitions ntpdc-opts.def * and the template file options * @@ -437,7 +437,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPDC"; tSCC zUsageTitle[] = -"ntpdc - vendor-specific NTP query program - Ver. 4.2.5p234-RC\n\ +"ntpdc - vendor-specific NTP query program - Ver. 4.2.5p235-RC\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index ded1067558..7fb4cadef4 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 October 16, 2009 at 06:39:51 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed October 18, 2009 at 06:39:04 AM by AutoGen 5.9.9pre5 * From the definitions ntpdc-opts.def * and the template file options * @@ -70,8 +70,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 15 -#define NTPDC_VERSION "4.2.5p234-RC" -#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.5p234-RC" +#define NTPDC_VERSION "4.2.5p235-RC" +#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.5p235-RC" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi index 03944871c0..e0a51d56e3 100644 --- a/ntpdc/ntpdc-opts.texi +++ b/ntpdc/ntpdc-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (ntpdc-opts.texi) # -# It has been AutoGen-ed October 16, 2009 at 06:39:54 AM by AutoGen 5.9.9pre5 +# It has been AutoGen-ed October 18, 2009 at 06:39:06 AM by AutoGen 5.9.9pre5 # From the definitions ntpdc-opts.def # and the template file aginfo.tpl @end ignore diff --git a/ntpdc/ntpdc.1 b/ntpdc/ntpdc.1 index a709e626e0..9b8c1fd1ef 100644 --- a/ntpdc/ntpdc.1 +++ b/ntpdc/ntpdc.1 @@ -1,7 +1,7 @@ -.TH NTPDC 1 2009-10-16 "( 4.2.5p234-RC)" "Programmer's Manual" +.TH NTPDC 1 2009-10-18 "( 4.2.5p235-RC)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpdc.1) .\" -.\" It has been AutoGen-ed October 16, 2009 at 06:39:53 AM by AutoGen 5.9.9pre5 +.\" It has been AutoGen-ed October 18, 2009 at 06:39:05 AM by AutoGen 5.9.9pre5 .\" From the definitions ntpdc-opts.def .\" and the template file agman1.tpl .\" diff --git a/ntpq/ntpq-opts.c b/ntpq/ntpq-opts.c index 05359c5109..98484127fa 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 October 16, 2009 at 06:40:34 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed October 18, 2009 at 06:39:36 AM by AutoGen 5.9.9pre5 * From the definitions ntpq-opts.def * and the template file options * @@ -420,7 +420,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPQ"; tSCC zUsageTitle[] = -"ntpq - standard NTP query program - Ver. 4.2.5p234-RC\n\ +"ntpq - standard NTP query program - Ver. 4.2.5p235-RC\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h index 3a3223ec59..1842fe6d81 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 October 16, 2009 at 06:40:33 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed October 18, 2009 at 06:39:36 AM by AutoGen 5.9.9pre5 * From the definitions ntpq-opts.def * and the template file options * @@ -69,8 +69,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 14 -#define NTPQ_VERSION "4.2.5p234-RC" -#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.5p234-RC" +#define NTPQ_VERSION "4.2.5p235-RC" +#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.5p235-RC" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi index 77683cf113..ae10dbf1c6 100644 --- a/ntpq/ntpq-opts.texi +++ b/ntpq/ntpq-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (ntpq-opts.texi) # -# It has been AutoGen-ed October 16, 2009 at 06:40:37 AM by AutoGen 5.9.9pre5 +# It has been AutoGen-ed October 18, 2009 at 06:39:39 AM by AutoGen 5.9.9pre5 # From the definitions ntpq-opts.def # and the template file aginfo.tpl @end ignore diff --git a/ntpq/ntpq.1 b/ntpq/ntpq.1 index 6194b0b435..0c267b5210 100644 --- a/ntpq/ntpq.1 +++ b/ntpq/ntpq.1 @@ -1,7 +1,7 @@ -.TH NTPQ 1 2009-10-16 "( 4.2.5p234-RC)" "Programmer's Manual" +.TH NTPQ 1 2009-10-18 "( 4.2.5p235-RC)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpq.1) .\" -.\" It has been AutoGen-ed October 16, 2009 at 06:40:36 AM by AutoGen 5.9.9pre5 +.\" It has been AutoGen-ed October 18, 2009 at 06:39:38 AM by AutoGen 5.9.9pre5 .\" From the definitions ntpq-opts.def .\" and the template file agman1.tpl .\" diff --git a/ntpsnmpd/ntpsnmpd-opts.c b/ntpsnmpd/ntpsnmpd-opts.c index cfef9d6e37..66a687712b 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 October 16, 2009 at 06:41:10 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed October 18, 2009 at 06:40:08 AM by AutoGen 5.9.9pre5 * From the definitions ntpsnmpd-opts.def * and the template file options * @@ -226,7 +226,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPSNMPD"; tSCC zUsageTitle[] = -"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p234-RC\n\ +"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p235-RC\n\ USAGE: %s [ - | -- ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h index b11c184fed..377337d3df 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 October 16, 2009 at 06:41:10 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed October 18, 2009 at 06:40:07 AM by AutoGen 5.9.9pre5 * From the definitions ntpsnmpd-opts.def * and the template file options * @@ -62,8 +62,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 7 -#define NTPSNMPD_VERSION "4.2.5p234-RC" -#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p234-RC" +#define NTPSNMPD_VERSION "4.2.5p235-RC" +#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p235-RC" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpsnmpd/ntpsnmpd-opts.texi b/ntpsnmpd/ntpsnmpd-opts.texi index ffd302741f..0e7bf6ed4e 100644 --- a/ntpsnmpd/ntpsnmpd-opts.texi +++ b/ntpsnmpd/ntpsnmpd-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.texi) # -# It has been AutoGen-ed October 16, 2009 at 06:41:12 AM by AutoGen 5.9.9pre5 +# It has been AutoGen-ed October 18, 2009 at 06:40:10 AM by AutoGen 5.9.9pre5 # From the definitions ntpsnmpd-opts.def # and the template file aginfo.tpl @end ignore diff --git a/ntpsnmpd/ntpsnmpd.1 b/ntpsnmpd/ntpsnmpd.1 index fbea219a32..af5cfe1f95 100644 --- a/ntpsnmpd/ntpsnmpd.1 +++ b/ntpsnmpd/ntpsnmpd.1 @@ -1,7 +1,7 @@ -.TH NTPSNMPD 1 2009-10-16 "( 4.2.5p234-RC)" "Programmer's Manual" +.TH NTPSNMPD 1 2009-10-18 "( 4.2.5p235-RC)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpsnmpd.1) .\" -.\" It has been AutoGen-ed October 16, 2009 at 06:41:12 AM by AutoGen 5.9.9pre5 +.\" It has been AutoGen-ed October 18, 2009 at 06:40:09 AM by AutoGen 5.9.9pre5 .\" From the definitions ntpsnmpd-opts.def .\" and the template file agman1.tpl .\" diff --git a/packageinfo.sh b/packageinfo.sh index 1fb04b0a5f..34befa9782 100644 --- a/packageinfo.sh +++ b/packageinfo.sh @@ -9,7 +9,7 @@ version=${proto}.${major}.${minor} # - Numeric values increment # - empty 'increments' to 1 # - NEW 'increments' to empty -point=234 +point=235 # Special. Normally unused. A suffix. #special=ag special= diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c index 02c614351d..5ba435346f 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 October 16, 2009 at 06:46:59 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed October 18, 2009 at 06:45:12 AM by AutoGen 5.9.9pre5 * From the definitions sntp-opts.def * and the template file options * @@ -458,7 +458,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "SNTP"; tSCC zUsageTitle[] = -"sntp - standard SNTP program - Ver. 4.2.5p234-RC\n\ +"sntp - standard SNTP program - Ver. 4.2.5p235-RC\n\ USAGE: %s [ - [] | --[{=| }] ]... ...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h index 85d0809417..8dd1d8b400 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 October 16, 2009 at 06:46:58 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed October 18, 2009 at 06:45:11 AM by AutoGen 5.9.9pre5 * From the definitions sntp-opts.def * and the template file options * @@ -72,8 +72,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 17 -#define SNTP_VERSION "4.2.5p234-RC" -#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.5p234-RC" +#define SNTP_VERSION "4.2.5p235-RC" +#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.5p235-RC" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi index eec772a52e..498c591654 100644 --- a/sntp/sntp-opts.texi +++ b/sntp/sntp-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (sntp-opts.texi) # -# It has been AutoGen-ed October 16, 2009 at 06:47:02 AM by AutoGen 5.9.9pre5 +# It has been AutoGen-ed October 18, 2009 at 06:45:15 AM by AutoGen 5.9.9pre5 # From the definitions sntp-opts.def # and the template file aginfo.tpl @end ignore diff --git a/sntp/sntp.1 b/sntp/sntp.1 index 43ca872ef1..7932d1e1e1 100644 --- a/sntp/sntp.1 +++ b/sntp/sntp.1 @@ -1,7 +1,7 @@ -.TH SNTP 1 2009-10-16 "( 4.2.5p234-RC)" "Programmer's Manual" +.TH SNTP 1 2009-10-18 "( 4.2.5p235-RC)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (sntp.1) .\" -.\" It has been AutoGen-ed October 16, 2009 at 06:47:01 AM by AutoGen 5.9.9pre5 +.\" It has been AutoGen-ed October 18, 2009 at 06:45:14 AM by AutoGen 5.9.9pre5 .\" From the definitions sntp-opts.def .\" and the template file agman1.tpl .\" diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c index c1b028ab32..974343eca9 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 October 16, 2009 at 06:47:28 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed October 18, 2009 at 06:45:37 AM by AutoGen 5.9.9pre5 * From the definitions ntp-keygen-opts.def * and the template file options * @@ -746,7 +746,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTP_KEYGEN"; tSCC zUsageTitle[] = -"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p234-RC\n\ +"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p235-RC\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h index 9184371d3a..987f8dc1bf 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 October 16, 2009 at 06:47:27 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed October 18, 2009 at 06:45:36 AM by AutoGen 5.9.9pre5 * From the definitions ntp-keygen-opts.def * and the template file options * @@ -78,8 +78,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 23 -#define NTP_KEYGEN_VERSION "4.2.5p234-RC" -#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p234-RC" +#define NTP_KEYGEN_VERSION "4.2.5p235-RC" +#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p235-RC" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/util/ntp-keygen-opts.texi b/util/ntp-keygen-opts.texi index 65229b4506..3297eb68da 100644 --- a/util/ntp-keygen-opts.texi +++ b/util/ntp-keygen-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (ntp-keygen-opts.texi) # -# It has been AutoGen-ed October 16, 2009 at 06:47:30 AM by AutoGen 5.9.9pre5 +# It has been AutoGen-ed October 18, 2009 at 06:45:39 AM by AutoGen 5.9.9pre5 # From the definitions ntp-keygen-opts.def # and the template file aginfo.tpl @end ignore diff --git a/util/ntp-keygen.1 b/util/ntp-keygen.1 index 3a91b66f12..dac6451dd8 100644 --- a/util/ntp-keygen.1 +++ b/util/ntp-keygen.1 @@ -1,7 +1,7 @@ -.TH NTP-KEYGEN 1 2009-10-16 "(ntp 4.2.5p234-RC)" "Programmer's Manual" +.TH NTP-KEYGEN 1 2009-10-18 "(ntp 4.2.5p235-RC)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntp-keygen.1) .\" -.\" It has been AutoGen-ed October 16, 2009 at 06:47:29 AM by AutoGen 5.9.9pre5 +.\" It has been AutoGen-ed October 18, 2009 at 06:45:38 AM by AutoGen 5.9.9pre5 .\" From the definitions ntp-keygen-opts.def .\" and the template file agman1.tpl .\"