Change Scala license to unmodified 3-clause BSD.

No longer using the slightly reworded 3-clause BSD license. This does not change the meaning of the license, just aligns it with the standard wording.
scala · Aug 27, 2013 · bf93057e2eb41629f69657ea4a60acac0b824fce · bf93057
1 parent ba86ac6
commit bf93057e2eb41629f69657ea4a60acac0b824fce
Unified Split
Showing with 24 additions and 32 deletions.
+24 −32 docs/LICENSE
diff --git a/docs/LICENSE b/docs/LICENSE
@@ -1,35 +1,27 @@
-
-SCALA LICENSE
+
+Copyright (c) 2002-2013 EPFL

-
-Copyright (c) 2002-2012 EPFL, Lausanne, unless otherwise specified.
 All rights reserved.

-
-This software was developed by the Programming Methods Laboratory of the
-
-Swiss Federal Institute of Technology (EPFL), Lausanne, Switzerland.
-
-
-
-Permission to use, copy, modify, and distribute this software in source
-
-or binary form for any purpose with or without fee is hereby granted,
-
-provided that the following conditions are met:
-
-
-
-1. Redistributions of source code must retain the above copyright
-
-notice, this list of conditions and the following disclaimer.
-
-
-
-2. 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.
-
-
-
-3. Neither the name of the EPFL nor the names of its contributors
-
-may be used to endorse or promote products derived from this
-
-software without specific prior written permission.
-
-
-
-
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+
+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.
+
+* Neither the name of the EPFL nor the names of its contributors
+
+may be used to endorse or promote products derived from this software
+
+without specific prior written permission.
+
+
+
+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.