Commit Graph

42766 Commits

Author SHA1 Message Date
John Mulhausen 9e96e483bc Create subdirectory-based docs archive 2016-10-26 17:48:00 -07:00
Victoria Bialas 277e83ceed Merge pull request #362 from docker/revert-37-aws-userdata
Revert "Doc change to support custom userdata option for docker-machine AWS driver"
2016-10-26 15:12:39 -07:00
LRubin b4d5685283 Merge pull request #361 from sanscontext/cloud-3400-multemails
Docker Cloud: updates for multiple email address management
2016-10-26 14:24:07 -07:00
Victoria Bialas 08d35416c9 Revert "Doc change to support custom userdata option for docker-machine AWS driver" 2016-10-26 14:23:25 -07:00
LRubin 50d5903120 updates for multiple email address management
Signed-off-by: LRubin <lrubin@docker.com>
2016-10-26 14:10:19 -07:00
LRubin eb84a42111 Merge pull request #354 from sanscontext/tag-mapping
Docker Cloud: update tag mapping label, some typo fixes
2016-10-26 14:04:46 -07:00
Victoria Bialas 962cc88d7f Merge pull request #359 from londoncalling/compose-wp-sample
finishing touches on Wordpress example in Compose docs per pr#129
2016-10-26 14:03:16 -07:00
LRubin 43e4f5a57d Merge pull request #352 from sanscontext/autotest
update autotest descriptions
2016-10-26 14:03:05 -07:00
Victoria Bialas 568cded2a5 finishing touches on Wordpress example in Compose docs per pr#129
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-10-26 13:46:53 -07:00
LRubin 25fd57ec73 update autotest descriptions
Signed-off-by: LRubin <lrubin@docker.com>
2016-10-26 13:30:37 -07:00
LRubin d54bb2e145 update tag mapping label, some typo fixes
Signed-off-by: LRubin <lrubin@docker.com>
2016-10-26 11:35:14 -07:00
Misty Stanley-Jones cdbebff817 Merge pull request #307 from mstanleyjones/d4w_firewall_detection
Add doc for firewall auto-detection
2016-10-26 09:09:54 -07:00
Victoria Bialas c79c339ed7 Merge pull request #347 from londoncalling/d4mac-d4win-beta29
added beta 29 release notes for mac and win
2016-10-25 17:28:26 -07:00
Victoria Bialas 943940c2af added beta 29 release notes for mac and win
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-10-25 17:26:12 -07:00
Victoria Bialas 6131cd69bd Merge pull request #346 from londoncalling/clarify-hyperv-virtualbox-in-machine-docs
incorporated Misty's rewrite from pr#256 with additional info
2016-10-25 16:51:45 -07:00
John Mulhausen c041f74a5c Merge pull request #340 from KevinTangy/patch-1
Update 3_prepare_the_app.md with missing dots
2016-10-25 16:50:08 -07:00
Victoria Bialas 796ec3d67c incorporated Misty's rewrite from pr#256 with additional info
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-10-25 16:42:03 -07:00
Joao Fernandes ee30fb9a8f Merge pull request #345 from joaofnfernandes/dtr-reference
Update docker/dtr image reference
2016-10-25 16:20:32 -07:00
Joao Fernandes 77031cb909 Update docker/dtr image reference 2016-10-25 16:18:00 -07:00
Joao Fernandes 0888a73e7e Merge pull request #239 from vsaraswat/patch-2
Add ELK stack example to UCP logging
2016-10-25 15:20:23 -07:00
Joao Fernandes a2af398626 Improve UCP logging configuration 2016-10-25 15:19:51 -07:00
Misty Stanley-Jones 34e383c602 Formatting 2016-10-25 14:49:08 -07:00
John Mulhausen be3e860fa1 Merge pull request #328 from alexandair/patch-1
Update index.md
2016-10-25 14:25:52 -07:00
Misty Stanley-Jones a4d2e0915d Formatting 2016-10-25 14:24:12 -07:00
John Mulhausen 9e01974db2 Merge pull request #336 from wluxion/patch-1
Update installing-cli.md to mention python-dev for pip install
2016-10-25 14:19:01 -07:00
Victoria Bialas 3b75ffeecd Merge pull request #338 from dsheets/docker-for-mac-osxfs-chown
docker-for-mac/osxfs: clarify the ownership behavior in Beta 29
2016-10-25 14:05:26 -07:00
Victoria Bialas 8cdd7432d6 incorporated comments from David
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-10-25 14:02:40 -07:00
Joao Fernandes 9482ecaa40 Merge pull request #343 from joaofnfernandes/machine-reference
Update code blocks in machine/reference
2016-10-25 14:01:27 -07:00
Joao Fernandes 5ea225187a Update code blocks in machine/reference 2016-10-25 13:58:10 -07:00
LRubin c343c03782 Merge pull request #342 from sanscontext/ocean-xmpl
troubleshooting kramdown issues in a real editor
2016-10-25 13:57:36 -07:00
Victoria Bialas a1a183a205 Merge pull request #341 from docker/revert-256-134_hyperv_virtualbox_confusion
Revert "Clarify Hyper-V and VirtualBox info for Docker for Windows"
2016-10-25 13:57:22 -07:00
LRubin 6976e5912c troubleshooting kramdown issues in a real editor
Signed-off-by: LRubin <lrubin@docker.com>
2016-10-25 13:56:10 -07:00
Victoria Bialas 43952452b9 Revert "Clarify Hyper-V and VirtualBox info for Docker for Windows" 2016-10-25 13:53:24 -07:00
John Mulhausen dce7847515 Formatting fixes 2016-10-25 12:18:22 -07:00
LRubin 454ad15950 Three, not four spaces 2016-10-25 12:18:13 -07:00
Misty Stanley-Jones bb957c06b6 Formatting 2016-10-25 12:15:51 -07:00
John Mulhausen d8805c2464 Formatting fix 2016-10-25 12:15:25 -07:00
LRubin a73288f7c6 Fix list formatting 2016-10-25 12:14:01 -07:00
Victoria Bialas f48157d696 Update swarm-mode.md 2016-10-25 12:11:35 -07:00
LRubin ef0f8459e6 Fix code fence 2016-10-25 12:09:27 -07:00
John Mulhausen 18e6fae8a2 Formatting fixes 2016-10-25 12:07:57 -07:00
Misty Stanley-Jones 26afe3deec Formatting 2016-10-25 12:06:40 -07:00
Victoria Bialas 4afc53c4fb Update opensource.md 2016-10-25 12:03:11 -07:00
LRubin ca1ae3f208 Fix formatting indentation 2016-10-25 12:02:46 -07:00
Misty Stanley-Jones ca21999b4c Formatting 2016-10-25 12:01:18 -07:00
Victoria Bialas ba85535198 Update troubleshoot.md 2016-10-25 12:01:02 -07:00
John Mulhausen d136af24af Formatting fix 2016-10-25 12:00:54 -07:00
Kevin Tang 61b6244d9b Add missing dot
The docker build commands are missing the dot to specify the Dockerfile in the current directory.
2016-10-25 15:00:38 -04:00
Joao Fernandes 9e5f9d7be2 Fix table formatting in ucp/reference 2016-10-25 12:00:09 -07:00
Misty Stanley-Jones 82fe40bff7 Formatting 2016-10-25 12:00:07 -07:00