From 7a705cc09966d60313085ee941299ab0cb45daa8 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Fri, 1 Mar 2024 14:03:35 -0600 Subject: [PATCH] LICENSE.md: avoid "dual-license", clarify that licenses apply separately --- CONTRIBUTING.md | 13 +++++++------ LICENSE.md | 6 +++--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0aa720b995..9273eb8f7e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -51,9 +51,10 @@ it as a road block if you would like to contribute some code. As a contributor to this project, you agree that all of your contributions to deal.II (a) be governed by the Developer Certificate of Origin -version 1.1 and (b) be dual-licensed under the terms of the Apache -License 2.0 with LLVM Exception and the GNU Lesser General -Public License v2.1 or later; see LICENSE.md for details. The deal.II -project does not require copyright assignments for contributions. This -means that the copyright for code contributions in the deal.II project is -held by its respective contributors. +version 1.1 and (b) be made available to the project under the terms of +the Apache License 2.0 with LLVM Exception, and separately +under the terms of the GNU Lesser General Public License v2.1 or +later; see [LICENSE.md](./LICENSE.md) for details. The deal.II project +does not require copyright assignments for contributions. This means that +the copyright for code contributions in the deal.II project is held by its +respective contributors. diff --git a/LICENSE.md b/LICENSE.md index 6f85f2e481..2809517435 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -21,11 +21,11 @@ Contributions As a contributor to this project, you agree that all of your contributions to deal.II (a) be governed by the [Developer Certificate of Origin version 1.1](https://developercertificate.org/), -and (b) be dual-licensed under the terms of the +and (b) be made available to the project under the terms of the [Apache License 2.0](https://spdx.org/licenses/Apache-2.0.html) with -[LLVM Exception](https://spdx.org/licenses/LLVM-exception.html) -and the +[LLVM Exception](https://spdx.org/licenses/LLVM-exception.html), +and separately under the terms of the [GNU Lesser General Public License v2.1 or later](https://spdx.org/licenses/LGPL-2.1-or-later.html). The deal.II project does not require copyright assignments for contributions. This means that the copyright for code contributions in the -- 2.39.5