diff --git a/LICENSE b/LICENSE index 610cecd0bda..ff6ecfad8da 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Apache License + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -186,7 +186,9 @@ Apache License same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2013-2015 Iron Summit Media Strategies, LLC + Copyright 2015-2016 Huxpro + + https://github.com/Huxpro/ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -200,3 +202,15 @@ Apache License See the License for the specific language governing permissions and limitations under the License. + +======================================================================= +Hux Blog Subcomponents: + +The Hux Blog project contains subcomponents with separate copyright +notices and license terms. Your use of the source code for the these +subcomponents is subject to the terms and conditions of the following +licenses. + +(MIT License) Clean Blog Jekyll Theme: https://github.com/BlackrockDigital/startbootstrap-clean-blog-jekyll/ +https://github.com/BlackrockDigital/startbootstrap-clean-blog-jekyll/blob/master/LICENSE +Copyright (c) 2013-2016 Blackrock Digital LLC. diff --git a/README.md b/README.md index ba58f937a67..fbb55c774ad 100644 --- a/README.md +++ b/README.md @@ -309,7 +309,10 @@ So, just edit `_config.yml`, find `highlighter: pygments`, change it to `highlig For other circumstance, check out existing issues or create a new one! -## Thanks +## License -This theme is forked from [IronSummitMedia/startbootstrap-clean-blog-jekyll](https://github.com/IronSummitMedia/startbootstrap-clean-blog-jekyll) -Thanks Jekyll and Github Pages! +Apache License 2.0. +Copyright (c) 2015-2016 Huxpro + +Hux Blog is derived from [Clean Blog Jekyll Theme (MIT License)](https://github.com/BlackrockDigital/startbootstrap-clean-blog-jekyll/) +Copyright (c) 2013-2016 Blackrock Digital LLC.