From 9f17e472d69d27dfa831259914fc8d18860dd8ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bonhomme?= Date: Wed, 26 Sep 2018 10:39:38 +0200 Subject: [PATCH 1/4] Added a clarification about the license of the data bundled with MONARC. --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index d2fab14..1b57ac7 100644 --- a/README.md +++ b/README.md @@ -85,3 +85,9 @@ This software is licensed under For more information, [the list of authors and contributors](AUTHORS) is available. +The data provided with MONARC (threats, assets, vulnerabilities) are licensed under +[CC0 1.0 Universal (CC0 1.0)](https://creativecommons.org/publicdomain/zero/1.0/) +- Public Domain Dedication. +If a specific author wants to license an object under a different license, +a pull request can be requested. + From ead10d1154fdbc8c52e73b6b42fc85c119bdc994 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bonhomme?= Date: Wed, 26 Sep 2018 10:43:41 +0200 Subject: [PATCH 2/4] Cosmethic change. --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 1b57ac7..1ca047e 100644 --- a/README.md +++ b/README.md @@ -86,8 +86,7 @@ This software is licensed under For more information, [the list of authors and contributors](AUTHORS) is available. The data provided with MONARC (threats, assets, vulnerabilities) are licensed under -[CC0 1.0 Universal (CC0 1.0)](https://creativecommons.org/publicdomain/zero/1.0/) -- Public Domain Dedication. +[CC0 1.0 Universal (CC0 1.0)](https://creativecommons.org/publicdomain/zero/1.0/) - Public Domain Dedication. If a specific author wants to license an object under a different license, a pull request can be requested. From 07f4295992f865af6cb73011402fdd2c85c0abb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bonhomme?= Date: Wed, 26 Sep 2018 10:44:45 +0200 Subject: [PATCH 3/4] Cosmethic change. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1ca047e..522b950 100644 --- a/README.md +++ b/README.md @@ -85,7 +85,7 @@ This software is licensed under For more information, [the list of authors and contributors](AUTHORS) is available. -The data provided with MONARC (threats, assets, vulnerabilities) are licensed under +Data provided with MONARC (threats, assets, vulnerabilities) are licensed under [CC0 1.0 Universal (CC0 1.0)](https://creativecommons.org/publicdomain/zero/1.0/) - Public Domain Dedication. If a specific author wants to license an object under a different license, a pull request can be requested. From 765af019ab342e1597a26b020cbc7de63280a2ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bonhomme?= Date: Wed, 26 Sep 2018 11:31:22 +0200 Subject: [PATCH 4/4] Cosmethic change. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 522b950..7d47e00 100644 --- a/README.md +++ b/README.md @@ -85,7 +85,7 @@ This software is licensed under For more information, [the list of authors and contributors](AUTHORS) is available. -Data provided with MONARC (threats, assets, vulnerabilities) are licensed under +Data provided with MONARC (threats, assets, vulnerabilities) are licensed under [CC0 1.0 Universal (CC0 1.0)](https://creativecommons.org/publicdomain/zero/1.0/) - Public Domain Dedication. If a specific author wants to license an object under a different license, a pull request can be requested.