[Bug 2842] Glitch in ntp.conf.def documentation stanza

bk: 5570a97cM74MwNC6M89_8anJje3Dcg

diff --git a/ChangeLog b/ChangeLog
index 9b1cc82570926fead351e4be41990535239b1b6e..88c633d48352dea66675188273a5cde38dd43243 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
 * [Bug 2832] refclock_jjy.c supports the TDC-300.
 * [Bug 2834] Correct a broken html tag in html/refclock.html
 * [Bug 2837] Allow a configurable DSCP value.
+* [Bug 2842] Glitch in ntp.conf.def documentation stanza.
 * Report select() debug messages at debug level 3 now.
 ---
 (4.2.8p3-RC1) 2015/05/12 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/ntpd/invoke-ntp.conf.texi b/ntpd/invoke-ntp.conf.texi
index bfeb36715ffc09989f9bb08ee69ac5a5c206d65d..78bc21dcdd512588121615555a41aca68c542912 100644 (file)
--- 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 12, 2015 at 04:31:59 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  June  4, 2015 at 06:56:34 PM by AutoGen 5.18.5
 # From the definitions    ntp.conf.def
 # and the template file   agtexi-file.tpl
 @end ignore
@@ -2570,11 +2570,11 @@ option).
 The default is 32 megabytes. Setting this to zero will prevent any attemp to lock memory.
 @item @code{stacksize} @kbd{N4kPages}
 Specifies the maximum size of the process stack on systems with the
-@item @code{filenum} @kbd{Nfiledescriptors}
-Specifies the maximum number of file descriptors ntpd may have open at once. Defaults to the system default.
 @code{mlockall()}
 function.
 Defaults to 50 4k pages (200 4k pages in OpenBSD).
+@item @code{filenum} @kbd{Nfiledescriptors}
+Specifies the maximum number of file descriptors ntpd may have open at once. Defaults to the system default.
 @end table
 @item @code{trap} @kbd{host_address} @code{[@code{port} @kbd{port_number}]} @code{[@code{interface} @kbd{interface_address}]}
 This command configures a trap receiver at the given host

diff --git a/ntpd/ntp.conf.5man b/ntpd/ntp.conf.5man
index eb3c0ac6b4d81395c6473500554c670208643573..b05b9e2211c4d7c8cce978515e12a8a4be3b4603 100644 (file)
--- 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 "12 May 2015" "4.2.8p3-RC1" "File Formats"
+.TH ntp.conf 5man "04 Jun 2015" "4.2.8p3-RC1" "File Formats"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-e5aaSS/ag-y5a4QS)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed May 12, 2015 at 04:31:38 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed June 4, 2015 at 06:56:37 PM by AutoGen 5.18.5
 .\" From the definitions ntp.conf.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -2888,12 +2888,12 @@ The default is 32 megabytes. Setting this to zero will prevent any attemp to loc
 .TP 7
 .NOP \f\*[B-Font]stacksize\f[] \f\*[I-Font]N4kPages\f[]
 Specifies the maximum size of the process stack on systems with the
-.TP 7
-.NOP \f\*[B-Font]filenum\f[] \f\*[I-Font]Nfiledescriptors\f[]
-Specifies the maximum number of file descriptors ntpd may have open at once. Defaults to the system default.
 \fBmlockall\fR()\f[]
 function.
 Defaults to 50 4k pages (200 4k pages in OpenBSD).
+.TP 7
+.NOP \f\*[B-Font]filenum\f[] \f\*[I-Font]Nfiledescriptors\f[]
+Specifies the maximum number of file descriptors ntpd may have open at once. Defaults to the system default.
 .RE
 .TP 7
 .NOP \f\*[B-Font]trap\f[] \f\*[I-Font]host_address\f[] [\f\*[B-Font]port\f[] \f\*[I-Font]port_number\f[]] [\f\*[B-Font]interface\f[] \f\*[I-Font]interface_address\f[]]

diff --git a/ntpd/ntp.conf.5mdoc b/ntpd/ntp.conf.5mdoc
index 1ae85c72eb86c47a1ea6a1680c860b111b7f733e..1f0f254fb44a966d5255e0d67f8ef65ff17d3cfb 100644 (file)
--- a/ntpd/ntp.conf.5mdoc
+++ b/ntpd/ntp.conf.5mdoc
@@ -1,9 +1,9 @@
-.Dd May 12 2015
+.Dd June 4 2015
 .Dt NTP_CONF 5mdoc File Formats
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntp.mdoc)
 .\"
-.\"  It has been AutoGen-ed  May 12, 2015 at 04:32:08 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  4, 2015 at 06:56:27 PM by AutoGen 5.18.5
 .\"  From the definitions    ntp.conf.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -2717,11 +2717,11 @@ option).
 The default is 32 megabytes. Setting this to zero will prevent any attemp to lock memory.
 .It Cm stacksize Ar N4kPages
 Specifies the maximum size of the process stack on systems with the
