--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: installation-guide: claims it will use "CD-ROM" as cover-term then doesn't
- From: Justin B Rye <justin.byam.rye@gmail.com>
- Date: Sat, 8 Aug 2015 11:07:28 +0100
- Message-id: <20150808100728.GA3846@xibalba.demon.co.uk>
Source: installation-guide
Version: 20150528
Severity: minor
Tags: d-i patch
In preparation for that proofreading sweep I claimed I was going to do
("https://lists.debian.org/debian-boot/2015/07/msg00455.html";) here's
a patch implementing a fix that has apparently already been decided on
but then not fully implemented.
The idea is, instead of constantly saying either "CDs" or "CDs/DVDs",
seemingly at random, when what it means is "optical media of any sort
whether that's CD, DVD, or BD", it should instead do what it announces
it's going to do: use "CD-ROM" as an official generic cover-term.
It's not a simple search-and-replace job, since sometimes "CD" really
means "CD". Here's a commented version of the patch.
(Let me know if these shouldn't get a "d-i" tag.)
>
> Index: appendix/chroot-install.xml
> ===================================================================
> --- appendix/chroot-install.xml (revision 70017)
> +++ appendix/chroot-install.xml (working copy)
> @@ -165,7 +165,7 @@
>
> </para><para>
>
> -If you have a &releasename; &debian-gnu; CD mounted at
> +If you have a &releasename; &debian-gnu; CD-ROM mounted at
> <filename>/cdrom</filename>, you could substitute a file URL instead
> of the http URL: <userinput>file:/cdrom/debian/</userinput>
A basic example of "CD" where it might mean anything up to
"BluRayDisc".
> Index: appendix/files.xml
> ===================================================================
> --- appendix/files.xml (revision 70017)
> +++ appendix/files.xml (working copy)
> @@ -202,7 +202,7 @@
>
> 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
> +of the special CD-ROM images, or by specifying the desired desktop environment
> when the installer is booted (see <xref linkend="pkgsel"/>).
>
> </para><para>
(skipping appendix/plip.xml, where there's a mention of loading
components "from CD", but that's a direct quote of something I'm not
editing.)
> Index: appendix/pppoe.xml
> ===================================================================
> --- appendix/pppoe.xml (revision 70017)
> +++ appendix/pppoe.xml (working copy)
> @@ -20,7 +20,7 @@
> </para><para>
>
> To have the option of setting up and using PPPoE during the installation,
> -you will need to install using one of the CD-ROM/DVD images that are
> +you will need to install using one of the CD-ROM images that are
> available. It is not supported for other installation methods (e.g.
> netboot<phrase condition="supports-floppy-boot"> or floppy</phrase>).
A slightly atypical case of the second major variety, where it already
takes DVDs into account but not BDs.
>
> Index: appendix/preseed.xml
> ===================================================================
> --- appendix/preseed.xml (revision 70017)
> +++ appendix/preseed.xml (working copy)
> @@ -73,7 +73,7 @@
>
> <tbody>
> <row>
> - <entry>CD/DVD</entry>
> + <entry>CD-ROM</entry>
> <entry>yes</entry>
> <entry>yes</entry>
> <entry>yes<footnote id='apx-ps-net'>
A more normal Type Two.
> @@ -119,7 +119,7 @@
> An important difference between the preseeding methods is the point at which
> the preconfiguration file is loaded and processed. For initrd preseeding
> this is right at the start of the installation, before the first question is
> -even asked. For file preseeding this is after the CD or CD image has been
> +even asked. For file preseeding this is after the CD-ROM or CD-ROM image has been
> loaded. For network preseeding it is only after the network has been
> configured.
Type One. Mind you, this use of "CD-ROM or CD-ROM image" can be
confusing, since after all a CD-ROM out of an official set *is* a
CD-ROM image (burned onto optical media). Maybe in my actual
proofreading sweep I'll get to rephrase it to something like "this is
after the ISO image has been loaded (e.g. from CD or USB device)..."
> @@ -228,7 +228,7 @@
> 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 floppy or usb-stick. If you want to include the file on a CD or DVD, you
> +a floppy or usb-stick. If you want to include the file on a CD-ROM, you
> will have to remaster the ISO 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;.
> @@ -290,7 +290,7 @@
> 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 CD-ROM:
> preseed/file=/cdrom/preseed.cfg
> preseed/file/checksum=5da499872becccfeda2c4872f9171c3d
>
More simple cases; I'll correct the references to usbs some other day.
> @@ -822,7 +822,7 @@
>
> 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 CD-ROM or USB stick. If you are loading preconfiguration
> files from the network, you can pass network config parameters by using
> kernel boot parameters.
>
> @@ -1452,7 +1452,7 @@
> # 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 include it on CD-ROMs.
> #popularity-contest popularity-contest/participate boolean false
> </screen></informalexample>
Strictly speaking that last bit about CD(-ROM)s is still nonsense -
even the least popular packages are still included somewhere.
> @@ -1526,7 +1526,7 @@
> # Avoid that last message about the install being complete.
> d-i finish-install/reboot_in_progress note
>
> -# This will prevent the installer from ejecting the CD during the reboot,
> +# This will prevent the installer from ejecting the CD-ROM during the reboot,
> # which is useful in some situations.
> #d-i cdrom-detect/eject boolean false
>
This is one of those cases where it would feel much more natural to
say "the disc", but I'll stick with applying the basic rule.
> @@ -1570,7 +1570,7 @@
> </para><para>
>
> When the filesystem of the target system is mounted, it is available in
> -<filename>/target</filename>. If an installation CD is used, when it is mounted
> +<filename>/target</filename>. If an installation CD-ROM is used, when it is mounted
> it is available in <filename>/cdrom</filename>.
>
> </para>
> Index: boot-installer/accessibility.xml
> ===================================================================
> --- boot-installer/accessibility.xml (revision 70017)
> +++ boot-installer/accessibility.xml (working copy)
> @@ -80,7 +80,7 @@
> <para>
>
> Support for software speech synthesis is available on all installer images which
> -have the graphical installer, i.e. all netinst, CD and DVD images, and the
> +have the graphical installer, i.e. all netinst and CD-ROM images, and the
> netboot gtk variant. It can be activated by selecting it in the
> boot menu by typing <userinput>s</userinput> &enterkey;. The textual version
> of the installer will then be automatically selected, and support for software
> @@ -115,7 +115,7 @@
> <para>
>
> Support for hardware speech synthesis devices is available on all installer
> -images which have the graphical installer, i.e. all netinst, CD and DVD images,
> +images which have the graphical installer, i.e. all netinst and CD-ROM images,
> and the netboot gtk variant. You thus need to select a <quote>Graphical
> install</quote> entry in the boot menu.
This one requires a minor conjunction shuffle.
> Index: boot-installer/arm.xml
> ===================================================================
> --- boot-installer/arm.xml (revision 70017)
> +++ boot-installer/arm.xml (working copy)
> @@ -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-ROM 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
> @@ -294,7 +294,7 @@
> USB stick formatted with a filesystem supported by the U-Boot version
> on your device. For modern U-Boot versions, any of FAT16 / FAT32 /
> ext2 / ext3 / ext4 usually works. Then copy the ISO image file of the
> - first &debian; installation CD or DVD onto the stick.
> + first &debian; installation CD-ROM onto the stick.
>
> </para>
> <para>
> @@ -334,7 +334,7 @@
> both U-Boot and the &d-i;. These images are provided in two variants
> - one for downloading the software packages over the network
> (available at &armmp-netboot-sd-img;) and one for offline
> - installations using a Debian CD/DVD (available at
> + installations using a Debian CD-ROM (available at
> &armmp-hd-media-sd-img;). To save space and network bandwidth, the
> images consist of two parts - a system-dependent part named
> <quote>firmware.<system-type>.img.gz</quote>, and a
> @@ -363,8 +363,8 @@
> After plugging the SD card into the target system and powering the
> system up, the installer is loaded from the SD card. If you use the
> hd-media variant for offline installations, you must provide the
> - installer with access to the first &debian; CD/DVD on a separate
> - medium, which can e.g. be a CD/DVD ISO image on a USB stick.
> + installer with access to the first &debian; CD-ROM on a separate
> + medium, which can e.g. be a CD-ROM ISO image on a USB stick.
> </para>
> <para>
> When you come to the partitioning step in the installer (see <xref
> Index: boot-installer/ia64.xml
> ===================================================================
> --- boot-installer/ia64.xml (revision 70017)
> +++ boot-installer/ia64.xml (working copy)
> @@ -6,11 +6,11 @@
> &boot-installer-intro-cd.xml;
>
> <note>
> - <title>CD Contents</title>
> + <title>CD-ROM Contents</title>
>
> <para>
>
> -There are three basic variations of &debian; Install CDs.
> +There are three basic variations of &debian; Install CD-ROMs.
> The <emphasis>Business Card</emphasis> CD has a minimal installation
> that will fit on the small form factor CD media.
> It requires a network connection in order to install the rest of the
This file's presumably a relic, which is why it's the only place where
the old "business card" CDs get mentioned, but it was easier to
include it in my sweep.
> @@ -101,7 +101,7 @@
> <itemizedlist>
>
> <listitem><para>
> -Insert the CD in the DVD/CD drive and reboot the machine.
> +Insert the CD-ROM in the drive and reboot the machine.
> The firmware will display the EFI Boot Manager page and menu after
> it completes its system initialization.
> </para></listitem>
> @@ -124,7 +124,7 @@
> </para></listitem>
>
> <listitem><para>
> -You can choose either of the entries that refer to the CD/DVD
> +You can choose either of the entries that refer to the CD-ROM
> drive.
> Select your choice with the arrow keys and press <command>ENTER</command>.
> If you choose <command>Removable Media Boot</command> the machine
> @@ -131,7 +131,7 @@
> will immediately start the boot load sequence.
> If you choose <command>Debian Inst [Acpi ...</command> instead, it
> will display a directory listing of the bootable portion of the
> -CD, requiring you to proceed to the next (additional) step.
> +CD-ROM, requiring you to proceed to the next (additional) step.
> </para></listitem>
>
> <listitem><para>
> @@ -162,7 +162,7 @@
> If, for some reason, option 1 is not successful, reboot the machine
> and when the EFI Boot Manager screen appears there should be
> one option called <command>EFI Shell [Built-in]</command>.
> -Boot the &debian; Installer CD with the following steps:
> +Boot the &debian; Installer CD-ROM with the following steps:
>
> </para>
>
> @@ -169,7 +169,7 @@
> <itemizedlist>
>
> <listitem><para>
> -Insert the CD in the DVD/CD drive and reboot the machine.
> +Insert the CD-ROM in the drive and reboot the machine.
> The firmware will display the EFI Boot Manager page and menu after
> it completes system initialization.
> </para></listitem>
> @@ -183,13 +183,13 @@
> <filename>fs<replaceable>n</replaceable>:</filename>.
> All other recognized partitions will be named
> <filename>blk<replaceable>n</replaceable>:</filename>.
> -If you inserted the CD just before entering the shell, this may
> -take a few extra seconds as it initializes the CD drive.
> +If you inserted the CD-ROM just before entering the shell, this may
> +take a few extra seconds as it initializes the CD-ROM drive.
> </para>
> </listitem>
>
> <listitem><para>
> -Examine the output from the shell looking for the CDROM drive.
> +Examine the output from the shell looking for the CD-ROM drive.
> It is most likely the <filename>fs0:</filename> device although
> other devices with bootable partitions will also show up as
> <filename>fs<replaceable>n</replaceable></filename>.
> @@ -199,7 +199,7 @@
> Enter <command>fs<replaceable>n</replaceable>:</command> and press
> <command>ENTER</command> to select that
> device where <replaceable>n</replaceable> is the partition number for the
> -CDROM. The shell will now display the partition number as its prompt.
> +CD-ROM. The shell will now display the partition number as its prompt.
> </para></listitem>
>
> <listitem><para>
> @@ -337,14 +337,14 @@
> <sect2 arch="ia64" id="boot-tftp"><title>Booting with TFTP</title>
>
> <para>
> -Booting an IA-64 system from the network is similar to a CD boot.
> +Booting an IA-64 system from the network is similar to a CD-ROM boot.
> The only difference is how the installation kernel is loaded.
> The EFI Boot Manager can load and start programs from a server on
> the network.
> Once the installation kernel is loaded and starts, the system install
> -will proceed through the same steps as the CD install with the exception
> +will proceed through the same steps as the CD-ROM install with the exception
> that the packages of the base install will be loaded from the network
> -rather than the CD drive.
> +rather than the CD-ROM drive.
>
> </para>
>
> @@ -450,7 +450,7 @@
> The boot loader will display its prompt after it has downloaded and
> processed its configuration file.
> At this point, the installation proceeds with the same steps as a
> -CD install. Select a boot option as in above and when the kernel
> +CD-ROM install. Select a boot option as in above and when the kernel
> has completed installing itself from the network, it will start the
> &debian; Installer.
Okay, enough polishing the cobwebs, back to still-in-use pages.
>
> Index: boot-installer/intro-cd.xml
> ===================================================================
> --- boot-installer/intro-cd.xml (revision 70017)
> +++ boot-installer/intro-cd.xml (working copy)
> @@ -3,19 +3,19 @@
>
> <para>
>
> -If you have a CD set, and if your machine supports booting directly
> -off the CD, great! Simply
> +If you have a CD-ROM set, and if your machine supports booting directly
> +off the CD-ROM, great! Simply
> <phrase arch="x86">
> -configure your system for booting off a CD as described in
> +configure your system for booting off a CD-ROM as described in
> <xref linkend="boot-dev-select"/>,
> </phrase>
> -insert your CD, reboot, and proceed to the next chapter.
> +insert your CD-ROM, reboot, and proceed to the next chapter.
>
> </para><para>
>
> -Note that certain CD drives may require special drivers, and thus be
> +Note that certain CD-ROM 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 a CD-ROM doesn't work for your hardware,
> revisit this chapter and read about alternate kernels and installation
> methods which may work for you.
The word "CD-ROM" gets a bit repetitive here.
>
> Index: boot-installer/parameters.xml
> ===================================================================
> --- boot-installer/parameters.xml (revision 70017)
> +++ boot-installer/parameters.xml (working copy)
> @@ -399,7 +399,7 @@
>
> 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 the CD-ROM. 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.
> Index: boot-installer/powerpc.xml
> ===================================================================
> --- boot-installer/powerpc.xml (revision 70017)
> +++ boot-installer/powerpc.xml (working copy)
> @@ -12,11 +12,11 @@
> On PowerMacs, hold the <keycap>c</keycap> key, or else the combination of
> <keycap>Command</keycap>, <keycap>Option</keycap>,
> <keycap>Shift</keycap>, and <keycap>Delete</keycap>
> -keys together while booting to boot from the factory default CD/DVD drive.
> +keys together while booting to boot from the factory default CD-ROM drive.
>
> </para><para>
>
> -To boot a PowerMac from an external Firewire CD/DVD drive invoke
> +To boot a PowerMac from an external Firewire CD-ROM drive invoke
> Open Firmware prompt first (see <xref linkend="invoking-openfirmware"/>),
> then type
(Are there Power Macs with BluRay drives? Anyway, standardising.)
>
> @@ -24,7 +24,7 @@
> 0 > boot fw/node/sbp-2/disk:,\install\yaboot
> </screen></informalexample>
>
> -for an alternative way to boot from the internal factory default CD/DVD
> +for an alternative way to boot from the internal factory default CD-ROM
> drive type
>
> <informalexample><screen>
> @@ -33,7 +33,7 @@
>
> </para><para>
>
> -OldWorld PowerMacs will not boot a &debian; CD, because OldWorld
> +OldWorld PowerMacs will not boot a &debian; CD-ROM, because OldWorld
> computers relied on a Mac OS ROM CD boot driver to be present on the CD,
> and a free-software version of this driver is not available. All
> OldWorld systems have floppy drives, so use the floppy drive to launch
What's a "Mac OS ROM CD boot driver"? Should "ROM CD" be "CD-ROM"?
I haven't changed "CD" to "CD-ROM" here because I don't know whether
it means optical media in general or only yellowbook-standard discs.
> @@ -42,7 +42,7 @@
>
> </para><para>
>
> -To boot &debian; CD/DVD on Pegasos II machine, hold <keycap>Esc</keycap>
> +To boot &debian; CD-ROM on Pegasos II machine, hold <keycap>Esc</keycap>
> key immediately after pressing the power-on button, when SmartFirmware
> prompt appears, type
I will definitely be revisiting this sentence in my general
proofreading sweep.
>
> Index: boot-installer/trouble.xml
> ===================================================================
> --- boot-installer/trouble.xml (revision 70017)
> +++ boot-installer/trouble.xml (working copy)
> @@ -45,8 +45,8 @@
> </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 DVD and
> +BD media as well as CD, but this guide uses the term CD-ROM for simplicity.
This was already pointing in the right general direction, but it
hadn't actually started moving that way.
> </para><para>
>
> @@ -61,8 +61,8 @@
> <itemizedlist>
> <listitem><para>
>
> -Some older CD-ROM drives do not support reading from discs that were burned
> -at high speeds using a modern CD writer.
> +Some older CD-ROM drives do not support reading from discs that were burned
> +at high speeds using a modern CD-ROM writer.
> </para></listitem>
>
> @@ -96,7 +96,7 @@
> <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
> +issue for very old systems) and that CD-ROM booting is enabled in the
> BIOS.
>
> </para></listitem>
> Index: boot-installer/x86.xml
> ===================================================================
> --- boot-installer/x86.xml (revision 70017)
> +++ boot-installer/x86.xml (working copy)
> @@ -23,7 +23,7 @@
> <itemizedlist>
> <listitem><para>
>
> -obtain CD-ROM/DVD-ROM<phrase condition="bootable-usb"> or USB memory
> +obtain CD-ROM<phrase condition="bootable-usb"> or USB memory
> stick</phrase> installation media as described in
> <xref linkend="official-cdrom"/><phrase condition="bootable-usb"> respective
> <xref linkend="boot-usb-files"/></phrase> or
I'll be back for that use of "respektive".
> @@ -39,7 +39,7 @@
>
> </para><para>
>
> -If you use an installation CD or DVD, a pre-installation program should be
> launched automatically when you insert the disc.
> +If you use an installation CD-ROM, 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
> @@ -63,7 +63,7 @@
>
> </para><para>
>
> -If you can access the installation CD, change the current drive to the CD-ROM
> +If you can access the installation CD-ROM, change the current drive to the CD-ROM
> drive, e.g.
>
> <informalexample><screen>
> @@ -117,9 +117,9 @@
> 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
> +copy a CD-ROM 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.
> +and install from the CD-ROM image, without needing the network.
> </para>
>
> <para>
> @@ -435,7 +435,7 @@
>
> </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-ROM 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>
> Index: hardware/installation-media.xml
> ===================================================================
> --- hardware/installation-media.xml (revision 70017)
> +++ hardware/installation-media.xml (working copy)
> @@ -76,7 +76,7 @@
> 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
> +particular netbooks and thin laptops, do not have a CD-ROM drive
> anymore at all and booting from USB media is the standard way of
> installing a new operating system on them.
>
> @@ -98,7 +98,7 @@
> </para><para condition="supports-tftp">
>
> You can also <emphasis>boot</emphasis> the installation system over the
> -network without needing any local media like CDs/DVDs or USB sticks. If
> +network without needing any local media like CD-ROMs 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
> Index: hardware/network-cards.xml
> ===================================================================
> --- hardware/network-cards.xml (revision 70017)
> +++ hardware/network-cards.xml (working copy)
> @@ -104,9 +104,9 @@
>
> If there is a problem with wireless and there
> is no other NIC you can use during the installation, it is still
> -possible to install &debian-gnu; using a full CD-ROM or DVD image. Select the
> +possible to install &debian-gnu; using a full CD-ROM image. Select the
> option to not configure a network and install using only the packages
> -available from the CD/DVD. You can then install the driver and firmware you
> +available from the CD-ROM. You can then install the driver and firmware you
> need after the installation is completed (after the reboot) and configure
> your network manually.
>
> Index: hardware/supported/sparc.xml
> ===================================================================
> --- hardware/supported/sparc.xml (revision 70017)
> +++ hardware/supported/sparc.xml (working copy)
> @@ -40,7 +40,7 @@
> This subarchitecture includes all 64-bit machines (sparc64) based on
> the UltraSparc processor and its clones. Most of the machines are well
> supported, even though for some you may experience problems booting from
> -CD due to firmware or bootloader bugs (this problem may be worked around
> +CD-ROM due to firmware or bootloader bugs (this problem may be worked around
> by using netbooting). Use the sparc64 or sparc64-smp kernel in UP and SMP
> configurations respectively.
>
> Index: howto/installation-howto.xml
> ===================================================================
> --- howto/installation-howto.xml (revision 70017)
> +++ howto/installation-howto.xml (working copy)
> @@ -37,12 +37,12 @@
> <para>
>
> <phrase condition="unofficial-build">
> -For some quick links to CD images, check out the <ulink url="&url-d-i;">
> +For some quick links to CD-ROM images, check out the <ulink url="&url-d-i;">
> &d-i; home page</ulink>.
> </phrase>
> -The debian-cd team provides builds of CD images using &d-i; on the
> +The debian-cd team provides builds of CD-ROM images using &d-i; on the
> <ulink url="&url-debian-cd;">Debian CD page</ulink>.
> -For more information on where to get CDs, see <xref linkend="official-cdrom" />.
> +For more information on where to get CD-ROMs, see <xref linkend="official-cdrom" />.
>
> </para><para>
Some of these references to "CDs" are quotes, and stay unmodified.
> @@ -62,26 +62,26 @@
> </para>
>
> <sect2 id="howto-getting-images-cdrom">
> - <title>CDROM</title>
> + <title>CD-ROM</title>
Standardising the hyphenation.
>
> <para>
>
> -The netinst CD image is a popular image which can be used to install
> +The netinst CD-ROM image is a popular image which can be used to install
> &releasename; with the &d-i;. This image is intended to boot from CD and
> install additional packages over a network; hence the name 'netinst'.
> The image has the software components needed to run the installer and
> the base packages to provide a minimal &releasename; system. If you'd
> -rather, you can get a full size CD image which will not need the network
> -to install. You only need the first CD of the set.
> +rather, you can get a full size CD-ROM image which will not need the network
> +to install. You only need the first CD-ROM of the set.
>
> </para><para>
>
> -Download whichever type you prefer and burn it to a CD.
> -<phrase arch="any-x86">To boot the CD, you may need to change your BIOS
> +Download whichever type you prefer and burn it to a CD-ROM.
> +<phrase arch="any-x86">To boot the CD-ROM, you may need to change your BIOS
> configuration, as explained in <xref linkend="bios-setup" />.</phrase>
> <phrase arch="powerpc">
> -To boot a PowerMac from CD, press the <keycap>c</keycap> key while booting. See
> -<xref linkend="boot-cd" /> for other ways to boot from CD.
> +To boot a PowerMac from CD-ROM, press the <keycap>c</keycap> key while booting. See
> +<xref linkend="boot-cd" /> for other ways to boot from CD-ROM.
> </phrase>
(For all I know hitting "c" might not work for DVD/BD booting, but
I'll assume it's safe to be generic.)
>
> </para>
> @@ -91,7 +91,7 @@
> <title>Floppy</title>
> <para>
>
> -If you can't boot from CD, you can download floppy images to install
> +If you can't boot from CD-ROM, you can download floppy images to install
> &debian;. You need the <filename>floppy/boot.img</filename>, the
> <filename>floppy/root.img</filename> and one or more of the driver disks.
>
> @@ -110,9 +110,9 @@
>
> </para><para>
>
> -If you have a CD, but cannot boot from it, then boot from floppies and use
> +If you have a CD-ROM, but cannot boot from it, then boot from floppies and use
> <filename>floppy/cd-drivers.img</filename> on a driver disk to complete the
> -install using the CD.
> +install using the CD-ROM.
>
> </para><para>
>
> @@ -137,10 +137,10 @@
> </para><para condition="isohybrid-supported">
>
> The easiest way to prepare your USB memory stick is to download any
> -Debian CD or DVD image that will fit on it, and write the CD image directly
> +Debian CD-ROM image that will fit on it, and write the image directly
> to the memory stick. Of course this will destroy anything already
> -on the memory stick. This works because Debian CD images are
> -"isohybrid" images that can boot both from CD and from USB drives.
> +on the memory stick. This works because Debian CD-ROM images are
> +"isohybrid" images that can boot both from CD-ROM and from USB drives.
>
> </para><para condition="isohybrid-unsupported">
>
> @@ -202,8 +202,8 @@
> It's possible to boot the installer using no removable media, but just an
> existing hard disk, which can have a different OS on it. Download
> <filename>hd-media/initrd.gz</filename>, <filename>hd-media/vmlinuz</filename>,
> -and a &debian; CD image to the top-level directory of the hard disk. Make sure
> -that the CD image has a filename ending in <literal>.iso</literal>. Now
> +and a &debian; CD-ROM image to the top-level directory of the hard disk. Make sure
> +that the CD-ROM image has a filename ending in <literal>.iso</literal>. Now
> it's just a matter of booting linux with the initrd.
> <phrase arch="x86">
> <xref linkend="boot-initrd" /> explains one way to do it.
> Index: install-methods/boot-drive-files.xml
> ===================================================================
> --- install-methods/boot-drive-files.xml (revision 70017)
> +++ install-methods/boot-drive-files.xml (working copy)
> @@ -13,7 +13,7 @@
>
> A full, <quote>pure network</quote> installation can be achieved using this
> technique. This avoids all hassles of removable media, like finding
> -and burning CD images or struggling with too numerous and
> +and burning CD-ROM images or struggling with too numerous and
> unreliable floppy disks.
>
> </para><para arch="powerpc">
> @@ -88,7 +88,7 @@
>
> </para><para>
>
> -Copy the following directories from a &debian; CD image to <filename>c:\</filename>.
> +Copy the following directories from a &debian; CD-ROM image to <filename>c:\</filename>.
>
> <itemizedlist>
> <listitem><para>
> @@ -129,7 +129,7 @@
> distribution, available from <ulink url="&url-powerpc-bootx;"></ulink>,
> or in the
> <filename>dists/woody/main/disks-powerpc/current/powermac</filename>
> -directory on &debian; http/ftp mirrors and official &debian; CDs. Use
> +directory on &debian; http/ftp mirrors and official &debian; CD-ROMs. Use
> <application>Stuffit Expander</application> to extract it from its
> archive. Within the package, there is an empty folder called
> <filename>Linux Kernels</filename>. Download
> Index: install-methods/boot-usb-files.xml
> ===================================================================
> --- install-methods/boot-usb-files.xml (revision 70017)
> +++ install-methods/boot-usb-files.xml (working copy)
> @@ -27,14 +27,14 @@
> </para></warning>
>
> <sect2 id="usb-copy-isohybrid" condition="isohybrid-supported">
> - <title>Preparing a USB stick using a hybrid CD or DVD image</title>
> + <title>Preparing a USB stick using a hybrid CD-ROM image</title>
> <para>
>
> -Debian CD and DVD images can now be written directly to a USB stick,
> +Debian CD-ROM images can now be written directly to a USB stick,
> which is a very easy way to make a bootable USB stick. Simply choose
> -a CD or DVD image (such as the netinst, CD-1, DVD-1, or netboot) that will fit
> +a CD-ROM image (such as the netinst, CD-1, DVD-1, or netboot) that will fit
> on your USB stick. See
> -<xref linkend="official-cdrom"/> to get a CD or DVD image.
> +<xref linkend="official-cdrom"/> to get a CD-ROM image.
Where it's just a "such as" we don't need to mention all the
possibilities, so never mind BluRay.
>
> </para><para>
>
> @@ -45,9 +45,9 @@
>
> </para><para>
>
> -The CD or DVD image you choose should be written directly to the USB stick,
> +The CD-ROM image you choose should be written directly to the USB stick,
> overwriting its current contents. For example, when using an existing
> -GNU/Linux system, the CD or DVD image file can be written to a USB stick
> +GNU/Linux system, the CD-ROM image file can be written to a USB stick
> as follows, after having made sure that the stick is unmounted:
>
> <informalexample><screen>
> @@ -68,7 +68,7 @@
>
> </para></important><important><para>
>
> -Simply writing the CD or DVD image to USB like this should work fine
> +Simply writing the CD-ROM image to USB like this should work fine
> for most users. The other options below are more complex, mainly for
> people with specialised needs.
>
> @@ -113,7 +113,7 @@
> <para>
>
> An alternative way to set up your USB stick is to manually copy
> -the installer files, and also a CD image to it.
> +the installer files, and also a CD-ROM image to it.
> Note that the USB stick should be at least 1 GB in size (smaller
> setups are possible if you follow <xref linkend="usb-copy-flexible"/>).
>
> @@ -162,7 +162,7 @@
> which will now have
> <phrase arch="x86">a FAT filesystem</phrase>
> <phrase arch="powerpc">an HFS filesystem</phrase>
> -on it, and copy a &debian; ISO image (netinst or full CD) to it.
> +on it, and copy a (full or netinst) &debian; ISO image to it.
> Unmount the stick (<userinput>umount /mnt</userinput>) and you are done.
This needed some extra tweaking, since it seemed to be implying that
netinst images were never CDs. This would all be simpler if we had a
less confusing name for the non-netinst ISO images.
> </para>
> @@ -176,7 +176,7 @@
> should use the following method to put the files on your stick. One
> advantage of using this method is that — if the capacity of your
> USB stick is large enough — you have the option of copying any
> -ISO image, even a DVD image, to it.
> +ISO image to it, even one that won't fit on a CD.
>
> </para>
Instead of trying to cram in BD as well, turn it round and negate it.
> Index: install-methods/create-floppy.xml
> ===================================================================
> --- install-methods/create-floppy.xml (revision 70017)
> +++ install-methods/create-floppy.xml (working copy)
> @@ -6,7 +6,7 @@
> <para>
>
> Bootable floppy disks are generally used as a last resort to boot the
> -installer on hardware that cannot boot from CD or by other means.
> +installer on hardware that cannot boot from CD-ROM or by other means.
>
> </para><para arch="powerpc">
>
> @@ -35,8 +35,8 @@
> Before you can create the floppies, you will first need to download them
> from one of the &debian; mirrors, as explained in
> <xref linkend="downloading-files"/>. <phrase arch="i386">If you already
> -have an installation CD-ROM or DVD, the floppy images may also be included
> -on the CD/DVD.</phrase>
> +have an installation CD-ROM, the floppy images may also be included
> +on the CD-ROM.</phrase>
>
> </para><para>
I think once I finish all this I'll celebrate by doing an install from
Zip disk.
> Index: install-methods/floppy/powerpc.xml
> ===================================================================
> --- install-methods/floppy/powerpc.xml (revision 70017)
> +++ install-methods/floppy/powerpc.xml (working copy)
> @@ -29,7 +29,7 @@
> <para>
>
> If you are creating the floppy image from files which were originally
> -on the official &debian-gnu; CD, then the Type and Creator are already set
> +on the official &debian-gnu; CD-ROM, then the Type and Creator are already set
> correctly. The following <command>Creator-Changer</command> steps are
> only necessary if you downloaded the image files from a &debian; mirror.
>
> Index: install-methods/official-cdrom.xml
> ===================================================================
> --- install-methods/official-cdrom.xml (revision 70017)
> +++ install-methods/official-cdrom.xml (working copy)
> @@ -2,21 +2,21 @@
> <!-- $Id$ -->
>
> <sect1 id="official-cdrom">
> - <title>Official &debian-gnu; CD/DVD-ROM Sets</title>
> + <title>Official &debian-gnu; CD-ROM Sets</title>
> <para>
>
> By far the easiest way to install &debian-gnu; is from an Official
> -&debian; CD/DVD-ROM Set. You can buy a set from a vendor (see the
> +&debian; CD-ROM Set. You can buy a set from a vendor (see the
> <ulink url="&url-debian-cd-vendors;">CD vendors page</ulink>).
> -You may also download the CD/DVD-ROM images from a &debian; mirror and make
> -your own set, if you have a fast network connection and a CD/DVD burner
> +You may also download the CD-ROM images from a &debian; mirror and make
> +your own set, if you have a fast network connection and a CD-ROM burner
> (see the <ulink url="&url-debian-cd;">Debian CD page</ulink> and
> <ulink url="&url-debian-cd-faq;">Debian CD FAQ</ulink> for
> -detailed instructions). If you have a &debian; CD/DVD set and CDs/DVDs are
> +detailed instructions). If you have a &debian; CD-ROM set and CD-ROMs are
> bootable on your machine<phrase arch="x86">, which is the case on all
> modern PCs</phrase>, you can skip right to
> <xref linkend="boot-installer"/>. Much effort has been expended to ensure
> -the most-used files are on the first CDs and DVDs, so that a basic
> +the most-used files are on the first CD-ROM of the set, so that a basic
> desktop installation can be done with only the first DVD or - to a limited
> extent - even with only the first CD.
I haven't tried to add any reference to BDs; I gather they still come in
"sets", even if there are only two discs in the set.
> @@ -31,7 +31,7 @@
> </para><para>
>
> If your machine doesn't support CD booting<phrase arch="x86"> (only relevant
> -on very old PC systems)</phrase>, but you do have a CD set,
> +on very old PC systems)</phrase>, but you do have a CD-ROM set,
> you can use an alternative strategy such as
>
> <phrase condition="supports-floppy-boot">floppy disk,</phrase>
> @@ -44,21 +44,21 @@
>
> <phrase condition="supports-tftp">net boot,</phrase>
>
> -or manually loading the kernel from the CD to initially boot the
> +or manually loading the kernel from the CD-ROM to initially boot the
> system installer. The files you need for booting by another means are
> -also on the CD; the &debian; network archive and CD folder organization
> +also on the CD-ROM; the &debian; network archive and CD-ROM folder organization
> are identical. So when archive file paths are given below for
> particular files you need for booting, look for those files in the
> -same directories and subdirectories on your CD.
> +same directories and subdirectories on your CD-ROM.
>
> </para><para>
>
> Once the installer is booted, it will be able to obtain all the other
> -files it needs from the CD.
> +files it needs from the CD-ROM.
>
> </para><para>
>
> -If you don't have a CD set, then you will need to download the
> +If you don't have a CD-ROM set, then you will need to download the
> installer system files and place them on the
>
> <phrase arch="s390">VM minidisk</phrase>
> Index: install-methods/usb-setup/powerpc.xml
> ===================================================================
> --- install-methods/usb-setup/powerpc.xml (revision 70017)
> +++ install-methods/usb-setup/powerpc.xml (working copy)
> @@ -114,7 +114,7 @@
> &debian; ISO image<footnote>
>
> <para>
> -You can use either a netinst or a full CD image (see
> +You can use either a netinst or a full CD-ROM image (see
> <xref linkend="official-cdrom"/>). Be sure to select one that fits.
> Note that the <quote>netboot <filename>mini.iso</filename></quote> image is
> not usable for this purpose.
Again we could do with a better term, since netinst images *are* full
CD-ROM images (they may not provide a full package archive, but
they're perfectly complete ISOs).
> Index: install-methods/usb-setup/x86.xml
> ===================================================================
> --- install-methods/usb-setup/x86.xml (revision 70017)
> +++ install-methods/usb-setup/x86.xml (working copy)
> @@ -116,7 +116,7 @@
> &debian; ISO image<footnote>
>
> <para>
> -You can use either a netinst or a full CD image (see
> +You can use either a netinst or a full CD-ROM image (see
> <xref linkend="official-cdrom"/>). Be sure to select one that fits.
> Note that the <quote>netboot <filename>mini.iso</filename></quote> image is
> not usable for this purpose.
Ditto.
> Index: partitioning/tree.xml
> ===================================================================
> --- partitioning/tree.xml (revision 70017)
> +++ partitioning/tree.xml (working copy)
> @@ -144,7 +144,7 @@
> <filename>/tmp</filename>: temporary data created by programs will
> most likely go in this directory. 40–100MB should usually
> be enough. Some applications — including archive manipulators,
> -CD/DVD authoring tools, and multimedia software — may use
> +CD-ROM authoring tools, and multimedia software — may use
> <filename>/tmp</filename> to temporarily store image files. If you
> plan to use such applications, you should adjust the space available
> in <filename>/tmp</filename> accordingly.
> Index: preparing/bios-setup/i386.xml
> ===================================================================
> --- preparing/bios-setup/i386.xml (revision 70017)
> +++ preparing/bios-setup/i386.xml (working copy)
> @@ -23,13 +23,13 @@
>
> Within the BIOS setup menu, you can select which devices shall be
> checked in which sequence for a bootable operating system. Possible choices
> -usually include the internal harddisks, the CD/DVD-ROM drive and USB mass storage
> +usually include the internal harddisks, the CD-ROM drive and USB mass storage
> devices such as USB sticks or external USB harddisks. On modern systems there
> is also often a possibility to enable network booting via PXE.
>
> </para><para>
>
> -Depending on the installation media (CD/DVD ROM, USB stick, network boot)
> +Depending on the installation media (CD-ROM, USB stick, network boot)
> you have chosen you should enable the appropriate boot devices if they
> are not already enabled.
>
> @@ -61,11 +61,11 @@
> some of these systems using a USB stick as boot medium is impossible; others
> can be tricked into booting from the stick by changing the device type in
> the BIOS setup from the default <quote>USB harddisk</quote> or <quote>USB
> -stick</quote> to <quote>USB ZIP</quote> or <quote>USB CDROM</quote>.
> +stick</quote> to <quote>USB ZIP</quote> or <quote>USB CD-ROM</quote>.
> <phrase condition="isohybrid-supported">
> -In particular if you use an isohybrid CD/DVD image on a USB stick
> +In particular if you use an isohybrid CD-ROM image on a USB stick
> (see <xref linkend="usb-copy-isohybrid"/>), changing the device type to
> -<quote>USB CDROM</quote> helps on some BIOSes which will not boot from a USB stick in
> +<quote>USB CD-ROM</quote> helps on some BIOSes which will not boot from a USB stick in
> USB harddisk mode.</phrase>
>
> </para><para>
(Or do we have some reason to believe that all BIOSes standardise on
the hyphenless spelling "USB CDROM"?)
> Index: preparing/bios-setup/s390.xml
> ===================================================================
> --- preparing/bios-setup/s390.xml (revision 70017)
> +++ preparing/bios-setup/s390.xml (working copy)
> @@ -100,7 +100,7 @@
> The installation server needs to copy the exact directory structure
> from any &debian-gnu; mirror, but only the s390 and
> architecture-independent files are required. You can also copy the
> -contents of all installation CDs into such a directory tree.
> +contents of all installation CD-ROMs into such a directory tree.
>
> </para><para condition="FIXME">
>
> Index: preparing/install-overview.xml
> ===================================================================
> --- preparing/install-overview.xml (revision 70017)
> +++ preparing/install-overview.xml (working copy)
> @@ -64,7 +64,7 @@
> </para></listitem>
> <listitem><para>
>
> -Set up boot media such as CDs/DVDs/USB sticks or provide a network boot
> +Set up boot media such as CD-ROMs/USB sticks or provide a network boot
> infrastructure from which the installer can be booted.
>
> </para></listitem>
> Index: preparing/needed-info.xml
> ===================================================================
> --- preparing/needed-info.xml (revision 70017)
> +++ preparing/needed-info.xml (working copy)
> @@ -369,7 +369,7 @@
> &debian-gnu; is also available as a so-called <quote>live system</quote> for certain
> architectures. A live system is a preconfigured ready-to-use system
> in a compressed format that can be booted and used from a read-only medium
> -like a CD or DVD. Using it by default does not create any permanent changes
> +like a CD-ROM. Using it by default does not create any permanent changes
> on your computer. You can change user settings and install additional
> programs from within the live system, but all this only happens in the
> computer's RAM, i.e. if you turn off the computer and boot the live system
> Index: preparing/nondeb-part/sparc.xml
> ===================================================================
> --- preparing/nondeb-part/sparc.xml (revision 70017)
> +++ preparing/nondeb-part/sparc.xml (working copy)
> @@ -11,7 +11,7 @@
> you partition using SunOS prior to installing &debian;. The Linux
> kernel understands Sun disk labels, so there are no problems there.
> SILO supports booting Linux and SunOS from any of EXT2 (Linux), UFS
> -(SunOS), romfs or iso9660 (CDROM) partitions.
> +(SunOS), romfs or iso9660 (CD-ROM) partitions.
>
> </para>
> </sect2>
> Index: using-d-i/loading-firmware.xml
> ===================================================================
> --- using-d-i/loading-firmware.xml (revision 70017)
> +++ using-d-i/loading-firmware.xml (working copy)
> @@ -54,9 +54,9 @@
> <sect2><title>Preparing a medium</title>
> <para>
>
> -Official CD images do not include non-free firmware. The most common
> +Official CD-ROM 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 CD-ROM builds 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, or floppy
> Index: using-d-i/modules/apt-setup.xml
> ===================================================================
> --- using-d-i/modules/apt-setup.xml (revision 70017)
> +++ using-d-i/modules/apt-setup.xml (working copy)
> @@ -15,7 +15,7 @@
> <command>dpkg</command>. However, this program is more of a low-level
> tool. <command>apt-get</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 CD-ROM, 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 @@
> </para>
>
> <sect4 id="apt-setup-cdset">
> - <title>Installing from more than one CD or DVD</title>
> + <title>Installing from more than one CD-ROM</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-ROM that is part of a larger set,
> +the installer will ask if you want to scan additional CD-ROMs.
> +If you have additional CD-ROMs 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 CD-ROMs, 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 @@
> </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-ROMs in the order of their popularity.
> +This means that for most uses only the first CD-ROMs in a set are needed and
> that only very few people actually use any of the packages included on the
> -last CDs in a set.
> +last CD-ROMs in a set.
>
> </para><para>
>
> @@ -90,9 +90,9 @@
> </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 CD-ROMs, the installer will prompt you to
> +exchange them when it needs packages from another CD-ROM than the one
> +currently in the drive. Note that only CD-ROMs 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.
> @@ -111,8 +111,8 @@
>
> </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
> +If you are <emphasis>not</emphasis> installing from a full CD-ROM or
> +using a full CD-ROM 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
Again the slightly confusing "full CD-ROM" terminology.
> @@ -131,16 +131,16 @@
>
> </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
> -of a network mirror is optional.
> +In the case of a DVD/BD install, any packages needed
> +during the installation should be present on the first CD-ROM. Use of a
> +network mirror is optional. The same applies if you have scanned
> +multiple CDs as explained in the previous section.
This really needed a specific reference to BD, and some syntactic
re-plumbing. (It seemed to be saying that if you were using a CD-set
then you would only need the first DVD, and it wasn't clear just what
made a mirror 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,
> -will become available for installation, thus extending the life of your CD/DVD
> +since the CD-ROM set was created and have been included in a point release,
> +will become available for installation, thus extending the life of your CD-ROM
> set without compromising the security or stability of the installed system.
>
> </para><para>
> @@ -147,7 +147,7 @@
>
> 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 CD-ROM, 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 @@
> </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 CD-ROMs 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 CD-ROMs are
> available from a mirror (either a regular package mirror, or a mirror for
> security or stable-updates).
>
> @@ -191,7 +191,7 @@
> <para>
>
> If you have selected to use a network mirror during the installation
> -(optional for CD/DVD installs, required for netboot images), you will be
> +(optional for CD-ROM installs, required for netboot images), you will be
> presented with a list of geographically nearby (and therefore hopefully
> fast) network mirrors, based upon your country selection earlier in the
> installation process. Choosing the offered default is usually fine.
> Index: using-d-i/modules/choose-mirror.xml
> ===================================================================
> --- using-d-i/modules/choose-mirror.xml (revision 70017)
> +++ using-d-i/modules/choose-mirror.xml (working copy)
> @@ -8,7 +8,7 @@
> installer components or the base system from the network
> (either local or the internet).
> - This means you first have to configure a network interface.
> -- Mirror selection is delayed until apt-setup for CD-based installs (except
> +- Mirror selection is delayed until apt-setup for CD-ROM-based installs (except
> businesscard)
> - A list of countries is displayed with the default based on the country you
> selected earlier.
> Index: using-d-i/modules/network-console.xml
> ===================================================================
> --- using-d-i/modules/network-console.xml (revision 70017)
> +++ using-d-i/modules/network-console.xml (working copy)
> @@ -19,7 +19,7 @@
> 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 CD-ROM, 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
> additional components select <guimenuitem>network-console: Continue
> Index: using-d-i/modules/pkgsel.xml
> ===================================================================
> --- using-d-i/modules/pkgsel.xml (revision 70017)
> +++ using-d-i/modules/pkgsel.xml (working copy)
> @@ -73,7 +73,7 @@
> 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
> -work fine if you are using a DVD image or any other installation method.
> +work fine if you are using a DVD/BD image or any other installation method.
>
> </para></note>
> <para>
Needed an update to its non-CD CD-ROM types.
> Index: using-d-i/using-d-i.xml
> ===================================================================
> --- using-d-i/using-d-i.xml (revision 70017)
> +++ using-d-i/using-d-i.xml (working copy)
> @@ -229,7 +229,7 @@
>
> <term>cdrom-detect</term><listitem><para>
>
> -Looks for and mounts a &debian; installation CD.
> +Looks for and mounts a &debian; installation CD-ROM.
>
> </para></listitem>
> </varlistentry>
> @@ -283,7 +283,7 @@
> <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 CD-ROM.
>
> </para></listitem>
> </varlistentry>
> Index: welcome/about-copyright.xml
> ===================================================================
> --- welcome/about-copyright.xml (revision 70017)
> +++ welcome/about-copyright.xml (working copy)
> @@ -21,7 +21,7 @@
> </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 CD-ROMs 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 @@
> 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/DVD-ROMs; see the
> +areas of &debian; mirrors or on third-party CD-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.
> Index: welcome/doc-organization.xml
> ===================================================================
> --- welcome/doc-organization.xml (revision 70017)
> +++ welcome/doc-organization.xml (working copy)
> @@ -59,7 +59,7 @@
> <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 CD-ROM 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;
> Index: welcome/getting-newest-inst.xml
> ===================================================================
> --- welcome/getting-newest-inst.xml (revision 70017)
> +++ welcome/getting-newest-inst.xml (working copy)
> @@ -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; CD-ROMs 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;
Okay, finished.
--
JBR with qualifications in linguistics, experience as a Debian
sysadmin, and probably no clue about this particular package
Index: chroot-install.xml
===================================================================
--- chroot-install.xml (revision 70017)
+++ chroot-install.xml (working copy)
@@ -165,7 +165,7 @@
</para><para>
-If you have a &releasename; &debian-gnu; CD mounted at
+If you have a &releasename; &debian-gnu; CD-ROM mounted at
<filename>/cdrom</filename>, you could substitute a file URL instead
of the http URL: <userinput>file:/cdrom/debian/</userinput>
Index: files.xml
===================================================================
--- files.xml (revision 70017)
+++ files.xml (working copy)
@@ -202,7 +202,7 @@
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
+of the special CD-ROM images, or by specifying the desired desktop environment
when the installer is booted (see <xref linkend="pkgsel"/>).
</para><para>
Index: pppoe.xml
===================================================================
--- pppoe.xml (revision 70017)
+++ pppoe.xml (working copy)
@@ -20,7 +20,7 @@
</para><para>
To have the option of setting up and using PPPoE during the installation,
-you will need to install using one of the CD-ROM/DVD images that are
+you will need to install using one of the CD-ROM images that are
available. It is not supported for other installation methods (e.g.
netboot<phrase condition="supports-floppy-boot"> or floppy</phrase>).
Index: preseed.xml
===================================================================
--- preseed.xml (revision 70017)
+++ preseed.xml (working copy)
@@ -73,7 +73,7 @@
<tbody>
<row>
- <entry>CD/DVD</entry>
+ <entry>CD-ROM</entry>
<entry>yes</entry>
<entry>yes</entry>
<entry>yes<footnote id='apx-ps-net'>
@@ -119,7 +119,7 @@
An important difference between the preseeding methods is the point at which
the preconfiguration file is loaded and processed. For initrd preseeding
this is right at the start of the installation, before the first question is
-even asked. For file preseeding this is after the CD or CD image has been
+even asked. For file preseeding this is after the CD-ROM or CD-ROM image has been
loaded. For network preseeding it is only after the network has been
configured.
@@ -228,7 +228,7 @@
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 floppy or usb-stick. If you want to include the file on a CD or DVD, you
+a floppy or usb-stick. If you want to include the file on a CD-ROM, you
will have to remaster the ISO 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;.
@@ -290,7 +290,7 @@
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 CD-ROM:
preseed/file=/cdrom/preseed.cfg
preseed/file/checksum=5da499872becccfeda2c4872f9171c3d
@@ -822,7 +822,7 @@
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 CD-ROM or USB stick. If you are loading preconfiguration
files from the network, you can pass network config parameters by using
kernel boot parameters.
@@ -1452,7 +1452,7 @@
# 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 include it on CD-ROMs.
#popularity-contest popularity-contest/participate boolean false
</screen></informalexample>
@@ -1526,7 +1526,7 @@
# Avoid that last message about the install being complete.
d-i finish-install/reboot_in_progress note
-# This will prevent the installer from ejecting the CD during the reboot,
+# This will prevent the installer from ejecting the CD-ROM during the reboot,
# which is useful in some situations.
#d-i cdrom-detect/eject boolean false
@@ -1570,7 +1570,7 @@
</para><para>
When the filesystem of the target system is mounted, it is available in
-<filename>/target</filename>. If an installation CD is used, when it is mounted
+<filename>/target</filename>. If an installation CD-ROM is used, when it is mounted
it is available in <filename>/cdrom</filename>.
</para>
--- End Message ---