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

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1125-52-53-57-58-59-60-mayer

bk: 49eee90eCvRAVPl33eqdECwY7mBu-w

diff --cc ChangeLog
index ad7c779021d8d310ce2d39768525f670d3be4922,77f9d11811ea6b66210daf9ae6f8e927df172fef..f2c18f5f972e766ae2e94c6ddddc1afd53c9f62b
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,5 +1,10 @@@
+ * PPS/PPSAPI cleanup from Dave Mills.
+ * Documentation updates from Dave Mills.
 +* [Bug 1125] C runtime per-thread initialization on Windows
 +* [Bug 1152] temporarily disable refclock_parse, refclock_true until
 +  maintainers can repair build break from pps_sample()
 +* [Bug 1153] refclock_nmea should not mix UTC with GPS time
 +* [Bug 1159] ntpq overlap diagnostic message test buggy
  (4.2.5p163) 2009/04/10 Released by Harlan Stenn <stenn@ntp.org>
  (4.2.5p162) 2009/04/09 Released by Harlan Stenn <stenn@ntp.org>
  * Documentation updates from Dave Mills.

diff --cc include/ntpd.h
Simple merge