From e48ee45412f0b6ee19588c57096b6d3e0be725eb Mon Sep 17 00:00:00 2001
From: Rob <me@robhaswell.co.uk>
Date: Fri, 5 Dec 2014 14:50:29 +0100
Subject: [PATCH 1/5] Update the example port to the new official Docker port.

---
 README.md | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 708d4d4f14..f0cd42a989 100644
--- a/README.md
+++ b/README.md
@@ -37,26 +37,26 @@ $ swarm create
 6856663cdefdec325839a4b7e1de38e8
 
 # on each of your nodes, start the swarm agent
-$ swarm join --token=6856663cdefdec325839a4b7e1de38e8 --addr=<docker_daemon_ip1:4243>
-$ swarm join --token=6856663cdefdec325839a4b7e1de38e8 --addr=<docker_daemon_ip2:4243>
-$ swarm join --token=6856663cdefdec325839a4b7e1de38e8 --addr=<docker_daemon_ip3:4243>
+$ swarm join --token=6856663cdefdec325839a4b7e1de38e8 --addr=<docker_daemon_ip1:2375>
+$ swarm join --token=6856663cdefdec325839a4b7e1de38e8 --addr=<docker_daemon_ip2:2375>
+$ swarm join --token=6856663cdefdec325839a4b7e1de38e8 --addr=<docker_daemon_ip3:2375>
 ...
 
 # start the manager on any machine or your laptop
-$ swarm manage --token=6856663cdefdec325839a4b7e1de38e8 --addr=<swarm_ip:4243>
+$ swarm manage --token=6856663cdefdec325839a4b7e1de38e8 --addr=<swarm_ip:2375>
 
 # use the regular docker cli
-$ docker -H <swarm_ip:4243> info
-$ docker -H <swarm_ip:4243> run ... 
-$ docker -H <swarm_ip:4243> ps 
-$ docker -H <swarm_ip:4243> logs ...
+$ docker -H <swarm_ip:2375> info
+$ docker -H <swarm_ip:2375> run ... 
+$ docker -H <swarm_ip:2375> ps 
+$ docker -H <swarm_ip:2375> logs ...
 ...
 
 # list nodes in your cluster
 $ swarm list --token=6856663cdefdec325839a4b7e1de38e8
-http://<docker_daemon_ip1:4243>
-http://<docker_daemon_ip2:4243>
-http://<docker_daemon_ip3:4243>
+http://<docker_daemon_ip1:2375>
+http://<docker_daemon_ip2:2375>
+http://<docker_daemon_ip3:2375>
 ```
 
 ## Participating

From 73b4ed57e58696831e49ee1bac737c46cafb606b Mon Sep 17 00:00:00 2001
From: Rob <me@robhaswell.co.uk>
Date: Fri, 5 Dec 2014 14:51:34 +0100
Subject: [PATCH 2/5] Rename docker_daemon_ip1 to public_node_ip for clarity.

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index f0cd42a989..71e3db19c0 100644
--- a/README.md
+++ b/README.md
@@ -37,9 +37,9 @@ $ swarm create
 6856663cdefdec325839a4b7e1de38e8
 
 # on each of your nodes, start the swarm agent
-$ swarm join --token=6856663cdefdec325839a4b7e1de38e8 --addr=<docker_daemon_ip1:2375>
-$ swarm join --token=6856663cdefdec325839a4b7e1de38e8 --addr=<docker_daemon_ip2:2375>
-$ swarm join --token=6856663cdefdec325839a4b7e1de38e8 --addr=<docker_daemon_ip3:2375>
+$ swarm join --token=6856663cdefdec325839a4b7e1de38e8 --addr=<public_node_ip1:2375>
+$ swarm join --token=6856663cdefdec325839a4b7e1de38e8 --addr=<public_node_ip2:2375>
+$ swarm join --token=6856663cdefdec325839a4b7e1de38e8 --addr=<public_node_ip3:2375>
 ...
 
 # start the manager on any machine or your laptop
@@ -54,9 +54,9 @@ $ docker -H <swarm_ip:2375> logs ...
 
 # list nodes in your cluster
 $ swarm list --token=6856663cdefdec325839a4b7e1de38e8
-http://<docker_daemon_ip1:2375>
-http://<docker_daemon_ip2:2375>
-http://<docker_daemon_ip3:2375>
+http://<public_node_ip1:2375>
+http://<public_node_ip2:2375>
+http://<public_node_ip3:2375>
 ```
 
 ## Participating

