1
0
mirror of https://github.com/github/choosealicense.com synced 2024-11-10 13:38:53 +01:00

Merge pull request #344 from github/copyleft-tweaks

Copyleft tweaks
This commit is contained in:
Mike Linksvayer 2016-02-07 11:19:19 -08:00
commit 659c2a0d47
13 changed files with 22 additions and 6 deletions

View File

@ -81,9 +81,10 @@ The license properties (rules) are stored as a bulleted list within the licenses
* `include-copyright` - Include a copy of the license and copyright notice with the code.
* `document-changes` - Indicate significant changes made to the code.
* `disclose-source` - Source code must be made available when distributing the software. In the case of LGPL and OSL 3.0, the source for the library (and not the entire program) must be made available.
* `disclose-source` - Source code must be made available when distributing the software.
* `network-use-disclose` - Users who interact with the software via network are given the right to receive a copy of the corresponding source code.
* `rename` - You must change the name of the software if you modify it.
* `same-license` - Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used.
#### Permitted

View File

@ -5,7 +5,7 @@ required:
- description: Indicate significant changes made to the code.
label: State Changes
tag: document-changes
- description: Source code must be made available when distributing the software. In the case of LGPL and OSL 3.0, the source for the library (and not the entire program) must be made available.
- description: Source code must be made available when distributing the software.
label: Disclose Source
tag: disclose-source
- description: Users who interact with the software via network are given the right to receive a copy of the corresponding source code.
@ -14,6 +14,9 @@ required:
- description: You must change the name of the software if you modify it.
label: Rename
tag: rename
- description: Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used.
label: Same License
tag: same-license
permitted:
- description: This software and derivatives may be used for commercial purposes.

View File

@ -18,6 +18,7 @@ required:
- document-changes
- disclose-source
- network-use-disclose
- same-license
permitted:
- commercial-use

View File

@ -18,6 +18,7 @@ using:
required:
- disclose-source
- include-copyright
- same-license
permitted:
- commercial-use

View File

@ -18,6 +18,7 @@ required:
- disclose-source
- document-changes
- network-use-disclose
- same-license
permitted:
- commercial-use
@ -70,7 +71,7 @@ the works or software that could be created by the Licensee, based upon the
Original Work or modifications thereof. This Licence does not define the
extent of modification or dependence on the Original Work required in order to
classify a work as a Derivative Work; this extent is determined by copyright
law applicable in the country mentioned in Article 15.
law applicable in the country mentioned in Article 15.
- The Work: the Original Work and/or its Derivative Works.
@ -175,7 +176,7 @@ the terms of this Compatible Licence. For the sake of this clause,
“Compatible Licence” refers to the licences listed in the appendix
attached to this Licence. Should the Licensees obligations under the
Compatible Licence conflict with his/her obligations under this Licence, the
obligations of the Compatible Licence shall prevail.
obligations of the Compatible Licence shall prevail.
Provision of Source Code:
When distributing and/or communicating copies of the Work, the Licensee
@ -260,7 +261,7 @@ Similarly, you irrevocably accept this Licence and
all of its terms and conditions by exercising any rights granted to You
by Article 2 of this Licence, such as the use of the Work,
the creation by You of a Derivative Work or the Distribution and/or
Communication by You of the Work or copies thereof.
Communication by You of the Work or copies thereof.
11. Information to the public
@ -328,7 +329,7 @@ This licence shall be governed by the Belgian law if:
- a litigation arises between the European Commission, as a Licensor, and any
Licensee;
- the Licensor, other than the European Commission, has no residence or
registered office inside a European Union country.
registered office inside a European Union country.
===

View File

@ -17,6 +17,7 @@ required:
- include-copyright
- document-changes
- disclose-source
- same-license
permitted:
- commercial-use

View File

@ -17,6 +17,7 @@ required:
- include-copyright
- document-changes
- disclose-source
- same-license
permitted:
- commercial-use

View File

@ -16,6 +16,7 @@ note: The Free Software Foundation recommends taking the additional step of addi
required:
- include-copyright
- disclose-source
- same-license
permitted:
- commercial-use

View File

@ -15,6 +15,8 @@ note: The Free Software Foundation recommends taking the additional step of addi
required:
- include-copyright
- disclose-source
- same-license
permitted:
- commercial-use

View File

@ -10,6 +10,7 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of
required:
- disclose-source
- include-copyright
- same-license
permitted:
- commercial-use

View File

@ -9,6 +9,7 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of
required:
- include-copyright
- same-license
permitted:
- commercial-use

View File

@ -11,6 +11,7 @@ note: This license doesn't require source provision, but recommends it. All file
required:
- include-copyright
- same-license
permitted:
- private-use

View File

@ -18,6 +18,7 @@ using:
required:
- include-copyright
- disclose-source
- same-license
permitted:
- commercial-use