summaryrefslogtreecommitdiff
path: root/en/welcome
diff options
context:
space:
mode:
authorHolger Wansing <hwansing@mailbox.org>2019-09-22 15:27:18 +0200
committerHolger Wansing <hwansing@mailbox.org>2019-09-22 15:27:18 +0200
commit64ccfd502a27181f3f1b9cf2254fdc9836710493 (patch)
tree6e01677ea52cec52778942c3ab114e06fa6c79f5 /en/welcome
parent7ec1db90734111869de96f2a001b24992ec50021 (diff)
downloadinstallation-guide-64ccfd502a27181f3f1b9cf2254fdc9836710493.zip
Change CD/DVD etc. into 'installation media' or 'installation image' as cover-term, where applicable
Diffstat (limited to 'en/welcome')
-rw-r--r--en/welcome/about-copyright.xml2
-rw-r--r--en/welcome/doc-organization.xml2
-rw-r--r--en/welcome/getting-newest-inst.xml2
3 files changed, 3 insertions, 3 deletions
diff --git a/en/welcome/about-copyright.xml b/en/welcome/about-copyright.xml
index 5ebcb41bd..d818acd35 100644
--- a/en/welcome/about-copyright.xml
+++ b/en/welcome/about-copyright.xml
@@ -21,7 +21,7 @@ and use the system comes directly from &debian; being based on
</para><para>
Calling software <emphasis>free</emphasis> doesn't mean that the software isn't
-copyrighted, and it doesn't mean that CDs/DVDs containing that software
+copyrighted, and it doesn't mean that installation media containing that software
must be distributed at no charge. Free software, in part, means that
the licenses of individual programs do not require you to pay for the
privilege of distributing or using those programs. Free software also
diff --git a/en/welcome/doc-organization.xml b/en/welcome/doc-organization.xml
index 172a6b85f..394910152 100644
--- a/en/welcome/doc-organization.xml
+++ b/en/welcome/doc-organization.xml
@@ -59,7 +59,7 @@ Perform the actual installation according to
<xref linkend="d-i-intro"/>. This involves choosing your language,
configuring peripheral driver modules, configuring your network
connection, so that remaining installation files can be obtained
-directly from a &debian; server (if you are not installing from a CD/DVD set),
+directly from a &debian; server (if you are not installing from a set of CD/DVD installation images),
partitioning your hard drives and installation of a base system, then
selection and installation of tasks.
(Some background about setting up the partitions for your &debian;
diff --git a/en/welcome/getting-newest-inst.xml b/en/welcome/getting-newest-inst.xml
index f424b6efa..30ce767b9 100644
--- a/en/welcome/getting-newest-inst.xml
+++ b/en/welcome/getting-newest-inst.xml
@@ -7,7 +7,7 @@
<para>
For information on how to download &debian-gnu; from the Internet
-or from whom official &debian; CDs can be purchased, see the
+or from whom official &debian; installation media can be purchased, see the
<ulink url="&url-debian-distrib;">distribution web page</ulink>.
The <ulink url="&url-debian-mirrors;">list of &debian; mirrors</ulink>
contains a full set of official &debian;