Commit graph

7276 commits

Author SHA1 Message Date
Misty Stanley-Jones
379e9259cf Fix instances of doubled words
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-11-28 10:48:45 -08:00
Misty Stanley-Jones
2333657e1b Fix copypaste error 'is-automated'
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-11-28 10:31:38 -08:00
Misty Stanley-Jones
a1f55dca21 Fix some redirect loops and problems
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-11-28 09:46:38 -08:00
Vincent Demeester
eb55d03f3c
Revert "Add -a option to service/node ps"
This reverts commit 139fff2bf0.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-28 18:08:45 +01:00
Vincent Demeester
b20bf510e5 Merge pull request #28822 from yuexiao-wang/modify-plugin
Modify repoName to PLUGIN for docker plugin create
2016-11-28 17:52:04 +01:00
Sebastiaan van Stijn
85a99c8891 Merge pull request #28657 from erxian/fix-doc-about-service-create
fix doc about service create in docker_remote_api_v1.24.md
2016-11-28 16:06:50 +01:00
Antonio Murdaca
76459076c2 Merge pull request #28882 from vdemeester/remove-stack_config-doc
Remove docker stack config commandline reference doc
2016-11-28 15:34:29 +01:00
Sebastiaan van Stijn
c04cf54d4e Merge pull request #28865 from albers/docs-stack-ls-aliases
Add aliases and options to `docker stack ls` docs
2016-11-28 15:27:35 +01:00
Vincent Demeester
3f98871a19
Remove docker stack config commandline reference doc
`docker stack config` command does not exists anymore, removing it
from the command reference documentation.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-28 15:25:52 +01:00
Ben Firshman
d9b109b807
Fix headings in old API docs
Jekyll automatically adds titles based on the title of the page,
so this was causing duplicate titles.

Also, made all the headings the correct level.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-28 11:24:22 +00:00
Kei Ohmura
4a3207de5b fix more according to the actual output of 'docker swarm init --help'
Signed-off-by: Kei Ohmura <ohmura.kei@gmail.com>
2016-11-28 18:40:11 +09:00
Kei Ohmura
3abee1bf8a fix description of 'docker swarm init'
Signed-off-by: Kei Ohmura <ohmura.kei@gmail.com>
2016-11-28 13:24:02 +09:00
Akihiro Suda
d5dee554ea Merge pull request #28857 from miaoyq/fix-a-description-of-docker-run
Fix description and link  of 'docker run [-a]'
2016-11-28 10:31:06 +09:00
Harald Albers
8260366dd2 Add aliases and options to docker stack ls docs
Signed-off-by: Harald Albers <github@albersweb.de>
2016-11-27 04:38:49 -08:00
Sebastiaan van Stijn
9dc0c8ec32 Merge pull request #28824 from lixiaobing10051267/masterPlugin2
modify invalid url in plugins_network.md
2016-11-26 23:22:52 +01:00
Yanqiang Miao
08ff4f427e Fix a description of 'docker run [-a]'
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2016-11-26 22:56:29 +08:00
Antonio Murdaca
ce0068ed04 Merge pull request #28780 from vieux/accept_src_in_secret
support src in --secret
2016-11-26 14:34:30 +01:00
Akihiro Suda
e6d9b7de64 cli: remove --mount from docker run
This commit reverts 273eeb813c (#26825).
For the discussion so far, please refer to #28527.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-11-26 04:55:28 +00:00
Vincent Demeester
c36c63b308 Merge pull request #28815 from dnephin/add-short-option
Add a short flag for docker stack deploy
2016-11-25 21:18:09 +01:00
Daniel Nephin
f1dd721b69 Add a short flag for docker stack deploy
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-25 13:23:36 -05:00
yuexiao-wang
c394034f59 Modify reponame to PLUGIN and fix some typos
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-11-25 23:09:46 +08:00
yuexiao-wang
4e970c1e5a Modify the link for config.json
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-11-25 18:33:04 +08:00
Vincent Demeester
3e58117608 Merge pull request #28771 from dnephin/add-missing-service-hostname-update
Allow hostname to be updated on service
2016-11-25 10:26:06 +01:00
lixiaobing10051267
fc7c235f84 modify invalid url in plugins_network.md
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-11-25 15:40:51 +08:00
Yanqiang Miao
18724726c2 Fix some syntax error
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2016-11-25 10:03:28 +08:00
Daniel Nephin
1c65cb6657 Allow hostname to be updated on service.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-24 15:44:35 -05:00
Yong Tang
2510f254ee Update docs of docker network ls --filter
Currently the help output of `docker network ls --filter` is:
```
Options:
  -f, --filter value   Provide filter values (i.e. 'dangling=true') (default [])
  ...
```
This caused confusion as only the following filters are supported at the moment:
 - `driver`
 - `type`
 - `name`
 - `id`
 - `label`

This fix update the help output of `docker network ls --filter` and `network_ls.md`.
The `dangling=true` description has been replace to:
```
Options:
  -f, --filter filter   Provide filter values (i.e. 'driver=bridge')
  ...
```

This fix fixes 28786.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-11-24 08:14:36 -08:00
Vincent Demeester
7aae360c41 Merge pull request #28802 from yuexiao-wang/fix-cli-typo
Add options for docker plugin enable and fix some typos
2016-11-24 17:03:56 +01:00
yuexiao-wang
9e414bfa6b Add options for docker plugin enable and fix some typos
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-11-25 04:07:06 +08:00
Sebastiaan van Stijn
b3687bdcdc Merge pull request #28602 from dattatrayakumbhar04/nw-connect-paused-container-doc
28600: Docs: network connect for container in Created/Stopped state
2016-11-24 15:04:53 +01:00
Victor Vieux
f70470b71e support src in --secret
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2016-11-23 14:30:57 -08:00
John Howard
c8c1dfbaf3 Fixes typo 'bin-mounts'
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-11-23 14:01:57 -08:00
Victor Vieux
ae64cae74e Merge pull request #28760 from ehazlett/carry-28576
Update Secret Command help (carry #28576)
2016-11-23 12:29:55 -08:00
dattatrayakumbhar04
16c9cdad6f 28600: Docs: network connect for container in Created/Stopped state
Signed-off-by: dattatrayakumbhar04 <dattatraya.kumbhar@gslab.com>
2016-11-23 20:20:37 +00:00
Vincent Demeester
2c978bd946 Merge pull request #28765 from vdemeester/update-docker-info-docs
Update docker info cli reference documentation
2016-11-23 17:27:08 +01:00
Vincent Demeester
d28eaa1171
Update docker info cli reference documentation
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-23 17:20:12 +01:00
erxian
d87c91e39f update secret command
Signed-off-by: erxian <evelynhsu21@gmail.com>
2016-11-23 10:07:09 -05:00
Vincent Demeester
55cd9c4edc Merge pull request #28758 from vdemeester/update-plugin-enable-cli-doc
Update plugin enable cli reference documentation
2016-11-23 15:53:02 +01:00
Vincent Demeester
43297dd6f8
Update plugin enable cli reference documentation
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-23 15:42:40 +01:00
Harald Albers
bb96e18b19 Move docker stack docs out of experimental
Signed-off-by: Harald Albers <github@albersweb.de>
2016-11-23 11:14:38 +01:00
erxian
c22821014a update the secret command docs
Signed-off-by: erxian <evelynhsu21@gmail.com>
2016-11-23 10:36:11 +08:00
Victor Vieux
22ba220e86 Merge pull request #28727 from cyli/do-not-display-secret-digest
Do not display the digest or size of swarm secrets [1.13]
2016-11-22 16:44:06 -08:00
Anusha Ragunathan
23ea9e45fd Merge pull request #28601 from tiborvass/plugin-misc-fixes
Plugin miscellaneous fixes
2016-11-22 16:12:37 -08:00
cyli
fe127b7eae Update docs to reflect no longer displaying secret digest or size.
Signed-off-by: cyli <cyli@twistedmatrix.com>
2016-11-22 18:18:56 -05:00
Tibor Vass
6547609870 plugins: misc fixes
Rename variable to reflect manifest -> config renaming
Populate Description fields when computing privileges.
Refactor/reuse code from daemon/oci_linux.go

Signed-off-by: Tibor Vass <tibor@docker.com>
2016-11-22 14:32:07 -08:00
Vincent Demeester
d145b0b93f Merge pull request #28726 from jacobtomlinson/docs-pull-concurrent
Document pull concurrent options
2016-11-22 23:11:27 +01:00
Jacob Tomlinson
b303381a4d Add concurrent uploads/downloads section
Document and link to the concurrent uploads/downloads daemon option.

Signed-off-by: Jacob Tomlinson <jacob@tom.linson.uk>
2016-11-22 21:59:10 +00:00
Sebastiaan van Stijn
313502488e Merge pull request #28506 from bfirsh/prepare-api-docs-for-swagger-docs
Prepare docs and Swagger definition for automatically generated API docs
2016-11-22 22:47:38 +01:00
Sebastiaan van Stijn
0cbc187447 Merge pull request #28715 from thaJeztah/add-warning-for-windows-plugins
add note that windows does not support managed plugins
2016-11-22 21:23:13 +01:00
Harald Albers
2e12055687 Fix typo in docs (Copmose)
Signed-off-by: Harald Albers <github@albersweb.de>
2016-11-22 19:09:30 +01:00