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

Merge pull request #360 from github/express-non-patent-grant

Express non patent grant
This commit is contained in:
Mike Linksvayer 2016-02-29 20:44:38 -08:00
commit 7b2790bf14
6 changed files with 9 additions and 3 deletions

View File

@ -98,8 +98,7 @@ The license properties (rules) are stored as a bulleted list within the licenses
* `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. * `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.
* `modifications` - This software may not be modified. * `patent-use` - This license explicitly states that it does NOT grant you any rights in the patents of contributors.
* `distribution` - You may not distribute this software.
## License ## License

View File

@ -37,8 +37,11 @@ permitted:
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 or other marks 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: Trademark Use
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.
label: Hold Liable label: Hold Liable
tag: no-liability tag: no-liability
- description: This license explicitly states that it does NOT grant you any rights in the patents of contributors.
label: Patent Use
tag: patent-use

View File

@ -20,6 +20,7 @@ permitted:
forbidden: forbidden:
- no-liability - no-liability
- patent-use
--- ---

View File

@ -20,6 +20,7 @@ permitted:
forbidden: forbidden:
- no-liability - no-liability
- trademark-use - trademark-use
- patent-use
--- ---
Attribution 4.0 International Attribution 4.0 International

View File

@ -21,6 +21,7 @@ permitted:
forbidden: forbidden:
- no-liability - no-liability
- trademark-use - trademark-use
- patent-use
--- ---
Attribution-ShareAlike 4.0 International Attribution-ShareAlike 4.0 International

View File

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