Skip to content

Commit 898aa4d

Browse files
committed
engine/install: sync some wording between distros
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent 0628e31 commit 898aa4d

File tree

7 files changed

+48
-55
lines changed

7 files changed

+48
-55
lines changed

content/manuals/engine/install/centos.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,11 @@ default. If you have disabled it, you need to re-enable it.
3636

3737
### Uninstall old versions
3838

39-
Older versions of Docker went by `docker` or `docker-engine`.
40-
Uninstall any such older versions before attempting to install a new version,
41-
along with associated dependencies.
39+
Before you can install Docker Engine, you need to uninstall any conflicting packages.
40+
41+
Your Linux distribution may provide unofficial Docker packages, which may conflict
42+
with the official packages provided by Docker. You must uninstall these packages
43+
before you install the official version of Docker Engine.
4244

4345
```console
4446
$ sudo dnf remove docker \
@@ -91,7 +93,7 @@ $ sudo dnf config-manager --add-repo {{% param "download-url-base" %}}/docker-ce
9193

9294
#### Install Docker Engine
9395

94-
1. Install Docker Engine, containerd, and Docker Compose:
96+
1. Install the Docker packages.
9597

9698
{{< tabs >}}
9799
{{< tab name="Latest" >}}
@@ -152,8 +154,7 @@ $ sudo dnf config-manager --add-repo {{% param "download-url-base" %}}/docker-ce
152154
boot your system. If you don't want Docker to start automatically, use `sudo
153155
systemctl start docker` instead.
154156

155-
3. Verify that the Docker Engine installation is successful by running the
156-
`hello-world` image.
157+
3. Verify that the installation is successful by running the `hello-world` image:
157158

158159
```console
159160
$ sudo docker run hello-world
@@ -202,8 +203,7 @@ download a new file each time you want to upgrade Docker Engine.
202203
boot your system. If you don't want Docker to start automatically, use `sudo
203204
systemctl start docker` instead.
204205

205-
4. Verify that the Docker Engine installation is successful by running the
206-
`hello-world` image.
206+
4. Verify that the installation is successful by running the `hello-world` image:
207207

208208
```console
209209
$ sudo docker run hello-world

content/manuals/engine/install/debian.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ and ppc64le (ppc64el) architectures.
5252

5353
Before you can install Docker Engine, you need to uninstall any conflicting packages.
5454

55-
Distro maintainers provide unofficial distributions of Docker packages in
56-
their repositories. You must uninstall these packages before you can install the
57-
official version of Docker Engine.
55+
Your Linux distribution may provide unofficial Docker packages, which may conflict
56+
with the official packages provided by Docker. You must uninstall these packages
57+
before you install the official version of Docker Engine.
5858

5959
The unofficial packages to uninstall are:
6060

@@ -170,8 +170,7 @@ Docker from the repository.
170170
{{< /tab >}}
171171
{{< /tabs >}}
172172

173-
3. Verify that the installation is successful by running the `hello-world`
174-
image:
173+
3. Verify that the installation is successful by running the `hello-world` image:
175174

176175
```console
177176
$ sudo docker run hello-world
@@ -226,8 +225,7 @@ download a new file each time you want to upgrade Docker Engine.
226225

227226
The Docker daemon starts automatically.
228227

229-
6. Verify that the Docker Engine installation is successful by running the
230-
`hello-world` image:
228+
6. Verify that the installation is successful by running the `hello-world` image:
231229

232230
```console
233231
$ sudo service docker start

content/manuals/engine/install/fedora.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,11 @@ Fedora versions:
3131

3232
### Uninstall old versions
3333

34-
Older versions of Docker went by `docker` or `docker-engine`.
35-
Uninstall any such older versions before attempting to install a new version,
36-
along with associated dependencies.
34+
Before you can install Docker Engine, you need to uninstall any conflicting packages.
35+
36+
Your Linux distribution may provide unofficial Docker packages, which may conflict
37+
with the official packages provided by Docker. You must uninstall these packages
38+
before you install the official version of Docker Engine.
3739

3840
```console
3941
$ sudo dnf remove docker \
@@ -88,7 +90,7 @@ $ sudo dnf-3 config-manager --add-repo {{% param "download-url-base" %}}/docker-
8890

8991
#### Install Docker Engine
9092

91-
1. Install Docker Engine, containerd, and Docker Compose:
93+
1. Install the Docker packages.
9294

9395
{{< tabs >}}
9496
{{< tab name="Latest" >}}
@@ -149,8 +151,7 @@ $ sudo dnf-3 config-manager --add-repo {{% param "download-url-base" %}}/docker-
149151
boot your system. If you don't want Docker to start automatically, use `sudo
150152
systemctl start docker` instead.
151153

152-
3. Verify that the Docker Engine installation is successful by running the
153-
`hello-world` image.
154+
3. Verify that the installation is successful by running the `hello-world` image:
154155

155156
```console
156157
$ sudo docker run hello-world
@@ -199,8 +200,7 @@ download a new file each time you want to upgrade Docker Engine.
199200
boot your system. If you don't want Docker to start automatically, use `sudo
200201
systemctl start docker` instead.
201202

202-
4. Verify that the Docker Engine installation is successful by running the
203-
`hello-world` image.
203+
4. Verify that the installation is successful by running the `hello-world` image:
204204

205205
```console
206206
$ sudo docker run hello-world

content/manuals/engine/install/raspberry-pi-os.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ To install Docker Engine, you need one of the following OS versions:
5353

5454
Before you can install Docker Engine, you need to uninstall any conflicting packages.
5555

56-
Distro maintainers provide an unofficial distributions of Docker packages in
57-
APT. You must uninstall these packages before you can install the official
58-
version of Docker Engine.
56+
Your Linux distribution may provide unofficial Docker packages, which may conflict
57+
with the official packages provided by Docker. You must uninstall these packages
58+
before you install the official version of Docker Engine.
5959

6060
The unofficial packages to uninstall are:
6161

@@ -158,8 +158,7 @@ Docker from the repository.
158158
{{< /tab >}}
159159
{{< /tabs >}}
160160

161-
3. Verify that the installation is successful by running the `hello-world`
162-
image:
161+
3. Verify that the installation is successful by running the `hello-world` image:
163162

164163
```console
165164
$ sudo docker run hello-world
@@ -214,8 +213,7 @@ download a new file each time you want to upgrade Docker Engine.
214213

215214
The Docker daemon starts automatically.
216215

217-
6. Verify that the Docker Engine installation is successful by running the
218-
`hello-world` image:
216+
6. Verify that the installation is successful by running the `hello-world` image:
219217

220218
```console
221219
$ sudo service docker start

content/manuals/engine/install/rhel.md

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,11 @@ RHEL versions:
3434

3535
### Uninstall old versions
3636

37-
Older versions of Docker went by `docker` or `docker-engine`.
38-
Uninstall any such older versions before attempting to install a new version,
39-
along with associated dependencies. Also uninstall `Podman` and the associated
40-
dependencies if installed already:
37+
Before you can install Docker Engine, you need to uninstall any conflicting packages.
38+
39+
Your Linux distribution may provide unofficial Docker packages, which may conflict
40+
with the official packages provided by Docker. You must uninstall these packages
41+
before you install the official version of Docker Engine.
4142

4243
```console
4344
$ sudo dnf remove docker \
@@ -92,7 +93,7 @@ $ sudo dnf config-manager --add-repo {{% param "download-url-base" %}}/docker-ce
9293

9394
#### Install Docker Engine
9495

95-
1. Install Docker Engine, containerd, and Docker Compose:
96+
1. Install the Docker packages.
9697

9798
{{< tabs >}}
9899
{{< tab name="Latest" >}}
@@ -153,8 +154,7 @@ $ sudo dnf config-manager --add-repo {{% param "download-url-base" %}}/docker-ce
153154
boot your system. If you don't want Docker to start automatically, use `sudo
154155
systemctl start docker` instead.
155156

156-
3. Verify that the Docker Engine installation is successful by running the
157-
`hello-world` image.
157+
3. Verify that the installation is successful by running the `hello-world` image:
158158

159159
```console
160160
$ sudo docker run hello-world
@@ -219,8 +219,7 @@ download a new file each time you want to upgrade Docker Engine.
219219
boot your system. If you don't want Docker to start automatically, use `sudo
220220
systemctl start docker` instead.
221221

222-
7. Verify that the Docker Engine installation is successful by running the
223-
`hello-world` image.
222+
7. Verify that the installation is successful by running the `hello-world` image:
224223

225224
```console
226225
$ sudo docker run hello-world

content/manuals/engine/install/sles.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,11 @@ $ sudo zypper addrepo $opensuse_repo
5858

5959
### Uninstall old versions
6060

61-
Older versions of Docker went by `docker` or `docker-engine`.
62-
Uninstall any such older versions before attempting to install a new version,
63-
along with associated dependencies.
61+
Before you can install Docker Engine, you need to uninstall any conflicting packages.
62+
63+
Your Linux distribution may provide unofficial Docker packages, which may conflict
64+
with the official packages provided by Docker. You must uninstall these packages
65+
before you install the official version of Docker Engine.
6466

6567
```console
6668
$ sudo zypper remove docker \
@@ -112,7 +114,7 @@ $ sudo zypper addrepo {{% param "download-url-base" %}}/docker-ce.repo
112114

113115
#### Install Docker Engine
114116

115-
1. Install Docker Engine, containerd, and Docker Compose:
117+
1. Install the Docker packages.
116118

117119
{{< tabs >}}
118120
{{< tab name="Latest" >}}
@@ -172,8 +174,7 @@ $ sudo zypper addrepo {{% param "download-url-base" %}}/docker-ce.repo
172174
boot your system. If you don't want Docker to start automatically, use `sudo
173175
systemctl start docker` instead.
174176

175-
3. Verify that the Docker Engine installation is successful by running the
176-
`hello-world` image.
177+
3. Verify that the installation is successful by running the `hello-world` image:
177178

178179
```console
179180
$ sudo docker run hello-world
@@ -222,8 +223,7 @@ download a new file each time you want to upgrade Docker Engine.
222223
boot your system. If you don't want Docker to start automatically, use `sudo
223224
systemctl start docker` instead.
224225

225-
4. Verify that the Docker Engine installation is successful by running the
226-
`hello-world` image.
226+
4. Verify that the installation is successful by running the `hello-world` image:
227227

228228
```console
229229
$ sudo docker run hello-world

content/manuals/engine/install/ubuntu.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ s390x, and ppc64le (ppc64el) architectures.
6262

6363
Before you can install Docker Engine, you need to uninstall any conflicting packages.
6464

65-
Distro maintainers provide unofficial distributions of Docker packages in
66-
APT. You must uninstall these packages before you can install the official
67-
version of Docker Engine.
65+
Your Linux distribution may provide unofficial Docker packages, which may conflict
66+
with the official packages provided by Docker. You must uninstall these packages
67+
before you install the official version of Docker Engine.
6868

6969
The unofficial packages to uninstall are:
7070

@@ -111,7 +111,7 @@ You can install Docker Engine in different ways, depending on your needs:
111111
### Install using the `apt` repository {#install-using-the-repository}
112112

113113
Before you install Docker Engine for the first time on a new host machine, you
114-
need to set up the Docker repository. Afterward, you can install and update
114+
need to set up the Docker `apt` repository. Afterward, you can install and update
115115
Docker from the repository.
116116

117117
1. Set up Docker's `apt` repository.
@@ -173,8 +173,7 @@ Docker from the repository.
173173
{{< /tab >}}
174174
{{< /tabs >}}
175175

176-
3. Verify that the Docker Engine installation is successful by running the
177-
`hello-world` image.
176+
3. Verify that the installation is successful by running the `hello-world` image:
178177

179178
```console
180179
$ sudo docker run hello-world
@@ -229,8 +228,7 @@ download a new file each time you want to upgrade Docker Engine.
229228

230229
The Docker daemon starts automatically.
231230

232-
6. Verify that the Docker Engine installation is successful by running the
233-
`hello-world` image.
231+
6. Verify that the installation is successful by running the `hello-world` image:
234232

235233
```console
236234
$ sudo service docker start

0 commit comments

Comments
 (0)