Change CD/DVD etc. into 'installation media' or 'installation image' as cover-term, where applicable

5 files changed, 56 insertions, 58 deletions

diff --git a/en/boot-installer/arm.xml b/en/boot-installer/arm.xml
index bd8ee2782..20bdb52c1 100644
--- a/en/boot-installer/arm.xml
+++ b/en/boot-installer/arm.xml
@@ -81,7 +81,7 @@
       2015 tested OK. Consult Juno documentation on firmware updating.
     </para>
     <para>
-      Prepare a standard arm64 CD image on a USB stick. Insert it in
+      Prepare a standard arm64 CD/DVD image on a USB stick. Insert it in
       one of the USB ports on the back. Plug a serial cable into the
       upper 9-pin serial port on the back. If you need networking
       (netboot image) plug the ethernet cable into the socket on the
diff --git a/en/boot-installer/intro-cd.xml b/en/boot-installer/intro-cd.xml
index 6712f7e0f..944cfc321 100644
--- a/en/boot-installer/intro-cd.xml
+++ b/en/boot-installer/intro-cd.xml
@@ -3,29 +3,29 @@
 
 <para>
 
-If you have a CD set, and if your machine supports booting directly
-off the CD, great!  Simply
+If you have a set of optical discs, and your machine supports booting directly
+off those, great!  Simply
 <phrase arch="x86">
-configure your system for booting off a CD as described in
+configure your system for booting off an optical disc as described in
 <xref linkend="boot-dev-select-x86"/>,
 </phrase>
-insert your CD, reboot, and proceed to the next chapter.
+insert the disc, reboot, and proceed to the next chapter.
 
 </para><para>
 
-Note that certain CD drives may require special drivers, and thus be
+Note that certain optical drives may require special drivers, and thus be
 inaccessible in the early installation stages. If it turns out the
-standard way of booting off a CD doesn't work for your hardware,
+standard way of booting off an optical disc doesn't work for your hardware,
 revisit this chapter and read about alternate kernels and installation
 methods which may work for you.
 
 </para><para>
 
-Even if you cannot boot from CD-ROM, you can probably install the
-&debian; system components and any packages you want from CD-ROM.
+Even if you cannot boot from optical disc, you can probably install the
+&debian; system components and any packages you want from such disc.
 Simply boot using a different medium and when it's
 time to install the operating system, base system, and any additional
-packages, point the installation system at the CD-ROM drive.
+packages, point the installation system at the optical drive.
 
 </para><para>
 
diff --git a/en/boot-installer/parameters.xml b/en/boot-installer/parameters.xml
index 68c1f61a5..dbe1e1f1e 100644
--- a/en/boot-installer/parameters.xml
+++ b/en/boot-installer/parameters.xml
@@ -383,7 +383,7 @@ Set to <userinput>true</userinput> to prevent this.
 
 By default, before rebooting, &d-i; automatically ejects the optical
 media used during the installation. This can be unnecessary if the system
-does not automatically boot off the CD. In some cases it may even be
+does not automatically boot off such disc. In some cases it may even be
 undesirable, for example if the optical drive cannot reinsert the media
 itself and the user is not there to do it manually. Many slot loading,
 slim-line, and caddy style drives cannot reload media automatically.
diff --git a/en/boot-installer/trouble.xml b/en/boot-installer/trouble.xml
index 6539fbe00..b23cce53f 100644
--- a/en/boot-installer/trouble.xml
+++ b/en/boot-installer/trouble.xml
@@ -7,12 +7,12 @@
 </para>
 
   <sect2 arch="not-s390" id="unreliable-cd">
-  <title>CD-ROM Reliability</title>
+  <title>Reliability of optical media</title>
 <para>
 
-Sometimes, especially with older CD-ROM drives, the installer may fail
-to boot from a CD-ROM. The installer may also &mdash; even after booting
-successfully from CD-ROM &mdash; fail to recognize the CD-ROM or return
+Sometimes, especially with older drives, the installer may fail
+to boot from an optical disc. The installer may also &mdash; even after booting
+successfully from such disc &mdash; fail to recognize the disc or return
 errors while reading from it during the installation.
 
 </para><para>
@@ -28,14 +28,14 @@ There are two very simple things that you should try first.
 <itemizedlist>
 <listitem><para>
 
-If the CD-ROM does not boot, check that it was inserted correctly and that
+If the disc does not boot, check that it was inserted correctly and that
 it is not dirty.
 
 </para></listitem>
 <listitem><para>
 
