Merge pull request #14307 from kolyshkin/readme-fixes

README.md: fix cgroups/namespaces name and link
Upstream-commit: 833cdd28ed668291bca8eb5ee5ba73a77523eafb
Component: engine
This commit is contained in:
moxiegirl
2015-07-07 06:09:20 -07:00
2 changed files with 4 additions and 5 deletions

View File

@ -168,9 +168,9 @@ Under the hood
Under the hood, Docker is built on the following components:
* The
[cgroup](https://en.wikipedia.org/wiki/Cgroups)
[cgroups](https://www.kernel.org/doc/Documentation/cgroups/cgroups.txt)
and
[namespacing](http://man7.org/linux/man-pages/man7/namespaces.7.html)
[namespaces](http://man7.org/linux/man-pages/man7/namespaces.7.html)
capabilities of the Linux kernel
* The [Go](https://golang.org) programming language
* The [Docker Image Specification](https://github.com/docker/docker/blob/master/image/spec/v1.md)

View File

@ -323,9 +323,6 @@ options for `zfs` start with `zfs`.
$ docker -d --storage-opt dm.blkdiscard=false
## Docker execdriver option
Currently supported options of `zfs`:
* `zfs.fsname`
@ -338,6 +335,8 @@ Currently supported options of `zfs`:
$ docker -d -s zfs --storage-opt zfs.fsname=zroot/docker
## Docker execdriver option
The Docker daemon uses a specifically built `libcontainer` execution driver as
its interface to the Linux kernel `namespaces`, `cgroups`, and `SELinux`.