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

5 files changed, 34 insertions, 34 deletions

diff --git a/en/using-d-i/loading-firmware.xml b/en/using-d-i/loading-firmware.xml
index ff75bd668..4e60aa9d5 100644
--- a/en/using-d-i/loading-firmware.xml
+++ b/en/using-d-i/loading-firmware.xml
@@ -54,9 +54,9 @@ for <quote>firmware</quote>.
   <sect2><title>Preparing a medium</title>
 <para>
 
-Official CD images do not include non-free firmware. The most common
+Official installation images do not include non-free firmware. The most common
 method to load such firmware is from some removable medium such as a USB
-stick. Alternatively, unofficial CD builds containing non-free firmware
+stick. Alternatively, unofficial installation images containing non-free firmware
 can be found at <ulink url="&url-firmware-cds;"/>.
 
 To prepare a USB stick (or other medium like a hard drive partition),
diff --git a/en/using-d-i/modules/apt-setup.xml b/en/using-d-i/modules/apt-setup.xml
index fe9151b21..e7829cd3e 100644
--- a/en/using-d-i/modules/apt-setup.xml
+++ b/en/using-d-i/modules/apt-setup.xml
@@ -15,7 +15,7 @@ Note that the program which actually installs the packages is called
 <command>dpkg</command>.  However, this program is more of a low-level
 tool.  <command>apt</command> is a higher-level tool, which will
 invoke <command>dpkg</command> as appropriate. It knows how to retrieve
-packages from your CD, the network, or wherever. It is also able to
+packages from your installation media, the network, or wherever. It is also able to
 automatically install other packages which are required to make the
 package you're trying to install work correctly.
 </para>
@@ -54,18 +54,18 @@ sections of the archive.
 </para>
 
     <sect4 id="apt-setup-cdset">
-    <title>Installing from more than one CD or DVD</title>
+    <title>Installing from more than one CD or DVD image</title>
 
 <para>
 
-If you are installing from a CD or a DVD that is part of a larger set,
-the installer will ask if you want to scan additional CDs or DVDs.
-If you have additional CDs or DVDs available, you probably want to do
+If you are installing from a CD or DVD image that is part of a larger set,
+the installer will ask if you want to scan additional installation media.
+If you have such additional media available, you probably want to do
 this so the installer can use the packages included on them.
 
 </para><para>
 
-If you do not have any additional CDs or DVDs, that is no problem: using
+If you do not have any additional media, that is no problem: using
 them is not required. If you also do not use a network mirror (as explained
 in the next section), it can mean that not all packages belonging to the
 tasks you select in the next step of the installation can be installed.
@@ -73,10 +73,10 @@ tasks you select in the next step of the installation can be installed.
 </para>
 <note><para>
 
-Packages are included on CDs (and DVDs) in the order of their popularity.
-This means that for most uses only the first CDs in a set are needed and
+Packages are included on CD and DVD images in the order of their popularity.
+This means that for most uses only the first image of a set is needed and
 that only very few people actually use any of the packages included on the
-last CDs in a set.
+last images of a set.
 
 </para><para>
 
@@ -90,9 +90,9 @@ will cover most needs.
 </para></note>
 <para>
 
-If you do scan multiple CDs or DVDs, the installer will prompt you to
-exchange them when it needs packages from another CD/DVD than the one
-currently in the drive. Note that only CDs or DVDs that belong to the
+If you do scan multiple installation media, the installer will prompt you to
+exchange them when it needs packages from another media than the one
+currently in the drive. Note that only discs that belong to the
 same set should be scanned. The order in which they are scanned does not
 really matter, but scanning them in ascending order will reduce the chance
 of mistakes.
@@ -112,7 +112,7 @@ answer should be fine, but there are some exceptions.
 </para><para>
 
 If you are <emphasis>not</emphasis> installing from a full CD or DVD or
-using a full CD/DVD image, you really should use a network mirror as
+a corresponding image, you really should use a network mirror as
 otherwise you will end up with only a very minimal system. However, if you
 have a limited Internet connection it is best <emphasis>not</emphasis>
 to select the <literal>desktop</literal> task in the next step of the
@@ -120,26 +120,26 @@ installation.
 
 </para><para>
 
-If you are installing from a single full CD or using a full CD image, using
+If you are installing from a single full CD or the corresponding image, using
 a network mirror is not required, but is still strongly recommended because
-a single CD contains only a fairly limited number of packages.
+a single CD image contains only a fairly limited number of packages.
 If you have a limited Internet connection it may still be best
 to <emphasis>not</emphasis> select a network mirror here, but to finish the
-installation using only what's available on the CD and selectively install
+installation using only what's available on the CD image and selectively install
 additional packages after the installation (i.e. after you have rebooted into
 the new system).
 
 </para><para>
 
