You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2018/03/04 22:37:58 UTC
[incubator-servicecomb-website] branch master updated: SCB-366
Clean up the LICENSE and NOTICE files
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-website.git
The following commit(s) were added to refs/heads/master by this push:
new 843c9b3 SCB-366 Clean up the LICENSE and NOTICE files
843c9b3 is described below
commit 843c9b3dca3716e2c37ff0132bf53c3c9c1ba596
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Sun Mar 4 06:58:02 2018 +0800
SCB-366 Clean up the LICENSE and NOTICE files
---
LICENSE | 63 +++++++++++++++++++++++++++++---------------
NOTICE | 68 ------------------------------------------------
licenses/LICENSE-fitvids | 13 +++++++++
3 files changed, 55 insertions(+), 89 deletions(-)
diff --git a/LICENSE b/LICENSE
index 86088e5..aad9cbf 100644
--- a/LICENSE
+++ b/LICENSE
@@ -213,62 +213,83 @@ following licenses.
=======================================================================
For minimal mistakes(the based theme of this website):
=======================================================================
-
-See licenses/LICENSE-minimal-mistakes
+This product bundles `minimal mistakes` which is licensed under the
+MIT License.
+For details, see https://github.com/mmistakes/minimal-mistakes
+You can find a copy of the License at licenses/LICENSE-minimal-mistakes
=======================================================================
For assets/vendor/prism:
=======================================================================
-
-See licenses/LICENSE-prism
+This product bundles `prism` which is licensed under the
+MIT License.
+For details, see https://github.com/PrismJS/prism
+You can find a copy of the License at licenses/LICENSE-prism
=======================================================================
For assets/vendor/font-awesome and
_sass/minimal-mistakes/vendor/font-awesome:
=======================================================================
-
-See licenses/LICENSE-font-awesome
+This product bundles `Font-awesome` fonts which is licensed under the
+SIL Open Font License (OFL) 1.1
+For details, see http://fontawesome.io/
+You can find a copy of the License at licenses/LICENSE-font-awesome
=======================================================================
For _sass/minimal-mistakes/vendor/breakpoint:
=======================================================================
-
-See http://www.opensource.org/licenses/mit-license.php and
-http://www.gnu.org/licenses/gpl-2.0.html.
+This product bundles 'breakpoint' which is licensed under the MIT/GPL
+License.
+For details, see https://github.com/at-import/breakpoint
+You can find a copy of the License at
+MIT license: http://www.opensource.org/licenses/mit-license.php
+GPL2 license: http://www.gnu.org/licenses/gpl-2.0.html
=======================================================================
For _sass/minimal-mistakes/vendor/magnific-popup and
assets/js/plugins/jquery.magnific-popup.js:
=======================================================================
-
-See licenses/LICENSE-magnific-popup
+This product bundles `magnific popup` which is licensed under the
+MIT License.
+For details, see https://github.com/dimsemenov/Magnific-Popup
+You can find a copy of the License at licenses/LICENSE-magnific-popup
=======================================================================
For _sass/minimal-mistakes/vendor/susy:
=======================================================================
-
-See licenses/LICENSE-susy
+This product bundles `magnific popup` which is licensed under the BSD
+3-Clause License.
+For details, see https://github.com/oddbird/susy
+You can find a copy of the License at licenses/LICENSE-susy
=======================================================================
For assets/js/plugins/jquery.fitvids.js:
=======================================================================
-
-See http://www.wtfpl.net/
+This product bundles "fitvids" which is licensed under the the WTFPL
+License.
+For details, see https://github.com/davatron5000/FitVids.js
+You can find a copy of the License at licenses/LICENSE-fitvids
=======================================================================
For assets/js/plugins/jquery.greedy-navigation.js:
=======================================================================
-
-See licenses/LICENSE-greedynav
+This product bundles "greedy navigation" which is licensed under the
+MIT License.
+For details, see https://github.com/lukejacksonn/GreedyNav
+You can find a copy of the License at licenses/LICENSE-greedynav
=======================================================================
For assets/js/plugins/jquery.smooth-scroll.min.js:
=======================================================================
-
-See licenses/LICENSE-jquery-smooth-scroll
+This product bundles "smooth scroll" which is licensed under the
+MIT License.
+For details, see https://github.com/kswedberg/jquery-smooth-scroll
+You can find a copy of the License at licenses/LICENSE-jquery-smooth-scroll
=======================================================================
For _includes/group-by-array:
=======================================================================
-
-See licenses/LICENSE-jquery-group-by-array
\ No newline at end of file
+This product bundles "group-by-array" which is licensed under the
+MIT License.
+For details, see https://github.com/mushishi78/jekyll-group-by-array
+You can find a copy of the License at licenses/LICENSE-jquery-group-by-array
diff --git a/NOTICE b/NOTICE
index 66a1440..dfbbc71 100644
--- a/NOTICE
+++ b/NOTICE
@@ -3,71 +3,3 @@ Copyright 2017-2018 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-
-================================================================
-The MIT License
-================================================================
-
-The following components are provided under the MIT License (http://www.opensource.org/licenses/mit-license.php). See project link for details.
-
-https://github.com/mmistakes/minimal-mistakes
-https://github.com/PrismJS/prism
-Font Awesome Code: https://github.com/FortAwesome/Font-Awesome
-https://github.com/dimsemenov/Magnific-Popup
-https://github.com/lukejacksonn/GreedyNav
-https://github.com/kswedberg/jquery-smooth-scroll
-https://github.com/mushishi78/jekyll-group-by-array
-
-
-================================================================
-The MIT/GPL License
-================================================================
-
-The following components are provided under the MIT/GPL License (https://opensource.org/licenses/BSD-3-Clause). See project link for details.
-
-https://github.com/at-import/breakpoint
-
-
-================================================================
-The BSD 3-Clause License
-================================================================
-
-The following components are provided under the BSD 3-Clause License (https://opensource.org/licenses/BSD-3-Clause). See project link for details.
-
-https://github.com/oddbird/susy
-
-
-================================================================
-The WTFPL License
-================================================================
-
-The following components are provided under the WTFPL License (http://www.wtfpl.net/). See project link for details.
-
-https://github.com/davatron5000/FitVids.js
-
-
-================================================================
-The CC BY 3.0 License
-================================================================
-
-The following components are provided under the CC BY 3.0 License (https://creativecommons.org/licenses/by/3.0/). See project link for details.
-
-https://thenounproject.com/
-
-
-================================================================
-The CC BY 4.0 License
-================================================================
-
-The following components are provided under the CC BY 4.0 License (https://creativecommons.org/licenses/by/4.0/). See project link for details.
-
-Font Awesome Icons: https://github.com/FortAwesome/Font-Awesome
-
-
-================================================================
-The SIL OFL 1.1 License
-================================================================
-
-The following components are provided under the SIL OFL 1.1 License (https://scripts.sil.org/OFL). See project link for details.
-
-Font Awesome Fonts: https://github.com/FortAwesome/Font-Awesome
\ No newline at end of file
diff --git a/licenses/LICENSE-fitvids b/licenses/LICENSE-fitvids
new file mode 100644
index 0000000..24a7c9e
--- /dev/null
+++ b/licenses/LICENSE-fitvids
@@ -0,0 +1,13 @@
+DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ Version 2, December 2004
+
+Copyright (C) 2004 Sam Hocevar <sa...@hocevar.net>
+
+Everyone is permitted to copy and distribute verbatim or modified
+copies of this license document, and changing it is allowed as long
+as the name is changed.
+
+DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. You just DO WHAT THE FUCK YOU WANT TO.
--
To stop receiving notification emails like this one, please contact
ningjiang@apache.org.