1
0
mirror of https://github.com/github/choosealicense.com synced 2025-01-09 05:04:35 +01:00

Merge pull request from waldyrious/patch-2

sort license properties as permissions > conditions > limitations (fixes )
This commit is contained in:
Mike Linksvayer 2016-08-22 11:55:24 -07:00 committed by GitHub
commit b0af73c0df
28 changed files with 156 additions and 136 deletions

@ -1,20 +1,3 @@
conditions:
- description: Include a copy of the license and copyright notice with the code.
label: License and Copyright Notice
tag: include-copyright
- description: Indicate changes made to the code.
label: State Changes
tag: document-changes
- 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.
label: Network Use is Distribution
tag: network-use-disclose
- 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
permissions:
- description: This software and derivatives may be used for commercial purposes.
label: Commercial Use
@ -32,6 +15,23 @@ permissions:
label: Patent Use
tag: patent-use
conditions:
- description: Include a copy of the license and copyright notice with the code.
label: License and Copyright Notice
tag: include-copyright
- description: Indicate changes made to the code.
label: State Changes
tag: document-changes
- 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.
label: Network Use is Distribution
tag: network-use-disclose
- 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
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.
label: Trademark Use

@ -7,10 +7,6 @@ description: The Academic Free License is a variant of the Open Software License
how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Files licensed under AFL 3.0 must also include the notice "Licensed under the Academic Free License version 3.0" adjacent to the copyright notice.
conditions:
- include-copyright
- document-changes
permissions:
- commercial-use
- modifications
@ -18,11 +14,16 @@ permissions:
- private-use
- patent-use
conditions:
- include-copyright
- document-changes
limitations:
- trademark-use
- no-liability
---
Academic Free License (“AFL”) v. 3.0
This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:

@ -12,13 +12,6 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of
note: The Free Software Foundation recommends taking the additional step of adding a boilerplate notice to the top of each file. The boilerplate can be found at the end of the license.
conditions:
- include-copyright
- document-changes
- disclose-source
- network-use-disclose
- same-license
permissions:
- commercial-use
- modifications
@ -26,8 +19,16 @@ permissions:
- patent-use
- private-use
conditions:
- include-copyright
- document-changes
- disclose-source
- network-use-disclose
- same-license
limitations:
- no-liability
---
GNU AFFERO GENERAL PUBLIC LICENSE

@ -17,10 +17,6 @@ using:
- Apache: https://svn.apache.org/viewvc/httpd/httpd/trunk/LICENSE?view=markup
- Swift: https://github.com/apple/swift/blob/master/LICENSE.txt
conditions:
- include-copyright
- document-changes
permissions:
- commercial-use
- modifications
@ -28,9 +24,14 @@ permissions:
- patent-use
- private-use
conditions:
- include-copyright
- document-changes
limitations:
- trademark-use
- no-liability
---
Apache License

@ -8,10 +8,6 @@ description: Heavily favored by the Perl community, the Artistic license require
how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code, and copy the text of the license into the file. Do not replace the copyright notice (year, author), which refers to the license itself, not the licensed project.
conditions:
- include-copyright
- document-changes
permissions:
- commercial-use
- modifications
@ -19,9 +15,14 @@ permissions:
- patent-use
- private-use
conditions:
- include-copyright
- document-changes
limitations:
- no-liability
- trademark-use
---
The Artistic License 2.0

@ -8,17 +8,18 @@ description: A permissive license that comes in two variants, the <a href="/lice
how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders.
conditions:
- include-copyright
permissions:
- commercial-use
- modifications
- distribution
- private-use
conditions:
- include-copyright
limitations:
- no-liability
---
BSD 2-Clause License

@ -1,25 +1,25 @@
---
title: BSD 3-clause Clear License
spdx-id: BSD-3-Clause-Clear
source: https://spdx.org/licenses/BSD-3-Clause-Clear.html
description: A variant of the <a href="/licenses/bsd-3-clause/">BSD 3-Clause License</a> that explicitly does not grant any patent rights.
how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. Replace [project] with the project organization, if any, that sponsors this work.
source: https://spdx.org/licenses/BSD-3-Clause-Clear.html
conditions:
- include-copyright
permissions:
- commercial-use
- modifications
- distribution
- private-use
conditions:
- include-copyright
limitations:
- no-liability
- patent-use
---
The Clear BSD License

@ -7,17 +7,18 @@ description: A permissive license similar to the <a href="/licenses/bsd-2-clause
how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. Replace [project] with the project organization, if any, that sponsors this work.
conditions:
- include-copyright
permissions:
- commercial-use
- modifications
- distribution
- private-use
conditions:
- include-copyright
limitations:
- no-liability
---
BSD 3-Clause License

@ -7,20 +7,21 @@ description: Permits almost any use subject to providing credit and license noti
how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. It is also acceptable to soley supply a link to a copy of the license, usually to the <a href='https://creativecommons.org/licenses/by/4.0/'>canonical URL for the license</a>.
conditions:
- include-copyright
- document-changes
permissions:
- commercial-use
- modifications
- distribution
- private-use
conditions:
- include-copyright
- document-changes
limitations:
- no-liability
- trademark-use
- patent-use
---
Attribution 4.0 International

@ -7,21 +7,22 @@ description: Similar to <a href='/licenses/cc-by-4.0/'>CC-BY-4.0</a> but require
how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. It is also acceptable to soley supply a link to a copy of the license, usually to the <a href='https://creativecommons.org/licenses/by-sa/4.0/'>canonical URL for the license</a>.
conditions:
- include-copyright
- document-changes
- same-license
permissions:
- commercial-use
- modifications
- distribution
- private-use
conditions:
- include-copyright
- document-changes
- same-license
limitations:
- no-liability
- trademark-use
- patent-use
---
Attribution-ShareAlike 4.0 International

@ -22,6 +22,7 @@ limitations:
- no-liability
- trademark-use
- patent-use
---
CC0 1.0 Universal

@ -13,11 +13,6 @@ using:
- JUnit: https://github.com/junit-team/junit/blob/master/LICENSE-junit.txt
- openHAB: https://github.com/openhab/openhab/blob/master/LICENSE.TXT
conditions:
- disclose-source
- include-copyright
- same-license
permissions:
- commercial-use
- distribution
@ -25,8 +20,14 @@ permissions:
- patent-use
- private-use
conditions:
- disclose-source
- include-copyright
- same-license
limitations:
- no-liability
---
Eclipse Public License - v 1.0

