X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pintos-anon;a=blobdiff_plain;f=LICENSE;h=8702541a9c913e71669cc6ef62cef16543f688c4;hp=ef2456065a4d47d038222a3db8601921d08ea22e;hb=94d17ee9287aec1c4c9ee37ca02615e8293a5f3a;hpb=9bade155997ac1dfe4eebb5b5dfe7ff2b38ffdc8

diff --git a/LICENSE b/LICENSE
index ef24560..8702541 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,35 @@
-Code derived from Nachos is subject to the following license:
+Pintos, including its documentation, is subject to the following
+license:
+
+    Copyright (C) 2004, 2005, 2006 Board of Trustees, Leland Stanford
+    Jr. University.  All rights reserved.
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+A few individual files in Pintos were originally derived from other
+projects, but they have been extensively modified for use in Pintos.
+The original code falls under the original license, and modifications
+for Pintos are additionally covered by the Pintos license above. 
+
+In particular, code derived from Nachos is subject to the following
+license:
 
 /* Copyright (c) 1992-1996 The Regents of the University of California.
    All rights reserved.
@@ -24,8 +55,8 @@ Code derived from Nachos is subject to the following license:
    MODIFICATIONS.
 */
 
-Code derived from MIT's 6.828 course code is subject to the following
-license:
+Also, code derived from MIT's 6.828 course code is subject to the
+following license:
 
 /*
  * Copyright (C) 1997 Massachusetts Institute of Technology 
@@ -62,30 +93,3 @@ license:
  * holders listed in the AUTHORS file. The rest of this file is covered by
  * the copyright notices, if any, listed below.
  */
-
-Other code, and modifications to the above code made for this project,
-is subject to the following license:
-
-Copyright 2004 Board of Trustees, Leland Stanford Jr. University
-  
-All rights reserved.
-  
-Export of this software from the United States of America may require a
-specific license from the United States Government.  It is the
-responsibility of any person or organization contemplating export to
-obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and distribute
-this software and its documentation for any purpose and without fee is
-hereby granted, provided that the above copyright notice appear in all
-copies and that both that copyright notice and this permission notice
-appear in supporting documentation, and that the name of Stanford
-University not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior permission.
-Stanford University makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.