beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #25405 from thaJeztah/fix-api-markdown

Browse source 
Fix Markdown formatting in API docs
(cherry picked from commit 66671d4ec2)

Signed-off-by: Tibor Vass <tibor@docker.com>

Conflicts:
	docs/reference/api/docker_remote_api_v1.25.md
This commit is contained in:
Sebastiaan van Stijn 2016-08-05 17:44:15 +02:00 committed by Tibor Vass
parent 0faacf1180
commit bc967c6ea9
7 changed files with 34 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/reference/api/docker_remote_api_v1.18.md
View file

@ -145,7 +145,7 @@ Create a container
"Cmd": [
"date"
],
"Entrypoint": "",
"Entrypoint": null,
"Image": "ubuntu",
"Labels": {
"com.example.vendor": "Acme",

2
docs/reference/api/docker_remote_api_v1.19.md
View file

@ -147,7 +147,7 @@ Create a container
"Cmd": [
"date"
],
"Entrypoint": "",
"Entrypoint": null,
"Image": "ubuntu",
"Labels": {
"com.example.vendor": "Acme",

2
docs/reference/api/docker_remote_api_v1.20.md
View file

@ -147,7 +147,7 @@ Create a container
"Cmd": [
"date"
],
"Entrypoint": "",
"Entrypoint": null,
"Image": "ubuntu",
"Labels": {
"com.example.vendor": "Acme",

2
docs/reference/api/docker_remote_api_v1.21.md
View file

@ -151,7 +151,7 @@ Create a container
"Cmd": [
"date"
],
"Entrypoint": "",
"Entrypoint": null,
"Image": "ubuntu",
"Labels": {
"com.example.vendor": "Acme",

19
docs/reference/api/docker_remote_api_v1.22.md
View file

@ -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"]
}
}
}
}

17
docs/reference/api/docker_remote_api_v1.23.md
View file

@ -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"]
}
}
}
}

21
docs/reference/api/docker_remote_api_v1.24.md
View file

@ -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"
}