From: NTP Release Engineering Date: Thu, 19 Dec 2024 10:25:14 +0000 (-0800) Subject: [Bug 3960] Remove duplicate ntp.conf.def content X-Git-Tag: NTP_4_3_107~5^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30d50f7c01eba76db9f1870c044846b0ff26adac;p=thirdparty%2Fntp.git [Bug 3960] Remove duplicate ntp.conf.def content bk: 6763f48aAk3SsgZ1MunzyjRNxG5aqg --- diff --git a/ChangeLog b/ChangeLog index daa090883..ac5c8fb7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ --- +* [Bug 3960] Remove duplicate ntp.conf.def content, reported by + Ulrich Windl. * Makefile.am: Fix distcheck problem with check-local. * Add .github to the top-level tree. * build script: Use hostname.site for NTF build hosts. Use the full diff --git a/ntpd/invoke-ntp.conf.texi b/ntpd/invoke-ntp.conf.texi index 1f232a313..80847a48b 100644 --- a/ntpd/invoke-ntp.conf.texi +++ b/ntpd/invoke-ntp.conf.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntp.conf.texi) # -# It has been AutoGen-ed May 25, 2024 at 12:03:56 AM by AutoGen 5.18.16 +# It has been AutoGen-ed December 18, 2024 at 02:16:41 PM by AutoGen 5.18.16 # From the definitions ntp.conf.def # and the template file agtexi-file.tpl @end ignore @@ -2995,13 +2995,6 @@ message is sent with a source address of the local interface the message is sent through. Note that on a multihomed host the interface used may vary from time to time with routing changes. -@item @code{ttl} @kbd{hop} @kbd{...} -This command specifies a list of TTL values in increasing order. -Up to 8 values can be specified. -In -@code{manycast} -mode these values are used in-turn in an expanding-ring search. -The default is eight multiples of 32 starting at 31. The trap receiver will generally log event messages and other information from the server in a log file. @@ -3009,7 +3002,7 @@ While such monitor programs may also request their own trap dynamically, configuring a trap receiver will ensure that no messages are lost when the server is started. -@item @code{hop} @kbd{...} +@item @code{ttl} @kbd{hop} @kbd{...} This command specifies a list of TTL values in increasing order, up to 8 values can be specified. In manycast mode these values are used in turn in diff --git a/ntpd/ntp.conf.5man b/ntpd/ntp.conf.5man index d5a82190c..9c37078e8 100644 --- a/ntpd/ntp.conf.5man +++ b/ntpd/ntp.conf.5man @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntp.conf 5man "25 May 2024" "4.2.8p18" "File Formats" +.TH ntp.conf 5man "18 Dec 2024" "4.2.8p18" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed May 25, 2024 at 12:04:03 AM by AutoGen 5.18.16 +.\" It has been AutoGen-ed December 18, 2024 at 02:16:44 PM by AutoGen 5.18.16 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME @@ -3344,14 +3344,6 @@ message is sent with a source address of the local interface the message is sent through. Note that on a multihomed host the interface used may vary from time to time with routing changes. -.TP 7 -.NOP \f\*[B-Font]ttl\f[] \f\*[I-Font]hop\f[] \f\*[I-Font]...\f[] -This command specifies a list of TTL values in increasing order. -Up to 8 values can be specified. -In -\f\*[B-Font]manycast\f[] -mode these values are used in-turn in an expanding-ring search. -The default is eight multiples of 32 starting at 31. .sp \n(Ppu .ne 2 @@ -3362,7 +3354,7 @@ programs may also request their own trap dynamically, configuring a trap receiver will ensure that no messages are lost when the server is started. .TP 7 -.NOP \f\*[B-Font]hop\f[] \f\*[I-Font]...\f[] +.NOP \f\*[B-Font]ttl\f[] \f\*[I-Font]hop\f[] \f\*[I-Font]...\f[] This command specifies a list of TTL values in increasing order, up to 8 values can be specified. In manycast mode these values are used in turn in diff --git a/ntpd/ntp.conf.5mdoc b/ntpd/ntp.conf.5mdoc index b950e92cd..23bedcfca 100644 --- a/ntpd/ntp.conf.5mdoc +++ b/ntpd/ntp.conf.5mdoc @@ -1,9 +1,9 @@ -.Dd May 25 2024 +.Dd December 18 2024 .Dt NTP_CONF 5mdoc File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed May 25, 2024 at 12:03:50 AM by AutoGen 5.18.16 +.\" It has been AutoGen-ed December 18, 2024 at 02:16:38 PM by AutoGen 5.18.16 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -3211,13 +3211,6 @@ message is sent with a source address of the local interface the message is sent through. Note that on a multihomed host the interface used may vary from time to time with routing changes. -.It Cm ttl Ar hop ... -This command specifies a list of TTL values in increasing order. -Up to 8 values can be specified. -In -.Cm manycast -mode these values are used in\-turn in an expanding\-ring search. -The default is eight multiples of 32 starting at 31. .Pp The trap receiver will generally log event messages and other information from the server in a log file. @@ -3225,7 +3218,7 @@ While such monitor programs may also request their own trap dynamically, configuring a trap receiver will ensure that no messages are lost when the server is started. -.It Cm hop Ar ... +.It Cm ttl Ar hop ... This command specifies a list of TTL values in increasing order, up to 8 values can be specified. In manycast mode these values are used in turn in diff --git a/ntpd/ntp.conf.def b/ntpd/ntp.conf.def index 444e3b35e..d00d300a3 100644 --- a/ntpd/ntp.conf.def +++ b/ntpd/ntp.conf.def @@ -3214,13 +3214,6 @@ message is sent with a source address of the local interface the message is sent through. Note that on a multihomed host the interface used may vary from time to time with routing changes. -.It Cm ttl Ar hop ... -This command specifies a list of TTL values in increasing order. -Up to 8 values can be specified. -In -.Cm manycast -mode these values are used in-turn in an expanding-ring search. -The default is eight multiples of 32 starting at 31. .Pp The trap receiver will generally log event messages and other information from the server in a log file. @@ -3228,7 +3221,7 @@ While such monitor programs may also request their own trap dynamically, configuring a trap receiver will ensure that no messages are lost when the server is started. -.It Cm hop Ar ... +.It Cm ttl Ar hop ... This command specifies a list of TTL values in increasing order, up to 8 values can be specified. In manycast mode these values are used in turn in diff --git a/ntpd/ntp.conf.html b/ntpd/ntp.conf.html index ea82c6783..0f92ba64e 100644 --- a/ntpd/ntp.conf.html +++ b/ntpd/ntp.conf.html @@ -3282,14 +3282,6 @@ message is sent with a source address of the local interface the message is sent through. Note that on a multihomed host the interface used may vary from time to time with routing changes. -

