Browse code
Merge pull request #25425 from thaJeztah/remove-rc-suffix
Remove "-rc" from documentation
(cherry picked from commit 9513aa3a48b6d4d7d612ddbdc097495bf48d9572)
Sebastiaan van Stijn authored on 2016/08/05 09:15:24Showing 4 changed files
- docs/swarm/index.md
- docs/swarm/swarm-tutorial/index.md
- docs/userguide/networking/get-started-overlay.md
- docs/userguide/storagedriver/device-mapper-driver.md
| ... | ... |
@@ -11,7 +11,7 @@ weight="1" |
| 11 | 11 |
<![end-metadata]--> |
| 12 | 12 |
# Swarm mode overview |
| 13 | 13 |
|
| 14 |
-To use Docker Engine in swarm mode, install the Docker Engine `v1.12.0-rc1` or |
|
| 14 |
+To use Docker Engine in swarm mode, install the Docker Engine `v1.12.0` or |
|
| 15 | 15 |
later from the [Docker releases GitHub |
| 16 | 16 |
repository](https://github.com/docker/docker/releases). Alternatively, install |
| 17 | 17 |
the latest Docker for Mac or Docker for Windows Beta. |
| ... | ... |
@@ -21,7 +21,7 @@ Docker Engines called a Swarm. Use the Docker CLI to create a swarm, deploy |
| 21 | 21 |
application services to a swarm, and manage swarm behavior. |
| 22 | 22 |
|
| 23 | 23 |
|
| 24 |
-If you’re using a Docker version prior to `v1.12.0-rc1`, see [Docker |
|
| 24 |
+If you’re using a Docker version prior to `v1.12.0`, see [Docker |
|
| 25 | 25 |
Swarm](https://docs.docker.com/swarm). |
| 26 | 26 |
|
| 27 | 27 |
## Feature highlights |
| ... | ... |
@@ -51,7 +51,7 @@ provider. This tutorial uses the following machine names: |
| 51 | 51 |
### Docker Engine 1.12 or later |
| 52 | 52 |
|
| 53 | 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-rc1` or later from the [Docker releases |
|
| 54 |
+mode, install the Docker Engine `v1.12.0` or later from the [Docker releases |
|
| 55 | 55 |
GitHub repository](https://github.com/docker/docker/releases). Alternatively, |
| 56 | 56 |
install the latest Docker for Mac or Docker for Windows Beta. |
| 57 | 57 |
|
| ... | ... |
@@ -147,12 +147,12 @@ To create an overlay network |
| 147 | 147 |
└ Containers: 2 |
| 148 | 148 |
└ Reserved CPUs: 0 / 1 |
| 149 | 149 |
└ Reserved Memory: 0 B / 1.021 GiB |
| 150 |
- └ Labels: executiondriver=native-0.2, kernelversion=4.1.10-boot2docker, operatingsystem=Boot2Docker 1.9.0-rc1 (TCL 6.4); master : 4187d2c - Wed Oct 14 14:00:28 UTC 2015, provider=virtualbox, storagedriver=aufs |
|
| 150 |
+ └ Labels: executiondriver=native-0.2, kernelversion=4.1.10-boot2docker, operatingsystem=Boot2Docker 1.9.0 (TCL 6.4); master : 4187d2c - Wed Oct 14 14:00:28 UTC 2015, provider=virtualbox, storagedriver=aufs |
|
| 151 | 151 |
mhs-demo1: 192.168.99.105:2376 |
| 152 | 152 |
└ Containers: 1 |
| 153 | 153 |
└ Reserved CPUs: 0 / 1 |
| 154 | 154 |
└ Reserved Memory: 0 B / 1.021 GiB |
| 155 |
- └ Labels: executiondriver=native-0.2, kernelversion=4.1.10-boot2docker, operatingsystem=Boot2Docker 1.9.0-rc1 (TCL 6.4); master : 4187d2c - Wed Oct 14 14:00:28 UTC 2015, provider=virtualbox, storagedriver=aufs |
|
| 155 |
+ └ Labels: executiondriver=native-0.2, kernelversion=4.1.10-boot2docker, operatingsystem=Boot2Docker 1.9.0 (TCL 6.4); master : 4187d2c - Wed Oct 14 14:00:28 UTC 2015, provider=virtualbox, storagedriver=aufs |
|
| 156 | 156 |
CPUs: 2 |
| 157 | 157 |
Total Memory: 2.043 GiB |
| 158 | 158 |
Name: 30438ece0915 |