Merge pull request moby#19165 from shishir-a412ed/man_page_fix

man page fix: remove -e/--exec-drive=native related description
bfirsh · Jan 8, 2016 · 6213cc9 · 6213cc9
2 parents b12ef0f + 50305d6
commit 6213cc9
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 12 deletions.
diff --git a/docs/reference/api/docker_remote_api_v1.18.md b/docs/reference/api/docker_remote_api_v1.18.md
@@ -603,8 +603,6 @@ Status Codes:
 
 This endpoint returns a live stream of a container's resource usage statistics.
 
-> **Note**: this functionality currently only works when using the *libcontainer* exec-driver.
-
 **Example request**:
 
         GET /containers/redis1/stats HTTP/1.1

diff --git a/docs/reference/api/docker_remote_api_v1.19.md b/docs/reference/api/docker_remote_api_v1.19.md
@@ -620,8 +620,6 @@ Status Codes:
 
 This endpoint returns a live stream of a container's resource usage statistics.
 
-> **Note**: this functionality currently only works when using the *libcontainer* exec-driver.
-
 **Example request**:
 
     GET /containers/redis1/stats HTTP/1.1

diff --git a/docs/reference/api/docker_remote_api_v1.20.md b/docs/reference/api/docker_remote_api_v1.20.md
@@ -633,8 +633,6 @@ Status Codes:
 
 This endpoint returns a live stream of a container's resource usage statistics.
 
-> **Note**: this functionality currently only works when using the *libcontainer* exec-driver.
-
 **Example request**:
 
     GET /containers/redis1/stats HTTP/1.1

diff --git a/docs/reference/api/docker_remote_api_v1.21.md b/docs/reference/api/docker_remote_api_v1.21.md
@@ -698,8 +698,6 @@ Status Codes:
 
 This endpoint returns a live stream of a container's resource usage statistics.
 
-> **Note**: this functionality currently only works when using the *libcontainer* exec-driver.
-
 **Example request**:
 
     GET /containers/redis1/stats HTTP/1.1

diff --git a/man/docker.1.md b/man/docker.1.md
@@ -226,10 +226,8 @@ inside it)
 
 # EXEC DRIVER OPTIONS
 
-Use the **--exec-opt** flags to specify options to the execution driver. The only
-runtime that accepts any options is Linux. As a
-result, you must also specify **-s=**native for this option to have effect. The 
-following is the only *native* option:
+Use the **--exec-opt** flags to specify options to the execution driver.
+The following options are available:
 
 #### native.cgroupdriver
 Specifies the management of the container's `cgroups`. You can specify