From: Harlan Stenn Date: Wed, 8 Jan 2014 10:25:17 +0000 (+0000) Subject: [Bug 2530] Fix documentation for enable/disable mode7 and pps X-Git-Tag: NTP_4_2_7P410~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a314a73de7c02491d797f00cae9cfa7ee62032a;p=thirdparty%2Fntp.git [Bug 2530] Fix documentation for enable/disable mode7 and pps bk: 52cd278dW5oTtQfJP7hDbGLWUhOFIw --- diff --git a/ChangeLog b/ChangeLog index fe67773e6..265a013dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ * [Bug 2332] Force reference to 'libgcc_s' when using GCC, because threading+restricted user+locked memory otherwise fails on Linux. +* [Bug 2530] Fix documentation for enable/disable mode7 and pps. * Cleanup to the new scripts/*/Makefile.am files. (4.2.7p409) 2014/01/04 Released by Harlan Stenn * [Bug 2060] Warn about restrictions with "kod" but not "limited". diff --git a/html/miscopt.html b/html/miscopt.html index 6e5fefb88..03ad785f7 100644 --- a/html/miscopt.html +++ b/html/miscopt.html @@ -26,8 +26,8 @@
This command specifies the complete path and name of the file used to record the frequency of the local clock oscillator. This is the same operation as the -f command line option. This command is mutually exclusive with the freq option of the tinker command.
If the file exists, it is read at startup in order to set the initial frequency and then updated once per hour or more with the current frequency computed by the daemon. If the file name is specified, but the file itself does not exist, the starts with an initial frequency of zero and creates the file when writing it for the first time. If this command is not given, the daemon will always start with an initial frequency of zero.
The file format consists of a single line containing a single floating point number, which records the frequency offset measured in parts-per-million (PPM). The file is updated by first writing the current drift value into a temporary file and then renaming this file to replace the old version.
-
enable [auth | bclient | calibrate | kernel | monitor | ntp | pps | stats]
- disable [auth | bclient | calibrate | kernel | monitor | ntp | pps | stats]
+
enable [auth | bclient | calibrate | kernel | mode7 | monitor | ntp | stats]
+ disable [auth | bclient | calibrate | kernel | mode7 | monitor | ntp | stats]
Provides a way to enable or disable various system options. Flags not mentioned are unaffected. Note that most of these flags can be modified remotely using ntpq utility program's :config and config-from-file commands.
auth
@@ -38,11 +38,11 @@
Enables the calibrate feature for reference clocks. The default for this flag is disable.
kernel
Enables the kernel time discipline, if available. The default for this flag is enable if support is available, otherwise disable.
+
mode7
+
Enables processing of NTP mode 7 implementation-specific requests which are used by the deprecated ntpdc program. The default for this flag is disable. This flag is excluded from runtime configuration using ntpq. The ntpq program provides the same capabilities as ntpdc using standard mode 6 requests.
monitor
Enables the monitoring facility. See the ntpq program and the monstats and mrulist commands, as well as the Access Control Options for details. The monitoring facility is also enabled by the presence of limited in any restrict commands. The default for this flag is enable.
-
mode7
-
Enables processing of NTP mode 7 implementation-specific requests which are used by the deprecated ntpdc program. The default for this flag is disable. This flag is excluded from runtime configuration using ntpq. The ntpq program provides the same capabilities as ntpdc using standard mode 6 requests.
ntp
Enables time and frequency discipline. In effect, this switch opens and closes the feedback loop, which is useful for testing. The default for this flag is enable.
stats
diff --git a/ntpd/ntp.conf.def b/ntpd/ntp.conf.def index cd3d6a10f..e0ea34f0c 100644 --- a/ntpd/ntp.conf.def +++ b/ntpd/ntp.conf.def @@ -2366,16 +2366,16 @@ otherwise, should be avoided. .Oo .Cm auth | Cm bclient | .Cm calibrate | Cm kernel | -.Cm monitor | Cm ntp | -.Cm pps | Cm stats +.Cm mode7 | monitor | +.Cm ntp | Cm stats .Oc .Xc .It Xo Ic disable .Oo .Cm auth | Cm bclient | .Cm calibrate | Cm kernel | -.Cm monitor | Cm ntp | -.Cm pps | Cm stats +.Cm mode7 | monitor | +.Cm ntp | Cm stats .Oc .Xc Provides a way to enable or disable various server options. @@ -2411,6 +2411,19 @@ flag is .Ic enable if support is available, otherwise .Ic disable . +.It Cm mode7 +Enables processing of NTP mode 7 implementation-specific requests +which are used by the deprecated +.Xr ntpdc 1ntpdcmdoc +program. +The default for this flag is disable. +This flag is excluded from runtime configuration using +.Xr ntpq 1ntpqmdoc . +The +.Xr ntpq 1ntpqmdoc +program provides the same capabilities as +.Xr ntpdc 1ntpdcmdoc +using standard mode 6 requests. .It Cm monitor Enables the monitoring facility. See the @@ -2429,17 +2442,6 @@ closes the feedback loop, which is useful for testing. The default for this flag is .Ic enable . -.It Cm pps -Enables the pulse-per-second (PPS) signal when frequency and time is -disciplined by the precision time kernel modifications. -See the -.Qq A Kernel Model for Precision Timekeeping -(available as part of the HTML documentation -provided in -.Pa /usr/share/doc/ntp ) -page for further information. -The default for this flag is -.Ic disable . .It Cm stats Enables the statistics facility. See the