瀏覽代碼

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 <arnaud.porterie@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Arnaud Porterie 9 年之前
父節點
當前提交
9014ac2d15

+ 4 - 4
docs/reference/api/docker_remote_api_v1.21.md

@@ -1921,11 +1921,11 @@ Display system-wide information
     Content-Type: application/json
     Content-Type: application/json
 
 
     {
     {
+        "ClusterStore": "etcd://localhost:2379",
         "Containers": 11,
         "Containers": 11,
         "CpuCfsPeriod": true,
         "CpuCfsPeriod": true,
         "CpuCfsQuota": true,
         "CpuCfsQuota": true,
         "Debug": false,
         "Debug": false,
-        "DiscoveryBackend": "etcd://localhost:2379",
         "DockerRootDir": "/var/lib/docker",
         "DockerRootDir": "/var/lib/docker",
         "Driver": "btrfs",
         "Driver": "btrfs",
         "DriverStatus": [[""]],
         "DriverStatus": [[""]],
@@ -1966,9 +1966,9 @@ Display system-wide information
                 "127.0.0.0/8"
                 "127.0.0.0/8"
             ]
             ]
         },
         },
+        "ServerVersion": "1.9.0",
         "SwapLimit": false,
         "SwapLimit": false,
         "SystemTime": "2015-03-10T11:11:23.730591467-07:00"
         "SystemTime": "2015-03-10T11:11:23.730591467-07:00"
-        "ServerVersion": "1.9.0"
     }
     }
 
 
 Status Codes:
 Status Codes:
@@ -2796,7 +2796,7 @@ JSON Parameters:
 
 
 `POST /networks/(id)/connect`
 `POST /networks/(id)/connect`
 
 
-Connects a container to a network
+Connect a container to a network
 
 
 **Example request**:
 **Example request**:
 
 
@@ -2827,7 +2827,7 @@ JSON Parameters:
 
 
 `POST /networks/(id)/disconnect`
 `POST /networks/(id)/disconnect`
 
 
-Disconnects a container from a network
+Disconnect a container from a network
 
 
 **Example request**:
 **Example request**:
 
 

+ 15 - 16
docs/reference/api/docker_remote_api_v1.22.md

@@ -2133,6 +2133,7 @@ Display system-wide information
 
 
     {
     {
         "Architecture": "x86_64",
         "Architecture": "x86_64",
+        "ClusterStore": "etcd://localhost:2379",
         "Containers": 11,
         "Containers": 11,
         "ContainersRunning": 7,
         "ContainersRunning": 7,
         "ContainersStopped": 3,
         "ContainersStopped": 3,
@@ -2140,21 +2141,9 @@ Display system-wide information
         "CpuCfsPeriod": true,
         "CpuCfsPeriod": true,
         "CpuCfsQuota": true,
         "CpuCfsQuota": true,
         "Debug": false,
         "Debug": false,
-        "DiscoveryBackend": "etcd://localhost:2379",
         "DockerRootDir": "/var/lib/docker",
         "DockerRootDir": "/var/lib/docker",
         "Driver": "btrfs",
         "Driver": "btrfs",
         "DriverStatus": [[""]],
         "DriverStatus": [[""]],
-        "SystemStatus": [["State", "Healthy"]],
-        "Plugins": {
-            "Volume": [
-                "local"
-            ],
-            "Network": [
-                "null",
-                "host",
-                "bridge"
-            ]
-        },
         "ExecutionDriver": "native-0.1",
         "ExecutionDriver": "native-0.1",
         "ExperimentalBuild": false,
         "ExperimentalBuild": false,
         "HttpProxy": "http://test:test@localhost:8080",
         "HttpProxy": "http://test:test@localhost:8080",
@@ -2179,8 +2168,17 @@ Display system-wide information
         "NoProxy": "9.81.1.160",
         "NoProxy": "9.81.1.160",
         "OomKillDisable": true,
         "OomKillDisable": true,
         "OSType": "linux",
         "OSType": "linux",
-        "OomScoreAdj": 500,
         "OperatingSystem": "Boot2Docker",
         "OperatingSystem": "Boot2Docker",
+        "Plugins": {
+            "Volume": [
+                "local"
+            ],
+            "Network": [
+                "null",
+                "host",
+                "bridge"
+            ]
+        },
         "RegistryConfig": {
         "RegistryConfig": {
             "IndexConfigs": {
             "IndexConfigs": {
                 "docker.io": {
                 "docker.io": {
@@ -2194,9 +2192,10 @@ Display system-wide information
                 "127.0.0.0/8"
                 "127.0.0.0/8"
             ]
             ]
         },
         },
+        "ServerVersion": "1.9.0",
         "SwapLimit": false,
         "SwapLimit": false,
+        "SystemStatus": [["State", "Healthy"]],
         "SystemTime": "2015-03-10T11:11:23.730591467-07:00"
         "SystemTime": "2015-03-10T11:11:23.730591467-07:00"
-        "ServerVersion": "1.9.0"
     }
     }
 
 
 Status Codes:
 Status Codes:
@@ -3089,7 +3088,7 @@ JSON Parameters:
 
 
 `POST /networks/(id)/connect`
 `POST /networks/(id)/connect`
 
 
-Connects a container to a network
+Connect a container to a network
 
 
 **Example request**:
 **Example request**:
 
 
@@ -3126,7 +3125,7 @@ JSON Parameters:
 
 
 `POST /networks/(id)/disconnect`
 `POST /networks/(id)/disconnect`
 
 
-Disconnects a container from a network
+Disconnect a container from a network
 
 
 **Example request**:
 **Example request**:
 
 

+ 13 - 14
docs/reference/api/docker_remote_api_v1.23.md

@@ -2167,6 +2167,7 @@ Display system-wide information
 
 
     {
     {
         "Architecture": "x86_64",
         "Architecture": "x86_64",
+        "ClusterStore": "etcd://localhost:2379",
         "CgroupDriver": "cgroupfs",
         "CgroupDriver": "cgroupfs",
         "Containers": 11,
         "Containers": 11,
         "ContainersRunning": 7,
         "ContainersRunning": 7,
@@ -2175,21 +2176,9 @@ Display system-wide information
         "CpuCfsPeriod": true,
         "CpuCfsPeriod": true,
         "CpuCfsQuota": true,
         "CpuCfsQuota": true,
         "Debug": false,
         "Debug": false,
-        "DiscoveryBackend": "etcd://localhost:2379",
         "DockerRootDir": "/var/lib/docker",
         "DockerRootDir": "/var/lib/docker",
         "Driver": "btrfs",
         "Driver": "btrfs",
         "DriverStatus": [[""]],
         "DriverStatus": [[""]],
-        "SystemStatus": [["State", "Healthy"]],
-        "Plugins": {
-            "Volume": [
-                "local"
-            ],
-            "Network": [
-                "null",
-                "host",
-                "bridge"
-            ]
-        },
         "ExecutionDriver": "native-0.1",
         "ExecutionDriver": "native-0.1",
         "ExperimentalBuild": false,
         "ExperimentalBuild": false,
         "HttpProxy": "http://test:test@localhost:8080",
         "HttpProxy": "http://test:test@localhost:8080",
@@ -2215,8 +2204,17 @@ Display system-wide information
         "NoProxy": "9.81.1.160",
         "NoProxy": "9.81.1.160",
         "OomKillDisable": true,
         "OomKillDisable": true,
         "OSType": "linux",
         "OSType": "linux",
-        "OomScoreAdj": 500,
         "OperatingSystem": "Boot2Docker",
         "OperatingSystem": "Boot2Docker",
+        "Plugins": {
+            "Volume": [
+                "local"
+            ],
+            "Network": [
+                "null",
+                "host",
+                "bridge"
+            ]
+        },
         "RegistryConfig": {
         "RegistryConfig": {
             "IndexConfigs": {
             "IndexConfigs": {
                 "docker.io": {
                 "docker.io": {
@@ -2230,9 +2228,10 @@ Display system-wide information
                 "127.0.0.0/8"
                 "127.0.0.0/8"
             ]
             ]
         },
         },
+        "ServerVersion": "1.9.0",
         "SwapLimit": false,
         "SwapLimit": false,
+        "SystemStatus": [["State", "Healthy"]],
         "SystemTime": "2015-03-10T11:11:23.730591467-07:00"
         "SystemTime": "2015-03-10T11:11:23.730591467-07:00"
-        "ServerVersion": "1.9.0"
     }
     }
 
 
 Status Codes:
 Status Codes: