From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 3 Mar 2020 08:40:52 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-p14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96b2a9a5dadaef8a5132db84f091c9a5a58a1cf1;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-p14
into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-p14-sec

bk: 5e5e1814i9GszDV4wm5rW0U-63u0Jw
---

96b2a9a5dadaef8a5132db84f091c9a5a58a1cf1
diff --cc ChangeLog
index 6bb01c3e9,856ce7657..1c5777d9b
--- a/ChangeLog
+++ b/ChangeLog
@@@ -88,9 -84,8 +88,10 @@@
  * [Bug 1433] runtime check whether the kernel really supports capabilities
    - (modified) patch by Kurt Roeckx <perlinger@ntp.org>
  * Clean up sntp/networking.c:sendpkt() error message.  <stenn@ntp.org>
 +* Provide more detail on unrecognized config file parser tokens. <stenn@ntp.org>
 +* Startup log improvements. <stenn@ntp.org>
  * Update the copyright year.
+ * html/confopt.html: cleanup. <stenn@ntp.org>
  
  ---
  (4.2.8p13) 2019/03/07 Released by Harlan Stenn <stenn@ntp.org>