merge cleanup

bk: 55918b16s5xcyaVFyTHd5X1PWQ46yw

diff --git a/ChangeLog b/ChangeLog
index 108934ae56e447b7a06d12dd8968c5e4d753fa5b..2202cb9943c3d1f874157d9563a7f7addf40a0ed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@ Below are from 4.2.8p3:
 * README.leapsmear added.  Martin Burnicki.
 * README.leapsmear edited.  Harlan Stenn.
 * tests/libntp/msyslog.c: fixed a gcc warning. Tomasz Flendrich.
+* ntpd/ntp.conf.def: Document DSCP and leapsmearinterval.  Harlan Stenn.
+* html/miscopt.html: Document leapsmearinterval, other cleanup.  Harlan Stenn.
 (4.3.48) 2015/06/28 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p3:
 * [Bug 1060] Buffer overruns in libparse/clk_rawdcf.c.  Helge Oldach.