michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-16 14:27:49 +00:00
Code Issues Projects Releases Wiki Activity

Clarify licensing in root README

Browse Source
This commit is contained in:
Philipp Oppermann
2019-12-12 09:55:23 +01:00
parent 9406eb32f6
commit a7ae6519c7
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
README.md
View File

@@ -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)) ([source code](https://github.com/phil-opp/blog_os/tree/returning_from_exceptions))
## License ## 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.