From c30b2792feaea1e1c78eaf74c19c5158c02f4e60 Mon Sep 17 00:00:00 2001
From: Steve McIntyre <93sam@debian.org>
Date: Mon, 13 Apr 2015 22:02:31 +0000
Subject: Multiple fixups:

 * Add mention of BD-ROM like CD/DVD
 * Merge paragraphs about supported CD drive types for x86
 * Fix typo in USB flash disk paragraph
---
 en/hardware/installation-media.xml | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

(limited to 'en')

diff --git a/en/hardware/installation-media.xml b/en/hardware/installation-media.xml
index 6b8ecf14f..61cc43948 100644
--- a/en/hardware/installation-media.xml
+++ b/en/hardware/installation-media.xml
@@ -28,13 +28,13 @@ For CHRP, floppy support is currently broken.
 </para>
   </sect2>
 
-  <sect2 arch="not-s390"><title>CD-ROM/DVD-ROM</title>
+  <sect2 arch="not-s390"><title>CD-ROM/DVD-ROM/BD-ROM</title>
 
 <note><para>
 
-Whenever you see <quote>CD-ROM</quote> in this manual, it applies to both
-CD-ROMs and DVD-ROMs, because both technologies are really
-the same from the operating system's point of view.
+Whenever you see <quote>CD-ROM</quote> in this manual, it applies to
+all of CD-ROMs, DVD-ROMs and BD-ROMs, because all these technologies
+are really the same from the operating system's point of view.
 
 </para></note><para>
 
@@ -42,14 +42,9 @@ CD-ROM based installation is supported for most architectures.
 
 </para><para arch="x86">
 
-On PCs SATA, IDE/ATAPI and SCSI CD-ROMs are supported.
+On PCs SATA, IDE/ATAPI, USB and SCSI CD-ROMs are supported, as are
+FireWire devices that are supported by the ohci1394 and sbp2 drivers.
 
-</para><para arch="x86">
-
-USB CD-ROM drives are also supported, as are FireWire devices that
-are supported by the ohci1394 and sbp2 drivers.
-
-</para>
 <!-- This is not true on today's hardware
 <para arch="arm">
 
@@ -76,12 +71,12 @@ entry in the firmware.
 
 <para>
 
-USB flash disks a.k.a. USB memory sticks have become a commonly
-used and cheap storage device. Most modern computer systems
-also allow booting the &d-i; from such a stick.
-Many modern computer systems, in particular netbooks and thin laptops, do not have
-a CD/DVD-ROM drive anymore at all and booting from USB media ist
-the standard way of installing a new operating system on them.
+USB flash disks a.k.a. USB memory sticks have become a commonly used
+and cheap storage device. Most modern computer systems also allow
+booting the &d-i; from such a stick. Many modern computer systems, in
+particular netbooks and thin laptops, do not have a CD/DVD-ROM drive
+anymore at all and booting from USB media is the standard way of
+installing a new operating system on them.
 
 </para>
   </sect2>
-- 
cgit v1.2.3