Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

project-template/README: Cleanup licensing (BY-SA link, etc.) #98

Merged
merged 1 commit into from
Jan 26, 2017

Conversation

wking
Copy link
Contributor

@wking wking commented Dec 17, 2016

LICENSE.docs has had the BY-SA copy since fcff91e (Add project template, 2015-12-21).

Also:

  • Make file references links for convenient access.
  • Explicitly put CONTRIBUTING.md under the docs license.
  • Use backticks for paths (less clutter than quotes in the rendered view).
  • Use the canonical abbreviation (CC BY-SA 4.0) instead of CC-BY-SA-4.0.

LICENSE.docs has had the BY-SA copy since fcff91e (Add project
template, 2015-12-21).

Also:

* Make file references links for convenient access.
* Link to the Apache License, although I haven't added the in-text
  README.code mention or upstream link that README.docs currently has.
* Explicitly put CONTRIBUTING.md under the docs license.
* Use backticks for paths (less clutter than quotes in the rendered
  view).
* Use the canonical abbreviation (CC BY-SA 4.0) instead of
  CC-BY-SA-4.0.

Signed-off-by: W. Trevor King <[email protected]>
@wking
Copy link
Contributor Author

wking commented Dec 17, 2016

Also link to the Apache License, although I haven't added the in-text README.code mention or upstream link that README.docs currently has.

wking added a commit to wking/go-digest that referenced this pull request Dec 17, 2016
Before this commit, the README referenced a LICENSE.docs that didn't
exist locally.  This commit copies the LICENSE.code, LICENSE.docs, and
README blurb directly from the upstream repo.  The license text is
from master with updated copyright year in LICENSE.code.  The README
blurb is from my cleanup PR [1] with an updated copyright year and the
newlines removed.

[1]: docker/opensource#98

Signed-off-by: W. Trevor King <[email protected]>
wking added a commit to wking/go-digest that referenced this pull request Dec 19, 2016
Before this commit, the README referenced a LICENSE.docs that didn't
exist locally.  This commit copies the LICENSE.code, LICENSE.docs, and
README blurb directly from the upstream repo.  The license text is
from master with updated copyright year in LICENSE.code.  The README
blurb is from my cleanup PR [1] with an updated copyright year and the
newlines removed.

[1]: docker/opensource#98

Signed-off-by: W. Trevor King <[email protected]>
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

@thaJeztah thaJeztah merged commit d8d541f into docker:master Jan 26, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants