1
0
mirror of https://github.com/github/choosealicense.com synced 2024-12-22 04:40:09 +01:00

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.
This commit is contained in:
Mike Linksvayer 2015-12-14 11:15:38 -08:00
parent 54de9d0e86
commit 587e104dc8
5 changed files with 2 additions and 5 deletions

View File

@ -95,7 +95,7 @@ The license properties (rules) are stored as a bulleted list within the licenses
#### Forbidden #### 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-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. * `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. * `modifications` - This software may not be modified.

View File

@ -39,7 +39,7 @@ permitted:
tag: patent-use tag: patent-use
forbidden: 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 label: Use Trademark
tag: trademark-use tag: trademark-use
- description: Software is provided without warranty and the software author/license owner cannot be held liable for damages. - description: Software is provided without warranty and the software author/license owner cannot be held liable for damages.

View File

@ -25,7 +25,6 @@ permitted:
forbidden: forbidden:
- no-liability - no-liability
- trademark-use
--- ---

View File

@ -22,7 +22,6 @@ permitted:
forbidden: forbidden:
- no-liability - no-liability
- trademark-use
--- ---

View File

@ -21,7 +21,6 @@ permitted:
forbidden: forbidden:
- no-liability - no-liability
- trademark-use
--- ---