From 416225f5541578106600ba6c18ffe2294a2a6aa8 Mon Sep 17 00:00:00 2001
From: Gabriele Farina <gabr.farina@gmail.com>
Date: Sun, 18 Oct 2015 21:50:39 +0100
Subject: [PATCH] Update OS/X instructions.

Update to reflect recent changes in docker-machine for OS/X users.

Related to this change: docker/machine#1791
---
 docs/getting-started-guides/docker.md | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/docs/getting-started-guides/docker.md b/docs/getting-started-guides/docker.md
index 17a9a9daf70..225c76d1c4f 100644
--- a/docs/getting-started-guides/docker.md
+++ b/docs/getting-started-guides/docker.md
@@ -121,13 +121,33 @@ binary
 ([OS X](https://storage.googleapis.com/kubernetes-release/release/v1.0.1/bin/darwin/amd64/kubectl))
 ([linux](https://storage.googleapis.com/kubernetes-release/release/v1.0.1/bin/linux/amd64/kubectl))
 
-*Note:*
-On OS/X you will need to set up port forwarding via ssh:
+<hr>
+
+**Note for OS/X users:**
+You will need to set up port forwarding via ssh. For users still using boot2docker directly, it is enough to run the command:
 
 ```sh
 boot2docker ssh -L8080:localhost:8080
 ```
 
+Since the recent deprecation of boot2docker/osx-installer, the correct way to solve the problem is to issue
+
+```sh
+docker-machine ssh default -L 8080:localhost:8080
+```
+
+However, this solution works only from docker-machine version 0.5. For older versions of docker-machine, a workaround is the
+following:
+
+```sh
+docker-machine env default
+ssh -f -T -N -L8080:localhost:8080 -l docker $(echo $DOCKER_HOST | cut -d ':' -f 2 | tr -d '/')
+```
+
+Type `tcuser` as the password.
+
+<hr>
+
 List the nodes in your cluster by running:
 
 ```sh