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

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

bk: 4e22165aRYLNQnZKh-0w-TKGx5pfJA

diff --cc ChangeLog
index db7ab2852ad47403015a7088eed2f33c85053698,d11a7a29e7e76319ea52bd0c130b0d99b22c365a..f8bed2302642c32b0ef26a0b33b1eb745c45f758
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,5 +1,6 @@@
+ * [Bug 1948] Update man page section layout.
 +* [Bug 1963] add reset command for ntpq :config, similar to ntpdc's.
+ * [Bug 1964] --without-sntp should not build sntp.
  (4.2.7p190) 2011/07/13 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1961] from 4.2.6p4: html2man update: distribute ntp-wait.html.
  * Require autogen-5.12.