From: Harlan Stenn Date: Tue, 25 Dec 2012 12:20:52 +0000 (-0500) Subject: Merge bk://bk.ntp.org/ntp-dev X-Git-Tag: NTP_4_2_7P339~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f291da0475239168f62af9843c2701e2b58cd4ca;p=thirdparty%2Fntp.git Merge bk://bk.ntp.org/ntp-dev into psp-deb1.ntp.org:/home/stenn/ntp-dev-autogen bk: 50d99a24lVLo89LYb1aY45G5N9vUZg --- f291da0475239168f62af9843c2701e2b58cd4ca diff --cc ChangeLog index fdda7ad6f,2273d2cac..6f6275f33 --- a/ChangeLog +++ b/ChangeLog @@@ -1,5 -1,4 +1,6 @@@ +* mdoc2texi fixes: parseQuote, closing of list item tables. +* ntp-wait, ntpd, ntpdc, ntpq, ntpsnmpd autogen documentation updates. + (4.2.7p338) 2012/12/25 Released by Harlan Stenn * mdoc2texi fixes: Handle_ArCmFlIc, Handle_Fn, HandleQ. * ntp-keygen autogen documentation updates. * ntpq autogen docs. diff --cc ntpdc/ntpdc.html index 96e1b8a46,b19cf2758..26cbd6bf1 --- a/ntpdc/ntpdc.html +++ b/ntpdc/ntpdc.html @@@ -147,10 -135,10 +147,10 @@@ This is the automatically generated usa the usage text by passing it through a pager program. more-help is disabled on platforms without a working fork(2) function. The PAGER environment variable is -used to select the program, defaulting to more. Both will exit +used to select the program, defaulting to more. Both will exit with a status code of 0. - 
ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p337
+ 
ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p338
  USAGE:  ntpdc [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]
    Flg Arg Option-Name    Description
     -4 no  ipv4           Force IPv4 DNS name resolution
diff --cc ntpq/ntpq.1ntpqmdoc
index aff2a6ce7,0df9d896d..6743e6cd1
--- a/ntpq/ntpq.1ntpqmdoc
+++ b/ntpq/ntpq.1ntpqmdoc
@@@ -1,9 -1,9 +1,9 @@@
  .Dd December 25 2012
  .Dt NTPQ 1ntpqmdoc User Commands
 -.Os SunOS 5.10
 +.Os FreeBSD 6.4-STABLE
  .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
  .\"  
- .\"  It has been AutoGen-ed  December 25, 2012 at 11:01:58 AM by AutoGen 5.16.2
+ .\"  It has been AutoGen-ed  December 25, 2012 at 11:35:13 AM by AutoGen 5.16.2
  .\"  From the definitions    ntpq-opts.def
  .\"  and the template file   agmdoc-cmd.tpl
  .Sh NAME
diff --cc ntpq/ntpq.html
index 56132c42a,cc4be2a16..d360936c4
--- a/ntpq/ntpq.html
+++ b/ntpq/ntpq.html
@@@ -21,9 -20,10 +20,9 @@@
  
  
  
ntpq: Network Time Protocol Query User's Manual

-   

+        

  
Short Contents

  
  

@@@ -31,22 -31,12 +30,19 @@@
  
  
  

- 
  

- Next: ,
- Previous: (dir),
- Up: (dir)
- 
+ Up: (dir)
+ 

  

  
 -
Top

 +
ntpq: Network Time Protocol Query User Manual

 +
 +
The ntpq utility program is used to
 +monitor the operational status
 +and determine the performance of
 +ntpd, the NTP daemon.
 +
 +  
This document applies to version 4.2.7p337 of ntpq.
  
  
    
  
  • ntpq Description
@@@ -681,95 -674,91 +680,90 @@@ Up: /usr/local/etc
  -k
  keysdir
 +
    
  
  
    
- 
  
    
- Next: ,
+ Next: ,
  Previous: Usage,
  Up: Top
- 
+ 
    
  
    
  
- 
+      
  
    Internal Commands
    
  
