From 6c14839c1e8bd7f7843312157fa20c21b74d6777 Mon Sep 17 00:00:00 2001 From: David Calavera Date: Tue, 16 Jun 2015 10:12:00 -0700 Subject: [PATCH] Move zfs options doc to the storage section. Zfs options belong to the storage section, but they were added under the exec driver section. Signed-off-by: David Calavera Upstream-commit: 1a184988a216e4b42433faea5dd35978e849fd8f Component: cli --- components/cli/docs/reference/commandline/cli.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/cli/docs/reference/commandline/cli.md b/components/cli/docs/reference/commandline/cli.md index de654197f8..9d0fd40744 100644 --- a/components/cli/docs/reference/commandline/cli.md +++ b/components/cli/docs/reference/commandline/cli.md @@ -476,8 +476,6 @@ Currently supported options of `devicemapper`: > Otherwise, set this flag for migrating existing Docker daemons to > a daemon with a supported environment. -### Docker execdriver option - Currently supported options of `zfs`: * `zfs.fsname` @@ -490,6 +488,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`.