Commit graph

604 commits

Author SHA1 Message Date
Vincent Demeester
75923481d7 Merge pull request #24179 from nicolaka/master
[Docs] added nfs docs
2016-07-01 12:38:57 +02:00
Aaron Lehmann
fa147591ed Add documentation for external CA features in API/CLI
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-06-30 18:08:57 -07:00
Sebastiaan van Stijn
d761719eb4 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>
2016-06-30 14:49:46 -07:00
Charles Smith
f98f596c19 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>
2016-06-30 14:30:11 -07:00
Nicola Kabar
841f985994 [Docs] clarified local volume driver docs
Signed-off-by: Nico <nicolaka@gmail.com>
2016-06-30 14:15:44 -07:00
allencloud
184afb92bf make cmd short short consistency and change docs
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-06-30 21:17:51 +08:00
Harald Albers
36f57f7d02 add documentation for desired_state filter
Signed-off-by: Harald Albers <github@albersweb.de>
2016-06-29 08:27:25 -07:00
allencloud
89582e1a34 uppercase output in node inspect to keep consistency
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-06-27 18:29:27 +08:00
orkaa
1bdbfa5770 For the lulz! (evalulate -> evaluate)
Signed-off-by: orkaa <orkica@gmail.com>
2016-06-23 16:26:43 +02:00
Sven Dowideit
d82e82a827 Merge pull request #23657 from neilpeterson/nepeters-docs-configfile
Added daemon.json Windows example
2016-06-21 21:07:19 +10:00
Shishir Mahajan
fe6416d04f 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>
2016-06-20 22:27:02 -04:00
Vincent Demeester
bfff4cce67 Merge pull request #23696 from sfsmithcha/check_swarm_cli
update docker swarm cli
2016-06-20 15:40:06 +02:00
Sven Dowideit
daedbc60d6 Add the advisory=rc metadata
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-06-20 11:54:53 +00:00
Sebastiaan van Stijn
37ee14a998
remove "RC" warning from Markdown files
A site-wide banner is going to be used, so we don't need this warning

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-20 00:24:37 -07:00
Charles Chan
17ae6539f6 Update help output to match Docker 1.11.
* Also touch up headings.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
2016-06-18 13:47:12 -07:00
Sebastiaan van Stijn
f565bc7ec9
Add initial "service" docs
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-17 17:28:24 -07:00
Charles Smith
78ebfaff1a update docker swarm cli
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-06-17 15:40:43 -07:00
Charles Smith
3b2132c2c7 update output for node commands, minor edits
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-06-16 21:44:07 -07:00
Neil Peterson
8352089e8c Added daemon.json Windows example
Signed-off-by: Neil Peterson <neilpeterson@outlook.com>
2016-06-16 21:41:58 -07:00
Arnaud Porterie
f52c807650 Merge pull request #23651 from tonistiigi/cert-expiry
Add cert-expiry to swarm update
2016-06-17 02:50:58 +00:00
Tonis Tiigi
7d8d51aa9d Add cert-expiry to swarm update
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-06-16 18:06:02 -07:00
Sebastiaan van Stijn
07e1c62bf4
Update docker info output example
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-16 16:29:23 -07:00
Sebastiaan van Stijn
aadd88c306
docs: move "advisory" to general metadata
the advisory option should not be
below "menu"

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-16 11:52:34 -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