Re: Making Debian available - patch for webwml

Holger Wansing <[email protected]> Mon, 18 Jan 2021 12:37:37 +0100

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

[ Now added debian-boot to CC, since a page included in the attached patch is ]
[ under their responsibility ]



Holger Wansing <[email protected]> wrote:
> [ Adding debian-www to the loop ]
> 
> Hi,
> 
> Marc Haber <[email protected]> wrote:
> > On Sun, 17 Jan 2021 01:53:24 +0000, Paul Wise <[email protected]> wrote:
> > >On Sat, Jan 16, 2021 at 11:52 PM Russell Stuart wrote:
> > >
> > >> Testing doesn't produce netinst with non-free firmware
> > >
> > >There are both daily and weekly testing netinsts with firmware:
> > >
> > >https://cdimage.debian.org/cdimage/unofficial/non-free/cd-including-firmware/daily-builds/sid_d-i/current/amd64/iso-cd/
> > >https://cdimage.debian.org/cdimage/unofficial/non-free/cd-including-firmware/weekly-builds/amd64/iso-cd/
> > 
> > We should really at least mention them somewhere. We're losing
> > installations each day because they are so hard to find.
> 
> So, to turn this discussion into a real change:
> 
> debian-www team: what do you think about adding some more hint/warning
> banners pointing to firmware-including installation images?
> 
> We already have one at 
> https://www.debian.org/releases/stable/debian-installer/
> 
> So we could also add it to other pages (and re-use the translations as well):
> https://www.debian.org/distrib/
> https://www.debian.org/distrib/netinst
> https://www.debian.org/CD/http-ftp/
> https://www.debian.org/CD/torrent-cd/
> 
> Of course it's not optimal to be forced to add it to so many pages,
> but the restructuring of the download / "getting-debian" section is 
> already on the agenda, so in the long term we can hopefully reduce the amount 
> of pages with that warning back to a low number like 2 or 3?
> 
> The above is for stable.
> We could also do similar for the testing firmware-including images
> (that's probably the more important part, since there is no mention of such
> images at all on the website).
> 
> 
> Should I try to work out a proposal/patch?

First patch attached.

For an easy overview of how that might look like, I have uploaded some 
patched html pages to people.debian.org:

https://people.debian.org/~holgerw/webwml_non-free-firmware/english/distrib/index.en.html
https://people.debian.org/~holgerw/webwml_non-free-firmware/english/distrib/netinst.en.html
https://people.debian.org/~holgerw/webwml_non-free-firmware/english/CD/http-ftp/index.en.html
https://people.debian.org/~holgerw/webwml_non-free-firmware/english/CD/torrent-cd/index.en.html

https://people.debian.org/~holgerw/webwml_non-free-firmware/english/devel/debian-installer/index.en.html


(relative links inside of debian.org do not work there)


Holger


-- 
Holger Wansing <[email protected]>
PGP-Fingerprint: 496A C6E8 1442 4B34 8508  3529 59F1 87CA 156E B076

non-free-warning.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..c535a0dfe07 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="warning">
+<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..78d174ada22 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="warning">
+<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..1a331c4453d 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="warning">
 <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..7d7810109b9 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="warning">
+<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..b54142c78f3 100644
--- a/english/distrib/netinst.wml
+++ b/english/distrib/netinst.wml
@@ -77,3 +77,18 @@ information):</p>
 </div>
 </div>
 
+<div id="firmware_nonfree" class="warning">
+<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>