From: Harlan Stenn Date: Tue, 27 Jun 2006 08:19:41 +0000 (-0400) Subject: Resolve the ambiguity in the copyright file X-Git-Tag: NTP_4_2_2P0_RC7~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e91b95c15e1c121b4ca7056c45316e6833a44c7f;p=thirdparty%2Fntp.git Resolve the ambiguity in the copyright file bk: 44a0ea1dcug041pYryXDskTeG1KPtw --- diff --git a/NEWS b/NEWS index 40cb667bd..6a87f8e2b 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,6 @@ (4.2.2) +* Resolve an ambiguity in the copyright notice +- * SNTP * Many bugfixes * Implements the current "goal state" of NTPv4 diff --git a/html/copyright.html b/html/copyright.html index 5a69cb27c..a08506ad8 100644 --- a/html/copyright.html +++ b/html/copyright.html @@ -11,7 +11,7 @@

Copyright Notice

jpg "Clone me," says Dolly sheepishly -

Last update: 19:36 UTC Monday, January 23, 2006

+

Last update: 02:45 UTC Tuesday, June 27, 2006


The following copyright notice applies to all files collectively called the Network Time Protocol Version 4 Distribution. Unless specifically declared otherwise in an individual file, this notice applies as if the text was explicitly included in the file.
@@ -22,7 +22,7 @@ * Copyright (c) David L. Mills 1992-2006 * * * * Permission to use, copy, modify, and distribute this software and * -* its documentation for any purpose and without fee is hereby * +* its documentation for any purpose with or without fee is hereby * * granted, provided that the above copyright notice appears in all * * copies and that both the copyright notice and this permission * * notice appear in supporting documentation, and that the name * @@ -60,7 +60,7 @@

  • Jeff Johnson <jbj@chatham.usdesign.com> massive prototyping overhaul
  • Hans Lambermont <Hans.Lambermont@nl.origin-it.com> or <H.Lambermont@chello.nl> ntpsweep
  • Poul-Henning Kamp <phk@FreeBSD.ORG> Oncore driver (Original author) -
  • Frank Kardel <Frank.Kardel@informatik.uni-erlangen.de> PARSE <GENERIC> driver (14 reference clocks), STREAMS modules for PARSE, support scripts, syslog cleanup +
  • Frank Kardel <kardel (at) ntp (dot) org> PARSE <GENERIC> driver (>14 reference clocks), STREAMS modules for PARSE, support scripts, syslog cleanup, dynamic interface handling
  • William L. Jones <jones@hermes.chpc.utexas.edu> RS/6000 AIX modifications, HPUX modifications
  • Dave Katz <dkatz@cisco.com> RS/6000 AIX port
  • Craig Leres <leres@ee.lbl.gov> 4.4BSD port, ppsclock, Magnavox GPS clock driver @@ -93,4 +93,4 @@ - \ No newline at end of file +