From 0be1dede6260d8ead59b2db21757dc510652834b Mon Sep 17 00:00:00 2001 From: Victoria Bialas Date: Mon, 19 Dec 2016 17:41:51 -0800 Subject: [PATCH] updates to d4win description per review comments Signed-off-by: Victoria Bialas --- docs/reference/glossary.md | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/docs/reference/glossary.md b/docs/reference/glossary.md index 7d87882f..6404b8ef 100644 --- a/docs/reference/glossary.md +++ b/docs/reference/glossary.md @@ -95,11 +95,24 @@ develop, ship, and run applications ## Docker for Mac -[Docker for Mac](https://docs.docker.com/docker-for-mac/) is an easy-to-install, lightweight Docker development environment designed specifically for the Mac. A native Mac application, Docker for Mac uses the macOS Hypervisor framework, networking, and filesystem. It's the best solution if you want to build, debug, test, package, and ship Dockerized applications on a Mac. Docker for Mac supersedes [Docker Toolbox](#toolbox) as state-of-the-art Docker for macOS. +[Docker for Mac](https://docs.docker.com/docker-for-mac/) is an easy-to-install, +lightweight Docker development environment designed specifically for the Mac. A +native Mac application, Docker for Mac uses the macOS Hypervisor framework, +networking, and filesystem. It's the best solution if you want to build, debug, +test, package, and ship Dockerized applications on a Mac. Docker for Mac +supersedes [Docker Toolbox](#toolbox) as state-of-the-art Docker for macOS. ## Docker for Windows -[Docker for Windows](https://docs.docker.com/docker-for-windows/) is an easy-to-install, lightweight Docker development environment designed specifically for Windows systems. Docker for Windows uses Microsoft Hyper-V, and runs as a native Windows app. It works with Windows Server 2016, and gives you the ability to set up and run Windows containers as well as the standard Linux containers (with an option to switch between the two). Docker for Windows is the best solution if you want to build, debug, test, package, and ship Dockerized applications on Windows machines. It supersedes [Docker Toolbox](#toolbox) as state-of-the-art Docker on Windows. +[Docker for Windows](https://docs.docker.com/docker-for-windows/) is an +easy-to-install, lightweight Docker development environment designed +specifically for Windows systems. Docker for Windows uses Microsoft Hyper-V, and +runs as a native Windows app. It works with Windows Server 2016, and gives you +the ability to set up and run Windows containers as well as the standard Linux +containers (with an option to switch between the two). Docker for Windows is the +best solution if you want to build, debug, test, package, and ship Dockerized +applications on Windows machines. It supersedes [Docker Toolbox](#toolbox) as +state-of-the-art Docker on Windows. ## Docker Hub @@ -272,18 +285,23 @@ containers. ## Toolbox -[Docker Toolbox](https://docs.docker.com/toolbox/overview/) is a legacy installer for Mac and Windows users. It uses Oracle VirtualBox for virtualization. +[Docker Toolbox](https://docs.docker.com/toolbox/overview/) is a legacy +installer for Mac and Windows users. It uses Oracle VirtualBox for +virtualization. -For Macs running OS X El Capitan 10.11 and newer macOS releases, [Docker for Mac](https://docs.docker.com/docker-for-mac/) is the better solution. +For Macs running OS X El Capitan 10.11 and newer macOS releases, [Docker for +Mac](https://docs.docker.com/docker-for-mac/) is the better solution. -For Windows systems running Windows 10 Pro and Microsoft Hyper-V, [Docker for Windows](https://docs.docker.com/docker-for-windows/) is the better solution. +For Windows 10 systems that support Microsoft Hyper-V (Professional, Enterprise +and Education), [Docker for +Windows](https://docs.docker.com/docker-for-windows/) is the better solution. ## Union file system -Union file systems, or UnionFS, are file systems that operate by creating layers, making them -very lightweight and fast. Docker uses union file systems to provide the building -blocks for containers. +Union file systems, or UnionFS, are file systems that operate by creating +layers, making them very lightweight and fast. Docker uses union file systems to +provide the building blocks for containers. ## virtual machine