-.It Cm filenum Ar Nfiledescriptors
-Specifies the maximum number of file descriptors ntpd may have open at once. Defaults to the system default.
 .Fn mlockall
 function.
 Defaults to 50 4k pages (200 4k pages in OpenBSD).
+.It Cm filenum Ar Nfiledescriptors
+Specifies the maximum number of file descriptors ntpd may have open at once. Defaults to the system default.
 .El
 .It Xo Ic trap Ar host_address
 .Op Cm port Ar port_number

diff --git a/ntpd/ntp.conf.def b/ntpd/ntp.conf.def
index e5c44b7565c77ee7251567cfd95abfa6a81670e4..eb3d273705b17db0b1236d743508a75a3a21e57a 100644 (file)
--- a/ntpd/ntp.conf.def
+++ b/ntpd/ntp.conf.def
@@ -2719,11 +2719,11 @@ option).
 The default is 32 megabytes. Setting this to zero will prevent any attemp to lock memory.
 .It Cm stacksize Ar N4kPages
 Specifies the maximum size of the process stack on systems with the
-.It Cm filenum Ar Nfiledescriptors
-Specifies the maximum number of file descriptors ntpd may have open at once. Defaults to the system default.
 .Fn mlockall
 function.
 Defaults to 50 4k pages (200 4k pages in OpenBSD).
+.It Cm filenum Ar Nfiledescriptors
+Specifies the maximum number of file descriptors ntpd may have open at once. Defaults to the system default.
 .El
 .It Xo Ic trap Ar host_address
 .Op Cm port Ar port_number

diff --git a/ntpd/ntp.conf.man.in b/ntpd/ntp.conf.man.in
index c5496a598b3a0841d3eaaa6fc8796b1127fe0dd4..04994eb3de6758f5bda09d9f0de40e4adbb70aab 100644 (file)
--- 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 "12 May 2015" "4.2.8p3-RC1" "File Formats"
+.TH ntp.conf 5 "04 Jun 2015" "4.2.8p3-RC1" "File Formats"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-e5aaSS/ag-y5a4QS)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed May 12, 2015 at 04:31:38 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed June 4, 2015 at 06:56:37 PM by AutoGen 5.18.5
 .\" From the definitions ntp.conf.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -2888,12 +2888,12 @@ The default is 32 megabytes. Setting this to zero will prevent any attemp to loc
 .TP 7
 .NOP \f\*[B-Font]stacksize\f[] \f\*[I-Font]N4kPages\f[]
 Specifies the maximum size of the process stack on systems with the
-.TP 7
-.NOP \f\*[B-Font]filenum\f[] \f\*[I-Font]Nfiledescriptors\f[]
-Specifies the maximum number of file descriptors ntpd may have open at once. Defaults to the system default.
 \fBmlockall\fR()\f[]
 function.
 Defaults to 50 4k pages (200 4k pages in OpenBSD).
+.TP 7
+.NOP \f\*[B-Font]filenum\f[] \f\*[I-Font]Nfiledescriptors\f[]
+Specifies the maximum number of file descriptors ntpd may have open at once. Defaults to the system default.
 .RE
 .TP 7
 .NOP \f\*[B-Font]trap\f[] \f\*[I-Font]host_address\f[] [\f\*[B-Font]port\f[] \f\*[I-Font]port_number\f[]] [\f\*[B-Font]interface\f[] \f\*[I-Font]interface_address\f[]]

diff --git a/ntpd/ntp.conf.mdoc.in b/ntpd/ntp.conf.mdoc.in
index e9f779d8371638979605abc29288c16c51629358..a0ef98e943e53a283a6cea20a13e51fea7bbb82d 100644 (file)
--- a/ntpd/ntp.conf.mdoc.in
+++ b/ntpd/ntp.conf.mdoc.in
@@ -1,9 +1,9 @@
-.Dd May 12 2015
+.Dd June 4 2015
 .Dt NTP_CONF 5 File Formats
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntp.mdoc)
 .\"
-.\"  It has been AutoGen-ed  May 12, 2015 at 04:32:08 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  4, 2015 at 06:56:27 PM by AutoGen 5.18.5
 .\"  From the definitions    ntp.conf.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -2717,11 +2717,11 @@ option).
 The default is 32 megabytes. Setting this to zero will prevent any attemp to lock memory.
 .It Cm stacksize Ar N4kPages
 Specifies the maximum size of the process stack on systems with the
-.It Cm filenum Ar Nfiledescriptors
-Specifies the maximum number of file descriptors ntpd may have open at once. Defaults to the system default.
 .Fn mlockall
 function.
 Defaults to 50 4k pages (200 4k pages in OpenBSD).
+.It Cm filenum Ar Nfiledescriptors
+Specifies the maximum number of file descriptors ntpd may have open at once. Defaults to the system default.
 .El
 .It Xo Ic trap Ar host_address
 .Op Cm port Ar port_number