1
0
mirror of https://github.com/github/choosealicense.com synced 2024-12-22 04:40:09 +01:00

Merge branch 'gh-pages' into patch-5

This commit is contained in:
Tyler887 2022-05-11 22:40:20 +01:00 committed by GitHub
commit 9732e1e193
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 57 additions and 58 deletions

View File

@ -102,14 +102,13 @@ limitations:
Copyright (c) [Year] [name of copyright holder] Copyright (c) [Year] [name of copyright holder]
[Software Name] is licensed under Mulan PSL v2. [Software Name] is licensed under Mulan PSL v2.
You can use this software according to the terms and conditions of the Mulan You can use this software according to the terms and conditions of the Mulan
PSL v2. PSL v2.
You may obtain a copy of Mulan PSL v2 at: You may obtain a copy of Mulan PSL v2 at:
http://license.coscl.org.cn/MulanPSL2 http://license.coscl.org.cn/MulanPSL2
THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY
KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
NON-INFRINGEMENT, NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
See the Mulan PSL v2 for more details. See the Mulan PSL v2 for more details.
Mulan Permissive Software LicenseVersion 2 Mulan Permissive Software LicenseVersion 2
@ -118,109 +117,109 @@ Mulan Permissive Software LicenseVersion 2 (Mulan PSL v2)
January 2020 http://license.coscl.org.cn/MulanPSL2 January 2020 http://license.coscl.org.cn/MulanPSL2
Your reproduction, use, modification and distribution of the Software shall Your reproduction, use, modification and distribution of the Software shall
be subject to Mulan PSL v2 (this License) with the following terms and be subject to Mulan PSL v2 (this License) with the following terms and
conditions: conditions:
0. Definition 0. Definition
Software means the program and related documents which are licensed under Software means the program and related documents which are licensed under
this License and comprise all Contribution(s). this License and comprise all Contribution(s).
Contribution means the copyrightable work licensed by a particular Contribution means the copyrightable work licensed by a particular
Contributor under this License. Contributor under this License.
Contributor means the Individual or Legal Entity who licenses its Contributor means the Individual or Legal Entity who licenses its
copyrightable work under this License. copyrightable work under this License.
Legal Entity means the entity making a Contribution and all its Legal Entity means the entity making a Contribution and all its
Affiliates. Affiliates.
Affiliates means entities that control, are controlled by, or are under Affiliates means entities that control, are controlled by, or are under
common control with the acting entity under this License, control means common control with the acting entity under this License, control means
direct or indirect ownership of at least fifty percent (50%) of the voting direct or indirect ownership of at least fifty percent (50%) of the voting
power, capital or other securities of controlled or commonly controlled power, capital or other securities of controlled or commonly controlled
entity. entity.
1. Grant of Copyright License 1. Grant of Copyright License
Subject to the terms and conditions of this License, each Contributor hereby Subject to the terms and conditions of this License, each Contributor hereby
grants to you a perpetual, worldwide, royalty-free, non-exclusive, grants to you a perpetual, worldwide, royalty-free, non-exclusive,
irrevocable copyright license to reproduce, use, modify, or distribute its irrevocable copyright license to reproduce, use, modify, or distribute its
Contribution, with modification or not. Contribution, with modification or not.
2. Grant of Patent License 2. Grant of Patent License
Subject to the terms and conditions of this License, each Contributor hereby Subject to the terms and conditions of this License, each Contributor hereby
grants to you a perpetual, worldwide, royalty-free, non-exclusive, grants to you a perpetual, worldwide, royalty-free, non-exclusive,
irrevocable (except for revocation under this Section) patent license to irrevocable (except for revocation under this Section) patent license to
make, have made, use, offer for sale, sell, import or otherwise transfer its make, have made, use, offer for sale, sell, import or otherwise transfer its
Contribution, where such patent license is only limited to the patent claims Contribution, where such patent license is only limited to the patent claims
owned or controlled by such Contributor now or in future which will be owned or controlled by such Contributor now or in future which will be
necessarily infringed by its Contribution alone, or by combination of the necessarily infringed by its Contribution alone, or by combination of the
Contribution with the Software to which the Contribution was contributed. Contribution with the Software to which the Contribution was contributed.
The patent license shall not apply to any modification of the Contribution, The patent license shall not apply to any modification of the Contribution,
and any other combination which includes the Contribution. If you or your and any other combination which includes the Contribution. If you or your
Affiliates directly or indirectly institute patent litigation (including a Affiliates directly or indirectly institute patent litigation (including a
cross claim or counterclaim in a litigation) or other patent enforcement cross claim or counterclaim in a litigation) or other patent enforcement
activities against any individual or entity by alleging that the Software or activities against any individual or entity by alleging that the Software or
any Contribution in it infringes patents, then any patent license granted to any Contribution in it infringes patents, then any patent license granted to
you under this License for the Software shall terminate as of the date such you under this License for the Software shall terminate as of the date such
litigation or activity is filed or taken. litigation or activity is filed or taken.
3. No Trademark License 3. No Trademark License
No trademark license is granted to use the trade names, trademarks, service No trademark license is granted to use the trade names, trademarks, service
marks, or product names of Contributor, except as required to fulfill notice marks, or product names of Contributor, except as required to fulfill notice
requirements in section 4. requirements in section 4.
4. Distribution Restriction 4. Distribution Restriction
You may distribute the Software in any medium with or without modification, You may distribute the Software in any medium with or without modification,
whether in source or executable forms, provided that you provide recipients whether in source or executable forms, provided that you provide recipients
with a copy of this License and retain copyright, patent, trademark and with a copy of this License and retain copyright, patent, trademark and
disclaimer statements in the Software. disclaimer statements in the Software.
5. Disclaimer of Warranty and Limitation of Liability 5. Disclaimer of Warranty and Limitation of Liability
THE SOFTWARE AND CONTRIBUTION IN IT ARE PROVIDED WITHOUT WARRANTIES OF ANY THE SOFTWARE AND CONTRIBUTION IN IT ARE PROVIDED WITHOUT WARRANTIES OF ANY
KIND, EITHER EXPRESS OR IMPLIED. IN NO EVENT SHALL ANY CONTRIBUTOR OR KIND, EITHER EXPRESS OR IMPLIED. IN NO EVENT SHALL ANY CONTRIBUTOR OR
COPYRIGHT HOLDER BE LIABLE TO YOU FOR ANY DAMAGES, INCLUDING, BUT NOT COPYRIGHT HOLDER BE LIABLE TO YOU FOR ANY DAMAGES, INCLUDING, BUT NOT
LIMITED TO ANY DIRECT, OR INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING LIMITED TO ANY DIRECT, OR INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING
FROM YOUR USE OR INABILITY TO USE THE SOFTWARE OR THE CONTRIBUTION IN IT, NO FROM YOUR USE OR INABILITY TO USE THE SOFTWARE OR THE CONTRIBUTION IN IT, NO
MATTER HOW ITS CAUSED OR BASED ON WHICH LEGAL THEORY, EVEN IF ADVISED OF MATTER HOW ITS CAUSED OR BASED ON WHICH LEGAL THEORY, EVEN IF ADVISED OF
THE POSSIBILITY OF SUCH DAMAGES. THE POSSIBILITY OF SUCH DAMAGES.
6. Language 6. Language
THIS LICENSE IS WRITTEN IN BOTH CHINESE AND ENGLISH, AND THE CHINESE VERSION THIS LICENSE IS WRITTEN IN BOTH CHINESE AND ENGLISH, AND THE CHINESE VERSION
AND ENGLISH VERSION SHALL HAVE THE SAME LEGAL EFFECT. IN THE CASE OF AND ENGLISH VERSION SHALL HAVE THE SAME LEGAL EFFECT. IN THE CASE OF
DIVERGENCE BETWEEN THE CHINESE AND ENGLISH VERSIONS, THE CHINESE VERSION DIVERGENCE BETWEEN THE CHINESE AND ENGLISH VERSIONS, THE CHINESE VERSION
SHALL PREVAIL. SHALL PREVAIL.
END OF THE TERMS AND CONDITIONS END OF THE TERMS AND CONDITIONS
How to Apply the Mulan Permissive Software LicenseVersion 2 How to Apply the Mulan Permissive Software LicenseVersion 2
(Mulan PSL v2) to Your Software (Mulan PSL v2) to Your Software
To apply the Mulan PSL v2 to your work, for easy identification by To apply the Mulan PSL v2 to your work, for easy identification by
recipients, you are suggested to complete following three steps: recipients, you are suggested to complete following three steps:
i. Fill in the blanks in following statement, including insert your software i. Fill in the blanks in following statement, including insert your software
name, the year of the first publication of your software, and your name name, the year of the first publication of your software, and your name
identified as the copyright owner; identified as the copyright owner;
ii. Create a file named "LICENSE" which contains the whole context of this ii. Create a file named "LICENSE" which contains the whole context of this
License in the first directory of your software package; License in the first directory of your software package;
iii. Attach the statement to the appropriate annotated syntax at the iii. Attach the statement to the appropriate annotated syntax at the
beginning of each source file. beginning of each source file.
Copyright (c) [Year] [name of copyright holder] Copyright (c) [Year] [name of copyright holder]
[Software Name] is licensed under Mulan PSL v2. [Software Name] is licensed under Mulan PSL v2.
You can use this software according to the terms and conditions of the Mulan You can use this software according to the terms and conditions of the Mulan
PSL v2. PSL v2.
You may obtain a copy of Mulan PSL v2 at: You may obtain a copy of Mulan PSL v2 at:
http://license.coscl.org.cn/MulanPSL2 http://license.coscl.org.cn/MulanPSL2
THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY
KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
See the Mulan PSL v2 for more details. See the Mulan PSL v2 for more details.

