From 460cf2928954c1eec8002ebb58220478d007bd72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 3 Sep 2020 23:53:47 +0300 Subject: [PATCH] Fix up licensing information of the documentation The tutorials are licensed under the CC BY-SA 4.0 license but all other documentation (especially API reference and design documentation) is LGPL v2.1+. Also the tutorials are not LGPL v2.1-only but also allow any later version. --- README.md | 15 +++++++++++---- scripts/RELEASE_README.md | 15 +++++++++++---- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index bc4e563233..8b5c879db5 100644 --- a/README.md +++ b/README.md @@ -117,7 +117,7 @@ All tutorial code is licensed under any of the following licenses (your choice): - 2-clause BSD license ("simplified BSD license") (`LICENSE.BSD`) - MIT license (`LICENSE.MIT`) - - LGPL v2.1 (`LICENSE.LGPL-2.1`) + - LGPL v2.1 (`LICENSE.LGPL-2.1`), or (at your option) any later version This means developers have maximum flexibility and can pick the right license for any derivative work. @@ -131,8 +131,15 @@ These are licensed under the [Open Publication License v1.0][op-license] ### Documentation -Mostly licensed under the [Creative Commons CC-BY-SA-4.0 license][cc-by-sa-4.0], -but some parts of the documentation may still be licensed differently -(e.g. LGPLv2.1) for historical reasons. +#### Tutorials + +The tutorials are licensed under the [Creative Commons CC-BY-SA-4.0 license][cc-by-sa-4.0] +(`LICENSE.CC-BY-SA-4.0`). [cc-by-sa-4.0]: https://creativecommons.org/licenses/by-sa/4.0/ + +#### API Reference and Design Documentation + +The remaining documentation, including the API reference and Design Documentation, +is licensed under the LGPL v2.1 (`LICENSE.LGPL-2.1`), or (at your option) any later +version. diff --git a/scripts/RELEASE_README.md b/scripts/RELEASE_README.md index a28dbf76e6..6fd7891ffe 100644 --- a/scripts/RELEASE_README.md +++ b/scripts/RELEASE_README.md @@ -42,7 +42,7 @@ All tutorial code is licensed under any of the following licenses (your choice): - 2-clause BSD license ("simplified BSD license") (`LICENSE.BSD`) - MIT license (`LICENSE.MIT`) - - LGPL v2.1 (`LICENSE.LGPL-2.1`) + - LGPL v2.1 (`LICENSE.LGPL-2.1`), or (at your option) any later version This means developers have maximum flexibility and can pick the right license for any derivative work. @@ -56,8 +56,15 @@ These are licensed under the [Open Publication License v1.0][op-license] ### Documentation -Mostly licensed under the [Creative Commons CC-BY-SA-4.0 license][cc-by-sa-4.0], -but some parts of the documentation may still be licensed differently -(e.g. LGPLv2.1) for historical reasons. +#### Tutorials + +The tutorials are licensed under the [Creative Commons CC-BY-SA-4.0 license][cc-by-sa-4.0] +(`LICENSE.CC-BY-SA-4.0`). [cc-by-sa-4.0]: https://creativecommons.org/licenses/by-sa/4.0/ + +#### API Reference and Design Documentation + +The remaining documentation, including the API reference and Design Documentation, +is licensed under the LGPL v2.1 (`LICENSE.LGPL-2.1`), or (at your option) any later +version.