- 
    Interactive format commands consist of a keyword followed by zero to four arguments.  Only enough characters of the full keyword to uniquely identify the command need be typed.  The output of a command is normally sent to the standard output, but optionally the output of individual commands may be sent to a file by appending a >, followed by a file name, to the command line.  A number of interactive format commands are executed entirely within the ntpq program itself and do not result in NTP mode-6 requests being sent to a server.  These are described following.
+      
    Interactive format commands consist of a keyword followed by zero to four arguments.  Only enough characters of the full keyword to uniquely identify the command need be typed.  The output of a command is normally sent to the standard output, but optionally the output of individual commands may be sent to a file by appending a >, followed by a file name, to the command line.  A number of interactive format commands are executed entirely within the ntpq program itself and do not result in NTP mode-6 requests being sent to a server.  These are described following.
  
-      
    
- 
    ? [command_keyword]
    help [command_keyword]
    A ? by itself will print a list of all the command keywords known to ntpq.  A ? followed by a command keyword will print function and usage information about the command.
+           
    
+ 
     ? [command_keyword
    help [command_keyword]
    A ? by itself will print a list of all the command keywords known to ntpq.  A ? followed by a command keyword will print function and usage information about the command.
  
-      
    >addvars name [ = value] [...]
    rmvars name [...]
    clearvars</dt>
    The arguments to these commands consist of a list of items of the form
- name = value, where the = value is ignored,
+           
     >addvars name [ = value] [...]
    rmvars name [...]
    clearvars</dt>
    The arguments to these commands consist of a list of items of the form
+ name = value, where the = value is ignored,
  and can be omitted in read requests. 
 -ntpq maintains an internal list in which data to be included
 -in control messages can be assembled, and sent using the readlist
 -and writelist commands described below. 
 -The addvars command allows variables and optional values
 +ntpq maintains an internal list in which data to be included
 +in control messages can be assembled, and sent using the readlist
 +and writelist commands described below. 
 +The addvars command allows variables and optional values
  to be added to the list. 
  If more than one variable is to be added
  the list should be comma-separated and not contain white space. 
 -The rmvars command can be used to remove individual variables
 +The rmvars command can be used to remove individual variables
  from the list,
 -while the clearlist command removes all variables from the list.
 +while the clearlist command removes all variables from the list.
  
-      
    cooked
    Display server messages in prettyprint format.
+           
     cooked
    Display server messages in prettyprint format.
 -
+           
     debug more | less | off
    Turns internal query program debugging on and off.
 -
+           
     delay milliseconds
    Specify a time interval to be added to timestamps included in requests which require authentication.  This is used to enable (unreliable) server reconfiguration over long delay network paths or between machines whose clocks are unsynchronized.  Actually the server does not now require timestamps in authenticated requests, so this command may be obsolete.
  
-      
    debug more | less | off
    Turns internal query program debugging on and off.
- 
-      
    delay milliseconds
    Specify a time interval to be added to timestamps included in requests which require authentication.  This is used to enable (unreliable) server reconfiguration over long delay network paths or between machines whose clocks are unsynchronized.  Actually the server does not now require timestamps in authenticated requests, so this command may be obsolete.
- 
-      
    host name
    Set the host to which future queries will be sent. 
+           
     host name
    Set the host to which future queries will be sent. 
  The name may be either a DNS name or a numeric address.
  
-      
    hostnames [yes | no]
    If yes is specified, host names are printed in information displays. 
- If no is specified, numeric addresses are printed instead. 
- The default is yes,
- unless modified using the command line -n switch.
+           
     hostnames [yes | no]
    If yes is specified, host names are printed in information displays. 
+ If no is specified, numeric addresses are printed instead. 
+ The default is yes,
+ unless modified using the command line -n switch.
  
-      
    keyid keyid
    This command specifies the key number to be used
+           
     keyid keyid
    This command specifies the key number to be used
  to authenticate configuration requests. 
 -This must correspond to a key ID configured in ntp.conf for this purpose.
 +This must correspond to a key ID configured in ntp.conf for this purpose.
  
-      
    keytype
    Specify the digest algorithm to use for authenticated requests,
- with default MD5. 
+           
     keytype
    Specify the digest algorithm to use for authenticated requests,
+ with default MD5. 
  If the OpenSSL library is installed,
  digest can be be any message digest algorithm supported by the library. 
 -The current selections are: MD2, MD4, MD5, MDC2, RIPEMD160, SHA and SHA1.
 +The current selections are: MD2, MD4, MD5, MDC2, RIPEMD160, SHA and SHA1.
  
-      
    ntpversion 1 | 2 | 3 | 4
    Sets the NTP version number which ntpq claims in packets. 
+           
     ntpversion 1 | 2 | 3 | 4
    Sets the NTP version number which ntpq claims in packets. 
  Defaults to 2. 
  Note that mode-6 control messages (and modes, for that matter)
  didn't exist in NTP version 1.
  
-      
    passwd
    This command prompts for a password to authenticate requests. 
- The password must correspond to the key ID configured in ntp.conf for this purpose.
+           
     passwd
    This command prompts for a password to authenticate requests. 
+ The password must correspond to the key ID configured in ntp.conf for this purpose.
  
-      
    quit
    Exit ntpq.
+           
     quit
    Exit ntpq.
  
-      
    raw
    Display server messages as received and without reformatting.
+           
     raw
    Display server messages as received and without reformatting.
  
-      
    timeout millseconds
    Specify a timeout period for responses to server queries. 
+           
     timeout millseconds
    Specify a timeout period for responses to server queries. 
  The default is about 5000 milliseconds. 
 -Note that since ntpq retries each query once after a timeout
 +Note that since ntpq retries each query once after a timeout
  the total waiting time for a timeout will be twice the timeout value set.
  
-   
    
- 
- 
    
- 
+        
    
+        
    
  
    
- Next: ,
+ Next: ,
  Previous: Internal Commands,
  Up: Top
- 
+ 
    
  
    
  
- 
+      
  
    Control Message Commands
    
  
- 
    Association IDs are used to identify system, peer and clock variables. 
+      
    Association IDs are used to identify system, peer and clock variables. 
  System variables are assigned an association ID of zero and system name space,
  while each association is assigned a nonzero association ID and peer namespace. 
  Most control commands send a single mode-6 message to the server
@@@ -784,41 -773,44 +778,46 @@@ which iterate over a range of associati
  
    associations
    Display a list of mobilized associations in the form:
  
    
  ind assid status conf reach auth condition last_event cnt
+ 
+        

    Variable Description
  
-      
    Variable Description
- 
-      

    ind
- index on this list
+      

    ind
+ index on this list
  
-      

    assid
- association ID
+      

    assid
+ association ID
  
-      

    status
- peer status word
+      

    status
+ peer status word
  
-      

    conf
- yes: persistent, no: ephemeral
+      

    conf
+ yes: persistent, no: ephemeral
  
-      

    reach
- yes: reachable, no: unreachable
+      

    reach
+ yes: reachable, no: unreachable
  
-      

    auth
- ok, yes, bad and none
++

    auth
++ok, yes, bad and none
+      

    auth
+ ok, yes, bad and none
  
-      

    condition
- selection status (see the select field of the peer status word)
+      

    condition
+ selection status (see the select field of the peer status word)
  
-      

    last_event
- event report (see the event field of the peer status word)
+      

    last_event
+ event report (see the event field of the peer status word)
  
-      

    cnt
+      

    cnt
  event count (see the count field of the peer status word)
  
-      
    
+        
    
  
-      
    clockvar assocID [name [ = value [...]] [...]]
    cv assocID [name [ = value [...] ][...]]
    Display a list of clock variables for those associations supporting a reference clock.
+        
     clockvar assocID [name [ = value [...]] [...]] 
+  cv assocID [name [ = value [...] ][...]] 
+ Display a list of See clock variables for those associations supporting a reference clock.
  
-      
    :config [...]
    Send the remainder of the command line, including whitespace, to the server
+        
     :config [...] 
+ Send the remainder of the command line, including whitespace, to the server
  as a run-time configuration command in the same format
  as the configuration file. 
  This command is experimental until further notice and clarification. 
diff --cc ntpq/ntpq.mdoc.in
index 270805327,706dea40a..7b9a0b682
--- a/ntpq/ntpq.mdoc.in
+++ b/ntpq/ntpq.mdoc.in
@@@ -1,9 -1,9 +1,9 @@@
  .Dd December 25 2012
  .Dt NTPQ @NTPQ_MS@ User Commands
 -.Os SunOS 5.10
 +.Os FreeBSD 6.4-STABLE
  .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
  .\"  
- .\"  It has been AutoGen-ed  December 25, 2012 at 11:01:58 AM by AutoGen 5.16.2
+ .\"  It has been AutoGen-ed  December 25, 2012 at 11:35:13 AM by AutoGen 5.16.2
  .\"  From the definitions    ntpq-opts.def
  .\"  and the template file   agmdoc-cmd.tpl
  .Sh NAME
diff --cc ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
index 4458ef4dd,bd2d51a31..cad27ce38
--- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
+++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
@@@ -1,9 -1,9 +1,9 @@@
  .Dd December 25 2012
  .Dt NTPSNMPD 1ntpsnmpdmdoc User Commands
 -.Os SunOS 5.10
 +.Os FreeBSD 6.4-STABLE
  .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.mdoc)
  .\"  
