Commit Graph

267 Commits

Author SHA1 Message Date
4183fa25d5 Remove "-rc" from documentation
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 4f7b731a26bf43c03687fab35c2f30cfd827bade
Component: engine
2016-08-05 01:38:18 +02:00
e2da5928d4 Merge pull request #25358 from lixiaobing10051267/masterBe
Remove reduntant word in device-mapper-driver.md
Upstream-commit: 5c9bcaa9421699eb39df59cf12f9404bd4ebec82
Component: engine
2016-08-03 10:21:39 +02:00
8c12ea3017 Remove reduntant word in device-mapper-driver.md
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 96c959ec6b80ff11c8dc8f6d9105b19b9c80899a
Component: engine
2016-08-03 16:13:44 +08:00
aa7e6b8845 Update usage of "Swarm" for consistency
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f0230049f0afd318217c60ebe486aab3b54538fd
Component: engine
2016-07-27 23:31:55 +02:00
3bf48fb858 fix the ipaddress of an explanation.
Signed-off-by: mapk0y <mapk0y@gmail.com>
Upstream-commit: a94b48923e8ec7a5e9ebe6101f0ccac208fb4f25
Component: engine
2016-07-27 03:17:32 +09:00
1c3431e16a fix typos
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 4e959ef2f7f063803d04e06166f459257eb94b5c
Component: engine
2016-07-23 11:32:23 +08:00
a4c4731dc9 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>
Upstream-commit: c0c7d5e71586ec8e4d54aef9e061f061e9223cc4
Component: engine
2016-07-12 13:01:35 -07:00
a7e56d2212 Merge pull request #24239 from ardnaxelarak/24130_clean_up_docs
[Docs code snippets] Make it obvious what is command what is result
Upstream-commit: c9e739011574f3b3fb0a1f450e69304b6dbdabf6
Component: engine
2016-07-11 08:26:30 -07:00
0bdbf282f3 Fix spelling in comments, strings and documentation
Signed-off-by: Otto Kekäläinen <otto@seravo.fi>
Upstream-commit: 644a7426cc31c338fedb6574d2b88d1cc2f43a08
Component: engine
2016-07-03 20:58:11 +03:00
90002d7a0a Add blanks lines in docs for clarity
Signed-off-by: Kara Alexandra <kalexandra@us.ibm.com>
Upstream-commit: d0737e9ac0bfcbac0e212d157ab305e561eea3ee
Component: engine
2016-07-01 11:40:22 -07:00
169947bdeb fix warn message typos
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: a4143e6756d697323d560396dff6b90168a1e56c
Component: engine
2016-06-30 15:17:37 +02:00
ac805da5d2 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>
Upstream-commit: 2aa01e0fbc76ecb8cf1a1b608e254e6cb8821ff7
Component: engine
2016-06-30 14:57:46 +08:00
28815bb149 update storagedriver/zfs-driver.md for Ubuntu 16.04 LTS
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: ddf9b6f6666d501bc408bdf8cdc4feb10db287ed
Component: engine
2016-06-28 06:11:03 +00:00
7c1b9df9b0 Merge pull request #23853 from docker/linkchecker-updates
Removing some url links that can be resolved using src markdown links
Upstream-commit: 563973a183bc100e78688f3b5e7b2244c341700a
Component: engine
2016-06-23 12:34:45 -07:00
7656eec977 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>
Upstream-commit: a54c3fbb8aa024c477864a0614506da3ea185839
Component: engine
2016-06-22 09:48:59 -07:00
9bfdf60ca3 Removing some url links that can be resolved using src markdown links
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 01f9cbc3663cf134ca427e4f8b98bba637f6655e
Component: engine
2016-06-22 12:50:51 +00:00
425fb8faf5 Fix the missing 'ls'
Signed-off-by: Kai Qiang Wu(Kennan) <wkq5325@gmail.com>
Upstream-commit: cbd240581f274c3599efb1c43b01cb61607c79d0
Component: engine
2016-06-22 08:40:35 +00:00
75f31f238e Merge pull request #23757 from AkihiroSuda/overlay2doc
Add overlay2 description to overlayfs-driver.md
Upstream-commit: 96e3f3e2d040c0b5120efd5bee994b13d44f8087
Component: engine
2016-06-21 14:06:57 +02:00
1555ddd988 Fix some doc typos and spacings
Signed-off-by: Kevin Jing Qiu <kevin@idempotent.ca>
Upstream-commit: 3b2ee9a704f1e3974dbb9ce857886d5e377580ab
Component: engine
2016-06-20 23:54:36 -07:00
b721dee70b Add overlay2 description to overlayfs-driver.md
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 8625adbd67f08f2da7816d0ce9d2e9267f7a4f6b
Component: engine
2016-06-21 06:18:56 +00:00
f1b4ff8de1 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>
Upstream-commit: 1cb7fb4d2e53c0f9c709cddc1339958b18e619fa
Component: engine
2016-06-19 08:50:13 -07:00
e7f24f4bb5 href links are not converted from file.md by hugo
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: ad1819ca1d56a0e2caae2f0f28d14a456686e00b
Component: engine
2016-06-18 12:44:38 +00:00
9b853ff739 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>
Upstream-commit: 5bc730eda76351ab669a60a5fc95fd273e399d88
Component: engine
2016-06-17 14:46:35 -07:00
b2d3f0c2e7 Merge pull request #23492 from londoncalling/docs-surface-tutorials-v1.12
surfacing Learn by example topics to top level of Docker Engine docs
Upstream-commit: 2a96ac66ea41d206161a6ef022e10d53f99e86ec
Component: engine
2016-06-14 21:10:17 +10:00
ce19593c15 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>
Upstream-commit: 8eca8089fa35f652060e86906166dabc42e556f8
Component: engine
2016-06-13 13:32:30 -07:00
7bec8a2e7d Merge pull request #22126 from dmcgowan/overlay-native-diff
Overlay multiple lower directory support
Upstream-commit: 8a2f9a249c28c0a80bac4b41eb318dfe68f63f0d
Component: engine
2016-06-13 13:15:39 -07:00
f7c1d79a55 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)
Upstream-commit: a546042b91f655c7cf53484cdb0c5c8b3cf12d33
Component: engine
2016-06-13 11:06:47 -07:00
a49a6cbc00 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>
Upstream-commit: feabf71dc1cd5757093c5887b463a6cbcdd83cc2
Component: engine
2016-06-06 14:20:41 +02:00
f36b50a0ec docs validation fixes
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 0cddc783cff152a383a109f70a9f7bc943dbb5ba
Component: engine
2016-06-03 21:43:45 +00:00
5578aba972 Merge pull request #23193 from allencloud/fix-typos
use grep to find all a/an typos
Upstream-commit: 98c245c9e63793cf8ca03c5500e0820447c1861c
Component: engine
2016-06-02 18:45:08 -07:00
35c5774373 fix typos
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: c1be45fa38e82054dcad606d71446a662524f2d5
Component: engine
2016-06-02 17:17:22 +08:00
e85968bd52 aufs,overlay: disable on eCryptfs
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 5e85ec82af6c8ec70ed39fd8489aea730fd41561
Component: engine
2016-06-01 21:00:35 +03:00
5eadce41df Merge pull request #22987 from Microsoft/jjh/labeldocs
Docs: Label clarification
Upstream-commit: bb80563a8123824bed23c36698e6fa01317bbe5f
Component: engine
2016-05-25 20:56:54 +02:00
1031d8bb5e Docs: Label clarification
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: b2643b6953e59549eba8af51a7e783a3e4cebc46
Component: engine
2016-05-25 11:48:07 -07:00
7098114aac docs: update graphdriver compatibility matrix
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: a7bf4e4832c216bdbc9fc678262bcd2c081e914b
Component: engine
2016-05-25 18:33:45 +00:00
e79985ff9b Re-apply changes made in 24ec73f
Signed-off-by: Matt Bentley <matt.bentley@docker.com>
Upstream-commit: 0b8ea4387a3b1e415a49b9c6dbead858891a5ce9
Component: engine
2016-05-25 08:46:39 -04:00
0f6a9d4e70 Fix thin pool devicemapper docs overwritten
Signed-off-by: Matt Bentley <matt.bentley@docker.com>
Upstream-commit: 79205c3f061c4b690a459cb2b08b6a7df7af327c
Component: engine
2016-05-25 08:45:51 -04:00
45541eb90b 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>
Upstream-commit: 55b172401851a6338a325ef7930d50ace9efb067
Component: engine
2016-05-21 13:19:05 -07:00
fac63eb804 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>
Upstream-commit: 5fb7f9b29e9a85f36d02c4ecec6c04498fdb4315
Component: engine
2016-05-18 20:10:31 +02:00
fb7a3051cb 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>
Upstream-commit: 414b9dea8a1bf7ef7a4b9584dd887c51b49751d4
Component: engine
2016-05-14 16:58:18 -07:00
1263382883 Small fix in images and containers docs
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
Upstream-commit: d0ab1c360f5af7b92ab3f414e42ad817e0bd3059
Component: engine
2016-05-14 16:09:49 +02:00
fb0e9a9733 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>
Upstream-commit: 5154856586eb0f81e7c3935448ed163c60b1a24d
Component: engine
2016-05-13 15:41:45 +02:00
cc4806d5b5 Clarify that --ip does not work with IPv6 in docker run
Closes docker/docker#22707

Signed-off-by: Tim Düsterhus <tim@bastelstu.be>
Upstream-commit: f6ecba104556f4c68b8ad11ee8c2e6b2a27b87ff
Component: engine
2016-05-12 23:19:46 +02:00
c427081daf remove trailing comma from top command
Signed-off-by: objectified <objectified@gmail.com>
Upstream-commit: c7e738d641e83ab955be423b70b9ed364dba9637
Component: engine
2016-05-05 13:18:23 +02:00
16a8047841 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>
Upstream-commit: a7b2f87b0637a3711e90c0f1d0a99dd5d32bd60f
Component: engine
2016-05-04 12:32:14 -07:00
820803730c Merge pull request #22386 from wenchma/dockerd
Update the `docker daemon` to `dockerd` for document
Upstream-commit: 1c1947dd29def10260e61688112eeac665761ace
Component: engine
2016-05-04 15:07:53 +02:00
f77b6d2fb7 fix typo
fix typo

Signed-off-by: Qizhao Yang <windfarer@gmail.com>
Upstream-commit: 176e9e2ffc192862f104b13bdf651551c1e492f1
Component: engine
2016-05-04 19:18:38 +08:00
dab6ceb6f9 Merge pull request #21945 from rhvgoyal/export-min-free-space
Export Mininum Thin Pool Free Space through docker info
Upstream-commit: 227c83826aafbbcb3235d75cf7ab58392e552a83
Component: engine
2016-05-02 20:20:08 -04:00
79ba4ce6e9 Update the docker daemon to dockerd for document
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 24ec73f754da16e37726a3f1c6a59de508e255fc
Component: engine
2016-04-29 09:06:02 +08:00
507bf1ac80 Fix typo
Signed-off-by: Sylvain Bellemare <sylvain@ascribe.io>
Upstream-commit: 63aa03ce0a9d2390f684da3403c1cd0e004592d1
Component: engine
2016-04-28 15:15:08 +02:00