From a629b944b643683a6214770745b1c2ab2b879181 Mon Sep 17 00:00:00 2001
From: Nils Israel <nils@sxda.io>
Date: Thu, 9 Jan 2025 12:33:05 +0100
Subject: [PATCH 1/2] directly support ubuntu based distros in add repository
 snippets

default to VERSION_CODENAME but use UBUNTU_CODENAME if present and remove comment to do so manually
---
 content/manuals/engine/install/ubuntu.md | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/content/manuals/engine/install/ubuntu.md b/content/manuals/engine/install/ubuntu.md
index ae89082b26d..b61b8caec8e 100644
--- a/content/manuals/engine/install/ubuntu.md
+++ b/content/manuals/engine/install/ubuntu.md
@@ -127,16 +127,11 @@ Docker from the repository.
    # Add the repository to Apt sources:
    echo \
      "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] {{% param "download-url-base" %}} \
-     $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
+     $(. /etc/os-release && echo "${UBUNTU_CODENAME:-$VERSION_CODENAME}") stable" | \
      sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
    sudo apt-get update
    ```
 
-   > [!NOTE]
-   >
-   > If you use an Ubuntu derivative distribution, such as Linux Mint,
-   > you may need to use `UBUNTU_CODENAME` instead of `VERSION_CODENAME`.
-
 2. Install the Docker packages.
 
    {{< tabs >}}

From c5c379a1232e6392a4e8d80b8786d4ced8e45333 Mon Sep 17 00:00:00 2001
From: Nils Israel <nils@sxda.io>
Date: Mon, 13 Jan 2025 19:13:26 +0100
Subject: [PATCH 2/2] readd, move and rephrase the note regarding Ubuntu
 derivative distributions

---
 content/manuals/engine/install/ubuntu.md | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/content/manuals/engine/install/ubuntu.md b/content/manuals/engine/install/ubuntu.md
index b61b8caec8e..652970f8fa9 100644
--- a/content/manuals/engine/install/ubuntu.md
+++ b/content/manuals/engine/install/ubuntu.md
@@ -58,6 +58,11 @@ versions:
 Docker Engine for Ubuntu is compatible with x86_64 (or amd64), armhf, arm64,
 s390x, and ppc64le (ppc64el) architectures.
 
+> [!NOTE]
+> 
+> Installation on Ubuntu derivative distributions, such as Linux Mint, is not officially
+> supported (though it may work).
+
 ### Uninstall old versions
 
 Before you can install Docker Engine, you need to uninstall any conflicting packages.
@@ -132,7 +137,7 @@ Docker from the repository.
    sudo apt-get update
    ```
 
-2. Install the Docker packages.
+3. Install the Docker packages.
 
    {{< tabs >}}
    {{< tab name="Latest" >}}
@@ -168,7 +173,7 @@ Docker from the repository.
    {{< /tab >}}
    {{< /tabs >}}
 
-3. Verify that the 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