diff --git a/.github/issue_template.md b/.github/issue_template.md index 84d2e08..4d3d813 100644 --- a/.github/issue_template.md +++ b/.github/issue_template.md @@ -1,7 +1,7 @@ -Thank you very much for your interest in TetGen! Reporting your issue here helps to improve the code. +Thank you very much for your interest in TetGen! Reporting your issue helps to improve the code. ### Legal -By opening this issue, you agree to the terms of the contributor license agreement stated in [CONTRIBUTING.md](https://codeberg.org/TetGen/TetGen/src/branch/main/CONTRIBUTING.md) +By opening this issue, you agree to the terms of the Contributor License Agreement (CLA) stated in [CONTRIBUTING.md](https://codeberg.org/TetGen/TetGen/src/branch/main/CONTRIBUTING.md). ### Kind of issue (bug, feature request...): diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 41425f1..bf3dd3d 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,7 +1,7 @@ Thank you very much for helping to improve TetGen! ### Legal: -By opening this pull request, you agree to the terms of the contributor license agreement stated in [CONTRIBUTING.md](https://codeberg.org/TetGen/TetGen/src/branch/main/CONTRIBUTING.md) +By opening this issue, you agree to the terms of the Contributor License Agreement (CLA) stated in [CONTRIBUTING.md](https://codeberg.org/TetGen/TetGen/src/branch/main/CONTRIBUTING.md). ### Pull request description: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 918e4fd..771e7f3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,16 +1,13 @@ -# Notes -- Contributors should be aware that under this CLA, commercial licenses for versions of TetGen which include their contributions under the MIT license be may provided to customers by the maintainers or their contract partners # Contributor License Agreement (CLA) -By submitting a contribution (including but not limited to code, documentation, or other materials) via a pull request, issue, or other means, Contributor agrees to the following terms: +A "Contributor" is any person or entity that intentionally submits copyrighted material to the project, +including but not limited to code, documentation, or other material, via a pull request, issue, or other means. -## Grant of License -Contributor hereby grants to the Project and its maintainers a perpetual, worldwide, non-exclusive, transferable, royalty-free, irrevocable license under all of Contributor's copyright and patent rights to: -- Use, reproduce, modify, distribute, and publicly display/perform the contribution under the GNU Affero General Public License v3 (AGPLv3) or any later version; -- Additionally, sublicense the contribution under the MIT License (included below) +By submitting a contribution Contributor agrees to the following terms: -## MIT License Grant -Contributor agrees that their contribution may be made available under the following MIT License terms, in addition to AGPLv3: +## Dual AGPLv3/MIT License Grant +Contributor agrees that their contribution is provided under the GNU Affero General Public License v3 (AGPLv3) reproduced +in [LICENSE](https://codeberg.org/TetGen/TetGen/src/branch/main/LICENSE.md) or any later version and, in addition, under the following MIT License terms: ```text Copyright (c) [Year] [Contributor's Name] @@ -34,6 +31,23 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ``` + +## Annotating contributions to source code + +### Trivial changes +Trivial changes (e.g., 1-2 line fixes or typo fixes) inherit the AGPLv3 license of the project and without further annotation in addition are assumed to be licensed under the MIT license + +### Functions and nontrivial snippets of code +Functions and nontrivial snippets of code by default inherit the AGPLv3 license of the project and in addition shall be marked in a PR with an SPDX header as in this example: + ``` + # SPDX-License-Identifier: MIT + # Copyright (c) [Year] [Your Name] + void frobnicate(int ntet) + { + ... + } + ``` + ## Representations and Warranties Contributor represents that: - They are legally entitled to grant the above licenses;