Commit Graph

263 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
798e0b07cb Update usage of "Swarm" for consistency
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit f0230049f0afd318217c60ebe486aab3b54538fd)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 17:56:43 -07:00
Sebastiaan van Stijn
4b9b07f281 Merge pull request #25425 from thaJeztah/remove-rc-suffix
Remove "-rc" from documentation
(cherry picked from commit 9513aa3a48b6d4d7d612ddbdc097495bf48d9572)

Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 16:32:22 -07:00
Sebastiaan van Stijn
85b9530e26 Merge pull request #25358 from lixiaobing10051267/masterBe
Remove reduntant word in device-mapper-driver.md
(cherry picked from commit 5c9bcaa9421699eb39df59cf12f9404bd4ebec82)

Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 16:32:19 -07:00
mapk0y
b7e1ea51a0 fix the ipaddress of an explanation.
Signed-off-by: mapk0y <mapk0y@gmail.com>
(cherry picked from commit a94b48923e8ec7a5e9ebe6101f0ccac208fb4f25)
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-07-27 20:40:26 +10:00
allencloud
4cd455a8d9 fix typos
Signed-off-by: allencloud <allen.sun@daocloud.io>
(cherry picked from commit 4e959ef2f7f063803d04e06166f459257eb94b5c)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 23:18:15 -07:00
Arnaud Porterie (icecrime)
c61fa33c23 Rename --net to --network
Add a `--network` flag which replaces `--net` without deprecating it
yet. The `--net` flag remains hidden and supported.

Add a `--network-alias` flag which replaces `--net-alias` without deprecating
it yet. The `--net-alias` flag remains hidden and supported.

Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
(cherry picked from commit c0c7d5e71586ec8e4d54aef9e061f061e9223cc4)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-12 15:50:38 -07:00
Kara Alexandra
e0960bd8e7 Add blanks lines in docs for clarity
Signed-off-by: Kara Alexandra <kalexandra@us.ibm.com>
(cherry picked from commit d0737e9ac0bfcbac0e212d157ab305e561eea3ee)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-12 15:43:39 -07:00
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 644a7426cc31c338fedb6574d2b88d1cc2f43a08)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-08 15:31:42 -07:00
Antonio Murdaca
b375ccfee7 fix warn message typos
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
(cherry picked from commit a4143e6756d697323d560396dff6b90168a1e56c)
2016-06-30 17:12:37 -07:00
Lei Jitang
bb09b3e5f1 Remove dm.no_warn_on_loop_devices in info warning
I think we doesn't provide dm.no_warn_on_loop_devices option
at all. I didn't found any code to handle this option.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
(cherry picked from commit 2aa01e0fbc76ecb8cf1a1b608e254e6cb8821ff7)
2016-06-30 16:58:15 -07:00
Akihiro Suda
cab4e108c8 update storagedriver/zfs-driver.md for Ubuntu 16.04 LTS
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
(cherry picked from commit ddf9b6f6666d501bc408bdf8cdc4feb10db287ed)
2016-06-30 16:47:52 -07:00
Sven Dowideit
eaf5b17592 Removing some url links that can be resolved using src markdown links
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
(cherry picked from commit 01f9cbc3663cf134ca427e4f8b98bba637f6655e)
2016-06-30 16:47:46 -07:00
David M. Karr (fullname at gmail.com)
6de8049ab5 Update work-with-networks.md
The value of the Subnet and Gateway properties didn't match the command-line argument.

Signed-off-by: David M. Karr <davidmichaelkarr@gmail.com>
(cherry picked from commit a54c3fbb8aa024c477864a0614506da3ea185839)
2016-06-30 16:47:46 -07:00
Kai Qiang Wu(Kennan)
db4153cc90 Fix the missing 'ls'
Signed-off-by: Kai Qiang Wu(Kennan) <wkq5325@gmail.com>
(cherry picked from commit cbd240581f274c3599efb1c43b01cb61607c79d0)
2016-06-30 16:47:43 -07:00
Akihiro Suda
ba77356d98 Add overlay2 description to overlayfs-driver.md
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
(cherry picked from commit 8625adbd67f08f2da7816d0ce9d2e9267f7a4f6b)
2016-06-30 16:47:42 -07:00
Kevin Jing Qiu
c7d35daad8 Fix some doc typos and spacings
Signed-off-by: Kevin Jing Qiu <kevin@idempotent.ca>
(cherry picked from commit 3b2ee9a704f1e3974dbb9ce857886d5e377580ab)
2016-06-30 16:47:40 -07:00
Yong Tang
abb6e38208 Fix reference link error in Jenkins docs failure
This fix fixes one of the Jenkins docs failure:
https://jenkins.dockerproject.org/job/docs-docker-pr/9754/

There are 7 errors. This fix addresses one:
`* link error: (in page engine/userguide/storagedriver/device-mapper-driver.md) ../../reference/commandline/dockerd/#storage-driver-options`

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
(cherry picked from commit 1cb7fb4d2e53c0f9c709cddc1339958b18e619fa)
2016-06-30 16:47:37 -07:00
Sven Dowideit
d546db33ff href links are not converted from file.md by hugo
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
(cherry picked from commit ad1819ca1d56a0e2caae2f0f28d14a456686e00b)
2016-06-18 20:58:24 -07:00
Victoria Bialas
d1c91b41e1 install mac and win pared down, link to d4mac, d4win, getting started improved, added menu.md's
fixing links to d4mac and d4win

