From 54de9d0e8619e59a855eddee7fcd54d5104443a2 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 14 Dec 2015 11:03:17 -0800 Subject: [PATCH 1/3] Slightly increase accuracy of trademark info: - use not directly forbideen by certain licenses, rather rights not granted - CC0-1.0 is one of those licenses with explicit non-grant --- README.md | 2 +- _data/rules.yml | 2 +- _licenses/cc0-1.0.txt | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 655f049..4db3d21 100644 --- a/README.md +++ b/README.md @@ -95,7 +95,7 @@ The license properties (rules) are stored as a bulleted list within the licenses #### Forbidden -* `trademark-use` - While this may be implicitly true of all licenses, this license explicitly states that you may NOT use the names, logos, or trademarks of contributors. +* `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 of contributors. * `no-liability` - Software is provided without warranty and the software author/license owner cannot be held liable for damages. * `no-sublicense` - You may not grant a sublicense to modify and distribute this software to third parties not included in the license. * `modifications` - This software may not be modified. diff --git a/_data/rules.yml b/_data/rules.yml index 4d9b591..22851ed 100644 --- a/_data/rules.yml +++ b/_data/rules.yml @@ -39,7 +39,7 @@ permitted: tag: patent-use forbidden: -- description: While this may be implicitly true of all licenses, this license explicitly states that you may NOT use the names, logos, or trademarks of contributors. +- 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 of contributors. label: Use Trademark tag: trademark-use - description: Software is provided without warranty and the software author/license owner cannot be held liable for damages. diff --git a/_licenses/cc0-1.0.txt b/_licenses/cc0-1.0.txt index 31a0010..bd99028 100644 --- a/_licenses/cc0-1.0.txt +++ b/_licenses/cc0-1.0.txt @@ -21,6 +21,7 @@ permitted: forbidden: - no-liability + - trademark-use required: [] From 587e104dc826e0ef2582dcc516e1d7031e3e8a45 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 14 Dec 2015 11:15:38 -0800 Subject: [PATCH 2/3] BSD and OFL licenses have no endorsement clauses, not explicit non-grant of trademark rights. Generalize description of trademark a bit to 'or' include other marks, as some licenses include others, though trademark the only universal among such licenses. --- README.md | 2 +- _data/rules.yml | 2 +- _licenses/bsd-3-clause-clear.txt | 1 - _licenses/bsd-3-clause.txt | 1 - _licenses/ofl-1.1.txt | 1 - 5 files changed, 2 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 4db3d21..4a1444f 100644 --- a/README.md +++ b/README.md @@ -95,7 +95,7 @@ The license properties (rules) are stored as a bulleted list within the licenses #### Forbidden -* `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 of contributors. +* `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. * `no-sublicense` - You may not grant a sublicense to modify and distribute this software to third parties not included in the license. * `modifications` - This software may not be modified. diff --git a/_data/rules.yml b/_data/rules.yml index 22851ed..3bf98a4 100644 --- a/_data/rules.yml +++ b/_data/rules.yml @@ -39,7 +39,7 @@ permitted: tag: patent-use 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 of contributors. +- 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 tag: trademark-use - description: Software is provided without warranty and the software author/license owner cannot be held liable for damages. diff --git a/_licenses/bsd-3-clause-clear.txt b/_licenses/bsd-3-clause-clear.txt index c60faed..cf7916a 100644 --- a/_licenses/bsd-3-clause-clear.txt +++ b/_licenses/bsd-3-clause-clear.txt @@ -25,7 +25,6 @@ permitted: forbidden: - no-liability - - trademark-use --- diff --git a/_licenses/bsd-3-clause.txt b/_licenses/bsd-3-clause.txt index 575852e..c33c270 100644 --- a/_licenses/bsd-3-clause.txt +++ b/_licenses/bsd-3-clause.txt @@ -22,7 +22,6 @@ permitted: forbidden: - no-liability - - trademark-use --- diff --git a/_licenses/ofl-1.1.txt b/_licenses/ofl-1.1.txt index 71482d2..4d353ec 100644 --- a/_licenses/ofl-1.1.txt +++ b/_licenses/ofl-1.1.txt @@ -21,7 +21,6 @@ permitted: forbidden: - no-liability - - trademark-use --- From 16bd726fd09e3665a978038d78f64edc2f4d0aee Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 15 Dec 2015 17:03:54 -0800 Subject: [PATCH 3/3] empty commit to force integration re-check