Browse code

Merge pull request #29561 from londoncalling/docs-glossary-d4mac-d4win

updates to glossary re: d4mac, d4win, toolbox per user request
(cherry picked from commit fb41283e493ab5d9c083433cdffdf2fba4019ecb)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2016/12/21 10:16:28
Showing 1 changed files
... ...
@@ -115,6 +115,27 @@ develop, ship, and run applications
115 115
 - The docker daemon process running on the host which manages images and containers
116 116
 
117 117
 
118
+## Docker for Mac
119
+
120
+[Docker for Mac](https://docs.docker.com/docker-for-mac/) is an easy-to-install,
121
+lightweight Docker development environment designed specifically for the Mac. A
122
+native Mac application, Docker for Mac uses the macOS Hypervisor framework,
123
+networking, and filesystem. It's the best solution if you want to build, debug,
124
+test, package, and ship Dockerized applications on a Mac. Docker for Mac
125
+supersedes [Docker Toolbox](#toolbox) as state-of-the-art Docker for macOS.
126
+
127
+## Docker for Windows
128
+
129
+[Docker for Windows](https://docs.docker.com/docker-for-windows/) is an
130
+easy-to-install, lightweight Docker development environment designed
131
+specifically for Windows systems. Docker for Windows uses Microsoft Hyper-V, and
132
+runs as a native Windows app. It works with Windows Server 2016, and gives you
133
+the ability to set up and run Windows containers as well as the standard Linux
134
+containers (with an option to switch between the two). Docker for Windows is the
135
+best solution if you want to build, debug, test, package, and ship Dockerized
136
+applications on Windows machines. It supersedes [Docker Toolbox](#toolbox) as
137
+state-of-the-art Docker on Windows.
138
+
118 139
 ## Docker Hub
119 140
 
120 141
 The [Docker Hub](https://hub.docker.com/) is a centralized resource for working with
... ...
@@ -286,14 +307,23 @@ containers.
286 286
 
287 287
 ## Toolbox
288 288
 
289
-Docker Toolbox is the installer for Mac and Windows users.
289
+[Docker Toolbox](https://docs.docker.com/toolbox/overview/) is a legacy
290
+installer for Mac and Windows users. It uses Oracle VirtualBox for
291
+virtualization.
292
+
293
+For Macs running OS X El Capitan 10.11 and newer macOS releases, [Docker for
294
+Mac](https://docs.docker.com/docker-for-mac/) is the better solution.
295
+
296
+For Windows 10 systems that support Microsoft Hyper-V (Professional, Enterprise
297
+and Education), [Docker for
298
+Windows](https://docs.docker.com/docker-for-windows/) is the better solution.
290 299
 
291 300
 
292 301
 ## Union file system
293 302
 
294
-Union file systems, or UnionFS, are file systems that operate by creating layers, making them
295
-very lightweight and fast. Docker uses union file systems to provide the building
296
-blocks for containers.
303
+Union file systems, or UnionFS, are file systems that operate by creating
304
+layers, making them very lightweight and fast. Docker uses union file systems to
305
+provide the building blocks for containers.
297 306
 
298 307
 
299 308
 ## virtual machine