Skip to content
This repository was archived by the owner on Jun 2, 2020. It is now read-only.

Commit 09e9461

Browse files
committed
Update licenses/readme to match current standard
This updates the licenses for this repo to match what's recommended in the latest IPFS community licensing policy: https://github.com/ipfs/community/blob/47a4d2c28bd490d764adf3bb85a78e356bda4e0b/docs/licensing-policy.md License: MIT Signed-off-by: Rob Brackett <rob@robbrackett.com>
1 parent 505451c commit 09e9461

File tree

2 files changed

+26
-56
lines changed

2 files changed

+26
-56
lines changed

LICENSE

Lines changed: 25 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@ The above copyright notice and this permission notice shall be included in all c
88

99
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1010

11+
12+
1113
=======================================================================
1214

13-
Other written documentation and content licensed under the Creative Commons Attribution-Share-Alike License as follows:
15+
Other written documentation and content licensed under the Creative Commons Attribution License as follows:
1416

15-
Attribution-ShareAlike 4.0 International
17+
Attribution 4.0 International
1618

1719
=======================================================================
1820

@@ -68,18 +70,16 @@ exhaustive, and do not form part of our licenses.
6870

6971
=======================================================================
7072

71-
Creative Commons Attribution-ShareAlike 4.0 International Public
72-
License
73+
Creative Commons Attribution 4.0 International Public License
7374

