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

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1171-3

bk: 49fdfdb6UPBmvcSyr4YjmqNBCipmWA

diff --cc ChangeLog
index 2413a75744b94a7b04ad45cf96af2b677c940cc9,7cb0740a8b68fc314e41dbb84a8d135e5cede246..4407a2b7cc4b5e629c59aae3c9a4e6e1714b490e
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,4 +1,6 @@@
+ * Autokey documentation cleanup from Dave Mills.
 +* [Bug 1171] line editing libs found without headers (Solaris 11)
 +* [Bug 1173] NMEA refclock fails with Solaris PPSAPI
  (4.2.5p170) 2009/05/02 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1152] adjust PARSE to new refclock_pps logic
  * Include (4.2.4p7-RC5)