docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

d4mac replaced xhyve w/Hypervisor, random line re-formatting 

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
This commit is contained in:
Victoria Bialas 2016-12-19 17:49:30 -08:00
parent ee59978f9c
commit cc9ab0c074
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
toolbox/toolbox_install_mac.md
View File

@ -33,7 +33,12 @@ software. To find out what version of the OS you have:
If you aren't using a supported version, you could consider upgrading your
operating system.
If you have macOS 10.10.3 Yosemite or newer, consider using [Docker for Mac](/docker-for-mac/) instead. It runs natively on the Mac, so there is no need for a pre-configured Docker QuickStart shell. It uses xhyve for virtualization, instead of VirutalBox. Full install prerequisites are provided in the Docker for Mac topic in [Docker for Mac](/docker-for-mac/#what-to-know-before-you-install).
If you have macOS 10.10.3 Yosemite or newer, consider using [Docker for
Mac](/docker-for-mac/) instead. It runs natively on the Mac, so there is no
need for a pre-configured Docker QuickStart shell. It uses the native macOS
Hypervisor framework for virtualization, instead of Oracle VirutalBox. Full
install prerequisites are provided in the Docker for Mac topic in [Docker
for Mac](/docker-for-mac/#what-to-know-before-you-install).
## Step 2: Install Docker Toolbox

12
toolbox/toolbox_install_windows.md
View File

@ -27,9 +27,17 @@ To verify your machine meets these requirements, do the following:
1. Right click the windows message and choose **System**.
If you aren't using a supported version, you could consider upgrading your
operating system.
operating system.
If you have a newer system, specifically 64bit Windows 10 Pro, with Enterprise and Education (1511 November update, Build 10586 or later), consider using [Docker for Windows](/docker-for-windows) instead. It runs natively on the Windows, so there is no need for a pre-configured Docker QuickStart shell. It also uses Hyper-V for virtualization, so the instructions below for checking virtualization will be out of date for newer Windows systems. Full install prerequisites are provided in the Docker for Windows topic in [What to know before you install](/docker-for-windows/#what-to-know-before-you-install).
If you have a newer system, specifically 64bit Windows 10 Pro, with
Enterprise and Education (1511 November update, Build 10586 or later),
consider using [Docker for Windows](/docker-for-windows) instead. It runs
natively on the Windows, so there is no need for a pre-configured Docker
QuickStart shell. It also uses Hyper-V for virtualization, so the
instructions below for checking virtualization will be out of date for newer
Windows systems. Full install prerequisites are provided in the Docker for
Windows topic in [What to know before you
install](/docker-for-windows/#what-to-know-before-you-install).
2. Make sure your Windows system supports Hardware Virtualization Technology and that virtualization is enabled.