-If the installer fails to recognize a CD-ROM, try just running the option
-<menuchoice> <guimenuitem>Detect and mount CD-ROM</guimenuitem> </menuchoice>
+If the installer fails to recognize the disc, try just running the option
+<menuchoice> <guimenuitem>Detect and mount installation media</guimenuitem> </menuchoice>
 a second time. Some DMA related issues with very old CD-ROM drives are known to
 be resolved in this way.
 
@@ -45,12 +45,11 @@ be resolved in this way.
 </para><para>
 
 If this does not work, then try the suggestions in the subsections below.
-Most, but not all, suggestions discussed there are valid for both CD-ROM and
-DVD, but we'll use the term CD-ROM for simplicity.
+Most, but not all, suggestions discussed there are valid for CD-ROM and DVD.
 
 </para><para>
 
-If you cannot get the installation working from CD-ROM, try one of the
+If you cannot get the installation working from optical disc, try one of the
 other installation methods that are available.
 
 </para>
@@ -90,13 +89,13 @@ access</quote> (DMA) is enabled for them.
   <title>How to investigate and maybe solve issues</title>
 <para>
 
-If the CD-ROM fails to boot, try the suggestions listed below.
+If the optical disc fails to boot, try the suggestions listed below.
 
 <itemizedlist>
   <listitem><para>
 
-Check that your BIOS actually supports booting from CD-ROM (only an
-issue for very old systems) and that CD booting is enabled in the
+Check that your BIOS actually supports booting from optical disc (only an
+issue for very old systems) and that booting from such media is enabled in the
 BIOS.
 
   </para></listitem>
@@ -112,9 +111,9 @@ $ md5sum <replaceable>debian-testing-i386-netinst.iso</replaceable>
 a20391b12f7ff22ef705cee4059c6b92  <replaceable>debian-testing-i386-netinst.iso</replaceable>
 </screen></informalexample>
 
-Next, check that the md5sum of the burned CD-ROM matches as well. The
+Next, check that the md5sum of the burned disc matches as well. The
 following command should work. It uses the size of the image to read the
-correct number of bytes from the CD-ROM.
+correct number of bytes from the disc.
 
 <informalexample><screen>
 $ dd if=/dev/cdrom | \
@@ -131,10 +130,10 @@ a20391b12f7ff22ef705cee4059c6b92  -
 
 </para><para>
 
-If, after the installer has been booted successfully, the CD-ROM is not
+If, after the installer has been booted successfully, the disc is not
 detected, sometimes simply trying again may solve the problem. If you have
-more than one CD-ROM drive, try changing the CD-ROM to the other drive.
-If that does not work or if the CD-ROM is recognized but there are errors
+more than one optical drive, try changing the disc to the other drive.
+If that does not work or if the disc is recognized but there are errors
 when reading from it, try the suggestions listed below. Some basic knowledge
 of &arch-kernel; is required for this.
 To execute any of the commands, you should first switch to the second
@@ -150,7 +149,7 @@ messages. After that, also check the output of <command>dmesg</command>.
   </para></listitem>
   <listitem><para>
 
-Check in the output of <command>dmesg</command> if your CD-ROM drive was
+Check in the output of <command>dmesg</command> if your optical drive was
 recognized. You should see something like (the lines do not necessarily
 have to be consecutive):
 
@@ -162,7 +161,7 @@ sr0: scsi3-mmc drive: 24x/24x writer dvd-ram cd/rw xa/form2 cdda tray
 cdrom: Uniform CD-ROM driver Revision: 3.20
 </screen></informalexample>
 
-If you don't see something like that, chances are the controller your CD-ROM
+If you don't see something like that, chances are the controller your drive
 is connected to was not recognized or may be not supported at all. If you
 know what driver is needed for the controller, you can try loading it manually
 using <command>modprobe</command>.
@@ -170,7 +169,7 @@ using <command>modprobe</command>.
   </para></listitem>
   <listitem><para>
 
-Check that there is a device node for your CD-ROM drive under
+Check that there is a device node for your optical drive under
 <filename>/dev/</filename>. In the example above, this would be
 <filename>/dev/sr0</filename>.
 There should also be a <filename>/dev/cdrom</filename>.
@@ -178,7 +177,7 @@ There should also be a <filename>/dev/cdrom</filename>.
   </para></listitem>
   <listitem><para>
 
-Use the <command>mount</command> command to check if the CD-ROM is already
+Use the <command>mount</command> command to check if the optical disc is already
 mounted; if not, try mounting it manually:
 
 <informalexample><screen>
