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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 2 commits into from
Dec 20, 2016
Merged

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

merged 2 commits into from
Dec 20, 2016

Commits on Dec 19, 2016

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

    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>
    @wking
    wking committed Dec 19, 2016
    Configuration menu
    Copy the full SHA
    fcf056d View commit details
    Browse the repository at this point in the history

  2. README: Remove 'docs' reference 

    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
    wking committed Dec 19, 2016
    Configuration menu
    Copy the full SHA
    95db856 View commit details
    Browse the repository at this point in the history