From ede7a091189f4e0cdc3b86aed545ac204268124d Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 28 Feb 2016 12:10:23 -0800 Subject: [PATCH 1/3] Add "forbidden" property for "patent-use", mirroring "trademark-use", for the sorry licenses that explicitly do not grant any patent permissions --- README.md | 1 + _data/rules.yml | 3 +++ _licenses/bsd-3-clause-clear.txt | 1 + _licenses/cc-by-4.0.txt | 1 + _licenses/cc-by-sa-4.0.txt | 1 + _licenses/cc0-1.0.txt | 1 + 6 files changed, 8 insertions(+) diff --git a/README.md b/README.md index d915b65..d382b66 100644 --- a/README.md +++ b/README.md @@ -100,6 +100,7 @@ The license properties (rules) are stored as a bulleted list within the licenses * `no-liability` - Software is provided without warranty and the software author/license owner cannot be held liable for damages. * `modifications` - This software may not be modified. * `distribution` - You may not distribute this software. +* `patent-use` - This license explicitly states that it does NOT grant you any rights in the patents of contributors. ## License diff --git a/_data/rules.yml b/_data/rules.yml index 2970878..97e5259 100644 --- a/_data/rules.yml +++ b/_data/rules.yml @@ -42,3 +42,6 @@ forbidden: - description: Software is provided without warranty and the software author/license owner cannot be held liable for damages. label: Hold Liable tag: no-liability +- description: This license explicitly states that it does NOT grant you any rights in the patents of contributors. + label: Patent Use + tag: patent-use diff --git a/_licenses/bsd-3-clause-clear.txt b/_licenses/bsd-3-clause-clear.txt index 64f59c4..2a8594e 100644 --- a/_licenses/bsd-3-clause-clear.txt +++ b/_licenses/bsd-3-clause-clear.txt @@ -20,6 +20,7 @@ permitted: forbidden: - no-liability + - patent-use --- diff --git a/_licenses/cc-by-4.0.txt b/_licenses/cc-by-4.0.txt index 2ab5acb..dbde259 100644 --- a/_licenses/cc-by-4.0.txt +++ b/_licenses/cc-by-4.0.txt @@ -20,6 +20,7 @@ permitted: forbidden: - no-liability - trademark-use + - patent-use --- Attribution 4.0 International diff --git a/_licenses/cc-by-sa-4.0.txt b/_licenses/cc-by-sa-4.0.txt index cfeaa5e..f58d3d9 100644 --- a/_licenses/cc-by-sa-4.0.txt +++ b/_licenses/cc-by-sa-4.0.txt @@ -21,6 +21,7 @@ permitted: forbidden: - no-liability - trademark-use + - patent-use --- Attribution-ShareAlike 4.0 International diff --git a/_licenses/cc0-1.0.txt b/_licenses/cc0-1.0.txt index 6ddc723..3e47b90 100644 --- a/_licenses/cc0-1.0.txt +++ b/_licenses/cc0-1.0.txt @@ -21,6 +21,7 @@ permitted: forbidden: - no-liability - trademark-use + - patent-use required: [] From 2c063f2a94efd2a592cac6f3e51e997e57aacd15 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 28 Feb 2016 12:12:57 -0800 Subject: [PATCH 2/3] sync README.md with _data/rules.yml, remove non-open forbiddens should have been removed as part of https://github.com/github/choosealicense.com/pull/345 correct that oversight --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index d382b66..fa1d318 100644 --- a/README.md +++ b/README.md @@ -98,8 +98,6 @@ The license properties (rules) are stored as a bulleted list within the licenses * `trademark-use` - While this may be implicitly true of all licenses, this license explicitly states that it does NOT grant you any rights in the trademarks or other marks of contributors. * `no-liability` - Software is provided without warranty and the software author/license owner cannot be held liable for damages. -* `modifications` - This software may not be modified. -* `distribution` - You may not distribute this software. * `patent-use` - This license explicitly states that it does NOT grant you any rights in the patents of contributors. ## License From 78217a096be25dfca35aa4dadc5b4fc1bac1c04b Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 28 Feb 2016 12:15:51 -0800 Subject: [PATCH 3/3] Use Trademark -> Trademark Use to match otther Use Xs --- _data/rules.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/rules.yml b/_data/rules.yml index 97e5259..c731405 100644 --- a/_data/rules.yml +++ b/_data/rules.yml @@ -37,7 +37,7 @@ permitted: forbidden: - description: While this may be implicitly true of all licenses, this license explicitly states that it does NOT grant you any rights in the trademarks or other marks of contributors. - label: Use Trademark + label: Trademark Use tag: trademark-use - description: Software is provided without warranty and the software author/license owner cannot be held liable for damages. label: Hold Liable