Update webpage to GR non-free-firmware: remove hint/links to unofficial images including firmware from CD/http-ftp/index.

1 files changed, 3 insertions, 38 deletions

diff --git a/english/CD/http-ftp/index.wml b/english/CD/http-ftp/index.wml
index a934ae6f56e..c0db92fcc24 100644
--- a/english/CD/http-ftp/index.wml
+++ b/english/CD/http-ftp/index.wml
@@ -28,13 +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>
-
-<comment>
-  <li>Unofficial CD/DVD images of the <q>testing</q> and <q>unstable</q>
-  distributions by fsn://HU &mdash; <a href="#unofficial">see below</a></li>
-</comment>
+  <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>
 
 </ul>
 
@@ -103,37 +99,6 @@ 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/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 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> &mdash;