- .\"  It has been AutoGen-ed  December 25, 2012 at 10:18:49 AM by AutoGen 5.16.2
+ .\"  It has been AutoGen-ed  December 25, 2012 at 11:35:28 AM by AutoGen 5.16.2
  .\"  From the definitions    ntpsnmpd-opts.def
  .\"  and the template file   agmdoc-cmd.tpl
  .Sh NAME
diff --cc ntpsnmpd/ntpsnmpd.mdoc.in
index ecb1ef63d,28ef87e5b..c6ad1dca2
--- a/ntpsnmpd/ntpsnmpd.mdoc.in
+++ b/ntpsnmpd/ntpsnmpd.mdoc.in
@@@ -1,9 -1,9 +1,9 @@@
  .Dd December 25 2012
  .Dt NTPSNMPD @NTPSNMPD_MS@ User Commands
 -.Os SunOS 5.10
 +.Os FreeBSD 6.4-STABLE
  .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.mdoc)
  .\"  
- .\"  It has been AutoGen-ed  December 25, 2012 at 10:18:49 AM by AutoGen 5.16.2
+ .\"  It has been AutoGen-ed  December 25, 2012 at 11:35:28 AM by AutoGen 5.16.2
  .\"  From the definitions    ntpsnmpd-opts.def
  .\"  and the template file   agmdoc-cmd.tpl
  .Sh NAME
