summaryrefslogtreecommitdiff
path: root/docs/LICENSE
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2013-12-09 11:48:49 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2013-12-10 11:09:04 -0800
commit27a38602decb891399fc9868b4dd7135f6e1ec2c (patch)
tree6b8c80d8b9378c1d61ab90cbfc615ac8ea39d16c /docs/LICENSE
parent139ba9d8759f325658f798de625676459a174a93 (diff)
downloadscala-27a38602decb891399fc9868b4dd7135f6e1ec2c.tar.gz
scala-27a38602decb891399fc9868b4dd7135f6e1ec2c.tar.bz2
scala-27a38602decb891399fc9868b4dd7135f6e1ec2c.zip
Update README, include doc/licenses in distro
We forgot to copy the licenses directory to the dists/ directory, so that they weren't included in the binary distribution. I did some house cleaning while I was at it. We no longer distribute ant as far as I can see (we used to for the sbt build, but that was long since removed). Added license for ASM, and Jansi (just to be sure).
Diffstat (limited to 'docs/LICENSE')
-rw-r--r--docs/LICENSE34
1 files changed, 34 insertions, 0 deletions
diff --git a/docs/LICENSE b/docs/LICENSE
index 3a08dca287..4daedef581 100644
--- a/docs/LICENSE
+++ b/docs/LICENSE
@@ -1,3 +1,7 @@
+Scala is licensed under the [BSD 3-Clause License](http://opensource.org/licenses/BSD-3-Clause).
+
+## Scala License
+
Copyright (c) 2002-2013 EPFL
Copyright (c) 2011-2013 Typesafe, Inc.
@@ -27,3 +31,33 @@ 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.
+
+# Other Licenses
+
+This software includes projects with the following licenses,
+which are also included in the `licenses/` directory:
+
+### [Apache License](http://www.apache.org/licenses/LICENSE-2.0.html)
+This license is used by the following third-party libraries:
+ * jansi
+
+### [BSD License](http://www.opensource.org/licenses/bsd-license.php)
+This license is used by the following third-party libraries:
+ * jline
+
+### [BSD 3-Clause License](http://opensource.org/licenses/BSD-3-Clause)
+This license is used by the following third-party libraries:
+ * asm
+
+### [MIT License](http://www.opensource.org/licenses/MIT)
+This license is used by the following third-party libraries:
+ * jquery
+ * jquery-ui
+ * jquery-layout
+ * sizzle
+ * tools tooltip
+
+### Public Domain
+The following libraries are freely available in the public domain:
+ * forkjoin
+