Merge psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable

into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-copyright

bk: 54b64cf5ZE0k8K8Xzhrep--gw8OyHw

diff --cc ChangeLog
index f7b394557603b9edc080388b81f4ded21b1712fe,2428d29909c81d929eea71c017a4ab7e3e599e04..cc9788db073dbe1bcee2a1d01588dcff98b7e957
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,31 -1,8 +1,34 @@@
  ---
+ 
++* Copyright update.
++---
 +(4.2.8p1-beta5) 2015/01/07 Released by Harlan Stenn <stenn@ntp.org>
 +
 +* [Bug 2728] Work around C99-style structure initialization code
 +  for older compilers, specifically Visual Studio prior to VS2013.
 +* [Bug 2695] Windows build: __func__ not supported under Windows.
 +---
 +(4.2.8p1-beta4) 2015/01/04 Released by Harlan Stenn <stenn@ntp.org>
 +
 +* Fix a regression introduced to timepps-Solaris.h as part of:
 +  [Bug 1206] Required compiler changes for Windows
 +  (4.2.5p181) 2009/06/06
 +* [Bug 1084] PPSAPI for ntpd on Windows with DLL backends
 +* [Bug 2695] Build problem on Windows (sys/socket.h).
 +* [Bug 2715] mdnstries option for ntp.conf from NetBSD.
 +---
 +(4.2.8p1-beta3) 2015/01/02 Released by Harlan Stenn <stenn@ntp.org>
 +
 +* [Bug 2627] shm refclock allows only two units with owner-only access
 +  Use mode bit 0 to select public access for units >= 2 (units 0 & 1 are
 +  always private.
  * [Bug 2681] Fix display of certificate EOValidity dates on 32-bit systems.
  * [Bug 2695] 4.2.8 does not build on Windows.
 -* Copyright update.
 +* [bug 2700] mrulist stopped working in 4.2.8.
 +* [Bug 2706] libparse/info_trimble.c build dependencies are broken.
 +* [Bug 2713] variable type/cast, parameter name, general cleanup from NetBSD.
 +* [Bug 2714] libevent may need to be built independently of any build of sntp.
 +* [Bug 2715] mdnstries option for ntp.conf from NetBSD.
  ---
  (4.2.8p1-beta2) 2014/12/27 Released by Harlan Stenn <stenn@ntp.org>
  

diff --cc ntpdc/ntpdc.html
index 399b8e4aef8fdbd4618cd5697d72b30d4d1d0820,1cfe44d1e1bbe151c1746ff7758fcd46fc464116..8772b8401509cdd8a574475b69a428227086fe5c
--- 1/ntpdc/ntpdc.html
--- 2/ntpdc/ntpdc.html
+++ b/ntpdc/ntpdc.html
@@@ -149,10 -164,10 +164,10 @@@ This is the automatically generated usa
  the usage text by passing it through a pager program. 
  <code>more-help</code> is disabled on platforms without a working
  <code>fork(2)</code> function.  The <code>PAGER</code> environment variable is
- used to select the program, defaulting to <span class="file">more</span>.  Both will exit
+ used to select the program, defaulting to <samp><span class="file">more</span></samp>.  Both will exit
  with a status code of 0.
  
 -<pre class="example">ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p1-beta2
 +<pre class="example">ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p1-beta5
  Usage:  ntpdc [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]... [ host ...]
    Flg Arg Option-Name    Description
     -4 no  ipv4           Force IPv4 DNS name resolution

diff --cc scripts/ntp-wait/ntp-wait.html
index 2772e4f5f6199462be534c2fe0c9f1e3917722cf,a0a805247e53a82531767d5ee08eed428ea30a67..09065f4a2fa5d9679c176c50c1949e75bdd34fe7
--- 1/scripts/ntp-wait/ntp-wait.html
--- 2/scripts/ntp-wait/ntp-wait.html
+++ b/scripts/ntp-wait/ntp-wait.html
@@@ -111,10 -117,10 +117,10 @@@ This is the automatically generated usa
  the usage text by passing it through a pager program. 
  <code>more-help</code> is disabled on platforms without a working
  <code>fork(2)</code> function.  The <code>PAGER</code> environment variable is
- used to select the program, defaulting to <span class="file">more</span>.  Both will exit
+ used to select the program, defaulting to <samp><span class="file">more</span></samp>.  Both will exit
  with a status code of 0.
  
 -<pre class="example">ntp-wait - Wait for ntpd to stabilize the system clock - Ver. 4.2.8p1-beta2
 +<pre class="example">ntp-wait - Wait for ntpd to stabilize the system clock - Ver. 4.2.8p1-beta5
  USAGE: ntp-wait [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]...
  
      -n, --tries=num              Number of times to check ntpd

diff --cc scripts/ntptrace/ntptrace.html
index c69c8d5d0a88cfd70fe58f0c1d5b5212565ae545,e5d296e75e28e7af0acc39b7fee76050c3e1dc47..ffe3167783622774701a9b9f9f76e77772079c0b
--- 1/scripts/ntptrace/ntptrace.html
--- 2/scripts/ntptrace/ntptrace.html
+++ b/scripts/ntptrace/ntptrace.html
@@@ -104,10 -108,10 +108,10 @@@ This is the automatically generated usa
  the usage text by passing it through a pager program. 
  <code>more-help</code> is disabled on platforms without a working
  <code>fork(2)</code> function.  The <code>PAGER</code> environment variable is
- used to select the program, defaulting to <span class="file">more</span>.  Both will exit
+ used to select the program, defaulting to <samp><span class="file">more</span></samp>.  Both will exit
  with a status code of 0.
  
 -<pre class="example">ntptrace - Trace peers of an NTP server - Ver. 4.2.8p1-beta2
 +<pre class="example">ntptrace - Trace peers of an NTP server - Ver. 4.2.8p1-beta5
  USAGE: ntptrace [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]... [host]
  
      -n, --numeric                Print IP addresses instead of hostnames

diff --cc sntp/sntp.html
index 286cf7107bb419ce30e04d024f8fd591dd8c1fe1,bd6a6635b9989b9a47f2c6a4ddb7a286b0a49a8f..7487ec4506df035727fb57af069aa82a1898fbf7
--- 1/sntp/sntp.html
--- 2/sntp/sntp.html
+++ b/sntp/sntp.html
@@@ -172,10 -187,10 +187,10 @@@ This is the automatically generated usa
  the usage text by passing it through a pager program. 
  <code>more-help</code> is disabled on platforms without a working
  <code>fork(2)</code> function.  The <code>PAGER</code> environment variable is
- used to select the program, defaulting to <span class="file">more</span>.  Both will exit
+ used to select the program, defaulting to <samp><span class="file">more</span></samp>.  Both will exit
  with a status code of 0.
  
 -<pre class="example">sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p1-beta2
 +<pre class="example">sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p1-beta5
  Usage:  sntp [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]... \
                  [ hostname-or-IP ...]
    Flg Arg Option-Name    Description