Merge pull request #6298 from fredlf/copyedits

Edits to Win and OSX install

docs/sources/installation/mac.md

@@ -7,13 +7,13 @@ page_keywords: Docker, Docker documentation, requirements, boot2docker, VirtualB
 > **Note:**
 > Docker is supported on Mac OS X 10.6 "Snow Leopard" or newer.
 
-The Docker Engine uses Linux-specific kernel features, so we run it on OS X
-using a lightweight virtual machine.  You can use the OS X Docker client to
-control the virtualized engine to build, run and manage Docker containers.
+The Docker Engine uses Linux-specific kernel features, so to run it on OS X
+we need to use a lightweight virtual machine (vm).  You use the OS X Docker client to
+control the virtualized Docker Engine to build, run, and manage Docker containers.
 
-To make this process easier we designed a helper application called
-[Boot2Docker](https://github.com/boot2docker/boot2docker) to install the
-virtual machine and run the Docker daemon.
+To make this process easier, we've designed a helper application called
+[Boot2Docker](https://github.com/boot2docker/boot2docker) that installs the
+virtual machine and runs the Docker daemon.
 
 ## Demonstration
 
@@ -31,7 +31,7 @@ virtual machine and run the Docker daemon.
 3. Run the `Boot2Docker` app in the `Applications` folder:
    ![](/installation/images/osx-Boot2Docker-Start-app.png)
 
-   Or to initiate Boot2Docker manually, open a terminal and run:
+   Or, to initiate Boot2Docker manually, open a terminal and run:
 
 	     $ boot2docker init
 	     $ boot2docker start
@@ -41,8 +41,8 @@ virtual machine and run the Docker daemon.
    (but least secure) is to just hit [Enter]. This passphrase is used by the
    `boot2docker ssh` command.
 
-Once you have an initialized virtual machine, you can `boot2docker stop`
-and `boot2docker start` it.
+Once you have an initialized virtual machine, you can control it with `boot2docker stop`
+and `boot2docker start`.
 
 ## Upgrading
 
@@ -60,36 +60,32 @@ and `boot2docker start` it.
 
 ## Running Docker
 
-From your terminal, you can try the “hello world” example. Run:
+From your terminal, you can test that Docker is running with a “hello world” example.
+Start the vm and then run:
 
     $ docker run ubuntu echo hello world
 
-This will download the `ubuntu` image and print `hello world`.
+This should download the `ubuntu` image and print `hello world`.
 
 ## Container port redirection
 
-The latest version of `boot2docker` sets up two network adapters: one using NAT
-to allow the VM to download images and files from the Internet, and one host only
-network adapter to which the container's ports will be exposed on.
+The latest version of `boot2docker` sets up a host only network adaptor which provides
+access to the container's ports.
 
-If you run a container with an exposed port:
+If you run a container with an exposed port,
 
     $ docker run --rm -i -t -p 80:80 apache
 
-Then you should be able to access that Apache server using the IP address reported
-to you using:
+then you should be able to access that Apache server using the IP address reported by:
 
     $ boot2docker ssh ip addr show dev eth1
 
-Typically, it is 192.168.59.103, but at this point it can change.
-
-If you want to share container ports with other computers on your LAN, you will
-need to set up [NAT adaptor based port forwarding](
-https://github.com/boot2docker/boot2docker/blob/master/doc/WORKAROUNDS.md)
+Typically, it is 192.168.59.103, but it could get changed by Virtualbox's DHCP
+implementation.
 
 # Further details
 
-The Boot2Docker management tool provides some commands:
+The Boot2Docker management tool provides several commands:
 
     $ ./boot2docker
     Usage: ./boot2docker [<options>]
@@ -97,4 +93,4 @@ The Boot2Docker management tool provides some commands:
 
 Continue with the [User Guide](/userguide/).
 
-For further information or to report issues, please see the [Boot2Docker site](http://boot2docker.io).
+For further information or to report issues, please visit the [Boot2Docker site](http://boot2docker.io).

docs/sources/installation/windows.md

@@ -3,14 +3,17 @@ page_description: Docker installation on Microsoft Windows
 page_keywords: Docker, Docker documentation, Windows, requirements, virtualbox, boot2docker
 
 # Windows
+> **Note:**
+> Docker has been tested on Windows 7.1 and 8; it may also run on older versions.
 
-Docker Engine runs on Windows using a lightweight virtual machine. There
-is no native Windows Docker client yet, so everything is done inside the virtual
-machine.
 
-To make this process easier we designed a helper application called
-[Boot2Docker](https://github.com/boot2docker/boot2docker) to install the
-virtual machine and run the Docker daemon.
+The Docker Engine uses Linux-specific kernel features, so to run it on OS X
+we need to use a lightweight virtual machine (vm).  You use the OS X Docker client to
+control the virtualized Docker Engine to build, run, and manage Docker containers.
+
+To make this process easier, we've designed a helper application called
+[Boot2Docker](https://github.com/boot2docker/boot2docker) that installs the
+virtual machine and runs the Docker daemon.
 
 ## Demonstration
 
@@ -19,8 +22,8 @@ virtual machine and run the Docker daemon.
 ## Installation
 
 1. Download the latest release of the [Docker for Windows Installer](https://github.com/boot2docker/windows-installer/releases)
-2. Run the installer, which will install VirtualBox, MSYS-git, the boot2docker Linux ISO and the
-   Boot2Docker management tool.
+2. Run the installer, which will install VirtualBox, MSYS-git, the boot2docker Linux ISO,
+and the Boot2Docker management tool.
    ![](/installation/images/windows-installer.png)
 3. Run the `Boot2Docker Start` shell script from your Desktop or Program Files > Docker.
    The Start script will ask you to enter an ssh key passphrase - the simplest
@@ -46,19 +49,18 @@ virtual machine and run the Docker daemon.
 
 ## Running Docker
 
-Boot2Docker will log you in automatically so you can start using Docker
-right away.
+Boot2Docker will log you in automatically so you can start using Docker right away.
 
 Let's try the “hello world” example. Run
 
     $ docker run busybox echo hello world
 
-This will download the small busybox image and print hello world.
+This will download the small busybox image and print "hello world".
 
 
 # Further Details
 
-The Boot2Docker management tool provides some commands:
+The Boot2Docker management tool provides several commands:
 
     $ ./boot2docker
     Usage: ./boot2docker [<options>] {help|init|up|ssh|save|down|poweroff|reset|restart|config|status|info|delete|download|version} [<args>]
@@ -66,8 +68,7 @@ The Boot2Docker management tool provides some commands:
 
 ## Container port redirection
 
-The latest version of `boot2docker` sets up a host only
-network adaptor on which the container's ports will be exposed.
+The latest version of `boot2docker` sets up a host only network adaptor which provides access to the container's ports.
 
 If you run a container with an exposed port:
 
@@ -78,6 +79,7 @@ to you using:
 
     boot2docker ip
 
-Typically, it is `192.168.59.103`, but it can change.
+Typically, it is 192.168.59.103, but it could get changed by Virtualbox's DHCP
+implementation.
 
 For further information or to report issues, please see the [Boot2Docker site](http://boot2docker.io)