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

diff --git a/LICENSE b/LICENSE
index 30e57e7..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,28 +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.
-
-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.