Merge psp-deb1.ntp.org:/home/stenn/ntp-dev

into  psp-deb1.ntp.org:/home/stenn/ntp-dev-libevent

bk: 4d37ea6b7wA7_hTroyNkx5hf3FvQow

diff --cc sntp/sntp.html
index 912fb5479cc06d67e5dbcfcde7e923e330549927,5dac61cbe2a189448ab3496019cffc242019a80b..6321a104ddd810f5523be85739895b668d16a202
--- 1/sntp/sntp.html
--- 2/sntp/sntp.html
+++ b/sntp/sntp.html
@@@ -152,14 -139,9 +152,14 @@@ Up:&nbsp;<a rel="up" accesskey="u" href
  <p><a name="index-sntp-usage-3"></a>
  This is the automatically generated usage text for sntp:
  
- <pre class="example">sntp - standard SNTP program - Ver. 4.2.7p118
+ <pre class="example">sntp - standard SNTP program - Ver. 4.2.7p119
 -USAGE:  sntp [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]... hostname-or-IP ...
 +USAGE:  sntp [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]... \
 +                [ hostname-or-IP ...]
    Flg Arg Option-Name    Description
 +   -d no  debug-level    Increase output debug message level
 +                                - may appear multiple times
 +   -D Str set-debug-level Set the output debug message level
 +                                - may appear multiple times
     -4 no  ipv4           Force IPv4 DNS name resolution
                                  - prohibits these options:
                                  ipv6