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

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
This commit is contained in:
Mike Linksvayer 2015-12-14 11:03:17 -08:00
parent 7d4c11e390
commit 54de9d0e86
3 changed files with 3 additions and 2 deletions

View File

@ -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.

View File

@ -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.

View File

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