summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2016-10-18 18:51:02 +0200
committerUlrich Müller <ulm@gentoo.org>2016-10-18 18:51:02 +0200
commit48deb6dee8e50f442605b2cbf7547f4a568bad36 (patch)
treea37c1c784f31694b976ad4a1bf3c85904b279491 /licenses/CC-BY-SA-4.0
parentx11-plugins/compiz-plugins-unsupported: change SRC_URI (diff)
downloadgentoo-48deb6dee8e50f442605b2cbf7547f4a568bad36.tar.gz
gentoo-48deb6dee8e50f442605b2cbf7547f4a568bad36.tar.bz2
gentoo-48deb6dee8e50f442605b2cbf7547f4a568bad36.zip
licenses: Update CC-BY*-4.0 from official versions.
Official plaintext versions of the CC licenses taken from: https://creativecommons.org/licenses/by/4.0/legalcode.txt https://creativecommons.org/licenses/by-sa/4.0/legalcode.txt https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode.txt Removed trailing whitespace.
Diffstat (limited to 'licenses/CC-BY-SA-4.0')
-rw-r--r--licenses/CC-BY-SA-4.018
1 files changed, 10 insertions, 8 deletions
diff --git a/licenses/CC-BY-SA-4.0 b/licenses/CC-BY-SA-4.0
index e26cd4fc8ed9..4dced8edf078 100644
--- a/licenses/CC-BY-SA-4.0
+++ b/licenses/CC-BY-SA-4.0
@@ -303,8 +303,8 @@ apply to Your use of the Licensed Material:
contents in a database in which You have Sui Generis Database
Rights, then the database in which You have Sui Generis Database
Rights (but not its individual contents) is Adapted Material,
-
including for purposes of Section 3(b); and
+
c. You must comply with the conditions in Section 3(a) if You Share
all or a substantial portion of the contents of the database.
@@ -407,11 +407,13 @@ Section 8 -- Interpretation.
=======================================================================
-Creative Commons is not a party to its public licenses.
-Notwithstanding, Creative Commons may elect to apply one of its public
-licenses to material it publishes and in those instances will be
-considered the "Licensor." Except for the limited purpose of indicating
-that material is shared under a Creative Commons public license or as
+Creative Commons is not a party to its public
+licenses. Notwithstanding, Creative Commons may elect to apply one of
+its public licenses to material it publishes and in those instances
+will be considered the “Licensor.” The text of the Creative Commons
+public licenses is dedicated to the public domain under the CC0 Public
+Domain Dedication. Except for the limited purpose of indicating that
+material is shared under a Creative Commons public license or as
otherwise permitted by the Creative Commons policies published at
creativecommons.org/policies, Creative Commons does not authorize the
use of the trademark "Creative Commons" or any other trademark or logo
@@ -419,7 +421,7 @@ of Creative Commons without its prior written consent including,
without limitation, in connection with any unauthorized modifications
to any of its public licenses or any other arrangements,
understandings, or agreements concerning use of licensed material. For
-the avoidance of doubt, this paragraph does not form part of the public
-licenses.
+the avoidance of doubt, this paragraph does not form part of the
+public licenses.
Creative Commons may be contacted at creativecommons.org.