From 76bdfebd468dfb6b4d442417380f0d59e8bd887c Mon Sep 17 00:00:00 2001
From: Victor Vieux <vieux@docker.com>
Date: Fri, 11 Jul 2014 23:24:44 +0000
Subject: [PATCH] update api doc

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 6bb27f18d19201d8c0b3c509151935308c001c22
Component: engine
---
 .../docs/sources/reference/api/docker_remote_api.md       | 6 ++++++
 .../docs/sources/reference/api/docker_remote_api_v1.14.md | 8 ++++++--
 components/engine/docs/sources/reference/run.md           | 2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/components/engine/docs/sources/reference/api/docker_remote_api.md b/components/engine/docs/sources/reference/api/docker_remote_api.md
index 04b750f4c5..c2916e5de0 100644
--- a/components/engine/docs/sources/reference/api/docker_remote_api.md
+++ b/components/engine/docs/sources/reference/api/docker_remote_api.md
@@ -43,6 +43,12 @@ You can now use the `stop` parameter to stop running containers before removal
 **New!**
 You can now use the `kill` parameter to kill running containers before removal.
 
+`POST /containers/(id)/start`
+
+**New!**
+The `hostConfig` option now accepts the field `CapAdd`, which specifies a list of capabilities
+to add, and the field `CapDrop`, which specifies a list of capabilities to drop.
+
 ## v1.13
 
 ### Full Documentation
diff --git a/components/engine/docs/sources/reference/api/docker_remote_api_v1.14.md b/components/engine/docs/sources/reference/api/docker_remote_api_v1.14.md
index c2f897ebef..bdc4fc5a4b 100644
--- a/components/engine/docs/sources/reference/api/docker_remote_api_v1.14.md
+++ b/components/engine/docs/sources/reference/api/docker_remote_api_v1.14.md
@@ -241,7 +241,9 @@ Return low-level information on the container `id`
                             ]
                          },
                          "Links": ["/name:alias"],
-                         "PublishAllPorts": false
+                         "PublishAllPorts": false,
+                         "CapAdd: ["NET_ADMIN"],
+                         "CapDrop: ["MKNOD"]
                      }
         }
 
@@ -410,7 +412,9 @@ Start the container `id`
              "PublishAllPorts":false,
              "Privileged":false,
              "Dns": ["8.8.8.8"],
-             "VolumesFrom": ["parent", "other:ro"]
+             "VolumesFrom": ["parent", "other:ro"],
+             "CapAdd: ["NET_ADMIN"],
+             "CapDrop: ["MKNOD"]
         }
 
     **Example response**:
diff --git a/components/engine/docs/sources/reference/run.md b/components/engine/docs/sources/reference/run.md
index 202d561df3..f8ced8d734 100644
--- a/components/engine/docs/sources/reference/run.md
+++ b/components/engine/docs/sources/reference/run.md
@@ -244,7 +244,7 @@ host as processes running outside containers on the host. Additional
 information about running with `--privileged` is available on the
 [Docker Blog](http://blog.docker.com/2013/09/docker-can-now-run-within-docker/).
 
-In addition to `--privileged` the operator can have fine grain control over the
+In addition to `--privileged`, the operator can have fine grain control over the
 capabilities using `--cap-add` and `--cap-drop`. By default, Docker has a default
 list of capabilities that are kept. Both flags support the value `all`, so if the
 operator wants to have all capabilities but `MKNOD` they could use: