Installation-guide cleanup

removal/rework of outdated parts (chapters 1 and 2, parts of chapter 3)

11 files changed, 164 insertions, 165 deletions

diff --git a/en/hardware/buying-hardware.xml b/en/hardware/buying-hardware.xml
index 4995508a1..48c20e4c7 100644
--- a/en/hardware/buying-hardware.xml
+++ b/en/hardware/buying-hardware.xml
@@ -41,58 +41,48 @@ releasing the &arch-kernel; source code.
 </para><para>
 
 Since we haven't been granted access to the documentation on these
-devices, they simply won't work under &arch-kernel;. You can help by asking
-the manufacturers of such hardware to release the documentation. If
-enough people ask, they will realize that the free software community
-is an important market.
+devices, they simply won't work under &arch-kernel;.
 
-</para>
-</sect2>
+</para><para>
 
+In many cases there are standards (or at least some de-facto standards)
+describing how an operating system and its device drivers communicate with a
+certain class of devices.  All devices which comply to such a
+(de-facto-)standard can be used with a single generic device driver and no
+device-specific drivers are required.  With some kinds of hardware (e.g. 
+USB "Human Interface Devices", i.e.  keyboards, mice, etc., and USB mass
+storage devices like USB flash disks and memory card readers) this works
+very well and practically every device sold in the market is
+standards-compliant.
 
-  <sect2 arch="any-x86"><title>Windows-specific Hardware</title>
-<para>
+</para><para>
 
-A disturbing trend is the proliferation of Windows-specific modems and
-printers. In some cases these are specially designed to be operated by
-the Microsoft Windows operating system and bear the legend <quote>WinModem</quote>
-or <quote>Made especially for Windows-based computers</quote>. This
-is generally done by removing the embedded processors of the hardware
-and shifting the work they do over to a Windows driver that is run by
-your computer's main CPU. This strategy makes the hardware less
-expensive, but the savings are often <emphasis>not</emphasis> passed on to the
-user and this hardware may even be more expensive than equivalent
-devices that retain their embedded intelligence.
+In other fields, among them e.g. printers, this is unfortunately not the
+case.  While there are many printers which can be addressed via a small set
+of (de-facto-)standard control languages and therefore can be made to work
+without problems in any operating system, there are quite a few models which
+only understand proprietary control commands and either cannot be used at
+all on free operating systems or can only be used with a vendor-supplied
+closed-source driver.
 
 </para><para>
 
-You should avoid Windows-specific hardware for two reasons. The first
-is that the manufacturers do not generally make the resources
-available to write a &arch-kernel; driver. Generally, the hardware and
-software interface to the device is proprietary, and documentation is
-not available without a non-disclosure agreement, if it is available
-at all. This precludes it being used for free software, since free
-software writers disclose the source code of their programs. The
-second reason is that when devices like these have had their embedded
-processors removed, the operating system must perform the work of the
-embedded processors, often at <emphasis>real-time</emphasis> priority,
-and thus the CPU is not available to run your programs while it is
-driving these devices. Since the typical Windows user does not
-multi-process as intensively as a &arch-kernel; user, the manufacturers hope
-that the Windows user simply won't notice the burden this hardware
-places on their CPU.  However, any multi-processing operating system,
-even Windows 2000 or XP, suffers from degraded performance when
-peripheral manufacturers skimp on the embedded processing power of
-their hardware.
+Even if there is a vendor-provided closed-source driver for such hardware
+when purchasing the device, the practical lifespan of the device is limited
+by driver availability.  Nowadays product cycles have become short and it is
+not uncommon that a short time after a consumer device has ceased
+production, no driver updates get made available any more by the
+manufacturer.  If the old closed-source driver does not work anymore after a
+system update, an otherwise perfectly working device becomes unusable due to
+lacking driver support and there is nothing that can be done in this case.
+You should therefore avoid buying closed hardware in the first place,
+regardless of the operating system you want to use it with.
 
 </para><para>
 
-You can help improve this situation by encouraging these manufacturers
-to release the documentation and other resources necessary for us to
-program their hardware, but the best strategy is simply to avoid this
-sort of hardware<phrase arch="linux-any"> until it is listed as working
-in the <ulink url="&url-hardware-howto;">Linux Hardware Compatibility
-HOWTO</ulink></phrase>.
+You can help improve this situation by encouraging manufacturers of closed
+hardware to release the documentation and other resources necessary for us
+to provide free drivers for their hardware.
 
 </para>
 </sect2>
