Skip to content

Commit

Permalink
corrects license
Browse files Browse the repository at this point in the history
  • Loading branch information
huettenhain committed Dec 16, 2019
1 parent ff033da commit 8cf4a15
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 21 deletions.
50 changes: 31 additions & 19 deletions LICENSE
@@ -1,4 +1,4 @@
Attribution-NoDerivatives 4.0 International
Attribution-NonCommercial-NoDerivatives 4.0 International

=======================================================================

Expand Down Expand Up @@ -52,21 +52,20 @@ exhaustive, and do not form part of our licenses.
for the public:
wiki.creativecommons.org/Considerations_for_licensees


=======================================================================

Creative Commons Attribution-NoDerivatives 4.0 International Public
License
Creative Commons Attribution-NonCommercial-NoDerivatives 4.0
International Public License

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


Section 1 -- Definitions.
Expand Down Expand Up @@ -111,21 +110,29 @@ Section 1 -- Definitions.
g. Licensor means the individual(s) or entity(ies) granting rights
under this Public License.

h. Share means to provide material to the public by any means or
h. NonCommercial means not primarily intended for or directed towards
commercial advantage or monetary compensation. For purposes of
this Public License, the exchange of the Licensed Material for
other material subject to Copyright and Similar Rights by digital
file-sharing or similar means is NonCommercial provided there is
no payment of monetary compensation in connection with the
exchange.

i. Share means to provide material to the public by any means or
process that requires permission under the Licensed Rights, such
as reproduction, public display, public performance, distribution,
dissemination, communication, or importation, and to make material
available to the public including in ways that members of the
public may access the material from a place and at a time
individually chosen by them.

i. Sui Generis Database Rights means rights other than copyright
j. Sui Generis Database Rights means rights other than copyright
resulting from Directive 96/9/EC of the European Parliament and of
the Council of 11 March 1996 on the legal protection of databases,
as amended and/or succeeded, as well as other essentially
equivalent rights anywhere in the world.

j. You means the individual or entity exercising the Licensed Rights
k. You means the individual or entity exercising the Licensed Rights
under this Public License. Your has a corresponding meaning.


Expand All @@ -139,9 +146,10 @@ Section 2 -- Scope.
exercise the Licensed Rights in the Licensed Material to:

a. reproduce and Share the Licensed Material, in whole or
in part; and
in part, for NonCommercial purposes only; and

b. produce and reproduce, but not Share, Adapted Material.
b. produce and reproduce, but not Share, Adapted Material
for NonCommercial purposes only.

2. Exceptions and Limitations. For the avoidance of doubt, where
Exceptions and Limitations apply to Your use, this Public
Expand Down Expand Up @@ -203,7 +211,9 @@ Section 2 -- Scope.
Rights, whether directly or through a collecting society
under any voluntary or waivable statutory or compulsory
licensing scheme. In all other cases the Licensor expressly
reserves any right to collect such royalties.
reserves any right to collect such royalties, including when
the Licensed Material is used other than for NonCommercial
purposes.


Section 3 -- License Conditions.
Expand Down Expand Up @@ -263,12 +273,14 @@ apply to Your use of the Licensed Material:

a. for the avoidance of doubt, Section 2(a)(1) grants You the right
to extract, reuse, reproduce, and Share all or a substantial
portion of the contents of the database, provided You do not Share
Adapted Material;
portion of the contents of the database for NonCommercial purposes
only and provided You do not Share Adapted Material;

b. if You include all or a substantial portion of the database
contents in a database in which You have Sui Generis Database
Rights, then the database in which You have Sui Generis Database
Rights (but not its individual contents) is Adapted Material; and

c. You must comply with the conditions in Section 3(a) if You Share
all or a substantial portion of the contents of the database.

Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -18,7 +18,7 @@ The main philosophy of the refinery is that every script should be a unit in the

### License

The Binary Refinery is (c) 2019 Jesko Hüttenhain, and published under a [Creative Commons Attribution-NoDerivatives 4.0 International License][CC BY-ND 4.0]. This repository also contains [a copy of the full license text](LICENSE).
The Binary Refinery is (c) 2019 Jesko Hüttenhain, and published under a [Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License][CC BY-NC-ND 4.0]. This repository also contains [a copy of the full license text](LICENSE). If you want to do something with it that's not covered by this license, please feel free to contact the author.

### Installing the Refinery

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -40,7 +40,7 @@ def magic(x):

setuptools.setup(
name='binary-refinery',
version='0.0.3',
version='0.0.4',
author='Jesko Hüttenhain',
description='A toolkit to transform and refine (mostly) binary data.',
long_description=readme,
Expand Down

0 comments on commit 8cf4a15

Please sign in to comment.