Skip to content

Commit 48c1e44

Browse files
mlinksvamlinksva
authored
Merge pull request #981 from liyishuai/mulan
mulan: fix wrapping and trim space
2 parents 639dac9 + 242b063 commit 48c1e44

File tree

2 files changed

+56
-57
lines changed

2 files changed

+56
-57
lines changed

‎_licenses/mulanpsl-2.0.txt‎

Lines changed: 55 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,13 @@ limitations:
102102

103103
Copyright (c) [Year] [name of copyright holder]
104104
[Software Name] is licensed under Mulan PSL v2.
105-
You can use this software according to the terms and conditions of the Mulan
105+
You can use this software according to the terms and conditions of the Mulan
106106
PSL v2.
107107
You may obtain a copy of Mulan PSL v2 at:
108108
http://license.coscl.org.cn/MulanPSL2
109-
THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY
110-
KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
111-
NON-INFRINGEMENT,
112-
MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
109+
THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY
110+
KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
111+
NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
113112
See the Mulan PSL v2 for more details.
114113

115114
Mulan Permissive Software License，Version 2
@@ -118,109 +117,109 @@ Mulan Permissive Software License，Version 2 (Mulan PSL v2)
118117

119118
January 2020 http://license.coscl.org.cn/MulanPSL2
120119

121-
Your reproduction, use, modification and distribution of the Software shall
122-
be subject to Mulan PSL v2 (this License) with the following terms and
120+
Your reproduction, use, modification and distribution of the Software shall
121+
be subject to Mulan PSL v2 (this License) with the following terms and
123122
conditions:
124123

125124
0. Definition
126125

127-
Software means the program and related documents which are licensed under
126+
Software means the program and related documents which are licensed under
128127
this License and comprise all Contribution(s).
129128

130-
Contribution means the copyrightable work licensed by a particular
129+
Contribution means the copyrightable work licensed by a particular
131130
Contributor under this License.
132131

133-
Contributor means the Individual or Legal Entity who licenses its
132+
Contributor means the Individual or Legal Entity who licenses its
134133
copyrightable work under this License.
135134

136-
Legal Entity means the entity making a Contribution and all its
135+
Legal Entity means the entity making a Contribution and all its
137136
Affiliates.
138137

139-
Affiliates means entities that control, are controlled by, or are under
140-
common control with the acting entity under this License, ‘control’ means
141-
direct or indirect ownership of at least fifty percent (50%) of the voting
142-
power, capital or other securities of controlled or commonly controlled
138+
Affiliates means entities that control, are controlled by, or are under
139+
common control with the acting entity under this License, ‘control’ means
140+
direct or indirect ownership of at least fifty percent (50%) of the voting
141+
power, capital or other securities of controlled or commonly controlled
143142
entity.
144143

145144
1. Grant of Copyright License
146145

147-
Subject to the terms and conditions of this License, each Contributor hereby
148-
grants to you a perpetual, worldwide, royalty-free, non-exclusive,
149-
irrevocable copyright license to reproduce, use, modify, or distribute its
146+
Subject to the terms and conditions of this License, each Contributor hereby
147+
grants to you a perpetual, worldwide, royalty-free, non-exclusive,
148+
irrevocable copyright license to reproduce, use, modify, or distribute its
150149
Contribution, with modification or not.
151150

152151
2. Grant of Patent License
153152

154-
Subject to the terms and conditions of this License, each Contributor hereby
155-
grants to you a perpetual, worldwide, royalty-free, non-exclusive,
156-
irrevocable (except for revocation under this Section) patent license to
157-
make, have made, use, offer for sale, sell, import or otherwise transfer its
158-
Contribution, where such patent license is only limited to the patent claims
159-
owned or controlled by such Contributor now or in future which will be
160-
necessarily infringed by its Contribution alone, or by combination of the
161-
Contribution with the Software to which the Contribution was contributed.
162-
The patent license shall not apply to any modification of the Contribution,
163-
and any other combination which includes the Contribution. If you or your
164-
Affiliates directly or indirectly institute patent litigation (including a
165-
cross claim or counterclaim in a litigation) or other patent enforcement
166-
activities against any individual or entity by alleging that the Software or
167-
any Contribution in it infringes patents, then any patent license granted to
168-
you under this License for the Software shall terminate as of the date such
153+
Subject to the terms and conditions of this License, each Contributor hereby
154+
grants to you a perpetual, worldwide, royalty-free, non-exclusive,
155+
irrevocable (except for revocation under this Section) patent license to
156+
make, have made, use, offer for sale, sell, import or otherwise transfer its
157+
Contribution, where such patent license is only limited to the patent claims
158+
owned or controlled by such Contributor now or in future which will be
159+
necessarily infringed by its Contribution alone, or by combination of the
160+
Contribution with the Software to which the Contribution was contributed.
161+
The patent license shall not apply to any modification of the Contribution,
162+
and any other combination which includes the Contribution. If you or your
163+
Affiliates directly or indirectly institute patent litigation (including a
164+
cross claim or counterclaim in a litigation) or other patent enforcement
165+
activities against any individual or entity by alleging that the Software or
166+
any Contribution in it infringes patents, then any patent license granted to
167+
you under this License for the Software shall terminate as of the date such
169168
litigation or activity is filed or taken.
170169

171170
3. No Trademark License
172171

