Skip to content

Commit e939966

Browse files
committed
merge branch 'pr-1903'
clarify license information LGTMs: @hqhq @cyphar Closes #1903
2 parents 7ca079f + 26bdc0d commit e939966

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,3 +263,7 @@ PIDFile=/run/mycontainerid.pid
263263
[Install]
264264
WantedBy=multi-user.target
265265
```
266+
267+
## License
268+
269+
The code and docs are released under the [Apache 2.0 license](LICENSE).

libcontainer/README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,7 @@ generated when building libcontainer with docker.
323323

324324
## Copyright and license
325325

326-
Code and documentation copyright 2014 Docker, inc. Code released under the Apache 2.0 license.
327-
Docs released under Creative commons.
328-
326+
Code and documentation copyright 2014 Docker, inc.
327+
The code and documentation are released under the [Apache 2.0 license](../LICENSE).
328+
The documentation is also released under Creative Commons Attribution 4.0 International License.
329+
You may obtain a copy of the license, titled CC-BY-4.0, at http://creativecommons.org/licenses/by/4.0/.

0 commit comments

Comments
 (0)