kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #25425 from thaJeztah/remove-rc-suffix 

Remove "-rc" from documentation
(cherry picked from commit 9513aa3a48)

Signed-off-by: Tibor Vass <tibor@docker.com>
This commit is contained in:
Sebastiaan van Stijn 2016-08-05 02:15:24 +02:00 committed by Tibor Vass
parent fff3dce95f
commit 4b9b07f281
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/swarm/index.md
View File

@ -11,7 +11,7 @@ weight="1"
<![end-metadata]--> <![end-metadata]-->
# Swarm mode overview # Swarm mode overview
To use Docker Engine in swarm mode, install the Docker Engine `v1.12.0-rc1` or To use Docker Engine in swarm mode, install the Docker Engine `v1.12.0` or
later from the [Docker releases GitHub later from the [Docker releases GitHub
repository](https://github.com/docker/docker/releases). Alternatively, install repository](https://github.com/docker/docker/releases). Alternatively, install
the latest Docker for Mac or Docker for Windows Beta. 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
application services to a swarm, and manage swarm behavior. application services to a swarm, and manage swarm behavior.
If you’re using a Docker version prior to `v1.12.0-rc1`, see [Docker If you’re using a Docker version prior to `v1.12.0`, see [Docker
Swarm](https://docs.docker.com/swarm). Swarm](https://docs.docker.com/swarm).
## Feature highlights ## Feature highlights

2
docs/swarm/swarm-tutorial/index.md
View File

@ -51,7 +51,7 @@ 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 You must install Docker Engine on each one of the host machines. To use swarm
mode, install the Docker Engine `v1.12.0-rc1` or later from the [Docker releases mode, install the Docker Engine `v1.12.0` or later from the [Docker releases
GitHub repository](https://github.com/docker/docker/releases). Alternatively, GitHub repository](https://github.com/docker/docker/releases). Alternatively,
install the latest Docker for Mac or Docker for Windows Beta. install the latest Docker for Mac or Docker for Windows Beta.

4
docs/userguide/networking/get-started-overlay.md
View File

@ -147,12 +147,12 @@ To create an overlay network
└ Containers: 2 └ Containers: 2
└ Reserved CPUs: 0 / 1 └ Reserved CPUs: 0 / 1
└ Reserved Memory: 0 B / 1.021 GiB └ Reserved Memory: 0 B / 1.021 GiB
└ 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 └ 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
mhs-demo1: 192.168.99.105:2376 mhs-demo1: 192.168.99.105:2376
└ Containers: 1 └ Containers: 1
└ Reserved CPUs: 0 / 1 └ Reserved CPUs: 0 / 1
└ Reserved Memory: 0 B / 1.021 GiB └ Reserved Memory: 0 B / 1.021 GiB
└ 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 └ 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
CPUs: 2 CPUs: 2
Total Memory: 2.043 GiB Total Memory: 2.043 GiB
Name: 30438ece0915 Name: 30438ece0915

2
docs/userguide/storagedriver/device-mapper-driver.md
View File

@ -423,7 +423,7 @@ Containers: 0
Paused: 0 Paused: 0
Stopped: 0 Stopped: 0
Images: 2 Images: 2
Server Version: 1.11.0-rc2 Server Version: 1.11.0
Storage Driver: devicemapper Storage Driver: devicemapper
Pool Name: docker-8:1-123141-pool Pool Name: docker-8:1-123141-pool
Pool Blocksize: 65.54 kB Pool Blocksize: 65.54 kB