Skip to content

Commit

Permalink
Clarify the interaction of the CC-BY license and trademark rights
Browse files Browse the repository at this point in the history
This commit changes the 'but does not grant you any trademark permissions' to a parenthetical comment
(an 'aside'), instead of having be part of the main sentence. With it part of the sentence, the reader
may believe that 'so long as you note the license and give credit' applies to the trademark-related
phrase, when in fact it relates the prior sections of the sentence.
  • Loading branch information
kpfleming committed Feb 14, 2017
1 parent cbf6ff1 commit 1207702
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Our goal is for this project to reflect community best practices, so we'd love y

## Licenses

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 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>
Expand Down
2 changes: 1 addition & 1 deletion notices.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Running an open source project, like any human endeavor, involves uncertainty an

## Licenses

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 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](https://github.com/github/open-source-guide) used under the [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/) license.
Expand Down

0 comments on commit 1207702

Please sign in to comment.