1
0
mirror of https://github.com/github/choosealicense.com synced 2024-12-22 12:50:24 +01:00

Merge pull request #981 from liyishuai/mulan

mulan: fix wrapping and trim space
This commit is contained in:
Mike Linksvayer 2022-04-14 16:53:19 -07:00 committed by GitHub
commit 48c1e44d1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 56 additions and 57 deletions

View File

@ -108,8 +108,7 @@ 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

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/)