Commit Graph

44731 Commits

Author SHA1 Message Date
Joao Fernandes 52525d664a Merge pull request #1040 from joaofnfernandes/1.1-backup-restore
Add flag to ucp 2.0 restore instructions
2017-01-06 13:44:04 -08:00
Victoria Bialas f111cb7fdd Merge pull request #1050 from londoncalling/d4d-beta35
beta 35 release notes d4mac, d4win
2017-01-06 11:04:51 -08:00
Victoria Bialas c07a6219b0 beta 35 release notes d4mac, d4win
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-06 10:47:49 -08:00
Victoria Bialas c12c12bbda Merge pull request #1043 from londoncalling/machine-install-ubuntu
update Docker machine install instructions per user feedback
2017-01-06 10:36:59 -08:00
Lars-Magnus Skog bc3704815d accross -> across 2017-01-06 18:56:14 +01:00
Luke Nimtz 7a5c3dd1a2 docker upgrade command fix (#1044)
`apt-get upgrade` doesn't take an argument. To upgrade docker specifically would require `apt-get install docker-engine`.
2017-01-06 04:20:57 -08:00
Saar Wexler d49d1e3c7a update the version in the code snnipt (#1037) 2017-01-06 04:20:34 -08:00
Saar Wexler 3f68896027 version changed to 1.12.3 (#1036) 2017-01-06 04:19:17 -08:00
alberto b80e160d0c Typo in ubuntulinux.md (#1041) 2017-01-06 04:16:44 -08:00
Victoria Bialas 534349778e update Docker machine install instructions per user feedback
added uninstall steps

fixed line lengths

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-05 17:13:13 -08:00
Joao Fernandes 53f24f763c Add flag to ucp 2.0 restore instructions 2017-01-05 14:10:25 -08:00
Joao Fernandes b687e93be7 Add flag to ucp 2.0 restore instructions 2017-01-05 14:00:42 -08:00
Victoria Bialas 5a70ee3591 Merge pull request #1035 from londoncalling/docker-cloud-cli-install
clarify docker-cloud install
2017-01-05 11:59:37 -08:00
Victoria Bialas c2fa76aee9 clarify docker-cloud install
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-04 18:02:05 -08:00
Adrien Duermael c6e05af4d7 using github url for yaml.v2 submodule (#1034)
in an attempt to fix Github pages build…

Signed-off-by: Adrien Duermael <adrien@duermael.com>
2017-01-04 17:28:55 -08:00
Joseph Mosby b7acfed1b6 Updating dockervolumes.md for Windows mounting
The code snippet for mounting Windows directories won't work: it will produce an "Invalid bind mount spec" error as Docker cannot properly read the path. The core error was addressed in [#12590](https://github.com/docker/docker/issues/12590#issuecomment-96767796), this is just an update to the tutorial.
2017-01-04 18:30:54 -05:00
dougalrm ae036ae0f5 Update to usingdocker.md
Link destination changed toa more appropriate (imo) destination.

Link originally linked to docker env varibles whereas link description describes other docker commands.
2017-01-04 23:23:31 +00:00
Victoria Bialas 7ad2f37bec Merge pull request #1023 from londoncalling/swarm-terms-feedback
update swarm worker node concept description
2017-01-04 14:46:30 -08:00
Victoria Bialas 665ac6d3df update swarm worker node concept description
incorporated review comments from Misty

re-worded topic titles and added to description of node

fixed links for services and tasks

incorporated more comments

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-04 14:39:08 -08:00
LRubin 9b7b256b62 Merge pull request #1028 from sanscontext/installcli
Cloud: small clarifications
2017-01-04 13:03:52 -08:00
LRubin 5bf6bdba02 small clarifications
Signed-off-by: LRubin <lrubin@docker.com>
2017-01-04 12:55:21 -08:00
LRubin e2be02ac5b Merge pull request #1022 from sanscontext/issue-1014
fixes #1014 by adding flag
2017-01-04 10:21:07 -08:00
LRubin d6b4c822cc fixes #1014 by adding flag
Signed-off-by: LRubin <lrubin@docker.com>
2017-01-03 18:04:22 -08:00
Joao Fernandes 00ac7f40c1 Merge pull request #1016 from mastertinner/patch-1
Correct wrong default value
2017-01-03 11:52:08 -08:00
Joao Fernandes 75a267a6c4 Merge pull request #969 from joaofnfernandes/dtr-external-url
Replace dtr-load-balancer by dtr-external-url
2017-01-03 11:37:48 -08:00
Misty Stanley-Jones 41c6a45c7d Merge pull request #1015 from TAGC/patch-1
Update services.md
2017-01-03 10:26:59 -08:00
Tobias Fuhrimann 2162c97da6 Correct wrong default value 2017-01-03 15:33:05 +01:00
David c06c4eb55b Update services.md
Correct typographical error.
2017-01-03 12:22:18 +00:00
Scott Fredericksen 984b8bdda6 Improved description for Hello-World
Adds more detail for people to be able to understand how to build the Hello World using FROM scratch.
2017-01-02 04:10:37 -07:00
John Mulhausen 01eac74edc Update ubuntulinux.md 2016-12-31 09:57:42 -08:00
Nick van der Meij e5e2b2d34a Update overview.md
Update overview.md to reference possible issues regarding windows to unix path convert issues
2016-12-30 21:46:29 +01:00
Victoria Bialas 1ea868eca3 Merge pull request #985 from yuexiao-wang/fix-window-console
Replace bash shell to powershell in docker for windows
2016-12-29 21:23:34 -08:00
Victoria Bialas ea991eb611 Merge branch 'master' into fix-window-console 2016-12-29 21:11:57 -08:00
yuexiao-wang ccb4c6e679 Replace bash shell to powershell in docker for windows
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-12-30 19:58:26 +08:00
Victoria Bialas 3f1d96bb4d Merge pull request #1005 from londoncalling/d4mac-win-improve-intro
update d4mac, d4win intros, add better feedback topics
2016-12-29 17:12:01 -08:00
Victoria Bialas 50d083870c update d4mac, d4win intros, add better feedback topics
copyedits

more copyedits

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-12-29 17:03:31 -08:00
Misty Stanley-Jones a5bfc21786 Merge pull request #963 from joaofnfernandes/update-robots-txt
Fix wrong entry for DTR in robots.txt
2016-12-29 14:43:03 -08:00
Misty Stanley-Jones fc5ea8ea7a Merge pull request #965 from tanertopal/patch-1
Update step_four.md - spelling error
2016-12-29 14:42:30 -08:00
Misty Stanley-Jones 6905a684b7 Merge pull request #966 from alexbaumgertner/patch-1
fix typo
2016-12-29 14:41:47 -08:00
Misty Stanley-Jones 4c28810463 Merge pull request #973 from ashishg-qburst/step_four
Fix typo on engine/getstarted/step_four.md
2016-12-29 14:40:43 -08:00
Misty Stanley-Jones 97b91d30a8 Merge pull request #975 from etki/patch-1
Update gcs.md
2016-12-29 14:40:08 -08:00
Misty Stanley-Jones 7b1f2901f7 Merge pull request #984 from StefanScherer/fix-raspbian-hello-world-example
Use armhf/hello-world for Raspbian tutorial
2016-12-29 14:34:01 -08:00
Misty Stanley-Jones 0d7778af0c Merge pull request #991 from sergei-solomonov/patch-1
typo fixed
2016-12-29 14:28:10 -08:00
Misty Stanley-Jones 197e1e8553 Merge pull request #992 from davidmichaelkarr/patch-1
Update host_integration.md
2016-12-29 14:27:33 -08:00
Misty Stanley-Jones 96a9511345 Merge pull request #993 from sergei-solomonov/patch-2
Excess '>' symbol deleted
2016-12-29 14:26:39 -08:00
Misty Stanley-Jones 797950d68b Merge pull request #999 from wbsTrash/master
Fix typo in network guide
2016-12-29 14:26:02 -08:00
Victoria Bialas d24ff8e012 Merge pull request #1001 from londoncalling/d4mac-win-formatting
fixed note formatting
2016-12-29 13:04:47 -08:00
Victoria Bialas 73ccbfe82d fixed note formatting
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-12-29 12:48:37 -08:00
Misty Stanley-Jones ae629e5741 Merge pull request #849 from aduermael/check-links
CI - no absolute links to local pages
2016-12-29 11:44:00 -08:00
Jerry Baker 498249685b Update deploy-to-cloud-btn.md
Add note about having to be logged into Docker Cloud...
2016-12-29 10:22:16 -05:00