7475
By exercising the Licensed Rights (defined below), You accept and agree
7576
to be bound by the terms and conditions of this Creative Commons
76-
Attribution-ShareAlike 4.0 International Public License ("Public
77-
License"). To the extent this Public License may be interpreted as a
78-
contract, You are granted the Licensed Rights in consideration of Your
79-
acceptance of these terms and conditions, and the Licensor grants You
80-
such rights in consideration of benefits the Licensor receives from
81-
making the Licensed Material available under these terms and
82-
conditions.
77+
Attribution 4.0 International Public License ("Public License"). To the
78+
extent this Public License may be interpreted as a contract, You are
79+
granted the Licensed Rights in consideration of Your acceptance of
80+
these terms and conditions, and the Licensor grants You such rights in
81+
consideration of benefits the Licensor receives from making the
82+
Licensed Material available under these terms and conditions.
8383

8484

8585
Section 1 -- Definitions.
@@ -98,59 +98,51 @@ Section 1 -- Definitions.
9898
and Similar Rights in Your contributions to Adapted Material in
9999
accordance with the terms and conditions of this Public License.
100100

101-
c. BY-SA Compatible License means a license listed at
102-
creativecommons.org/compatiblelicenses, approved by Creative
103-
Commons as essentially the equivalent of this Public License.
104-
105-
d. Copyright and Similar Rights means copyright and/or similar rights
101+
c. Copyright and Similar Rights means copyright and/or similar rights
106102
closely related to copyright including, without limitation,
107103
performance, broadcast, sound recording, and Sui Generis Database
108104
Rights, without regard to how the rights are labeled or
109105
categorized. For purposes of this Public License, the rights
110106
specified in Section 2(b)(1)-(2) are not Copyright and Similar
111107
Rights.
112108

113-
e. Effective Technological Measures means those measures that, in the
109+
d. Effective Technological Measures means those measures that, in the
114110
absence of proper authority, may not be circumvented under laws
115111
fulfilling obligations under Article 11 of the WIPO Copyright
116112
Treaty adopted on December 20, 1996, and/or similar international
117113
agreements.
118114

119-
f. Exceptions and Limitations means fair use, fair dealing, and/or
115+
e. Exceptions and Limitations means fair use, fair dealing, and/or
120116
any other exception or limitation to Copyright and Similar Rights
121117
that applies to Your use of the Licensed Material.
122118

123-
g. License Elements means the license attributes listed in the name
124-
of a Creative Commons Public License. The License Elements of this
125-
Public License are Attribution and ShareAlike.
126-
127-
h. Licensed Material means the artistic or literary work, database,
119+
f. Licensed Material means the artistic or literary work, database,
128120
or other material to which the Licensor applied this Public
129121
License.
130122

131-
i. Licensed Rights means the rights granted to You subject to the
123+
g. Licensed Rights means the rights granted to You subject to the
132124
terms and conditions of this Public License, which are limited to
133125
all Copyright and Similar Rights that apply to Your use of the
134126
Licensed Material and that the Licensor has authority to license.
135127

136-
j. Licensor means the individual(s) or entity(ies) granting rights
128+
h. Licensor means the individual(s) or entity(ies) granting rights
137129
under this Public License.
138130

139-
k. Share means to provide material to the public by any means or
131+
i. Share means to provide material to the public by any means or
140132
process that requires permission under the Licensed Rights, such
141133
as reproduction, public display, public performance, distribution,
142134
dissemination, communication, or importation, and to make material
143135
available to the public including in ways that members of the
144136
public may access the material from a place and at a time
145137
individually chosen by them.
146138

147-
l. Sui Generis Database Rights means rights other than copyright
139+
j. Sui Generis Database Rights means rights other than copyright
148140
resulting from Directive 96/9/EC of the European Parliament and of
149141
the Council of 11 March 1996 on the legal protection of databases,
150142
as amended and/or succeeded, as well as other essentially
151143
equivalent rights anywhere in the world.
152144

153-
m. You means the individual or entity exercising the Licensed Rights
145+
k. You means the individual or entity exercising the Licensed Rights
154146
under this Public License. Your has a corresponding meaning.
155147

156148

@@ -196,13 +188,7 @@ Section 2 -- Scope.
196188
Licensed Rights under the terms and conditions of this
197189
Public License.
198190

199-
b. Additional offer from the Licensor -- Adapted Material.
200-
Every recipient of Adapted Material from You
201-
automatically receives an offer from the Licensor to
202-
exercise the Licensed Rights in the Adapted Material
203-
under the conditions of the Adapter's License You apply.
204-
205-
c. No downstream restrictions. You may not offer or impose
191+
b. No downstream restrictions. You may not offer or impose
206192
any additional or different terms or conditions on, or
207193
apply any Effective Technological Measures to, the
208194
Licensed Material if doing so restricts exercise of the
@@ -284,24 +270,9 @@ following conditions.
284270
information required by Section 3(a)(1)(A) to the extent
285271
reasonably practicable.
286272

287-
b. ShareAlike.
288-
289-
In addition to the conditions in Section 3(a), if You Share
290-
Adapted Material You produce, the following conditions also apply.
291-
292-
1. The Adapter's License You apply must be a Creative Commons
293-
license with the same License Elements, this version or
294-
later, or a BY-SA Compatible License.
295-
296-
2. You must include the text of, or the URI or hyperlink to, the
297-
Adapter's License You apply. You may satisfy this condition
298-
in any reasonable manner based on the medium, means, and
299-
context in which You Share Adapted Material.
300-
301-
3. You may not offer or impose any additional or different terms
302-
or conditions on, or apply any Effective Technological
303-
Measures to, Adapted Material that restrict exercise of the
304-
rights granted under the Adapter's License You apply.
273+
4. If You Share Adapted Material You produce, the Adapter's
274+
License You apply must not prevent recipients of the Adapted
275+
Material from complying with this Public License.
305276

306277

307278
Section 4 -- Sui Generis Database Rights.
@@ -316,9 +287,8 @@ apply to Your use of the Licensed Material:
316287
b. if You include all or a substantial portion of the database
317288
contents in a database in which You have Sui Generis Database
318289
Rights, then the database in which You have Sui Generis Database
319-
Rights (but not its individual contents) is Adapted Material,
290+
Rights (but not its individual contents) is Adapted Material; and
320291

321-
including for purposes of Section 3(b); and
322292
c. You must comply with the conditions in Section 3(a) if You Share
323293
all or a substantial portion of the contents of the database.
324294

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,6 @@ TODO
4444

4545
All software code is copyright (c) Protocol Labs, Inc. under the **MIT license**.
4646

47-
Other written documentation and content (c) Protocol Labs, Inc under the [**Creative Commons Attribution-Share-Alike License**](https://creativecommons.org/licenses/by-sa/4.0/).
47+
Other written documentation and content (c) Protocol Labs, Inc. under the [**Creative Commons Attribution-Share-Alike License**](https://creativecommons.org/licenses/by/4.0/).
4848

4949
See [LICENSE file](./LICENSE) for details.

0 commit comments

Comments
 (0)