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
61122f748a
Merge pull request #23820 from ericbarch/master
...
Add missing words in the swarm docs
Upstream-commit: e770b80d80485e99cdfb8e25341a087624d13b3a
Component: engine
2016-06-22 11:58:09 +10:00
a75adf3964
Merge pull request #23797 from liubin/fix-typo
...
fix some typos
Upstream-commit: 4962fea757415087755d7683e73bc0c7c7a39921
Component: engine
2016-06-22 11:56:48 +10:00
be2677812e
Add missing words in the swarm docs
...
Signed-off-by: Eric Barch <barch@tomesoftware.com >
Upstream-commit: db158e9182f86adc721d6c401782983bfe51fd49
Component: engine
2016-06-21 08:28:59 -07:00
d011d97fca
Merge pull request #23816 from SvenDowideit/update-docker4-links
...
Now that the Docker4 links are online, we can use them
Upstream-commit: 96a58bdba833ebbbe59e47fd9b028766c5d46dfc
Component: engine
2016-06-21 23:04:43 +10:00
d37f26ec66
Now that the Docker4 links are online, we can use them
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 587d2f9d8132c4ba8cfa74e5f0f2ec3328fdf9b9
Component: engine
2016-06-21 12:55:41 +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
91c796ca73
Merge pull request #23657 from neilpeterson/nepeters-docs-configfile
...
Added daemon.json Windows example
Upstream-commit: d82e82a827e3292b90156008edfb86912047dd1d
Component: engine
2016-06-21 21:07:19 +10:00
d20da36e24
Merge pull request #23780 from shishir-a412ed/doc_update_PR19367
...
PR 19367 doc change: Mention supported drivers for --storage-opt size option in docker create/run.
Upstream-commit: 097d1a2b6186dcf1df8ae6135470871aca309a31
Component: engine
2016-06-21 12:09:47 +02:00
2f64d37d3f
Merge pull request #23781 from kevinjqiu/fix-doc-typo
...
Fix some doc typos
Upstream-commit: f3c9ba0bb06597294c51cff1c55512a764eaa2e1
Component: engine
2016-06-21 12:07:00 +02:00
ae46554957
Merge pull request #23778 from thaJeztah/sync_api-1.24-1.25
...
Sync API changes from 1.25 -> 1.24
Upstream-commit: d25cc581f7783a1664394df2506e246c99920ce8
Component: engine
2016-06-21 00:41:17 -07:00
5a4ecb85ca
Merge pull request #23770 from sfsmithcha/edit_swarm_concept
...
clarify swarm concept
Upstream-commit: 2753a5e9169074fd75ba954af2ec57f5ccb9caba
Component: engine
2016-06-21 00:29:49 -07:00
923b4bd8ef
fix some typos
...
Signed-off-by: bin liu <liubin0329@gmail.com >
Upstream-commit: 950073aabb305db6156709ea8509b1f72ff06f3b
Component: engine
2016-06-21 15:29:25 +08: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
73a81242ef
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 >
Upstream-commit: fe6416d04fb3ccd83fe4fb3a73f0364b88da730a
Component: engine
2016-06-20 22:27:02 -04:00
169d2f0c62
Sync API changes from 1.25 -> 1.24
...
commit 79e1d3877a1b1697028399b8ce39c4ee27b60a96
updated the v1.25 API with changes in SwarmKit,
but these changes should apply to v1.24.
This updates the 1.24 API with the same changes.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 93095b1699eb11e1bd256dcf8f42f34f50ec2c78
Component: engine
2016-06-20 14:07:11 -07:00
acc2e881b3
Temporarily disable API v1.25 docs
...
The docs are currently published from "master" for the RC,
so hiding v1.25 API, which is for docker 1.13
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 59bdd4e56986c09a998f41bfec23a30df14444cc
Component: engine
2016-06-20 13:50:00 -07:00
72d1e6e5de
clarify swarm concept
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: e0296317131782008dcb94c72d591244663d61b1
Component: engine
2016-06-20 11:02:56 -07:00
67d1984a09
Merge pull request #23737 from cpuguy83/cleanup_some_service_api_docs
...
Fix a bunch of issues with service API docs
Upstream-commit: e070503511c5cebbb0ee0f1737dcf2f590ce6853
Component: engine
2016-06-20 07:03:37 -07:00
b9bedcbcb2
Fix a bunch of issues with service API docs
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 79e1d3877a1b1697028399b8ce39c4ee27b60a96
Component: engine
2016-06-20 06:40:31 -07:00
b6c8db0026
Merge pull request #23696 from sfsmithcha/check_swarm_cli
...
update docker swarm cli
Upstream-commit: bfff4cce676f12fb092e82b61cc626dfa3944405
Component: engine
2016-06-20 15:40:06 +02:00
aeecaae19f
Add the advisory=rc metadata
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: daedbc60d61387cb284b871145b672006da1b6de
Component: engine
2016-06-20 11:54:53 +00:00
122239bbc3
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 >
Upstream-commit: 37ee14a99894c78396b51b62f5e979f1d000d321
Component: engine
2016-06-20 00:24:37 -07:00
85a0643506
add links to swarm and service commands to swarm mode overview
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: c13c5601961bb5ea30e21c9c8c469dd55a2f17d0
Component: engine
2016-06-19 11:43:49 -07:00
5be32366aa
Merge pull request #23736 from yongtang/06192016-reference-link
...
Fix reference link error in Jenkins docs failure
Upstream-commit: f01e8556bbda3aff33d6e06a4deaa330def33c1f
Component: engine
2016-06-19 18:24:55 +02: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
75748b66ab
Add release tag reference links in deprecated.md
...
This fix adds a couple of missed release tag reference links in deprecated.md
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: bc20354b095906eedd346fb45bbbf9ad5e82145d
Component: engine
2016-06-19 06:13:57 -07:00
69d60f8bcb
Update help output to match Docker 1.11.
...
* Also touch up headings.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
Upstream-commit: 17ae6539f6bfc20792d0a25b3f98adfce96e7337
Component: engine
2016-06-18 13:47:12 -07:00
e75e9b54a9
update cli commands output for rc1, revise key concepts
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 9499d5fd522e2fa31e5d0458c4eb9b420f164096
Component: engine
2016-06-18 11:38:27 -07:00
14409cb989
bad url
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: c2495dbe6d4961cb2b2eb975c4d4758ece0c8c45
Component: engine
2016-06-18 13:00:38 +00: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
6200f441cd
Add initial "service" docs
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: f565bc7ec964537a4e20bf5d4e497d15c0c9b5bf
Component: engine
2016-06-17 17:28:24 -07:00
e82e1cb033
update docker swarm cli
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 78ebfaff1a426425573c440c24eb0f36ffed4d8c
Component: engine
2016-06-17 15:40:43 -07:00
531b88d2e3
Merge pull request #23658 from londoncalling/mac-win-install-updates
...
install mac and win pared down, link to d4mac, d4win, getting started…
Upstream-commit: 2b865dbc3a94675478a9d6faae480ff447cc75de
Component: engine
2016-06-18 07:49:04 +10: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
913871096c
update output for node commands, minor edits
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 3b2132c2c7f277750edfd9fc76d73dbb9142fde2
Component: engine
2016-06-16 21:44:07 -07:00
4977b39f5b
Added daemon.json Windows example
...
Signed-off-by: Neil Peterson <neilpeterson@outlook.com >
Upstream-commit: 8352089e8c78cdf71ac9eec0c125a35f9bf36ebc
Component: engine
2016-06-16 21:41:58 -07:00
bfa982122e
Merge pull request #23651 from tonistiigi/cert-expiry
...
Add cert-expiry to swarm update
Upstream-commit: f52c807650beb3bb0afe67bafd546792d7fa1422
Component: engine
2016-06-17 02:50:58 +00:00
1c57d98347
Add cert-expiry to swarm update
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 7d8d51aa9d0c1737ff7f97a3efac0a2ef0975b56
Component: engine
2016-06-16 18:06:02 -07:00
d74065d7d9
Update docker info output example
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 07e1c62bf4a24e8a075e87b38be3bbe7c8282e42
Component: engine
2016-06-16 16:29:23 -07:00
1e8aef0b45
Merge pull request #23633 from thaJeztah/fix-advisory-meta
...
docs: move "advisory" to general metadata
Upstream-commit: ef9c058b67b181fc5084ead0bafcca410863726c
Component: engine
2016-06-16 14:55:11 -07:00
c0b4786bbf
Fix API 1.25 order in menu
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 6891fead3675a31a9a98a0f19a80c96ebc393afd
Component: engine
2016-06-16 12:07:29 -07:00
bcf7be1ed0
docs: move "advisory" to general metadata
...
the advisory option should not be
below "menu"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: aadd88c306d43b401a18a29efafa714f64f87894
Component: engine
2016-06-16 11:52:34 -07:00
e787e67ec5
advisory can't be in the [menu] section
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: bc033cb706fd22e3934968b0dfdf93da962e36a8
Component: engine
2016-06-16 11:59:47 +00:00
fc28f1b8ca
Merge pull request #23601 from dnephin/change_header
...
Change SCALE to REPLICAS.
Upstream-commit: 8ab79f1f7035288743882a6f0fa8bacc6c8454fa
Component: engine
2016-06-16 04:18:49 +00:00
cb9a8acf9f
fixing links and merge conflicts
...
updated link to faqs/troubleshoot to point to new location /toolbox
fixed docker-for-mac link error
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com >
Upstream-commit: 1d80f8ca193139755de935fa6567a32734038cac
Component: engine
2016-06-15 18:37:50 -07:00
dd45c05df9
Merge pull request #23510 from sbose78/23376-update-centos-yum-repo-version
...
Fixes #23376 Broken URL for Centos yum repo for docker fixed to harcoded version number.
Upstream-commit: 0c78a7dd64c4c0b11aae040fadbecee2a7fdf5ae
Component: engine
2016-06-16 02:43:13 +02:00
93b2574efc
Change SCALE to REPLICAS.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 4df03499486a7f62f94bd1fb8e2625b0ef932fe5
Component: engine
2016-06-15 17:57:59 -04:00
965831ca81
fix links for #23505
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: fa94eb46041ad309468dbbd29faba2053f402096
Component: engine
2016-06-15 04:46:40 +00:00
