Re: Making Debian available - patch for webwml v5

diff --git a/english/CD/http-ftp/index.wml b/english/CD/http-ftp/index.wml
index d23e1c87bc8..752517b66d9 100644
--- a/english/CD/http-ftp/index.wml
+++ b/english/CD/http-ftp/index.wml
@@ -28,6 +28,9 @@ download:</p>
 
   <li><a href="#stable">Official CD/DVD images of the <q>stable</q> release</a></li>
 
+  <li><a href="#firmware"><b>Unofficial</b> CD/DVD images for <q>stable</q> with
+  <b>non-free</b> firmware included</a></li>
+
   <li><a href="https://cdimage.debian.org/cdimage/weekly-builds/">Official
   CD/DVD images of the <q>testing</q> distribution (<em>regenerated
   weekly</em>)</a></li>
@@ -104,6 +107,34 @@ walkthrough of the installation process. Other useful documentation includes:
 
 <hr />
 
+# Translators: the following paragraph exists several files in webwml, so please keep
+# translations consistent. See:
+# ./CD/http-ftp/index.wml
+# ./CD/torrent-cd/index.wml
+# ./distrib/index.wml
+# ./distrib/netinst.wml
+# ... and at ./devel/debian-installer/index.wml in a slightly different variant.
+# 
+<h2><a name="firmware">Unofficial CD/DVD images with non-free firmware included</a></h2>
+
+<div id="firmware_nonfree" class="important">
+<p>
+If any of the hardware in your system <strong>requires non-free firmware to be
+loaded</strong> with the device driver, you can use one of the
+<a href="https://cdimage.debian.org/cdimage/unofficial/non-free/firmware/stable/current/">\
+tarballs of common firmware packages</a> or download an <strong>unofficial</strong> image
+including these <strong>non-free</strong> firmwares. Instructions how to use the tarballs
+and general information about loading firmware during an installation can
+be found in the <a href="../../releases/stable/amd64/ch06s04">Installation Guide</a>.
+</p>
+<p>
+<a href="https://cdimage.debian.org/cdimage/unofficial/non-free/cd-including-firmware/current/">unofficial
+installation images for <q>stable</q> with firmware included</a>
+</p>
+</div>
+
+<hr />
+
 <h2><a name="mirrors">Registered mirrors of the <q>debian-cd</q> archive</a></h2>
 
 <p>Note that <strong>some mirrors are not up to date</strong> &mdash;
diff --git a/english/CD/torrent-cd/index.wml b/english/CD/torrent-cd/index.wml
index e3e5e260432..69a0863ecb2 100644
--- a/english/CD/torrent-cd/index.wml
+++ b/english/CD/torrent-cd/index.wml
@@ -74,3 +74,27 @@ walkthrough of the installation process. Other useful documentation includes:
 If you can, please leave your client running after your download is complete,
 to help others download images faster!
 </p>
+
+# Translators: the following paragraph exists several files in webwml, so please keep
+# translations consistent. See:
+# ./CD/http-ftp/index.wml
+# ./CD/torrent-cd/index.wml
+# ./distrib/index.wml
+# ./distrib/netinst.wml
+# ... and at ./devel/debian-installer/index.wml in a slightly different variant.
+# 
+<div id="firmware_nonfree" class="important">
+<p>
+If any of the hardware in your system <strong>requires non-free firmware to be
+loaded</strong> with the device driver, you can use one of the
+<a href="https://cdimage.debian.org/cdimage/unofficial/non-free/firmware/stable/current/">\
+tarballs of common firmware packages</a> or download an <strong>unofficial</strong> image
+including these <strong>non-free</strong> firmwares. Instructions how to use the tarballs
+and general information about loading firmware during an installation can
+be found in the <a href="../../releases/stable/amd64/ch06s04">Installation Guide</a>.
+</p>
+<p>
+<a href="https://cdimage.debian.org/cdimage/unofficial/non-free/cd-including-firmware/current/">unofficial
+installation images for <q>stable</q> with firmware included</a>
+</p>
+</div>
diff --git a/english/devel/debian-installer/index.wml b/english/devel/debian-installer/index.wml
index ef00806e51c..1dad32eaa2c 100644
--- a/english/devel/debian-installer/index.wml
+++ b/english/devel/debian-installer/index.wml
@@ -172,14 +172,36 @@ available version of installer components.
 </div>
 </div>
 
