Skip to content

Commit 28fe898

Browse files
brixenbrixen
committedJan 2, 2016
Added MPL-2.0.
[ci skip]
·
v5.0v3.1
1 parent e946d9a commit 28fe898

File tree

3 files changed

+373
-33
lines changed

3 files changed

+373
-33
lines changed
 

Diff for: ‎LICENSE

+365-25
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,365 @@
1-
Copyright (c) 2007-2015, Evan Phoenix and contributors
2-
All rights reserved.
3-
4-
Redistribution and use in source and binary forms, with or without
5-
modification, are permitted provided that the following conditions are met:
6-
7-
* Redistributions of source code must retain the above copyright notice, this
8-
list of conditions and the following disclaimer.
9-
* Redistributions in binary form must reproduce the above copyright notice
10-
this list of conditions and the following disclaimer in the documentation
11-
and/or other materials provided with the distribution.
12-
* Neither the name of Rubinius nor the names of its contributors
13-
may be used to endorse or promote products derived from this software
14-
without specific prior written permission.
15-
16-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
17-
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
18-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19-
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
20-
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21-
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
22-
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
23-
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
24-
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
25-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1+
Copyright (c) 2016, the Rubinius project.
Has conversations. Original line has conversations.
2+
Copyright (c) 2007-2015, Evan Phoenix and contributors.
3+
4+
Mozilla Public License, version 2.0
5+
6+
1. Definitions
7+
8+
1.1. "Contributor"
9+
10+
means each individual or legal entity that creates, contributes to the
11+
creation of, or owns Covered Software.
12+
13+
1.2. "Contributor Version"
14+
15+
means the combination of the Contributions of others (if any) used by a
16+
Contributor and that particular Contributor's Contribution.
17+
18+
1.3. "Contribution"
19+
20+
means Covered Software of a particular Contributor.
21+
22+
1.4. "Covered Software"
23+
24+
means Source Code Form to which the initial Contributor has attached the
25+
notice in Exhibit A, the Executable Form of such Source Code Form, and
26+
Modifications of such Source Code Form, in each case including portions
27+
thereof.
28+
29+
1.5. "Incompatible With Secondary Licenses"
30+
means
31+
32+
a. that the initial Contributor has attached the notice described in
33+
Exhibit B to the Covered Software; or
34+
35+
b. that the Covered Software was made available under the terms of
36+
version 1.1 or earlier of the License, but not also under the terms of
37+
a Secondary License.
38+
39+
1.6. "Executable Form"
40+
41+
means any form of the work other than Source Code Form.
42+
43+
1.7. "Larger Work"
44+
45+
means a work that combines Covered Software with other material, in a
46+
separate file or files, that is not Covered Software.
47+
48+
1.8. "License"
49+
50+
means this document.
51+
52+
1.9. "Licensable"
53+
54+
means having the right to grant, to the maximum extent possible, whether
55+
at the time of the initial grant or subsequently, any and all of the
56+
rights conveyed by this License.
57+
58+
1.10. "Modifications"
59+
60+
means any of the following:
61+
62+
a. any file in Source Code Form that results from an addition to,
63+
deletion from, or modification of the contents of Covered Software; or
64+
65+
b. any new file in Source Code Form that contains any Covered Software.
66+
67+
1.11. "Patent Claims" of a Contributor
68+
69+
means any patent claim(s), including without limitation, method,
70+
process, and apparatus claims, in any patent Licensable by such
71+
Contributor that would be infringed, but for the grant of the License,
72+
by the making, using, selling, offering for sale, having made, import,
73+
or transfer of either its Contributions or its Contributor Version.
74+
75+
1.12. "Secondary License"
76+
77+
means either the GNU General Public License, Version 2.0, the GNU Lesser
78+
General Public License, Version 2.1, the GNU Affero General Public
79+
License, Version 3.0, or any later versions of those licenses.
80+
81+
1.13. "Source Code Form"
82+
83+
means the form of the work preferred for making modifications.
84+
85+
1.14. "You" (or "Your")
86+
87+
means an individual or a legal entity exercising rights under this
88+
License. For legal entities, "You" includes any entity that controls, is
89+
controlled by, or is under common control with You. For purposes of this
90+
definition, "control" means (a) the power, direct or indirect, to cause
91+
the direction or management of such entity, whether by contract or
92+
otherwise, or (b) ownership of more than fifty percent (50%) of the
93+
outstanding shares or beneficial ownership of such entity.
94+
95+
96+
2. License Grants and Conditions
97+
98+
2.1. Grants
99+
100+
Each Contributor hereby grants You a world-wide, royalty-free,
101+
non-exclusive license:
102+
103+
a. under intellectual property rights (other than patent or trademark)
104+
Licensable by such Contributor to use, reproduce, make available,
105+
modify, display, perform, distribute, and otherwise exploit its
106+
Contributions, either on an unmodified basis, with Modifications, or
107+
as part of a Larger Work; and
108+
109+
b. under Patent Claims of such Contributor to make, use, sell, offer for
110+
sale, have made, import, and otherwise transfer either its
111+
Contributions or its Contributor Version.
112+
113+
2.2. Effective Date
114+
115+
The licenses granted in Section 2.1 with respect to any Contribution
116+
become effective for each Contribution on the date the Contributor first
117+
distributes such Contribution.
118+
119+
2.3. Limitations on Grant Scope
120+
121+
The licenses granted in this Section 2 are the only rights granted under
122+
this License. No additional rights or licenses will be implied from the
123+
distribution or licensing of Covered Software under this License.
124+
Notwithstanding Section 2.1(b) above, no patent license is granted by a
125+
Contributor:
126+
127+
a. for any code that a Contributor has removed from Covered Software; or
128+
129+
b. for infringements caused by: (i) Your and any other third party's
130+
modifications of Covered Software, or (ii) the combination of its
131+
Contributions with other software (except as part of its Contributor
132+
Version); or
133+
134+
c. under Patent Claims infringed by Covered Software in the absence of
135+
its Contributions.
136+
137+
This License does not grant any rights in the trademarks, service marks,
138+
or logos of any Contributor (except as may be necessary to comply with
139+
the notice requirements in Section 3.4).
140+
141+
2.4. Subsequent Licenses
142+
143+
No Contributor makes additional grants as a result of Your choice to
144+
distribute the Covered Software under a subsequent version of this
145+
License (see Section 10.2) or under the terms of a Secondary License (if
146+
permitted under the terms of Section 3.3).
147+
148+
2.5. Representation
149+
150+
Each Contributor represents that the Contributor believes its
151+
Contributions are its original creation(s) or it has sufficient rights to
152+
grant the rights to its Contributions conveyed by this License.
153+
154+
2.6. Fair Use
155+
156+
This License is not intended to limit any rights You have under
157+
applicable copyright doctrines of fair use, fair dealing, or other
158+
equivalents.
159+
160+
2.7. Conditions
161+
162+
Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
163+
Section 2.1.
164+
165+
166+
3. Responsibilities
167+
168+
3.1. Distribution of Source Form
169+
170+
All distribution of Covered Software in Source Code Form, including any
171+
Modifications that You create or to which You contribute, must be under
172+
the terms of this License. You must inform recipients that the Source
173+
Code Form of the Covered Software is governed by the terms of this
174+
License, and how they can obtain a copy of this License. You may not
175+
attempt to alter or restrict the recipients' rights in the Source Code
176+
Form.
177+
178+
3.2. Distribution of Executable Form
179+
180+
If You distribute Covered Software in Executable Form then:
181+
182+
a. such Covered Software must also be made available in Source Code Form,
183+
as described in Section 3.1, and You must inform recipients of the
184+
Executable Form how they can obtain a copy of such Source Code Form by
185+
reasonable means in a timely manner, at a charge no more than the cost
186+
of distribution to the recipient; and
187+
188+
b. You may distribute such Executable Form under the terms of this
189+
License, or sublicense it under different terms, provided that the
190+
license for the Executable Form does not attempt to limit or alter the
191+
recipients' rights in the Source Code Form under this License.
192+
193+
3.3. Distribution of a Larger Work
194+
195+
You may create and distribute a Larger Work under terms of Your choice,
196+
provided that You also comply with the requirements of this License for
197+
the Covered Software. If the Larger Work is a combination of Covered
198+
Software with a work governed by one or more Secondary Licenses, and the
199+
Covered Software is not Incompatible With Secondary Licenses, this
200+
License permits You to additionally distribute such Covered Software
201+
under the terms of such Secondary License(s), so that the recipient of
202+
the Larger Work may, at their option, further distribute the Covered
203+
Software under the terms of either this License or such Secondary
204+
License(s).
205+
206+
3.4. Notices
207+
208+
You may not remove or alter the substance of any license notices
209+
(including copyright notices, patent notices, disclaimers of warranty, or
210+
limitations of liability) contained within the Source Code Form of the
211+
Covered Software, except that You may alter any license notices to the
212+
extent required to remedy known factual inaccuracies.
213+
214+
3.5. Application of Additional Terms
215+
216+
You may choose to offer, and to charge a fee for, warranty, support,
217+
indemnity or liability obligations to one or more recipients of Covered
218+
Software. However, You may do so only on Your own behalf, and not on
219+
behalf of any Contributor. You must make it absolutely clear that any
220+
such warranty, support, indemnity, or liability obligation is offered by
221+
You alone, and You hereby agree to indemnify every Contributor for any
222+
liability incurred by such Contributor as a result of warranty, support,
223+
indemnity or liability terms You offer. You may include additional
224+
disclaimers of warranty and limitations of liability specific to any
225+
jurisdiction.
226+
227+
4. Inability to Comply Due to Statute or Regulation
228+
229+
If it is impossible for You to comply with any of the terms of this License
230+
with respect to some or all of the Covered Software due to statute,
231+
judicial order, or regulation then You must: (a) comply with the terms of
232+
this License to the maximum extent possible; and (b) describe the
233+
limitations and the code they affect. Such description must be placed in a
234+
text file included with all distributions of the Covered Software under
235+
this License. Except to the extent prohibited by statute or regulation,
236+
such description must be sufficiently detailed for a recipient of ordinary
237+
skill to be able to understand it.
238+
239+
5. Termination
240+
241+
5.1. The rights granted under this License will terminate automatically if You
242+
fail to comply with any of its terms. However, if You become compliant,
243+
then the rights granted under this License from a particular Contributor
244+
are reinstated (a) provisionally, unless and until such Contributor
245+
explicitly and finally terminates Your grants, and (b) on an ongoing
246+
basis, if such Contributor fails to notify You of the non-compliance by
247+
some reasonable means prior to 60 days after You have come back into
248+
compliance. Moreover, Your grants from a particular Contributor are
249+
reinstated on an ongoing basis if such Contributor notifies You of the
250+
non-compliance by some reasonable means, this is the first time You have
251+
received notice of non-compliance with this License from such
252+
Contributor, and You become compliant prior to 30 days after Your receipt
253+
of the notice.
254+
255+
5.2. If You initiate litigation against any entity by asserting a patent
256+
infringement claim (excluding declaratory judgment actions,
257+
counter-claims, and cross-claims) alleging that a Contributor Version
258+
directly or indirectly infringes any patent, then the rights granted to
259+
You by any and all Contributors for the Covered Software under Section
260+
2.1 of this License shall terminate.
261+
262+
5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user
263+
license agreements (excluding distributors and resellers) which have been
264+
validly granted by You or Your distributors under this License prior to
265+
termination shall survive termination.
266+
267+
6. Disclaimer of Warranty
268+
269+
Covered Software is provided under this License on an "as is" basis,
270+
without warranty of any kind, either expressed, implied, or statutory,
271+
including, without limitation, warranties that the Covered Software is free
272+
of defects, merchantable, fit for a particular purpose or non-infringing.
273+
The entire risk as to the quality and performance of the Covered Software
274+
is with You. Should any Covered Software prove defective in any respect,
275+
You (not any Contributor) assume the cost of any necessary servicing,
276+
repair, or correction. This disclaimer of warranty constitutes an essential
277+
part of this License. No use of any Covered Software is authorized under
278+
this License except under this disclaimer.
279+
280+
7. Limitation of Liability
281+
282+
Under no circumstances and under no legal theory, whether tort (including
283+
negligence), contract, or otherwise, shall any Contributor, or anyone who
284+
distributes Covered Software as permitted above, be liable to You for any
285+
direct, indirect, special, incidental, or consequential damages of any
286+
character including, without limitation, damages for lost profits, loss of
287+
goodwill, work stoppage, computer failure or malfunction, or any and all
288+
other commercial damages or losses, even if such party shall have been
289+
informed of the possibility of such damages. This limitation of liability
290+
shall not apply to liability for death or personal injury resulting from
291+
such party's negligence to the extent applicable law prohibits such
292+
limitation. Some jurisdictions do not allow the exclusion or limitation of
293+
incidental or consequential damages, so this exclusion and limitation may
294+
not apply to You.
295+
296+
8. Litigation
297+
298+
Any litigation relating to this License may be brought only in the courts
299+
of a jurisdiction where the defendant maintains its principal place of
300+
business and such litigation shall be governed by laws of that
301+
jurisdiction, without reference to its conflict-of-law provisions. Nothing
302+
in this Section shall prevent a party's ability to bring cross-claims or
303+
counter-claims.
304+
305+
9. Miscellaneous
306+
307+
This License represents the complete agreement concerning the subject
308+
matter hereof. If any provision of this License is held to be
309+
unenforceable, such provision shall be reformed only to the extent
310+
necessary to make it enforceable. Any law or regulation which provides that
311+
the language of a contract shall be construed against the drafter shall not
312+
be used to construe this License against a Contributor.
313+
314+
315+
10. Versions of the License
316+
317+
10.1. New Versions
318+
319+
Mozilla Foundation is the license steward. Except as provided in Section
320+
10.3, no one other than the license steward has the right to modify or
321+
publish new versions of this License. Each version will be given a
322+
distinguishing version number.
323+
324+
10.2. Effect of New Versions
325+
326+
You may distribute the Covered Software under the terms of the version
327+
of the License under which You originally received the Covered Software,
328+
or under the terms of any subsequent version published by the license
329+
steward.
330+
331+
10.3. Modified Versions
332+
333+
If you create software not governed by this License, and you want to
334+
create a new license for such software, you may create and use a
335+
modified version of this License if you rename the license and remove
336+
any references to the name of the license steward (except to note that
337+
such modified license differs from this License).
338+
339+
10.4. Distributing Source Code Form that is Incompatible With Secondary
340+
Licenses If You choose to distribute Source Code Form that is
341+
Incompatible With Secondary Licenses under the terms of this version of
342+
the License, the notice described in Exhibit B of this License must be
343+
attached.
344+
345+
Exhibit A - Source Code Form License Notice
346+
347+
This Source Code Form is subject to the
348+
terms of the Mozilla Public License, v.
349+
2.0. If a copy of the MPL was not
350+
distributed with this file, You can
351+
obtain one at
352+
http://mozilla.org/MPL/2.0/.
353+
354+
If it is not possible or desirable to put the notice in a particular file,
355+
then You may include the notice in a location (such as a LICENSE file in a
356+
relevant directory) where a recipient would be likely to look for such a
357+
notice.
358+
359+
You may add additional accurate notices of copyright ownership.
360+
361+
Exhibit B - "Incompatible With Secondary Licenses" Notice
362+
363+
This Source Code Form is "Incompatible
364+
With Secondary Licenses", as defined by
365+
the Mozilla Public License, v. 2.0.

Diff for: ‎README

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ The following Ruby features are not supported on Rubinius:
3535

3636
3. License
3737

38-
Rubinius uses the BSD license. See LICENSE for details.
38+
Rubinius uses the MPL-2.0 license. See LICENSE for details.
3939

4040

4141
4. Installing Rubinius from Source
@@ -51,8 +51,8 @@ To install Rubinius, use the following steps:
5151

5252
When the install process finishes, follow the directions printed to the
5353
terminal to add the Rubinius executable (bin) directory to your PATH. For more
54-
information see http://rubini.us/doc/en/getting-started/requirements/
55-
and http://rubini.us/doc/en/getting-started/building/.
54+
information see http://rubinius.com/doc/en/getting-started/requirements/
55+
and http://rubinius.com/doc/en/getting-started/building/.
5656

5757

5858
5. Using RubyGems
@@ -66,7 +66,7 @@ Rubinius comes with RubyGems built-in. To install a gem, run the following:
6666

6767
The Rubinius documentation is available at the Rubinius website:
6868

69-
http://rubini.us
69+
http://rubinius.com
7070

7171

7272
7. Issues & Support

Diff for: ‎README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ The following Ruby features are not supported on Rubinius:
3333

3434
### License
3535

36-
Rubinius uses the BSD license. See LICENSE for details.
36+
Rubinius uses the MPL-2.0 license. See LICENSE for details.
3737