@@ -206,14 +205,14 @@ $ echo -n "using_dma:0" &gt;settings
 </screen></informalexample>
 
 Make sure that you are in the directory for the device that corresponds
-to your CD-ROM drive.
+to your optical drive.
 
   </para></listitem>
   <listitem><para>
 
 If there are any problems during the installation, try checking the integrity
-of the CD-ROM using the option near the bottom of the installer's main menu.
-This option can also be used as a general test if the CD-ROM can be read
+of the installation media using the option near the bottom of the installer's main menu.
+This option can also be used as a general test if the disc can be read
 reliably.
 
   </para></listitem>
@@ -511,7 +510,7 @@ installation reports, and file the report as a bug report against the
 <informalexample><screen>
 Package: installation-reports
 
-Boot method: &lt;How did you boot the installer? CD? USB stick? Network?&gt;
+Boot method: &lt;How did you boot the installer? CD/DVD? USB stick? Network?&gt;
 Image version: &lt;Full URL to image you downloaded is best&gt;
 Date: &lt;Date and time of the install&gt;
 
@@ -525,19 +524,19 @@ Output of lspci -knn (or lspci -nn):
 Base System Installation Checklist:
 [O] = OK, [E] = Error (please elaborate below), [ ] = didn't try it
 
-Initial boot:           [ ]
-Detect network card:    [ ]
-Configure network:      [ ]
-Detect CD:              [ ]
-Load installer modules: [ ]
-Detect hard drives:     [ ]
-Partition hard drives:  [ ]
-Install base system:    [ ]
-Clock/timezone setup:   [ ]
-User/password setup:    [ ]
-Install tasks:          [ ]
-Install boot loader:    [ ]
-Overall install:        [ ]
+Initial boot:               [ ]
+Detect network card:        [ ]
+Configure network:          [ ]
+Detect installation medium: [ ]
+Load installer modules:     [ ]
+Detect hard drives:         [ ]
+Partition hard drives:      [ ]
+Install base system:        [ ]
+Clock/timezone setup:       [ ]
+User/password setup:        [ ]
+Install tasks:              [ ]
+Install boot loader:        [ ]
+Overall install:            [ ]
 
 Comments/Problems:
 
diff --git a/en/boot-installer/x86.xml b/en/boot-installer/x86.xml
index 0b88d2417..0e1e23beb 100644
--- a/en/boot-installer/x86.xml
+++ b/en/boot-installer/x86.xml
@@ -8,7 +8,7 @@
 
   </sect2>
 
-  <sect2 arch="any-x86"><title>Booting from a CD-ROM</title>
+  <sect2 arch="any-x86"><title>Booting from optical disc (CD/DVD)</title>
 
 &boot-installer-intro-cd.xml;
 
@@ -23,8 +23,7 @@ To start the installer from Windows, you can either
 <itemizedlist>
 <listitem><para>
 
-obtain CD-ROM/DVD-ROM<phrase condition="bootable-usb"> or USB memory
-stick</phrase> installation media as described in
+obtain installation media as described in
 <xref linkend="official-cdrom"/><phrase condition="bootable-usb"> respective
 <xref linkend="boot-usb-files"/></phrase> or
 
@@ -40,7 +39,7 @@ on the &debian; mirrors.
 
 </para><para>
 
-If you use an installation CD or DVD, a pre-installation program should be
+If you use optical installation media, a pre-installation program should be
 launched automatically when you insert the disc.
 In case Windows does not start it automatically, or if you are using a USB
 memory stick, you can run it manually by accessing the device and executing
@@ -118,9 +117,9 @@ should do so with care.
 Alternatively, if you intend to keep an existing partition on the hard
 drive unchanged during the install, you can download the
 <filename>hd-media/initrd.gz</filename> file and its kernel, as well as
-copy a CD (or DVD) iso to the drive (make sure the file is named ending in
-<literal>.iso</literal>). The installer can then boot from the drive
-and install from the CD/DVD image, without needing the network.
+copy an installation image to the hard drive (make sure the file is named ending in
+<literal>.iso</literal>). The installer can then boot from the hard drive
+and install from the installation image, without needing the network.
 </para>
 
 <para>
@@ -379,7 +378,7 @@ questions can be displayed on a single screen.
 
 </para><para arch="any-x86">
 
-The graphical installer is available with all CD images and with the
+The graphical installer is available with all CD/DVD images and with the
 hd-media installation method. To boot the graphical installer simply select
 the relevant option from the boot menu. Expert and rescue mode for the
 graphical installer can be selected from the <quote>Advanced options</quote>