--- a/COPYRIGHT Sun Jun 20 09:30:12 2004 +0200
+++ b/COPYRIGHT Mon Jun 21 10:25:57 2004 +0200
@@ -1,22 +1,35 @@
ISABELLE COPYRIGHT NOTICE, LICENCE AND DISCLAIMER.
-Copyright (C) 2003 by the University of Cambridge, Cambridge, UK and
- by the Technical University of Munich, Munich, Germany.
+Copyright (c) 2004,
+ University of Cambridge and
+ Technische Universitaet Muenchen.
+
+ All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+* 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.
-Permission to use, copy, modify, and distribute this software and its
-documentation for any non-commercial purpose and 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 and warranty
-disclaimer appear in supporting documentation, and that the name of the
-University of Cambridge or the Technical University of Munich not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.
+* Neither the name of the University of Cambridge or the Technical
+University of Munich nor the names of their contributors may be used to
+endorse or promote products derived from this software without specific
+prior written permission.
-The University of Cambridge and the Technical University of Munich disclaim
-all warranties with regard to this software, including all implied warranties
-of merchantability and fitness. In no event shall the University of Cambridge
-or the Technical University of Munich be liable for any special, indirect or
-consequential damages or any damages whatsoever resulting from loss of use,
-data or profits, whether in an action of contract, negligence or other
-tortious action, arising out of or in connection with the use or performance
-of this software.
+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
+OWNER 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.