3838

3939
### Installing Rubinius from Source
@@ -47,7 +47,7 @@ To install Rubinius, use the following steps:
4747
1. ./configure --prefix=/path/to/install/dir
4848
1. rake
4949

50-
When the install process finishes, follow the directions printed to the terminal to add the Rubinius executable (bin) directory to your PATH. For more information see the documentation for [Build Requirements](http://rubini.us/doc/en/getting-started/requirements/) and [Building Rubinius](http://rubini.us/doc/en/getting-started/building/).
50+
When the install process finishes, follow the directions printed to the terminal to add the Rubinius executable (bin) directory to your PATH. For more information see the documentation for [Build Requirements](http://rubinius.com/doc/en/getting-started/requirements/) and [Building Rubinius](http://rubinius.com/doc/en/getting-started/building/).
5151

5252

5353
### Using RubyGems
@@ -59,7 +59,7 @@ Rubinius comes with RubyGems built-in. To install a gem, run the following:
5959

6060
### Documentation
6161

62-
The Rubinius documentation is available at the [Rubinius website](http://rubini.us).
62+
The Rubinius documentation is available at the [Rubinius website](http://rubinius.com).
6363

6464

6565
### Issues & Support
@@ -72,4 +72,4 @@ For additional help, visit the [Rubinius Gitter chat room](https://gitter.im/rub
7272
### Contributing
7373

7474
The Rubinius team welcomes contributions. For more information, read the
75-
[CONTRIBUTING](https://github.com/rubinius/rubinius/blob/master/CONTRIBUTING.md) file and see the documentation [about contributing](http://rubini.us/doc/en/contributing/).
75+
[CONTRIBUTING](https://github.com/rubinius/rubinius/blob/master/CONTRIBUTING.md) file and see the documentation [about contributing](http://rubinius.com/doc/en/contributing/).

0 commit comments

Comments
 (0)
Please sign in to comment.