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

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

bk: 49fdff3cMaN8KO0DqL6eQPopRCcWnw

diff --cc ChangeLog
index 1d6839d31258dc055fc9c8cd52e7fbf243562d87,7cb0740a8b68fc314e41dbb84a8d135e5cede246..778c3399025d155b5fe69e15cb65337f7c0548ad
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,5 @@@
+ * Autokey documentation cleanup from Dave Mills.
 +* do not clear config.cache when it is already empty
  (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)