From a97a5bde538b51b56623b5797dbe20275ae9d39b Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Wed, 24 Feb 2016 14:07:49 -0800 Subject: [PATCH 1/2] cc-by-sa-4.0: Fix link to CC BY 4.0 (was self-reference) Correct a typo from c81c90ba (conform to SPDX title to make tests work, #353). --- _licenses/cc-by-sa-4.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/cc-by-sa-4.0.txt b/_licenses/cc-by-sa-4.0.txt index bcffc01..04e5290 100644 --- a/_licenses/cc-by-sa-4.0.txt +++ b/_licenses/cc-by-sa-4.0.txt @@ -3,7 +3,7 @@ title: Creative Commons Attribution Share Alike 4.0 nickname: CC-BY-SA-4.0 source: https://creativecommons.org/licenses/by-sa/4.0/legalcode.txt -description: Similar to CC-BY-4.0 but requires derivatives be distributed under the same license. Frequently used for media assets and educational materials. A previous version is the default license for Wikipedia and other Wikimedia projects. Not recommended for software. +description: Similar to CC-BY-4.0 but requires derivatives be distributed under the same license. Frequently used for media assets and educational materials. A previous version is the default license for Wikipedia and other Wikimedia projects. Not recommended for software. how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. It is also acceptable to soley supply a link to a copy of the license, usually to the canonical URL for the license. From 39154843dfaa9275d1628e0593a164f6a442b7cb Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Wed, 24 Feb 2016 14:18:35 -0800 Subject: [PATCH 2/2] cc-by-sa-4.0: Weaken "same license" to mention compatibility The human-readable summary uses "same license" [1], but also links to a page listing other compatible licenses [2], and the license text includes a compatible-license alternative [3,4]. This commit links to that same set of compatible licenses using Mike's wording [5]. [1]: https://creativecommons.org/licenses/by-sa/4.0/ [2]: https://creativecommons.org/compatiblelicenses/ [3]: https://creativecommons.org/licenses/by-sa/4.0/legalcode#s3b1 [4]: https://creativecommons.org/licenses/by-sa/4.0/legalcode#s1c [5]: https://github.com/github/choosealicense.com/pull/353/files#r53963602 --- _licenses/cc-by-sa-4.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/cc-by-sa-4.0.txt b/_licenses/cc-by-sa-4.0.txt index 04e5290..cfeaa5e 100644 --- a/_licenses/cc-by-sa-4.0.txt +++ b/_licenses/cc-by-sa-4.0.txt @@ -3,7 +3,7 @@ title: Creative Commons Attribution Share Alike 4.0 nickname: CC-BY-SA-4.0 source: https://creativecommons.org/licenses/by-sa/4.0/legalcode.txt -description: Similar to CC-BY-4.0 but requires derivatives be distributed under the same license. Frequently used for media assets and educational materials. A previous version is the default license for Wikipedia and other Wikimedia projects. Not recommended for software. +description: Similar to CC-BY-4.0 but requires derivatives be distributed under the same or a similar, compatible license. Frequently used for media assets and educational materials. A previous version is the default license for Wikipedia and other Wikimedia projects. Not recommended for software. how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. It is also acceptable to soley supply a link to a copy of the license, usually to the canonical URL for the license.