Update COPYRIGHT and DISCLAIMER.

Update the COPYRIGHT and DISCLAIMER in an attempt to be clear about
the copyright and licensing issues.

2 files changed, 31 insertions, 21 deletions

diff --git a/COPYRIGHT b/COPYRIGHT
index 2ca159945..1123393f7 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,14 @@
-The bulk of the library is Copyright 2004 Sun Microsystems, Inc.
-Portions are Copyright 2006 OmniTI, Inc.
+The majority of the code is this project comes from OpenSolaris which
+has been released under the CDDL open source license.  This includes
+the core ZFS code, libavl, libnvpair, libefi, libunicode, and libutil.
+The original OpenSolaris source can be downloaded from:
 
-The library is distributed under the terms of the CDDL.
-See the file OPENSOLARIS.LICENSE for more information.
+http://dlc.sun.com/osol/on/downloads/b121/on-src.tar.bz2
 
+Files which do not originate from OpenSolaris are noted by a header
+and attributed properly.  These exceptions include but are not limited
+to the vdev_disk.c and zvol.c implementation which are also licensed
+under the CDDL.
+
+This package is distributed under the terms of the CDDL.  See the file
+OPENSOLARIS.LICENSE for more information.
diff --git a/DISCLAIMER b/DISCLAIMER
index 86778c593..1bb04be7e 100644
--- a/DISCLAIMER
+++ b/DISCLAIMER
@@ -1,22 +1,24 @@
-This notice is required to be provided under our contract with the 
-U.S. Department of Energy (DOE).  This work was produced at the 
-Lawrence Livermore National Laboratory under Contract with the DOE.
+This work was produced at the Lawrence Livermore National Laboratory
+(LLNL) under Contract No. DE-AC52-07NA27344 (Contract 44) between
+the U.S. Department of Energy (DOE) and Lawrence Livermore National
+Security, LLC (LLNS) for the operation of LLNL.
 
-Neither the United States Government nor the Lawrence Livermore National
-Security, LLC. nor any of their employees, makes any warranty, express
-or implied, or assumes any liability or responsibility for the accuracy,
-completeness, or usefulness of any information, apparatus, product,
-or process disclosed, or represents that its use would not infringe
-privately-owned rights.
+This work was prepared as an account of work sponsored by an agency of
+the United States Government.  Neither the United States Government nor
+Lawrence Livermore National Security, LLC nor any of their employees,
+makes any warranty, express or implied, or assumes any liability or
+responsibility for the accuracy, completeness, or usefulness of any
+information, apparatus, product, or process disclosed, or represents
+that its use would not infringe privately-owned rights.
 
-Also, reference herein to any specific commercial products, process,
-or services by trade name, trademark, manufacturer or otherwise does
+Reference herein to any specific commercial products, process, or
+services by trade name, trademark, manufacturer or otherwise does
 not necessarily constitute or imply its endorsement, recommendation,
-or favoring by the United States Government or the  Lawrence Livermore
-National Security, LLC.  The views and opinions of authors expressed 
-herein do not necessarily state or reflect those of the United States 
-Government or the  Lawrence Livermore National Security, LLC., and 
-shall not be used for advertising or product endorsement purposes.
+or favoring by the United States Government or Lawrence Livermore
+National Security, LLC.  The views and opinions of authors expressed
+herein do not necessarily state or reflect those of the Untied States
+Government or Lawrence Livermore National Security, LLC, and shall
+not be used for advertising or product endorsement purposes.
 
-The precise terms and conditions for copying, distribution and
+The precise terms and conditions for copying, distribution, and
 modification are specified in the file "COPYING".