]> https://gitweb.dealii.org/ - dealii.git/commitdiff
LICENSE.md: avoid "dual-license", clarify that licenses apply separately 16708/head
authorMatthias Maier <tamiko@43-1.org>
Fri, 1 Mar 2024 20:03:35 +0000 (14:03 -0600)
committerMatthias Maier <tamiko@43-1.org>
Fri, 1 Mar 2024 20:03:35 +0000 (14:03 -0600)
CONTRIBUTING.md
LICENSE.md

index 0aa720b995f4cfa3efc5bb70f409bbad338727c7..9273eb8f7e5c696524a109f22473b153c22fd4a6 100644 (file)
@@ -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 <b>Developer Certificate of Origin
-version 1.1</b> and (b) be dual-licensed under the terms of the <b>Apache
-License 2.0</b> with <b>LLVM Exception</b> and the <b>GNU Lesser General
-Public License v2.1 or later</b>; 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</b> and (b) be made available to the project under the terms of
+the <b>Apache License 2.0</b> with <b>LLVM Exception</b>, and separately
+under the terms of the <b>GNU Lesser General Public License v2.1 or
+later</b>; 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.
index 6f85f2e481aefcbbe4a34a18456c6becb90982f9..28095174352733ccad5400fd1668d44c536bdb65 100644 (file)
@@ -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
 [<b>Developer Certificate of Origin version 1.1</b>](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
 [<b>Apache License 2.0</b>](https://spdx.org/licenses/Apache-2.0.html)
 with
-[<b>LLVM Exception</b>](https://spdx.org/licenses/LLVM-exception.html)
-and the
+[<b>LLVM Exception</b>](https://spdx.org/licenses/LLVM-exception.html),
+and separately under the terms of the
 [<b>GNU Lesser General Public License v2.1 or later</b>](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

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.