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

fixing HTML on Kitematic, Mac, Windows, Toolbox docs for github.io rendering, plus copyedits 

copyedits

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
This commit is contained in:
Victoria Bialas 2016-10-03 16:09:10 -07:00
parent f759b96301
commit 432f9af1d3
4 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker-for-mac/index.md
View File

@ -63,7 +63,7 @@ For more about stable and beta channels, see the [FAQs](faqs.md#stable-and-beta-
* **README FIRST for Docker Toolbox and Docker Machine users**: If you are already running Docker on your machine, first read [Docker for Mac vs. Docker Toolbox](docker-toolbox.md) to understand the impact of this installation on your existing setup, how to set your environment for Docker for Mac, and how the two products can coexist.
* **Relationship to Docker Machine**: Installing Docker for Mac does not affect machines you created with Docker Machine. You'll get the option to copy containers and images from your local `default` machine (if one exists) to the new Docker for Mac <a href="https://github.com/docker/HyperKit/" target="_blank">HyperKit</a> VM.
* **Relationship to Docker Machine**: Installing Docker for Mac does not affect machines you created with Docker Machine. You'll get the option to copy containers and images from your local `default` machine (if one exists) to the new Docker for Mac <a href="https://github.com/docker/HyperKit/" target="_blank">HyperKit</a> VM. When you are running Docker for Mac, you do not need Docker Machine nodes running at all locally (or anywhere else). With Docker for Mac, you have a new, native virtualization system running (HyperKit) which takes the place of the VirtualBox system. To learn more, see [Docker for Mac vs. Docker Toolbox](docker-toolbox.md).
* **System Requirements**: Docker for Mac will launch only if all these requirements are met.

2
docker-for-windows/index.md
View File

@ -61,8 +61,6 @@ If you have not already done so, please install Docker for Windows. You can down
* **README FIRST for Docker Toolbox and Docker Machine users**: Docker for Windows requires Microsoft Hyper-V to run. After Hyper-V is enabled, VirtualBox will no longer work, but any VirtualBox VM images will remain. VirtualBox VMs created with `docker-machine` (including the `default` one typically created during Toolbox install) will no longer start. These VMs cannot be used side-by-side with Docker for Windows. However, you can still use `docker-machine` to manage remote VMs.
* You can import a `default` VirtualBox VM after installing Docker for Windows by using the **Settings** menu in the System Tray.
* The current version of Docker for Windows runs on 64bit Windows 10 Pro, Enterprise and Education (1511 November update, Build 10586 or later). In the future we will support more versions of Windows 10.
* Containers and images created with Docker for Windows are shared between all user accounts on machines where it is installed. This is because all Windows accounts will use the same VM to build and run containers. In the future, Docker for Windows will better isolate user content.

6
kitematic/userguide.md
View File

@ -146,10 +146,8 @@ start a container.
The list of environment variables will show any that have been set on the image
metadata - for example, using the `ENV` instruction in the Dockerfile.
<!-- TODO: image of the jenkins container-->
When you "Save" the changed environment variables, the container will be stopped,
removed and re-created.
When you "Save" the changed environment variables, the container will be
stopped, removed and re-created.
### Delete container

16
toolbox/toolbox_install_windows.md
View File

@ -39,21 +39,21 @@ To verify your machine meets these requirements, do the following:
2. Make sure your Windows system supports Hardware Virtualization Technology and that virtualization is enabled.
#### For Windows 8 or 8.1
<br>
**For Windows 8 or 8.1**
Choose **Start > Task Manager** and navigate to the **Performance** tab.
Choose **Start > Task Manager** and navigate to the **Performance** tab.
Under **CPU** you should see the following:
![Release page](images/virtualization.png)
![Release page](images/virtualization.png)
If virtualization is not enabled on your system, follow the manufacturer's instructions for enabling it.
### For Windows 7
Run the <a href="http://www.microsoft.com/en-us/download/details.aspx?id=592"
target="_blank"> Microsoft® Hardware-Assisted Virtualization Detection Tool</a>
and follow the on-screen instructions.
<br>
**For Windows 7**
Run the [Microsoft® Hardware-Assisted Virtualization Detection Tool](http://www.microsoft.com/en-us/download/details.aspx?id=592) and follow the on-screen instructions.
<br><br>
3. Verify your Windows OS is 64-bit (x64)
How you do this verification depends on your Windows version. For details, see the Windows