Misty Stanley-Jones
c38dc6cfe2
Merge pull request #578 from docker/mstanleyjones-patch-2
...
Add disclaimer about standalone swarm in 1.12+
2016-11-23 12:34:26 -08:00
Misty Stanley-Jones
8953d4a4b8
Add disclaimer about standalone swarm in 1.12+
...
Fixes #559
2016-11-23 12:29:27 -08:00
Misty Stanley-Jones
013d8f09fd
Merge pull request #631 from mstanleyjones/followup_link_flag
...
Add a little more clarification about --link
2016-11-23 12:28:04 -08:00
Alessandro Boch
d3155b9482
About the docker_gwbridge network ( #400 )
...
* About the docker_gwbridge network
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-11-23 12:21:33 -08:00
John Mulhausen
e105f0714a
Merge pull request #693 from joelemmer/patch-1
...
Update extends.md
2016-11-22 17:32:57 -08:00
John Mulhausen
70bb36eb49
Merge pull request #680 from ananthulasrikar/master
...
Updated the URL syntax in mark down at line 73
2016-11-22 17:32:29 -08:00
Victoria Bialas
094981f4ba
Merge pull request #697 from londoncalling/d4mac-deprecate-yosemite-10.10.x
...
d4mac, added warning re:plan to drop support for OS X 10.10.x
2016-11-22 16:12:30 -08:00
Victoria Bialas
905ee05f57
d4mac, added warning re:plan to drop support for OS X 10.10.x
...
copyedit of macOS and OS X release names
updated system requirements to emphasize OS X 10.11 or newer is the real baseline
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-11-22 16:10:10 -08:00
John Mulhausen
0aa54283c1
Merge pull request #695 from docker/removestorebeta
...
Remove beta notices for Docker Store
2016-11-22 14:53:41 -08:00
John Mulhausen
0afa0ee50f
Remove beta notices.
2016-11-22 13:17:08 -08:00
John Mulhausen
b31f6f527d
Remove beta notices
2016-11-22 13:11:45 -08:00
Joao Fernandes
312579df8b
Merge pull request #692 from joaofnfernandes/ucp-2.0.1
...
Add release notes for UCP 2.0.1
2016-11-22 12:19:40 -08:00
Joao Fernandes
730f22526b
Merge pull request #678 from joaofnfernandes/dtr-health-checks
...
Add more information about DTR healthchecks
2016-11-22 12:12:16 -08:00
Joe Lemmer
07fdd239c7
Update extends.md
...
Just corrected a missing 'and'
2016-11-22 20:12:14 +00:00
Joao Fernandes
28d97648cc
Merge pull request #687 from joaofnfernandes/dtr-wrong-link
...
Fix wrong links in DTR install
2016-11-22 12:12:06 -08:00
Joao Fernandes
2b08ae1ee6
Update DDC offline install
2016-11-22 12:09:11 -08:00
Joao Fernandes
9b92d622b5
Add UCP auto upgrade to release notes
2016-11-22 12:09:11 -08:00
Vivek Saraswat
4436a3ddac
Update 2.0.1 release notes with rethinkDB fix
...
Update release notes with rethinkDB bug fix that is blocking editions
2016-11-22 12:09:11 -08:00
Joao Fernandes
902111de17
Add release notes for UCP 2.0.1
2016-11-22 12:09:11 -08:00
Victoria Bialas
3d9bdd287a
Merge pull request #679 from londoncalling/d4win-powershell-tab-completion
...
d4win added how to set up docker tab completion in Powershell
2016-11-22 11:18:00 -08:00
Joao Fernandes
458a715834
Fix wrong links in DTR install
2016-11-22 09:36:41 -08:00
Srikar
b9e40eb629
Updated the link text to "the instructions for installing Docker on Ubuntu"
2016-11-22 16:42:18 +05:30
Srikar
b356a0b20a
Updated the URL syntax in mark down at line 73
2016-11-22 13:04:46 +05:30
Victoria Bialas
43822ab5a2
d4win added how to set up docker tab completion in Powershell
...
formatting fixes
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-11-21 22:05:08 -08:00
John Mulhausen
0e65544a3f
Merge pull request #676 from sanscontext/update-analytics
...
Cloud API docs: swap out google analytics for segment
2016-11-21 17:42:31 -08:00
Joao Fernandes
c8c05e64d0
Add more information about DTR healthchecks
2016-11-21 17:09:28 -08:00
LRubin
75525bb923
swap out google analytics for segment
...
Signed-off-by: LRubin <lrubin@docker.com>
2016-11-21 15:13:08 -08:00
John Mulhausen
cb8154c88e
Remove GTM + GA native tags, now that we have Segment
2016-11-21 14:14:21 -08:00
John Mulhausen
03aec3b083
Merge pull request #655 from mischah/patch-1
...
Docs: Update versions of Docker, Compose, and Machine
2016-11-21 12:51:49 -08:00
John Mulhausen
cb9460a8b1
Merge pull request #653 from rogererens/patch-1
...
Add `docker ps -a`
2016-11-21 12:51:21 -08:00
John Mulhausen
3ad0802f51
Prevent *.github.io URLs from being indexed
2016-11-21 12:49:11 -08:00
John Mulhausen
b0df3a9568
Update docs.html
2016-11-21 12:44:49 -08:00
John Mulhausen
48e12921a1
Fixes #635
2016-11-21 12:24:15 -08:00
Victoria Bialas
94412b7a84
Merge pull request #673 from londoncalling/swarm-heartbeat-option
...
clarify syntax on swarm heartbeat for create machine command
2016-11-21 12:12:20 -08:00
Victoria Bialas
fd49e78fb0
clarify syntax on swarm heartbeat for create machine command
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-11-21 11:40:28 -08:00
Victoria Bialas
d5df4967f9
Merge pull request #594 from dsheets/patch-4
...
Docked for Mac: Custom host CA certs in stable
2016-11-21 11:21:31 -08:00
LRubin
6075f9a794
remove fragment
...
removing a random sentence fragment.
2016-11-21 10:40:44 -08:00
LRubin
beb9a97556
Merge pull request #656 from MicahZoltu/patch-1
...
Minor technical correction.
2016-11-21 09:54:31 -08:00
Micah Zoltu
adfc2cbcbc
Minor technical correction.
...
`$IMAGE_NAME` is actually `$DOCKER_REPO:$DOCKER_TAG`, not `$DOCKER_REPO/$DOCKER_TAG`. This mistake confused me and made me think that `$DOCKER_REPO` was something like `index.docker.io/MyName` rather than `index.docker.io/MyName/MyProject`.
2016-11-19 13:22:01 -08:00
Michael Kühnel
491df30891
Update versions of Docker, Compose, and Machine
2016-11-19 19:51:46 +01:00
John Mulhausen
57fcd95be9
Reverting reversion, geez
2016-11-18 19:08:42 -08:00
John Mulhausen
65ff90c6bb
Merge branch 'master' of https://github.com/docker/docker.github.io
2016-11-18 19:05:14 -08:00
John Mulhausen
69f07bcd1e
Revert "Merge pull request #654 from mstanleyjones/fix_dockerfile"
...
This reverts commit 2ede6ff7f0 , reversing
changes made to 30772c6703 .
2016-11-18 19:04:42 -08:00
John Mulhausen
0060ef460a
merge conflict fixes
2016-11-18 18:58:26 -08:00
John Mulhausen
9bdefe1f07
Merge branch 'auto-issue-assign'
2016-11-18 18:55:28 -08:00
John Mulhausen
9aadd420ba
Merge branch 'master' into auto-issue-assign
2016-11-18 18:55:10 -08:00
John Mulhausen
0c2c69b527
Make offsite edit this page links file-specific
2016-11-18 18:55:07 -08:00
John Mulhausen
99c9555130
Adding 1.12.x specific links
2016-11-18 18:51:05 -08:00
John Mulhausen
2ede6ff7f0
Merge pull request #654 from mstanleyjones/fix_dockerfile
...
Fixing the Dockerfile
2016-11-18 16:45:15 -08:00
Misty Stanley-Jones
fbab0cf7b9
Fixing the Dockerfile
2016-11-18 16:40:06 -08:00