From cc9ab0c074e841ac94e7aad7569cdc9c4cdd2956 Mon Sep 17 00:00:00 2001 From: Victoria Bialas Date: Mon, 19 Dec 2016 17:49:30 -0800 Subject: [PATCH] d4mac replaced xhyve w/Hypervisor, random line re-formatting Signed-off-by: Victoria Bialas --- toolbox/toolbox_install_mac.md | 7 ++++++- toolbox/toolbox_install_windows.md | 12 ++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/toolbox/toolbox_install_mac.md b/toolbox/toolbox_install_mac.md index 736e731b1c..3865a75eb2 100644 --- a/toolbox/toolbox_install_mac.md +++ b/toolbox/toolbox_install_mac.md @@ -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 diff --git a/toolbox/toolbox_install_windows.md b/toolbox/toolbox_install_windows.md index 30014b364d..c4d7844fff 100644 --- a/toolbox/toolbox_install_windows.md +++ b/toolbox/toolbox_install_windows.md @@ -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.