mirror of
https://github.com/github/choosealicense.com
synced 2024-12-22 12:50:24 +01:00
Merge pull request #334 from github/gplv3-no-sublicense
Remove confusing and inaccurate [no-]sublicensing property
This commit is contained in:
commit
17fa055cf6
@ -91,7 +91,6 @@ The license properties (rules) are stored as a bulleted list within the licenses
|
||||
* `commercial-use` - This software and derivatives may be used for commercial purposes.
|
||||
* `modifications` - This software may be modified.
|
||||
* `distribution` - You may distribute this software.
|
||||
* `sublicense` - You may grant a sublicense to modify and distribute this software to third parties not included in the license.
|
||||
* `private-use` - You may use and modify the software without distributing it.
|
||||
* `patent-use` - This license provides an express grant of patent rights from the contributor to the recipient.
|
||||
|
||||
@ -99,10 +98,8 @@ 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.
|
||||
* `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.
|
||||
* `distribution` - You may not distribute this software.
|
||||
* `sublicense` - You may not grant a sublicense to modify and distribute this software to third parties not included in the license.
|
||||
|
||||
## License
|
||||
|
||||
|
@ -28,9 +28,6 @@ permitted:
|
||||
- description: You may distribute this software.
|
||||
label: Distribution
|
||||
tag: distribution
|
||||
- description: You may grant a sublicense to modify and distribute this software to third parties not included in the license.
|
||||
label: Sublicensing
|
||||
tag: sublicense
|
||||
- description: You may use and modify the software without distributing it.
|
||||
label: Private Use
|
||||
tag: private-use
|
||||
@ -45,15 +42,9 @@ forbidden:
|
||||
- description: Software is provided without warranty and the software author/license owner cannot be held liable for damages.
|
||||
label: Hold Liable
|
||||
tag: no-liability
|
||||
- description: You may not grant a sublicense to modify and distribute this software to third parties not included in the license.
|
||||
label: Sublicensing
|
||||
tag: no-sublicense
|
||||
- description: This software may not be modified.
|
||||
label: Modification
|
||||
tag: modifications
|
||||
- description: You may not distribute this software.
|
||||
label: Distribution
|
||||
tag: distribution
|
||||
- description: You may not grant a sublicense to modify and distribute this software to third parties not included in the license.
|
||||
label: Sublicensing
|
||||
tag: sublicense
|
||||
|
@ -13,7 +13,6 @@ permitted:
|
||||
- commercial-use
|
||||
- modifications
|
||||
- distribution
|
||||
- sublicense
|
||||
- private-use
|
||||
- patent-use
|
||||
|
||||
|
@ -28,7 +28,6 @@ permitted:
|
||||
|
||||
forbidden:
|
||||
- no-liability
|
||||
- no-sublicense
|
||||
|
||||
hidden: false
|
||||
---
|
||||
|
@ -19,7 +19,6 @@ permitted:
|
||||
- commercial-use
|
||||
- modifications
|
||||
- distribution
|
||||
- sublicense
|
||||
- patent-use
|
||||
- private-use
|
||||
|
||||
|
@ -15,7 +15,6 @@ permitted:
|
||||
- commercial-use
|
||||
- modifications
|
||||
- distribution
|
||||
- sublicense
|
||||
- private-use
|
||||
|
||||
forbidden:
|
||||
|
@ -18,7 +18,6 @@ permitted:
|
||||
- commercial-use
|
||||
- modifications
|
||||
- distribution
|
||||
- sublicense
|
||||
- private-use
|
||||
|
||||
forbidden:
|
||||
|
@ -19,7 +19,6 @@ permitted:
|
||||
- commercial-use
|
||||
- modifications
|
||||
- distribution
|
||||
- sublicense
|
||||
- private-use
|
||||
|
||||
forbidden:
|
||||
|
@ -17,7 +17,6 @@ permitted:
|
||||
- commercial-use
|
||||
- modifications
|
||||
- distribution
|
||||
- sublicense
|
||||
- private-use
|
||||
|
||||
forbidden:
|
||||
|
@ -23,7 +23,6 @@ permitted:
|
||||
- commercial-use
|
||||
- distribution
|
||||
- modifications
|
||||
- sublicense
|
||||
- patent-use
|
||||
- private-use
|
||||
|
||||
|
@ -27,7 +27,6 @@ permitted:
|
||||
|
||||
forbidden:
|
||||
- no-liability
|
||||
- no-sublicense
|
||||
|
||||
hidden: false
|
||||
---
|
||||
|
@ -16,7 +16,6 @@ permitted:
|
||||
- distribution
|
||||
- modifications
|
||||
- private-use
|
||||
- sublicense
|
||||
|
||||
forbidden:
|
||||
- no-liability
|
||||
|
@ -22,7 +22,6 @@ permitted:
|
||||
- commercial-use
|
||||
- modifications
|
||||
- distribution
|
||||
- sublicense
|
||||
- patent-use
|
||||
- private-use
|
||||
|
||||
|
@ -21,7 +21,6 @@ permitted:
|
||||
- commercial-use
|
||||
- modifications
|
||||
- distribution
|
||||
- sublicense
|
||||
- patent-use
|
||||
- private-use
|
||||
|
||||
|
@ -14,7 +14,6 @@ permitted:
|
||||
- commercial-use
|
||||
- modifications
|
||||
- distribution
|
||||
- sublicense
|
||||
- private-use
|
||||
|
||||
forbidden:
|
||||
|
@ -15,7 +15,6 @@ permitted:
|
||||
- commercial-use
|
||||
- modifications
|
||||
- distribution
|
||||
- sublicense
|
||||
- patent-use
|
||||
- private-use
|
||||
|
||||
|
@ -25,8 +25,6 @@ permitted:
|
||||
- modifications
|
||||
- patent-use
|
||||
- private-use
|
||||
- sublicense
|
||||
|
||||
|
||||
forbidden:
|
||||
- trademark-use
|
||||
|
@ -15,7 +15,6 @@ permitted:
|
||||
- commercial-use
|
||||
- modifications
|
||||
- distribution
|
||||
- sublicense
|
||||
|
||||
forbidden:
|
||||
- no-liability
|
||||
|
@ -12,7 +12,6 @@ permitted:
|
||||
- commercial-use
|
||||
- modifications
|
||||
- distribution
|
||||
- sublicense
|
||||
- private-use
|
||||
|
||||
forbidden: []
|
||||
|
Loading…
x
Reference in New Issue
Block a user