From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 20 Jan 2011 07:55:23 +0000 (-0500)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-dev
X-Git-Tag: NTP_4_2_7P131~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d1721e46816e77f48c30b9014e4249502b3e9bf;p=thirdparty%2Fntp.git

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

bk: 4d37ea6b7wA7_hTroyNkx5hf3FvQow
---

3d1721e46816e77f48c30b9014e4249502b3e9bf
diff --cc sntp/sntp.html
index 912fb5479,5dac61cbe..6321a104d
--- a/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