Fix redirects, add notes about available arches, and minor edits

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

engine/install/centos.md

@@ -3,20 +3,13 @@ description: Instructions for installing Docker Engine on CentOS
 keywords: requirements, apt, installation, centos, rpm, install, uninstall, upgrade, update
 redirect_from:
 - /ee/docker-ee/centos/
-- /ee/docker-ee/rhel/
-- /engine/installation/centos/
 - /engine/installation/centos/
 - /engine/installation/linux/centos/
 - /engine/installation/linux/docker-ce/centos/
 - /engine/installation/linux/docker-ee/centos/
-- /engine/installation/linux/docker-ee/rhel/
-- /engine/installation/linux/rhel/
-- /engine/installation/rhel/
 - /install/linux/centos/
 - /install/linux/docker-ce/centos/
 - /install/linux/docker-ee/centos/
-- /install/linux/docker-ee/rhel/
-- /installation/rhel/
 title: Install Docker Engine on CentOS
 toc_max: 4
 ---

engine/install/index.md

@@ -9,7 +9,6 @@ redirect_from:
 - /cs-engine/1.13/
 - /cs-engine/1.13/upgrade/
 - /ee/docker-ee/oracle/
-- /ee/docker-ee/suse/
 - /ee/supported-platforms/
 - /en/latest/installation/
 - /engine/installation/
@@ -20,18 +19,13 @@ redirect_from:
 - /engine/installation/linux/docker-ce/
 - /engine/installation/linux/docker-ee/
 - /engine/installation/linux/docker-ee/oracle/
-- /engine/installation/linux/docker-ee/suse/
 - /engine/installation/linux/frugalware/
 - /engine/installation/linux/gentoolinux/
 - /engine/installation/linux/oracle/
 - /engine/installation/linux/other/
-- /engine/installation/linux/SUSE/
-- /engine/installation/linux/suse/
 - /engine/installation/oracle/
-- /engine/installation/SUSE/
 - /enterprise/supported-platforms/
 - /install/linux/docker-ee/oracle/
-- /install/linux/docker-ee/suse/
 ---
 
 

engine/install/rhel.md

@@ -1,21 +1,13 @@
 ---
 description: Instructions for installing Docker Engine on RHEL
-keywords: requirements, apt, installation, rhel, rpm, install, uninstall, upgrade, update
+keywords: requirements, apt, installation, rhel, rpm, install, uninstall, upgrade, update, s390x, ibm-z
 redirect_from:
-- /ee/docker-ee/centos/
 - /ee/docker-ee/rhel/
-- /engine/installation/centos/
-- /engine/installation/rhel/
-- /engine/installation/linux/centos/
-- /engine/installation/linux/docker-ce/centos/
 - /engine/installation/linux/docker-ce/rhel/
-- /engine/installation/linux/docker-ee/centos/
 - /engine/installation/linux/docker-ee/rhel/
 - /engine/installation/linux/rhel/
 - /engine/installation/rhel/
-- /install/linux/centos/
-- /install/linux/docker-ce/centos/
-- /install/linux/docker-ee/centos/
+- /engine/installation/rhel/
 - /install/linux/docker-ee/rhel/
 - /installation/rhel/
 title: Install Docker Engine on RHEL
@@ -28,6 +20,12 @@ To get started with Docker Engine on RHEL, make sure you
 
 ## Prerequisites
 
+> **Note**
+>
+> We currently only provide packages for RHEL on s390x (IBM Z). Other architectures
+> are not yet supported for RHEL, but you may be able to install the CentOS packages
+> on RHEL. Refer to the [Install Docker Engine on CentOS](centos.md) page for details.
+
 ### OS requirements
 
 To install Docker Engine, you need a maintained version of RHEL 7 or 8 on s390x (IBM Z).

engine/install/sles.md

@@ -1,18 +1,21 @@
 ---
 description: Instructions for installing Docker Engine on SLES
