X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/blobdiff_plain/17ff8c4b215552a4880d5fa0d66f3a0fa22d71e9..d37b14c8486d027448eff1adc789fde90fd65b6f:/COPYRIGHT

diff --git a/COPYRIGHT b/COPYRIGHT
index 04ba2b5936..7338122041 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,33 +1,52 @@
 # $FreeBSD: src/COPYRIGHT,v 1.4 1999/09/05 21:33:47 obrien Exp $
-# $DragonFly: src/COPYRIGHT,v 1.3 2004/01/08 17:10:08 drhodus Exp $
+# $DragonFly: src/COPYRIGHT,v 1.9 2006/01/01 00:00:06 swildner Exp $
 #	@(#)COPYRIGHT	8.2 (Berkeley) 3/21/94
 
-The compilation of software known as DragonFly is distributed under the
-following terms:
+Authors of new code wishing specific recognition are encouraged to use the
+DragonFly copyright with the following paragraph inserting just after the
+Copyright line.  Multiple authors should simply append their names to the
+[pre-existing] paragraph:
 
-Copyright (C) 2003-2004 The DragonFly Project. All rights reserved.
+ This code is derived from software contributed to The DragonFly Project
+ by Author Name <author@email.address>
+
+--
+
+The software known as "DragonFly" or "DragonFly BSD" is distributed under
+the following terms:
+
+Copyright (c) 2003, 2004, 2005, 2006
+	The DragonFly Project.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
+
 1. Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
 2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+3. Neither the name of The DragonFly Project nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific, prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
 
+--
+
 The 4.4BSD and 4.4BSD-Lite software is distributed under the following
 terms:
 
@@ -65,6 +84,8 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
 
+--
+
 The Institute of Electrical and Electronics Engineers and the American
 National Standards Committee X3, on Information Processing Systems have
 given us permission to reprint portions of their documentation.
@@ -94,6 +115,7 @@ those of the authors and should not be interpreted as representing official
 policies, either expressed or implied, of the Regents of the University
 of California.
 
+--
 
 NOTE: The copyright of UC Berkeley's Berkeley Software Distribution ("BSD")
 source has been updated.  The copyright addendum may be found at
@@ -125,3 +147,6 @@ in its entirety.
 William Hoskins
 Director, Office of Technology Licensing
 University of California, Berkeley
+
+--
+