From fc4c0d9de45da5ff5664fb9c914b68e176c626cd Mon Sep 17 00:00:00 2001 From: Tom Maaswinkel Date: Mon, 30 Jun 2014 10:16:49 +0200 Subject: [PATCH 1/3] Update usingdocker.md boot2docker on windows also uses an IP of its own. Docker-DCO-1.1-Signed-off-by: Tom Maaswinkel (github: SvenDowideit) --- docs/sources/userguide/usingdocker.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/userguide/usingdocker.md b/docs/sources/userguide/usingdocker.md index c1f524f89a..f08b41d7d0 100644 --- a/docs/sources/userguide/usingdocker.md +++ b/docs/sources/userguide/usingdocker.md @@ -179,7 +179,7 @@ see the application. Our Python application is live! > **Note:** -> If you have used boot2docker on OSX you'll need to get the IP of the virtual +> If you have used boot2docker on OSX, or Windows, 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. > From 84990731f79e4e94229a7ff2039f812e8b036643 Mon Sep 17 00:00:00 2001 From: SvenDowideit Date: Tue, 1 Jul 2014 12:02:39 +1000 Subject: [PATCH 2/3] expand to 'used b2d vm on any of the platforms' Docker-DCO-1.1-Signed-off-by: SvenDowideit (github: SvenDowideit) --- docs/sources/userguide/usingdocker.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/sources/userguide/usingdocker.md b/docs/sources/userguide/usingdocker.md index f08b41d7d0..16fdecc272 100644 --- a/docs/sources/userguide/usingdocker.md +++ b/docs/sources/userguide/usingdocker.md @@ -179,8 +179,9 @@ see the application. Our Python application is live! > **Note:** -> If you have used boot2docker on OSX, or Windows, 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 OSX, 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. > > $ boot2docker ip From 91c4fbb7bfe8851130f746911e34b9d190bb4572 Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Tue, 1 Jul 2014 14:59:28 -0700 Subject: [PATCH 3/3] convert OSX into OS X Docker-DCO-1.1-Signed-off-by: Sven Dowideit (github: SvenDowideit) --- docs/sources/installation/binaries.md | 2 +- docs/sources/installation/mac.md | 4 ++-- docs/sources/userguide/usingdocker.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/sources/installation/binaries.md b/docs/sources/installation/binaries.md index 97e2f93c4e..f6eb44fa64 100644 --- a/docs/sources/installation/binaries.md +++ b/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. 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: diff --git a/docs/sources/installation/mac.md b/docs/sources/installation/mac.md index b6253de12d..2aff0e5b89 100644 --- a/docs/sources/installation/mac.md +++ b/docs/sources/installation/mac.md @@ -21,7 +21,7 @@ virtual machine and runs the Docker daemon. ## 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) 2. Run the installer, which will install VirtualBox and the Boot2Docker management @@ -42,7 +42,7 @@ and `boot2docker start`. ## 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) 2. Run the installer, which will update VirtualBox and the Boot2Docker management diff --git a/docs/sources/userguide/usingdocker.md b/docs/sources/userguide/usingdocker.md index 16fdecc272..7080e3ed43 100644 --- a/docs/sources/userguide/usingdocker.md +++ b/docs/sources/userguide/usingdocker.md @@ -179,7 +179,7 @@ see the application. Our Python application is live! > **Note:** -> If you have used the boot2docker virtual machine on OSX, Windows or Linux, +> 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.