From: Dave Hart <hart@ntp.org>
Date: Sun, 11 Apr 2010 23:14:51 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-pool-doc
X-Git-Tag: NTP_4_2_7P24~2^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bffce5493d11f5bfd8c80ce0282b8a4d1a89885;p=thirdparty%2Fntp.git

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

bk: 4bc257ebYVr1OZAQeurj75YOgPdT-g
---

3bffce5493d11f5bfd8c80ce0282b8a4d1a89885
diff --cc ChangeLog
index 61623502d,4afcf1e80..4810ecab4
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,8 +1,12 @@@
 +* [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.
+ * 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.