diff options
26 files changed, 159 insertions, 165 deletions
diff --git a/debian/changelog b/debian/changelog index 2913b4610..3ec48babc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ installation-guide (20190623) UNRELEASED; urgency=medium * Rename mdcfg into partman-md and lvmcfg into partman-lvm. Closes: #414194 * Remove mentions of floppy. Thanks to Miguel Figueiredo for the patch. Closes: #935069 + * Change CD/DVD etc. into 'installation media' or 'installation image' as + cover-term, where applicable. [ Moritz Muehlenhoff ] * Update doc for apt-setup/localX/key preseeding config. Closes: #932284 diff --git a/en/appendix/chroot-install.xml b/en/appendix/chroot-install.xml index e4b7c2505..c8f48dd1c 100644 --- a/en/appendix/chroot-install.xml +++ b/en/appendix/chroot-install.xml @@ -165,7 +165,7 @@ network-wise. Mirrors are listed at </para><para> -If you have a &releasename; &debian-gnu; CD mounted at +If you have a &releasename; &debian-gnu; installation medium mounted at <filename>/cdrom</filename>, you could substitute a file URL instead of the http URL: <userinput>file:/cdrom/debian/</userinput> diff --git a/en/appendix/files.xml b/en/appendix/files.xml index 0103afd2a..65f45b470 100644 --- a/en/appendix/files.xml +++ b/en/appendix/files.xml @@ -192,8 +192,8 @@ obtained by adding up the numbers. By default the installer will install the GNOME desktop environment, but alternative desktop environments can be selected either by using one -of the special CD images, or by specifying the desired desktop environment -when the installer is booted (see <xref linkend="pkgsel"/>). +of the special installation images, or by specifying the desired desktop environment +during installation (see <xref linkend="pkgsel"/>). </para><para> diff --git a/en/appendix/plip.xml b/en/appendix/plip.xml index d4fc97bd3..6edf4c99c 100644 --- a/en/appendix/plip.xml +++ b/en/appendix/plip.xml @@ -117,7 +117,7 @@ the installation. <orderedlist> <listitem><para> -<guimenuitem>Load installer components from CD</guimenuitem> +<guimenuitem>Load installer components from installation media</guimenuitem> </para><para> diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml index 1ec09a627..3d9bf425b 100644 --- a/en/appendix/preseed.xml +++ b/en/appendix/preseed.xml @@ -73,7 +73,7 @@ installation methods. <tbody> <row> - <entry>CD/DVD</entry> + <entry>CD/DVD/USB</entry> <entry>yes</entry> <entry>yes</entry> <entry>yes<footnote id='apx-ps-net'> @@ -112,8 +112,8 @@ this is right at the start of the installation, before the first question is even asked. Preseeding from the kernel command line happens just after. It is thus possible to override configuration set in the initrd by editing the kernel command line (either in the bootloader configuration or manually at boot time -for bootloaders that allow it). For file preseeding this is after the CD -or CD image has been loaded. For network preseeding it is only after the +for bootloaders that allow it). For file preseeding this is after the installation +image has been loaded. For network preseeding it is only after the network has been configured. </para><important><para> @@ -221,8 +221,8 @@ You will first need to create a preconfiguration file and place it in the location from where you want to use it. Creating the preconfiguration file is covered later in this appendix. Putting it in the correct location is fairly straightforward for network preseeding or if you want to read the file off -a usb-stick. If you want to include the file on a CD or DVD, you -will have to remaster the ISO image. How to get the preconfiguration file +a usb-stick. If you want to include the file in an installation ISO image, you +will have to remaster the image. How to get the preconfiguration file included in the initrd is outside the scope of this document; please consult the developers' documentation for &d-i;. @@ -283,7 +283,7 @@ Boot parameters to specify: preseed/url=tftp://host/path/to/preseed.cfg preseed/url/checksum=5da499872becccfeda2c4872f9171c3d -- if you're booting a remastered CD: +- if you're booting a remastered installation image: preseed/file=/cdrom/preseed.cfg preseed/file/checksum=5da499872becccfeda2c4872f9171c3d @@ -835,7 +835,7 @@ This will result in the kernel keymap remaining active. Of course, preseeding the network configuration won't work if you're loading your preconfiguration file from the network. But it's great when -you're booting from CD or USB stick. If you are loading preconfiguration +you're booting from optical disc or USB stick. If you are loading preconfiguration files from the network, you can pass network config parameters by using kernel boot parameters. @@ -1477,7 +1477,7 @@ to be used easily on the kernel command line as well. # Some versions of the installer can report back on what software you have # installed, and what software you use. The default is not to report back, # but sending reports helps the project determine what software is most -# popular and include it on CDs. +# popular and should be included on the first CD/DVD. #popularity-contest popularity-contest/participate boolean false </screen></informalexample> diff --git a/en/boot-installer/arm.xml b/en/boot-installer/arm.xml index bd8ee2782..20bdb52c1 100644 --- a/en/boot-installer/arm.xml +++ b/en/boot-installer/arm.xml @@ -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/DVD 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 diff --git a/en/boot-installer/intro-cd.xml b/en/boot-installer/intro-cd.xml index 6712f7e0f..944cfc321 100644 --- a/en/boot-installer/intro-cd.xml +++ b/en/boot-installer/intro-cd.xml @@ -3,29 +3,29 @@ <para> -If you have a CD set, and if your machine supports booting directly -off the CD, great! Simply +If you have a set of optical discs, and your machine supports booting directly +off those, great! Simply <phrase arch="x86"> -configure your system for booting off a CD as described in +configure your system for booting off an optical disc as described in <xref linkend="boot-dev-select-x86"/>, </phrase> -insert your CD, reboot, and proceed to the next chapter. +insert the disc, reboot, and proceed to the next chapter. </para><para> -Note that certain CD drives may require special drivers, and thus be +Note that certain optical 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 an optical disc doesn't work for your hardware, revisit this chapter and read about alternate kernels and installation methods which may work for you. </para><para> -Even if you cannot boot from CD-ROM, you can probably install the -&debian; system components and any packages you want from CD-ROM. +Even if you cannot boot from optical disc, you can probably install the +&debian; system components and any packages you want from such disc. Simply boot using a different medium and when it's time to install the operating system, base system, and any additional -packages, point the installation system at the CD-ROM drive. +packages, point the installation system at the optical drive. </para><para> diff --git a/en/boot-installer/parameters.xml b/en/boot-installer/parameters.xml index 68c1f61a5..dbe1e1f1e 100644 --- a/en/boot-installer/parameters.xml +++ b/en/boot-installer/parameters.xml @@ -383,7 +383,7 @@ Set to <userinput>true</userinput> to prevent this. 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 such disc. 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. diff --git a/en/boot-installer/trouble.xml b/en/boot-installer/trouble.xml index 6539fbe00..b23cce53f 100644 --- a/en/boot-installer/trouble.xml +++ b/en/boot-installer/trouble.xml @@ -7,12 +7,12 @@ </para> <sect2 arch="not-s390" id="unreliable-cd"> - <title>CD-ROM Reliability</title> + <title>Reliability of optical media</title> <para> -Sometimes, especially with older CD-ROM drives, the installer may fail -to boot from a CD-ROM. The installer may also — even after booting -successfully from CD-ROM — fail to recognize the CD-ROM or return +Sometimes, especially with older drives, the installer may fail +to boot from an optical disc. The installer may also — even after booting +successfully from such disc — fail to recognize the disc or return errors while reading from it during the installation. </para><para> @@ -28,14 +28,14 @@ There are two very simple things that you should try first. <itemizedlist> <listitem><para> -If the CD-ROM does not boot, check that it was inserted correctly and that +If the disc does not boot, check that it was inserted correctly and that it is not dirty. </para></listitem> <listitem><para> -If the installer fails to recognize a CD-ROM, try just running the option -<menuchoice> <guimenuitem>Detect and mount CD-ROM</guimenuitem> </menuchoice> +If the installer fails to recognize the disc, try just running the option +<menuchoice> <guimenuitem>Detect and mount installation media</guimenuitem> </menuchoice> a second time. Some DMA related issues with very old CD-ROM drives are known to be resolved in this way. @@ -45,12 +45,11 @@ be resolved in this way. </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 CD-ROM and DVD. </para><para> -If you cannot get the installation working from CD-ROM, try one of the +If you cannot get the installation working from optical disc, try one of the other installation methods that are available. </para> @@ -90,13 +89,13 @@ access</quote> (DMA) is enabled for them. <title>How to investigate and maybe solve issues</title> <para> -If the CD-ROM fails to boot, try the suggestions listed below. +If the optical disc fails to boot, try the suggestions listed below. <itemizedlist> <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 +Check that your BIOS actually supports booting from optical disc (only an +issue for very old systems) and that booting from such media is enabled in the BIOS. </para></listitem> @@ -112,9 +111,9 @@ $ md5sum <replaceable>debian-testing-i386-netinst.iso</replaceable> a20391b12f7ff22ef705cee4059c6b92 <replaceable>debian-testing-i386-netinst.iso</replaceable> </screen></informalexample> -Next, check that the md5sum of the burned CD-ROM matches as well. The +Next, check that the md5sum of the burned disc matches as well. The following command should work. It uses the size of the image to read the -correct number of bytes from the CD-ROM. +correct number of bytes from the disc. <informalexample><screen> $ dd if=/dev/cdrom | \ @@ -131,10 +130,10 @@ a20391b12f7ff22ef705cee4059c6b92 - </para><para> -If, after the installer has been booted successfully, the CD-ROM is not +If, after the installer has been booted successfully, the disc is not detected, sometimes simply trying again may solve the problem. If you have -more than one CD-ROM drive, try changing the CD-ROM to the other drive. -If that does not work or if the CD-ROM is recognized but there are errors +more than one optical drive, try changing the disc to the other drive. +If that does not work or if the disc is recognized but there are errors when reading from it, try the suggestions listed below. Some basic knowledge of &arch-kernel; is required for this. To execute any of the commands, you should first switch to the second @@ -150,7 +149,7 @@ messages. After that, also check the output of <command>dmesg</command>. </para></listitem> <listitem><para> -Check in the output of <command>dmesg</command> if your CD-ROM drive was +Check in the output of <command>dmesg</command> if your optical drive was recognized. You should see something like (the lines do not necessarily have to be consecutive): @@ -162,7 +161,7 @@ sr0: scsi3-mmc drive: 24x/24x writer dvd-ram cd/rw xa/form2 cdda tray cdrom: Uniform CD-ROM driver Revision: 3.20 </screen></informalexample> -If you don't see something like that, chances are the controller your CD-ROM +If you don't see something like that, chances are the controller your drive is connected to was not recognized or may be not supported at all. If you know what driver is needed for the controller, you can try loading it manually using <command>modprobe</command>. @@ -170,7 +169,7 @@ using <command>modprobe</command>. </para></listitem> <listitem><para> -Check that there is a device node for your CD-ROM drive under +Check that there is a device node for your optical drive under <filename>/dev/</filename>. In the example above, this would be <filename>/dev/sr0</filename>. There should also be a <filename>/dev/cdrom</filename>. @@ -178,7 +177,7 @@ There should also be a <filename>/dev/cdrom</filename>. </para></listitem> <listitem><para> -Use the <command>mount</command> command to check if the CD-ROM is already +Use the <command>mount</command> command to check if the optical disc is already mounted; if not, try mounting it manually: <informalexample><screen> @@ -206,14 +205,14 @@ $ echo -n "using_dma:0" >settings </screen></informalexample> Make sure that you are in the directory for the device that corresponds -to your CD-ROM drive. +to your optical drive. </para></listitem> <listitem><para> If there are any problems during the installation, try checking the integrity -of the CD-ROM using the option near the bottom of the installer's main menu. -This option can also be used as a general test if the CD-ROM can be read +of the installation media using the option near the bottom of the installer's main menu. +This option can also be used as a general test if the disc can be read reliably. </para></listitem> @@ -511,7 +510,7 @@ installation reports, and file the report as a bug report against the <informalexample><screen> Package: installation-reports -Boot method: <How did you boot the installer? CD? USB stick? Network?> +Boot method: <How did you boot the installer? CD/DVD? USB stick? Network?> Image version: <Full URL to image you downloaded is best> Date: <Date and time of the install> @@ -525,19 +524,19 @@ Output of lspci -knn (or lspci -nn): Base System Installation Checklist: [O] = OK, [E] = Error (please elaborate below), [ ] = didn't try it -Initial boot: [ ] -Detect network card: [ ] -Configure network: [ ] -Detect CD: [ ] -Load installer modules: [ ] -Detect hard drives: [ ] -Partition hard drives: [ ] -Install base system: [ ] -Clock/timezone setup: [ ] -User/password setup: [ ] -Install tasks: [ ] -Install boot loader: [ ] -Overall install: [ ] +Initial boot: [ ] +Detect network card: [ ] +Configure network: [ ] +Detect installation medium: [ ] +Load installer modules: [ ] +Detect hard drives: [ ] +Partition hard drives: [ ] +Install base system: [ ] +Clock/timezone setup: [ ] +User/password setup: [ ] +Install tasks: [ ] +Install boot loader: [ ] +Overall install: [ ] Comments/Problems: diff --git a/en/boot-installer/x86.xml b/en/boot-installer/x86.xml index 0b88d2417..0e1e23beb 100644 --- a/en/boot-installer/x86.xml +++ b/en/boot-installer/x86.xml @@ -8,7 +8,7 @@ </sect2> - <sect2 arch="any-x86"><title>Booting from a CD-ROM</title> + <sect2 arch="any-x86"><title>Booting from optical disc (CD/DVD)</title> &boot-installer-intro-cd.xml; @@ -23,8 +23,7 @@ To start the installer from Windows, you can either <itemizedlist> <listitem><para> -obtain CD-ROM/DVD-ROM<phrase condition="bootable-usb"> or USB memory -stick</phrase> installation media as described in +obtain installation media as described in <xref linkend="official-cdrom"/><phrase condition="bootable-usb"> respective <xref linkend="boot-usb-files"/></phrase> or @@ -40,7 +39,7 @@ on the &debian; mirrors. </para><para> -If you use an installation CD or DVD, a pre-installation program should be +If you use optical installation media, 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 @@ -118,9 +117,9 @@ should do so with care. 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 -<literal>.iso</literal>). The installer can then boot from the drive -and install from the CD/DVD image, without needing the network. +copy an installation image to the hard drive (make sure the file is named ending in +<literal>.iso</literal>). The installer can then boot from the hard drive +and install from the installation image, without needing the network. </para> <para> @@ -379,7 +378,7 @@ questions can be displayed on a single screen. </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/DVD 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> diff --git a/en/hardware/installation-media.xml b/en/hardware/installation-media.xml index 0f9418a41..742a09e09 100644 --- a/en/hardware/installation-media.xml +++ b/en/hardware/installation-media.xml @@ -16,19 +16,13 @@ you reach that section. <sect2 arch="not-s390"><title>CD-ROM/DVD-ROM/BD-ROM</title> -<note><para> - -Whenever you see <quote>CD-ROM</quote> in this manual, it applies to -all of CD-ROMs, DVD-ROMs and BD-ROMs, because all these technologies -are really the same from the operating system's point of view. - -</para></note><para> +<para> -CD-ROM based installation is supported for most architectures. +Installation from optical disc is supported for most architectures. </para><para arch="x86"> -On PCs SATA, IDE/ATAPI, USB and SCSI CD-ROMs are supported, as are +On PCs SATA, IDE/ATAPI, USB and SCSI optical drives are supported, as are FireWire devices that are supported by the ohci1394 and sbp2 drivers. </para> @@ -50,7 +44,7 @@ IDE/ATAPI CD-ROMs are supported on all ARM machines. 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 an optical drive anymore at all and booting from USB media is the standard way of installing a new operating system on them. diff --git a/en/howto/installation-howto.xml b/en/howto/installation-howto.xml index fa8706968..a8c832868 100644 --- a/en/howto/installation-howto.xml +++ b/en/howto/installation-howto.xml @@ -37,16 +37,16 @@ on the OFTC network). <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 installation 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 -<ulink url="&url-debian-cd;">Debian CD page</ulink>. -For more information on where to get CDs, see <xref linkend="official-cdrom" />. +The debian-cd team provides builds of installation images using &d-i; on the +<ulink url="&url-debian-cd;">Debian CD/DVD page</ulink>. +For more information on where to get installation images, see <xref linkend="official-cdrom" />. </para><para> -Some installation methods require other images than CD images. +Some installation methods require other images than those for optical media. <phrase condition="unofficial-build"> The <ulink url="&url-d-i;">&d-i; home page</ulink> has links to other images. @@ -62,22 +62,22 @@ get for each possible means of installation. </para> <sect2 id="howto-getting-images-cdrom"> - <title>CDROM</title> + <title>Optical disc</title> <para> The netinst CD 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 +&releasename; with the &d-i;. This installation method is intended to boot from the image and install additional packages over a network; hence the name <quote>netinst</quote>. 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/DVD image which will not need the network +to install. You only need the first image of such 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 an optical disc. +<phrase arch="any-x86">To boot the disc, 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 @@ -98,10 +98,10 @@ can take with you anywhere. </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 or DVD 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 stick. This works because Debian CD/DVD images are +<quote>isohybrid</quote> images that can boot both from optical and USB drives. </para><para condition="isohybrid-unsupported"> @@ -164,8 +164,8 @@ For detailed instructions, see <xref linkend="install-tftp" />. 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/DVD image to the top-level directory of the hard disk. Make sure +that the 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. @@ -199,7 +199,7 @@ you know better. </para><para> Now sit back while debian-installer detects some of your hardware, and -loads the rest of itself from CD, USB, etc. +loads the rest of itself from the installation medium. </para><para> diff --git a/en/install-methods/boot-drive-files.xml b/en/install-methods/boot-drive-files.xml index 820dd659c..8e6707e92 100644 --- a/en/install-methods/boot-drive-files.xml +++ b/en/install-methods/boot-drive-files.xml @@ -13,7 +13,7 @@ system or by invoking a boot loader directly from the BIOS. 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. +and burning CD/DVD images. </para><para arch="powerpc"> @@ -87,7 +87,7 @@ from DOS using <command>loadlin</command>. </para><para> -Copy the following directories from a &debian; CD image to <filename>c:\</filename>. +Copy the following directories from a &debian; installation image to <filename>c:\</filename>. <itemizedlist> <listitem><para> diff --git a/en/install-methods/boot-usb-files.xml b/en/install-methods/boot-usb-files.xml index 66bddf200..c1e6d23d1 100644 --- a/en/install-methods/boot-usb-files.xml +++ b/en/install-methods/boot-usb-files.xml @@ -27,14 +27,14 @@ information on for example a hard disk could be lost. </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/DVD image</title> <para> -Debian CD and DVD images can now be written directly to a USB stick, +Debian installation 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 +an image (such as the netinst, CD, 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 an installation image. </para><para> @@ -45,9 +45,9 @@ directory (at the location mentioned in <xref linkend="where-files"/>). </para><para> -The CD or DVD image you choose should be written directly to the USB stick, +The installation 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 image file can be written to a USB stick as follows, after having made sure that the stick is unmounted: <informalexample><screen> @@ -66,7 +66,7 @@ Do not use tools like <command>unetbootin</command> which alter the image. </para></important><important><para> -Simply writing the CD or DVD image to USB like this should work fine +Simply writing the installation image to USB like this should work fine for most users. The other options below are more complex, mainly for people with specialised needs. @@ -111,7 +111,7 @@ USB stick should make the two partitions visible. <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 an installation 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"/>). @@ -160,7 +160,7 @@ After that, mount the USB memory stick 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 &debian; ISO image (netinst or full CD/DVD) to it. Unmount the stick (<userinput>umount /mnt</userinput>) and you are done. </para> diff --git a/en/install-methods/official-cdrom.xml b/en/install-methods/official-cdrom.xml index 4d9414823..8ab538d06 100644 --- a/en/install-methods/official-cdrom.xml +++ b/en/install-methods/official-cdrom.xml @@ -2,23 +2,23 @@ <!-- $Id$ --> <sect1 id="official-cdrom"> - <title>Official &debian-gnu; CD/DVD-ROM Sets</title> + <title>Official &debian-gnu; installation images</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 +By far the easiest way to install &debian-gnu; is from a set of official +&debian; installation images. You can buy a set of CD/DVD 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 +You may also download the installation images from a &debian; mirror and make your own set, if you have a fast network connection and a CD/DVD burner -(see the <ulink url="&url-debian-cd;">Debian CD page</ulink> and +(see the <ulink url="&url-debian-cd;">Debian CD/DVD 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 such optical installation media and those media 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 and DVD image, 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. +extent - even with only the first CD image. </para><para> @@ -30,16 +30,16 @@ the installation to download the remaining files or additional CDs. </para><para> -Also, keep in mind: if the CDs/DVDs you are using don't contain some packages +Also, keep in mind: if the installation media you are using don't contain some packages you need, you can always install those packages afterwards from your running new Debian system (after the installation has finished). If you need to know -on which CD/DVD to find a specific package, visit +on which installation image to find a specific package, visit <ulink url="https://cdimage-search.debian.org/">https://cdimage-search.debian.org/</ulink>. </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, +If your machine doesn't support booting from optical media<phrase arch="x86"> (only relevant +on very old PC systems)</phrase>, but you do have a set of CD/DVD, you can use an alternative strategy such as <phrase arch="s390">VM reader,</phrase> @@ -50,21 +50,21 @@ you can use an alternative strategy such as <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 disc 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 disc; the &debian; network archive and folder organization on the disc 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 installation media. </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 disc. </para><para> -If you don't have a CD set, then you will need to download the +If you don't have a installation media set, then you will need to download the installer system files and place them on the <phrase arch="s390">VM minidisk</phrase> diff --git a/en/install-methods/usb-setup/x86.xml b/en/install-methods/usb-setup/x86.xml index 102574876..fd6947340 100644 --- a/en/install-methods/usb-setup/x86.xml +++ b/en/install-methods/usb-setup/x86.xml @@ -115,7 +115,7 @@ If you used an <filename>hd-media</filename> image, you should now copy the ISO &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/DVD 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. diff --git a/en/preparing/bios-setup/i386.xml b/en/preparing/bios-setup/i386.xml index 73f29271d..264003c61 100644 --- a/en/preparing/bios-setup/i386.xml +++ b/en/preparing/bios-setup/i386.xml @@ -63,7 +63,7 @@ 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>. <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 installation 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 USB harddisk mode.</phrase> diff --git a/en/preparing/bios-setup/s390.xml b/en/preparing/bios-setup/s390.xml index a0cf8e648..0a7132eab 100644 --- a/en/preparing/bios-setup/s390.xml +++ b/en/preparing/bios-setup/s390.xml @@ -100,7 +100,7 @@ FTP. The installation server needs to copy the exact directory structure from any &debian-gnu; mirror, but only the S/390 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 images into such a directory tree. </para><para condition="FIXME"> diff --git a/en/using-d-i/loading-firmware.xml b/en/using-d-i/loading-firmware.xml index ff75bd668..4e60aa9d5 100644 --- a/en/using-d-i/loading-firmware.xml +++ b/en/using-d-i/loading-firmware.xml @@ -54,9 +54,9 @@ for <quote>firmware</quote>. <sect2><title>Preparing a medium</title> <para> -Official CD images do not include non-free firmware. The most common +Official installation images do not include non-free firmware. The most common method to load such firmware is from some removable medium such as a USB -stick. Alternatively, unofficial CD builds containing non-free firmware +stick. Alternatively, unofficial installation images containing non-free firmware can be found at <ulink url="&url-firmware-cds;"/>. To prepare a USB stick (or other medium like a hard drive partition), diff --git a/en/using-d-i/modules/apt-setup.xml b/en/using-d-i/modules/apt-setup.xml index fe9151b21..e7829cd3e 100644 --- a/en/using-d-i/modules/apt-setup.xml +++ b/en/using-d-i/modules/apt-setup.xml @@ -15,7 +15,7 @@ Note that the program which actually installs the packages is called <command>dpkg</command>. However, this program is more of a low-level tool. <command>apt</command> is a higher-level tool, which will invoke <command>dpkg</command> as appropriate. It knows how to retrieve -packages from your CD, the network, or wherever. It is also able to +packages from your installation media, the network, or wherever. It is also able to automatically install other packages which are required to make the package you're trying to install work correctly. </para> @@ -54,18 +54,18 @@ sections of the archive. </para> <sect4 id="apt-setup-cdset"> - <title>Installing from more than one CD or DVD</title> + <title>Installing from more than one CD or DVD image</title> <para> -If you are installing from a CD or a DVD that is part of a larger set, -the installer will ask if you want to scan additional CDs or DVDs. -If you have additional CDs or DVDs available, you probably want to do +If you are installing from a CD or DVD image that is part of a larger set, +the installer will ask if you want to scan additional installation media. +If you have such additional media available, you probably want to do this so the installer can use the packages included on them. </para><para> -If you do not have any additional CDs or DVDs, that is no problem: using +If you do not have any additional media, that is no problem: using them is not required. If you also do not use a network mirror (as explained in the next section), it can mean that not all packages belonging to the tasks you select in the next step of the installation can be installed. @@ -73,10 +73,10 @@ tasks you select in the next step of the installation can be installed. </para> <note><para> -Packages are included on CDs (and DVDs) in the order of their popularity. -This means that for most uses only the first CDs in a set are needed and +Packages are included on CD and DVD images in the order of their popularity. +This means that for most uses only the first image of a set is needed and that only very few people actually use any of the packages included on the -last CDs in a set. +last images of a set. </para><para> @@ -90,9 +90,9 @@ will cover most needs. </para></note> <para> -If you do scan multiple CDs or DVDs, the installer will prompt you to -exchange them when it needs packages from another CD/DVD than the one -currently in the drive. Note that only CDs or DVDs that belong to the +If you do scan multiple installation media, the installer will prompt you to +exchange them when it needs packages from another media than the one +currently in the drive. Note that only discs that belong to the same set should be scanned. The order in which they are scanned does not really matter, but scanning them in ascending order will reduce the chance of mistakes. @@ -112,7 +112,7 @@ answer should be fine, but there are some exceptions. </para><para> If you are <emphasis>not</emphasis> installing from a full CD or DVD or -using a full CD/DVD image, you really should use a network mirror as +a corresponding image, you really should use a network mirror as otherwise you will end up with only a very minimal system. However, if you have a limited Internet connection it is best <emphasis>not</emphasis> to select the <literal>desktop</literal> task in the next step of the @@ -120,26 +120,26 @@ installation. </para><para> -If you are installing from a single full CD or using a full CD image, using +If you are installing from a single full CD or the corresponding image, using a network mirror is not required, but is still strongly recommended because -a single CD contains only a fairly limited number of packages. +a single CD image contains only a fairly limited number of packages. If you have a limited Internet connection it may still be best to <emphasis>not</emphasis> select a network mirror here, but to finish the -installation using only what's available on the CD and selectively install +installation using only what's available on the CD image and selectively install additional packages after the installation (i.e. after you have rebooted into the new system). </para><para> -If you are installing from a DVD or using a DVD image, any packages needed -during the installation should be present on the first DVD. The same is true -if you have scanned multiple CDs as explained in the previous section. Use +If you are installing from a DVD or the corresponding image, any packages needed +during the installation should be present on the first DVD (image). The same is true +if you have scanned multiple CD (images) as explained in the previous section. Use of a network mirror is optional. </para><para> -One advantage of adding a network mirror is that updates that have occurred -since the CD/DVD set was created and have been included in a point release, +One advantage of adding a network mirror is that updates, that have occurred +since the CD/DVD images were created and have been included in a point release, will become available for installation, thus extending the life of your CD/DVD set without compromising the security or stability of the installed system. @@ -147,7 +147,7 @@ set without compromising the security or stability of the installed system. In summary: selecting a network mirror is generally a good idea, except if you do not have a good Internet connection. If the current version of -a package is available from CD/DVD, the installer will always use that. +a package is available from installation media, the installer will always use that. The amount of data that will be downloaded if you do select a mirror thus depends on @@ -164,12 +164,12 @@ which packages are needed for those tasks, </para></listitem> <listitem><para> -which of those packages are present on the CDs or DVDs you have scanned, and +which of those packages are present on the installation media you have scanned, and </para></listitem> <listitem><para> -whether any updated versions of packages included on the CDs or DVDs are +whether any updated versions of packages included on the installation media are available from a mirror (either a regular package mirror, or a mirror for security or stable-updates). diff --git a/en/using-d-i/modules/network-console.xml b/en/using-d-i/modules/network-console.xml index e92334c06..b8dee287c 100644 --- a/en/using-d-i/modules/network-console.xml +++ b/en/using-d-i/modules/network-console.xml @@ -19,9 +19,9 @@ the networking. (Although you can automate that part with This component is not loaded into the main installation menu by default, so you have to explicitly ask for it. -If you are installing from CD, you need to boot with medium priority or +If you are installing from optical media, you need to boot with medium priority or otherwise invoke the main installation menu and choose <guimenuitem>Load -installer components from CD</guimenuitem> and from the list of +installer components from installation media</guimenuitem> and from the list of additional components select <guimenuitem>network-console: Continue installation remotely using SSH</guimenuitem>. Successful load is indicated by a new menu entry called <guimenuitem>Continue diff --git a/en/using-d-i/modules/pkgsel.xml b/en/using-d-i/modules/pkgsel.xml index 308c32d3d..37f34aa81 100644 --- a/en/using-d-i/modules/pkgsel.xml +++ b/en/using-d-i/modules/pkgsel.xml @@ -70,8 +70,8 @@ desktops, but some combinations of desktop may not be co-installable. Note that this will only work if the packages needed for the desired desktop environment are actually available. If you are installing using a single full CD image, they will possibly need to be downloaded from a network mirror as -some of the needed packages for your choice might only be included on later -CDs. Installing any of the available desktop environments this way should +they might not be available on the CD image due to its limited amount of space. +Installing any of the available desktop environments this way should work fine if you are using a DVD image or any other installation method. </para></note> diff --git a/en/using-d-i/using-d-i.xml b/en/using-d-i/using-d-i.xml index f0389d81e..f2e8faf47 100644 --- a/en/using-d-i/using-d-i.xml +++ b/en/using-d-i/using-d-i.xml @@ -229,7 +229,7 @@ cards, disk drives, and PCMCIA. <term>cdrom-detect</term><listitem><para> -Looks for and mounts a &debian; installation CD. +Looks for and mounts a &debian; installation media. </para></listitem> </varlistentry> @@ -263,8 +263,8 @@ the source of his installation packages. <term>cdrom-checker</term><listitem><para> -Checks integrity of a CD-ROM. This way, the user may assure him/herself -that the installation CD-ROM was not corrupted. +Checks integrity of installation media. This way, the user may assure him/herself +that the installation image was not corrupted. </para></listitem> </varlistentry> @@ -283,7 +283,7 @@ cost of some features). <term>anna</term><listitem><para> Anna's Not Nearly APT. Installs packages which have been retrieved -from the chosen mirror or CD. +from the chosen mirror or installation medium. </para></listitem> </varlistentry> diff --git a/en/welcome/about-copyright.xml b/en/welcome/about-copyright.xml index 5ebcb41bd..d818acd35 100644 --- a/en/welcome/about-copyright.xml +++ b/en/welcome/about-copyright.xml @@ -21,7 +21,7 @@ and use the system comes directly from &debian; being based on </para><para> Calling software <emphasis>free</emphasis> doesn't mean that the software isn't -copyrighted, and it doesn't mean that CDs/DVDs containing that software +copyrighted, and it doesn't mean that installation media containing that software must be distributed at no charge. Free software, in part, means that the licenses of individual programs do not require you to pay for the privilege of distributing or using those programs. Free software also diff --git a/en/welcome/doc-organization.xml b/en/welcome/doc-organization.xml index 172a6b85f..394910152 100644 --- a/en/welcome/doc-organization.xml +++ b/en/welcome/doc-organization.xml @@ -59,7 +59,7 @@ Perform the actual installation according to <xref linkend="d-i-intro"/>. This involves choosing your language, configuring peripheral driver modules, configuring your network connection, so that remaining installation files can be obtained -directly from a &debian; server (if you are not installing from a CD/DVD set), +directly from a &debian; server (if you are not installing from a set of CD/DVD installation images), partitioning your hard drives and installation of a base system, then selection and installation of tasks. (Some background about setting up the partitions for your &debian; diff --git a/en/welcome/getting-newest-inst.xml b/en/welcome/getting-newest-inst.xml index f424b6efa..30ce767b9 100644 --- a/en/welcome/getting-newest-inst.xml +++ b/en/welcome/getting-newest-inst.xml @@ -7,7 +7,7 @@ <para> For information on how to download &debian-gnu; from the Internet -or from whom official &debian; CDs can be purchased, see the +or from whom official &debian; installation media can be purchased, see the <ulink url="&url-debian-distrib;">distribution web page</ulink>. The <ulink url="&url-debian-mirrors;">list of &debian; mirrors</ulink> contains a full set of official &debian; |