From: Dave Hart <hart@ntp.org>
Date: Sat, 16 Jul 2011 22:53:14 +0000 (+0000)
Subject: Merge bk://bk2.ntp.org./ntp-dev
X-Git-Tag: NTP_4_2_7P191~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5de4890b092a4f01c3e3bfe6d0044d173113375;p=thirdparty%2Fntp.git

Merge bk://bk2.ntp.org./ntp-dev
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1963

bk: 4e22165aRYLNQnZKh-0w-TKGx5pfJA
---

d5de4890b092a4f01c3e3bfe6d0044d173113375
diff --cc ChangeLog
index db7ab2852,d11a7a29e..f8bed2302
--- a/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.