diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/LICENSE.md | 8 | ||||
| -rw-r--r-- | doc/License.rtf | 8 | ||||
| -rw-r--r-- | doc/README | 4 | ||||
| -rw-r--r-- | doc/licenses/mit_jquery-layout.txt | 21 | ||||
| -rw-r--r-- | doc/licenses/mit_jquery-ui.txt | 25 |
5 files changed, 2 insertions, 64 deletions
diff --git a/doc/LICENSE.md b/doc/LICENSE.md index ce29d7e7d4..2c79713f36 100644 --- a/doc/LICENSE.md +++ b/doc/LICENSE.md @@ -56,13 +56,5 @@ This license is used by the following third-party libraries: 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 - diff --git a/doc/License.rtf b/doc/License.rtf index adc7dfdcb8..4c460e2f28 100644 --- a/doc/License.rtf +++ b/doc/License.rtf @@ -53,13 +53,5 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \'93AS IS\'9 \fs26 This license is used by the following third-party libraries:\ \'95 jquery\ - \'95 jquery-ui\ - \'95 jquery-layout\ \'95 sizzle\ \'95 tools tooltip\ - -\fs30 \ -Public Domain\ - -\fs26 The following libraries are freely available in the public domain:\ - \'95 forkjoin}
\ No newline at end of file diff --git a/doc/README b/doc/README index 29f64c9fef..a89ab52792 100644 --- a/doc/README +++ b/doc/README @@ -1,7 +1,7 @@ Scala Distribution ------------------ -The Scala distribution requires Java 1.6 or above. +The Scala distribution requires Java 1.8 or above. Please report bugs at https://issues.scala-lang.org/. We welcome contributions at https://github.com/scala/scala! @@ -31,6 +31,6 @@ Licenses -------- Scala is licensed under the standard 3-clause BSD license, -included in the distribution as the file `doc/LICENSE`. +included in the distribution as the file `doc/LICENSE.md`. The licenses of the software included in the Scala distribution can be found in the `doc/licenses` directory.
\ No newline at end of file diff --git a/doc/licenses/mit_jquery-layout.txt b/doc/licenses/mit_jquery-layout.txt deleted file mode 100644 index 4af6a0a4b0..0000000000 --- a/doc/licenses/mit_jquery-layout.txt +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2010 Fabrizio Balliano, Kevin Dalman - -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. diff --git a/doc/licenses/mit_jquery-ui.txt b/doc/licenses/mit_jquery-ui.txt deleted file mode 100644 index be226805d3..0000000000 --- a/doc/licenses/mit_jquery-ui.txt +++ /dev/null @@ -1,25 +0,0 @@ -Copyright (c) 2011 Paul Bakaus, http://jqueryui.com/ - -This software consists of voluntary contributions made by many -individuals (AUTHORS.txt, http://jqueryui.com/about) For exact -contribution history, see the revision history and logs, available -at http://jquery-ui.googlecode.com/svn/ - -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. |