Re: Making Debian available - patch for webwml - round 2
Hi,
Holger Wansing <hwansing@mailbox.org> wrote:
> Hi,
>
> Thomas Lange <lange@cs.uni-koeln.de> wrote:
> > >>>>> On Mon, 25 Jan 2021 10:49:11 +0100, Holger Wansing <hwansing@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.
Done.
Moreover, I found two more pages, which deserve such "non-free images hint":
./CD/live/index.wml
./CD/netinst/index.wml
So I have added it there too.
(patch attached, just for completeness)
Holger
--
Holger Wansing <hwansing@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 db7c9a703cf..2cb154d795f 100644
--- a/english/CD/http-ftp/index.wml
+++ b/english/CD/http-ftp/index.wml
@@ -110,6 +110,8 @@ 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/live/index.wml
+# ./CD/netinst/index.wml
# ./CD/torrent-cd/index.wml
# ./distrib/index.wml
# ./distrib/netinst.wml
diff --git a/english/CD/live/index.wml b/english/CD/live/index.wml
index 369904f4bbe..52f719e1866 100644
--- a/english/CD/live/index.wml
+++ b/english/CD/live/index.wml
@@ -72,3 +72,31 @@ information about the installation process</a>.</p>
<p>See the <a href="$(HOME)/devel/debian-live">Debian Live Project page</a> for
more information about the Debian Live systems provided by these images.</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/live/index.wml
+# ./CD/netinst/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 live 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/";>unofficial
+live images for <q>stable</q> with firmware included</a>
+</p>
+</div>
diff --git a/english/CD/netinst/index.wml b/english/CD/netinst/index.wml
index 2f8396449d1..d7ba0251488 100644
--- a/english/CD/netinst/index.wml
+++ b/english/CD/netinst/index.wml
@@ -62,3 +62,32 @@ the <a href="../faq/">FAQ</a>.</p>
<p>Once you have downloaded the images, be sure to have a look at the
<a href="$(HOME)/releases/stable/installmanual">detailed
information about the installation process</a>.</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/live/index.wml
+# ./CD/netinst/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 netinst 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>
diff --git a/english/CD/torrent-cd/index.wml b/english/CD/torrent-cd/index.wml
index c166b6a4bc6..7d6865a2b3c 100644
--- a/english/CD/torrent-cd/index.wml
+++ b/english/CD/torrent-cd/index.wml
@@ -78,6 +78,8 @@ 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/live/index.wml
+# ./CD/netinst/index.wml
# ./CD/torrent-cd/index.wml
# ./distrib/index.wml
# ./distrib/netinst.wml
diff --git a/english/devel/debian-installer/index.wml b/english/devel/debian-installer/index.wml
index 0de5de401e8..104d71ae338 100644
--- a/english/devel/debian-installer/index.wml
+++ b/english/devel/debian-installer/index.wml
@@ -175,6 +175,8 @@ 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/live/index.wml
+# ./CD/netinst/index.wml
# ./CD/torrent-cd/index.wml
# ./distrib/index.wml
# ./distrib/netinst.wml
diff --git a/english/distrib/index.wml b/english/distrib/index.wml
index ad308e0196e..abdc459bf78 100644
--- a/english/distrib/index.wml
+++ b/english/distrib/index.wml
@@ -113,6 +113,8 @@ And, the release notes can be found <a href="../releases/stable/releasenotes">he
# 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/live/index.wml
+# ./CD/netinst/index.wml
# ./CD/torrent-cd/index.wml
# ./distrib/index.wml
# ./distrib/netinst.wml
diff --git a/english/distrib/netinst.wml b/english/distrib/netinst.wml
index eb3808baca6..73a2a917617 100644
--- a/english/distrib/netinst.wml
+++ b/english/distrib/netinst.wml
@@ -80,6 +80,8 @@ information):</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/live/index.wml
+# ./CD/netinst/index.wml
# ./CD/torrent-cd/index.wml
# ./distrib/index.wml
# ./distrib/netinst.wml
diff --git a/english/releases/bookworm/debian-installer/index.wml b/english/releases/bookworm/debian-installer/index.wml
index c2f8843d77c..c0aeac7029b 100644
--- a/english/releases/bookworm/debian-installer/index.wml
+++ b/english/releases/bookworm/debian-installer/index.wml
@@ -87,6 +87,17 @@ CD/DVD images can be used on USB sticks too):
</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/live/index.wml
+# ./CD/netinst/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
diff --git a/english/releases/bullseye/debian-installer/index.wml b/english/releases/bullseye/debian-installer/index.wml
index 8325da52f6e..16ec263f769 100644
--- a/english/releases/bullseye/debian-installer/index.wml
+++ b/english/releases/bullseye/debian-installer/index.wml
@@ -90,6 +90,8 @@ CD/DVD images can be used on USB sticks too):
# 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/live/index.wml
+# ./CD/netinst/index.wml
# ./CD/torrent-cd/index.wml
# ./distrib/index.wml
# ./distrib/netinst.wml
diff --git a/english/releases/buster/debian-installer/index.wml b/english/releases/buster/debian-installer/index.wml
index c11ecf081ba..b658436a238 100644
--- a/english/releases/buster/debian-installer/index.wml
+++ b/english/releases/buster/debian-installer/index.wml
@@ -87,6 +87,17 @@ CD/DVD images can be used on USB sticks too):
</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/live/index.wml
+# ./CD/netinst/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
Reply to: