Module Name:    src
Committed By:   martin
Date:           Mon Dec  9 16:20:11 UTC 2019

Modified Files:
        src/distrib/notes/common [netbsd-9]: legal.common

Log Message:
Pull up the following changes, requested by uwe in ticket #536:

        distrib/notes/common/legal.common               upto 1.124 (adapted)

Sync with reality and sort.


To generate a diff of this commit:
cvs rdiff -u -r1.98.12.1 -r1.98.12.2 src/distrib/notes/common/legal.common

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/notes/common/legal.common
diff -u src/distrib/notes/common/legal.common:1.98.12.1 src/distrib/notes/common/legal.common:1.98.12.2
--- src/distrib/notes/common/legal.common:1.98.12.1	Thu Nov 21 19:28:39 2019
+++ src/distrib/notes/common/legal.common	Mon Dec  9 16:20:11 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: legal.common,v 1.98.12.1 2019/11/21 19:28:39 martin Exp $
+.\" $NetBSD: legal.common,v 1.98.12.2 2019/12/09 16:20:11 martin Exp $
 .\"
 .\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -55,9 +55,6 @@ This product includes software developed
 NetBSD Project.  See https://www.NetBSD.org/ for
 information about NetBSD.
 .It
-This product includes software developed by Intel Corporation and
-its contributors.
-.It
 This product includes cryptographic software written by
 Eric Young ([email protected])
 .It
@@ -66,55 +63,41 @@ Eric Young ([email protected])
 .It
 This product includes software designed by William Allen Simpson.
 .It
-This product includes software developed at Ludd, University of
-Lulea, Sweden and its contributors.
+This product includes software developed at Ludd, University of Lule\(oa.
 .It
-This product includes software developed at Ludd, University of Lulea.
+This product includes software developed at Ludd, University of
+Lule\(oa, Sweden and its contributors.
 .It
 This product includes software developed at the Information
 Technology Division, US Naval Research Laboratory.
 .It
-This product includes software developed by
-David Jones and Gordon Ross
-.It
-This product includes software developed by
-Hellmuth Michaelis and Joerg Wunsch
-.It
-This product includes software developed by
-Internet Research Institute, Inc.
-.It
-This product includes software developed by
-Leo Weppelman and Waldi Ravens.
-.It
-This product includes software developed by  Mika Kortelainen
-.It
 This product includes software developed by Aaron Brown and
 Harvard University.
 .It
 This product includes software developed by Adam Ciarcinski for
 the NetBSD project.
 .It
+This product includes software developed by Adam Glass.
+.It
 This product includes software developed by Adam Glass and Charles M.
 Hannum.
 .It
-This product includes software developed by Adam Glass.
+This product includes software developed by Alex Zepeda.
 .It
 This product includes software developed by Alex Zepeda, and
 Colin Wood for the NetBSD Projet.
 .It
-This product includes software developed by Alex Zepeda.
-.It
 This product includes software developed by Allen Briggs.
 .It
 This product includes software developed by Amancio Hasty and
 Roger Hardiman
 .It
-This product includes software developed by Berkeley Software Design, Inc.
+This product includes software developed by Ben Gray.
 .It
-This product includes software developed by Bill Paul.
+This product includes software developed by Berkeley Software Design,
+Inc.
 .It
-This product includes software developed by Bodo Moeller.
-(If available, substitute umlauted o for oe)
+This product includes software developed by Bill Paul.
 .It
 This product includes software developed by Boris Popov.
 .It
@@ -126,30 +109,35 @@ This product includes software developed
 .It
 This product includes software developed by Charles Hannum.
 .It
+This product includes software developed by Charles M. Hannum.
+.It
 This product includes software developed by Charles M. Hannum, by the
 University of Vermont and State Agricultural College and Garrett A.
 Wollman, by William F. Jolitz, and by the University of California,
 Berkeley, Lawrence Berkeley Laboratory, and its contributors.
 .It
-This product includes software developed by Charles M. Hannum.
+This product includes software developed by Christian E. Hopps.
 .It
 This product includes software developed by Christian E. Hopps,
 Ezra Story, Kari Mettinen, Markus Wild, Lutz Vieweg
 and Michael Teske.
 .It
-This product includes software developed by Christian E. Hopps.
+This product includes software developed by Christopher G. Demetriou.
 .It
 This product includes software developed by Christopher G. Demetriou
 for the NetBSD Project.
 .It
-This product includes software developed by Christopher G. Demetriou.
-.It
 This product includes software developed by Chuck Silvers.
 .It
+This product includes software developed by Cisco Systems, Inc.
+.It
+This product includes software developed by Colin Wood.
+.It
 This product includes software developed by Colin Wood
 for the NetBSD Project.
 .It
-This product includes software developed by Colin Wood.
+This product includes software developed by Computing Services
+at Carnegie Mellon University (http://www.cmu.edu/computing/).
 .It
 This product includes software developed by Daan Vreeken.
 .It
@@ -161,6 +149,9 @@ and Michael L. Hitch.
 This product includes software developed by Daniel Widenfalk
 for the NetBSD Project.
 .It
+This product includes software developed by
+David Jones and Gordon Ross
+.It
 This product includes software developed by David Miller.
 .It
 This product includes software developed by Dean Huxley.
@@ -175,19 +166,19 @@ This product includes software developed
 .It
 This product includes software developed by Eric Young ([email protected])
 .It
-This product includes software developed by Ezra Story and  by Kari
+This product includes software developed by Ezra Story.
+.It
+This product includes software developed by Ezra Story and by Kari
 Mettinen.
 .It
 This product includes software developed by Ezra Story, by Kari
 Mettinen and by Bernd Ernesti.
 .It
 This product includes software developed by Ezra Story, by Kari
-Mettinen, Michael Teske and by Bernd Ernesti.
-.It
-This product includes software developed by Ezra Story, by Kari
 Mettinen, and Michael Teske.
 .It
-This product includes software developed by Ezra Story.
+This product includes software developed by Ezra Story, by Kari
+Mettinen, Michael Teske and by Bernd Ernesti.
 .It
 This product includes software developed by Frank van der Linden for
 the NetBSD Project.
@@ -200,10 +191,13 @@ This product includes software developed
 .It
 This product includes software developed by Gordon Ross
 .It
+This product includes software developed by Harvard University.
+.It
 This product includes software developed by Harvard University and
 its contributors.
 .It
-This product includes software developed by Harvard University.
+This product includes software developed by
+Hellmuth Michaelis and Joerg Wunsch
 .It
 This product includes software developed by Henrik Vestergaard Draboel.
 .It
@@ -216,9 +210,15 @@ the NetBSD Project.
 .It
 This product includes software developed by Ian W. Dall.
 .It
+This product includes software developed by Intel Corporation and
+its contributors.
+.It
 This product includes software developed by Internet
 Initiative Japan Inc.
 .It
+This product includes software developed by
+Internet Research Institute, Inc.
+.It
 This product includes software developed by James R. Maynard III.
 .It
 This product includes software developed by Jared D. McNeill.
@@ -241,22 +241,22 @@ This product includes software developed
 .It
 This product includes software developed by John Polstra.
 .It
-This product includes software developed by Jonathan R. Stone
-for the NetBSD Project.
+This product includes software developed by Jonathan R. Stone for
+the NetBSD Project.
+.It
+This product includes software developed by Jonathan Stone.
 .It
 This product includes software developed by Jonathan Stone
 and Jason R. Thorpe for the NetBSD Project.
 .It
-This product includes software developed by Jonathan Stone.
-.It
 This product includes software developed by Jonathan Stone for
 the NetBSD Project.
 .It
 This product includes software developed by Julian Highfield.
 .It
-This product includes software developed by K. Kobayashi.
+This product includes software developed by K. Kobayashi
 .It
-This product includes software developed by K. Kobayashi and H. Shimokawa.
+This product includes software developed by K. Kobayashi and H. Shimokawa
 .It
 This product includes software developed by Kazuhisa Shimizu.
 .It
@@ -270,22 +270,24 @@ This product includes software developed
 Ernesti, by Michael van Elst, and by the University of California,
 Berkeley and its contributors.
 .It
+This product includes software developed by Kyma Systems.
+.It
+This product includes software developed by
+Leo Weppelman and Waldi Ravens.
+.It
 This product includes software developed by Lloyd Parkes.
 .It
 This product includes software developed by Lutz Vieweg.
 .It
-This product includes software developed by MINOURA Makoto,
-Takuya Harakawa.
-.It
 This product includes software developed by Marc Horowitz.
 .It
 This product includes software developed by Marcus Comstedt.
 .It
-This product includes software developed by Mark Brinicombe for
-the NetBSD project.
-.It
 This product includes software developed by Mark Brinicombe.
 .It
+This product includes software developed by Mark Brinicombe
+for the NetBSD Project.
+.It
 This product includes software developed by Mark Tinguely and Jim Lowe
 .It
 This product includes software developed by Markus Wild.
@@ -296,13 +298,15 @@ This product includes software developed
 .It
 This product includes software developed by Masaru Oki.
 .It
-This product includes software developed by Matthew Fredette.
+This product includes software developed by Matt DeBergalis
 .It
-This product includes software developed by Matt DeBergalis.
+This product includes software developed by Matthew Fredette.
 .It
 This product includes software developed by Michael Smith.
 .It
-This product includes software developed by Microsoft.
+This product includes software developed by Microsoft
+.It
+This product includes software developed by Mika Kortelainen
 .It
 This product includes software developed by Mike Pritchard.
 .It
@@ -311,20 +315,29 @@ contributors.
 .It
 This product includes software developed by Minoura Makoto.
 .It
+This product includes software developed by MINOURA Makoto,
+Takuya Harakawa.
+.It
 This product includes software developed by Niels Provos.
 .It
+This product includes software developed by Niklas Hallqvist.
+.It
 This product includes software developed by Niklas Hallqvist,
 Brandon Creighton and Job de Haas.
 .It
-This product includes software developed by Niklas Hallqvist.
-.It
 This product includes software developed by Paolo Abeni.
 .It
 This product includes software developed by Paul Kranenburg.
 .It
 This product includes software developed by Paul Mackerras.
 .It
-This product includes software developed by Per Fogelstrom
+This product includes software developed by Paul Mackerras
+<[email protected]>.
+.It
+This product includes software developed by Pedro Roque Marques
+<[email protected]>
+.It
+This product includes software developed by Per Fogelstrom.
 .It
 This product includes software developed by Peter Galbavy.
 .It
@@ -336,7 +349,7 @@ This product includes software developed
 .It
 This product includes software developed by RiscBSD.
 .It
-This product includes software developed by Roar Thron�s.
+This product includes software developed by Roar Thron\(aes.
 .It
 This product includes software developed by Rodney W. Grimes.
 .It
@@ -344,11 +357,11 @@ This product includes software developed
 .It
 This product includes software developed by Rolf Grossmann.
 .It
+This product includes software developed by Ross Harvey.
+.It
 This product includes software developed by Ross Harvey
 for the NetBSD Project.
 .It
-This product includes software developed by Ross Harvey.
-.It
 This product includes software developed by Scott Bartram.
 .It
 This product includes software developed by Scott Stevens.
@@ -360,7 +373,7 @@ University of California, Berkeley, and 
 .It
 This product includes software developed by Stephan Thesing.
 .It
-This product includes software developed by Steven M. Bellovin.
+This product includes software developed by Steven M. Bellovin
 .It
 This product includes software developed by Takashi Hamada.
 .It
@@ -369,26 +382,24 @@ This product includes software developed
 This product includes software developed by Tatoku Ogaito
 for the NetBSD Project.
 .It
-This product includes software developed by Texas A&M University
-and its contributors.
-.It
-This product includes software developed by Thomas Gerner.
+This product includes software developed by Tommi Komulainen
+<[email protected]>.
 .It
 This product includes software developed by TooLs GmbH.
 .It
 This product includes software developed by Trimble Navigation, Ltd.
 .It
+This product includes software developed by Waldi Ravens.
+.It
 This product includes software developed by WIDE Project and
 its contributors.
 .It
-This product includes software developed by Waldi Ravens.
-.It
 This product includes software developed by Winning Strategies, Inc.
 .It
-This product includes software developed by Yasushi Yamasaki.
+This product includes software developed by Yasushi Yamasaki
 .It
 This product includes software developed by Yen Yen Lim and
-North Dakota State University.
+North Dakota State University
 .It
 This product includes software developed by Zembu Labs, Inc.
 .It
@@ -397,7 +408,10 @@ This product includes software developed
 This product includes software developed by the Computer Systems
 Engineering Group at Lawrence Berkeley Laboratory.
 .It
-This product includes software developed by the David Muir Sharnoff.
+.\" Nonstandard formatting of the ad clause in hp300 and hppa code
+.\" e.g. sys/arch/hppa/include/param.h
+This product includes software developed by the Computer Systems
+Laboratory at the University of Utah.
 .It
 This product includes software developed by the Harvard
 University and its contributors.
@@ -414,7 +428,7 @@ for use in the OpenSSL Toolkit. (http://
 This product includes software developed by the PocketBSD project
 and its contributors.
 .It
-This product includes software developed by the RiscBSD kernel team.
+This product includes software developed by the RiscBSD kernel team
 .It
 This product includes software developed by the RiscBSD team.
 .It
@@ -422,20 +436,13 @@ This product includes software developed
 Development Group at Sun Microsystems, Inc.
 .It
 This product includes software developed by the University of
-California, Berkeley and its contributors, as well as the Trustees of
-Columbia University.
-.It
-This product includes software developed by the University of
-California, Lawrence Berkeley Laboratory and its contributors.
+California, Lawrence Berkeley Laboratories.
 .It
 This product includes software developed by the University of
 California, Lawrence Berkeley Laboratory.
 .It
-This product includes software developed by the University of
-Illinois at Urbana and their contributors.
-.It
-This product includes software developed by the Urbana-Champaign
-Independent Media Center.
+This product includes software developed by the University of California,
+Lawrence Berkeley Laboratory and its contributors.
 .It
 This product includes software developed by the University of
 Vermont and State Agricultural College and Garrett A. Wollman.
@@ -445,24 +452,37 @@ and State Agricultural College and Garre
 Jolitz, and by the University of California, Berkeley, Lawrence
 Berkeley Laboratory, and its contributors.
 .It
+This product includes software developed by the Urbana-Champaign
+Independent Media Center.
+.It
 This product includes software developed for the FreeBSD project
 .It
+This product includes software developed for the NetBSD Project by
+Allegro Networks, Inc., and Wasabi Systems, Inc.
+.It
 This product includes software developed for the NetBSD Project
 by Bernd Ernesti.
 .It
 This product includes software developed for the NetBSD Project
 by Christopher G. Demetriou.
 .It
+This product includes software developed for the NetBSD Project by
+Eiji Kawauchi.
+.It
 This product includes software developed for the NetBSD Project
 by Frank van der Linden
 .It
+This product includes software developed for the NetBSD Project by
+Genetec Corporation.
+.It
 This product includes software developed for the NetBSD Project
 by Jason R. Thorpe.
 .It
 This product includes software developed for the NetBSD Project
 by John M. Vinopal.
 .It
-This product includes software developed by Kyma Systems.
+This product includes software developed for the NetBSD Project by
+Jonathan Stone.
 .It
 This product includes software developed for the NetBSD Project by
 Kyma Systems LLC.
@@ -473,54 +493,33 @@ by Matthias Drochner.
 This product includes software developed for the NetBSD Project
 by Perry E. Metzger.
 .It
-This product includes software developed for the NetBSD Project
-by Scott Bartram and Frank van der Linden
-.It
-This product includes software developed for the NetBSD Project by
-Allegro Networks, Inc., and Wasabi Systems, Inc.
-.It
-This product includes software developed for the NetBSD Project by
-Eiji Kawauchi.
-.It
-This product includes software developed for the NetBSD Project by
-Genetec Corporation.
-.It
-This product includes software developed for the NetBSD Project by
-Jonathan Stone.
-.It
 This product includes software developed for the NetBSD Project by
 Piermont Information Systems Inc.
 .It
 This product includes software developed for the NetBSD Project by
-SUNET, Swedish University Computer Network.
+Shigeyuki Fukushima.
 .It
 This product includes software developed for the NetBSD Project by
-Shigeyuki Fukushima.
+SUNET, Swedish University Computer Network.
 .It
 This product includes software developed for the NetBSD Project by
 Wasabi Systems, Inc.
 .It
-This product includes software developed under OpenBSD by
-Per Fogelstrom Opsycon AB for RTMX Inc, North Carolina, USA.
+This product includes software developed or owned by Caldera
+International, Inc.
 .It
 This product includes software developed under OpenBSD by
 Per Fogelstrom.
 .It
+This product includes software developed under OpenBSD by
+Per Fogelstrom Opsycon AB for RTMX Inc, North Carolina, USA.
+.It
 This software was developed by Holger Veit and Brian Moore
 for use with "386BSD" and similar operating systems.
 "Similar operating systems" includes mainly non-profit oriented
 systems for research and education, including but not restricted to
 "NetBSD", "FreeBSD", "Mach" (by CMU).
 .It
-This software includes software developed by the Computer Systems
-Laboratory at the University of Utah.
-.It
-This product includes software developed by Computing Services
-at Carnegie Mellon University (http://www.cmu.edu/computing/).
-.It
-This product includes software developed or owned by Caldera
-International, Inc.
-.It
 .\" For compliance with term (b) of
 .\" localsrc/legal/TheOpenGroup/TOG_LICENSE:
 .\"

Reply via email to