[Bug 1349] statistics command not documented in HTML documentation

bk: 52e76a2doeZliS7dHXdaq0UQ2b7fKQ

diff --git a/ChangeLog b/ChangeLog
index 945872d32299e73082e7263d7643552a4826c953..e97d35b2471e6abcd6e8d045a85537198f90abd7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,13 @@
 * [Bug 930] ntpdc docs refer to 'clockinfo', but mean 'clockstat'.
 * [Bug 1002] ntp-keygen option and documentation updates: -p/--pvt-passwd
   is now -p/--password, and -q/--get-pvt-passwd is now -q/--export-passwd.
+* [Bug 1349] statistics command not documented in HTML documentation.
+  In html/monopt.html, add statistics id, definition, description, and
+  correct typo.
+  In html/scripts/monopt.txt, add statistics item, href, and comment.
+  In ntpd/ntp.conf.def, under statistics correct four to eight kinds.
+  In ntpd/complete.conf.in, add all eight kinds to statistics.
+  In html/comdex.html, remove duplicate footer.
 * [Bug 2545] Cleanup of scripts/monitoring/ntptrap.
 (4.2.7p413) 2014/01/27 Released by Harlan Stenn <stenn@ntp.org>
 * Require a version string for perl scripts that use autogen.

diff --git a/html/comdex.html b/html/comdex.html
index bab74a519976f7e02772577704dc10405a22434e..747d0a386a0d00c8eb33f3c5d4dc99396d2ba9f0 100644 (file)
--- a/html/comdex.html
+++ b/html/comdex.html
@@ -23,7 +23,7 @@
 <script type="text/javascript" language="javascript" src="scripts/miscopt.txt"></script>
 <hr>
 <script type="text/javascript" language="javascript" src="scripts/footer.txt"></script>
-<hr>
-<script type="text/javascript" language="javascript" src="scripts/footer.txt"></script>
+<!-- <hr> -->
+<!-- <script type="text/javascript" language="javascript" src="scripts/footer.txt"></script> -->
 </body>
 </html>

diff --git a/html/monopt.html b/html/monopt.html
index c2cc30f9f08d58d0fd3e3bad0306d84dd0608ccd..b1ebb543ea185898cdf8af3fdf33844ec91612dd 100644 (file)
--- a/html/monopt.html
+++ b/html/monopt.html
@@ -104,9 +104,13 @@
         by a constant name.</dd>
       <dt><tt>enable | disable</tt></dt>
       <dd>Enable or disable the recording function, with default <tt>enable</tt>.
-        These options are intended for remote configutation commands.</dd>
+        These options are intended for remote configuration commands.</dd>
     </dl>
   </dd>
+  <dt id="statistics"><tt>statistics <i>name</i>...</tt></dt>
+  <dd>Enables writing of statistics records. Currently, eight kinds of
+    statistics are supported: <i>name</i>s specify the file set type(s) from
+    the list in the next section.</dd>
   <dt id="statsdir"><tt>statsdir <i>directory_path</i></tt></dt>
   <dd>Specify the directory path prefix for statistics file names.</dd>
 </dl>

diff --git a/html/scripts/monopt.txt b/html/scripts/monopt.txt
index 407c615a26ade1b03a3a58a8fcde94f94eb72a21..b7d5a2f3299354f9921129255006ab65890e261c 100644 (file)
--- a/html/scripts/monopt.txt
+++ b/html/scripts/monopt.txt
@@ -1,5 +1,6 @@
 document.write("<p>Monitoring Commands and Options</p><ul>\
 <li class='inline'><a href='monopt.html#filegen'>filegen - specify monitor files</a></li>\
+<li class='inline'><a href='monopt.html#statistics'>statistics - enable writing of statistics records</a></li>\
 <li class='inline'><a href='monopt.html#statsdir'>statsdir - specify monitor files directory</a></li>\
 <li class='inline'><a href='comdex.html'>Command Index</a></li>\
 </ul>")

diff --git a/ntpd/complete.conf.in b/ntpd/complete.conf.in
index 9ed02c9fa94fdcc7f13e6f7b2dd59e0043245c5a..9f83e1c3d757c9eb5996a2edc56b1c1230415b0b 100644 (file)
--- a/ntpd/complete.conf.in
+++ b/ntpd/complete.conf.in
@@ -5,7 +5,7 @@ nonvolatile 1e-7
 ident "udent"
 logconfig =allall -allinfo -allevents -allstatistics -allstatus +allall -clockinfo -clockevents -clockstatistics -clockstatus +clockall -syncinfo -syncevents -syncstatistics -syncstatus +syncall -sysinfo -sysevents -sysstatistics -sysstatus +sysall
 statsdir "/etc/ntp/stats"
-statistics loopstats peerstats
+statistics clockstats cryptostats loopstats peerstats protostats rawstats sysstats timingstats
 filegen clockstats file clockstats type none enable
 filegen cryptostats file cryptostats type pid link disable
 filegen loopstats file loopstats type day nolink enable

diff --git a/ntpd/ntp.conf.def b/ntpd/ntp.conf.def
index e0ea34f0c5a886b611a96469124591703e5aca81..2e6af43962682e7b7998f87192c371c3269a47e1 100644 (file)
--- a/ntpd/ntp.conf.def
+++ b/ntpd/ntp.conf.def
@@ -1045,7 +1045,7 @@ automatically summarized and archived for retrospective analysis.
 .Bl -tag -width indent
 .It Ic statistics Ar name ...
 Enables writing of statistics records.
-Currently, four kinds of
+Currently, eight kinds of
 .Ar name
 statistics are supported.
 .Bl -tag -width indent