Skip to content

Commit

Permalink
tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
mlinksva committed Feb 21, 2017
1 parent 44e9555 commit 1df2f89
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 11 deletions.
12 changes: 4 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
> <a href="https://github.com/github/open-source-guide">github.com/github/open-source-guide</a>
> used under the
> <a href="https://creativecommons.org/licenses/by/4.0/">CC-BY-4.0</a>
> license.</a>
> 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

Expand Down
6 changes: 3 additions & 3 deletions notices.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:**

Expand Down

0 comments on commit 1df2f89

Please sign in to comment.