updates per @Sven and @theJeztah, fixing links, typos, menu definitions, etc.

updates per Sven's comments in the PR

removed duplicate line in tutorials menu.md

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
(cherry picked from commit 5bc730eda76351ab669a60a5fc95fd273e399d88)
2016-06-18 20:58:23 -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
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
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
Sven Dowideit
0cddc783cf docs validation fixes
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-06-03 21:43:45 +00:00
Sven Dowideit
98c245c9e6 Merge pull request #23193 from allencloud/fix-typos
use grep to find all a/an typos
2016-06-02 18:45:08 -07:00
allencloud
c1be45fa38 fix typos
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-06-02 17:17:22 +08:00
unclejack
5e85ec82af aufs,overlay: disable on eCryptfs
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2016-06-01 21:00:35 +03:00
Sebastiaan van Stijn
bb80563a81 Merge pull request #22987 from Microsoft/jjh/labeldocs
Docs: Label clarification
2016-05-25 20:56:54 +02:00
John Howard
b2643b6953 Docs: Label clarification
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-05-25 11:48:07 -07:00
Sven Dowideit
a7bf4e4832 docs: update graphdriver compatibility matrix
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-05-25 18:33:45 +00:00
Matt Bentley
0b8ea4387a Re-apply changes made in 24ec73f
Signed-off-by: Matt Bentley <matt.bentley@docker.com>
2016-05-25 08:46:39 -04:00
Matt Bentley
79205c3f06 Fix thin pool devicemapper docs overwritten
Signed-off-by: Matt Bentley <matt.bentley@docker.com>
2016-05-25 08:45:51 -04:00
Yong Tang
55b1724018 Fix a typos in docs of networking guide
This fix fixes a typo in the documentation (`dockernetworks.md`)
of networking user guide.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-05-21 13:19:05 -07:00
Sebastiaan van Stijn
5fb7f9b29e Suppress "IPv4 forwarding" warning for --net=host
Containers using the host network stack (--net=host)
are not affected by "ip-forwarding" being disabled,
so there's not need to show a warning.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-05-18 20:10:31 +02:00
Yong Tang
414b9dea8a Fix a typo in work-with-networks.md
This fix fixes a typo in the documentation of `work-with-networks.md`.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-05-14 16:58:18 -07:00
Tomasz Kopczynski
d0ab1c360f Small fix in images and containers docs
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
2016-05-14 16:09:49 +02:00
Sebastiaan van Stijn
5154856586 Fix Markdown formatting in Devicemapper docs
Fixes some text being presented as "code".

Also reformatted/wrapped some text and examples

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-05-13 15:41:45 +02:00
Tim Düsterhus
f6ecba1045 Clarify that --ip does not work with IPv6 in docker run
Closes docker/docker#22707

Signed-off-by: Tim Düsterhus <tim@bastelstu.be>
2016-05-12 23:19:46 +02:00
objectified
c7e738d641 remove trailing comma from top command
Signed-off-by: objectified <objectified@gmail.com>
2016-05-05 13:18:23 +02:00
Chun Chen
a7b2f87b06 Add docs about how to extend devicemapper thin pool
Signed-off-by: Chun Chen <ramichen@tencent.com>

Update to device mapper
Entering comments

Signed-off-by: Mary Anthony <mary@docker.com>
2016-05-04 12:32:14 -07:00
Vincent Demeester
1c1947dd29 Merge pull request #22386 from wenchma/dockerd
Update the `docker daemon` to `dockerd` for document
2016-05-04 15:07:53 +02:00
Eric Yang
176e9e2ffc fix typo
fix typo

Signed-off-by: Qizhao Yang <windfarer@gmail.com>
2016-05-04 19:18:38 +08:00
Brian Goff
227c83826a Merge pull request #21945 from rhvgoyal/export-min-free-space
Export Mininum Thin Pool Free Space through docker info
2016-05-02 20:20:08 -04:00
Wen Cheng Ma
24ec73f754 Update the docker daemon to dockerd for document
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-04-29 09:06:02 +08:00
Sylvain Bellemare
63aa03ce0a Fix typo
Signed-off-by: Sylvain Bellemare <sylvain@ascribe.io>
2016-04-28 15:15:08 +02:00
Vivek Goyal
55a9b8123d Export Mininum Thin Pool Free Space through docker info
Right now there is no way to know what's the minimum free space threshold
daemon is applying. It would be good to export it through docker info and
then user knows what's the current value. Also this could be useful to
higher level management tools which can look at this value and setup their
own internal thresholds for image garbage collection etc.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
2016-04-21 15:42:23 +00:00
David Calavera
01dd64cd10 Merge pull request #22193 from panyufeng920/master
optimise docs
2016-04-21 08:38:27 -07:00
搏通
9abf304c25 optimise docs
Signed-off-by: 搏通 <yufeng.pyf@alibaba-inc.com>
2016-04-21 09:34:28 +08:00
Chun Chen
b21d90c28f Add docs about how to extend devicemapper thin pool
Signed-off-by: Chun Chen <ramichen@tencent.com>
2016-04-20 10:49:51 +08:00