From fa4990af91b6a2bc3939ea9a270636c49d9ed106 Mon Sep 17 00:00:00 2001 From: Michael Chiang Date: Wed, 22 Jul 2015 19:26:51 -0700 Subject: [PATCH 1/3] Quit virtual box message. --- osx/mpkg/Resources/en.lproj/Localizable.strings | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osx/mpkg/Resources/en.lproj/Localizable.strings b/osx/mpkg/Resources/en.lproj/Localizable.strings index 5bb3f6cb4a..c80538a86e 100644 --- a/osx/mpkg/Resources/en.lproj/Localizable.strings +++ b/osx/mpkg/Resources/en.lproj/Localizable.strings @@ -21,8 +21,8 @@ 'choiceVBox_title' = 'Oracle VM VirtualBox %VBOX_VERSION%'; 'choiceVBox_msg' = 'Installs the Oracle VM VirtualBox application into /Applications.'; -'RUNNING_VMS_TLE' = "Running VirtualBox detected!"; -'RUNNING_VMS_MSG' = "The installer has detected that VirtualBox is still running. Please shutdown all running VirtualBox machines and exit VirtualBox. Then restart the Docker Toolbox installation."; +'RUNNING_VMS_TLE' = "Please Quit VirtualBox!"; +'RUNNING_VMS_MSG' = "The installer has detected that VirtualBox is still running. Please quit VirtualBox, and then restart the Docker Toolbox installation."; 'UNSUPPORTED_HW_MACHINE_TLE' = "Unsupported hardware architecture detected!"; 'UNSUPPORTED_HW_MACHINE_MSG' = "The installer has detected an unsupported architecture. VirtualBox only runs on the x86 and amd64 architectures."; From a71b477a3f3d2221c3671e0038389246660e6f4d Mon Sep 17 00:00:00 2001 From: Michael Chiang Date: Wed, 22 Jul 2015 19:39:51 -0700 Subject: [PATCH 2/3] update link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 606ce65a6c..308d8c8da2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![docker toolbox logo](https://cloud.githubusercontent.com/assets/251292/8687428/fd6ed9f0-2a44-11e5-9424-a3f1445e4845.png)](https://toolbox.docker.com) +[![docker toolbox logo](https://cloud.githubusercontent.com/assets/251292/8687428/fd6ed9f0-2a44-11e5-9424-a3f1445e4845.png)](https://www.docker.com/toolbox) The Docker Toolbox installs everything you need to get started with Docker on Mac OS X and Windows, including: From 6c1535543eeeb9ccf95e1b1d7f3d448509ed2ac0 Mon Sep 17 00:00:00 2001 From: Michael Chiang Date: Wed, 22 Jul 2015 19:45:16 -0700 Subject: [PATCH 3/3] Adding table for explaining target OSes. --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index 308d8c8da2..d8a537b79d 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,17 @@ Docker on Mac OS X and Windows, including: - Kitematic (Beta) - VirtualBox + +| | Mac | Windows | Linux (Help Wanted) | +|------------------------|--------|-------------|---------------------| +| Docker Client / Engine | Client | Client | Engine | +| Docker Machine | Yes | Yes | Yes | +| Docker Compose | Yes | Coming Soon | Yes | +| Docker Kitematic | Yes | Yes | Coming Soon | +| VirtualBox 5.0 | Yes | Yes | No | + + + ## Installation and documentation Full documentation [is available