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

README: Cleanup licensing (add CC BY-SA 4.0 for docs, etc.) #12

Merged
merged 2 commits into from
Dec 20, 2016

Conversation

wking
Copy link
Contributor

@wking wking commented 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.md blurb directly from the upstream repo. The license text is from master with updated copyright year in LICENSE.code. The README.md blurb is from my cleanup PR with an updated copyright year and the newlines removed (to match this repo's earlier blurb).

@stevvooe
Copy link
Contributor

There aren't really docs here.

@wking
Copy link
Contributor Author

wking commented Dec 19, 2016 via email

@stevvooe
Copy link
Contributor

@wking Just remove the part about a non-existent docs directory.

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 <wking@tremily.us>
On Mon, Dec 19, 2016 at 01:58:43PM -0800, Stephen Day wrote [1]:
> Just remove the part about a non-existent docs directory.

[1]: opencontainers#12 (comment)

Signed-off-by: W. Trevor King <wking@tremily.us>
@wking
Copy link
Contributor Author

wking commented Dec 19, 2016 via email

@stevvooe
Copy link
Contributor

LGTM

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.

None yet

2 participants