[Bug 2556] mrulist is missing from the generated ntpq man page

bk: 540991aaaYITxEnSFm_iUQZuBtMWXA

diff --git a/ChangeLog b/ChangeLog
index cf4e58cf8cc7162b614e48c619b39d389dbe8d84..85721f567ee881cf210185b5bb293fe49b34e49f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 2556] mrulist is missing from the generated ntpq man page.
 (4.2.7p471) 2014/09/05 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 2649] "make install" leaves wrong owner for files in html/.
 * [Bug 2652] Windows hates directory names that contain a :.

diff --git a/ntpq/ntpq-opts.def b/ntpq/ntpq-opts.def
index d993db611b05562e58b6f873e331dd3e335130da..d0c57a0293124710e212fafe93100920cf10fbda 100644 (file)
--- a/ntpq/ntpq-opts.def
+++ b/ntpq/ntpq-opts.def
@@ -209,11 +209,12 @@ source of information about
 .Nm
 than this manual
 page.
-.It Ic addvars Ar variable_name Xo Op Ic =value
+.It Ic addvars Ar variable_name Ns Xo Op Ic =value
 .Ic ...
 .Xc
 .It Ic rmvars Ar variable_name Ic ...
 .It Ic clearvars
+.It Ic showvars
 The data carried by NTP mode 6 messages consists of a list of
 items of the form
 .Ql variable_name=value ,
@@ -242,6 +243,9 @@ while the
 .Ic clearlist
 command removes all variables from the
 list.
+The
+.Ic showvars
+command displays the current list of optional variables.
 .It Ic authenticate Op yes | no
 Normally
 .Nm
@@ -295,6 +299,9 @@ or between machines whose clocks are unsynchronized.
 Actually the
 server does not now require timestamps in authenticated requests,
 so this command may be obsolete.
+.It Ic exit
+Exit
+.Nm .
 .It Ic host Ar hostname
 Set the host to which future queries will be sent.
 .Ar hostname
@@ -320,6 +327,21 @@ used to authenticate configuration requests.
 This must correspond
 to a key number the server has been configured to use for this
 purpose.
+.It Ic keytype Xo Oo
+.Cm md5 |
+.Cm OpenSSLDigestType
+.Oc
+.Xc
+Specify the type of key to use for authenticating requests.
+.Cm md5
+is alway supported.
+If
+.Nm
+was built with OpenSSL support,
+any digest type supported by OpenSSL can also be provided.
+If no argument is given, the current
+.Ic keytype
+is displayed.
 .It Ic ntpversion Xo Oo
 .Cm 1 |
 .Cm 2 |
@@ -344,9 +366,16 @@ requests.
 The password must correspond to the key configured for
 use by the NTP server for this purpose if such requests are to be
 successful.
+.\" Not yet implemented.
+.\" .It Ic poll
+.\" .Op Ar n
+.\" .Op Ic verbose
+.\" Poll an NTP server in client mode
+.\" .Ar n
+.\" times.
 .It Ic quit
 Exit
-.Nm
+.Nm .
 .It Ic raw
 Causes all output from query commands is printed as received
 from the remote server.
@@ -361,6 +390,10 @@ Note that since
 .Nm
 retries each query once after a timeout, the total waiting time for
 a timeout will be twice the timeout value set.
+.It Ic version
+Print the version of the
+.Nm
+program.
 .El
 
 .Ss "Control Message Commands"
@@ -391,8 +424,10 @@ Display a list of mobilized associations in the form:
 .It Li last_event Ta event report (see the Li event field of the peer status word)
 .It Li cnt Ta event count (see the Li count field of the peer status word)
 .El
-.It Cm clockvar Ar assocID Oo Ar name Oo Cm = Ar value Op ... Oc Oc Op ...
-.It Cm cv Ar assocID Oo Ar name Oo Cm = Ar value Op ... Oc Oc Op ...
+.It Cm authinfo
+Display the authentication statistics.
+.It Cm clockvar Ar assocID Oo Ar name Ns Oo Cm = Ns Ar value Oc Oc Op ...
+.It Cm cv Ar assocID Oo Ar name Ns Oo Cm = Ns Ar value Oc Oc Op ...
 Display a list of clock variables for those associations supporting a reference clock.
 .It Cm :config Op ...
 Send the remainder of the command line, including whitespace, to the server as a run-time configuration command in the same format as a line in the configuration file. This command is experimental until further notice and clarification. Authentication is of course required.
@@ -408,6 +443,22 @@ Display network and reference clock I/O statistics.
 Display kernel loop and PPS statistics. As with other ntpq output, times are in milliseconds. The precision value displayed is in milliseconds as well, unlike the precision system variable.
 .It Ic lassociations
 Perform the same function as the associations command, except display mobilized and unmobilized associations.
