Skip to content

Commit

Permalink
Add link to Apache contributor agreement page, and correct right bord…
Browse files Browse the repository at this point in the history
…er in license text files
  • Loading branch information
cpurdy committed Jul 12, 2019
1 parent ce3e9dc commit 496825c
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 9 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Contributing

Thank you for your interest in contributing to The Ecstasy Project. By participating in this project, you agree to abide by our [code of conduct](CODE_OF_CONDUCT.md).

Pull requests are welcome. Before submitting your first pull request, please sign and submit either an [individual contributor agreement](./license/icla.txt) ([PDF](./license/icla.pdf)) or (if contributing as an employee of a company) a [corporate contributor agreement](./license/ccla.txt) ([PDF](./license/ccla.pdf)). Please email the signed form to <[email protected]>.
Pull requests are welcome. Before submitting your first pull request, please sign and submit either an [individual contributor agreement](./license/icla.txt) ([PDF](./license/icla.pdf)) or (if contributing as an employee of a company) a [corporate contributor agreement](./license/ccla.txt) ([PDF](./license/ccla.pdf)). (For information about the basis and purpose of our contributor agreements, see <https://www.apache.org/licenses/contributor-agreements.html>.) Please email the signed form to <[email protected]>.

## Contribution guidelines ##

Expand Down
26 changes: 20 additions & 6 deletions license/ccla.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,21 @@
The Ecstasy Project
The Ecstasy Project
Software Grant and Corporate Contributor License Agreement v1.0
http://www.xtclang.org/

Thank you for your interest in contributing to the Ecstasy Project ("Project"). In order to clarify the intellectual property license granted with Contributions from any person or entity, the Project must have a Contributor License Agreement ("CLA") on file that has been signed by each Contributor, indicating agreement to the license terms below. This license is for your protection as a Contributor as well as the protection of the Project and its users; it does not change your rights to use your own Contributions for any other purpose.

This version of the Agreement allows an entity (the "Corporation") to submit Contributions to the Project, to authorize Contributions to the Project to be submitted by its designated employees, and to grant copyright and patent licenses to the Project. Please read this document carefully before signing, and keep a copy for your records.
Thank you for your interest in contributing to the Ecstasy Project ("Project").
In order to clarify the intellectual property license granted with
Contributions from any person or entity, the Project must have a Contributor
License Agreement ("CLA") on file that has been signed by each Contributor,
indicating agreement to the license terms below. This license is for your
protection as a Contributor as well as the protection of the Project and its
users; it does not change your rights to use your own Contributions for any
other purpose.

This version of the Agreement allows an entity (the "Corporation") to submit
Contributions to the Project, to authorize Contributions to the Project to be
submitted by its designated employees, and to grant copyright and patent
licenses to the Project. Please read this document carefully before signing,
and keep a copy for your records.

Corporation name: __________________________________________________________

Expand All @@ -17,10 +28,13 @@ Corporation address: __________________________________________________________
Point of Contact: _____________________________________________________________

E-Mail: _____________________________________________________________

Telephone: __________________________ Fax: ____________________________

You accept and agree to the following terms and conditions for Your present and future Contributions submitted to the Project. Except for the license granted herein to the Project and recipients of software distributed by the Project, You reserve all right, title, and interest in and to Your Contributions.
You accept and agree to the following terms and conditions for Your present and
future Contributions submitted to the Project. Except for the license granted
herein to the Project and recipients of software distributed by the Project,
You reserve all right, title, and interest in and to Your Contributions.

1. Definitions.
"You" (or "Your") shall mean the copyright owner or legal entity authorized
Expand Down
15 changes: 13 additions & 2 deletions license/icla.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,15 @@ The Ecstasy Project
Individual Contributor License Agreement v1.0
http://www.xtclang.org/

Thank you for your interest in contributing to the Ecstasy Project ("Project"). In order to clarify the intellectual property license granted with Contributions from any person or entity, the Project must have a Contributor License Agreement ("CLA") on file that has been signed by each Contributor, indicating agreement to the license terms below. This license is for your protection as a Contributor as well as the protection of the Project and its users; it does not change your rights to use your own Contributions for any other purpose. Please read this document carefully before signing, and keep a copy for your records.
Thank you for your interest in contributing to the Ecstasy Project ("Project").
In order to clarify the intellectual property license granted with
Contributions from any person or entity, the Project must have a Contributor
License Agreement ("CLA") on file that has been signed by each Contributor,
indicating agreement to the license terms below. This license is for your
protection as a Contributor as well as the protection of the Project and its
users; it does not change your rights to use your own Contributions for any
other purpose. Please read this document carefully before signing, and keep a
copy for your records.

Full name: __________________________________________________________________

Expand All @@ -18,7 +26,10 @@ Thank you for your interest in contributing to the Ecstasy Project ("Project").

E-Mail: __________________________________________________________________

You accept and agree to the following terms and conditions for Your present and future Contributions submitted to the Project. Except for the license granted herein to the Project and recipients of software distributed by the Project, You reserve all right, title, and interest in and to Your Contributions.
You accept and agree to the following terms and conditions for Your present and
future Contributions submitted to the Project. Except for the license granted
herein to the Project and recipients of software distributed by the Project,
You reserve all right, title, and interest in and to Your Contributions.

1. Definitions.
"You" (or "Your") shall mean the copyright owner or legal entity authorized
Expand Down

0 comments on commit 496825c

Please sign in to comment.