173-
No trademark license is granted to use the trade names, trademarks, service
174-
marks, or product names of Contributor, except as required to fulfill notice
172+
No trademark license is granted to use the trade names, trademarks, service
173+
marks, or product names of Contributor, except as required to fulfill notice
175174
requirements in section 4.
176175

177176
4. Distribution Restriction
178177

179-
You may distribute the Software in any medium with or without modification,
180-
whether in source or executable forms, provided that you provide recipients
181-
with a copy of this License and retain copyright, patent, trademark and
178+
You may distribute the Software in any medium with or without modification,
179+
whether in source or executable forms, provided that you provide recipients
180+
with a copy of this License and retain copyright, patent, trademark and
182181
disclaimer statements in the Software.
183182

184183
5. Disclaimer of Warranty and Limitation of Liability
185184

186-
THE SOFTWARE AND CONTRIBUTION IN IT ARE PROVIDED WITHOUT WARRANTIES OF ANY
187-
KIND, EITHER EXPRESS OR IMPLIED. IN NO EVENT SHALL ANY CONTRIBUTOR OR
188-
COPYRIGHT HOLDER BE LIABLE TO YOU FOR ANY DAMAGES, INCLUDING, BUT NOT
189-
LIMITED TO ANY DIRECT, OR INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING
190-
FROM YOUR USE OR INABILITY TO USE THE SOFTWARE OR THE CONTRIBUTION IN IT, NO
191-
MATTER HOW IT’S CAUSED OR BASED ON WHICH LEGAL THEORY, EVEN IF ADVISED OF
185+
THE SOFTWARE AND CONTRIBUTION IN IT ARE PROVIDED WITHOUT WARRANTIES OF ANY
186+
KIND, EITHER EXPRESS OR IMPLIED. IN NO EVENT SHALL ANY CONTRIBUTOR OR
187+
COPYRIGHT HOLDER BE LIABLE TO YOU FOR ANY DAMAGES, INCLUDING, BUT NOT
188+
LIMITED TO ANY DIRECT, OR INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING
189+
FROM YOUR USE OR INABILITY TO USE THE SOFTWARE OR THE CONTRIBUTION IN IT, NO
190+
MATTER HOW IT’S CAUSED OR BASED ON WHICH LEGAL THEORY, EVEN IF ADVISED OF
192191
THE POSSIBILITY OF SUCH DAMAGES.
193192

194193
6. Language
195194

196-
THIS LICENSE IS WRITTEN IN BOTH CHINESE AND ENGLISH, AND THE CHINESE VERSION
197-
AND ENGLISH VERSION SHALL HAVE THE SAME LEGAL EFFECT. IN THE CASE OF
198-
DIVERGENCE BETWEEN THE CHINESE AND ENGLISH VERSIONS, THE CHINESE VERSION
195+
THIS LICENSE IS WRITTEN IN BOTH CHINESE AND ENGLISH, AND THE CHINESE VERSION
196+
AND ENGLISH VERSION SHALL HAVE THE SAME LEGAL EFFECT. IN THE CASE OF
197+
DIVERGENCE BETWEEN THE CHINESE AND ENGLISH VERSIONS, THE CHINESE VERSION
199198
SHALL PREVAIL.
200199

201200
END OF THE TERMS AND CONDITIONS
202201

203-
How to Apply the Mulan Permissive Software License，Version 2
202+
How to Apply the Mulan Permissive Software License，Version 2
204203
(Mulan PSL v2) to Your Software
205204

206-
To apply the Mulan PSL v2 to your work, for easy identification by
205+
To apply the Mulan PSL v2 to your work, for easy identification by
207206
recipients, you are suggested to complete following three steps:
208207

209-
i. Fill in the blanks in following statement, including insert your software
210-
name, the year of the first publication of your software, and your name
208+
i. Fill in the blanks in following statement, including insert your software
209+
name, the year of the first publication of your software, and your name
211210
identified as the copyright owner;
212-
ii. Create a file named "LICENSE" which contains the whole context of this
211+
ii. Create a file named "LICENSE" which contains the whole context of this
213212
License in the first directory of your software package;
214-
iii. Attach the statement to the appropriate annotated syntax at the
213+
iii. Attach the statement to the appropriate annotated syntax at the
215214
beginning of each source file.
216215

217216
Copyright (c) [Year] [name of copyright holder]
218217
[Software Name] is licensed under Mulan PSL v2.
219-
You can use this software according to the terms and conditions of the Mulan
218+
You can use this software according to the terms and conditions of the Mulan
220219
PSL v2.
221220
You may obtain a copy of Mulan PSL v2 at:
222221
http://license.coscl.org.cn/MulanPSL2
223-
THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY
224-
KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
222+
THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY
223+
KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
225224
NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
226225
See the Mulan PSL v2 for more details.

‎community.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Some communities have strong preferences for particular licenses. If you want to
1414
{: .bullets}
1515

1616
* [Apache](https://www.apache.org/licenses/) requires [Apache License 2.0](/licenses/apache-2.0/)
17-
* [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
17+
* [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
1818
* [GNU](https://www.gnu.org/licenses/license-recommendations.html) recommends [GNU GPLv3](/licenses/gpl-3.0/) for most programs
1919
* [npm packages](https://libraries.io/search?platforms=npm) overwhelmingly use the [MIT](/licenses/mit/) or the very similar [ISC](/licenses/isc) licenses
2020
* [OpenBSD](https://www.openbsd.org/policy.html) prefers the [ISC License](/licenses/isc/)

0 commit comments

Comments
 (0)