Skip to content

Commit fcf056d

Browse files
committed
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 <[email protected]>
1 parent abeb4ab commit fcf056d

File tree

3 files changed

+429
-14
lines changed

3 files changed

+429
-14
lines changed

LICENSE renamed to LICENSE.code

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
12
Apache License
23
Version 2.0, January 2004
3-
http://www.apache.org/licenses/
4+
https://www.apache.org/licenses/
45

56
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
67

@@ -175,24 +176,13 @@
175176

176177
END OF TERMS AND CONDITIONS
177178

178-
APPENDIX: How to apply the Apache License to your work.
179-
180-
To apply the Apache License to your work, attach the following
181-
boilerplate notice, with the fields enclosed by brackets "{}"
182-
replaced with your own identifying information. (Don't include
183-
the brackets!) The text should be enclosed in the appropriate
184-
comment syntax for the file format. We also recommend that a
185-
file or class name and description of purpose be included on the
186-
same "printed page" as the copyright notice for easier
187-
identification within third-party archives.
188-
189179
Copyright 2016 Docker, Inc.
190180

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

195-
http://www.apache.org/licenses/LICENSE-2.0
185+
https://www.apache.org/licenses/LICENSE-2.0
196186

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

0 commit comments

Comments
 (0)