From a7ae6519c7152181b38da5b183910c0868733b2b Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Thu, 12 Dec 2019 09:55:23 +0100 Subject: [PATCH] Clarify licensing in root README --- README.md | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 08c6199a..4b8e6e36 100644 --- a/README.md +++ b/README.md @@ -104,4 +104,17 @@ The current version of the blog is already the second edition. The first edition ([source code](https://github.com/phil-opp/blog_os/tree/returning_from_exceptions)) ## License -The source code is dual-licensed under MIT or the Apache License (Version 2.0). This excludes the `blog` directory. + +This project, with exception of the `blog/content` folder, is licensed under either of + +- Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or + http://www.apache.org/licenses/LICENSE-2.0) +- MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT) + +at your option. + +For licensing of the `blog/content` folder, see the [`blog/content/README.md`](blog/content/README.md). + +### Contribution + +Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions.