Merge bk://www.ntp.org/ntp-dev

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1518-20-22

bk: 4bc3f670HpBe-ltr0_tIcwKUn9xXEw

diff --cc ChangeLog
index 4810ecab410ca89552f1c742b4aa4bef5af695d4,d8a70da8d28bdf0e09d140e968ce7db1521c366b..82b08abe7a877a94a1cb32bf5eb8dd500ae14340
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,12 -1,4 +1,13 @@@
 +* [Bug 1518] Windows ntpd should lock to one processor more
 +  conservatively.
 +* [Bug 1520] '%u' formats for size_t gives warnings with 64-bit builds.
 +* [Bug 1522] Enable range syntax "trustedkey (301 ... 399)".
 +* Documentation updates for 4.2.7p22 changes and additions, updating
 +  ntpdc.html, ntpq.html, accopt.html, confopt.html, manyopt.html,
 +  miscopt.html, and miscopt.txt.
+ * accopt.html: non-ntpport doc changes from Dave Mills.
 +* Modify full MRU list preemption when full to match "discard monitor"
 +  documentation, by removing exception for count == 1.
  (4.2.7p23) 2010/04/04 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1516] unpeer by IP address fails, DNS name works.
  * [Bug 1517] ntpq and ntpdc should verify reverse DNS before use.

diff --cc html/accopt.html
index 3497d01182df1550c2dae2bed023e17a04ceb5be,36a5474ae63f80c92e2d1088ac70c222745b2a66..539dfca6d85206f307d145cae0c10c21388a7c6a
--- 1/html/accopt.html
--- 2/html/accopt.html
+++ b/html/accopt.html
@@@ -24,8 -24,8 +24,8 @@@
  
  <p>The skunk watches for intruders and sprays.</p>
  <p>Last update: 
- <!-- #BeginDate format:En2m -->11-Apr-2010  22:57<!-- #EndDate -->
-               UTC</p>
 -      <!-- #BeginDate format:En2m -->12-Feb-2010  21:43<!-- #EndDate -->
++      <!-- #BeginDate format:En2m -->13-Apr-2010  04:38<!-- #EndDate -->
+       UTC</p>
  <br clear="left">
  
  <h4>Related Links</h4>