Skip to content

Commit 9861b01

Browse files
committed
Update license text
1 parent 7d141bc commit 9861b01

File tree

2 files changed

+28
-28
lines changed

2 files changed

+28
-28
lines changed

.cla/version1/CLA.md

+21-21
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
> Adapted from the [Apache Software Foundation Individual Contributor License Agreement (ICLA)](https://www.apache.org/licenses/contributor-agreements.html) [version 2.2](https://www.apache.org/licenses/icla.pdf)
44
55
You accept and agree to the following terms and conditions for Your
6-
Contributions (present and future) that you submit to the GitHub organization
7-
"AiiDA Team" <https://github.com/aiidateam>.
8-
In return, the AiiDA Team shall not use Your Contributions in a way that
9-
is contrary to the public benefit or inconsistent with its nonprofit
10-
status and bylaws in effect at the time of the Contribution.
11-
Except for the license granted herein to the AiiDA Team and recipients of
12-
software distributed by the AiiDA Team, You reserve all right, title,
13-
and interest in and to Your Contributions.
6+
Contributions (present and future) that you submit to the copyright
7+
holders (hereafter "HOLDERS", see the [`LICENSE.txt`](../../LICENSE.txt)
8+
bundled with this software). In return, the HOLDERS shall not use
9+
Your Contributions in a way that is contrary to the public benefit or
10+
inconsistent with its nonprofit status and bylaws in effect at the
11+
time of the Contribution. Except for the license granted herein to
12+
the HOLDERS and recipients of software distributed by the HOLDERS,
13+
You reserve all right, title, and interest in and to Your Contributions.
1414

1515
1. Definitions.
1616

1717
"You" (or "Your") shall mean the copyright owner or legal entity
1818
authorized by the copyright owner that is making this Agreement
19-
with the AiiDA Team. For legal entities, the entity making a
19+
with the HOLDERS. For legal entities, the entity making a
2020
Contribution and all other entities that control, are controlled
2121
by, or are under common control with that entity are considered to
2222
be a single Contributor. For the purposes of this definition,
@@ -26,29 +26,29 @@ and interest in and to Your Contributions.
2626
outstanding shares, or (iii) beneficial ownership of such entity.
2727
"Contribution" shall mean any original work of authorship,
2828
including any modifications or additions to an existing work, that
29-
is intentionally submitted by You to the AiiDA Team for inclusion
29+
is intentionally submitted by You to the HOLDERS for inclusion
3030
in, or documentation of, any of the products owned or managed by
31-
the AiiDA Team (the "Work"). For the purposes of this definition,
31+
the HOLDERS (the "Work"). For the purposes of this definition,
3232
"submitted" means any form of electronic, verbal, or written
33-
communication sent to the AiiDA Team or its representatives,
33+
communication sent to the HOLDERS or its representatives,
3434
including but not limited to communication on electronic mailing
3535
lists, source code control systems, and issue tracking systems that
36-
are managed by, or on behalf of, the AiiDA Team for the purpose of
36+
are managed by, or on behalf of, the HOLDERS for the purpose of
3737
discussing and improving the Work, but excluding communication that
3838
is conspicuously marked or otherwise designated in writing by You
3939
as "Not a Contribution."
4040

4141
2. Grant of Copyright License. Subject to the terms and conditions of
42-
this Agreement, You hereby grant to the AiiDA Team and to
43-
recipients of software distributed by the AiiDA Team a perpetual,
42+
this Agreement, You hereby grant to the HOLDERS and to
43+
recipients of software distributed by the HOLDERS a perpetual,
4444
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
4545
copyright license to reproduce, prepare derivative works of,
4646
publicly display, publicly perform, sublicense, and distribute Your
4747
Contributions and such derivative works.
4848

4949
3. Grant of Patent License. Subject to the terms and conditions of
50-
this Agreement, You hereby grant to the AiiDA Team and to
51-
recipients of software distributed by the AiiDA Team a perpetual,
50+
this Agreement, You hereby grant to the HOLDERS and to
51+
recipients of software distributed by the HOLDERS a perpetual,
5252
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
5353
(except as stated in this section) patent license to make, have
5454
made, use, offer to sell, sell, import, and otherwise transfer the
@@ -69,8 +69,8 @@ and interest in and to Your Contributions.
6969
that you create that includes your Contributions, you represent
7070
that you have received permission to make Contributions on behalf
7171
of that employer, that your employer has waived such rights for
72-
your Contributions to the AiiDA Team, or that your employer has
73-
executed a separate Corporate CLA with the AiiDA Team.
72+
your Contributions to the HOLDERS, or that your employer has
73+
executed a separate Corporate CLA with the HOLDERS.
7474

7575
5. You represent that each of Your Contributions is Your original
7676
creation (see section 7 for submissions on behalf of others). You
@@ -90,13 +90,13 @@ and interest in and to Your Contributions.
9090
INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.
9191

9292
7. Should You wish to submit work that is not Your original creation,
93-
You may submit it to the AiiDA Team separately from any
93+
You may submit it to the HOLDERS separately from any
9494
Contribution, identifying the complete details of its source and of
9595
any license or other restriction (including, but not limited to,
9696
related patents, trademarks, and license agreements) of which you
9797
are personally aware, and conspicuously marking the work as
9898
"Submitted on behalf of a third-party: [named here]".
9999

100-
8. You agree to notify the AiiDA Team of any facts or circumstances of
100+
8. You agree to notify the HOLDERS of any facts or circumstances of
101101
which you become aware that would make these representations
102102
inaccurate in any respect.

LICENSE.txt

+7-7
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ INTRODUCTION
1010

1111
- This license agreement sets forth the terms and conditions under which the
1212
Authors and their Institutions (hereafter "LICENSORS") of the program
13-
"AiiDA-wannier90-workflows" (hereafter "PROGRAM"), will grant you (hereafter
14-
"LICENSEE") a fully-paid, non-exclusive, and non-transferable license for
15-
academic, non-commercial purposes only (hereafter "LICENSE") to use the PROGRAM
16-
computer software and associated documentation furnished hereunder.
13+
"AiiDA-wannier90-workflows" (hereafter "PROGRAM"), will grant you (hereafter
14+
"LICENSEE") a fully-paid, non-exclusive, and non-transferable license for
15+
academic, non-commercial purposes only (hereafter "LICENSE") to use the
16+
PROGRAM computer software and associated documentation furnished hereunder.
1717

1818
- LICENSEE acknowledges that the PROGRAM is a research tool still in the
1919
development stage, that is being supplied "as is", without any related
20-
services, improvements or warranties from LICENSORS and that this license is
21-
entered into in order to enable others to utilize the PROGRAM in their academic
22-
activities.
20+
services, improvements or warranties from LICENSORS and that this license is
21+
entered into in order to enable others to utilize the PROGRAM in their
22+
academic activities.
2323

2424
TERMS AND CONDITIONS OF THE LICENSE
2525

0 commit comments

Comments
 (0)