Browse Source

Merge pull request #6789 from SvenDowideit/pr_out_expand_to_used_b2d_vm_on_any_of_the_platforms

expand to 'used b2d vm on any of the platforms'
Fred Lifton 11 years ago
parent
commit
5ff18b8155

+ 1 - 1
docs/sources/installation/binaries.md

@@ -36,7 +36,7 @@ In general, a 3.8 Linux kernel (or higher) is preferred, as some of the
 prior versions have known issues that are triggered by Docker.
 prior versions have known issues that are triggered by Docker.
 
 
 Note that Docker also has a client mode, which can run on virtually any
 Note that Docker also has a client mode, which can run on virtually any
-Linux kernel (it even builds on OSX!).
+Linux kernel (it even builds on OS X!).
 
 
 ## Get the docker binary:
 ## Get the docker binary:
 
 

+ 2 - 2
docs/sources/installation/mac.md

@@ -21,7 +21,7 @@ virtual machine and runs the Docker daemon.
 
 
 ## Installation
 ## Installation
 
 
-1. Download the latest release of the [Docker for OSX Installer](
+1. Download the latest release of the [Docker for OS X Installer](
    https://github.com/boot2docker/osx-installer/releases)
    https://github.com/boot2docker/osx-installer/releases)
 
 
 2. Run the installer, which will install VirtualBox and the Boot2Docker management
 2. Run the installer, which will install VirtualBox and the Boot2Docker management
@@ -42,7 +42,7 @@ and `boot2docker start`.
 
 
 ## Upgrading
 ## Upgrading
 
 
-1. Download the latest release of the [Docker for OSX Installer](
+1. Download the latest release of the [Docker for OS X Installer](
    https://github.com/boot2docker/osx-installer/releases)
    https://github.com/boot2docker/osx-installer/releases)
 
 
 2. Run the installer, which will update VirtualBox and the Boot2Docker management
 2. Run the installer, which will update VirtualBox and the Boot2Docker management

+ 3 - 2
docs/sources/userguide/usingdocker.md

@@ -179,8 +179,9 @@ see the application.
 Our Python application is live!
 Our Python application is live!
 
 
 > **Note:**
 > **Note:**
-> If you have used boot2docker on OSX you'll need to get the IP of the virtual
-> host instead of using localhost. You can do this by running the following in
+> If you have used the boot2docker virtual machine on OS X, Windows or Linux,
+> you'll need to get the IP of the virtual host instead of using localhost.
+> You can do this by running the following in
 > the boot2docker shell.
 > the boot2docker shell.
 > 
 > 
 >     $ boot2docker ip
 >     $ boot2docker ip