From 9014ac2d15b65559468ef0496061a38b919e1680 Mon Sep 17 00:00:00 2001 From: Arnaud Porterie Date: Mon, 14 Mar 2016 09:13:08 -0700 Subject: [PATCH] docs: fix incorrect output for "/info" endpoint OomScoreAjd is not part of `/info` output Wrong field name `DiscoveryBackend` in API reference Signed-off-by: Arnaud Porterie Signed-off-by: Sebastiaan van Stijn --- docs/reference/api/docker_remote_api_v1.21.md | 8 ++--- docs/reference/api/docker_remote_api_v1.22.md | 31 +++++++++---------- docs/reference/api/docker_remote_api_v1.23.md | 27 ++++++++-------- 3 files changed, 32 insertions(+), 34 deletions(-) diff --git a/docs/reference/api/docker_remote_api_v1.21.md b/docs/reference/api/docker_remote_api_v1.21.md index 467ec32fdd..4c86108186 100644 --- a/docs/reference/api/docker_remote_api_v1.21.md +++ b/docs/reference/api/docker_remote_api_v1.21.md @@ -1921,11 +1921,11 @@ Display system-wide information Content-Type: application/json { + "ClusterStore": "etcd://localhost:2379", "Containers": 11, "CpuCfsPeriod": true, "CpuCfsQuota": true, "Debug": false, - "DiscoveryBackend": "etcd://localhost:2379", "DockerRootDir": "/var/lib/docker", "Driver": "btrfs", "DriverStatus": [[""]], @@ -1966,9 +1966,9 @@ Display system-wide information "127.0.0.0/8" ] }, + "ServerVersion": "1.9.0", "SwapLimit": false, "SystemTime": "2015-03-10T11:11:23.730591467-07:00" - "ServerVersion": "1.9.0" } Status Codes: @@ -2796,7 +2796,7 @@ JSON Parameters: `POST /networks/(id)/connect` -Connects a container to a network +Connect a container to a network **Example request**: @@ -2827,7 +2827,7 @@ JSON Parameters: `POST /networks/(id)/disconnect` -Disconnects a container from a network +Disconnect a container from a network **Example request**: diff --git a/docs/reference/api/docker_remote_api_v1.22.md b/docs/reference/api/docker_remote_api_v1.22.md index 3ff1a99080..67a5c6e36b 100644 --- a/docs/reference/api/docker_remote_api_v1.22.md +++ b/docs/reference/api/docker_remote_api_v1.22.md @@ -2133,6 +2133,7 @@ Display system-wide information { "Architecture": "x86_64", + "ClusterStore": "etcd://localhost:2379", "Containers": 11, "ContainersRunning": 7, "ContainersStopped": 3, @@ -2140,21 +2141,9 @@ Display system-wide information "CpuCfsPeriod": true, "CpuCfsQuota": true, "Debug": false, - "DiscoveryBackend": "etcd://localhost:2379", "DockerRootDir": "/var/lib/docker", "Driver": "btrfs", "DriverStatus": [[""]], - "SystemStatus": [["State", "Healthy"]], - "Plugins": { - "Volume": [ - "local" - ], - "Network": [ - "null", - "host", - "bridge" - ] - }, "ExecutionDriver": "native-0.1", "ExperimentalBuild": false, "HttpProxy": "http://test:test@localhost:8080", @@ -2179,8 +2168,17 @@ Display system-wide information "NoProxy": "9.81.1.160", "OomKillDisable": true, "OSType": "linux", - "OomScoreAdj": 500, "OperatingSystem": "Boot2Docker", + "Plugins": { + "Volume": [ + "local" + ], + "Network": [ + "null", + "host", + "bridge" + ] + }, "RegistryConfig": { "IndexConfigs": { "docker.io": { @@ -2194,9 +2192,10 @@ Display system-wide information "127.0.0.0/8" ] }, + "ServerVersion": "1.9.0", "SwapLimit": false, + "SystemStatus": [["State", "Healthy"]], "SystemTime": "2015-03-10T11:11:23.730591467-07:00" - "ServerVersion": "1.9.0" } Status Codes: @@ -3089,7 +3088,7 @@ JSON Parameters: `POST /networks/(id)/connect` -Connects a container to a network +Connect a container to a network **Example request**: @@ -3126,7 +3125,7 @@ JSON Parameters: `POST /networks/(id)/disconnect` -Disconnects a container from a network +Disconnect a container from a network **Example request**: diff --git a/docs/reference/api/docker_remote_api_v1.23.md b/docs/reference/api/docker_remote_api_v1.23.md index 90895fc4e3..0f455deee0 100644 --- a/docs/reference/api/docker_remote_api_v1.23.md +++ b/docs/reference/api/docker_remote_api_v1.23.md @@ -2167,6 +2167,7 @@ Display system-wide information { "Architecture": "x86_64", + "ClusterStore": "etcd://localhost:2379", "CgroupDriver": "cgroupfs", "Containers": 11, "ContainersRunning": 7, @@ -2175,21 +2176,9 @@ Display system-wide information "CpuCfsPeriod": true, "CpuCfsQuota": true, "Debug": false, - "DiscoveryBackend": "etcd://localhost:2379", "DockerRootDir": "/var/lib/docker", "Driver": "btrfs", "DriverStatus": [[""]], - "SystemStatus": [["State", "Healthy"]], - "Plugins": { - "Volume": [ - "local" - ], - "Network": [ - "null", - "host", - "bridge" - ] - }, "ExecutionDriver": "native-0.1", "ExperimentalBuild": false, "HttpProxy": "http://test:test@localhost:8080", @@ -2215,8 +2204,17 @@ Display system-wide information "NoProxy": "9.81.1.160", "OomKillDisable": true, "OSType": "linux", - "OomScoreAdj": 500, "OperatingSystem": "Boot2Docker", + "Plugins": { + "Volume": [ + "local" + ], + "Network": [ + "null", + "host", + "bridge" + ] + }, "RegistryConfig": { "IndexConfigs": { "docker.io": { @@ -2230,9 +2228,10 @@ Display system-wide information "127.0.0.0/8" ] }, + "ServerVersion": "1.9.0", "SwapLimit": false, + "SystemStatus": [["State", "Healthy"]], "SystemTime": "2015-03-10T11:11:23.730591467-07:00" - "ServerVersion": "1.9.0" } Status Codes: