Skip to content

Commit

Permalink
Merge pull request #12 from wking/license-cleanup
Browse files Browse the repository at this point in the history
README: Cleanup licensing (add CC BY-SA 4.0 for docs, etc.)
  • Loading branch information
stevvooe committed Dec 20, 2016
2 parents abeb4ab + 95db856 commit 7cc41cb
Show file tree
Hide file tree
Showing 3 changed files with 429 additions and 14 deletions.
16 changes: 3 additions & 13 deletions LICENSE → LICENSE.code
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
https://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

Expand Down Expand Up @@ -175,24 +176,13 @@

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "{}"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2016 Docker, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0
https://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
Expand Down
Loading

0 comments on commit 7cc41cb

Please sign in to comment.