View File

@ -14,7 +14,7 @@ Some communities have strong preferences for particular licenses. If you want to
{: .bullets} {: .bullets}
* [Apache](https://www.apache.org/licenses/) requires [Apache License 2.0](/licenses/apache-2.0/) * [Apache](https://www.apache.org/licenses/) requires [Apache License 2.0](/licenses/apache-2.0/)
* [Cloud Native Computing Foundation](https://github.com/cncf/toc/blob/master/process/project_proposals.adoc) dictates [Apache License 2.0](/licenses/apache-2.0/) by default * [Cloud Native Computing Foundation](https://github.com/cncf/toc/blob/main/process/project_proposals.md) dictates [Apache License 2.0](/licenses/apache-2.0/) by default
* [GNU](https://www.gnu.org/licenses/license-recommendations.html) recommends [GNU GPLv3](/licenses/gpl-3.0/) for most programs * [GNU](https://www.gnu.org/licenses/license-recommendations.html) recommends [GNU GPLv3](/licenses/gpl-3.0/) for most programs
* [npm packages](https://libraries.io/search?platforms=npm) overwhelmingly use the [MIT](/licenses/mit/) or the very similar [ISC](/licenses/isc) licenses * [npm packages](https://libraries.io/search?platforms=npm) overwhelmingly use the [MIT](/licenses/mit/) or the very similar [ISC](/licenses/isc) licenses
* [OpenBSD](https://www.openbsd.org/policy.html) prefers the [ISC License](/licenses/isc/) * [OpenBSD](https://www.openbsd.org/policy.html) prefers the [ISC License](/licenses/isc/)

View File

@ -28,7 +28,7 @@ describe 'licenses' do
context 'industry approval' do context 'industry approval' do
it 'should be approved by OSI or FSF or OD' do it 'should be approved by OSI or FSF or OD' do
expect(approved_licenses).to include(spdx_lcase), 'See https://git.io/vzCTV.' expect(approved_licenses).to include(spdx_lcase), 'See https://github.com/github/choosealicense.com/blob/gh-pages/CONTRIBUTING.md#adding-new-licenses.'
end end
end end