diff --cc util/ntp-keygen.html
index f800f643e,efd5a5e3b..bf5b34bd4
--- a/util/ntp-keygen.html
+++ b/util/ntp-keygen.html
@@@ -73,15 -70,14 +73,15 @@@ All other files are in PEM-encode
  printable ASCII format so they can be embedded as MIME attachments in
  mail to other sites.
  
-   
    This document applies to version 4.2.7p337 of ntp-keygen.
+   
    This document applies to version 4.2.7p338 of ntp-keygen.
  
  
    
 +
  
    
 -Next: ,
 +Next: ,
  Previous: Top,
  Up: Top
 -
    
 +
  
    
  
  
@@@ -301,13 -294,12 +301,13 @@@ The names used for generated files and 
  string
  ntpkey and include the file type, generating host and filestamp,
  as described in the
- “Cryptographic Data Files”
+ Cryptographic Data Files
  section below. 
  
    
 -
    
  
 -
    
 +
    
 +
 +
  
    
  
  
    Running
    
@@@ -889,42 -877,41 +889,42 @@@ o
  DSA-SHA1. Note that RSA schemes must be used with a RSA sign key and DSA
  schemes must be used with a DSA sign key. 
  The default without this option is
 -RSA-MD5. 
    Fl
    Enable debugging. 
 +RSA-MD5. 
    ‘Fl’
    Enable debugging. 
  This option displays the cryptographic data produced in eye-friendly billboards. 
 -
    Fl
    Write the IFF client keys to the standard output. 
 +
    ‘Fl’
    Write the IFF client keys to the standard output. 
  This is intended for automatic key distribution by mail. 
 -
    Fl
    Generate parameters and keys for the GQ identification scheme,
 +
    ‘Fl’
    Generate parameters and keys for the GQ identification scheme,
  obsoleting any that may exist. 
 -
    Fl
    Generate keys for the GQ identification scheme
 +
    ‘Fl’
    Generate keys for the GQ identification scheme
  using the existing GQ parameters. 
  If the GQ parameters do not yet exist, create them first. 
 -
    Fl
    Generate new host keys, obsoleting any that may exist. 
 -
    Fl
    Generate parameters for the IFF identification scheme,
 +
    ‘Fl’
    Generate new host keys, obsoleting any that may exist. 
 +
    ‘Fl’
    Generate parameters for the IFF identification scheme,
  obsoleting any that may exist. 
