summaryrefslogtreecommitdiff
path: root/en
diff options
context:
space:
mode:
authorPhilip Hands <phil@hands.com>2023-01-31 10:52:51 +0100
committerPhilip Hands <phil@hands.com>2023-01-31 10:59:13 +0100
commit04f4aa2539b3e034a677ebbbacb55b41c1c7d4e4 (patch)
tree068c1a4eecc8d82003cba46990f6a932346bc6c6 /en
parent53a3c6dee39b767d513d43628edb5677480afa40 (diff)
downloadinstallation-guide-04f4aa2539b3e034a677ebbbacb55b41c1c7d4e4.zip
minor nitpicking
Diffstat (limited to 'en')
-rw-r--r--en/hardware/hardware-supported.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/en/hardware/hardware-supported.xml b/en/hardware/hardware-supported.xml
index fa536dceb..fb135e6c9 100644
--- a/en/hardware/hardware-supported.xml
+++ b/en/hardware/hardware-supported.xml
@@ -364,18 +364,18 @@ In most cases firmware is non-free according to the criteria used by the
If the device driver itself is included in
the distribution and if &debian-gnu; legally can distribute the firmware,
it will often be available as a separate package from the non-free-firmware section
-of the archive (non-free before &debian-gnu; 12.0).
+of the archive (prior to &debian-gnu; 12.0: from the non-free section).
</para><para>
However, this does not mean that such hardware cannot be used during
-an installation. Starting with &debian-gnu; 12.0, following the <ulink
+installation. 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 can include non-free firmware packages. By default, &d-i; will
-detect required firmware (based on kernel logs and based on modalias
+detect required firmware (based on kernel logs and modalias
information), and install the relevant packages if they are found on
-installation images (e.g. on the netinst). The package manager gets
+an installation medium (e.g. on the netinst). The package manager gets
automatically configured with the matching components so that those
packages get security updates. This usually means that the
non-free-firmware component gets enabled, in addition to main.