From 64192639fda1cd28ba74b4b65d9cabf00faa4edc Mon Sep 17 00:00:00 2001 From: Chris Chinchilla Date: Tue, 28 Mar 2023 17:22:34 +0100 Subject: [PATCH 1/2] Minor changes for freshness --- engine/install/index.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/engine/install/index.md b/engine/install/index.md index a7e6ccd6e2..bc66f7e9ef 100644 --- a/engine/install/index.md +++ b/engine/install/index.md @@ -30,8 +30,8 @@ redirect_from: > **Docker Desktop for Linux** > -> Docker Desktop helps you build, share, and run containers easily on Mac and -> Windows as you do on Linux. We are excited to share that Docker Desktop for +> Docker Desktop helps you build, share, and run containers on Mac and +> Windows as you do on Linux. Docker Desktop for > Linux is now GA. For more information, see [Docker Desktop for Linux](../../desktop/install/linux-install.md). {: .important} @@ -39,7 +39,7 @@ redirect_from: ## Supported platforms Docker Engine is available on a variety of [Linux platforms](../../desktop/install/linux-install.md), -[macOS](../../desktop/install/mac-install.md) and [Windows 10](../../desktop/install/windows-install.md) +[macOS](../../desktop/install/mac-install.md), and [Windows 10](../../desktop/install/windows-install.md) through Docker Desktop, and as a [static binary installation](binaries.md). Find your preferred operating system below. @@ -73,28 +73,28 @@ and architectures: > **Note** > -> While the instructions below may work, Docker does not test or verify -> installation on derivatives. +> While the instructions below may work, Docker doesn't test or verify +> installation on distribution derivatives. - Users of Debian derivatives such as "BunsenLabs Linux", "Kali Linux" or "LMDE" (Debian-based Mint) should follow the installation instructions for - [Debian](debian.md), substituting the version of their distro for the - corresponding Debian release. Refer to the documentation of your distro to find + [Debian](debian.md), substituting the version of their distribution for the + corresponding Debian release. Refer to the documentation of your distribution to find which Debian release corresponds with your derivative version. - Likewise, users of Ubuntu derivatives such as "Kubuntu", "Lubuntu" or "Xubuntu" should follow the installation instructions for [Ubuntu](ubuntu.md), - substituting the version of their distro for the corresponding Ubuntu release. - Refer to the documentation of your distro to find which Ubuntu release + substituting the version of their distribution for the corresponding Ubuntu release. + Refer to the documentation of your distribution to find which Ubuntu release corresponds with your derivative version. -- Some Linux distributions are providing a package of Docker Engine through their +- Some Linux distributions provide a package of Docker Engine through their package repositories. These packages are built and maintained by the Linux distribution's package maintainers and may have differences in configuration - or built from modified source code. Docker is not involved in releasing these - packages and bugs or issues involving these packages should be reported in + or built from modified source code. Docker isn't involved in releasing these + packages and you should report any bugs or issues involving these packages to your Linux distribution's issue tracker. Docker provides [binaries](binaries.md) for manual installation of Docker Engine. -These binaries are statically linked and can be used on any Linux distribution. +These binaries are statically linked and you can use them on any Linux distribution. ## Release channels From 0accf4a17fd0b97a9cb7c8e123c6811ad19162c7 Mon Sep 17 00:00:00 2001 From: Chris Chinchilla Date: Thu, 30 Mar 2023 11:15:59 +0100 Subject: [PATCH 2/2] Undo distro change --- engine/install/index.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/engine/install/index.md b/engine/install/index.md index bc66f7e9ef..1d49b5a86b 100644 --- a/engine/install/index.md +++ b/engine/install/index.md @@ -38,7 +38,7 @@ redirect_from: ## Supported platforms -Docker Engine is available on a variety of [Linux platforms](../../desktop/install/linux-install.md), +Docker Engine is available on a variety of [Linux distros](../../desktop/install/linux-install.md), [macOS](../../desktop/install/mac-install.md), and [Windows 10](../../desktop/install/windows-install.md) through Docker Desktop, and as a [static binary installation](binaries.md). Find your preferred operating system below. @@ -55,7 +55,7 @@ your preferred operating system below. ### Server -Docker provides `.deb` and `.rpm` packages from the following Linux distributions +Docker provides `.deb` and `.rpm` packages from the following Linux distros and architectures: | Platform | x86_64 / amd64 | arm64 / aarch64 | arm (32-bit) | s390x | @@ -69,32 +69,32 @@ and architectures: | [Ubuntu](ubuntu.md) | [{{ yes }}](ubuntu.md) | [{{ yes }}](ubuntu.md) | [{{ yes }}](ubuntu.md) | [{{ yes }}](ubuntu.md) | | [Binaries](binaries.md) | [{{yes}}](binaries.md) | [{{yes}}](binaries.md) | [{{yes}}](binaries.md) | | -### Other Linux distributions +### Other Linux distros > **Note** > > While the instructions below may work, Docker doesn't test or verify -> installation on distribution derivatives. +> installation on distro derivatives. - Users of Debian derivatives such as "BunsenLabs Linux", "Kali Linux" or "LMDE" (Debian-based Mint) should follow the installation instructions for - [Debian](debian.md), substituting the version of their distribution for the - corresponding Debian release. Refer to the documentation of your distribution to find + [Debian](debian.md), substituting the version of their distro for the + corresponding Debian release. Refer to the documentation of your distro to find which Debian release corresponds with your derivative version. - Likewise, users of Ubuntu derivatives such as "Kubuntu", "Lubuntu" or "Xubuntu" should follow the installation instructions for [Ubuntu](ubuntu.md), - substituting the version of their distribution for the corresponding Ubuntu release. - Refer to the documentation of your distribution to find which Ubuntu release + substituting the version of their distro for the corresponding Ubuntu release. + Refer to the documentation of your distro to find which Ubuntu release corresponds with your derivative version. -- Some Linux distributions provide a package of Docker Engine through their +- Some Linux distros provide a package of Docker Engine through their package repositories. These packages are built and maintained by the Linux - distribution's package maintainers and may have differences in configuration + distro's package maintainers and may have differences in configuration or built from modified source code. Docker isn't involved in releasing these packages and you should report any bugs or issues involving these packages to - your Linux distribution's issue tracker. + your Linux distro's issue tracker. Docker provides [binaries](binaries.md) for manual installation of Docker Engine. -These binaries are statically linked and you can use them on any Linux distribution. +These binaries are statically linked and you can use them on any Linux distro. ## Release channels