From 898aa4d2d3665b72db8270b9da99b14c78e4b71b Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 8 Nov 2024 13:32:52 +0100 Subject: [PATCH] engine/install: sync some wording between distros Signed-off-by: Sebastiaan van Stijn --- content/manuals/engine/install/centos.md | 16 ++++++++-------- content/manuals/engine/install/debian.md | 12 +++++------- content/manuals/engine/install/fedora.md | 16 ++++++++-------- .../manuals/engine/install/raspberry-pi-os.md | 12 +++++------- content/manuals/engine/install/rhel.md | 17 ++++++++--------- content/manuals/engine/install/sles.md | 16 ++++++++-------- content/manuals/engine/install/ubuntu.md | 14 ++++++-------- 7 files changed, 48 insertions(+), 55 deletions(-) diff --git a/content/manuals/engine/install/centos.md b/content/manuals/engine/install/centos.md index 06ed0352e3..c560cea9fa 100644 --- a/content/manuals/engine/install/centos.md +++ b/content/manuals/engine/install/centos.md @@ -36,9 +36,11 @@ default. If you have disabled it, you need to re-enable it. ### Uninstall old versions -Older versions of Docker went by `docker` or `docker-engine`. -Uninstall any such older versions before attempting to install a new version, -along with associated dependencies. +Before you can install Docker Engine, you need to uninstall any conflicting packages. + +Your Linux distribution may provide unofficial Docker packages, which may conflict +with the official packages provided by Docker. You must uninstall these packages +before you install the official version of Docker Engine. ```console $ sudo dnf remove docker \ @@ -91,7 +93,7 @@ $ sudo dnf config-manager --add-repo {{% param "download-url-base" %}}/docker-ce #### Install Docker Engine -1. Install Docker Engine, containerd, and Docker Compose: +1. Install the Docker packages. {{< tabs >}} {{< tab name="Latest" >}} @@ -152,8 +154,7 @@ $ sudo dnf config-manager --add-repo {{% param "download-url-base" %}}/docker-ce boot your system. If you don't want Docker to start automatically, use `sudo systemctl start docker` instead. -3. Verify that the Docker Engine installation is successful by running the - `hello-world` image. +3. Verify that the installation is successful by running the `hello-world` image: ```console $ sudo docker run hello-world @@ -202,8 +203,7 @@ download a new file each time you want to upgrade Docker Engine. boot your system. If you don't want Docker to start automatically, use `sudo systemctl start docker` instead. -4. Verify that the Docker Engine installation is successful by running the - `hello-world` image. +4. Verify that the installation is successful by running the `hello-world` image: ```console $ sudo docker run hello-world diff --git a/content/manuals/engine/install/debian.md b/content/manuals/engine/install/debian.md index 6b23846ed3..ebb0b94d56 100644 --- a/content/manuals/engine/install/debian.md +++ b/content/manuals/engine/install/debian.md @@ -52,9 +52,9 @@ and ppc64le (ppc64el) architectures. Before you can install Docker Engine, you need to uninstall any conflicting packages. -Distro maintainers provide unofficial distributions of Docker packages in -their repositories. You must uninstall these packages before you can install the -official version of Docker Engine. +Your Linux distribution may provide unofficial Docker packages, which may conflict +with the official packages provided by Docker. You must uninstall these packages +before you install the official version of Docker Engine. The unofficial packages to uninstall are: @@ -170,8 +170,7 @@ Docker from the repository. {{< /tab >}} {{< /tabs >}} -3. Verify that the installation is successful by running the `hello-world` - image: +3. Verify that the installation is successful by running the `hello-world` image: ```console $ sudo docker run hello-world @@ -226,8 +225,7 @@ download a new file each time you want to upgrade Docker Engine. The Docker daemon starts automatically. -6. Verify that the Docker Engine installation is successful by running the - `hello-world` image: +6. Verify that the installation is successful by running the `hello-world` image: ```console $ sudo service docker start diff --git a/content/manuals/engine/install/fedora.md b/content/manuals/engine/install/fedora.md index a92e2b7f06..e1bed80474 100644 --- a/content/manuals/engine/install/fedora.md +++ b/content/manuals/engine/install/fedora.md @@ -31,9 +31,11 @@ Fedora versions: ### Uninstall old versions -Older versions of Docker went by `docker` or `docker-engine`. -Uninstall any such older versions before attempting to install a new version, -along with associated dependencies. +Before you can install Docker Engine, you need to uninstall any conflicting packages. + +Your Linux distribution may provide unofficial Docker packages, which may conflict +with the official packages provided by Docker. You must uninstall these packages +before you install the official version of Docker Engine. ```console $ sudo dnf remove docker \ @@ -88,7 +90,7 @@ $ sudo dnf-3 config-manager --add-repo {{% param "download-url-base" %}}/docker- #### Install Docker Engine -1. Install Docker Engine, containerd, and Docker Compose: +1. Install the Docker packages. {{< tabs >}} {{< tab name="Latest" >}} @@ -149,8 +151,7 @@ $ sudo dnf-3 config-manager --add-repo {{% param "download-url-base" %}}/docker- boot your system. If you don't want Docker to start automatically, use `sudo systemctl start docker` instead. -3. Verify that the Docker Engine installation is successful by running the - `hello-world` image. +3. Verify that the installation is successful by running the `hello-world` image: ```console $ sudo docker run hello-world @@ -199,8 +200,7 @@ download a new file each time you want to upgrade Docker Engine. boot your system. If you don't want Docker to start automatically, use `sudo systemctl start docker` instead. -4. Verify that the Docker Engine installation is successful by running the - `hello-world` image. +4. Verify that the installation is successful by running the `hello-world` image: ```console $ sudo docker run hello-world diff --git a/content/manuals/engine/install/raspberry-pi-os.md b/content/manuals/engine/install/raspberry-pi-os.md index 2a6950c8bc..927f6498d1 100644 --- a/content/manuals/engine/install/raspberry-pi-os.md +++ b/content/manuals/engine/install/raspberry-pi-os.md @@ -53,9 +53,9 @@ To install Docker Engine, you need one of the following OS versions: Before you can install Docker Engine, you need to uninstall any conflicting packages. -Distro maintainers provide an unofficial distributions of Docker packages in -APT. You must uninstall these packages before you can install the official -version of Docker Engine. +Your Linux distribution may provide unofficial Docker packages, which may conflict +with the official packages provided by Docker. You must uninstall these packages +before you install the official version of Docker Engine. The unofficial packages to uninstall are: @@ -158,8 +158,7 @@ Docker from the repository. {{< /tab >}} {{< /tabs >}} -3. Verify that the installation is successful by running the `hello-world` - image: +3. Verify that the installation is successful by running the `hello-world` image: ```console $ sudo docker run hello-world @@ -214,8 +213,7 @@ download a new file each time you want to upgrade Docker Engine. The Docker daemon starts automatically. -6. Verify that the Docker Engine installation is successful by running the - `hello-world` image: +6. Verify that the installation is successful by running the `hello-world` image: ```console $ sudo service docker start diff --git a/content/manuals/engine/install/rhel.md b/content/manuals/engine/install/rhel.md index c1b55ce6f9..b8cde38551 100644 --- a/content/manuals/engine/install/rhel.md +++ b/content/manuals/engine/install/rhel.md @@ -34,10 +34,11 @@ RHEL versions: ### Uninstall old versions -Older versions of Docker went by `docker` or `docker-engine`. -Uninstall any such older versions before attempting to install a new version, -along with associated dependencies. Also uninstall `Podman` and the associated -dependencies if installed already: +Before you can install Docker Engine, you need to uninstall any conflicting packages. + +Your Linux distribution may provide unofficial Docker packages, which may conflict +with the official packages provided by Docker. You must uninstall these packages +before you install the official version of Docker Engine. ```console $ sudo dnf remove docker \ @@ -92,7 +93,7 @@ $ sudo dnf config-manager --add-repo {{% param "download-url-base" %}}/docker-ce #### Install Docker Engine -1. Install Docker Engine, containerd, and Docker Compose: +1. Install the Docker packages. {{< tabs >}} {{< tab name="Latest" >}} @@ -153,8 +154,7 @@ $ sudo dnf config-manager --add-repo {{% param "download-url-base" %}}/docker-ce boot your system. If you don't want Docker to start automatically, use `sudo systemctl start docker` instead. -3. Verify that the Docker Engine installation is successful by running the - `hello-world` image. +3. Verify that the installation is successful by running the `hello-world` image: ```console $ sudo docker run hello-world @@ -219,8 +219,7 @@ download a new file each time you want to upgrade Docker Engine. boot your system. If you don't want Docker to start automatically, use `sudo systemctl start docker` instead. -7. Verify that the Docker Engine installation is successful by running the - `hello-world` image. +7. Verify that the installation is successful by running the `hello-world` image: ```console $ sudo docker run hello-world diff --git a/content/manuals/engine/install/sles.md b/content/manuals/engine/install/sles.md index 894565185c..d8b5016340 100644 --- a/content/manuals/engine/install/sles.md +++ b/content/manuals/engine/install/sles.md @@ -58,9 +58,11 @@ $ sudo zypper addrepo $opensuse_repo ### Uninstall old versions -Older versions of Docker went by `docker` or `docker-engine`. -Uninstall any such older versions before attempting to install a new version, -along with associated dependencies. +Before you can install Docker Engine, you need to uninstall any conflicting packages. + +Your Linux distribution may provide unofficial Docker packages, which may conflict +with the official packages provided by Docker. You must uninstall these packages +before you install the official version of Docker Engine. ```console $ sudo zypper remove docker \ @@ -112,7 +114,7 @@ $ sudo zypper addrepo {{% param "download-url-base" %}}/docker-ce.repo #### Install Docker Engine -1. Install Docker Engine, containerd, and Docker Compose: +1. Install the Docker packages. {{< tabs >}} {{< tab name="Latest" >}} @@ -172,8 +174,7 @@ $ sudo zypper addrepo {{% param "download-url-base" %}}/docker-ce.repo boot your system. If you don't want Docker to start automatically, use `sudo systemctl start docker` instead. -3. Verify that the Docker Engine installation is successful by running the - `hello-world` image. +3. Verify that the installation is successful by running the `hello-world` image: ```console $ sudo docker run hello-world @@ -222,8 +223,7 @@ download a new file each time you want to upgrade Docker Engine. boot your system. If you don't want Docker to start automatically, use `sudo systemctl start docker` instead. -4. Verify that the Docker Engine installation is successful by running the - `hello-world` image. +4. Verify that the installation is successful by running the `hello-world` image: ```console $ sudo docker run hello-world diff --git a/content/manuals/engine/install/ubuntu.md b/content/manuals/engine/install/ubuntu.md index a9be9b5406..0989b8cec4 100644 --- a/content/manuals/engine/install/ubuntu.md +++ b/content/manuals/engine/install/ubuntu.md @@ -62,9 +62,9 @@ s390x, and ppc64le (ppc64el) architectures. Before you can install Docker Engine, you need to uninstall any conflicting packages. -Distro maintainers provide unofficial distributions of Docker packages in -APT. You must uninstall these packages before you can install the official -version of Docker Engine. +Your Linux distribution may provide unofficial Docker packages, which may conflict +with the official packages provided by Docker. You must uninstall these packages +before you install the official version of Docker Engine. The unofficial packages to uninstall are: @@ -111,7 +111,7 @@ You can install Docker Engine in different ways, depending on your needs: ### Install using the `apt` repository {#install-using-the-repository} Before you install Docker Engine for the first time on a new host machine, you -need to set up the Docker repository. Afterward, you can install and update +need to set up the Docker `apt` repository. Afterward, you can install and update Docker from the repository. 1. Set up Docker's `apt` repository. @@ -173,8 +173,7 @@ Docker from the repository. {{< /tab >}} {{< /tabs >}} -3. Verify that the Docker Engine installation is successful by running the - `hello-world` image. +3. Verify that the installation is successful by running the `hello-world` image: ```console $ sudo docker run hello-world @@ -229,8 +228,7 @@ download a new file each time you want to upgrade Docker Engine. The Docker daemon starts automatically. -6. Verify that the Docker Engine installation is successful by running the - `hello-world` image. +6. Verify that the installation is successful by running the `hello-world` image: ```console $ sudo service docker start