+# Translators: the following paragraph exists several files in webwml, so please keep
+# translations consistent. See:
+# ./CD/http-ftp/index.wml
+# ./CD/torrent-cd/index.wml
+# ./distrib/index.wml
+# ./distrib/netinst.wml
+# ... and at ./devel/debian-installer/index.wml in a slightly different variant.
+# 
+<div id="firmware_nonfree" class="important">
 <p>
-If any of the hardware in your system <strong>requires firmware to be
+If any of the hardware in your system <strong>requires non-free firmware to be
 loaded</strong> with the device driver, you can use one of the
 <a href="https://cdimage.debian.org/cdimage/unofficial/non-free/firmware/">\
-tarballs of common firmware packages</a>. Instructions how to use the tarballs
+tarballs of common firmware packages</a> or download an <strong>unofficial</strong> image
+including these <strong>non-free</strong> firmwares. Instructions how to use the tarballs
 and general information about loading firmware during an installation can
-be found in the Installation Guide (see Documentation below).
+be found in the <a href="https://d-i.debian.org/doc/installation-guide/en.amd64/ch06s04.html">Installation Guide</a>.
 </p>
+<p>
+<a href="https://cdimage.debian.org/cdimage/unofficial/non-free/cd-including-firmware/daily-builds/sid_d-i/current/">unofficial
+images with firmware included - daily builds</a>
+</p>
+<p>
+<a href="https://cdimage.debian.org/cdimage/unofficial/non-free/cd-including-firmware/weekly-builds/">unofficial
+images with firmware included - weekly builds</a>
+
+</p>
+</div>
+
+<hr />
 
 <p>
 <strong>Notes</strong>
diff --git a/english/distrib/index.wml b/english/distrib/index.wml
index 527725adb23..e0bd415eb6a 100644
--- a/english/distrib/index.wml
+++ b/english/distrib/index.wml
@@ -109,3 +109,27 @@ And, the release notes can be found <a href="../releases/stable/releasenotes">he
    </ul>
   </div>
 </div>
+
+# Translators: the following paragraph exists several files in webwml, so please keep
+# translations consistent. See:
+# ./CD/http-ftp/index.wml
+# ./CD/torrent-cd/index.wml
+# ./distrib/index.wml
+# ./distrib/netinst.wml
+# ... and at ./devel/debian-installer/index.wml in a slightly different variant.
+# 
+<div id="firmware_nonfree" class="important">
+<p>
+If any of the hardware in your system <strong>requires non-free firmware to be
+loaded</strong> with the device driver, you can use one of the
+<a href="https://cdimage.debian.org/cdimage/unofficial/non-free/firmware/stable/current/">\
+tarballs of common firmware packages</a> or download an <strong>unofficial</strong> image
+including these <strong>non-free</strong> firmwares. Instructions how to use the tarballs
+and general information about loading firmware during an installation can
+be found in the <a href="../releases/stable/amd64/ch06s04">Installation Guide</a>.
+</p>
+<p>
+<a href="https://cdimage.debian.org/cdimage/unofficial/non-free/cd-including-firmware/current/">unofficial
+installation images for <q>stable</q> with firmware included</a>
+</p>
+</div>
diff --git a/english/distrib/netinst.wml b/english/distrib/netinst.wml
index 31d2e1f339d..fb31c51d236 100644
--- a/english/distrib/netinst.wml
+++ b/english/distrib/netinst.wml
@@ -77,3 +77,26 @@ information):</p>
 </div>
 </div>
 
+# Translators: the following paragraph exists several files in webwml, so please keep
+# translations consistently. See:
+# ./CD/http-ftp/index.wml
+# ./CD/torrent-cd/index.wml
+# ./distrib/index.wml
+# ./distrib/netinst.wml
+# ... and at ./devel/debian-installer/index.wml in a slightly different variant.
+# 
+<div id="firmware_nonfree" class="important">
+<p>
+If any of the hardware in your system <strong>requires non-free firmware to be
+loaded</strong> with the device driver, you can use one of the
+<a href="https://cdimage.debian.org/cdimage/unofficial/non-free/firmware/stable/current/">\
+tarballs of common firmware packages</a> or download an <strong>unofficial</strong> image
+including these <strong>non-free</strong> firmwares. Instructions how to use the tarballs
+and general information about loading firmware during an installation can
+be found in the <a href="../releases/stable/amd64/ch06s04">Installation Guide</a>.
+</p>
+<p>
+<a href="https://cdimage.debian.org/cdimage/unofficial/non-free/cd-including-firmware/current/">unofficial
+installation images for <q>stable</q> with firmware included</a>
+</p>
+</div>