-If you are installing from a DVD or using a DVD image, any packages needed
-during the installation should be present on the first DVD. The same is true
-if you have scanned multiple CDs as explained in the previous section. Use
+If you are installing from a DVD or the corresponding image, any packages needed
+during the installation should be present on the first DVD (image). The same is true
+if you have scanned multiple CD (images) as explained in the previous section. Use
 of a network mirror is optional.
 
 </para><para>
 
-One advantage of adding a network mirror is that updates that have occurred
-since the CD/DVD set was created and have been included in a point release,
+One advantage of adding a network mirror is that updates, that have occurred
+since the CD/DVD images were created and have been included in a point release,
 will become available for installation, thus extending the life of your CD/DVD
 set without compromising the security or stability of the installed system.
 
@@ -147,7 +147,7 @@ set without compromising the security or stability of the installed system.
 
 In summary: selecting a network mirror is generally a good idea, except
 if you do not have a good Internet connection. If the current version of
-a package is available from CD/DVD, the installer will always use that.
+a package is available from installation media, the installer will always use that.
 The amount of data that will be downloaded if you do select a mirror thus
 depends on
 
@@ -164,12 +164,12 @@ which packages are needed for those tasks,
 </para></listitem>
 <listitem><para>
  
-which of those packages are present on the CDs or DVDs you have scanned, and
+which of those packages are present on the installation media you have scanned, and
 
 </para></listitem>
 <listitem><para>
 
-whether any updated versions of packages included on the CDs or DVDs are
+whether any updated versions of packages included on the installation media are
 available from a mirror (either a regular package mirror, or a mirror for
 security or stable-updates).
 
diff --git a/en/using-d-i/modules/network-console.xml b/en/using-d-i/modules/network-console.xml
index e92334c06..b8dee287c 100644
--- a/en/using-d-i/modules/network-console.xml
+++ b/en/using-d-i/modules/network-console.xml
@@ -19,9 +19,9 @@ the networking. (Although you can automate that part with
 This component is not loaded into the main installation menu by default,
 so you have to explicitly ask for it.
 
-If you are installing from CD, you need to boot with medium priority or
+If you are installing from optical media, you need to boot with medium priority or
 otherwise invoke the main installation menu and choose <guimenuitem>Load
-installer components from CD</guimenuitem> and from the list of
+installer components from installation media</guimenuitem> and from the list of
 additional components select <guimenuitem>network-console: Continue
 installation remotely using SSH</guimenuitem>. Successful load is
 indicated by a new menu entry called <guimenuitem>Continue
diff --git a/en/using-d-i/modules/pkgsel.xml b/en/using-d-i/modules/pkgsel.xml
index 308c32d3d..37f34aa81 100644
--- a/en/using-d-i/modules/pkgsel.xml
+++ b/en/using-d-i/modules/pkgsel.xml
@@ -70,8 +70,8 @@ desktops, but some combinations of desktop may not be co-installable.
 Note that this will only work if the packages needed for the desired desktop
 environment are actually available.  If you are installing using a single
 full CD image, they will possibly need to be downloaded from a network mirror as
-some of the needed packages for your choice might only be included on later
-CDs. Installing any of the available desktop environments this way should
+they might not be available on the CD image due to its limited amount of space.
+Installing any of the available desktop environments this way should
 work fine if you are using a DVD image or any other installation method.
 
 </para></note>
diff --git a/en/using-d-i/using-d-i.xml b/en/using-d-i/using-d-i.xml
index f0389d81e..f2e8faf47 100644
--- a/en/using-d-i/using-d-i.xml
+++ b/en/using-d-i/using-d-i.xml
@@ -229,7 +229,7 @@ cards, disk drives, and PCMCIA.
 
 <term>cdrom-detect</term><listitem><para>
 
-Looks for and mounts a &debian; installation CD.
+Looks for and mounts a &debian; installation media.
 
 </para></listitem>
 </varlistentry>
@@ -263,8 +263,8 @@ the source of his installation packages.
 
 <term>cdrom-checker</term><listitem><para>
 
-Checks integrity of a CD-ROM. This way, the user may assure him/herself
-that the installation CD-ROM was not corrupted.
+Checks integrity of installation media. This way, the user may assure him/herself
+that the installation image was not corrupted.
 
 </para></listitem>
 </varlistentry>
@@ -283,7 +283,7 @@ cost of some features).
 <term>anna</term><listitem><para>
 
 Anna's Not Nearly APT. Installs packages which have been retrieved
-from the chosen mirror or CD.
+from the chosen mirror or installation medium.
 
 </para></listitem>
 </varlistentry>