Skip to content

Commit 2e719a1

Browse files
ntprelengntpreleng
committed
[Bug 3960] Remove duplicate ntp.conf.def content
bk: 6763f48aAk3SsgZ1MunzyjRNxG5aqg
1 parent fd370a8 commit 2e719a1

File tree

8 files changed

+18
-68
lines changed

8 files changed

+18
-68
lines changed

‎ChangeLog‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
---
2+
* [Bug 3960] Remove duplicate ntp.conf.def content, reported by
3+
Ulrich Windl. <stenn@ntp.org>
24
* Makefile.am: Fix distcheck problem with check-local. <stenn@ntp.org>
35
* Add .github to the top-level tree. <dlavigne@nwtime.org>
46
* build script: Use hostname.site for NTF build hosts. Use the full

‎ntpd/invoke-ntp.conf.texi‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#
77
# EDIT THIS FILE WITH CAUTION (invoke-ntp.conf.texi)
88
#
9-
# It has been AutoGen-ed May 25, 2024 at 12:03:56 AM by AutoGen 5.18.16
9+
# It has been AutoGen-ed December 18, 2024 at 02:16:41 PM by AutoGen 5.18.16
1010
# From the definitions ntp.conf.def
1111
# and the template file agtexi-file.tpl
1212
@end ignore
@@ -2995,21 +2995,14 @@ message is sent with a source address of the local interface the
29952995
message is sent through.
29962996
Note that on a multihomed host the
29972997
interface used may vary from time to time with routing changes.
2998-
@item @code{ttl} @kbd{hop} @kbd{...}
2999-
This command specifies a list of TTL values in increasing order.
3000-
Up to 8 values can be specified.
3001-
In
3002-
@code{manycast}
3003-
mode these values are used in-turn in an expanding-ring search.
3004-
The default is eight multiples of 32 starting at 31.
30052998

30062999
The trap receiver will generally log event messages and other
30073000
information from the server in a log file.
30083001
While such monitor
30093002
programs may also request their own trap dynamically, configuring a
30103003
trap receiver will ensure that no messages are lost when the server
30113004
is started.
3012-
@item @code{hop} @kbd{...}
3005+
@item @code{ttl} @kbd{hop} @kbd{...}
30133006
This command specifies a list of TTL values in increasing order, up to 8
30143007
values can be specified.
30153008
In manycast mode these values are used in turn in

‎ntpd/ntp.conf.5man‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
.ds B-Font B
1111
.ds I-Font I
1212
.ds R-Font R
13-
.TH ntp.conf 5man "25 May 2024" "4.2.8p18" "File Formats"
13+
.TH ntp.conf 5man "18 Dec 2024" "4.2.8p18" "File Formats"
1414
.\"
1515
.\" EDIT THIS FILE WITH CAUTION (in-mem file)
1616
.\"
17-
.\" It has been AutoGen-ed May 25, 2024 at 12:04:03 AM by AutoGen 5.18.16
17+
.\" It has been AutoGen-ed December 18, 2024 at 02:16:44 PM by AutoGen 5.18.16
1818
.\" From the definitions ntp.conf.def
1919
.\" and the template file agman-cmd.tpl
2020
.SH NAME
@@ -3344,14 +3344,6 @@ message is sent with a source address of the local interface the
33443344
message is sent through.
33453345
Note that on a multihomed host the
33463346
interface used may vary from time to time with routing changes.
3347-
.TP 7
3348-
.NOP \f\*[B-Font]ttl\f[] \f\*[I-Font]hop\f[] \f\*[I-Font]...\f[]
3349-
This command specifies a list of TTL values in increasing order.
3350-
Up to 8 values can be specified.
3351-
In
3352-
\f\*[B-Font]manycast\f[]
3353-
mode these values are used in-turn in an expanding-ring search.
3354-
The default is eight multiples of 32 starting at 31.
33553347
.sp \n(Ppu
33563348
.ne 2
33573349

@@ -3362,7 +3354,7 @@ programs may also request their own trap dynamically, configuring a
33623354
trap receiver will ensure that no messages are lost when the server
33633355
is started.
33643356
.TP 7
3365-
.NOP \f\*[B-Font]hop\f[] \f\*[I-Font]...\f[]
3357+
.NOP \f\*[B-Font]ttl\f[] \f\*[I-Font]hop\f[] \f\*[I-Font]...\f[]
33663358
This command specifies a list of TTL values in increasing order, up to 8
33673359
values can be specified.
33683360
In manycast mode these values are used in turn in

‎ntpd/ntp.conf.5mdoc‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
.Dd May 25 2024
1+
.Dd December 18 2024
22
.Dt NTP_CONF 5mdoc File Formats
33
.Os
44
.\" EDIT THIS FILE WITH CAUTION (ntp.mdoc)
55
.\"
6-
.\" It has been AutoGen-ed May 25, 2024 at 12:03:50 AM by AutoGen 5.18.16
6+
.\" It has been AutoGen-ed December 18, 2024 at 02:16:38 PM by AutoGen 5.18.16
77
.\" From the definitions ntp.conf.def
88
.\" and the template file agmdoc-cmd.tpl
99
.Sh NAME
@@ -3211,21 +3211,14 @@ message is sent with a source address of the local interface the
32113211
message is sent through.
32123212
Note that on a multihomed host the
32133213
interface used may vary from time to time with routing changes.
3214-
.It Cm ttl Ar hop ...
3215-
This command specifies a list of TTL values in increasing order.
3216-
Up to 8 values can be specified.
3217-
In
3218-
.Cm manycast
3219-
mode these values are used in\-turn in an expanding\-ring search.
3220-
The default is eight multiples of 32 starting at 31.
32213214
.Pp
32223215
The trap receiver will generally log event messages and other
32233216
information from the server in a log file.
32243217
While such monitor
32253218
programs may also request their own trap dynamically, configuring a
32263219
trap receiver will ensure that no messages are lost when the server
32273220
is started.
3228-
.It Cm hop Ar ...
3221+
.It Cm ttl Ar hop ...
32293222
This command specifies a list of TTL values in increasing order, up to 8
32303223
values can be specified.
32313224
In manycast mode these values are used in turn in

‎ntpd/ntp.conf.def‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3214,21 +3214,14 @@ message is sent with a source address of the local interface the
32143214
message is sent through.
32153215
Note that on a multihomed host the
32163216
interface used may vary from time to time with routing changes.
3217-
.It Cm ttl Ar hop ...
3218-
This command specifies a list of TTL values in increasing order.
3219-
Up to 8 values can be specified.
3220-
In
3221-
.Cm manycast
3222-
mode these values are used in-turn in an expanding-ring search.
3223-
The default is eight multiples of 32 starting at 31.
32243217
.Pp
32253218
The trap receiver will generally log event messages and other
32263219
information from the server in a log file.
32273220
While such monitor
32283221
programs may also request their own trap dynamically, configuring a
32293222
trap receiver will ensure that no messages are lost when the server
32303223
is started.
3231-
.It Cm hop Ar ...
3224+
.It Cm ttl Ar hop ...
32323225
This command specifies a list of TTL values in increasing order, up to 8
32333226
values can be specified.
32343227
In manycast mode these values are used in turn in

‎ntpd/ntp.conf.html‎

Lines changed: 1 addition & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ntpd/ntp.conf.man.in‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
.ds B-Font B
1111
.ds I-Font I
1212
.ds R-Font R
13-
.TH ntp.conf 5 "25 May 2024" "4.2.8p18" "File Formats"
13+
.TH ntp.conf 5 "18 Dec 2024" "4.2.8p18" "File Formats"
1414
.\"
1515
.\" EDIT THIS FILE WITH CAUTION (in-mem file)
1616
.\"
17-
.\" It has been AutoGen-ed May 25, 2024 at 12:04:03 AM by AutoGen 5.18.16
17+
.\" It has been AutoGen-ed December 18, 2024 at 02:16:44 PM by AutoGen 5.18.16
1818
.\" From the definitions ntp.conf.def
1919
.\" and the template file agman-cmd.tpl
2020
.SH NAME
@@ -3344,14 +3344,6 @@ message is sent with a source address of the local interface the
33443344
message is sent through.
33453345
Note that on a multihomed host the
33463346
interface used may vary from time to time with routing changes.
3347-
.TP 7
3348-
.NOP \f\*[B-Font]ttl\f[] \f\*[I-Font]hop\f[] \f\*[I-Font]...\f[]
3349-
This command specifies a list of TTL values in increasing order.
3350-
Up to 8 values can be specified.
3351-
In
3352-
\f\*[B-Font]manycast\f[]
3353-
mode these values are used in-turn in an expanding-ring search.
3354-
The default is eight multiples of 32 starting at 31.
33553347
.sp \n(Ppu
33563348
.ne 2
33573349

@@ -3362,7 +3354,7 @@ programs may also request their own trap dynamically, configuring a
33623354
trap receiver will ensure that no messages are lost when the server
33633355
is started.
33643356
.TP 7
3365-
.NOP \f\*[B-Font]hop\f[] \f\*[I-Font]...\f[]
3357+
.NOP \f\*[B-Font]ttl\f[] \f\*[I-Font]hop\f[] \f\*[I-Font]...\f[]
33663358
This command specifies a list of TTL values in increasing order, up to 8
33673359
values can be specified.
33683360
In manycast mode these values are used in turn in

‎ntpd/ntp.conf.mdoc.in‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
.Dd May 25 2024
1+
.Dd December 18 2024
22
.Dt NTP_CONF 5 File Formats
33
.Os
44
.\" EDIT THIS FILE WITH CAUTION (ntp.mdoc)
55
.\"
6-
.\" It has been AutoGen-ed May 25, 2024 at 12:03:50 AM by AutoGen 5.18.16
6+
.\" It has been AutoGen-ed December 18, 2024 at 02:16:38 PM by AutoGen 5.18.16
77
.\" From the definitions ntp.conf.def
88
.\" and the template file agmdoc-cmd.tpl
99
.Sh NAME
@@ -3211,21 +3211,14 @@ message is sent with a source address of the local interface the
32113211
message is sent through.
32123212
Note that on a multihomed host the
32133213
interface used may vary from time to time with routing changes.
3214-
.It Cm ttl Ar hop ...
3215-
This command specifies a list of TTL values in increasing order.
3216-
Up to 8 values can be specified.
3217-
In
3218-
.Cm manycast
3219-
mode these values are used in\-turn in an expanding\-ring search.
3220-
The default is eight multiples of 32 starting at 31.
32213214
.Pp
32223215
The trap receiver will generally log event messages and other
32233216
information from the server in a log file.
32243217
While such monitor
32253218
programs may also request their own trap dynamically, configuring a
32263219
trap receiver will ensure that no messages are lost when the server
32273220
is started.
3228-
.It Cm hop Ar ...
3221+
.It Cm ttl Ar hop ...
32293222
This command specifies a list of TTL values in increasing order, up to 8
32303223
values can be specified.
32313224
In manycast mode these values are used in turn in

0 commit comments

Comments
 (0)