From 068d1a3e597f08a8b8bc07578150e4477f2e2947 Mon Sep 17 00:00:00 2001 From: Todd Lunter Date: Wed, 30 Oct 2013 08:50:21 -0400 Subject: [PATCH 1/2] Fix formatted on build Upstream-commit: e7402ed9cc823045a75baef32a090607f7272078 Component: engine --- .../sources/api/docker_remote_api_v1.4.rst | 36 +++++++++---------- .../sources/api/docker_remote_api_v1.6.rst | 36 +++++++++---------- 2 files changed, 36 insertions(+), 36 deletions(-) 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 b49bbc4f54..3d17974237 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 @@ -945,34 +945,34 @@ Build an image from Dockerfile via stdin Build an image from Dockerfile via stdin - **Example request**: + **Example request**: - .. sourcecode:: http + .. sourcecode:: http - POST /build HTTP/1.1 + POST /build HTTP/1.1 - {{ STREAM }} + {{ STREAM }} - **Example response**: + **Example response**: - .. sourcecode:: http + .. sourcecode:: http - HTTP/1.1 200 OK + HTTP/1.1 200 OK - {{ STREAM }} + {{ STREAM }} - The stream must be a tar archive compressed with one of the following algorithms: - identity (no compression), gzip, bzip2, xz. The archive must include a file called - `Dockerfile` at its root. It may include any number of other files, which will be - accessible in the build context (See the ADD build command). + The stream must be a tar archive compressed with one of the following algorithms: + identity (no compression), gzip, bzip2, xz. The archive must include a file called + `Dockerfile` at its root. It may include any number of other files, which will be + accessible in the build context (See the ADD build command). - The Content-type header should be set to "application/tar". + The Content-type header should be set to "application/tar". - :query t: repository name (and optionally a tag) to be applied to the resulting image in case of success - :query q: suppress verbose build output + :query t: repository name (and optionally a tag) to be applied to the resulting image in case of success + :query q: suppress verbose build output :query nocache: do not use the cache when building the image - :statuscode 200: no error + :statuscode 200: no error :statuscode 500: server error @@ -1069,8 +1069,8 @@ Show the docker version information "GoVersion":"go1.0.3" } - :statuscode 200: no error - :statuscode 500: server error + :statuscode 200: no error + :statuscode 500: server error Create a new image from a container's changes diff --git a/components/engine/docs/sources/api/docker_remote_api_v1.6.rst b/components/engine/docs/sources/api/docker_remote_api_v1.6.rst index 703f7345d4..defe145d06 100644 --- a/components/engine/docs/sources/api/docker_remote_api_v1.6.rst +++ b/components/engine/docs/sources/api/docker_remote_api_v1.6.rst @@ -995,36 +995,36 @@ Build an image from Dockerfile via stdin .. http:post:: /build - Build an image from Dockerfile via stdin + Build an image from Dockerfile via stdin - **Example request**: + **Example request**: - .. sourcecode:: http + .. sourcecode:: http - POST /build HTTP/1.1 + POST /build HTTP/1.1 - {{ STREAM }} + {{ STREAM }} - **Example response**: + **Example response**: - .. sourcecode:: http + .. sourcecode:: http - HTTP/1.1 200 OK + HTTP/1.1 200 OK - {{ STREAM }} + {{ STREAM }} - The stream must be a tar archive compressed with one of the following algorithms: - identity (no compression), gzip, bzip2, xz. The archive must include a file called - `Dockerfile` at its root. It may include any number of other files, which will be - accessible in the build context (See the ADD build command). + The stream must be a tar archive compressed with one of the following algorithms: + identity (no compression), gzip, bzip2, xz. The archive must include a file called + `Dockerfile` at its root. It may include any number of other files, which will be + accessible in the build context (See the ADD build command). + + The Content-type header should be set to "application/tar". - The Content-type header should be set to "application/tar". - - :query t: repository name (and optionally a tag) to be applied to the resulting image in case of success - :query q: suppress verbose build output + :query t: repository name (and optionally a tag) to be applied to the resulting image in case of success + :query q: suppress verbose build output :query nocache: do not use the cache when building the image - :statuscode 200: no error + :statuscode 200: no error :statuscode 500: server error From bf5d4694b48b9dab3760633ee4dc8c5041ed21cb Mon Sep 17 00:00:00 2001 From: Todd Lunter Date: Thu, 31 Oct 2013 08:46:16 -0400 Subject: [PATCH 2/2] Fixed the quoted text Upstream-commit: 3a14d4c923109b93ba805e661fa1573c3b2f9db7 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 3d17974237..0441e068d0 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 @@ -943,7 +943,7 @@ Build an image from Dockerfile via stdin .. http:post:: /build - Build an image from Dockerfile via stdin + Build an image from Dockerfile via stdin **Example request**: