mirror of
https://github.com/github/choosealicense.com
synced 2024-12-22 21:00:10 +01:00
Merge pull request #467 from github/warranty
no-liability -> liability, warranty
This commit is contained in:
commit
4b39f96c2a
@ -95,8 +95,9 @@ The license properties (rules) are stored as a bulleted list within the licenses
|
|||||||
#### Limitations
|
#### Limitations
|
||||||
|
|
||||||
* `trademark-use` - This license explicitly states that it does NOT grant you trademark rights, even though licenses without such a statement probably do not grant you any implicit trademark rights.
|
* `trademark-use` - This license explicitly states that it does NOT grant you trademark rights, even though licenses without such a statement probably do not grant you any implicit trademark rights.
|
||||||
* `no-liability` - Software is provided without warranty and the software author/license owner cannot be held liable for damages.
|
* `liability` - This license includes a limitation of liability.
|
||||||
* `patent-use` - This license explicitly states that it does NOT grant you any rights in the patents of contributors.
|
* `patent-use` - This license explicitly states that it does NOT grant you any rights in the patents of contributors.
|
||||||
|
* `warranty` - The license explicitly states that it does NOT provide any warranty.
|
||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
|
@ -36,9 +36,12 @@ limitations:
|
|||||||
- description: This license explicitly states that it does NOT grant you trademark rights, even though licenses without such a statement probably do not grant you any implicit trademark rights.
|
- description: This license explicitly states that it does NOT grant you trademark rights, even though licenses without such a statement probably do not grant you any implicit trademark rights.
|
||||||
label: Trademark Use
|
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: This license includes a limitation of liability.
|
||||||
label: Hold Liable
|
label: Liability
|
||||||
tag: no-liability
|
tag: liability
|
||||||
- description: This license explicitly states that it does NOT grant you any rights in the patents of contributors.
|
- description: This license explicitly states that it does NOT grant you any rights in the patents of contributors.
|
||||||
label: Patent Use
|
label: Patent Use
|
||||||
tag: patent-use
|
tag: patent-use
|
||||||
|
- description: The license explicitly states that it does NOT provide any warranty.
|
||||||
|
label: Warranty
|
||||||
|
tag: warranty
|
||||||
|
@ -20,7 +20,8 @@ conditions:
|
|||||||
|
|
||||||
limitations:
|
limitations:
|
||||||
- trademark-use
|
- trademark-use
|
||||||
- no-liability
|
- liability
|
||||||
|
- warranty
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
@ -27,7 +27,8 @@ conditions:
|
|||||||
- same-license
|
- same-license
|
||||||
|
|
||||||
limitations:
|
limitations:
|
||||||
- no-liability
|
- liability
|
||||||
|
- warranty
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
@ -30,7 +30,8 @@ conditions:
|
|||||||
|
|
||||||
limitations:
|
limitations:
|
||||||
- trademark-use
|
- trademark-use
|
||||||
- no-liability
|
- liability
|
||||||
|
- warranty
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
@ -20,8 +20,9 @@ conditions:
|
|||||||
- document-changes
|
- document-changes
|
||||||
|
|
||||||
limitations:
|
limitations:
|
||||||
- no-liability
|
- liability
|
||||||
- trademark-use
|
- trademark-use
|
||||||
|
- warranty
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
@ -19,7 +19,8 @@ conditions:
|
|||||||
- include-copyright
|
- include-copyright
|
||||||
|
|
||||||
limitations:
|
limitations:
|
||||||
- no-liability
|
- liability
|
||||||
|
- warranty
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
@ -17,8 +17,9 @@ conditions:
|
|||||||
- include-copyright
|
- include-copyright
|
||||||
|
|
||||||
limitations:
|
limitations:
|
||||||
- no-liability
|
- liability
|
||||||
- patent-use
|
- patent-use
|
||||||
|
- warranty
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
@ -18,7 +18,8 @@ conditions:
|
|||||||
- include-copyright
|
- include-copyright
|
||||||
|
|
||||||
limitations:
|
limitations:
|
||||||
- no-liability
|
- liability
|
||||||
|
- warranty
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
@ -19,7 +19,8 @@ conditions:
|
|||||||
- include-copyright
|
- include-copyright
|
||||||
|
|
||||||
limitations:
|
limitations:
|
||||||
- no-liability
|
- liability
|
||||||
|
- warranty
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
@ -18,9 +18,10 @@ conditions:
|
|||||||
- document-changes
|
- document-changes
|
||||||
|
|
||||||
limitations:
|
limitations:
|
||||||
- no-liability
|
- liability
|
||||||
- trademark-use
|
- trademark-use
|
||||||
- patent-use
|
- patent-use
|
||||||
|
- warranty
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
@ -19,9 +19,10 @@ conditions:
|
|||||||
- same-license
|
- same-license
|
||||||
|
|
||||||
limitations:
|
limitations:
|
||||||
- no-liability
|
- liability
|
||||||
- trademark-use
|
- trademark-use
|
||||||
- patent-use
|
- patent-use
|
||||||
|
- warranty
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
@ -19,9 +19,10 @@ permissions:
|
|||||||
conditions: []
|
conditions: []
|
||||||
|
|
||||||
limitations:
|
limitations:
|
||||||
- no-liability
|
- liability
|
||||||
- trademark-use
|
- trademark-use
|
||||||
- patent-use
|
- patent-use
|
||||||
|
- warranty
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
@ -27,7 +27,8 @@ conditions:
|
|||||||
- same-license
|
- same-license
|
||||||
|
|
||||||
limitations:
|
limitations:
|
||||||
- no-liability
|
- liability
|
||||||
|
- warranty
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
@ -25,8 +25,9 @@ conditions:
|
|||||||
- same-license
|
- same-license
|
||||||
|
|
||||||
limitations:
|
limitations:
|
||||||
- no-liability
|
- liability
|
||||||
- trademark-use
|
- trademark-use
|
||||||
|
- warranty
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
@ -29,7 +29,8 @@ conditions:
|
|||||||
- same-license
|
- same-license
|
||||||
|
|
||||||
limitations:
|
limitations:
|
||||||
- no-liability
|
- liability
|
||||||
|
- warranty
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
@ -32,7 +32,8 @@ conditions:
|
|||||||
- same-license
|
- same-license
|
||||||
|
|
||||||
limitations:
|
limitations:
|
||||||
- no-liability
|
- liability
|
||||||
|
- warranty
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
@ -22,7 +22,8 @@ conditions:
|
|||||||
- include-copyright
|
- include-copyright
|
||||||
|
|
||||||
limitations:
|
limitations:
|
||||||
- no-liability
|
- liability
|
||||||
|
- warranty
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
@ -25,7 +25,8 @@ conditions:
|
|||||||
- same-license
|
- same-license
|
||||||
|
|
||||||
limitations:
|
limitations:
|
||||||
- no-liability
|
- liability
|
||||||
|
- warranty
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
@ -26,7 +26,8 @@ conditions:
|
|||||||
- same-license
|
- same-license
|
||||||
|
|
||||||
limitations:
|
limitations:
|
||||||
- no-liability
|
- liability
|
||||||
|
- warranty
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
@ -21,7 +21,8 @@ conditions:
|
|||||||
- disclose-source
|
- disclose-source
|
||||||
|
|
||||||
limitations:
|
limitations:
|
||||||
- no-liability
|
- liability
|
||||||
|
- warranty
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@ -440,4 +441,3 @@ Important Recommendations
|
|||||||
to comprise the Work and, in such a case, the licensee would be
|
to comprise the Work and, in such a case, the licensee would be
|
||||||
entitled to make reasonable conjectures as to which files comprise
|
entitled to make reasonable conjectures as to which files comprise
|
||||||
the Work.
|
the Work.
|
||||||
|
|
||||||
|
@ -24,7 +24,8 @@ conditions:
|
|||||||
- include-copyright
|
- include-copyright
|
||||||
|
|
||||||
limitations:
|
limitations:
|
||||||
- no-liability
|
- liability
|
||||||
|
- warranty
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
@ -29,8 +29,9 @@ conditions:
|
|||||||
- same-license
|
- same-license
|
||||||
|
|
||||||
limitations:
|
limitations:
|
||||||
- no-liability
|
- liability
|
||||||
- trademark-use
|
- trademark-use
|
||||||
|
- warranty
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ conditions:
|
|||||||
- include-copyright
|
- include-copyright
|
||||||
|
|
||||||
limitations:
|
limitations:
|
||||||
- no-liability
|
- warranty
|
||||||
- trademark-use
|
- trademark-use
|
||||||
|
|
||||||
---
|
---
|
||||||
|
@ -20,7 +20,7 @@ conditions:
|
|||||||
- same-license
|
- same-license
|
||||||
|
|
||||||
limitations:
|
limitations:
|
||||||
- no-liability
|
- warranty
|
||||||
- trademark-use
|
- trademark-use
|
||||||
|
|
||||||
---
|
---
|
||||||
|
@ -21,7 +21,8 @@ conditions:
|
|||||||
- same-license
|
- same-license
|
||||||
|
|
||||||
limitations:
|
limitations:
|
||||||
- no-liability
|
- liability
|
||||||
|
- warranty
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
@ -30,7 +30,8 @@ conditions:
|
|||||||
|
|
||||||
limitations:
|
limitations:
|
||||||
- trademark-use
|
- trademark-use
|
||||||
- no-liability
|
- liability
|
||||||
|
- warranty
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
@ -22,7 +22,8 @@ permissions:
|
|||||||
conditions: []
|
conditions: []
|
||||||
|
|
||||||
limitations:
|
limitations:
|
||||||
- no-liability
|
- liability
|
||||||
|
- warranty
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
@ -18,7 +18,8 @@ conditions:
|
|||||||
- document-changes
|
- document-changes
|
||||||
|
|
||||||
limitations:
|
limitations:
|
||||||
- no-liability
|
- liability
|
||||||
|
- warranty
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user