Browse code

Revise Windows Docker instructions * Fix Windows 7 (not 7.1 ;p) * Clarify virtualization technology section, add link to wiki * Fix heading level for various ways of starting Docker container * Clarify `default` VM * Various minor changes

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>

Charles Chan authored on 2015/08/22 14:06:11
Showing 1 changed files
... ...
@@ -31,16 +31,17 @@ small ~24MB download, and boots in approximately 5s.
31 31
 
32 32
 ## Requirements
33 33
 
34
-Your machine must be running Windows 7.1, 8/8.1 or newer to run Docker. Windows 10 is not currently supported. To find out what version of Windows you have:
34
+Your machine must be running Windows 7, 8/8.1 or newer to run Docker. Windows 10 is not currently supported. To find out what version of Windows you have:
35 35
 
36
-1. Right click the Windows message and choose **System**. 
36
+1. Right click the Windows Start Menu and choose **System**.
37 37
 
38 38
     ![Which version](/installation/images/win_ver.png)
39 39
     
40
-    If you aren't using a supported version, you could consider upgrading your
41
-    operating system.
40
+    If you are using an unsupported version of Windows, you should consider
41
+    upgrading your operating system in order to try out Docker.
42 42
 
43
-2. Make sure your Windows system supports Hardware Virtualization Technology and that virtualization is enabled.
43
+2. Make sure your CPU supports [virtualization technology](https://en.wikipedia.org/wiki/X86_virtualization) 
44
+and virtualzation support is enabled in BIOS and recognized by Windows.
44 45
 
45 46
     #### For Windows 8 or 8.1
46 47
 
... ...
@@ -51,7 +52,7 @@ Your machine must be running Windows 7.1, 8/8.1 or newer to run Docker. Windows
51 51
     
52 52
     If virtualization is not enabled on your system, follow the manufacturer's instructions for enabling it.
53 53
     
54
-    ### For Windows 7 
54
+    #### For Windows 7
55 55
     
56 56
 	  Run the <a
57 57
 	  href="http://www.microsoft.com/en-us/download/details.aspx?id=592"
... ...
@@ -110,7 +111,7 @@ installer.
110 110
     installation. By default, the standard Docker Toolbox installation:
111 111
   
112 112
     * installs executables for the Docker tools in `C:\Program Files\Docker Toolbox` 
113
-    * updates any existing VirtualBox installation 
113
+    * install VirtualBox; or updates any existing installation
114 114
     * adds a Docker Inc. folder to your program shortcuts
115 115
     * updates your `PATH` environment variable
116 116
     * adds desktop icons for the Docker Quickstart Terminal and Kitematic
... ...
@@ -130,7 +131,7 @@ installer.
130 130
    
131 131
      ![All finished](/installation/images/windows-finish.png)
132 132
    
133
-7. Press "Close" to exit.
133
+7. Press "Finish" to exit.
134 134
 
135 135
 ## Running a Docker Container
136 136
 
... ...
@@ -146,14 +147,14 @@ VirtualBox VM, it maintains its configuration between uses.
146 146
 There are several ways to use the installed tools, from the Docker Quickstart Terminal or
147 147
 [from your shell](#from-your-shell).
148 148
 
149
-### From the Docker Quickstart Terminal
149
+### Using the Docker Quickstart Terminal
150 150
 
151 151
 1. Find the Docker Quickstart Terminal icon on your Desktop and double-click to launch it.
152 152
 
153 153
     The application:
154 154
 
155 155
     * opens a terminal window
156
-    * creates a `default` if it doesn't exist, starts the VM if it does
156
+    * creates a `default` VM if it doesn't exist, and starts the VM after
157 157
     * points the terminal environment to this VM
158 158
 
159 159
     Once the launch completes, you can run `docker` commands. 
... ...
@@ -188,9 +189,9 @@ There are several ways to use the installed tools, from the Docker Quickstart Te
188 188
         http://docs.docker.com/userguide/
189 189
 
190 190
 
191
-## Using Docker from Windows Command Line Prompt (cmd.exe)
191
+### Using Docker from Windows Command Prompt (cmd.exe)
192 192
 
193
-1. Launch a Windows Command Line Prompt (cmd.exe).
193
+1. Launch a Windows Command Prompt (cmd.exe).
194 194
 
195 195
     The `docker-machine` command requires `ssh.exe` in your `PATH` environment
196 196
     variable. This `.exe` is in the MsysGit `bin` folder. 
... ...
@@ -234,7 +235,7 @@ There are several ways to use the installed tools, from the Docker Quickstart Te
234 234
 
235 235
         C:\Users\mary> docker run hello-world
236 236
 
237
-## Using Docker from PowerShell
237
+### Using Docker from PowerShell
238 238
 
239 239
 1. Launch a Windows PowerShell window.
240 240
 
... ...
@@ -269,13 +270,13 @@ There are several ways to use the installed tools, from the Docker Quickstart Te
269 269
 
270 270
 Toolbox installs the Docker Engine binary in the `C:\Program Files\Docker
271 271
 Toolbox` directory. When you use the Docker Quickstart Terminal or create a
272
-`default` manually, Docker Machine updates the
272
+`default` VM manually, Docker Machine updates the
273 273
 `C:\USERS\USERNAME\.docker\machine\machines\default` folder to your
274 274
 system. This folder contains the configuration for the VM.
275 275
 
276
-You can create multiple VMs on your system with Docker Machine. So, you may have
277
-more than one VM folder if you have more than one VM. To remove a VM, use the
278
-`docker-machine rm <machine-name>` command.
276
+You can create multiple VMs on your system with Docker Machine. Therefore, you
277
+may end up with multiple VM folders if you have created more than one VM. To
278
+remove a VM, use the `docker-machine rm <machine-name>` command.
279 279
 
280 280
 ## Migrate from Boot2Docker
281 281
 
... ...
@@ -321,7 +322,7 @@ installer](https://www.docker.com/toolbox).
321 321
 
322 322
 ## Container port redirection
323 323
 
324
-If you are curious, the username for the Docker default user is `docker` and the
324
+If you are curious, the username for the Docker default VM is `docker` and the
325 325
 password is `tcuser`. The latest version of `docker-machine` sets up a host only
326 326
 network adaptor which provides access to the container's ports.
327 327