From 1df2f8906ceb66f8fae707845ff5949569d8cc41 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 21 Feb 2017 10:18:30 -0800 Subject: [PATCH] tweaks --- README.md | 12 ++++-------- notices.md | 6 +++--- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 1821f4e6c69..6d747db9d86 100644 --- a/README.md +++ b/README.md @@ -23,22 +23,18 @@ Our goal is for this project to reflect community best practices, so we'd love y Content is released under [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/), which gives you permission to use content for almost any purpose (but does not grant you any trademark permissions), so long as you note the license and give credit, such as follows: -> Content based on -> github.com/github/open-source-guide -> used under the -> CC-BY-4.0 -> license. +> Content based on [github.com/github/open-source-guide](https://github.com/github/open-source-guide) used under the [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/) license. Code, including source files and code samples if any in the content, is released under [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/), with the following exceptions: -* The primer components in the `node_modules` directory are under the MIT license +* The primer components in `node_modules` are under the MIT license; see `LICENSE` in each component's directory * The [Octicons images](https://octicons.github.com) are under the [SIL OFL 1.1](http://scripts.sil.org/OFL) -This means you can use the code and content in this repository except for GitHub trademarks in your own projects. +This means you can use the code and content in this repository except for GitHub trademarks in your own projects. When using the GitHub logos, be sure to follow the [GitHub logo guidelines](https://github.com/logos). When you contribute to this repository you are doing so under the above licenses. -Screenshots in the guide are used according to [various permissions](notices.md#permissions). +Screenshots and images from other projects are used according to [various permissions](notices.md#permissions). ## Acknowledgments diff --git a/notices.md b/notices.md index fe9d25aa14c..da00be66092 100644 --- a/notices.md +++ b/notices.md @@ -19,16 +19,16 @@ Content is released under [CC-BY-4.0](https://creativecommons.org/licenses/by/4. Code, including source files and code samples if any in the content, is released under [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/), with the following exceptions: -* The primer components in the `node_modules` directory are under the MIT license +* The primer components in `node_modules` are under the MIT license; see `LICENSE` in each component's directory * The [Octicons images](https://octicons.github.com) are under the [SIL OFL 1.1](http://scripts.sil.org/OFL) -This means you can use the code and content in this repository except for GitHub trademarks in your own projects. +This means you can use the code and content in this repository except for GitHub trademarks in your own projects. When using the GitHub logos, be sure to follow the [GitHub logo guidelines](https://github.com/logos). When you contribute to this repository you are doing so under the above licenses. ## Permissions -Screenshots are used with permissions below. +Screenshots and images from other projects are used with permissions below. **Django:**