- 
    ‘Fl’
    Set the suject name to
+ 
    Fl
    Set the suject name to
  name. This is used as the subject field in certificates
  and in the file name for host and sign keys. 
 -
    Fl
    Generate MD5 keys, obsoleting any that may exist. 
 -
    Fl
    Generate a private certificate. 
 +
    ‘Fl’
    Generate MD5 keys, obsoleting any that may exist. 
 +
    ‘Fl’
    Generate a private certificate. 
  By default, the program generates public certificates. 
- 
    ‘Fl’
    Encrypt generated files containing private data with
+ 
    Fl
    Encrypt generated files containing private data with
  password and the DES-CBC algorithm. 
- 
    ‘Fl’
    Set the password for reading files to password. 
- 
    ‘Fl’
    Generate a new sign key of the designated type,
+ 
    Fl
    Set the password for reading files to password. 
+ 
    Fl
    Generate a new sign key of the designated type,
  obsoleting any that may exist. 
  By default, the program uses the host key as the sign key. 
- 
    ‘Fl’
    Set the issuer name to
+ 
    Fl
    Set the issuer name to
  name. This is used for the issuer field in certificates
  and in the file name for identity files. 
 -
    Fl
    Generate a trusted certificate. 
 +
    ‘Fl’
    Generate a trusted certificate. 
  By default, the program generates a non-trusted certificate. 
 -
    Fl
    Generate parameters and keys for the Mu-Varadharajan (MV) identification scheme.
 +
    ‘Fl’
    Generate parameters and keys for the Mu-Varadharajan (MV) identification scheme.
  
  
    
 -
    
  
 -
    
 +
    
 +
 +
  
    
  
  
    Random
    
@@@ -1237,13 -1215,11 +1237,11 @@@ private keys.  The default is three-ke
  equivalent to "-C des-ede3-cbc".  The openssl tool lists ciphers
  available in "openssl -h" output. 
  
    
- 
- 
  
    
 -Next: ,
 +Next: ,
  Previous: ntp-keygen cipher,
  Up: Cryptographic
 -
    
 +
  
    
  
  
    id-key option (-e)
    
@@@ -1354,13 -1322,11 +1352,11 @@@ issuer names in the form hos
         
    'crypto ident' or 'server ident' configuration in
  ntpd's configuration file. 
  
    
- 
- 
  
    
 -Next: ,
 +Next: ,
  Previous: ntp-keygen ident,
  Up: Cryptographic
 -
    
 +
  
    
  
  
    lifetime option (-l)
    
@@@ -1535,13 -1487,11 +1531,11 @@@ in hos
  if not provided, the host name are also used in the file names
  of IFF, GQ, and MV client parameter files. 
  
    
- 
- 
  
    
 -Next: ,
 +Next: ,
  Previous: ntp-keygen subject-name,
  Up: Cryptographic
 -
    
 +
  
    
  
  
    trusted-cert option (-T)