X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=DISCLAIMER;h=a0af1efe177da29eeaa17cffc2ca4fcec8258b29;hb=5bb90f438bd0e9e0404fb203e27e926876a270b3;hp=86778c593f25766df8ddb76fb8a998cc8f8f58ae;hpb=34dc7c2f2553220ebc6e29ca195fb6d57155f95f;p=mirror_zfs-debian.git

diff --git a/DISCLAIMER b/DISCLAIMER
index 86778c59..a0af1efe 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 United 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
-modification are specified in the file "COPYING".
+The precise terms and conditions for copying, distribution, and
+modification are specified in the file OPENSOLARIS.LICENSE.