From 6a47f2d6014159d3ebbf54e5a2129368302a2ceb Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 28 Jul 2016 02:11:34 +0200 Subject: [PATCH] docs: re-enable API 1.25 Signed-off-by: Sebastiaan van Stijn Upstream-commit: 2b9838eafed6c9f56a47fecc997cdef9b0203e9a Component: engine --- .../engine/docs/reference/api/docker_remote_api.md | 11 ++++++++--- .../docs/reference/api/docker_remote_api_v1.25.md | 1 - 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/components/engine/docs/reference/api/docker_remote_api.md b/components/engine/docs/reference/api/docker_remote_api.md index 0c710d36fa..eb9b4a2bb3 100644 --- a/components/engine/docs/reference/api/docker_remote_api.md +++ b/components/engine/docs/reference/api/docker_remote_api.md @@ -35,15 +35,16 @@ If you have bound the Docker daemon to a different socket path or TCP port, you would reference that in your cURL rather than the default. -The current version of the API is v1.24 which means calling `/info` is the same -as calling `/v1.24/info`. To call an older version of the API use -`/v1.23/info`. If a newer daemon is installed, new properties may be returned +The current version of the API is v1.25 which means calling `/info` is the same +as calling `/v1.25/info`. To call an older version of the API use +`/v1.24/info`. If a newer daemon is installed, new properties may be returned even when calling older versions of the API. Use the table below to find the API version for a Docker version: Docker version | API version | Changes ----------------|------------------------------------|------------------------------------------------------ +1.13.x | [1.25](docker_remote_api_v1.25.md) | [API changes](docker_remote_api.md#v1-25-api-changes) 1.12.x | [1.24](docker_remote_api_v1.24.md) | [API changes](docker_remote_api.md#v1-24-api-changes) 1.11.x | [1.23](docker_remote_api_v1.23.md) | [API changes](docker_remote_api.md#v1-23-api-changes) 1.10.x | [1.22](docker_remote_api_v1.22.md) | [API changes](docker_remote_api.md#v1-22-api-changes) @@ -111,6 +112,10 @@ Running `docker rmi` emits an **untag** event when removing an image name. The This section lists each version from latest to oldest. Each listing includes a link to the full documentation set and the changes relevant in that release. +### v1.25 API changes + +[Docker Remote API v1.25](docker_remote_api_v1.25.md) documentation + ### v1.24 API changes [Docker Remote API v1.24](docker_remote_api_v1.24.md) documentation diff --git a/components/engine/docs/reference/api/docker_remote_api_v1.25.md b/components/engine/docs/reference/api/docker_remote_api_v1.25.md index 3e00b2548d..1e6f49a4c6 100644 --- a/components/engine/docs/reference/api/docker_remote_api_v1.25.md +++ b/components/engine/docs/reference/api/docker_remote_api_v1.25.md @@ -3,7 +3,6 @@ title = "Remote API v1.25" description = "API Documentation for Docker" keywords = ["API, Docker, rcli, REST, documentation"] -draft = true [menu.main] parent="engine_remoteapi" weight=-6