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

4 files changed, 12 insertions, 12 deletions

diff --git a/en/appendix/chroot-install.xml b/en/appendix/chroot-install.xml
index e4b7c2505..c8f48dd1c 100644
--- a/en/appendix/chroot-install.xml
+++ b/en/appendix/chroot-install.xml
@@ -165,7 +165,7 @@ network-wise. Mirrors are listed at
 
 </para><para>
 
-If you have a &releasename; &debian-gnu; CD mounted at
+If you have a &releasename; &debian-gnu; installation medium mounted at
 <filename>/cdrom</filename>, you could substitute a file URL instead
 of the http URL: <userinput>file:/cdrom/debian/</userinput>
 
diff --git a/en/appendix/files.xml b/en/appendix/files.xml
index 0103afd2a..65f45b470 100644
--- a/en/appendix/files.xml
+++ b/en/appendix/files.xml
@@ -192,8 +192,8 @@ obtained by adding up the numbers.
 
 By default the installer will install the GNOME desktop environment, but
 alternative desktop environments can be selected either by using one
-of the special CD images, or by specifying the desired desktop environment
-when the installer is booted (see <xref linkend="pkgsel"/>).
+of the special installation images, or by specifying the desired desktop environment
+during installation (see <xref linkend="pkgsel"/>).
 
 </para><para>
 
diff --git a/en/appendix/plip.xml b/en/appendix/plip.xml
index d4fc97bd3..6edf4c99c 100644
--- a/en/appendix/plip.xml
+++ b/en/appendix/plip.xml
@@ -117,7 +117,7 @@ the installation.
 <orderedlist>
 <listitem><para>
 
-<guimenuitem>Load installer components from CD</guimenuitem>
+<guimenuitem>Load installer components from installation media</guimenuitem>
 
 </para><para>
 
diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml
index 1ec09a627..3d9bf425b 100644
--- a/en/appendix/preseed.xml
+++ b/en/appendix/preseed.xml
@@ -73,7 +73,7 @@ installation methods.
 
 <tbody>
 <row>
-  <entry>CD/DVD</entry>
+  <entry>CD/DVD/USB</entry>
   <entry>yes</entry>
   <entry>yes</entry>
   <entry>yes<footnote id='apx-ps-net'>
@@ -112,8 +112,8 @@ this is right at the start of the installation, before the first question is
 even asked. Preseeding from the kernel command line happens just after. It is
 thus possible to override configuration set in the initrd by editing the kernel
 command line (either in the bootloader configuration or manually at boot time
-for bootloaders that allow it). For file preseeding this is after the CD
-or CD image has been loaded. For network preseeding it is only after the
+for bootloaders that allow it). For file preseeding this is after the installation
+image has been loaded. For network preseeding it is only after the
 network has been configured.
 
 </para><important><para>
@@ -221,8 +221,8 @@ You will first need to create a preconfiguration file and place it in
 the location from where you want to use it. Creating the preconfiguration file
 is covered later in this appendix. Putting it in the correct location is fairly
 straightforward for network preseeding or if you want to read the file off
-a usb-stick. If you want to include the file on a CD or DVD, you
-will have to remaster the ISO image. How to get the preconfiguration file
+a usb-stick. If you want to include the file in an installation ISO image, you
+will have to remaster the image. How to get the preconfiguration file
 included in the initrd is outside the scope of this document; please consult
 the developers' documentation for &d-i;.
 
@@ -283,7 +283,7 @@ Boot parameters to specify:
   preseed/url=tftp://host/path/to/preseed.cfg
   preseed/url/checksum=5da499872becccfeda2c4872f9171c3d
 
-- if you're booting a remastered CD:
+- if you're booting a remastered installation image:
   preseed/file=/cdrom/preseed.cfg
   preseed/file/checksum=5da499872becccfeda2c4872f9171c3d
 
@@ -835,7 +835,7 @@ This will result in the kernel keymap remaining active.
 
 Of course, preseeding the network configuration won't work if you're
 loading your preconfiguration file from the network. But it's great when
-you're booting from CD or USB stick. If you are loading preconfiguration
+you're booting from optical disc or USB stick. If you are loading preconfiguration
 files from the network, you can pass network config parameters by using
 kernel boot parameters.
 
@@ -1477,7 +1477,7 @@ to be used easily on the kernel command line as well.
 # Some versions of the installer can report back on what software you have
 # installed, and what software you use. The default is not to report back,
 # but sending reports helps the project determine what software is most
-# popular and include it on CDs.
+# popular and should be included on the first CD/DVD.
 #popularity-contest popularity-contest/participate boolean false
 </screen></informalexample>