mirror of
https://github.com/github/choosealicense.com
synced 2024-12-22 21:00:10 +01:00
Merge pull request #311 from mlinksva/tm-accuracy
Increase accuracy re trademark clauses
This commit is contained in:
commit
b7204165de
@ -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.
|
||||||
|
@ -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.
|
||||||
|
@ -25,7 +25,6 @@ permitted:
|
|||||||
|
|
||||||
forbidden:
|
forbidden:
|
||||||
- no-liability
|
- no-liability
|
||||||
- trademark-use
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
@ -22,7 +22,6 @@ permitted:
|
|||||||
|
|
||||||
forbidden:
|
forbidden:
|
||||||
- no-liability
|
- no-liability
|
||||||
- trademark-use
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
@ -21,6 +21,7 @@ permitted:
|
|||||||
|
|
||||||
forbidden:
|
forbidden:
|
||||||
- no-liability
|
- no-liability
|
||||||
|
- trademark-use
|
||||||
|
|
||||||
required: []
|
required: []
|
||||||
|
|
||||||
|
@ -21,7 +21,6 @@ permitted:
|
|||||||
|
|
||||||
forbidden:
|
forbidden:
|
||||||
- no-liability
|
- no-liability
|
||||||
- trademark-use
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user