Sebastiaan van Stijn
fa29ecbceb
Merge pull request #22987 from Microsoft/jjh/labeldocs
...
Docs: Label clarification
(cherry picked from commit bb80563a81
2016-05-25 21:34:21 +02:00
Vincent Demeester
c70c8f1ed9
Merge pull request #22928 from friism/patch-3
...
remove duplicated text
(cherry picked from commit bf7bae9662
2016-05-25 21:34:11 +02:00
Vincent Demeester
4efcbf5784
Merge pull request #22906 from nshalman/patch-1
...
Clarification about 'docker build --build-arg'
(cherry picked from commit ce07eac570
2016-05-25 21:34:02 +02:00
Vincent Demeester
9114864ace
Merge pull request #22900 from AkihiroSuda/fix22020
...
update docs/reference/commandline/cp.md
(cherry picked from commit 6a385a0022
2016-05-25 21:33:55 +02:00
Sebastiaan van Stijn
0626fa4555
Merge pull request #22885 from yongtang/05212016-typo-in-dockernetworks-md
...
Fix a typos in docs of networking guide
(cherry picked from commit c0c36bc150
2016-05-25 21:33:49 +02:00
Sebastiaan van Stijn
d41cd45c3d
Merge pull request #22876 from Microsoft/jjh/docsclarification
...
Docs: JSON vs Shell clarification
(cherry picked from commit e3079b4704
2016-05-25 21:33:41 +02:00
Sebastiaan van Stijn
a9f9a79d5c
Merge pull request #22839 from thaJeztah/update-selinux-example
...
Remove MLS example from SELinux example in run reference
(cherry picked from commit 74ee26cceb
2016-05-25 21:33:33 +02:00
Sebastiaan van Stijn
08f1f62f41
Merge pull request #22821 from zunayed/patch-1
...
fix duplicate command in uninstall instructions
(cherry picked from commit 1691fe6d23
2016-05-25 21:33:26 +02:00
Vincent Demeester
e47de0ba4d
Merge pull request #22778 from DoraALin/10972-docs-Support-for-non-proxied-private-registry
...
doc:http pkg variables info added in pull cmd
(cherry picked from commit 9751170f08
2016-05-25 21:33:19 +02:00
Vincent Demeester
e3007c51a5
Merge pull request #22768 from mansinahar/run-cmd-doc
...
Update 'run' command doc for better readability. Issue:#22721
(cherry picked from commit 28a436af36
2016-05-25 21:33:12 +02:00
Vincent Demeester
4971a81f75
Merge pull request #22757 from gondor/master
...
Documentation: Updated URL to plugin reference - docker-volume-netshare
(cherry picked from commit 37dfd8bc8c
2016-05-25 21:33:04 +02:00
Sebastiaan van Stijn
b42d833cd8
Merge pull request #22751 from igrcic/docs-small-typo-reference-attach
...
remove double "using" in reference attach docs
(cherry picked from commit 6e12d0720f
2016-05-25 21:32:44 +02:00
Sebastiaan van Stijn
281f0fa53b
Merge pull request #22743 from yongtang/05142016-typo-in-work-with-networks
...
Fix a typo in work-with-networks.md
(cherry picked from commit e333675cd7
2016-05-25 21:28:47 +02:00
Vincent Demeester
36ada7d158
Merge pull request #22742 from yongtang/05142016-update-deprecated-docs-for-LXC-built-in-exec-driver
...
Update deprecated docs for LXC built-in exec driver
(cherry picked from commit 1bcc42e038
2016-05-25 21:28:36 +02:00
Sebastiaan van Stijn
307195b3e1
Merge pull request #22727 from clawconduce/master
...
Fix error for env variables example in docker reference
(cherry picked from commit 3723b88406
2016-05-25 21:28:29 +02:00
Vincent Demeester
d1024638f9
Merge pull request #22720 from thaJeztah/fix-markdown
...
Fix Markdown formatting in Devicemapper docs
(cherry picked from commit 2f94a367d7
2016-05-25 21:28:21 +02:00
Sebastiaan van Stijn
9396307501
Merge pull request #22661 from SvenDowideit/update-compatibility-matrix
...
docs: update graphdriver compatibility matrix
(cherry picked from commit a5e4aaaf71
2016-05-25 21:28:12 +02:00
Sven Dowideit
54a58f9886
Merge pull request #22711 from thaJeztah/docs-cherry-picks
...
Docs cherry picks
2016-05-13 21:40:22 +10:00
Vincent Demeester
ab595882e3
Merge pull request #22689 from thaJeztah/docs-update-menu-order
...
docs: update menu order in security section
(cherry picked from commit 24a0f1f3e8
2016-05-13 01:58:41 +02:00
Sebastiaan van Stijn
fcd432d110
Merge pull request #22707 from TimWolla/patch-1
...
User network does not work with IPv6
(cherry picked from commit ab090291dd
2016-05-13 01:34:23 +02:00
Vincent Demeester
77efb507b3
Merge pull request #22694 from allencloud/fix-typos-in-docs
...
docs: correct some typos
(cherry picked from commit 475c37dd66
2016-05-13 01:34:07 +02:00
Vincent Demeester
c23ad97de5
Merge pull request #22687 from haoshuwei/fix-docs-securitymd
...
Fixing security.md
(cherry picked from commit edf5e097a2
2016-05-13 01:33:17 +02:00
Sebastiaan van Stijn
b28e6b7eda
Merge pull request #22683 from npcode/docs-no-request-status
...
docs: Remove RequestStatusCode
(cherry picked from commit 2ae863c28f
2016-05-13 01:33:08 +02:00
Sven Dowideit
785665203d
Merge pull request #22672 from kevinmeredith/correct_trapped_signals
...
Correct docs for a docker container's clean-up.
(cherry picked from commit c273163e80
2016-05-13 01:33:00 +02:00
Vincent Demeester
36a62de41f
Merge pull request #22669 from thaJeztah/docs-update-seccomp-whitelist
...
docs: update seccomp whitelist
(cherry picked from commit 4c654eeea2
2016-05-13 01:32:53 +02:00
Sebastiaan van Stijn
e7d0711142
Merge pull request #22666 from yongtang/05112016-update-deprecated-docs-cli-flags
...
Update deprecated docs for cli flags removal.
(cherry picked from commit 3710f9074e
2016-05-13 01:32:45 +02:00
Sebastiaan van Stijn
6e916fca02
Merge pull request #22579 from jfrazelle/docs-add-security-non-events
...
docs: add security non-events
(cherry picked from commit a14e85c40d
2016-05-13 01:32:32 +02:00
Sven Dowideit
bfe58ad819
Merge pull request #22662 from thaJeztah/docs-cherry-picks
...
Docs cherry picks
2016-05-11 23:07:33 +10:00
Tonis Tiigi
8d485949d6
docs: clarify docker attach
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit da1dbd2093
2016-05-11 14:41:23 +02:00
Yong Tang
7e83ae34dc
Add the missing subtitle in deprecated docs for --security-opt.
...
The colon separator(`:`) of `--security-opt` flag was deprecated
in 1.11.0. However, the subtitle in deprecated docs is missing
so it is placed under the same subtitle as the deprecated `-e` and
`--email` flags.
This fix adds the missing subtitle in deprecated docs.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
(cherry picked from commit 018c22880d
2016-05-11 14:41:16 +02:00
Yuan Sun
ef76dd0761
from inheritted to inherited
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
(cherry picked from commit fe1130b7ba
2016-05-11 14:41:08 +02:00
Lars Kellogg-Stedman
b706ee90ca
docs: note requirements for systemd drop-in filenames
...
the documentations says that you can drop "a file" into the
`docker.service.d` directory, but does not note that the file must end
with `.conf` in order to be recognized by systemd. This can lead to
some [confusion][] if readers are not previously familiar with
systemd.
[confusion]: https://botbot.me/freenode/docker/2016-05-06/?msg=65605541&page=11
Signed-off-by: Lars Kellogg-Stedman <lars@redhat.com>
(cherry picked from commit 987b03054a
2016-05-11 14:41:01 +02:00
Sebastiaan van Stijn
2f4b69229a
docs: update supervisord example
...
This updates the supervisor example documentation
to use an up-to-date version of Ubuntu.
Also reduced the use of "royal We", and tweaked some
language.
Finally, added some language hints for code-highlighting.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit e38678e660
2016-05-11 14:40:54 +02:00
objectified
b34165ae37
remove trailing comma from top command
...
Signed-off-by: objectified <objectified@gmail.com>
(cherry picked from commit c7e738d641
2016-05-11 14:40:47 +02:00
Tomasz Kopczynski
cef1a10f5e
Docs: fixing typos in admin/supervisor
...
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
(cherry picked from commit 74d382ff8d
2016-05-11 14:40:39 +02:00
Doug Davis
2c531b4fb7
Remove unnecessary double-double quotes
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
(cherry picked from commit 8eb2188bd9
2016-05-11 14:40:30 +02:00
Eric Yang
8fc5559841
fix typo
...
fix typo
Signed-off-by: Qizhao Yang <windfarer@gmail.com>
(cherry picked from commit 176e9e2ffc
2016-05-11 14:40:19 +02:00
Liron Levin
ea8b5e07b6
Remove response modification sections from authorization design doc
...
Signed-off-by: Liron Levin <liron@twistlock.com>
(cherry picked from commit 638096431a
2016-05-11 14:38:20 +02:00
Chun Chen
3cf8c53515
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>
(cherry picked from commit a7b2f87b06
2016-05-11 14:07:59 +02:00
Vincent Demeester
15af7564cf
Merge pull request #22421 from thaJeztah/docs-cherry-picks
...
docs cherry-pick
2016-05-02 20:11:29 +02:00
Ben Firshman
340c9a4619
Remove out-of-date client libraries
...
For each language, if there is one library which is clearly the
best or most active, I've removed the other libraries so users
aren't mislead.
I've removed the web UIs because they're not really client
libraries.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
(cherry picked from commit bb94cfce62
2016-05-01 20:31:08 +02:00
Ben Firshman
3b2ed5b2df
Fix lasote/docker_client link
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
(cherry picked from commit 91fe274dcf
2016-05-01 20:30:52 +02:00
Yuan Sun
0b5c960bb0
remove "the" in docs.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
(cherry picked from commit 043c9ef076
2016-05-01 20:29:15 +02:00
Lorenzo Fontana
14a2985f37
Mention the fact that authz plugins are available today
...
Signed-off-by: Lorenzo Fontana <fontanalorenzo@me.com>
(cherry picked from commit 96cc1ee44c
2016-05-01 20:27:48 +02:00
Sebastiaan van Stijn
a1d16b4557
update API example response for docker events
...
the events API was rewritten in 723be0a3323932d46a78
2016-04-29 17:55:50 +02:00
Sebastiaan van Stijn
290e0ea54c
Merge pull request #22392 from thaJeztah/docs-cherry-picks-3
...
documentation cherry-picks
2016-04-28 16:57:08 +02:00
Sylvain Bellemare
5901eda4f7
Fix typo
...
Signed-off-by: Sylvain Bellemare <sylvain@ascribe.io>
(cherry picked from commit 63aa03ce0a
2016-04-28 15:28:40 +02:00
Hao Zhang
c2bea5ba26
update cgroup link in doc of run
...
Signed-off-by: Hao Zhang <21521210@zju.edu.cn>
(cherry picked from commit 8fec7c26d4
2016-04-28 13:32:11 +02:00
Sven Dowideit
4703824f00
Small API formating fix.
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
(cherry picked from commit 204a52c689
2016-04-28 13:32:00 +02:00
Sebastiaan van Stijn
4bf3f74126
docs: remove duplicate line in "Understand the architecture"
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 00e84ca4d2
2016-04-28 13:31:25 +02:00
