Sebastiaan van Stijn
121cd6f9e6
Fix incorrectly named API options
...
This renames `MaximumIOps` to `IOMaximumBandwidth`,
and `MaximumIOBps` to `IOMaximumIOps` to match
the actual code.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit 36a25bdbe4github@gone.nl >
2016-09-29 14:27:41 +02:00
yuexiao-wang
d4288a3212
Update on index refernce documentation
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
(cherry picked from commit 0483d77613github@gone.nl >
2016-09-29 14:27:34 +02:00
Sebastiaan van Stijn
cdda81146b
Update API docs for "HostConfig.Binds"
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit 708892c403github@gone.nl >
2016-09-29 14:27:27 +02:00
Sebastiaan van Stijn
7da3e5d0b2
Fix Markdown formatting and missing prompt in service create
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit 533b00da8bgithub@gone.nl >
2016-09-29 14:26:59 +02:00
yuexiao-wang
5508a82cac
fix typo for docs reference
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
(cherry picked from commit 0f0b0db842github@gone.nl >
2016-09-29 14:26:45 +02:00
Misty Stanley-Jones
0e29518469
Misty's edits and additions
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
(cherry picked from commit 3de7d725137ee1620ae2050e65ace4990a3af87e)
(cherry picked from commit 5880d62953github@gone.nl >
2016-09-29 14:26:28 +02:00
Sebastiaan van Stijn
3bd4612aaf
Add --mount syntax documentation to CLI reference
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit eb3a01eb43github@gone.nl >
2016-09-29 14:25:31 +02:00
Sebastiaan van Stijn
9a207a7eb7
Synchronize API docs
...
This synchronizes changes between API versions, and:
- applies e0a552504ea2a0a03e2bgithub@gone.nl >
(cherry picked from commit 53b1dcb25cgithub@gone.nl >
2016-09-29 14:25:09 +02:00
Sebastiaan van Stijn
ac1eb9edd0
Fix service and tasks API documentation
...
The documentation contained some outdated information
on these endpoints.
This change fixes those parts of the documentation
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit d69409fd43github@gone.nl >
2016-09-29 14:25:02 +02:00
Alessandro Boch
e289fc155a
Fix mtu option in documentation
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
(cherry picked from commit e74a937b00github@gone.nl >
2016-09-29 14:24:46 +02:00
Josh Bodah
bcc70e52eb
Remove extra paren in run --link docs
...
Signed-off-by: Josh Bodah <jb3689@yahoo.com >
(cherry picked from commit 484fbe236dgithub@gone.nl >
2016-09-29 14:24:29 +02:00
Sebastiaan van Stijn
c84d8b8360
Use "sudo" for dockerd examples
...
Because we standardize on using a non-privileged
prompt (`$`) instead of `#`, replacing the
examples to use `sudo` instead to indicate
this has to be run as root.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit 87b174080bgithub@gone.nl >
2016-09-29 14:23:30 +02:00
Sebastiaan van Stijn
ae9b46dbd0
Add link to logging drivers reference
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit 7ca02f86degithub@gone.nl >
2016-09-29 14:17:53 +02:00
Antonio Murdaca
7fad9da9f2
docs: reference: api: clarify pull all tags
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
(cherry picked from commit 03a8b6798dgithub@gone.nl >
2016-09-29 14:17:45 +02:00
Sebastiaan van Stijn
a8aaf5bfad
Synchronize push reference with man page
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit dddea689abgithub@gone.nl >
2016-09-29 14:17:37 +02:00
Sebastiaan van Stijn
c6ba6498b3
Restore missing "format" example
...
The "format" example got lost during the
rewrite of the documentation for Cobra. This
restores the missing example.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit edbb8fb86dgithub@gone.nl >
2016-09-29 14:17:29 +02:00
Sebastiaan van Stijn
c9ce561ac0
Add direct link to event chart image
...
This adds a direct link to the event chart image
so that the full-resolution image can be "zoomed"
in to.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit 86de72fef2github@gone.nl >
2016-09-29 14:17:14 +02:00
Victor Vieux
1ec9ca1ca6
Merge pull request #26866 from docker/cherry-picks-1.12.2
...
Cherry picks 1.12.2
2016-09-27 13:33:29 -07:00
Sebastiaan van Stijn
e9c655442a
1.12 Revert "Merge pull request #26030 from yongtang/08252016-doc-docker-create-rm"
...
This reverts commit 44180a48e9github@gone.nl >
2016-09-27 16:33:53 +02:00
Yong Tang
e892a54fa1
Fix incorrect help output in docker network ls
...
As is raised in 26312, in `docker network ls`, the help output was
mistaken to `volume names`:
```
-q, --quiet Only display volume names
```
This fix changes the help output to:
```
-q, --quiet Only display network IDs
```
This fix also updates the documentation in:
`docs/reference/commandline/network_ls.md`
This fix fixes 26312.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
(cherry picked from commit b9e46235favieux@docker.com >
2016-09-26 19:33:52 -07:00
Misty Stanley-Jones
24df982128
Clarify usage of --force when used on a swarm manager
...
Fixes #26125
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
(cherry picked from commit 7b5c3d935avieux@docker.com >
2016-09-26 19:33:45 -07:00
Misty Stanley-Jones
4da24ca1e3
Set docker_remote_api_v1.25.md to draft in 1.12.x branch
...
It does not apply to 1.12.x but we are leaving the file in place
to make future cherry-picks easier.
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
2016-09-16 10:03:13 -07:00
Sebastiaan van Stijn
99ed95cb57
Merge pull request #26526 from lixiaobing10051267/masterSymble
...
fix some incorrect symbols before executing command
(cherry picked from commit 9e9ba1e1c1misty@docker.com >
2016-09-16 10:03:13 -07:00
Brian Goff
9ec857ad5a
Merge pull request #26472 from yongtang/09112016-docker-build-step-0
...
Fix documentation for `Step 0` to `Step 1` in `docker build`
(cherry picked from commit e41839e8a1misty@docker.com >
2016-09-16 10:03:12 -07:00
Vincent Demeester
0183b3bf8c
Merge pull request #26426 from sfsmithcha/carry_pry_25414
...
Carry pr 25414
(cherry picked from commit e6f76800f5misty@docker.com >
2016-09-16 10:03:12 -07:00
Sven Dowideit
8f264db3f1
Merge pull request #26306 from deployable/patch-1
...
Remote API documentation consistancy
(cherry picked from commit 2cce7bf33amisty@docker.com >
2016-09-16 10:03:12 -07:00
Michael Crosby
b23bff1d9f
Merge pull request #26224 from q384566678/test-zhou
...
Modify rename function use tips
(cherry picked from commit 061cc41759misty@docker.com >
2016-09-16 10:03:12 -07:00
Sebastiaan van Stijn
7c8dc9e6d5
Merge pull request #25817 from sfsmithcha/update_glossary
...
add swarm mode terms to the glossary
(cherry picked from commit 027e7be348misty@docker.com >
2016-09-14 09:48:29 -07:00
Vincent Demeester
c6e7fececb
Merge pull request #25719 from eskaaren/master
...
You can force leave swarm
(cherry picked from commit daf454d8cdmisty@docker.com >
2016-09-14 09:48:23 -07:00
Misty Stanley-Jones
bf637439e7
Revert "Merge pull request #26236 from yuexiao-wang/remove-h-option"
...
This reverts commit eea99cd001misty@docker.com >
2016-09-12 11:02:09 -07:00
Vincent Demeester
eea99cd001
Merge pull request #26236 from yuexiao-wang/remove-h-option
...
Remove -h option for docker cli
(cherry picked from commit 01fe5639bcmisty@docker.com >
2016-09-09 14:44:58 -07:00
Brian Goff
8a56561528
Merge pull request #26228 from lixiaobing10051267/masterPluginRm
...
check inconsistant command in docs/reference/commandline
(cherry picked from commit e96c0fafa0misty@docker.com >
2016-09-09 14:44:37 -07:00
Charles Smith
dc98c76772
Merge pull request #26156 from mstanleyjones/24905_swarm_noun_usage
...
Sanitize uses of Swarm as a proper and improper noun (Fixes #24905 )
(cherry picked from commit 6f0502b89bmisty@docker.com >
2016-09-09 14:44:29 -07:00
yuexiao-wang
0d800e9a37
clean up the run.md in reference
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
(cherry picked from commit dd02815a26misty@docker.com >
2016-09-09 14:44:09 -07:00
Sven Dowideit
be71b62acf
Merge pull request #26431 from mstanleyjones/2016.09.08-engine-docs-updates
...
2016.09.08 engine docs updates
2016-09-09 21:43:38 +10:00
Sven Dowideit
bf7d335513
Merge pull request #26218 from frosforever/fix_run_reference_typo
...
Correct typo in run reference docs that use the create command
(cherry picked from commit e73e37f112misty@docker.com >
2016-09-08 14:34:00 -07:00
Vincent Demeester
11330bf048
Merge pull request #26307 from AkihiroSuda/fix-doc-26291
...
fix docs about `sudo docker login`
(cherry picked from commit da763602afcharles.smith@docker.com >
2016-09-06 12:31:59 -07:00
Vincent Demeester
95bc4519d2
Merge pull request #26241 from YuPengZTE/devNote
...
The first letter of “docker“ is small
(cherry picked from commit b14f29dfbdcharles.smith@docker.com >
2016-09-06 12:28:39 -07:00
Vincent Demeester
a42e2a0e42
Merge pull request #26192 from lixiaobing10051267/masterPluginInspect
...
make command "docker plugin inspect" complete
(cherry picked from commit cf699ad427charles.smith@docker.com >
2016-09-06 12:18:44 -07:00
Vincent Demeester
1e9fb2f18e
Merge pull request #26190 from lixiaobing10051267/masterNetworkCreate
...
provide actual command format for docker network create
(cherry picked from commit 37fd1416dacharles.smith@docker.com >
2016-09-06 12:17:10 -07:00
Vincent Demeester
748f3ef8e3
Merge pull request #26185 from yuexiao-wang/update-docs
...
Update description for docker plugin inspect
(cherry picked from commit 0414a2c1a9charles.smith@docker.com >
2016-09-06 12:11:34 -07:00
Sven Dowideit
5c34d579dc
Merge pull request #26302 from vdemeester/health_status-in-event-docs
...
Add health status as action on events documentations
(cherry picked from commit b468df9eaccharles.smith@docker.com >
2016-09-06 12:04:23 -07:00
Vincent Demeester
7e2259bb63
Merge pull request #26271 from AkihiroSuda/fix-service-create-doc
...
update docs/reference/commandline/service_create.md
(cherry picked from commit 1a04d7b1e1charles.smith@docker.com >
2016-09-06 12:03:07 -07:00
Vincent Demeester
b7e9344365
Merge pull request #26258 from mstanleyjones/25625_swarm_init_return_value
...
Add response to swarm/init example (fixes #25625
(cherry picked from commit d4e173fc34charles.smith@docker.com >
2016-09-06 12:02:00 -07:00
Justin Cormack
e773b059d1
Merge pull request #26139 from yuexiao-wang/fix-link
...
Modify link for hub and registry
(cherry picked from commit ad6f5a49d5charles.smith@docker.com >
2016-09-06 11:37:03 -07:00
Vincent Demeester
934d7b83ef
Merge pull request #26135 from kmkr/master
...
Fix typo in builder.md
(cherry picked from commit 20869b5650charles.smith@docker.com >
2016-09-06 11:36:27 -07:00
Justin Cormack
9bef12dcfd
Merge pull request #26096 from ohmystack/fix/docs-dockerd
...
Add docs for "--containerd" in dockerd
(cherry picked from commit 644cb53b41charles.smith@docker.com >
2016-09-06 11:31:55 -07:00
Doug Davis
44180a48e9
Merge pull request #26030 from yongtang/08252016-doc-docker-create-rm
...
Update docs for `docker create` to include `--rm` flag
(cherry picked from commit 91ec7fa811charles.smith@docker.com >
2016-09-06 11:29:55 -07:00
Antonio Murdaca
8f0254da41
Merge pull request #26029 from WhisperingChaos/25918-permissive-to-privileged
...
Fixes #25918 - Changed --permissive to --privileged.
(cherry picked from commit 91fdafb79fcharles.smith@docker.com >
2016-09-06 11:26:13 -07:00
Vincent Demeester
af9378f713
Merge pull request #25996 from yuexiao-wang/fix-docker-daemon
...
Replace docker command from 'docker daemon' to 'dockerd'
(cherry picked from commit aff33055accharles.smith@docker.com >
2016-09-06 11:06:57 -07:00
