Otto Kekäläinen
664c75ebba
Fix spelling in comments, strings and documentation
...
Signed-off-by: Otto Kekäläinen <otto@seravo.fi>
(cherry picked from commit 644a7426cc
)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-08 15:31:42 -07:00
Antonio Murdaca
18d85f7db1
man: add missing --add-runtime
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
(cherry picked from commit 585332dfe0
)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-08 15:31:24 -07:00
Adolfo Ochagavía
98e4b0035a
Fix typo
...
Signed-off-by: Adolfo Ochagavía <aochagavia92@gmail.com>
(cherry picked from commit 76b09be696
)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-08 15:31:24 -07:00
Sebastiaan van Stijn
a4bc0cfecb
fix typo in "readonly" flag in documentation
...
the flag is named '--read-only', not '--readonly'
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit ac12696ff4
)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-08 15:31:23 -07:00
Alan Thompson
5c9db19be0
Update network_create.md
...
minor typos and punctuation.
Signed-off-by: Alan Thompson <cloojure@gmail.com>
(cherry picked from commit 68b8cc9735
)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-08 15:31:23 -07:00
Aaron Lehmann
7e086db901
Fix --auto-accept documentation
...
The --auto-accept documentation currently says that both worker and
manager nodes are automatically accepted by default. Correct it.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
(cherry picked from commit 9aed7d1a3d
)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-08 15:31:23 -07:00
Charles Smith
bb41792de2
add menu.md, make index.md command line reference, update typos/minor errors in cli docs
...
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit f98f596c19
)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-08 15:31:22 -07:00
Sebastiaan van Stijn
67f4f5d2c4
rename desired_state filter to desired-state
...
For consistency with other filters (such as
"is-official"), this renames the desired_state
filter to "desired-state".
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit d761719eb4
)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-08 15:31:22 -07:00
Nicola Kabar
6387822594
[Docs] clarified local volume driver docs
...
Signed-off-by: Nico <nicolaka@gmail.com>
(cherry picked from commit 841f985994
)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-08 15:31:22 -07:00
Aaron Lehmann
8a18eac752
Add documentation for external CA features in API/CLI
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
(cherry picked from commit fa147591ed
)
2016-07-01 00:40:48 -07:00
allencloud
49981f8327
make cmd short short consistency and change docs
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
(cherry picked from commit 184afb92bf
)
2016-06-30 17:11:29 -07:00
Harald Albers
4476697867
add documentation for desired_state filter
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 36f57f7d02
)
2016-06-30 16:47:53 -07:00
allencloud
a3b8c1a80e
uppercase output in node inspect to keep consistency
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
(cherry picked from commit 89582e1a34
)
2016-06-30 16:47:50 -07:00
orkaa
d4cdc5172c
For the lulz! (evalulate -> evaluate)
...
Signed-off-by: orkaa <orkica@gmail.com>
(cherry picked from commit 1bdbfa5770
)
2016-06-30 16:47:45 -07:00
Shishir Mahajan
16274ba940
PR 19367 doc change: Mention supported drivers for --storage-opt size option in docker create/run.
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
(cherry picked from commit fe6416d04f
)
2016-06-30 16:47:41 -07:00
Charles Smith
3f276b58a5
update docker swarm cli
...
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit 78ebfaff1a
)
2016-06-30 16:47:39 -07:00
Charles Chan
fe2a9bea38
Update help output to match Docker 1.11.
...
* Also touch up headings.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
(cherry picked from commit 17ae6539f6
)
2016-06-18 20:58:25 -07:00
Sebastiaan van Stijn
d5c89ec65e
Add initial "service" docs
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit f565bc7ec9
)
2016-06-18 20:58:23 -07:00
Charles Smith
aa1f241894
update output for node commands, minor edits
...
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit 3b2132c2c7
)
2016-06-16 23:36:59 -07:00
Tonis Tiigi
ab6abb799b
Add cert-expiry to swarm update
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 7d8d51aa9d
)
2016-06-16 23:36:58 -07:00
Sebastiaan van Stijn
fdb5324595
Update docker info output example
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 07e1c62bf4
)
2016-06-16 23:36:56 -07:00
Sebastiaan van Stijn
c73e56fd7f
docs: move "advisory" to general metadata
...
the advisory option should not be
below "menu"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit aadd88c306
)
2016-06-16 23:36:55 -07:00
Arnaud Porterie
2e9aac59e2
Merge pull request #23553 from icecrime/heartbeat_as_duration
...
Make `--dispatcher-heartbeat-period` a duration
2016-06-15 02:36:17 +00:00
Arnaud Porterie (icecrime)
e6e1fd5d06
Make --dispatcher-heartbeat-period
a duration
...
Make `--dispatcher-heartbeat-period` a duration in `docker swarm
update`, allowing to express the value as "5s", "1h", etc.
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
2016-06-14 18:10:49 -07:00
Arnaud Porterie
e087ba4633
Merge pull request #23548 from vieux/no_more_reject
...
no more 'docker node reject' in docs
2016-06-15 00:43:58 +00:00
Brian Goff
6ed921dc38
Merge pull request #23446 from tiborvass/plugins-experimental
...
Plugins: experimental support for new plugin management
2016-06-14 20:32:14 -04:00
Sebastiaan van Stijn
e79873c27c
docker plugin commandline reference
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-14 15:50:00 -07:00
Michael Crosby
c97fdbe3c5
Merge pull request #23415 from aboch/ll
...
Allow user to specify container's link-local addresses
2016-06-14 15:47:54 -07:00
Victor Vieux
c21f861327
no more 'docker node reject' in docs
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-06-14 14:55:25 -07:00
Alessandro Boch
1c4efb6aa0
Allow user to specify container's link-local addresses
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-06-14 14:28:33 -07:00
Kenfe-Mickael Laventure
7b2e5216b8
Add support for multiples runtimes
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-06-14 07:47:31 -07:00
Sven Dowideit
2a96ac66ea
Merge pull request #23492 from londoncalling/docs-surface-tutorials-v1.12
...
surfacing Learn by example topics to top level of Docker Engine docs
2016-06-14 21:10:17 +10:00
Amit Shukla
9acf97b72a
CLI docs
...
Signed-off-by: Amit Shukla <amit.shukla@docker.com>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-06-13 22:17:15 -07:00
Victoria Bialas
8eca8089fa
surfacing Learn by example topics to top level of Docker Engine docs
...
fixing links after moving surfacing tutorials
fixing more links for the newly located tutorials
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-06-13 13:32:30 -07:00
Michael Crosby
8a2f9a249c
Merge pull request #22126 from dmcgowan/overlay-native-diff
...
Overlay multiple lower directory support
2016-06-13 13:15:39 -07:00
Derek McGowan
a546042b91
Add documentation for using overlay2
...
Add mention in dockerd command line and storage driver selection documentation.
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-06-13 11:06:47 -07:00
Charles Chan
0c3a4a1fcd
Add link to Docker Hub.
...
* To make it consistent with similar references in other parts of document.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
2016-06-11 14:31:53 -07:00
Sebastiaan van Stijn
1164f917fa
Merge pull request #23359 from londoncalling/docker-engine-overview
...
re-doing Docker Engine overview topics for v.1.12
2016-06-10 00:02:56 +02:00
Victoria Bialas
8bd33b430b
re-doing Docker Engine overview topics for v.1.12
...
fixed broken links created from Engine Overview update by adding missing topic to daemon reference page and updating the hrefs in the api pages
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-06-08 17:35:28 -07:00
Brian Goff
9db33b7646
Merge pull request #23377 from vdemeester/carry-pr-23007
...
Carry #23007 : Say something useful during docker load
2016-06-08 13:42:22 -04:00
Vincent Demeester
9b5e0ea7de
Update docker-load documentation
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-06-08 17:40:37 +02:00
Vincent Demeester
430950e2d1
Merge pull request #23305 from thaJeztah/fix-network-examples
...
network docs cleanup
2016-06-08 17:32:00 +02:00
Sebastiaan van Stijn
7c46ba02e6
add support for filtering by network ID
...
This adds support for filtering by network ID, to be
consistent with other filter options.
Note that only *full* matches are returned; this is
consistent with other filters (e.g. volume), that
also return full matches only.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-07 16:50:31 +02:00
Sainath Grandhi
912af1ae8f
Adding network filter to docker ps command
...
Signed-off-by: Sainath Grandhi <sainath.grandhi@intel.com>
2016-06-07 16:43:11 +02:00
Yong Tang
2e506039ff
Fix a couple of typos in the docs of docker attach
...
This fix fixed a couple of typos in the docs of `docker attach`:
docs/reference/commandline/attach.md
man/docker-attach.1.md
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-06-06 19:06:50 -07:00
Sebastiaan van Stijn
feabf71dc1
network docs cleanup
...
This fixes some Markup and formatting
issues in the network documentation;
- wrap text to 80 chars
- add missing language hints for code examples
- add missing line continuations (\)
- update USAGE output for Cobra
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-06 14:20:41 +02:00
Sebastiaan van Stijn
ac14aa11b6
Merge pull request #23293 from mountkin/network-docs
...
docs: correct network create command
2016-06-06 12:07:23 +02:00
Shijiang Wei
041aad6d72
docs: correct network create command
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2016-06-06 13:50:29 +08:00
Yong Tang
5667365ed1
Fix a couple of typos in docker attach docs.
...
This fix fixes a couple of typos in docker attach docs:
docs/reference/commandline/attach.md
man/docker-attach.1.md
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-06-05 14:03:23 -07:00
Brian Goff
ad8d0c9a8b
Merge pull request #23244 from LK4D4/no_interface
...
attach: replace interface with simple type
2016-06-03 22:03:11 -04:00