Browse code

Merge pull request #25422 from sfsmithcha/fix_tutorial_advisory

update D4M D4W advisory in swarm tutorial
(cherry picked from commit e4bca493568c2b67bb45fc488cf7c8a81d55e3d3)

Sebastiaan van Stijn authored on 2016/08/06 01:37:35
Showing 1 changed files
... ...
@@ -50,23 +50,16 @@ provider. This tutorial uses the following machine names:
50 50
 
51 51
 ###  Docker Engine 1.12 or later
52 52
 
53
-You must install Docker Engine on each one of the host machines. To use swarm
54
-mode, install the Docker Engine `v1.12.0` or later from the [Docker releases
55
-GitHub repository](https://github.com/docker/docker/releases). Alternatively,
56
-install the latest Docker for Mac or Docker for Windows Beta.
53
+To use swarm mode, you must [install Docker Engine](../../installation/index.md)
54
+on each one of the host machines. Alternatively, install the latest Docker for
55
+Mac or Docker for Windows.
57 56
 
58
->**Advisory**: Some multi-node features may not work for Docker for Mac Beta and
59
-Docker for Windows Beta. We're working on the multi-node features for GA.
57
+>**Note**: Docker for Mac and Docker for Windows let you use single-node
58
+features of swarm mode, like creating a swarm and creating a service. Multi-node
59
+features like joining additional nodes and scaling a service are not available.
60 60
 
61 61
 Verify that the Docker Engine daemon is running on each of the machines.
62 62
 
63
-<!-- See the following options to install:
64
-
65
-* [Install Docker Engine](../../installation/index.md).
66
-
67
-* [Example: Manual install on cloud provider](../../installation/cloud/cloud-ex-aws.md).
68
-
69 63
 ### The IP address of the manager machine
70 64
 
71 65
 The IP address must be assigned to an a network interface available to the host