Sven Dowideit
4962fea757
Merge pull request #23797 from liubin/fix-typo
...
fix some typos
2016-06-22 11:56:48 +10:00
Sven Dowideit
96a58bdba8
Merge pull request #23816 from SvenDowideit/update-docker4-links
...
Now that the Docker4 links are online, we can use them
2016-06-21 23:04:43 +10:00
Sven Dowideit
587d2f9d81
Now that the Docker4 links are online, we can use them
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-06-21 12:55:41 +00:00
Vincent Demeester
96e3f3e2d0
Merge pull request #23757 from AkihiroSuda/overlay2doc
...
Add overlay2 description to overlayfs-driver.md
2016-06-21 14:06:57 +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
Vincent Demeester
097d1a2b61
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.
2016-06-21 12:09:47 +02:00
Vincent Demeester
f3c9ba0bb0
Merge pull request #23781 from kevinjqiu/fix-doc-typo
...
Fix some doc typos
2016-06-21 12:07:00 +02:00
Sebastiaan van Stijn
d25cc581f7
Merge pull request #23778 from thaJeztah/sync_api-1.24-1.25
...
Sync API changes from 1.25 -> 1.24
2016-06-21 00:41:17 -07:00
Aaron Lehmann
2753a5e916
Merge pull request #23770 from sfsmithcha/edit_swarm_concept
...
clarify swarm concept
2016-06-21 00:29:49 -07:00
bin liu
950073aabb
fix some typos
...
Signed-off-by: bin liu <liubin0329@gmail.com>
2016-06-21 15:29:25 +08:00
Kevin Jing Qiu
3b2ee9a704
Fix some doc typos and spacings
...
Signed-off-by: Kevin Jing Qiu <kevin@idempotent.ca>
2016-06-20 23:54:36 -07:00
Akihiro Suda
8625adbd67
Add overlay2 description to overlayfs-driver.md
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-06-21 06:18:56 +00: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
Sebastiaan van Stijn
93095b1699
Sync API changes from 1.25 -> 1.24
...
commit 79e1d3877a
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>
2016-06-20 14:07:11 -07:00
Sebastiaan van Stijn
59bdd4e569
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>
2016-06-20 13:50:00 -07:00
Charles Smith
e029631713
clarify swarm concept
...
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-06-20 11:02:56 -07:00
Sebastiaan van Stijn
e070503511
Merge pull request #23737 from cpuguy83/cleanup_some_service_api_docs
...
Fix a bunch of issues with service API docs
2016-06-20 07:03:37 -07:00
Brian Goff
79e1d3877a
Fix a bunch of issues with service API docs
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-06-20 06:40:31 -07: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 Smith
c13c560196
add links to swarm and service commands to swarm mode overview
...
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-06-19 11:43:49 -07:00
Vincent Demeester
f01e8556bb
Merge pull request #23736 from yongtang/06192016-reference-link
...
Fix reference link error in Jenkins docs failure
2016-06-19 18:24:55 +02:00
Yong Tang
1cb7fb4d2e
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>
2016-06-19 08:50:13 -07:00
Yong Tang
bc20354b09
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>
2016-06-19 06:13:57 -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
Charles Smith
9499d5fd52
update cli commands output for rc1, revise key concepts
...
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-06-18 11:38:27 -07:00
Sven Dowideit
c2495dbe6d
bad url
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-06-18 13:00:38 +00:00
Sven Dowideit
ad1819ca1d
href links are not converted from file.md by hugo
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-06-18 12:44:38 +00: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
Sven Dowideit
2b865dbc3a
Merge pull request #23658 from londoncalling/mac-win-install-updates
...
install mac and win pared down, link to d4mac, d4win, getting started…
2016-06-18 07:49:04 +10:00
Victoria Bialas
5bc730eda7
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>
2016-06-17 14:46:35 -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
ef9c058b67
Merge pull request #23633 from thaJeztah/fix-advisory-meta
...
docs: move "advisory" to general metadata
2016-06-16 14:55:11 -07:00
Sebastiaan van Stijn
6891fead36
Fix API 1.25 order in menu
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-16 12:07:29 -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
Sven Dowideit
bc033cb706
advisory can't be in the [menu] section
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-06-16 11:59:47 +00:00
Arnaud Porterie
8ab79f1f70
Merge pull request #23601 from dnephin/change_header
...
Change SCALE to REPLICAS.
2016-06-16 04:18:49 +00:00
Victoria Bialas
1d80f8ca19
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>
2016-06-15 18:37:50 -07:00
Sebastiaan van Stijn
0c78a7dd64
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.
2016-06-16 02:43:13 +02:00
Daniel Nephin
4df0349948
Change SCALE to REPLICAS.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-06-15 17:57:59 -04:00
Sven Dowideit
fa94eb4604
fix links for #23505
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-06-15 04:46:40 +00:00
Sven Dowideit
da15923559
Merge pull request #23505 from londoncalling/add-getstarted-tutorial
...
ready for merge: surfacing Learn by example topics to top level of Docker Engine docs
2016-06-15 14:18:09 +10:00
Victoria Bialas
0254c12e1e
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
WIP: merging 3 getting started tutorials into one to cover all platforms, added new files
fixing broken images and links in 3-in-1 getting started, re-wrote story flow, linked to Toolbox, d4mac,d4win
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-06-14 21:08:44 -07:00
Tibor Vass
04292192e0
Bump API Version to v1.25
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-06-14 20:03:50 -07:00