From bc967c6ea94acb051e2e2db85bd39b26f7ce199d Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 5 Aug 2016 17:44:15 +0200 Subject: [PATCH] Merge pull request #25405 from thaJeztah/fix-api-markdown Fix Markdown formatting in API docs (cherry picked from commit 66671d4ec29d7ccbd991399b8b98705e57b6a3eb) Signed-off-by: Tibor Vass Conflicts: docs/reference/api/docker_remote_api_v1.25.md --- docs/reference/api/docker_remote_api_v1.18.md | 2 +- docs/reference/api/docker_remote_api_v1.19.md | 2 +- docs/reference/api/docker_remote_api_v1.20.md | 2 +- docs/reference/api/docker_remote_api_v1.21.md | 2 +- docs/reference/api/docker_remote_api_v1.22.md | 19 +++++++++-------- docs/reference/api/docker_remote_api_v1.23.md | 17 ++++++++------- docs/reference/api/docker_remote_api_v1.24.md | 21 ++++++++++--------- 7 files changed, 34 insertions(+), 31 deletions(-) diff --git a/docs/reference/api/docker_remote_api_v1.18.md b/docs/reference/api/docker_remote_api_v1.18.md index aca560f11d..7ab6c2441c 100644 --- a/docs/reference/api/docker_remote_api_v1.18.md +++ b/docs/reference/api/docker_remote_api_v1.18.md @@ -145,7 +145,7 @@ Create a container "Cmd": [ "date" ], - "Entrypoint": "", + "Entrypoint": null, "Image": "ubuntu", "Labels": { "com.example.vendor": "Acme", diff --git a/docs/reference/api/docker_remote_api_v1.19.md b/docs/reference/api/docker_remote_api_v1.19.md index ec15a81c54..f6e59fc90f 100644 --- a/docs/reference/api/docker_remote_api_v1.19.md +++ b/docs/reference/api/docker_remote_api_v1.19.md @@ -147,7 +147,7 @@ Create a container "Cmd": [ "date" ], - "Entrypoint": "", + "Entrypoint": null, "Image": "ubuntu", "Labels": { "com.example.vendor": "Acme", diff --git a/docs/reference/api/docker_remote_api_v1.20.md b/docs/reference/api/docker_remote_api_v1.20.md index 9595119ac7..a37802a3f2 100644 --- a/docs/reference/api/docker_remote_api_v1.20.md +++ b/docs/reference/api/docker_remote_api_v1.20.md @@ -147,7 +147,7 @@ Create a container "Cmd": [ "date" ], - "Entrypoint": "", + "Entrypoint": null, "Image": "ubuntu", "Labels": { "com.example.vendor": "Acme", diff --git a/docs/reference/api/docker_remote_api_v1.21.md b/docs/reference/api/docker_remote_api_v1.21.md index 7fa7233798..1b033af05e 100644 --- a/docs/reference/api/docker_remote_api_v1.21.md +++ b/docs/reference/api/docker_remote_api_v1.21.md @@ -151,7 +151,7 @@ Create a container "Cmd": [ "date" ], - "Entrypoint": "", + "Entrypoint": null, "Image": "ubuntu", "Labels": { "com.example.vendor": "Acme", diff --git a/docs/reference/api/docker_remote_api_v1.22.md b/docs/reference/api/docker_remote_api_v1.22.md index 9b98708899..c300153d56 100644 --- a/docs/reference/api/docker_remote_api_v1.22.md +++ b/docs/reference/api/docker_remote_api_v1.22.md @@ -239,7 +239,7 @@ Create a container "Cmd": [ "date" ], - "Entrypoint": "", + "Entrypoint": null, "Image": "ubuntu", "Labels": { "com.example.vendor": "Acme", @@ -301,14 +301,15 @@ Create a container "ShmSize": 67108864 }, "NetworkingConfig": { - "EndpointsConfig": { - "isolated_nw" : { - "IPAMConfig": { - "IPv4Address":"172.20.30.33", - "IPv6Address":"2001:db8:abcd::3033" - }, - "Links":["container_1", "container_2"], - "Aliases":["server_x", "server_y"] + "EndpointsConfig": { + "isolated_nw" : { + "IPAMConfig": { + "IPv4Address":"172.20.30.33", + "IPv6Address":"2001:db8:abcd::3033" + }, + "Links":["container_1", "container_2"], + "Aliases":["server_x", "server_y"] + } } } } diff --git a/docs/reference/api/docker_remote_api_v1.23.md b/docs/reference/api/docker_remote_api_v1.23.md index 315f1d1232..dda9e6f3a1 100644 --- a/docs/reference/api/docker_remote_api_v1.23.md +++ b/docs/reference/api/docker_remote_api_v1.23.md @@ -321,14 +321,15 @@ Create a container "ShmSize": 67108864 }, "NetworkingConfig": { - "EndpointsConfig": { - "isolated_nw" : { - "IPAMConfig": { - "IPv4Address":"172.20.30.33", - "IPv6Address":"2001:db8:abcd::3033" - }, - "Links":["container_1", "container_2"], - "Aliases":["server_x", "server_y"] + "EndpointsConfig": { + "isolated_nw" : { + "IPAMConfig": { + "IPv4Address":"172.20.30.33", + "IPv6Address":"2001:db8:abcd::3033" + }, + "Links":["container_1", "container_2"], + "Aliases":["server_x", "server_y"] + } } } } diff --git a/docs/reference/api/docker_remote_api_v1.24.md b/docs/reference/api/docker_remote_api_v1.24.md index cf3ed3d065..e1bb39abf0 100644 --- a/docs/reference/api/docker_remote_api_v1.24.md +++ b/docs/reference/api/docker_remote_api_v1.24.md @@ -336,15 +336,16 @@ Create a container "ShmSize": 67108864 }, "NetworkingConfig": { - "EndpointsConfig": { - "isolated_nw" : { - "IPAMConfig": { - "IPv4Address":"172.20.30.33", - "IPv6Address":"2001:db8:abcd::3033", - "LinkLocalIPs:["169.254.34.68", "fe80::3468"] - }, - "Links":["container_1", "container_2"], - "Aliases":["server_x", "server_y"] + "EndpointsConfig": { + "isolated_nw" : { + "IPAMConfig": { + "IPv4Address":"172.20.30.33", + "IPv6Address":"2001:db8:abcd::3033", + "LinkLocalIPs":["169.254.34.68", "fe80::3468"] + }, + "Links":["container_1", "container_2"], + "Aliases":["server_x", "server_y"] + } } } } @@ -3588,7 +3589,7 @@ Join an existing new Swarm { "ListenAddr": "0.0.0.0:2377", - "AdvertiseAddr: "192.168.1.1:2377", + "AdvertiseAddr": "192.168.1.1:2377", "RemoteAddrs": ["node1:2377"], "JoinToken": "SWMTKN-1-3pu6hszjas19xyp7ghgosyx9k8atbfcr8p2is99znpy26u2lkl-7p73s1dx5in4tatdymyhg9hu2" }