瀏覽代碼

Merge pull request #25422 from sfsmithcha/fix_tutorial_advisory

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

Signed-off-by: Tibor Vass <tibor@docker.com>
Sebastiaan van Stijn 9 年之前
父節點
當前提交
33cabf2658
共有 1 個文件被更改,包括 6 次插入13 次删除
  1. 6 13
      docs/swarm/swarm-tutorial/index.md

+ 6 - 13
docs/swarm/swarm-tutorial/index.md

@@ -50,23 +50,16 @@ provider. This tutorial uses the following machine names:
 
 
 ###  Docker Engine 1.12 or later
 ###  Docker Engine 1.12 or later
 
 
-You must install Docker Engine on each one of the host machines. To use swarm
-mode, install the Docker Engine `v1.12.0` or later from the [Docker releases
-GitHub repository](https://github.com/docker/docker/releases). Alternatively,
-install the latest Docker for Mac or Docker for Windows Beta.
+To use swarm mode, you must [install Docker Engine](../../installation/index.md)
+on each one of the host machines. Alternatively, install the latest Docker for
+Mac or Docker for Windows.
 
 
->**Advisory**: Some multi-node features may not work for Docker for Mac Beta and
-Docker for Windows Beta. We're working on the multi-node features for GA.
+>**Note**: Docker for Mac and Docker for Windows let you use single-node
+features of swarm mode, like creating a swarm and creating a service. Multi-node
+features like joining additional nodes and scaling a service are not available.
 
 
 Verify that the Docker Engine daemon is running on each of the machines.
 Verify that the Docker Engine daemon is running on each of the machines.
 
 
-<!-- See the following options to install:
-
-* [Install Docker Engine](../../installation/index.md).
-
-* [Example: Manual install on cloud provider](../../installation/cloud/cloud-ex-aws.md).
--->
-
 ### The IP address of the manager machine
 ### The IP address of the manager machine
 
 
 The IP address must be assigned to an a network interface available to the host
 The IP address must be assigned to an a network interface available to the host