From 7e309aed4e23ad5dfa94b9279be9a4b075aab0a8 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Tue, 30 Jun 2015 16:48:07 -0700 Subject: [PATCH 1/2] README.md: fix cgroups/namespaces name and link The features Docker relies on are called "cgroups" and "namespaces", so fix the language accordingly. Also for cgroups, provide a link to Linux kernel documentation that is more relevant (and deep) than the Wikipedia article. Cc: Ankush Agarwal Signed-off-by: Kir Kolyshkin --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 32ab77c3b5..76ad4c4b2c 100644 --- a/README.md +++ b/README.md @@ -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) From 68efb27e990a52478d9927911757a07910244dc5 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Tue, 30 Jun 2015 17:33:04 -0700 Subject: [PATCH 2/2] daemon.md: fix placement of exec driver heading Options for zfs storage driver were incorrectly placed under 'exec driver options' header. Move the header to the correct place. Signed-off-by: Kir Kolyshkin --- docs/reference/commandline/daemon.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/reference/commandline/daemon.md b/docs/reference/commandline/daemon.md index cb56ab5454..07acb65e10 100644 --- a/docs/reference/commandline/daemon.md +++ b/docs/reference/commandline/daemon.md @@ -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`.