Commit Graph

44131 Commits

Author SHA1 Message Date
gbzhu f1598cad58 modify the user name (#946) 2016-12-20 17:18:38 -08:00
SRaddict cdbcb5d879 fix the grammer in aws.md (#948)
* fix the grammer in aws.md

* a and an
2016-12-20 17:18:15 -08:00
tim-zju 4a947c9c19 delete error asterisk (#947)
Signed-off-by: tim-zju <21651152@zju.edu.cn>
2016-12-20 17:17:27 -08:00
SRaddict 7da9ea3f42 fix the error of handing a and an (#953) 2016-12-20 17:16:54 -08:00
luojie233 f75e9787ee fix punctuation typos (#949)
Signed-off-by: Jie Luo <luo612@zju.edu.cn>
2016-12-20 17:16:22 -08:00
Victoria Bialas bdfb99957b Merge pull request #955 from londoncalling/d4mac-win-stable-1.13.0
d4mac, d4win stable 1.12.5 and beta 34 updates
2016-12-20 14:19:32 -08:00
Victoria Bialas f82c8aa86e d4mac, d4win stable 1.12.5 and beta 34 updates
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-12-20 14:11:53 -08:00
Joao Fernandes 3db461c548 Merge pull request #944 from joaofnfernandes/improve-diagrams
Improve DDC diagrams
2016-12-20 10:29:25 -08:00
Victoria Bialas 5345566f8c Merge pull request #945 from londoncalling/d4mac-requirements
clarify Docker for Mac OS requirements
2016-12-19 18:25:06 -08:00
Victoria Bialas 70101d0e08 clarify Docker for Mac OS requirements
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-12-19 18:07:31 -08:00
Victoria Bialas 1ab493ad94 Merge pull request #943 from londoncalling/toolbox-updates-per-d4mac-win
d4mac replaced xhyve w/Hypervisor, random line re-formatting
2016-12-19 18:01:32 -08:00
Joao Fernandes a5bf278899 Improve diagrams 2016-12-19 17:55:03 -08:00
Victoria Bialas cc9ab0c074 d4mac replaced xhyve w/Hypervisor, random line re-formatting
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-12-19 17:49:30 -08:00
Misty Stanley-Jones ee59978f9c Merge pull request #885 from programmerq/patch-2
you must add a second delegation
2016-12-19 16:06:34 -08:00
Misty Stanley-Jones 5a412eb6af Merge pull request #940 from mstanleyjones/747_storage_driver_improvement
Add info about required package thin-provisioning-tools
2016-12-19 16:04:56 -08:00
Misty Stanley-Jones e80cfecbee Add info about required package thin-provisioning-tools
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-12-19 15:59:24 -08:00
Misty Stanley-Jones cecc34d8cf Merge pull request #938 from docker/715_add_key_debian
Fix the command to add the Docker key on Debian
2016-12-19 15:46:59 -08:00
Misty Stanley-Jones 33701c8bef Fix the command to add the Docker key on Debian 2016-12-19 15:32:01 -08:00
Joao Fernandes 5022078dd5 Merge pull request #934 from SachinKSingh28/patch-1
Update dump-certs.md
2016-12-19 15:08:19 -08:00
Dan Keder 36ac04c1fa Add a note to `env_file` option (#932)
* Add a note to `env_file` option
2016-12-19 15:02:42 -08:00
Misty Stanley-Jones 79bd98b56e Merge pull request #918 from willseward/patch-1
Update btrfs-driver.md
2016-12-19 14:43:34 -08:00
Misty Stanley-Jones deceee678a Merge pull request #884 from svekars/using-jekyll-directly
Added minor changes to the README.md file:
2016-12-19 14:34:40 -08:00
Misty Stanley-Jones fdbb29f81a Minor whitespace fix 2016-12-19 14:23:52 -08:00
Misty Stanley-Jones dc22bdd7e8 Merge pull request #879 from buuren/patch-2
Update environment-variables.md
2016-12-19 14:22:17 -08:00
Misty Stanley-Jones 55be185ad2 Merge pull request #878 from ceharris/patch-1
use correct default socket path
2016-12-19 14:21:37 -08:00
Misty Stanley-Jones 6801369fbc Merge pull request #870 from mstanleyjones/720_whalesay_too_unixy
Add Windows info to Getting Started topics
2016-12-19 14:20:26 -08:00
Misty Stanley-Jones 676f532888 Merge pull request #864 from danshumaker/patch-1
Update index.md -- Adding Drupal
2016-12-19 14:19:45 -08:00
Misty Stanley-Jones 6890af3243 Merge pull request #848 from shaynewang/patch-1
Update aws.md
2016-12-19 14:18:44 -08:00
Misty Stanley-Jones f482d36a06 Merge pull request #846 from lslezak/patch-1
Update SUSE.md
2016-12-19 14:17:56 -08:00
Misty Stanley-Jones 5213a7e469 Merge pull request #826 from mazerty/patch-1
Update certificates.md
2016-12-19 14:17:02 -08:00
Misty Stanley-Jones 7183279abb Merge pull request #476 from alexisbellido/master
Clarify the fact that VOLUME does not support host-dir
2016-12-19 13:49:28 -08:00
Nils Otto Johansen 4e2ee1a40c documenting rateLimit wich leads to the confusion of #28641 (#670)
* documenting rateLimit which leads to the confusion of #28641
2016-12-19 11:15:45 -08:00
Sachin Kumar Singh e056d72dc9 Update dump-certs.md 2016-12-19 15:38:22 +00:00
Joao Fernandes fe5bf6d5fa Merge pull request #931 from joaofnfernandes/update-screenshots
Update DDC screenshots, christmas cleaning
2016-12-18 21:15:49 -08:00
Joao Fernandes 9111a3231e Update DDC screenshots, christmas cleaning 2016-12-18 20:55:47 -08:00
Victoria Bialas dcf66fa3e8 Merge pull request #925 from londoncalling/d4mac-d4win-faqs
added info on usage data options for beta vs. stable
2016-12-16 18:42:50 -08:00
Victoria Bialas 552b1a1cea added info on usage data options for beta vs. stable
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-12-16 18:25:50 -08:00
Victoria Bialas 42bcd85903 Merge pull request #924 from londoncalling/toolbox-troubleshoot-copyedits
fixed heading rendering by moving an <a name...> anchor tag
2016-12-16 17:45:25 -08:00
Victoria Bialas beb4ada0d3 fixed heading rendering by moving an <a name...> anchor tag
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-12-16 17:30:30 -08:00
Victoria Bialas 891b6185a7 Merge pull request #923 from londoncalling/d4mac-beta-33.1
added d4mac hotfix release notes
2016-12-16 17:22:40 -08:00
Victoria Bialas 774f8d1ad4 added d4mac hotfix release notes
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-12-16 17:04:34 -08:00
Victoria Bialas c44d528da9 Merge pull request #920 from docker/revert-716-compose-file-v3
Revert "Update Compose file reference for version 3"
2016-12-16 14:41:02 -08:00
Victoria Bialas d0b903fc07 Revert "Update Compose file reference for version 3" 2016-12-16 14:32:39 -08:00
Victoria Bialas 7f291684ad Merge pull request #716 from aanand/compose-file-v3
Update Compose file reference for version 3
2016-12-16 14:11:32 -08:00
LRubin 86b5bb4025 Merge pull request #919 from sanscontext/permsdefaults
Cloud: repo permissions and default privacy
2016-12-16 10:05:13 -08:00
LRubin cede175b2b Merge pull request #915 from sanscontext/combine-landings
improved combined Cloud landing/info pages
2016-12-16 10:01:56 -08:00
LRubin 3fe8d8730e repo permissions and default privacy
Signed-off-by: LRubin <lrubin@docker.com>
2016-12-16 10:00:27 -08:00
LRubin 0430663118 Merge pull request #916 from athend/patch-1
Update dockerizing.md
2016-12-16 09:57:33 -08:00
LRubin 8bbb8cf187 Merge pull request #917 from aimichal/patch-1
Update PULL_REQUEST_TEMPLATE.md
2016-12-16 09:56:55 -08:00
Wills Ward 261a0e8a87 Update btrfs-driver.md 2016-12-16 09:39:13 -06:00