Hi,
Thomas Lange wrote:
> > On Mon, 25 Jan 2021 10:49:11 +0100, Holger Wansing
> > 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//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
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:
Official CD/DVD images of the stable release
+ Unofficial CD/DVD images for stable with
+ non-free firmware included
+
https://cdimage.debian.org/cdimage/weekly-builds/;>Official
CD/DVD images of the testing distribution (regenerated
weekly)
@@ -104,6 +107,35 @@ walkthrough of the installation process. Other useful documentation includes:
+# 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//debian-installer/index.wml
+# ./devel/debian-installer/index.wml
+#
+Unofficial CD/DVD images with non-free firmware included
+
+
+
+If any of the hardware in your system requires non-free firmware to be
+loaded with the device driver, you can use one of the
+https://cdimage.debian.org/cdimage/unofficial/non-free/firmware/stable/current/;>\
+tarballs of common firmware packages or download an unofficial image
+including these non-free firmwares. Instructions how to use the tarballs
+and general information about loading firmware during an installation can
+be found in the Installation Guide.
+
+
+https://cdimage.debian.org/cdimage/unofficial/non-free/cd-including-firmware/current/;>unofficial
+installation images for stable with firmware included
+
+
+
+
+
Registered mirrors of the debian-cd archive
Note that some mirrors are not up to date
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!
+
+# 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//debian-installer/index.wml
+# ./devel/debian-installer/index.wml
+#
+
+
+If any of the hardware in your system requires non-free firmware to be
+loaded with the device driver, you can use one of the
+https://cdimage.debian.org/cdimage/unofficial/non-free/firmware/stable/current/;>\
+tarballs of common firmware packages or download an unofficial image
+including these non-free firmwares. Instructions how to use the tarballs
+and general information about loading firmware during an installation can
+be found in the Installation Guide.
+
+
+https://cdimage.debian.org/cdimage/unofficial/non-free/cd-including-firmware/current/;>unofficial
+installation images for stable with firmware included
+
+
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.
+# 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//debian-installer/index.wml
+# ./devel/debian-installer/index.wml
+#
+
-If any of the hardware in your system requires firmware to be
+If any of the hardware in your system requires non-free firmware to be
loaded with the device driver, you can use one of the
https://cdimage.debian.org/cdimage/unofficial/non-free/firmware/;>\
-tarballs of common firmware packages. Instructions how to use the tarballs
+tarballs of common firmware packages or download an unofficial image
+including these non-free firmwares. Instructions how to use the tarballs
and general information about loading
