1
0
mirror of https://github.com/github/choosealicense.com synced 2024-12-22 12:50:24 +01:00

Merge pull request #311 from mlinksva/tm-accuracy

Increase accuracy re trademark clauses
This commit is contained in:
Mike Linksvayer 2016-01-18 14:27:52 -08:00
commit b7204165de
6 changed files with 3 additions and 5 deletions

View File

@ -97,7 +97,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 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 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 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 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,6 +21,7 @@ permitted:
forbidden: forbidden:
- no-liability - no-liability
- trademark-use
required: [] required: []

View File

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