Repository: incubator-systemml-website Updated Branches: refs/heads/master 0117c7b80 -> 53ffe6d3c
[SYSTEMML-991] Add additional licenses to website Update website licenses for Susy, Sass, and BrowserSync. Update Jekyll copyright to 2017. Closes #49. Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml-website/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml-website/commit/53ffe6d3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml-website/tree/53ffe6d3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml-website/diff/53ffe6d3 Branch: refs/heads/master Commit: 53ffe6d3cdde3ab4e99fb0f65fe96185e29c7111 Parents: 0117c7b Author: Deron Eriksson <de...@us.ibm.com> Authored: Wed May 17 11:09:48 2017 -0700 Committer: Deron Eriksson <de...@us.ibm.com> Committed: Wed May 17 11:09:48 2017 -0700 ---------------------------------------------------------------------- LICENSE | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---- README.md | 2 +- 2 files changed, 74 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-systemml-website/blob/53ffe6d3/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 817f2e9..d028660 100644 --- a/LICENSE +++ b/LICENSE @@ -202,14 +202,21 @@ =============================================================================== -The following components included on this website are distributed under MIT license : +The following components included on this website are distributed under the +Apache License 2.0: -- Jekyll +- BrowserSync + +=============================================================================== +The following components included on this website are distributed under the +MIT license: + +- Jekyll The MIT License (MIT) -Copyright (c) 2008-2015 Tom Preston-Werner +Copyright (c) 2008-2017 Tom Preston-Werner and Jekyll contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -229,7 +236,6 @@ 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. - ------------------ - Jekyll Bootstrap @@ -280,6 +286,31 @@ THE SOFTWARE. ------------------ +- Sass + +Copyright (c) 2006-2016 Hampton Catlin, Natalie Weizenbaum, and Chris Eppstein + +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. + +------------------ + - jQuery Copyright jQuery Foundation and other contributors, https://jquery.org/ @@ -317,4 +348,41 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. All files located in the node_modules and external directories are externally maintained libraries used by this software which have their own licenses; we recommend you read them, as their terms may differ from -the terms above. \ No newline at end of file +the terms above. + +=============================================================================== + +The following components included on this website are distributed under the +BSD 3-clause "New" or "Revised" License: + +- Susy + +Copyright (c) 2015, Miriam Eric Suzanne +All rights reserved. + +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 author nor the names of other + 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. + http://git-wip-us.apache.org/repos/asf/incubator-systemml-website/blob/53ffe6d3/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 12e015d..f6b9d49 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ In order to build this project you will need the latest version of [node.js and #### Gulp -We use Gulp to compile Sass and JS aswell as run the Jekyll build. You can install it with npm: +We use Gulp to compile Sass and JS as well as run the Jekyll build. You can install it with npm: ``` $ sudo npm install -g gulp
