Merge bk://ntp2.isc.org/ntp-dev

into  psp-deb1.ntp.org:/home/stenn/ntp-dev-sntp

bk: 4b0e21eaZaAuoGNdVsKsVBygtNQIjw

diff --cc ChangeLog
index 48f72d3242311716ef910dd78dc8fbb03ecb4467,60a23adc761ff117c5566ee415bf0b2cfff63ed2..56b866bd8226f3d9ce05a185d626b60921eedbfa
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,9 +1,10 @@@
 +* Prepare for the generation of sntp.html.
+ * Documentation changes from Dave Mills.
+ * [Bug 1387] Storage leak in ntp_intres (minor).
+ * [Bug 1389] buffer overflow in refclock_oncore.c
+ * [Bug 1391] .texi usage text from installed, not built binaries.
+ * [Bug 1392] intres retries duplicate assocations endlessly.
+ * Correct *-opts.h dependency so default 'get' action isn't used.
  (4.2.5p247-RC) 2009/11/20 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1142] nodebug builds shed no light on -d, -D option failure.
  * [Bug 1179] point out the problem with -i/--jaildir and -u/--user when

diff --cc configure.ac
Simple merge

diff --cc sntp/Makefile.am
index d7a64463bf76bd844b3a0f6f512fd6206e189b61,621504090fdebb6aa406b0cae94d3b1ec4401091..dbe154cedb7cf6f98c8a3136dc31a1a6e8c25d57
--- 1/sntp/Makefile.am
--- 2/sntp/Makefile.am
+++ b/sntp/Makefile.am
@@@ -125,11 -111,9 +126,12 @@@ $(srcdir)/sntp.1: $(srcdir)/sntp-opts.d
        $(run_ag) -Tagman1.tpl -bsntp sntp-opts.def
  
  $(srcdir)/sntp-opts.texi $(srcdir)/sntp-opts.menu: $(srcdir)/sntp-opts.def $(srcdir)/../include/version.def
+       $(MAKE) sntp    # aginfo.tpl runs the binary to extract --help usage text
        $(run_ag) -Taginfo.tpl -DLEVEL=section sntp-opts.def
  
 +$(srcdir)/sntp.html: $(srcdir)/sntp-opts.menu $(srcdir)/sntp-opts.texi $(srcdir)/sntp.texi $(srcdir)/version.texi
 +      cd $(srcdir) && makeinfo --force --html --no-split -o sntp.html sntp.texi
 +
  ../libntp/libntp.a:
        cd ../libntp && $(MAKE)