Merge branch 'master' of github.com:docker/toolbox

docker-archive · Oct 30, 2015 · 884feee · 884feee
2 parents 359729d + 1170f67
commit 884feee
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -6,14 +6,14 @@ Docker Toolbox
 The Docker Toolbox installs everything you need to get started with
 Docker on Mac OS X and Windows, including:
 
-|                        | Mac    | Windows     | Desktop 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                             |
-| Delivery Format        | .pkg   | .exe        | script* (cURL)                 |
+|                        | Mac    | Windows     |
+|------------------------|--------|-------------|
+| Docker Client / Engine | Client | Client      |
+| Docker Machine         | Yes    | Yes         |
+| Docker Compose         | Yes    | Coming Soon |
+| Docker Kitematic       | Yes    | Yes         |
+| VirtualBox 5.0         | Yes    | Yes         |
+| Delivery Format        | .pkg   | .exe        |
 
 
 ## Installation and documentation