From: Harlan Stenn Date: Mon, 29 Jun 2015 05:28:47 +0000 (+0000) Subject: ntpd/ntp.conf.def: Document DSCP and leapsmearinterval. Harlan Stenn. X-Git-Tag: NTP_4_2_8P3~3^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f71199b98cebb36204c69f79491de5ae1fa2f278;p=thirdparty%2Fntp.git ntpd/ntp.conf.def: Document DSCP and leapsmearinterval. Harlan Stenn. bk: 5590d78fhMYwx22fHZKFZjJTRLLblQ --- diff --git a/ChangeLog b/ChangeLog index d1f44c5c3..3c477f334 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ * README.leapsmear added. Martin Burnicki. * README.leapsmear edited. Harlan Stenn. * tests/libntp/msyslog.c: fixed a gcc warning. Tomasz Flendrich. +* ntpd/ntp.conf.def: Document DSCP and leapsmearinterval. Harlan Stenn. --- (4.2.8p3-RC3) 2015/06/27 Released by Harlan Stenn diff --git a/ntpd/invoke-ntp.conf.texi b/ntpd/invoke-ntp.conf.texi index ff5b94892..c9a7f7a03 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 June 27, 2015 at 05:19:38 AM by AutoGen 5.18.5 +# It has been AutoGen-ed June 29, 2015 at 05:18:48 AM by AutoGen 5.18.5 # From the definitions ntp.conf.def # and the template file agtexi-file.tpl @end ignore @@ -2291,6 +2291,9 @@ This implies that must have write permission for the directory the drift file is located in, and that file system links, symbolic or otherwise, should be avoided. +@item @code{dscp} @kbd{value} +This option specifies the Differentiated Services Control Point (DSCP) value, +a 6-bit code. The default value is 46, signifying Expedited Forwarding. @item @code{enable} @code{[@code{auth} | @code{bclient} | @code{calibrate} | @code{kernel} | @code{mode7} | @code{monitor} | @code{ntp} | @code{stats}]} @item @code{disable} @code{[@code{auth} | @code{bclient} | @code{calibrate} | @code{kernel} | @code{mode7} | @code{monitor} | @code{ntp} | @code{stats}]} Provides a way to enable or disable various server options. @@ -2376,6 +2379,19 @@ This option is useful for sites that run @code{ntpd(1ntpdmdoc)} on multiple hosts, with (mostly) common options (e.g., a restriction list). +@item @code{leapsmearinterval} @kbd{seconds} +This EXPERIMENTAL option is only available if +@code{ntpd(1ntpdmdoc)} +was built with the +@code{--enable-leap-smear} +option to the +@code{configure} +script. +It specifies the interval over which a leap second correction will be applied. +Recommended values for this option are between +7200 (2 hours) and 86400 (24 hours). +.Sy DO NOT USE THIS OPTION ON PUBLIC-ACCESS SERVERS! +See http://bugs.ntp.org/2855 for more information. @item @code{logconfig} @kbd{configkeyword} This command controls the amount and type of output written to the system diff --git a/ntpd/ntp.conf.5man b/ntpd/ntp.conf.5man index 978b5574a..114b3b1a8 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 "27 Jun 2015" "4.2.8p3-RC3" "File Formats" +.TH ntp.conf 5man "29 Jun 2015" "4.2.8p3-RC3" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-zzaaDD/ag-Lza4BD) +.\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed June 27, 2015 at 05:19:25 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 29, 2015 at 05:18:50 AM by AutoGen 5.18.5 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME @@ -2569,6 +2569,10 @@ must have write permission for the directory the drift file is located in, and that file system links, symbolic or otherwise, should be avoided. .TP 7 +.NOP \f\*[B-Font]dscp\f[] \f\*[I-Font]value\f[] +This option specifies the Differentiated Services Control Point (DSCP) value, +a 6-bit code. The default value is 46, signifying Expedited Forwarding. +.TP 7 .NOP \f\*[B-Font]enable\f[] [\f\*[B-Font]auth\f[] | \f\*[B-Font]bclient\f[] | \f\*[B-Font]calibrate\f[] | \f\*[B-Font]kernel\f[] | \f\*[B-Font]mode7\f[] | \f\*[B-Font]monitor\f[] | \f\*[B-Font]ntp\f[] | \f\*[B-Font]stats\f[]] .TP 7 .NOP \f\*[B-Font]disable\f[] [\f\*[B-Font]auth\f[] | \f\*[B-Font]bclient\f[] | \f\*[B-Font]calibrate\f[] | \f\*[B-Font]kernel\f[] | \f\*[B-Font]mode7\f[] | \f\*[B-Font]monitor\f[] | \f\*[B-Font]ntp\f[] | \f\*[B-Font]stats\f[]] @@ -2665,6 +2669,20 @@ This option is useful for sites that run on multiple hosts, with (mostly) common options (e.g., a restriction list). .TP 7 +.NOP \f\*[B-Font]leapsmearinterval\f[] \f\*[I-Font]seconds\f[] +This EXPERIMENTAL option is only available if +\fCntpd\f[]\fR(1ntpdmdoc)\f[] +was built with the +\f\*[B-Font]\--enable-leap-smear\f[] +option to the +\f\*[B-Font]configure\f[] +script. +It specifies the interval over which a leap second correction will be applied. +Recommended values for this option are between +7200 (2 hours) and 86400 (24 hours). +.Sy DO NOT USE THIS OPTION ON PUBLIC-ACCESS SERVERS! +See http://bugs.ntp.org/2855 for more information. +.TP 7 .NOP \f\*[B-Font]logconfig\f[] \f\*[I-Font]configkeyword\f[] This command controls the amount and type of output written to the system diff --git a/ntpd/ntp.conf.5mdoc b/ntpd/ntp.conf.5mdoc index 2a878eced..239878a99 100644 --- a/ntpd/ntp.conf.5mdoc +++ b/ntpd/ntp.conf.5mdoc @@ -1,9 +1,9 @@ -.Dd June 27 2015 +.Dd June 29 2015 .Dt NTP_CONF 5mdoc File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed June 27, 2015 at 05:19:46 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 29, 2015 at 05:18:43 AM by AutoGen 5.18.5 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -2386,6 +2386,9 @@ This implies that must have write permission for the directory the drift file is located in, and that file system links, symbolic or otherwise, should be avoided. +.It Ic dscp Ar value +This option specifies the Differentiated Services Control Point (DSCP) value, +a 6\-bit code. The default value is 46, signifying Expedited Forwarding. .It Xo Ic enable .Oo .Cm auth | Cm bclient | @@ -2485,6 +2488,19 @@ This option is useful for sites that run .Xr ntpd 1ntpdmdoc on multiple hosts, with (mostly) common options (e.g., a restriction list). +.It Ic leapsmearinterval Ar seconds +This EXPERIMENTAL option is only available if +.Xr ntpd 1ntpdmdoc +was built with the +.Cm \-\-enable\-leap\-smear +option to the +.Cm configure +script. +It specifies the interval over which a leap second correction will be applied. +Recommended values for this option are between +7200 (2 hours) and 86400 (24 hours). +.Sy DO NOT USE THIS OPTION ON PUBLIC\-ACCESS SERVERS! +See http://bugs.ntp.org/2855 for more information. .It Ic logconfig Ar configkeyword This command controls the amount and type of output written to the system diff --git a/ntpd/ntp.conf.def b/ntpd/ntp.conf.def index eb3d27370..7e09c0306 100644 --- a/ntpd/ntp.conf.def +++ b/ntpd/ntp.conf.def @@ -2388,6 +2388,9 @@ This implies that must have write permission for the directory the drift file is located in, and that file system links, symbolic or otherwise, should be avoided. +.It Ic dscp Ar value +This option specifies the Differentiated Services Control Point (DSCP) value, +a 6-bit code. The default value is 46, signifying Expedited Forwarding. .It Xo Ic enable .Oo .Cm auth | Cm bclient | @@ -2487,6 +2490,19 @@ This option is useful for sites that run .Xr ntpd 1ntpdmdoc on multiple hosts, with (mostly) common options (e.g., a restriction list). +.It Ic leapsmearinterval Ar seconds +This EXPERIMENTAL option is only available if +.Xr ntpd 1ntpdmdoc +was built with the +.Cm --enable-leap-smear +option to the +.Cm configure +script. +It specifies the interval over which a leap second correction will be applied. +Recommended values for this option are between +7200 (2 hours) and 86400 (24 hours). +.Sy DO NOT USE THIS OPTION ON PUBLIC-ACCESS SERVERS! +See http://bugs.ntp.org/2855 for more information. .It Ic logconfig Ar configkeyword This command controls the amount and type of output written to the system diff --git a/ntpd/ntp.conf.man.in b/ntpd/ntp.conf.man.in index 483c33a71..0a2645efd 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 "27 Jun 2015" "4.2.8p3-RC3" "File Formats" +.TH ntp.conf 5 "29 Jun 2015" "4.2.8p3-RC3" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-zzaaDD/ag-Lza4BD) +.\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed June 27, 2015 at 05:19:25 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 29, 2015 at 05:18:50 AM by AutoGen 5.18.5 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME @@ -2569,6 +2569,10 @@ must have write permission for the directory the drift file is located in, and that file system links, symbolic or otherwise, should be avoided. .TP 7 +.NOP \f\*[B-Font]dscp\f[] \f\*[I-Font]value\f[] +This option specifies the Differentiated Services Control Point (DSCP) value, +a 6-bit code. The default value is 46, signifying Expedited Forwarding. +.TP 7 .NOP \f\*[B-Font]enable\f[] [\f\*[B-Font]auth\f[] | \f\*[B-Font]bclient\f[] | \f\*[B-Font]calibrate\f[] | \f\*[B-Font]kernel\f[] | \f\*[B-Font]mode7\f[] | \f\*[B-Font]monitor\f[] | \f\*[B-Font]ntp\f[] | \f\*[B-Font]stats\f[]] .TP 7 .NOP \f\*[B-Font]disable\f[] [\f\*[B-Font]auth\f[] | \f\*[B-Font]bclient\f[] | \f\*[B-Font]calibrate\f[] | \f\*[B-Font]kernel\f[] | \f\*[B-Font]mode7\f[] | \f\*[B-Font]monitor\f[] | \f\*[B-Font]ntp\f[] | \f\*[B-Font]stats\f[]] @@ -2665,6 +2669,20 @@ This option is useful for sites that run on multiple hosts, with (mostly) common options (e.g., a restriction list). .TP 7 +.NOP \f\*[B-Font]leapsmearinterval\f[] \f\*[I-Font]seconds\f[] +This EXPERIMENTAL option is only available if +\fCntpd\f[]\fR(@NTPD_MS@)\f[] +was built with the +\f\*[B-Font]\--enable-leap-smear\f[] +option to the +\f\*[B-Font]configure\f[] +script. +It specifies the interval over which a leap second correction will be applied. +Recommended values for this option are between +7200 (2 hours) and 86400 (24 hours). +.Sy DO NOT USE THIS OPTION ON PUBLIC-ACCESS SERVERS! +See http://bugs.ntp.org/2855 for more information. +.TP 7 .NOP \f\*[B-Font]logconfig\f[] \f\*[I-Font]configkeyword\f[] This command controls the amount and type of output written to the system diff --git a/ntpd/ntp.conf.mdoc.in b/ntpd/ntp.conf.mdoc.in index 194cf60bc..894b5c86c 100644 --- a/ntpd/ntp.conf.mdoc.in +++ b/ntpd/ntp.conf.mdoc.in @@ -1,9 +1,9 @@ -.Dd June 27 2015 +.Dd June 29 2015 .Dt NTP_CONF 5 File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed June 27, 2015 at 05:19:46 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 29, 2015 at 05:18:43 AM by AutoGen 5.18.5 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -2386,6 +2386,9 @@ This implies that must have write permission for the directory the drift file is located in, and that file system links, symbolic or otherwise, should be avoided. +.It Ic dscp Ar value +This option specifies the Differentiated Services Control Point (DSCP) value, +a 6\-bit code. The default value is 46, signifying Expedited Forwarding. .It Xo Ic enable .Oo .Cm auth | Cm bclient | @@ -2485,6 +2488,19 @@ This option is useful for sites that run .Xr ntpd @NTPD_MS@ on multiple hosts, with (mostly) common options (e.g., a restriction list). +.It Ic leapsmearinterval Ar seconds +This EXPERIMENTAL option is only available if +.Xr ntpd @NTPD_MS@ +was built with the +.Cm \-\-enable\-leap\-smear +option to the +.Cm configure +script. +It specifies the interval over which a leap second correction will be applied. +Recommended values for this option are between +7200 (2 hours) and 86400 (24 hours). +.Sy DO NOT USE THIS OPTION ON PUBLIC\-ACCESS SERVERS! +See http://bugs.ntp.org/2855 for more information. .It Ic logconfig Ar configkeyword This command controls the amount and type of output written to the system