John Mulhausen
|
bdd321ab20
|
Merge pull request #363 from michael-wise/patch-1
compose/startup-order.md -- added clarification
|
2016-10-27 12:40:44 -07:00 |
|
John Mulhausen
|
e0de7a6c76
|
Merge pull request #365 from rhencke/patch-1
Minor wording & grammar fixes to deploy-infra.md.
|
2016-10-27 12:39:21 -07:00 |
|
John Mulhausen
|
6cae98a438
|
Merge pull request #350 from KevinTangy/patch-2
Use the correct service name when linking
|
2016-10-27 12:37:34 -07:00 |
|
John Mulhausen
|
4d6819a5dd
|
Merge pull request #364 from lbausch/patch-1
Add missing whitespace
|
2016-10-27 12:36:25 -07:00 |
|
John Mulhausen
|
482007ee35
|
Creating robots.txt ahead of time
Soon, versioned docs are coming back to subdirectories; making sure they aren't indexed.
|
2016-10-27 12:34:58 -07:00 |
|
Victoria Bialas
|
13e79b3ec0
|
Merge pull request #335 from mstanleyjones/docker_native_win
Add info about using native Docker on win10 and 2016
|
2016-10-27 12:06:12 -07:00 |
|
Misty Stanley-Jones
|
397a734235
|
Fixed admonitions
|
2016-10-27 12:02:52 -07:00 |
|
Robert Hencke
|
7f47adcc96
|
Minor wording & grammar fixes to deploy-infra.md.
Use single term for key-value store. Fix a couple minor grammar issues. Add documentation link to supported key-value stores.
|
2016-10-27 12:59:54 -04:00 |
|
Victoria Bialas
|
cbd51fd8d1
|
moved windows server 16, windows 10 notes under what to know before you install
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
|
2016-10-27 09:06:39 -07:00 |
|
Misty Stanley-Jones
|
db14c15c4d
|
Add info about using native Docker on win10 and 2016
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
|
2016-10-27 09:00:58 -07:00 |
|
lbausch
|
110d94b9a1
|
Add missing whitespace
|
2016-10-27 14:04:36 +02:00 |
|
michael-wise
|
870abe59b4
|
added a filename above the custom script
Added a filename above the custom script to distinguish it from the wait-for-it.sh script.
|
2016-10-26 21:24:36 -04:00 |
|
Victoria Bialas
|
12389d311a
|
Update index.md
|
2016-10-26 17:54:25 -07:00 |
|
Victoria Bialas
|
eec53574d3
|
Update index.md
|
2016-10-26 17:53:40 -07:00 |
|
John Mulhausen
|
0dd1cf261e
|
Merge branch 'master' of https://github.com/docker/docker.github.io
|
2016-10-26 17:48:06 -07:00 |
|
John Mulhausen
|
9e96e483bc
|
Create subdirectory-based docs archive
|
2016-10-26 17:48:00 -07:00 |
|
Victoria Bialas
|
7b04a910bc
|
Update index.md
|
2016-10-26 17:14:42 -07:00 |
|
Victoria Bialas
|
9c5319211d
|
Fixing note formatting
Changing note format back to the way it was to match the rest of the notes in this section.
|
2016-10-26 16:58:24 -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 |
|
Kevin Tang
|
13e819b889
|
Use the correct service name when linking
|
2016-10-26 10:52:24 -04: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 |
|