diff --git a/en/hardware/hardware-supported.xml b/en/hardware/hardware-supported.xml
index 89a9b4670..a4e7c09d0 100644
--- a/en/hardware/hardware-supported.xml
+++ b/en/hardware/hardware-supported.xml
@@ -237,9 +237,14 @@ as well.
   <sect2 arch="x86" id="laptops"><title>Laptops</title>
 <para>
 
-Laptops are also supported and nowadays most laptops work out of the box.
-In case a laptop contains specialized or proprietary hardware, some specific
-functions may not be supported.  To see if your particular laptop works well
+From a technical point of view, laptops are normal PCs, so all information
+regarding PC systems applies to laptops as well. Installations
+on laptops nowadays usually work out of the box, including things like
+automatically suspending the system on closing the lid and laptop specfic
+hardware buttons like those for disabling the wifi interfaces ("airplane
+mode"). Nonetheless sometimes the hardware vendors use specialized or
+proprietary hardware for some laptop-specific functions which
+might not be supported. To see if your particular laptop works well
 with GNU/Linux, see for example the
 <ulink url="&url-x86-laptop;">Linux Laptop pages</ulink>.
 
@@ -250,21 +255,16 @@ with GNU/Linux, see for example the
   <title>Multiple Processors</title>
 <para>
 
-Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</quote>
-or SMP &mdash; is available for this architecture.  The standard &debian;
-&release; kernel image has been compiled with SMP support.  The standard
-kernel is also usable on non-SMP systems, but has a slight overhead which
-will cause a small reduction in performance. For normal system use this
-will hardly be noticable.
-
-</para><para>
+Multiprocessor support &mdash; also called <quote>symmetric
+multiprocessing</quote> or SMP &mdash; is available for this
+architecture.  Having multiple processors in a computer was originally
+only an issue for high-end server systems but has become quite common in
+recent years even for rather low-end desktop computers and laptops with
+the introduction of so called "multi-core" processors.  These contain
+two or more processor units, called "cores", in one physical chip.
 
-In order to optimize the kernel for single CPU systems, you'll have to
-replace the standard &debian; kernel.<phrase arch="linux-any">  You can find a discussion of how
-to do this in <xref linkend="kernel-baking"/>.  At this time
-(kernel version &kernelversion;) the way you disable SMP is to deselect
-<quote>&smp-config-option;</quote> in the <quote>&smp-config-section;</quote>
-section of the kernel config.</phrase>
+The standard &debian; &release; kernel image has been compiled with SMP support.
+It is also usable on non-SMP systems without problems.
 
 </para>
   </sect2>
@@ -281,6 +281,12 @@ The standard &debian; &release; kernel image has been compiled with
 will detect the number of processors (or processor cores) and will
 automatically deactivate SMP on uniprocessor systems.
 
+Having multiple processors in a computer was originally
+only an issue for high-end server systems but has become quite common in
+recent years even for rather low-end desktop computers and laptops with
+the introduction of so called "multi-core" processors.  These contain
+two or more processor units, called "cores", in one physical chip.
+
 </para><para arch="i386">
 
 The 486 flavour of the &debian; kernel image packages for &arch-title;
@@ -298,7 +304,7 @@ multiprocessing</quote> or SMP &mdash; is available for this architecture.
 However, the standard &debian; &release; kernel image does not support
 SMP.  This should not prevent installation, since the standard,
 non-SMP kernel should boot on SMP systems; the kernel will simply use
-the first CPU.
+only the first CPU.
 
 </para><para>
 
@@ -344,19 +350,19 @@ section of the kernel config.</phrase>
   <sect2 id="gfx" arch="not-s390"><title>Graphics Card Support</title>
 <para arch="x86">
 
-You should be using a VGA-compatible display interface for the console
-terminal. Nearly every modern display card is compatible with
-VGA. Ancient standards such CGA, MDA, or HGA should also work,
-assuming you do not require X11 support.  Note that X11 is not used
-during the installation process described in this document unless the
-graphical installer was explicitly selected.
-
-</para><para>
-
 &debian;'s support for graphical interfaces is determined by the
-underlying support found in X.Org's X11 system.  Most AGP, PCI,
-PCIe, and PCI-X video cards work under X.Org.  Details on supported graphics
-buses, cards, monitors, and pointing devices can be found at
+underlying support found in X.Org's X11 system. On modern PCs,
+having a graphical display usually works out of the box. Whether
+advanced graphics card features such as 3D-hardware acceleration
+or hardware-accelerated video are available, depends on the 
+actual graphics hardware used in the system and in some cases
+on the installation of additional "firmware" images (see <xref
+linkend="hardware-firmware"/>). In very few cases there have
+been reports about hardware on which installation of additional graphics
+card firmware was required even for basic graphics support, but
+these have been rare exceptions.
+</para><para>
+Details on supported graphics cards and pointing devices can be found at
 <ulink url="&url-xorg;"></ulink>.  &debian; &release; ships
 with X.Org version &x11ver;.
 
@@ -407,6 +413,17 @@ so-called <firstterm>firmware</firstterm> or <firstterm>microcode</firstterm>
 to be loaded into the device before it can become operational. This is most
 common for network interface cards (especially wireless NICs), but for example
 some USB devices and even some hard disk controllers also require firmware.
+With many graphics cards, basic functionality is available without
+additional firmware, but the use of advanced features requires an
+appropriate firmware file to be installed in the system.
+
+</para><para>
+
+On many older devices which require firmware to work, the firmware file was
+permanently placed in an EEPROM/Flash chip on the device itself by the
+manufacturer.  Nowadays most new devices do not have the firmware embedded
+this way anymore, so the firmware file must be uploaded into the device by
+the host operating system every time the system boots.
 
 </para><para>
 
@@ -422,7 +439,7 @@ of the archive.
 However, this does not mean that such hardware cannot be used during an
 installation. Starting with &debian-gnu; 5.0, &d-i; supports loading
 firmware files or packages containing firmware from a removable medium,
-such as a floppy disk or USB stick.
+such as a USB stick.
 See <xref linkend="loading-firmware"/> for detailed information on how to
 load firmware files or packages during the installation.
 
diff --git a/en/hardware/installation-media.xml b/en/hardware/installation-media.xml
index c8bcb7ad6..47cc37f24 100644
--- a/en/hardware/installation-media.xml
+++ b/en/hardware/installation-media.xml
@@ -34,26 +34,15 @@ For CHRP, floppy support is currently broken.
 
 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, except for some very
-old nonstandard CD-ROM drives which are neither SCSI nor IDE/ATAPI.
+the same from the operating system's point of view.
 
 </para></note><para>
 
-CD-ROM based installation is supported for some architectures.
-On machines which support bootable CD-ROMs, you should be able to do a
-completely
-<phrase arch="not-s390">floppy-less</phrase>
-<phrase arch="s390">tape-less</phrase>
-installation.  Even if your system doesn't
-support booting from a CD-ROM, you can use the CD-ROM in conjunction
-with the other techniques to install your system, once you've booted
-up by other means; see <xref linkend="boot-installer"/>.
+CD-ROM based installation is supported for most architectures.
 
 </para><para arch="x86">
 
-SCSI, SATA and IDE/ATAPI CD-ROMs are supported.  The <ulink
-url="&url-cd-howto;">Linux CD-ROM HOWTO</ulink> contains in-depth information
-on using CD-ROMs with Linux.
+On PCs SATA, IDE/ATAPI and SCSI CD-ROMs are supported.
 
 </para><para arch="x86">
 
@@ -78,32 +67,16 @@ entry in the firmware.
 </para>
   </sect2>
 
-  <sect2><title>Hard Disk</title>
-
-<para>
-
-Booting the installation system directly from a hard disk is another option
-for many architectures. This will require some other operating system
-to load the installer onto the hard disk.
-
-</para><para arch="sparc">
-
-Although the &arch-title; does not allow booting from SunOS
-(Solaris), you can install from a SunOS partition (UFS slices).
-
-</para>
-  </sect2>
-
   <sect2 condition="bootable-usb"><title>USB Memory Stick</title>
 
 <para>
 
-Many &debian; boxes need their floppy and/or CD-ROM drives only for
-setting up the system and for rescue purposes. If you operate some
-servers, you will probably already have thought about omitting those
-drives and using an USB memory stick for installing and (when
-necessary) for recovering the system. This is also useful for small
-systems which have no room for unnecessary drives.
+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.
 
 </para>
   </sect2>
@@ -123,7 +96,14 @@ configure your system to use ISDN and PPP.
 </para><para condition="supports-tftp">
 
 You can also <emphasis>boot</emphasis> the installation system over the
-network. <phrase arch="mips;mipsel">This is the preferred installation technique
+network without needing any local media like CDs/DVDs or USB sticks.  If
+you already have a netboot-infrastructure available (i.e.  you are already
+running DHCP and TFTP services in your network), this allows an easy and fast
+deployment of a large number of machines.  Setting up the necessary
+infrastructure requires a certain level of technical experience, so this is
+not recommended for novice users.
+
+<phrase arch="mips;mipsel">This is the preferred installation technique
 for &arch-title;.</phrase>
 
 </para><para condition="supports-nfsroot">
@@ -134,6 +114,25 @@ and NFS-mounting of all local filesystems, is another option.
 </para>
   </sect2>
 
+
+  <sect2><title>Hard Disk</title>
+
+<para>
+
+Booting the installation system directly from a hard disk is another option
+for many architectures. This will require some other operating system
+to load the installer onto the hard disk. This method is only recommended
+for special cases when no other installation method is available.
+
+</para><para arch="sparc">
+
+Although the &arch-title; does not allow booting from SunOS
+(Solaris), you can install from a SunOS partition (UFS slices).
+
+</para>
+  </sect2>
+
+
   <sect2><title>Un*x or GNU system</title>
 
 <para>
@@ -143,7 +142,8 @@ If you are running another Unix-like system, you could use it to install
 manual. This kind of install may be useful for users with otherwise
 unsupported hardware or on hosts which can't afford downtime.  If you
 are interested in this technique, skip to the <xref
-linkend="linux-upgrade"/>.
+linkend="linux-upgrade"/>. This installation method is only recommended
+for advanced users when no other installation method is available.
 
 </para>
   </sect2>
@@ -152,21 +152,16 @@ linkend="linux-upgrade"/>.
 
 <para>
 
-The &debian; boot disks contain a kernel which is built to maximize the
-number of systems it runs on.  Unfortunately, this makes for a larger
-kernel, which includes many drivers that won't be used for your
-machine<phrase arch="linux-any"> (see <xref linkend="kernel-baking"/> to learn how to
-build your own kernel)</phrase>.  Support for the widest possible range of
-devices is desirable in general, to ensure that &debian; can be
-installed on the widest array of hardware.
-
+The &debian; installer contains a kernel which is built to maximize the
+number of systems it runs on.
 </para><para arch="x86">
+Generally, the &debian; installation system includes support for IDE (also
+known as PATA) drives, SATA and SCSI controllers and drives, USB, and
+FireWire.  The supported file systems include FAT, Win-32 FAT extensions
+(VFAT) and NTFS.
 
-Generally, the &debian; installation system includes support for floppies,
-IDE (also known as PATA) drives, IDE floppies, parallel port IDE devices, SATA
-and SCSI controllers and drives, USB, and FireWire.  The supported file systems
-include FAT, Win-32 FAT extensions (VFAT) and NTFS.
 
+<!--
 </para><para arch="i386">
 
 Disk interfaces that emulate the <quote>AT</quote> hard disk interface
@@ -174,6 +169,7 @@ Disk interfaces that emulate the <quote>AT</quote> hard disk interface
 SCSI disk controllers from many different manufacturers are supported. See the
 <ulink url="&url-hardware-howto;">Linux Hardware Compatibility HOWTO</ulink>
 for more details.
+-->
 
 </para><para arch="sparc">
 
diff --git a/en/hardware/network-cards.xml b/en/hardware/network-cards.xml
index 0279753fd..5d9ca0d6f 100644
--- a/en/hardware/network-cards.xml
+++ b/en/hardware/network-cards.xml
@@ -6,10 +6,11 @@
 <para>
 
 Almost any network interface card (NIC) supported by the &arch-kernel; kernel
-should also be supported by the installation system; modular drivers
+should also be supported by the installation system; drivers
 should normally be loaded automatically.
 
-<phrase arch="x86">This includes most PCI and PCMCIA cards.</phrase>
+<phrase arch="x86">This includes most PCI/PCI-Express cards as well as
+PCMCIA/Express Cards on laptops.</phrase>
 <phrase arch="i386">Many older ISA cards are supported as well.</phrase>
 
 </para><para arch="sparc">
diff --git a/en/hardware/supported-peripherals.xml b/en/hardware/supported-peripherals.xml
index a05789677..e69492bf9 100644
--- a/en/hardware/supported-peripherals.xml
+++ b/en/hardware/supported-peripherals.xml
@@ -11,17 +11,14 @@ devices are not required while installing the system.
 
 </para><para arch="x86">
 
-USB hardware generally works fine, only some
-USB keyboards may require additional configuration
-(see <xref linkend="hardware-issues"/>).
+USB hardware generally works fine. On some very old PC systems some
+USB keyboards may require additional configuration (see <xref linkend="hardware-issues"/>).
+On modern PCs, USB keyboards and mice work without requiring any
+specific configuration.
 
-</para><para arch="x86">
-
-Again, see the
-<ulink url="&url-hardware-howto;">Linux Hardware Compatibility HOWTO</ulink>
-to determine whether your specific hardware is supported by Linux.
+</para>
 
-</para><para arch="s390">
+<para arch="s390">
 
 Package installations from XPRAM and tape are not supported by this
 system.  All packages that you want to install need to be available on a
diff --git a/en/hardware/supported/amd64.xml b/en/hardware/supported/amd64.xml
index 652bb4ffc..b2ef681e5 100644
--- a/en/hardware/supported/amd64.xml
+++ b/en/hardware/supported/amd64.xml
@@ -2,22 +2,12 @@
 <!-- $Id: i386.xml 39614 2006-08-07 15:50:11Z fjp $ -->
 
 
-  <sect2 arch="amd64"><title>CPU, Main Boards, and Video Support</title>
-<para>
-
-Complete information concerning supported peripherals can be found at
-<ulink url="&url-hardware-howto;">Linux Hardware Compatibility HOWTO</ulink>.
-This section merely outlines the basics.
-
-</para>
-
-   <sect3><title>CPU</title>
+  <sect2 arch="amd64"><title>CPU Support</title>
 <para>
 
 Both AMD64 and Intel EM64T processors are supported.
 
 </para>
-   </sect3>
 
 <!-- Not sure if this is relevant for AMD64; AFAIK only PCI supported
    <sect3 id="bus"><title>I/O Bus</title>
diff --git a/en/preparing/backup.xml b/en/preparing/backup.xml
index 2b86e17bd..5d8746700 100644
--- a/en/preparing/backup.xml
+++ b/en/preparing/backup.xml
@@ -6,12 +6,12 @@
 <para>
 
 Before you start, make sure to back up every file that is now on your
-system. If this is the first time a non-native operating system has
-been installed on your computer, it's quite likely you will need to
+system. If this is the first time a non-native operating system is going
+to be installed on your computer, it is quite likely you will need to
 re-partition your disk to make room for &debian-gnu;. Anytime you
 partition your disk, you run a risk of losing everything on the
 disk, no matter what program you use to do it. The programs used in
-installation are quite reliable and most have seen years of use; but
+the installation are quite reliable and most have seen years of use; but
 they are also quite powerful and a false move can cost you. Even after
 backing up, be careful and think about your answers and actions. Two
 minutes of thinking can save hours of unnecessary work.
@@ -20,10 +20,11 @@ minutes of thinking can save hours of unnecessary work.
 
 If you are creating a multi-boot system, make sure that you have the
 distribution media of any other present operating systems on hand.
-Especially if you repartition your boot drive, you might find that you
-have to reinstall your operating system's boot loader, or in many
-cases the whole operating system itself and all files on the affected
-partitions.
+Even though this is normally not necessary, there might be situations
+in which you could be required to reinstall your operating system's boot
+loader to make the system boot or in a worst case even have to reinstall the 
+complete operating system and restore your previously made backup.
+
 
 </para>
 
diff --git a/en/preparing/install-overview.xml b/en/preparing/install-overview.xml
index f2f3f6404..5f91cfab1 100644
--- a/en/preparing/install-overview.xml
+++ b/en/preparing/install-overview.xml
@@ -51,7 +51,7 @@ Gather information about your computer and any needed documentation,
 before starting the installation.
 
 </para></listitem>
-<listitem><para>
+<listitem arch="not-x86"><para>
 
 Create partitionable space for &debian; on your hard disk.
 
@@ -59,13 +59,13 @@ Create partitionable space for &debian; on your hard disk.
 <listitem><para>
 
 Locate and/or download the installer software and any specialized
-driver files your machine requires (except &debian; CD users).
+driver or firmware files your machine requires.
 
 </para></listitem>
 <listitem><para>
 
-Set up boot tapes/floppies/USB sticks, or place boot files (most &debian;
-CD users can boot from one of the CDs).
+Set up boot media such as CDs/DVDs/USB sticks or provide a network boot
+infrastructure from which the installer can be booted.
 
 </para></listitem>
 <listitem><para>
@@ -100,6 +100,11 @@ Attach one or more DASDs (Direct Access Storage Device).
 
 </para></listitem>
 
+<listitem arch="x86"><para>
+If necessary, resize existing partitions on your target harddisk to make
+space for the installation.
+</para></listitem>
+
 <listitem><para>
 
 Create and mount the partitions on which &debian; will be installed.
@@ -163,8 +168,9 @@ a graphical desktop environment, consisting of the X Window System and
 one of the available graphical desktop environments.
 If you choose not to select the <quote>Desktop environment</quote> task,
 you will only have a relatively basic, command line driven system.
-Installing the Desktop environment task is optional because it requires a
-fairly large amount of disk space, and because many &debian-gnu; systems are
+Installing the Desktop environment task is optional because in relation to a
+text-mode-only system it requires a comparatively large amount of disk space
+and because many &debian-gnu; systems are
 servers which don't really have any need for a graphical user interface
 to do their job.
 
@@ -172,7 +178,7 @@ to do their job.
 
 Just be aware that the X Window System is completely separate from
 <classname>debian-installer</classname>, and in fact is much more
-complicated. Installation and troubleshooting of the X Window
+complicated. Troubleshooting of the X Window
 System is not within the scope of this manual.
 
 </para>
diff --git a/en/preparing/needed-info.xml b/en/preparing/needed-info.xml
index c5a7390f5..4c13446f0 100644
--- a/en/preparing/needed-info.xml
+++ b/en/preparing/needed-info.xml
@@ -55,7 +55,7 @@ Often contains useful information on configuring or using your hardware.
  <itemizedlist arch="x86;sparc;mips;mipsel">
 <listitem arch="x86"><para>
 
-<ulink url="&url-hardware-howto;">Linux Hardware Compatibility HOWTO</ulink>
+<ulink url="&url-debian-wiki-hardware;">The Debian Wiki hardware page</ulink>
 
 </para></listitem>
 
@@ -153,7 +153,8 @@ The manuals that come with each piece of hardware.
 
 The BIOS setup screens of your computer. You can view these screens
 when you start your computer by pressing a combination of keys. Check
-your manual for the combination. Often, it is the <keycap>Delete</keycap> key.
+your manual for the combination. Often, it is the <keycap>Delete</keycap> 
+or the <keycap>F2</keycap> key.
 
 </para></listitem>
 <listitem><para>
@@ -187,7 +188,7 @@ networking and e-mail.
 <para>
 
 <table>
-<title>Hardware Information Needed for an Install</title>
+<title>Hardware Information Helpful for an Install</title>
 <tgroup cols="2">
 <thead>
 <row>
diff --git a/en/welcome/about-copyright.xml b/en/welcome/about-copyright.xml
index 30ed47ff2..5ebcb41bd 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 containing that software
+copyrighted, and it doesn't mean that CDs/DVDs 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
@@ -36,7 +36,7 @@ does make some packages available that do not meet our criteria for
 being free.  These packages are not part of the official distribution,
 however, and are only available from the
 <userinput>contrib</userinput> or <userinput>non-free</userinput>
-areas of &debian; mirrors or on third-party CD-ROMs; see the
+areas of &debian; mirrors or on third-party CD/DVD-ROMs; see the
 <ulink url="&url-debian-faq;">Debian FAQ</ulink>, under
 <quote>The Debian FTP archives</quote>, for more information about the
 layout and contents of the archives.
diff --git a/en/welcome/doc-organization.xml b/en/welcome/doc-organization.xml
index 39975d2c1..3ce6ec094 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),
+directly from a &debian; server (if you are not installing from a CD/DVD set),
 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;