@ -10,13 +10,6 @@ how: Create a text file (typically named COPYING or LICENCE.txt) in the root of
note: The European Commission recommends taking the additional step of adding a [boilerplate notice](https://joinup.ec.europa.eu/sites/default/files/ckeditor_files/files/EUPL%201_1%20Guidelines%20EN%20Joinup.pdf#page=17) to the top of each file.
conditions:
- include-copyright
- disclose-source
- document-changes
- network-use-disclose
- same-license
permissions:
- commercial-use
- modifications
@ -24,9 +17,17 @@ permissions:
- patent-use
- private-use
conditions:
- include-copyright
- disclose-source
- document-changes
- network-use-disclose
- same-license
limitations:
- no-liability
- trademark-use
---
European Union Public Licence

@ -15,20 +15,21 @@ using:
- Linux: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/COPYING
- WordPress: https://github.com/WordPress/WordPress/blob/master/license.txt
conditions:
- include-copyright
- document-changes
- disclose-source
- same-license
permissions:
- commercial-use
- modifications
- distribution
- private-use
conditions:
- include-copyright
- document-changes
- disclose-source
- same-license
limitations:
- no-liability
---
GNU GENERAL PUBLIC LICENSE

@ -18,12 +18,6 @@ using:
- GIMP: https://git.gnome.org/browse/gimp/tree/COPYING
- Privacy Badger: https://github.com/EFForg/privacybadgerfirefox/blob/master/LICENSE
conditions:
- include-copyright
- document-changes
- disclose-source
- same-license
permissions:
- commercial-use
- modifications
@ -31,8 +25,15 @@ permissions:
- patent-use
- private-use
conditions:
- include-copyright
- document-changes
- disclose-source
- same-license
limitations:
- no-liability
---
GNU GENERAL PUBLIC LICENSE

@ -12,17 +12,18 @@ using:
- Node.js semver: https://github.com/npm/node-semver/blob/master/LICENSE
- OpenStreetMap iD: https://github.com/openstreetmap/iD/blob/master/LICENSE
conditions:
- include-copyright
permissions:
- commercial-use
- distribution
- modifications
- private-use
conditions:
- include-copyright
limitations:
- no-liability
---
ISC License

@ -11,20 +11,21 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of
note: The Free Software Foundation recommends taking the additional step of adding a boilerplate notice to the top of each file. The boilerplate can be found at the end of the license.
conditions:
- include-copyright
- disclose-source
- document-changes
- same-license
permissions:
- commercial-use
- modifications
- distribution
- private-use
conditions:
- include-copyright
- disclose-source
- document-changes
- same-license
limitations:
- no-liability
---
GNU LESSER GENERAL PUBLIC LICENSE

@ -12,13 +12,6 @@ how: This license is an additional set of permissions to the <a href="/licenses/
note: The Free Software Foundation recommends taking the additional step of adding a boilerplate notice to the top of each file. The boilerplate can be found at the end of the <a href="/licenses/gpl-3.0">GNU GPLv3 license</a>. Insert the word “Lesser” before “General” in all three places in the boilerplate notice to make sure that you refer to the GNU LGPLv3 and not the GNU GPLv3.
conditions:
- include-copyright
- disclose-source
- document-changes
- same-license
permissions:
- commercial-use
- modifications
@ -26,8 +19,15 @@ permissions:
- patent-use
- private-use
conditions:
- include-copyright
- disclose-source
- document-changes
- same-license
limitations:
- no-liability
---
GNU LESSER GENERAL PUBLIC LICENSE

@ -9,19 +9,20 @@ how: To use this license, place in each of the components of your work both an e
note: An example boilerplate and more information about how to use the license can be found at the end of the license.
conditions:
- include-copyright
- document-changes
- disclose-source
permissions:
- commercial-use
- modifications
- distribution
- private-use
conditions:
- include-copyright
- document-changes
- disclose-source
limitations:
- no-liability
---
The LaTeX Project Public License

@ -14,17 +14,18 @@ using:
- .NET Core: https://github.com/dotnet/corefx/blob/master/LICENSE
- Rails: https://github.com/rails/rails/blob/master/activerecord/MIT-LICENSE
conditions:
- include-copyright
permissions:
- commercial-use
- modifications
- distribution
- private-use
conditions:
- include-copyright
limitations:
- no-liability
---
MIT License

@ -16,11 +16,6 @@ using:
- TimelineJS3: https://github.com/NUKnightLab/TimelineJS3/blob/master/LICENSE
- LibreOffice: https://cgit.freedesktop.org/libreoffice/core/tree/COPYING.MPL
conditions:
- disclose-source
- include-copyright
- same-license
permissions:
- commercial-use
- modifications
@ -28,9 +23,15 @@ permissions:
- patent-use
- private-use
conditions:
- disclose-source
- include-copyright
- same-license
limitations:
- no-liability
- trademark-use
---
Mozilla Public License Version 2.0

@ -1,16 +1,12 @@
---
title: Microsoft Public License
spdx-id: MS-PL
source: http://opensource.org/licenses/ms-pl
description: An open source license with a patent grant.
how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file.
conditions:
- include-copyright
permissions:
- commercial-use
- modifications
@ -18,9 +14,13 @@ permissions:
- patent-use
- private-use
conditions:
- include-copyright
limitations:
- no-liability
- trademark-use
---
Microsoft Public License (MS-PL)

@ -1,18 +1,12 @@
---
title: Microsoft Reciprocal License
spdx-id: MS-RL
source: http://opensource.org/licenses/ms-rl
description: An open source license with a patent grant similar to the <a href="/licenses/ms-pl/">Microsoft Public License</a>, with the additional condition that any source code for any derived file be provided under this license.
how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file.
conditions:
- disclose-source
- include-copyright
- same-license
permissions:
- commercial-use
- modifications
@ -20,9 +14,15 @@ permissions:
- patent-use
- private-use
conditions:
- disclose-source
- include-copyright
- same-license
limitations:
- no-liability
- trademark-use
---
Microsoft Reciprocal License (MS-RL)

@ -10,16 +10,16 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of
note: This license doesn't require source provision, but recommends it. All files derived from OFL files must remain licensed under the OFL.
conditions:
- include-copyright
- same-license
permissions:
- private-use
- commercial-use
- modifications
- distribution
conditions:
- include-copyright
- same-license
limitations:
- no-liability

@ -14,13 +14,6 @@ using:
- Magento 2: https://github.com/magento/magento2/blob/develop/LICENSE.txt
- Restyaboard: https://github.com/RestyaPlatform/board/blob/master/LICENSE.txt
conditions:
- include-copyright
- disclose-source
- document-changes
- network-use-disclose
- same-license
permissions:
- commercial-use
- distribution
@ -28,6 +21,13 @@ permissions:
- patent-use
- private-use
conditions:
- include-copyright
- disclose-source
- document-changes
- network-use-disclose
- same-license
limitations:
- trademark-use
- no-liability

@ -23,6 +23,7 @@ conditions: []
limitations:
- no-liability
---
This is free and unencumbered software released into the public domain.

@ -7,14 +7,14 @@ description: The easiest license out there. It gives the user permissions to do
how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file.
conditions: []
permissions:
- commercial-use
- modifications
- distribution
- private-use
conditions: []
limitations: []
---

@ -7,18 +7,19 @@ description: A short permissive license, compatible with GPL. Requires altered s
how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders.
conditions:
- include-copyright
- document-changes
permissions:
- commercial-use
- modifications
- distribution
- private-use
conditions:
- include-copyright
- document-changes
limitations:
- no-liability
---
zlib License