Re: Making Debian available - patch for webwml v2

Holger Wansing <[email protected]>
Newsgroups gmane.linux.debian.devel.general,gmane.linux.debian.devel.www,gmane.linux.debian.devel.boot
Message-ID <[email protected]> 
Hi,

Thomas Lange <[email protected]> wrote:
> >>>>> On Mon, 18 Jan 2021 12:37:37 +0100, Holger Wansing <[email protected]> said:
> 
>     >> debian-www team: what do you think about adding some more hint/warning
>     >> banners pointing to firmware-including installation images?
> I really like to have a hint, but warning is a too negative word.
> Having those non-official images can help our users.
> 
>     > First patch attached.
> I would use admon-important.png or admon-tip.png, but not admon-warning.png.
> 
> Please let us treat non-free firmware as something positive, that our
> users need for certain hardware and not use FUD when talking about
> non-free firmware.

Sounds good.
I would vote for the 'important' class (the exclamation mark attracts more
attention IMO).

Patch updated.


Holger


-- 
Holger Wansing <[email protected]>
PGP-Fingerprint: 496A C6E8 1442 4B34 8508  3529 59F1 87CA 156E B076
non-free-hint_v2.diff (text/x-diff, 6.6 KB) 
diff --git a/english/CD/http-ftp/index.wml b/english/CD/http-ftp/index.wml
index d23e1c87bc8..9006f3e8bc6 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,26 @@ walkthrough of the installation process. Other useful documentation includes:
 
 <hr />
 
+<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/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 <a href="../releases/stable/installmanual">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..5175bab8734 100644
--- a/english/CD/torrent-cd/index.wml
+++ b/english/CD/torrent-cd/index.wml
@@ -74,3 +74,19 @@ 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>
+
+<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 <a href="../releases/stable/installmanual">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..d531f47b4fa 100644
--- a/english/devel/debian-installer/index.wml
+++ b/english/devel/debian-installer/index.wml
@@ -172,14 +172,28 @@ available version of installer components.
 </div>
 </div>
 
+<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/manual/">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..317409e845d 100644
--- a/english/distrib/index.wml
+++ b/english/distrib/index.wml
@@ -109,3 +109,19 @@ And, the release notes can be found <a href="../releases/stable/releasenotes">he
    </ul>
   </div>
 </div>
+
+<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 <a href="../releases/stable/installmanual">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..abaf6d80df0 100644
--- a/english/distrib/netinst.wml
+++ b/english/distrib/netinst.wml
@@ -77,3 +77,18 @@ information):</p>
 </div>
 </div>
 
+<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 <a href="../releases/stable/installmanual">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>
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.