Hi, Thomas Lange <la...@cs.uni-koeln.de> wrote: > >>>>> On Mon, 25 Jan 2021 10:49:11 +0100, Holger Wansing > >>>>> <hwans...@mailbox.org> said: > > > Patch updated again > Hi Holger, > > I really like to see this improvement on our web pages. > Please go ahead and apply this patch.
Attached to this mail is an once-again updated patch: I noticed that there are some more pages, which already have such non-free hint with as a "warning" class, that's several files in ./english/releases/<release-name>/debian-installer/index.wml I have updated the ones for Buster and Bullseye to be consistent with the others (while leaving the older ones untouched). Will apply this shortly. Holger -- Holger Wansing <hwans...@mailbox.org> PGP-Fingerprint: 496A C6E8 1442 4B34 8508 3529 59F1 87CA 156E B076
diff --git a/english/CD/http-ftp/index.wml b/english/CD/http-ftp/index.wml index d23e1c87bc8..6615fe360ac 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,35 @@ walkthrough of the installation process. Other useful documentation includes: <hr /> +# Translators: the following paragraph exists (in this or a similar form) several times in webwml, +# so please try to keep translations consistent. See: +# ./CD/http-ftp/index.wml +# ./CD/torrent-cd/index.wml +# ./distrib/index.wml +# ./distrib/netinst.wml +# ./releases/<release-codename>/debian-installer/index.wml +# ./devel/debian-installer/index.wml +# +<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> — diff --git a/english/CD/torrent-cd/index.wml b/english/CD/torrent-cd/index.wml index e3e5e260432..c166b6a4bc6 100644 --- a/english/CD/torrent-cd/index.wml +++ b/english/CD/torrent-cd/index.wml @@ -74,3 +74,28 @@ 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 (in this or a similar form) several times in webwml, +# so please try to keep translations consistent. See: +# ./CD/http-ftp/index.wml +# ./CD/torrent-cd/index.wml +# ./distrib/index.wml +# ./distrib/netinst.wml +# ./releases/<release-codename>/debian-installer/index.wml +# ./devel/debian-installer/index.wml +# +<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..0de5de401e8 100644 --- a/english/devel/debian-installer/index.wml +++ b/english/devel/debian-installer/index.wml @@ -172,14 +172,37 @@ available version of installer components. </div> </div> +# Translators: the following paragraph exists (in this or a similar form) several times in webwml, +# so please try to keep translations consistent. See: +# ./CD/http-ftp/index.wml +# ./CD/torrent-cd/index.wml +# ./distrib/index.wml +# ./distrib/netinst.wml +# ./releases/<release-codename>/debian-installer/index.wml +# ./devel/debian-installer/index.wml +# +<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..ad308e0196e 100644 --- a/english/distrib/index.wml +++ b/english/distrib/index.wml @@ -109,3 +109,28 @@ And, the release notes can be found <a href="../releases/stable/releasenotes">he </ul> </div> </div> + +# Translators: the following paragraph exists (in this or a similar form) several times in webwml, +# so please try to keep translations consistent. See: +# ./CD/http-ftp/index.wml +# ./CD/torrent-cd/index.wml +# ./distrib/index.wml +# ./distrib/netinst.wml +# ./releases/<release-codename>/debian-installer/index.wml +# ./devel/debian-installer/index.wml +# +<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..eb3808baca6 100644 --- a/english/distrib/netinst.wml +++ b/english/distrib/netinst.wml @@ -77,3 +77,27 @@ information):</p> </div> </div> +# Translators: the following paragraph exists (in this or a similar form) several times in webwml, +# so please try to keep translations consistent. See: +# ./CD/http-ftp/index.wml +# ./CD/torrent-cd/index.wml +# ./distrib/index.wml +# ./distrib/netinst.wml +# ./releases/<release-codename>/debian-installer/index.wml +# ./devel/debian-installer/index.wml +# +<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/releases/bullseye/debian-installer/index.wml b/english/releases/bullseye/debian-installer/index.wml index 6938af961f0..8325da52f6e 100644 --- a/english/releases/bullseye/debian-installer/index.wml +++ b/english/releases/bullseye/debian-installer/index.wml @@ -87,14 +87,23 @@ CD/DVD images can be used on USB sticks too): </div> </div> -<div id="firmware_nonfree" class="warning"> +# Translators: the following paragraph exists (in this or a similar form) several times in webwml, +# so please try to keep translations consistent. See: +# ./CD/http-ftp/index.wml +# ./CD/torrent-cd/index.wml +# ./distrib/index.wml +# ./distrib/netinst.wml +# ./releases/<release-codename>/debian-installer/index.wml +# ./devel/debian-installer/index.wml +# +<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/bullseye/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 Installation Guide (see Documentation below). +be found in the <a href="../amd64/ch06s04">Installation Guide</a>. </p> <div class="line"> <div class="item col50"> diff --git a/english/releases/buster/debian-installer/index.wml b/english/releases/buster/debian-installer/index.wml index 0a9742a839d..80018dcc466 100644 --- a/english/releases/buster/debian-installer/index.wml +++ b/english/releases/buster/debian-installer/index.wml @@ -87,14 +87,23 @@ CD/DVD images can be used on USB sticks too): </div> </div> -<div id="firmware_nonfree" class="warning"> +# Translators: the following paragraph exists (in this or a similar form) several times in webwml, +# so please try to keep translations consistent. See: +# ./CD/http-ftp/index.wml +# ./CD/torrent-cd/index.wml +# ./distrib/index.wml +# ./distrib/netinst.wml +# ./releases/<release-codename>/debian-installer/index.wml +# ./devel/debian-installer/index.wml +# +<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/buster/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 Installation Guide (see Documentation below). +be found in the <a href="../amd64/ch06s04">Installation Guide</a>. </p> <div class="line"> <div class="item col50">
