Commit Graph

44271 Commits

Author SHA1 Message Date
Riyaz Faizullabhoy bbd5c2723b Fix root_ca, json structure (#1079)
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-01-12 18:11:48 -08:00
Josue Zarzosa a577949194 Remove reference to legacy container links (#1057) 2017-01-12 18:11:04 -08:00
Victoria Bialas d9d150fb16 Merge pull request #1115 from londoncalling/toolbox-install-direct-links
added direct installer links, re-worked Toolbox intro pages
2017-01-12 18:01:27 -08:00
Victoria Bialas 69a9da9be4 added direct installer links, re-worked Toolbox intro pages
updated Toolbox install intros

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-12 17:51:02 -08:00
Joao Fernandes 1b213f5ab5 Merge pull request #1114 from cpuguy83/1.10.3-cs4
Add release notes for 1.10.3-cs4
2017-01-12 17:08:19 -08:00
Brian Goff 0c474add6e Add release notes for 1.10.3-cs4
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-01-12 19:17:29 -05:00
Joao Fernandes 4dc2cd7a2f Merge pull request #1113 from joaofnfernandes/broken-links
Update links to DTR
2017-01-12 16:01:58 -08:00
Joao Fernandes 5008e56c7d Update links to DTR 2017-01-12 15:37:07 -08:00
Victoria Bialas 4afdfa1a93 Merge pull request #1096 from londoncalling/toolbox-install-links-web-launch
added links to Toolbox installer downloads via Releases page
2017-01-12 13:50:54 -08:00
Joao Fernandes 33ec8e404d Merge pull request #1108 from joaofnfernandes/redirect-dtr-install
Add new redirect for DTR install
2017-01-12 12:10:49 -08:00
Joao Fernandes a0d625b417 Merge pull request #1109 from cpuguy83/1.11.2-cs6
Add 1.11.2-cs6 release notes
2017-01-12 12:10:11 -08:00
Joao Fernandes 9c87f82b0f Merge pull request #1110 from joaofnfernandes/broken-links
Updates broken links for #1068
2017-01-12 12:08:27 -08:00
Victoria Bialas 6dfd8e9d2e added links to Toolbox installer downloads via Releases page
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-12 12:04:43 -08:00
Joao Fernandes f7a33dc833 Updates broken links for #1068 2017-01-12 11:54:21 -08:00
Brian Goff 144abc4204 Add 1.11.2-cs6 release notes
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-01-12 14:48:56 -05:00
Joao Fernandes c3ac3b3247 Add new redirect for DTR install 2017-01-12 11:43:14 -08:00
Joao Fernandes 3bcfe97272 Merge pull request #1080 from cpuguy83/1.12.6-cs
Add cs-engine 1.12.6-cs6 release notes
2017-01-12 10:25:31 -08:00
Brian Goff 1648228182 Add cs-engine 1.12.6-cs6 release notes
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-01-12 10:11:53 -08:00
LRubin 8a8bcde834 Merge pull request #1095 from sanscontext/fix-note
Some format fixing and light rewording on note
2017-01-12 09:26:06 -08:00
LRubin 64559ac1dc format fix and light rewording
Signed-off-by: LRubin <lrubin@docker.com>
2017-01-11 16:58:06 -08:00
LRubin 9157ec86aa Merge pull request #1094 from sanscontext/issue-1013
Cloud: docker is no longer optional in this 2nd tutorial
2017-01-11 16:42:23 -08:00
LRubin d5a6d2993c Merge pull request #1000 from kizbitz/patch-1
Update deploy-to-cloud-btn.md
2017-01-11 16:36:08 -08:00
LRubin e223f8117e docker is no longer optional in this tutorial
Signed-off-by: LRubin <lrubin@docker.com>
2017-01-11 16:21:36 -08:00
LRubin 32f0406945 Merge pull request #1092 from sanscontext/fix-cloud-links
more link fixes
2017-01-11 15:13:44 -08:00
LRubin 78ddec623b Merge pull request #1093 from aduermael/exclude-cloud-api-source
exclude /apidocs/cloud-api-source when building
2017-01-11 15:03:18 -08:00
LRubin a3a53fc3ff more more link link fixes fixes
Signed-off-by: LRubin <lrubin@docker.com>
2017-01-11 15:02:28 -08:00
Adrien Duermael 1ef7132a6f exclude /apidocs/cloud-api-source when building
Signed-off-by: Adrien Duermael <adrien@duermael.com>
2017-01-11 14:46:06 -08:00
LRubin fde978afc5 more link fixes
Signed-off-by: LRubin <lrubin@docker.com>
2017-01-11 14:43:52 -08:00
John Mulhausen 6f19cd1e0e Fixes #1086 2017-01-11 13:47:22 -08:00
LRubin ae80059160 Merge pull request #1088 from sanscontext/fix-cloud-links
url fixes for #1068
2017-01-11 13:39:57 -08:00
LRubin e059b654e0 url fixes for #1068
Signed-off-by: LRubin <lrubin@docker.com>
2017-01-11 13:26:50 -08:00
LRubin 613d448b1c Merge pull request #1087 from aduermael/absolute-urls-in-includes
fixed links in /apidocs/docker-cloud/includes
2017-01-11 12:17:34 -08:00
Adrien Duermael b193b00826 cf6fc379 fix had to be made in /apidocs/cloud-api-source
Signed-off-by: Adrien Duermael <adrien@duermael.com>
2017-01-11 12:06:08 -08:00
Adrien Duermael cf6fc37931 fixed links in /apidocs/docker-cloud/includes
urls in html files that are included must be absolute, otherwise it only works when the files are included in some specific location.

Signed-off-by: Adrien Duermael <adrien@duermael.com>
2017-01-11 11:04:11 -08:00
Andy Yu 333fe83af9 urls (#1074)
Signed-off-by: yupengzte <yu.peng36@zte.com.cn>
2017-01-10 14:56:22 -08:00
Solomon Hykes 443d84ec34 Change title (#1073) 2017-01-10 14:54:50 -08:00
Joao Fernandes 0805c821ad Merge pull request #1071 from joaofnfernandes/broken-links
Broken links
2017-01-09 15:53:15 -08:00
Joao Fernandes 4cf873e0de Fix DDC broken links reported on #1068 2017-01-09 15:06:03 -08:00
grahammadden fc8bd3ef9d Fix small typo in step_four.md. (#1053) 2017-01-09 14:04:32 -08:00
Juan Eugenio Abadie 9880cc46f2 Fix title (#1056)
The title is not rendered correctly because of the missing newline
2017-01-09 14:04:05 -08:00
Curtis Ekstrom 6c04d6b617 Fix typo (are -> area) (#1058) 2017-01-09 14:03:40 -08:00
LRubin 75cde9c698 Merge pull request #1066 from pkennedyr/patch-2
Update automated-testing.md
2017-01-09 10:36:56 -08:00
Ryan Kennedy 3563214873 Update automated-testing.md
Updated text to reflect that the `docker-compose.test.yml` file needs to be in the same directory as the Dockerfile used to build the image.
2017-01-09 10:20:13 -08:00
LRubin 9b96144191 Merge pull request #1051 from donovan/patch-1
Remove duplicate 'for details'
2017-01-06 16:58:22 -08:00
LRubin dbbdb4b26a Merge pull request #1049 from ralphtheninja/master
accross -> across
2017-01-06 13:57:23 -08:00
Donovan Jones d143fa4dc7 Remove duplicate 'for details'
Remove duplicate 'for details' in Docker Daemon Attack Surface line.
2017-01-07 10:53:03 +13:00
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