Merge branch '6-dev' into fix-video-warnings-link-errors

Author: stevepiercy

docs/glossary.md

@@ -642,4 +642,8 @@ Varnish
 Content Delivery Network
 CDN
     A Content Delivery Network (CDN) is a network of servers located in various geographic regions that work together to deliver web content to users quickly and efficiently.
+
+WSL
+Windows Subsystem for Linux
+    The [Windows Subsystem for Linux (WSL)](https://learn.microsoft.com/en-us/windows/wsl/install) lets developers install a Linux distribution (such as Ubuntu, OpenSUSE, Kali, Debian, or Arch Linux) and use Linux applications, utilities, and Bash command-line tools directly on Windows, unmodified, without the overhead of a traditional virtual machine or dualboot setup.
 ```

docs/install/containers/index.md

@@ -36,22 +36,22 @@ Although there are many container engine tools for developing, managing, and run
 
 ### System requirements
 
-```{todo}
-Add system requirements
-```
+The system requirements include those required by Docker itself.
+
+-   [Linux](https://docs.docker.com/desktop/install/linux-install/)
+-   [macOS](https://docs.docker.com/desktop/install/mac-install/)
+-   [Windows](https://docs.docker.com/desktop/install/windows-install/)
+
+Plone 6 itself requires memory and disk space in addition to those of Docker alone.
+See its {ref}`install-packages-hardware-requirements-label`.
 
 
 ### Install Docker
 
-Install [Docker](https://docs.docker.com/get-docker/) for your operating system.
+Install [Docker Desktop](https://docs.docker.com/get-docker/) for your operating system.
 
 Docker Desktop includes all Docker tools.
-Both macOS and Windows use Docker Desktop.
-On some Linux distributions a beta version of Docker Desktop is available.
-If Docker Desktop is not available for your Linux distribution, you may still install Docker Engine and all of its tools.
-Consult [Get Docker](https://docs.docker.com/get-docker/) for details.
-
-{term}`Docker Compose` is one of the Docker tools that will be used throughout this documentation.
+{term}`Docker Compose` is one of the Docker tools that will be used in much of this documentation.
 
 
 ### Start Plone

docs/install/install-from-packages.md

@@ -19,14 +19,20 @@ When you want full control over development or deployment, installing Plone from
 
 ## System requirements
 
+Plone 6 has both hardware requirements and software pre-requisites.
+
+
+(install-packages-hardware-requirements-label)=
+
+### Hardware requirements
+
 The hardware requirements below give a rough estimate of the minimum hardware setup needed for a Plone server.
 
 {term}`Add-on` products and caching solutions may increase RAM requirements.
 
 A single Plone installation is able to run many Plone sites.
 You may host multiple Plone sites on the same server.
 
--   Almost any modern operating system, including Linux, macOS, and Windows, but a UNIX-based operating system is recommended.
 -   Minimum 256 MB RAM and 512 MB of swap space per Plone site is required.
     2 GB or more RAM per Plone site is recommended.
 -   Minimum 512 MB hard disk space is required.
@@ -37,6 +43,15 @@ You may host multiple Plone sites on the same server.
 
 ### Pre-requisites for installation
 
+-   An operating system that runs all the pre-requisites.
+    Most UNIX-based operating systems are supported, including many Linux distributions, macOS, or {term}`Windows Subsystem for Linux` (WSL) on Windows.
+    A UNIX-based operating system is recommended.
+
+    ```{important}
+    Windows alone is not recommended because it does not support {term}`GNU make`.
+    If you get Plone to run on Windows alone, please feel free to document and share your process.
+    ```
+
 -   [Python](https://www.python.org/downloads/) 3.8, 3.9, or 3.10.
 -   {term}`Cookiecutter`
 -   {term}`nvm`