From 9aadd9a07b9e788217db0dafbf4fffa68b89a8d6 Mon Sep 17 00:00:00 2001
From: Cyril Brulebois <kibi@debian.org>
Date: Mon, 30 Jan 2023 05:31:33 +0100
Subject: Trade unofficial images for official ones.

---
 en/using-d-i/loading-firmware.xml | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'en')

diff --git a/en/using-d-i/loading-firmware.xml b/en/using-d-i/loading-firmware.xml
index acf89e47b..fe9eae9fd 100644
--- a/en/using-d-i/loading-firmware.xml
+++ b/en/using-d-i/loading-firmware.xml
@@ -13,6 +13,17 @@ additional features.
 
 </para><para>
 
+Starting with &debian-gnu; 12.0, following the <ulink
+url="https://www.debian.org/vote/2022/vote_003">2022 General
+Resolution about non-free firmware</ulink>, official installation
+images (like netinst) can include non-free firmware packages.
+
+Even with those firmware packages available, some firmware files might
+still be missing. Or one might be using netboot files, which don't
+include firmware packages.
+
+</para><para>
+
 If a device driver requests firmware that is not available, &d-i; will
 display a dialog offering to load the missing firmware. If this option
 is selected, &d-i; will scan available devices for either loose firmware
@@ -42,10 +53,9 @@ the installation.
   <sect2><title>Preparing a medium</title>
 <para>
 
-Official installation images do not include non-free firmware. The most common
+The most common
 method to load such firmware is from some removable medium such as a USB
-stick. Alternatively, unofficial installation images containing non-free firmware
-can be found at <ulink url="&url-firmware-cds;"/>.
+stick.
 
 To prepare a USB stick (or other medium like a hard drive partition),
 the firmware files or packages must be placed in either the root directory
-- 
cgit v1.2.3