You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bahir.apache.org by lr...@apache.org on 2016/05/27 23:34:03 UTC
[20/48] bahir-website git commit: Update LICENSE and NOTICE files
Update LICENSE and NOTICE files
Remove copyright information from NOTICE file, in favor
of having them as part of each dependency license entry
in the LICENSE file.
Project: http://git-wip-us.apache.org/repos/asf/bahir-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/bahir-website/commit/da0d477d
Tree: http://git-wip-us.apache.org/repos/asf/bahir-website/tree/da0d477d
Diff: http://git-wip-us.apache.org/repos/asf/bahir-website/diff/da0d477d
Branch: refs/heads/master
Commit: da0d477d410b9ef4d241e619d65b37aaac1f1bf4
Parents: 0d04a2f
Author: Luciano Resende <lr...@apache.org>
Authored: Thu Dec 3 11:16:25 2015 -0800
Committer: Luciano Resende <lr...@apache.org>
Committed: Thu Dec 3 11:24:44 2015 -0800
----------------------------------------------------------------------
LICENSE | 96 ++++++++++++++++++++++++++++++++++++++--
NOTICE | 12 ++---
apache-website-template.iml | 9 ++++
3 files changed, 104 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bahir-website/blob/da0d477d/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 7736772..817f2e9 100644
--- a/LICENSE
+++ b/LICENSE
@@ -205,11 +205,11 @@
The following components included on this website are distributed under MIT license :
- Jekyll
-- Jekyll Bootstrap
-- Bootstrap
-- jQuery
-The MIT License (MIT):
+
+The MIT License (MIT)
+
+Copyright (c) 2008-2015 Tom Preston-Werner
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -230,3 +230,91 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+------------------
+
+- Jekyll Bootstrap
+
+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.
+
+------------------
+
+- Bootstrap
+
+The MIT License (MIT)
+
+Copyright (c) 2011-2015 Twitter, Inc
+
+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/
+
+This software consists of voluntary contributions made by many
+individuals. For exact contribution history, see the revision history
+available at https://github.com/jquery/jquery
+
+The following license applies to all parts of this software except as
+documented below:
+
+====
+
+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.
+
+====
+
+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
http://git-wip-us.apache.org/repos/asf/bahir-website/blob/da0d477d/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index a4fed15..5ddd773 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,11 +1,5 @@
+Apache Website Template
+Copyright [2015] The Apache Software Foundation
+
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-
-This product uses Jekyll software (http://jekyllrb.com/)
-Copyright (c) 2008-2015 Tom Preston-Werner
-
-This product includes Boostrap software (http://getbootstrap.com/)
-Copyright (c) 2011-2015 Twitter, Inc
-
-This product includes jQuery software (http://jquery.com/)
-Copyright jQuery Foundation and other contributors, https://jquery.org/
http://git-wip-us.apache.org/repos/asf/bahir-website/blob/da0d477d/apache-website-template.iml
----------------------------------------------------------------------
diff --git a/apache-website-template.iml b/apache-website-template.iml
new file mode 100644
index 0000000..8021953
--- /dev/null
+++ b/apache-website-template.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$" />
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ </component>
+</module>
\ No newline at end of file