From b7b1c977a193d1984de8e7c0c990d58ee2d9998d Mon Sep 17 00:00:00 2001
From: Rob <me@robhaswell.co.uk>
Date: Fri, 5 Dec 2014 14:52:08 +0100
Subject: [PATCH 3/5] Remove duplicated join commands.

---
 README.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 71e3db19c0..73f62a5e00 100644
--- a/README.md
+++ b/README.md
@@ -37,9 +37,7 @@ $ swarm create
 6856663cdefdec325839a4b7e1de38e8
 
 # on each of your nodes, start the swarm agent
-$ swarm join --token=6856663cdefdec325839a4b7e1de38e8 --addr=<public_node_ip1:2375>
-$ swarm join --token=6856663cdefdec325839a4b7e1de38e8 --addr=<public_node_ip2:2375>
-$ swarm join --token=6856663cdefdec325839a4b7e1de38e8 --addr=<public_node_ip3:2375>
+$ swarm join --token=6856663cdefdec325839a4b7e1de38e8 --addr=<public_node_ip:2375>
 ...
 
 # start the manager on any machine or your laptop

From d6e91bba23db81d227a171c00866f7620552bb42 Mon Sep 17 00:00:00 2001
From: Victor Vieux <vieux@docker.com>
Date: Mon, 8 Dec 2014 21:17:17 +0000
Subject: [PATCH 4/5] remove go install and use go get -u

Signed-off-by: Victor Vieux <vieux@docker.com>
---
 README.md | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 73f62a5e00..a90ac88753 100644
--- a/README.md
+++ b/README.md
@@ -10,14 +10,8 @@ Like the other Docker projects, `swarm` follows the "batteries included but remo
 
 ### Installation
 
-######1 - Download the current source code.
 ```sh
-go get github.com/docker/swarm
-```
-
-######2 - Compile and install `swarm`
-```sh
-go install github.com/docker/swarm
+go get -u github.com/docker/swarm
 ```
 
 ######3 - Nodes setup

From e4655e112856a3b627359703313088beda31f8e7 Mon Sep 17 00:00:00 2001
From: Victor Vieux <vieux@docker.com>
Date: Mon, 8 Dec 2014 21:22:12 +0000
Subject: [PATCH 5/5] update node_ip

Signed-off-by: Victor Vieux <vieux@docker.com>
---
 README.md | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index a90ac88753..07e43c3f17 100644
--- a/README.md
+++ b/README.md
@@ -10,11 +10,12 @@ Like the other Docker projects, `swarm` follows the "batteries included but remo
 
 ### Installation
 
+######1 - Download and install the current source code.
 ```sh
 go get -u github.com/docker/swarm
 ```
 
-######3 - Nodes setup
+######2 - Nodes setup
 The only requirement for Swarm nodes is to run a regular Docker daemon.
 
 In order for Swarm to be able to communicate with its nodes, they must bind on a network interface.
@@ -31,24 +32,23 @@ $ swarm create
 6856663cdefdec325839a4b7e1de38e8
 
 # on each of your nodes, start the swarm agent
-$ swarm join --token=6856663cdefdec325839a4b7e1de38e8 --addr=<public_node_ip:2375>
-...
+#  <node_ip> doesn't have to be public (eg. 192.168.0.X),
+#  as long as the other nodes can reach it, it is fine.
+$ swarm join --token=6856663cdefdec325839a4b7e1de38e8 --addr=<node_ip:2375>
 
 # start the manager on any machine or your laptop
-$ swarm manage --token=6856663cdefdec325839a4b7e1de38e8 --addr=<swarm_ip:2375>
+$ swarm manage --token=6856663cdefdec325839a4b7e1de38e8 --addr=<swarm_ip:swarm_port>
 
 # use the regular docker cli
-$ docker -H <swarm_ip:2375> info
-$ docker -H <swarm_ip:2375> run ... 
-$ docker -H <swarm_ip:2375> ps 
-$ docker -H <swarm_ip:2375> logs ...
+$ docker -H <swarm_ip:swarm_port> info
+$ docker -H <swarm_ip:swarm_port> run ... 
+$ docker -H <swarm_ip:swarm_port> ps 
+$ docker -H <swarm_ip:swarm_port> logs ...
 ...
 
 # list nodes in your cluster
 $ swarm list --token=6856663cdefdec325839a4b7e1de38e8
-http://<public_node_ip1:2375>
-http://<public_node_ip2:2375>
-http://<public_node_ip3:2375>
+http://<node_ip:2375>
 ```
 
 ## Participating