+.It Ic lopeers Xo
+.Oo Ic -4 |
+.Ic -6
+.Oc
+.Xc
+Obtain and print a list of all peers and clients showing
+.Ar dstadr
+(associated with any given IP version).
+.It Ic lpeers Xo
+.Oo Ic -4 |
+.Ic -6
+.Oc
+.Xc
+Print a peer spreadsheet for the appropriate IP version(s).
+.Ar dstadr
+(associated with any given IP version).
 .It Ic monstats
 Display monitor facility statistics.
 .It Ic mrulist Oo Ic limited | Ic kod | Ic mincount Ns = Ns Ar count | Ic laddr Ns = Ns Ar localaddr | Ic sort Ns = Ns Ar sortorder | Ic resany Ns = Ns Ar hexmask | Ic resall Ns = Ns Ar hexmask Oc
@@ -481,17 +532,28 @@ Source port of last packet from this address.
 DNS name, numeric address, or address followed by
 claimed DNS name which could not be verified in parentheses.
 .El
-.It Ic mreadvar assocID assocID Oo variable_name Oo = Ar value Oc Oc ...
-.It Ic mrv assocID assocID Oo variable_name Oo = Ar value Oc Oc ...
+.It Ic mreadvar assocID assocID Oo Ar variable_name Ns Oo = Ns Ar value Oc Oc ...
+.It Ic mrv assocID assocID Oo Ar variable_name Ns Oo = Ns Ar value Oc Oc ...
 Perform the same function as the
 .Ic readvar
 command, except for a range of association IDs.
 This range is determined from the association list cached by the most recent
 .Ic associations
 command.
+.It Ic opeers Xo
+.Oo Ic -4 |
+.Ic -6
+.Oc
+.Xc
+Obtain and print the old-style list of all peers and clients showing
+.Ar dstadr
+(associated with any given IP version),
+rather than the
+.Ar refid .
 .It Ic passociations
 Perform the same function as the
-.Ic associations command ,
+.Ic associations
+command,
 except that it uses previously stored data rather than making a new query.
 .It Ic peers
 Display a list of peers in the form:
@@ -544,8 +606,14 @@ offset of server relative to this host
 .It Ic jitter
 jitter
 .El
-.It Ic readvar Ar assocID Ar name Oo Ns = Ns Ar value Oc  Oo , ... Oc
-.It Ic rv Ar assocID Ar name Oo Ns = Ns Ar value Oc  Oo , ... Oc
+.It Ic pstats Ar assocID
+Show the statistics for the peer with the given
+.Ar assocID .
+.It Ic readlist Ar assocID
+.It Ic rl Ar assocID
+Read the system or peer variables included in the variable list.
+.It Ic readvar Ar assocID Ar name Ns Oo Ns = Ns Ar value Oc  Oo , ... Oc
+.It Ic rv Ar assocID Ar name Ns Oo Ns = Ns Ar value Oc  Oo , ... Oc
 Display the specified variables.
 If
 .Ar assocID
@@ -573,6 +641,10 @@ where YYYY is the year,
 MM the month of year,
 DD the day of month and
 TTTT the time of day.
+.It Ic reslist
+Show the access control (restrict) list for
+.Nm .
+
 .It Ic saveconfig Ar filename
 Write the current configuration,
 including any runtime modifications given with
@@ -594,6 +666,10 @@ format specifies to substitute the current date and time, for example,
 The filename used is stored in system variable
 .Ic savedconfig .
 Authentication is required.
+.It Ic timerstats
+Display interval timer counters.
+.It Ic writelist Ar assocID
+Write the system or peer variables included in the variable list.
 .It Ic writevar Ar assocID Ar name Ns = Ns Ar value Op , ...
 Write the specified variables.
 If the
@@ -614,13 +690,16 @@ Print statistics counters maintained in the protocol module.
 
 .Ss Status Words and Kiss Codes
 
-The current state of the operating program is shown in a set of status words maintained by the system and each association separately.
+The current state of the operating program is shown
+in a set of status words
+maintained by the system.
+Status information is also available on a per-association basis.
 These words are displayed in the
 .Ic rv
 and
 .Ic as
-commands both in hexadecimal and decoded short tip strings.
-The codes, tips and short explanations are on the
+commands both in hexadecimal and in decoded short tip strings.
+The codes, tips and short explanations are documented on the
 .Lk decode.html "Event Messages and Status Words"
 page.
 The page also includes a list of system and peer messages,