-
ttl hop ...
-

This command specifies a list of TTL values in increasing order. -Up to 8 values can be specified. -In -manycast -mode these values are used in-turn in an expanding-ring search. -The default is eight multiples of 32 starting at 31.

The trap receiver will generally log event messages and other information from the server in a log file. @@ -3298,7 +3290,7 @@ programs may also request their own trap dynamically, configuring a trap receiver will ensure that no messages are lost when the server is started.

-
hop ...
+
ttl hop ...

This command specifies a list of TTL values in increasing order, up to 8 values can be specified. In manycast mode these values are used in turn in diff --git a/ntpd/ntp.conf.man.in b/ntpd/ntp.conf.man.in index 175fcb8ab..8404bacb1 100644 --- a/ntpd/ntp.conf.man.in +++ b/ntpd/ntp.conf.man.in @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntp.conf 5 "25 May 2024" "4.2.8p18" "File Formats" +.TH ntp.conf 5 "18 Dec 2024" "4.2.8p18" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed May 25, 2024 at 12:04:03 AM by AutoGen 5.18.16 +.\" It has been AutoGen-ed December 18, 2024 at 02:16:44 PM by AutoGen 5.18.16 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME @@ -3344,14 +3344,6 @@ message is sent with a source address of the local interface the message is sent through. Note that on a multihomed host the interface used may vary from time to time with routing changes. -.TP 7 -.NOP \f\*[B-Font]ttl\f[] \f\*[I-Font]hop\f[] \f\*[I-Font]...\f[] -This command specifies a list of TTL values in increasing order. -Up to 8 values can be specified. -In -\f\*[B-Font]manycast\f[] -mode these values are used in-turn in an expanding-ring search. -The default is eight multiples of 32 starting at 31. .sp \n(Ppu .ne 2 @@ -3362,7 +3354,7 @@ programs may also request their own trap dynamically, configuring a trap receiver will ensure that no messages are lost when the server is started. .TP 7 -.NOP \f\*[B-Font]hop\f[] \f\*[I-Font]...\f[] +.NOP \f\*[B-Font]ttl\f[] \f\*[I-Font]hop\f[] \f\*[I-Font]...\f[] This command specifies a list of TTL values in increasing order, up to 8 values can be specified. In manycast mode these values are used in turn in diff --git a/ntpd/ntp.conf.mdoc.in b/ntpd/ntp.conf.mdoc.in index 70f908025..95dffaaf9 100644 --- a/ntpd/ntp.conf.mdoc.in +++ b/ntpd/ntp.conf.mdoc.in @@ -1,9 +1,9 @@ -.Dd May 25 2024 +.Dd December 18 2024 .Dt NTP_CONF 5 File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed May 25, 2024 at 12:03:50 AM by AutoGen 5.18.16 +.\" It has been AutoGen-ed December 18, 2024 at 02:16:38 PM by AutoGen 5.18.16 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -3211,13 +3211,6 @@ message is sent with a source address of the local interface the message is sent through. Note that on a multihomed host the interface used may vary from time to time with routing changes. -.It Cm ttl Ar hop ... -This command specifies a list of TTL values in increasing order. -Up to 8 values can be specified. -In -.Cm manycast -mode these values are used in\-turn in an expanding\-ring search. -The default is eight multiples of 32 starting at 31. .Pp The trap receiver will generally log event messages and other information from the server in a log file. @@ -3225,7 +3218,7 @@ While such monitor programs may also request their own trap dynamically, configuring a trap receiver will ensure that no messages are lost when the server is started. -.It Cm hop Ar ... +.It Cm ttl Ar hop ... This command specifies a list of TTL values in increasing order, up to 8 values can be specified. In manycast mode these values are used in turn in