From 40a7f3c46972d04afa3d2364ad67e00fc125a8e5 Mon Sep 17 00:00:00 2001 From: getvictor Date: Fri, 13 Sep 2013 14:09:05 -0500 Subject: [PATCH 1/2] Fixed LxcConf example for docker_remote_api_v1.5.rst Based on how command line docker sends the request. Upstream-commit: b3cbf424ec7dbce8a42f75b23f48083f3f62abaf Component: engine --- components/engine/docs/sources/api/docker_remote_api_v1.5.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/docs/sources/api/docker_remote_api_v1.5.rst b/components/engine/docs/sources/api/docker_remote_api_v1.5.rst index 88fe5e7307..522885ff86 100644 --- a/components/engine/docs/sources/api/docker_remote_api_v1.5.rst +++ b/components/engine/docs/sources/api/docker_remote_api_v1.5.rst @@ -358,7 +358,7 @@ Start a container { "Binds":["/tmp:/tmp"], - "LxcConf":{"lxc.utsname":"docker"} + "LxcConf":[{"Key":"lxc.utsname","Value":"docker"}] } **Example response**: From 262f4e57a26dba18ff6c7cf1b60a5db43f09b233 Mon Sep 17 00:00:00 2001 From: getvictor Date: Fri, 13 Sep 2013 14:10:05 -0500 Subject: [PATCH 2/2] Fixing LxcConf example in docker_remote_api_v1.4.rst Upstream-commit: 102522bcd1e87730394665c5a78f8e8bbcc50b7e Component: engine --- components/engine/docs/sources/api/docker_remote_api_v1.4.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/docs/sources/api/docker_remote_api_v1.4.rst b/components/engine/docs/sources/api/docker_remote_api_v1.4.rst index 227c18f3df..b3628f0252 100644 --- a/components/engine/docs/sources/api/docker_remote_api_v1.4.rst +++ b/components/engine/docs/sources/api/docker_remote_api_v1.4.rst @@ -359,7 +359,7 @@ Start a container { "Binds":["/tmp:/tmp"], - "LxcConf":{"lxc.utsname":"docker"} + "LxcConf":[{"Key":"lxc.utsname","Value":"docker"}] } **Example response**: