From d5e4a5144b36d96d6bd82ae44782ac59a70eeee3 Mon Sep 17 00:00:00 2001
From: David Karlsson <35727626+dvdksn@users.noreply.github.com>
Date: Fri, 8 Nov 2024 09:49:54 +0100
Subject: [PATCH 01/15] build: dockerfile 1.11.1 changelog

Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
---
 .../build/buildkit/dockerfile-release-notes.md    | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/content/manuals/build/buildkit/dockerfile-release-notes.md b/content/manuals/build/buildkit/dockerfile-release-notes.md
index a5964298e74f..7505071da589 100644
--- a/content/manuals/build/buildkit/dockerfile-release-notes.md
+++ b/content/manuals/build/buildkit/dockerfile-release-notes.md
@@ -13,6 +13,21 @@ issues, and bug fixes in [Dockerfile reference](/reference/dockerfile.md).
 
 For usage, see the [Dockerfile frontend syntax](frontend.md) page.
 
+## 1.11.1
+
+{{< release-date date="2024-11-08" >}}
+
+The full release note for this release is available
+[on GitHub](https://github.com/moby/buildkit/releases/tag/dockerfile%2F1.11.1).
+
+```dockerfile
+# syntax=docker/dockerfile:1.11.1
+```
+
+- Fix regression when using the `ONBUILD` instruction in stages inherited within the same Dockerfile. [moby/buildkit#5490]
+
+[moby/buildkit#5490]: https://github.com/moby/buildkit/pull/5490
+
 ## 1.11.0
 
 {{< release-date date="2024-10-30" >}}

From 57a2bb6ef21da30afdf7692cbd9108c1c761acdf Mon Sep 17 00:00:00 2001
From: George Hopkins <george-hopkins@null.net>
Date: Fri, 8 Nov 2024 12:19:09 +0100
Subject: [PATCH 02/15] Fix title level in Compose file reference

---
 content/reference/compose-file/services.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/reference/compose-file/services.md b/content/reference/compose-file/services.md
index 85a20df4496c..78222054d8ad 100644
--- a/content/reference/compose-file/services.md
+++ b/content/reference/compose-file/services.md
@@ -1505,7 +1505,7 @@ ports:
     mode: host
 ```
 
-## post_start
+### post_start
 
 {{< introduced compose 2.30.0 "../../manuals/compose/releases/release-notes.md#2300" >}}
 
@@ -1530,7 +1530,7 @@ services:
 
 For more information, see [Use lifecycle hooks](/manuals/compose/how-tos/lifecycle.md).
 
-## pre_stop
+### pre_stop
 
 {{< introduced compose 2.30.0 "../../manuals/compose/releases/release-notes.md#2300" >}}
 

From fde4750c859ab0cf386b30cc19eb9ea7b9cfe24c Mon Sep 17 00:00:00 2001
From: David Karlsson <35727626+dvdksn@users.noreply.github.com>
Date: Fri, 8 Nov 2024 12:11:57 +0100
Subject: [PATCH 03/15] engine: remove -y from fedora (dnf) installation steps

Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
---
 content/manuals/engine/install/fedora.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/content/manuals/engine/install/fedora.md b/content/manuals/engine/install/fedora.md
index 7e7123883523..c02833a002dc 100644
--- a/content/manuals/engine/install/fedora.md
+++ b/content/manuals/engine/install/fedora.md
@@ -130,7 +130,7 @@ $ sudo dnf-3 config-manager --add-repo {{% param "download-url-base" %}}/docker-
    command to install:
 
    ```console
-   $ sudo dnf -y install docker-ce-<VERSION_STRING> docker-ce-cli-<VERSION_STRING> containerd.io docker-buildx-plugin docker-compose-plugin
+   $ sudo dnf install docker-ce-<VERSION_STRING> docker-ce-cli-<VERSION_STRING> containerd.io docker-buildx-plugin docker-compose-plugin
    ```
 
    This command installs Docker, but it doesn't start Docker. It also creates a
@@ -179,7 +179,7 @@ download a new file each time you want to upgrade Docker Engine.
    the Docker package.
 
    ```console
-   $ sudo dnf -y install /path/to/package.rpm
+   $ sudo dnf install /path/to/package.rpm
    ```
 
    Docker is installed but not started. The `docker` group is created, but no
@@ -214,8 +214,8 @@ You have now successfully installed and started Docker Engine.
 #### Upgrade Docker Engine
 
 To upgrade Docker Engine, download the newer package files and repeat the
-[installation procedure](#install-from-a-package), using `dnf -y upgrade`
-instead of `dnf -y install`, and point to the new files.
+[installation procedure](#install-from-a-package), using `dnf upgrade`
+instead of `dnf install`, and point to the new files.
 
 {{< include "install-script.md" >}}
 

From 1514b0dc3662970121091028459abb3ab496cf57 Mon Sep 17 00:00:00 2001
From: David Karlsson <35727626+dvdksn@users.noreply.github.com>
Date: Fri, 8 Nov 2024 12:17:11 +0100
Subject: [PATCH 04/15] engine: enable the systemd service by default after
 installation

Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
---
 content/manuals/engine/install/centos.md | 6 +++++-
 content/manuals/engine/install/fedora.md | 6 +++++-
 content/manuals/engine/install/rhel.md   | 6 +++++-
 content/manuals/engine/install/sles.md   | 6 +++++-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/content/manuals/engine/install/centos.md b/content/manuals/engine/install/centos.md
index 50529472c182..83e744e1acfc 100644
--- a/content/manuals/engine/install/centos.md
+++ b/content/manuals/engine/install/centos.md
@@ -145,9 +145,13 @@ $ sudo yum-config-manager --add-repo {{% param "download-url-base" %}}/docker-ce
 2. Start Docker.
 
    ```console
-   $ sudo systemctl start docker
+   $ sudo systemctl enable --now docker
    ```
 
+   This configures the Docker systemd service to start automatically when you
+   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.
 
diff --git a/content/manuals/engine/install/fedora.md b/content/manuals/engine/install/fedora.md
index c02833a002dc..5af647a575d1 100644
--- a/content/manuals/engine/install/fedora.md
+++ b/content/manuals/engine/install/fedora.md
@@ -142,9 +142,13 @@ $ sudo dnf-3 config-manager --add-repo {{% param "download-url-base" %}}/docker-
 2. Start Docker.
 
    ```console
-   $ sudo systemctl start docker
+   $ sudo systemctl enable --now docker
    ```
 
+   This configures the Docker systemd service to start automatically when you
+   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.
 
diff --git a/content/manuals/engine/install/rhel.md b/content/manuals/engine/install/rhel.md
index c7a6ad09b88e..210235ef4372 100644
--- a/content/manuals/engine/install/rhel.md
+++ b/content/manuals/engine/install/rhel.md
@@ -146,9 +146,13 @@ $ sudo yum-config-manager --add-repo {{% param "download-url-base" %}}/docker-ce
 2. Start Docker.
 
    ```console
-   $ sudo systemctl start docker
+   $ sudo systemctl enable --now docker
    ```
 
+   This configures the Docker systemd service to start automatically when you
+   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.
 
diff --git a/content/manuals/engine/install/sles.md b/content/manuals/engine/install/sles.md
index 39f73b54cf7f..58eeec76bf94 100644
--- a/content/manuals/engine/install/sles.md
+++ b/content/manuals/engine/install/sles.md
@@ -165,9 +165,13 @@ $ sudo zypper addrepo {{% param "download-url-base" %}}/docker-ce.repo
 2. Start Docker.
 
    ```console
-   $ sudo systemctl start docker
+   $ sudo systemctl enable --now docker
    ```
 
+   This configures the Docker systemd service to start automatically when you
+   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.
 

From 7402de4fdce0a650be6c6df1bf3d6049e3c23a34 Mon Sep 17 00:00:00 2001
From: David Karlsson <35727626+dvdksn@users.noreply.github.com>
Date: Thu, 7 Nov 2024 18:11:44 +0100
Subject: [PATCH 05/15] build: gha example loading multi-platform images with
 containerd

Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
---
 .../build/ci/github-actions/multi-platform.md | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/content/manuals/build/ci/github-actions/multi-platform.md b/content/manuals/build/ci/github-actions/multi-platform.md
index 5fb013ed7ef5..0d4d2bfd58c7 100644
--- a/content/manuals/build/ci/github-actions/multi-platform.md
+++ b/content/manuals/build/ci/github-actions/multi-platform.md
@@ -45,6 +45,59 @@ jobs:
           tags: user/app:latest
 ```
 
+## Build and load multi-platform images
+
+The default Docker setup for GitHub Actions runners does not support loading
+multi-platform images to the local image store of the runner after building
+them. To load a multi-platform image, you need to enable the containerd image
+store option for the Docker Engine.
+
+There is no way to configure the default Docker setup in the GitHub Actions
+runners directly, but you can use the `crazy-max/ghaction-setup-docker` action
+to customize the Docker Engine and CLI settings for a job.
+
+The following example workflow enables the containerd image store, builds a
+multi-platform image, and loads the results into the GitHub runner's local
+image store.
+
+```yaml
+name: ci
+
+on:
+  push:
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Docker
+        uses: crazy-max/ghaction-setup-docker@v3
+        with:
+          daemon-config: |
+            {
+              "debug": true,
+              "features": {
+                "containerd-snapshotter": true
+              }
+            }
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          platforms: linux/amd64,linux/arm64
+          load: true
+          tags: user/app:latest
+```
+
 ## Distribute build across multiple runners
 
 In the previous example, each platform is built on the same runner which can

From ac30bdbad7ed2e00f962b39d311f5719ff4eead4 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Fri, 8 Nov 2024 14:41:07 +0100
Subject: [PATCH 06/15] vale: allow keyring(s)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 _vale/config/vocabularies/Docker/accept.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/_vale/config/vocabularies/Docker/accept.txt b/_vale/config/vocabularies/Docker/accept.txt
index 774adcc4ca36..37e782dc22ba 100644
--- a/_vale/config/vocabularies/Docker/accept.txt
+++ b/_vale/config/vocabularies/Docker/accept.txt
@@ -76,6 +76,7 @@ Jamf
 JFrog
 JetBrains
 Kerberos
+[Kk]eyrings?
 Kitematic
 Kubernetes
 LTS

From 778d1c34427f13ed991e1007522f8a3203626607 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Fri, 8 Nov 2024 12:15:02 +0100
Subject: [PATCH 07/15] engine/install: enable engine as system service on rpm
 installs

Unlike deb-based systems, installing an rpm doesn't automatically
start the Docker service, and starting the service doesn't make
it automatically start on (re)boot.

Update the instructions so that Docker is automatically started
on boot.

follow-up to 1514b0dc3662970121091028459abb3ab496cf57, which left
some of the old instructions.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 content/manuals/engine/install/centos.md |  6 +++++-
 content/manuals/engine/install/fedora.md | 12 +++++-------
 content/manuals/engine/install/rhel.md   |  6 +++++-
 content/manuals/engine/install/sles.md   |  6 +++++-
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/content/manuals/engine/install/centos.md b/content/manuals/engine/install/centos.md
index 83e744e1acfc..b51c7d392e1c 100644
--- a/content/manuals/engine/install/centos.md
+++ b/content/manuals/engine/install/centos.md
@@ -195,9 +195,13 @@ download a new file each time you want to upgrade Docker Engine.
 3. Start Docker.
 
    ```console
-   $ sudo systemctl start docker
+   $ sudo systemctl enable --now docker
    ```
 
+   This configures the Docker systemd service to start automatically when you
+   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.
 
diff --git a/content/manuals/engine/install/fedora.md b/content/manuals/engine/install/fedora.md
index 5af647a575d1..ba89b932ad01 100644
--- a/content/manuals/engine/install/fedora.md
+++ b/content/manuals/engine/install/fedora.md
@@ -192,16 +192,14 @@ download a new file each time you want to upgrade Docker Engine.
 3. Start Docker.
 
    ```console
-   $ sudo systemctl start docker
+   $ sudo systemctl enable --now docker
    ```
 
-4. Make Docker start automatically after reboot.
-
-   ```console
-   $ sudo systemctl enable docker
-   ```
+   This configures the Docker systemd service to start automatically when you
+   boot your system. If you don't want Docker to start automatically, use `sudo
+   systemctl start docker` instead.
 
-5. Verify that the Docker Engine installation is successful by running the
+4. Verify that the Docker Engine installation is successful by running the
    `hello-world` image.
 
    ```console
diff --git a/content/manuals/engine/install/rhel.md b/content/manuals/engine/install/rhel.md
index 210235ef4372..4503775ff808 100644
--- a/content/manuals/engine/install/rhel.md
+++ b/content/manuals/engine/install/rhel.md
@@ -212,9 +212,13 @@ download a new file each time you want to upgrade Docker Engine.
 6. Start Docker.
 
    ```console
-   $ sudo systemctl start docker
+   $ sudo systemctl enable --now docker
    ```
 
+   This configures the Docker systemd service to start automatically when you
+   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.
 
diff --git a/content/manuals/engine/install/sles.md b/content/manuals/engine/install/sles.md
index 58eeec76bf94..5ad92560987f 100644
--- a/content/manuals/engine/install/sles.md
+++ b/content/manuals/engine/install/sles.md
@@ -215,9 +215,13 @@ download a new file each time you want to upgrade Docker Engine.
 3. Start Docker.
 
    ```console
-   $ sudo systemctl start docker
+   $ sudo systemctl enable --now docker
    ```
 
+   This configures the Docker systemd service to start automatically when you
+   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.
 

From 7073f01453133409e3bfb3e8678696e8c7d91362 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Fri, 8 Nov 2024 14:05:00 +0100
Subject: [PATCH 08/15] engine/install: Docker -> Docker Engine

Make it more clear we're starting the engine (not "docker", the CLI).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 content/manuals/engine/install/centos.md | 4 ++--
 content/manuals/engine/install/fedora.md | 4 ++--
 content/manuals/engine/install/rhel.md   | 4 ++--
 content/manuals/engine/install/sles.md   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/content/manuals/engine/install/centos.md b/content/manuals/engine/install/centos.md
index b51c7d392e1c..62ba219e4c8d 100644
--- a/content/manuals/engine/install/centos.md
+++ b/content/manuals/engine/install/centos.md
@@ -142,7 +142,7 @@ $ sudo yum-config-manager --add-repo {{% param "download-url-base" %}}/docker-ce
    {{< /tab >}}
    {{< /tabs >}}
 
-2. Start Docker.
+2. Start Docker Engine.
 
    ```console
    $ sudo systemctl enable --now docker
@@ -192,7 +192,7 @@ download a new file each time you want to upgrade Docker Engine.
    Docker is installed but not started. The `docker` group is created, but no
    users are added to the group.
 
-3. Start Docker.
+3. Start Docker Engine.
 
    ```console
    $ sudo systemctl enable --now docker
diff --git a/content/manuals/engine/install/fedora.md b/content/manuals/engine/install/fedora.md
index ba89b932ad01..d7e8105159c9 100644
--- a/content/manuals/engine/install/fedora.md
+++ b/content/manuals/engine/install/fedora.md
@@ -139,7 +139,7 @@ $ sudo dnf-3 config-manager --add-repo {{% param "download-url-base" %}}/docker-
    {{< /tab >}}
    {{< /tabs >}}
 
-2. Start Docker.
+2. Start Docker Engine.
 
    ```console
    $ sudo systemctl enable --now docker
@@ -189,7 +189,7 @@ download a new file each time you want to upgrade Docker Engine.
    Docker is installed but not started. The `docker` group is created, but no
    users are added to the group.
 
-3. Start Docker.
+3. Start Docker Engine.
 
    ```console
    $ sudo systemctl enable --now docker
diff --git a/content/manuals/engine/install/rhel.md b/content/manuals/engine/install/rhel.md
index 4503775ff808..80d35a982c1c 100644
--- a/content/manuals/engine/install/rhel.md
+++ b/content/manuals/engine/install/rhel.md
@@ -143,7 +143,7 @@ $ sudo yum-config-manager --add-repo {{% param "download-url-base" %}}/docker-ce
    {{< /tab >}}
    {{< /tabs >}}
 
-2. Start Docker.
+2. Start Docker Engine.
 
    ```console
    $ sudo systemctl enable --now docker
@@ -209,7 +209,7 @@ download a new file each time you want to upgrade Docker Engine.
    Docker is installed but not started. The `docker` group is created, but no
    users are added to the group.
 
-6. Start Docker.
+6. Start Docker Engine.
 
    ```console
    $ sudo systemctl enable --now docker
diff --git a/content/manuals/engine/install/sles.md b/content/manuals/engine/install/sles.md
index 5ad92560987f..376f81709a76 100644
--- a/content/manuals/engine/install/sles.md
+++ b/content/manuals/engine/install/sles.md
@@ -162,7 +162,7 @@ $ sudo zypper addrepo {{% param "download-url-base" %}}/docker-ce.repo
    {{< /tab >}}
    {{< /tabs >}}
 
-2. Start Docker.
+2. Start Docker Engine.
 
    ```console
    $ sudo systemctl enable --now docker
@@ -212,7 +212,7 @@ download a new file each time you want to upgrade Docker Engine.
    Docker is installed but not started. The `docker` group is created, but no
    users are added to the group.
 
-3. Start Docker.
+3. Start Docker Engine.
 
    ```console
    $ sudo systemctl enable --now docker

From 26aaea63a4db491c05d6b535d9749bf492898a76 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Fri, 8 Nov 2024 13:04:36 +0100
Subject: [PATCH 09/15] engine/install: remove -y from yum installation steps

Use interactive installation for packages from our repository, so that the user
can confirm what will be installed. For the distro-packages (yum-utils),
we keep the non-interactive, as these should be generally ok to install.

follow-up to fde4750c859ab0cf386b30cc19eb9ea7b9cfe24c

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 content/manuals/engine/install/centos.md | 4 ++--
 content/manuals/engine/install/rhel.md   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/content/manuals/engine/install/centos.md b/content/manuals/engine/install/centos.md
index 62ba219e4c8d..097fb67ddc71 100644
--- a/content/manuals/engine/install/centos.md
+++ b/content/manuals/engine/install/centos.md
@@ -219,8 +219,8 @@ You have now successfully installed and started Docker Engine.
 #### Upgrade Docker Engine
 
 To upgrade Docker Engine, download the newer package files and repeat the
-[installation procedure](#install-from-a-package), using `yum -y upgrade`
-instead of `yum -y install`, and point to the new files.
+[installation procedure](#install-from-a-package), using `yum upgrade`
+instead of `yum install`, and point to the new files.
 
 {{< include "install-script.md" >}}
 
diff --git a/content/manuals/engine/install/rhel.md b/content/manuals/engine/install/rhel.md
index 80d35a982c1c..9bba1ebfe3e0 100644
--- a/content/manuals/engine/install/rhel.md
+++ b/content/manuals/engine/install/rhel.md
@@ -236,8 +236,8 @@ You have now successfully installed and started Docker Engine.
 #### Upgrade Docker Engine
 
 To upgrade Docker Engine, download the newer package files and repeat the
-[installation procedure](#install-from-a-package), using `yum -y upgrade`
-instead of `yum -y install`, and point to the new files.
+[installation procedure](#install-from-a-package), using `yum upgrade`
+instead of `yum install`, and point to the new files.
 
 {{< include "install-script.md" >}}
 

From a8cfab163dc1ec5b9a1018999a5318898943dac5 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Fri, 8 Nov 2024 13:10:58 +0100
Subject: [PATCH 10/15] engine/install: use dnf for CentOS and RHEL

The versions of CentOS and RHEL we support now have dnf as a default
instead of yum, so rewrite these to use dnf.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 content/manuals/engine/install/centos.md | 28 ++++++++++++------------
 content/manuals/engine/install/fedora.md |  2 +-
 content/manuals/engine/install/rhel.md   | 28 ++++++++++++------------
 3 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/content/manuals/engine/install/centos.md b/content/manuals/engine/install/centos.md
index 097fb67ddc71..06ed0352e363 100644
--- a/content/manuals/engine/install/centos.md
+++ b/content/manuals/engine/install/centos.md
@@ -1,7 +1,7 @@
 ---
 description: Learn how to install Docker Engine on CentOS. These instructions cover
   the different installation methods, how to uninstall, and next steps.
-keywords: requirements, yum, installation, centos, install, uninstall, docker engine, upgrade, update
+keywords: requirements, dnf, yum, installation, centos, install, uninstall, docker engine, upgrade, update
 title: Install Docker Engine on CentOS
 linkTitle: CentOS
 weight: 60
@@ -41,7 +41,7 @@ Uninstall any such older versions before attempting to install a new version,
 along with associated dependencies.
 
 ```console
-$ sudo yum remove docker \
+$ sudo dnf remove docker \
                   docker-client \
                   docker-client-latest \
                   docker-common \
@@ -51,7 +51,7 @@ $ sudo yum remove docker \
                   docker-engine
 ```
 
-`yum` might report that you have none of these packages installed.
+`dnf` might report that you have none of these packages installed.
 
 Images, containers, volumes, and networks stored in `/var/lib/docker/` aren't
 automatically removed when you uninstall Docker.
@@ -81,12 +81,12 @@ Docker from the repository.
 
 #### Set up the repository
 
-Install the `yum-utils` package (which provides the `yum-config-manager`
-utility) and set up the repository.
+Install the `dnf-plugins-core` package (which provides the commands to manage
+your DNF repositories) and set up the repository.
 
 ```console
-$ sudo yum install -y yum-utils
-$ sudo yum-config-manager --add-repo {{% param "download-url-base" %}}/docker-ce.repo
+$ sudo dnf -y install dnf-plugins-core
+$ sudo dnf config-manager --add-repo {{% param "download-url-base" %}}/docker-ce.repo
 ```
 
 #### Install Docker Engine
@@ -99,7 +99,7 @@ $ sudo yum-config-manager --add-repo {{% param "download-url-base" %}}/docker-ce
    To install the latest version, run:
 
    ```console
-   $ sudo yum install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
+   $ sudo dnf install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
    ```
 
    If prompted to accept the GPG key, verify that the fingerprint matches
@@ -115,7 +115,7 @@ $ sudo yum-config-manager --add-repo {{% param "download-url-base" %}}/docker-ce
    the repository:
 
    ```console
-   $ yum list docker-ce --showduplicates | sort -r
+   $ dnf list docker-ce --showduplicates | sort -r
 
    docker-ce.x86_64    3:27.3.1-1.el9    docker-ce-stable
    docker-ce.x86_64    3:27.3.0-1.el9    docker-ce-stable
@@ -133,7 +133,7 @@ $ sudo yum-config-manager --add-repo {{% param "download-url-base" %}}/docker-ce
    command to install:
 
    ```console
-   $ sudo yum install docker-ce-<VERSION_STRING> docker-ce-cli-<VERSION_STRING> containerd.io docker-buildx-plugin docker-compose-plugin
+   $ sudo dnf install docker-ce-<VERSION_STRING> docker-ce-cli-<VERSION_STRING> containerd.io docker-buildx-plugin docker-compose-plugin
    ```
 
    This command installs Docker, but it doesn't start Docker. It also creates a
@@ -186,7 +186,7 @@ download a new file each time you want to upgrade Docker Engine.
    the Docker package.
 
    ```console
-   $ sudo yum install /path/to/package.rpm
+   $ sudo dnf install /path/to/package.rpm
    ```
 
    Docker is installed but not started. The `docker` group is created, but no
@@ -219,8 +219,8 @@ You have now successfully installed and started Docker Engine.
 #### Upgrade Docker Engine
 
 To upgrade Docker Engine, download the newer package files and repeat the
-[installation procedure](#install-from-a-package), using `yum upgrade`
-instead of `yum install`, and point to the new files.
+[installation procedure](#install-from-a-package), using `dnf upgrade`
+instead of `dnf install`, and point to the new files.
 
 {{< include "install-script.md" >}}
 
@@ -229,7 +229,7 @@ instead of `yum install`, and point to the new files.
 1. Uninstall the Docker Engine, CLI, containerd, and Docker Compose packages:
 
    ```console
-   $ sudo yum remove docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin docker-ce-rootless-extras
+   $ sudo dnf remove docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin docker-ce-rootless-extras
    ```
 
 2. Images, containers, volumes, or custom configuration files on your host
diff --git a/content/manuals/engine/install/fedora.md b/content/manuals/engine/install/fedora.md
index d7e8105159c9..9c0cf0d2beb0 100644
--- a/content/manuals/engine/install/fedora.md
+++ b/content/manuals/engine/install/fedora.md
@@ -1,7 +1,7 @@
 ---
 description: Learn how to install Docker Engine on Fedora. These instructions cover
   the different installation methods, how to uninstall, and next steps.
-keywords: requirements, apt, installation, fedora, install fedora, install docker engine, rpm, install, uninstall, upgrade,
+keywords: requirements, dnf, installation, fedora, install fedora, install docker engine, rpm, install, uninstall, upgrade,
   update
 title: Install Docker Engine on Fedora
 linkTitle: Fedora
diff --git a/content/manuals/engine/install/rhel.md b/content/manuals/engine/install/rhel.md
index 9bba1ebfe3e0..c1b55ce6f9b2 100644
--- a/content/manuals/engine/install/rhel.md
+++ b/content/manuals/engine/install/rhel.md
@@ -1,7 +1,7 @@
 ---
 description: Learn how to install Docker Engine on RHEL. These instructions cover
   the different installation methods, how to uninstall, and next steps.
-keywords: requirements, apt, installation, rhel, rpm, install, install docker engine, uninstall, upgrade,
+keywords: requirements, dnf, installation, rhel, rpm, install, install docker engine, uninstall, upgrade,
   update
 title: Install Docker Engine on RHEL
 linkTitle: RHEL
@@ -40,7 +40,7 @@ along with associated dependencies. Also uninstall `Podman` and the associated
 dependencies if installed already:
 
 ```console
-$ sudo yum remove docker \
+$ sudo dnf remove docker \
                   docker-client \
                   docker-client-latest \
                   docker-common \
@@ -52,7 +52,7 @@ $ sudo yum remove docker \
                   runc
 ```
 
-`yum` might report that you have none of these packages installed.
+`dnf` might report that you have none of these packages installed.
 
 Images, containers, volumes, and networks stored in `/var/lib/docker/` aren't
 automatically removed when you uninstall Docker.
@@ -82,12 +82,12 @@ Docker from the repository.
 
 #### Set up the repository
 
-Install the `yum-utils` package (which provides the `yum-config-manager`
-utility) and set up the repository.
+Install the `dnf-plugins-core` package (which provides the commands to manage
+your DNF repositories) and set up the repository.
 
 ```console
-$ sudo yum install -y yum-utils
-$ sudo yum-config-manager --add-repo {{% param "download-url-base" %}}/docker-ce.repo
+$ sudo dnf -y install dnf-plugins-core
+$ sudo dnf config-manager --add-repo {{% param "download-url-base" %}}/docker-ce.repo
 ```
 
 #### Install Docker Engine
@@ -100,7 +100,7 @@ $ sudo yum-config-manager --add-repo {{% param "download-url-base" %}}/docker-ce
    To install the latest version, run:
 
    ```console
-   $ sudo yum install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
+   $ sudo dnf install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
    ```
 
    If prompted to accept the GPG key, verify that the fingerprint matches
@@ -116,7 +116,7 @@ $ sudo yum-config-manager --add-repo {{% param "download-url-base" %}}/docker-ce
    the repository:
 
    ```console
-   $ yum list docker-ce --showduplicates | sort -r
+   $ dnf list docker-ce --showduplicates | sort -r
 
    docker-ce.x86_64    3:27.3.1-1.el9    docker-ce-stable
    docker-ce.x86_64    3:27.3.0-1.el9    docker-ce-stable
@@ -134,7 +134,7 @@ $ sudo yum-config-manager --add-repo {{% param "download-url-base" %}}/docker-ce
    command to install:
 
    ```console
-   $ sudo yum install docker-ce-<VERSION_STRING> docker-ce-cli-<VERSION_STRING> containerd.io docker-buildx-plugin docker-compose-plugin
+   $ sudo dnf install docker-ce-<VERSION_STRING> docker-ce-cli-<VERSION_STRING> containerd.io docker-buildx-plugin docker-compose-plugin
    ```
 
    This command installs Docker, but it doesn't start Docker. It also creates a
@@ -199,7 +199,7 @@ download a new file each time you want to upgrade Docker Engine.
    the packages.
 
    ```console
-   $ sudo yum install ./containerd.io-<version>.<arch>.rpm \
+   $ sudo dnf install ./containerd.io-<version>.<arch>.rpm \
      ./docker-ce-<version>.<arch>.rpm \
      ./docker-ce-cli-<version>.<arch>.rpm \
      ./docker-buildx-plugin-<version>.<arch>.rpm \
@@ -236,8 +236,8 @@ You have now successfully installed and started Docker Engine.
 #### Upgrade Docker Engine
 
 To upgrade Docker Engine, download the newer package files and repeat the
-[installation procedure](#install-from-a-package), using `yum upgrade`
-instead of `yum install`, and point to the new files.
+[installation procedure](#install-from-a-package), using `dnf upgrade`
+instead of `dnf install`, and point to the new files.
 
 {{< include "install-script.md" >}}
 
@@ -246,7 +246,7 @@ instead of `yum install`, and point to the new files.
 1. Uninstall the Docker Engine, CLI, containerd, and Docker Compose packages:
 
    ```console
-   $ sudo yum remove docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin docker-ce-rootless-extras
+   $ sudo dnf remove docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin docker-ce-rootless-extras
    ```
 
 2. Images, containers, volumes, or custom configuration files on your host

From 3a12814361a6a468d04c79f94f366f1167a96375 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Fri, 8 Nov 2024 13:14:26 +0100
Subject: [PATCH 11/15] engine/install: fix leftover old version in ubuntu

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 content/manuals/engine/install/ubuntu.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/manuals/engine/install/ubuntu.md b/content/manuals/engine/install/ubuntu.md
index 3af691594a6b..8d9bc7a13182 100644
--- a/content/manuals/engine/install/ubuntu.md
+++ b/content/manuals/engine/install/ubuntu.md
@@ -166,7 +166,7 @@ Docker from the repository.
    Select the desired version and install:
 
    ```console
-   $ VERSION_STRING=5:27.1.1-1~ubuntu.24.04~noble
+   $ VERSION_STRING=5:27.3.1-1~ubuntu.24.04~noble
    $ sudo apt-get install docker-ce=$VERSION_STRING docker-ce-cli=$VERSION_STRING containerd.io docker-buildx-plugin docker-compose-plugin
    ```
   

From a23d62139ab3b05ce0b3200a8b556dfa30cf8a58 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Fri, 8 Nov 2024 13:15:31 +0100
Subject: [PATCH 12/15] engine/install: fix indentation in debian,
 raspberry-pi-os

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 content/manuals/engine/install/debian.md      | 30 +++++++++----------
 .../manuals/engine/install/raspberry-pi-os.md | 20 ++++++-------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/content/manuals/engine/install/debian.md b/content/manuals/engine/install/debian.md
index 9f16f925baf4..6b23846ed368 100644
--- a/content/manuals/engine/install/debian.md
+++ b/content/manuals/engine/install/debian.md
@@ -250,26 +250,26 @@ To upgrade Docker Engine, download the newer package files and repeat the
 
 ## Uninstall Docker Engine
 
-1.  Uninstall the Docker Engine, CLI, containerd, and Docker Compose packages:
+1. Uninstall the Docker Engine, CLI, containerd, and Docker Compose packages:
 
-    ```console
-    $ sudo apt-get purge docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin docker-ce-rootless-extras
-    ```
+   ```console
+   $ sudo apt-get purge docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin docker-ce-rootless-extras
+   ```
 
-2.  Images, containers, volumes, or custom configuration files on your host
-    aren't automatically removed. To delete all images, containers, and volumes:
+2. Images, containers, volumes, or custom configuration files on your host
+   aren't automatically removed. To delete all images, containers, and volumes:
 
-    ```console
-    $ sudo rm -rf /var/lib/docker
-    $ sudo rm -rf /var/lib/containerd
-    ```
+   ```console
+   $ sudo rm -rf /var/lib/docker
+   $ sudo rm -rf /var/lib/containerd
+   ```
 
-3.  Remove source list and keyrings
+3. Remove source list and keyrings
 
-    ```console
-    $ sudo rm /etc/apt/sources.list.d/docker.list
-    $ sudo rm /etc/apt/keyrings/docker.asc
-    ```
+   ```console
+   $ sudo rm /etc/apt/sources.list.d/docker.list
+   $ sudo rm /etc/apt/keyrings/docker.asc
+   ```
 
 You have to delete any edited configuration files manually.
 
diff --git a/content/manuals/engine/install/raspberry-pi-os.md b/content/manuals/engine/install/raspberry-pi-os.md
index 87cb33a91472..400dbc9fac98 100644
--- a/content/manuals/engine/install/raspberry-pi-os.md
+++ b/content/manuals/engine/install/raspberry-pi-os.md
@@ -238,19 +238,19 @@ To upgrade Docker Engine, download the newer package files and repeat the
 
 ## Uninstall Docker Engine
 
-1.  Uninstall the Docker Engine, CLI, containerd, and Docker Compose packages:
+1. Uninstall the Docker Engine, CLI, containerd, and Docker Compose packages:
 
-    ```console
-    $ sudo apt-get purge docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin docker-ce-rootless-extras
-    ```
+   ```console
+   $ sudo apt-get purge docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin docker-ce-rootless-extras
+   ```
 
-2.  Images, containers, volumes, or custom configuration files on your host
-    aren't automatically removed. To delete all images, containers, and volumes:
+2. Images, containers, volumes, or custom configuration files on your host
+   aren't automatically removed. To delete all images, containers, and volumes:
 
-    ```console
-    $ sudo rm -rf /var/lib/docker
-    $ sudo rm -rf /var/lib/containerd
-    ```
+   ```console
+   $ sudo rm -rf /var/lib/docker
+   $ sudo rm -rf /var/lib/containerd
+   ```
 
 You have to delete any edited configuration files manually.
 

From d5859c5ff7dbfcbbef7beb96b9ecdf9de66b4d4d Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Fri, 8 Nov 2024 13:18:59 +0100
Subject: [PATCH 13/15] engine/install: fix some stray whitespace

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 content/manuals/engine/install/fedora.md | 4 ++--
 content/manuals/engine/install/sles.md   | 2 +-
 content/manuals/engine/install/ubuntu.md | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/content/manuals/engine/install/fedora.md b/content/manuals/engine/install/fedora.md
index 9c0cf0d2beb0..a92e2b7f06ba 100644
--- a/content/manuals/engine/install/fedora.md
+++ b/content/manuals/engine/install/fedora.md
@@ -92,7 +92,7 @@ $ sudo dnf-3 config-manager --add-repo {{% param "download-url-base" %}}/docker-
 
    {{< tabs >}}
    {{< tab name="Latest" >}}
-   
+
    To install the latest version, run:
 
    ```console
@@ -135,7 +135,7 @@ $ sudo dnf-3 config-manager --add-repo {{% param "download-url-base" %}}/docker-
 
    This command installs Docker, but it doesn't start Docker. It also creates a
    `docker` group, however, it doesn't add any users to the group by default.
-   
+
    {{< /tab >}}
    {{< /tabs >}}
 
diff --git a/content/manuals/engine/install/sles.md b/content/manuals/engine/install/sles.md
index 376f81709a76..894565185cf6 100644
--- a/content/manuals/engine/install/sles.md
+++ b/content/manuals/engine/install/sles.md
@@ -128,7 +128,7 @@ $ sudo zypper addrepo {{% param "download-url-base" %}}/docker-ce.repo
 
    This command installs Docker, but it doesn't start Docker. It also creates a
    `docker` group, however, it doesn't add any users to the group by default.
-  
+
    {{< /tab >}}
    {{< tab name="Specific version" >}}
 
diff --git a/content/manuals/engine/install/ubuntu.md b/content/manuals/engine/install/ubuntu.md
index 8d9bc7a13182..a695bdf63ae5 100644
--- a/content/manuals/engine/install/ubuntu.md
+++ b/content/manuals/engine/install/ubuntu.md
@@ -123,7 +123,7 @@ Docker from the repository.
    sudo install -m 0755 -d /etc/apt/keyrings
    sudo curl -fsSL {{% param "download-url-base" %}}/gpg -o /etc/apt/keyrings/docker.asc
    sudo chmod a+r /etc/apt/keyrings/docker.asc
-   
+
    # Add the repository to Apt sources:
    echo \
      "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] {{% param "download-url-base" %}} \
@@ -169,7 +169,7 @@ Docker from the repository.
    $ VERSION_STRING=5:27.3.1-1~ubuntu.24.04~noble
    $ sudo apt-get install docker-ce=$VERSION_STRING docker-ce-cli=$VERSION_STRING containerd.io docker-buildx-plugin docker-compose-plugin
    ```
-  
+
    {{< /tab >}}
    {{< /tabs >}}
 

From 0628e31742732b67157950cd4a71403def0e0e1a Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Fri, 8 Nov 2024 13:19:54 +0100
Subject: [PATCH 14/15] engine/install: ubuntu/rpi-os: sync uninstall with
 debian steps

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 content/manuals/engine/install/raspberry-pi-os.md | 7 +++++++
 content/manuals/engine/install/ubuntu.md          | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/content/manuals/engine/install/raspberry-pi-os.md b/content/manuals/engine/install/raspberry-pi-os.md
index 400dbc9fac98..2a6950c8bc9d 100644
--- a/content/manuals/engine/install/raspberry-pi-os.md
+++ b/content/manuals/engine/install/raspberry-pi-os.md
@@ -252,6 +252,13 @@ To upgrade Docker Engine, download the newer package files and repeat the
    $ sudo rm -rf /var/lib/containerd
    ```
 
+3. Remove source list and keyrings
+
+   ```console
+   $ sudo rm /etc/apt/sources.list.d/docker.list
+   $ sudo rm /etc/apt/keyrings/docker.asc
+   ```
+
 You have to delete any edited configuration files manually.
 
 ## Next steps
diff --git a/content/manuals/engine/install/ubuntu.md b/content/manuals/engine/install/ubuntu.md
index a695bdf63ae5..a9be9b5406a3 100644
--- a/content/manuals/engine/install/ubuntu.md
+++ b/content/manuals/engine/install/ubuntu.md
@@ -267,6 +267,13 @@ To upgrade Docker Engine, download the newer package files and repeat the
    $ sudo rm -rf /var/lib/containerd
    ```
 
+3. Remove source list and keyrings
+
+   ```console
+   $ sudo rm /etc/apt/sources.list.d/docker.list
+   $ sudo rm /etc/apt/keyrings/docker.asc
+   ```
+
 You have to delete any edited configuration files manually.
 
 ## Next steps

From 898aa4d2d3665b72db8270b9da99b14c78e4b71b Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Fri, 8 Nov 2024 13:32:52 +0100
Subject: [PATCH 15/15] engine/install: sync some wording between distros

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 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 06ed0352e363..c560cea9fa45 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 6b23846ed368..ebb0b94d56b6 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 a92e2b7f06ba..e1bed80474cc 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 2a6950c8bc9d..927f6498d153 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 c1b55ce6f9b2..b8cde38551e5 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 894565185cf6..d8b501634017 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 a9be9b5406a3..0989b8cec43b 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