-keywords: requirements, apt, installation, centos, rpm, sles, install, uninstall, upgrade, update
+keywords: requirements, apt, installation, centos, rpm, sles, install, uninstall, upgrade, update, s390x, ibm-z
 redirect_from:
 - /ee/docker-ee/sles/
-- /engine/installation/sles/
-- /engine/installation/linux/sles/
+- /ee/docker-ee/suse/
 - /engine/installation/linux/docker-ce/sles/
 - /engine/installation/linux/docker-ee/sles/
-- /engine/installation/linux/docker-ee/sles/
+- /engine/installation/linux/docker-ee/suse/
 - /engine/installation/linux/sles/
+- /engine/installation/linux/SUSE/
+- /engine/installation/linux/suse/
 - /engine/installation/sles/
-- /install/linux/sles/
+- /engine/installation/SUSE/
 - /install/linux/docker-ce/sles/
 - /install/linux/docker-ee/sles/
+- /install/linux/docker-ee/suse/
+- /install/linux/sles/
 - /installation/sles/
 title: Install Docker Engine on SLES
 toc_max: 4
@@ -24,19 +27,27 @@ To get started with Docker Engine on SLES, make sure you
 
 ## Prerequisites
 
+> **Note**
+>
+> We currently only provide packages for SLES on s390x (IBM Z). Other architectures
+> are not yet supported for SLES.
+
 ### OS requirements
 
 To install Docker Engine, you need a maintained version of SLES 15-SP2 on s390x (IBM Z).
 Archived versions aren't supported or tested.
 
-The [`SCC SUSE`](https://scc.suse.com/packages?name=SUSE%20Linux%20Enterprise%20Server&version=15.2&arch=s390x) repositories must be enabled. 
+The [`SCC SUSE`](https://scc.suse.com/packages?name=SUSE%20Linux%20Enterprise%20Server&version=15.2&arch=s390x)
+repositories must be enabled. 
 
 The `SELinux (SLE_15_SP2)`repository must be enabled. This repository is not added by
 default, you need to
 [add it](https://download.opensuse.org/repositories/security:SELinux/SLE_15_SP2/security:SELinux.repo).
+
 ```console
 $ zypper addrepo https://download.opensuse.org/repositories/security:SELinux/SLE_15_SP2/security:SELinux.repo
 ```
+
 The `overlay2` storage driver is recommended.
 
 ### Uninstall old versions
@@ -53,7 +64,6 @@ $ sudo zypper remove docker \
                   docker-latest-logrotate \
                   docker-logrotate \
                   docker-engine \
-                  docker-ce-cli \
                   runc
 ```
 

engine/install/ubuntu.md

@@ -237,7 +237,7 @@ a new file each time you want to upgrade Docker.
 
 1.  Go to [`{{ download-url-base }}/dists/`]({{ download-url-base }}/dists/){: target="_blank" rel="noopener" class="_" },
     choose your Ubuntu version, then browse to `pool/stable/`, choose `amd64`,
-    `armhf`, `arm64`,or `s390x`, and download the `.deb` file for the Docker Engine
+    `armhf`, `arm64`, or `s390x`, and download the `.deb` file for the Docker Engine
     version you want to install.
 
     > **Note**: To install a **nightly** or **test** (pre-release) package,

engine/security/rootless.md

@@ -123,7 +123,7 @@ testuser:231072:65536
 ## Known limitations
 
 - Only the following storage drivers are supported:
-  - `overlay2` (only if running with kernel 5.11 or later, or Ubuntu-flavored kernel, or Debian-flavored kernel, doesn't work on SLES 15)
+  - `overlay2` (only if running with kernel 5.11 or later, or Ubuntu-flavored kernel, or Debian-flavored kernel)
   - `fuse-overlayfs` (only if running with kernel 4.18 or later, and `fuse-overlayfs` is installed)
   - `btrfs` (only if running with kernel 4.18 or later, or `~/.local/share/docker` is mounted with `user_subvol_rm_allowed` mount option)
   - `vfs`