diff options
Diffstat (limited to 'en')
-rw-r--r-- | en/install-methods/boot-drive-files.xml | 6 | ||||
-rw-r--r-- | en/install-methods/boot-usb-files.xml | 24 | ||||
-rw-r--r-- | en/install-methods/create-floppy.xml | 11 | ||||
-rw-r--r-- | en/install-methods/install-tftp.xml | 26 | ||||
-rw-r--r-- | en/install-methods/ipl-tape.xml | 2 | ||||
-rw-r--r-- | en/install-methods/tftp/bootp.xml | 12 | ||||
-rw-r--r-- | en/install-methods/usb-setup/i386.xml | 2 |
7 files changed, 43 insertions, 40 deletions
diff --git a/en/install-methods/boot-drive-files.xml b/en/install-methods/boot-drive-files.xml index acde0cb56..39c36d50e 100644 --- a/en/install-methods/boot-drive-files.xml +++ b/en/install-methods/boot-drive-files.xml @@ -163,9 +163,9 @@ of your hard drive (this can be accomplished by Make a note of the partition number of the MacOS partition where you place these files. If you have the MacOS <command>pdisk</command> -program, you can use the L command to check for the partition -number. You will need this partition number for the command you type -at the Open Firmware prompt when you boot the installer. +program, you can use the <command>L</command> command to check for the +partition number. You will need this partition number for the command +you type at the Open Firmware prompt when you boot the installer. </para><para> diff --git a/en/install-methods/boot-usb-files.xml b/en/install-methods/boot-usb-files.xml index 78615be96..22399fedc 100644 --- a/en/install-methods/boot-usb-files.xml +++ b/en/install-methods/boot-usb-files.xml @@ -6,17 +6,17 @@ <para> -For preparing the USB stick you will need a system where GNU/Linux is +To prepare the USB stick, you will need a system where GNU/Linux is already running and where USB is supported. You should ensure that the usb-storage kernel module is loaded (<userinput>modprobe usb-storage</userinput>) and try to find out which SCSI device the USB stick has been mapped to (in this example <filename>/dev/sda</filename> is used). To write to your stick, you -will probably have to turn off its write protection switch. +may have to turn off its write protection switch. </para><para> -Note, that the USB stick should be at least 128 MB in size (smaller +Note that the USB stick should be at least 128 MB in size (smaller setups are possible if you follow <xref linkend="usb-copy-flexible"/>). </para> @@ -81,12 +81,15 @@ should use the following method to put the files on your stick. &usb-setup-i386.xml; &usb-setup-powerpc.xml; - <sect3> + </sect2> + <sect2> <title>Adding an ISO image</title> <para> -Now you should put any Debian ISO image (businesscard, netinst or even -a full one) onto your stick (if it fits). The file name of such an +The installer will look for a Debian ISO image on the stick as its source +for additional data needed for the installation. So your next step is to +copy a Debian ISO image (businesscard, netinst or even a full CD image) +onto your stick (be sure to select one that fits). The file name of the image must end in <filename>.iso</filename>. </para><para> @@ -104,11 +107,11 @@ When you are done, unmount the USB memory stick (<userinput>umount /mnt</userinput>) and activate its write protection switch. </para> - </sect3> + </sect2> - <!-- TODO: doesn't this section belong later? --> - <sect3 arch="i386"> - <title>Booting the USB stick</title> + <!-- TODO: doesn't this section belong later? --> + <sect2 arch="i386"> + <title>Booting the USB stick</title> <warning><para> If your system refuses to boot from the memory stick, the stick may @@ -121,6 +124,5 @@ contain an invalid master boot record (MBR). To fix this, use the </screen></informalexample> </para></warning> - </sect3> </sect2> </sect1> diff --git a/en/install-methods/create-floppy.xml b/en/install-methods/create-floppy.xml index 433c91697..2b31174e1 100644 --- a/en/install-methods/create-floppy.xml +++ b/en/install-methods/create-floppy.xml @@ -10,11 +10,12 @@ installer on hardware that cannot boot from CD or by other means. </para><para arch="powerpc"> -Floppy disk booting reportedly fails on Mac USB floppy drives. +Booting the installer from floppy disk reportedly fails on Mac USB +floppy drives. </para><para arch="m68k"> -Floppy disk booting is not supported on Amigas or +Booting the installer from floppy disk is not supported on Amigas or 68k Macs. </para><para> @@ -30,9 +31,9 @@ floppy. </para><para> -There are different techniques for creating floppies from disk images, -which depend on your platform. This section describes how to create -floppies from disk images on different platforms. +There are different techniques for creating floppies from disk images. +This section describes how to create floppies from disk images on +different platforms. </para><para> diff --git a/en/install-methods/install-tftp.xml b/en/install-methods/install-tftp.xml index 0926ed5dc..45ad26d1b 100644 --- a/en/install-methods/install-tftp.xml +++ b/en/install-methods/install-tftp.xml @@ -186,7 +186,8 @@ to <command>tftpd</command> as the filename to boot. For DECstations, there are tftpimage files for each subarchitecture, which contain both kernel and installer in one file. The naming -convention is <replaceable>subarchitecture</replaceable>/netboot-boot.img. +convention is +<filename><replaceable>subarchitecture</replaceable>/netboot-boot.img</filename>. Copy the tftpimage file you would like to use to <userinput>/tftpboot/tftpboot.img</userinput> if you work with the example BOOTP/DHCP setups described above. @@ -262,22 +263,21 @@ these methods. <title>SPARC TFTP Booting</title> <para> -SPARC architectures for instance use the subarchitecture names, such -as <quote>SUN4M</quote> or <quote>SUN4C</quote>; in some cases, the -architecture is left blank, so the file the client looks for is just -<filename>client-ip-in-hex</filename>. Thus, if your system -subarchitecture is a SUN4C, and its IP is 192.168.1.3, the filename -would be <filename>C0A80103.SUN4C</filename>. An easy way to determine -this is to enter the following command in a shell (assuming the -machine's intended IP is 10.0.0.4). +Some SPARC architectures add the subarchitecture names, such as +<quote>SUN4M</quote> or <quote>SUN4C</quote>, to the filename. Thus, +if your system's subarchitecture is a SUN4C, and its IP is 192.168.1.3, +the filename would be <filename>C0A80103.SUN4C</filename>. However, +there are also subarchitectures where the file the client looks for is +just <filename>client-ip-in-hex</filename>. An easy way to determine the +hexadecimal code for the IP address is to enter the following command +in a shell (assuming the machine's intended IP is 10.0.0.4). <informalexample><screen> $ printf '%.2x%.2x%.2x%.2x\n' 10 0 0 4 </screen></informalexample> -This will spit out the IP in hexadecimal; to get to the correct -filename, you will need to change all letters to uppercase and -if necessary append the subarchitecture name. +To get to the correct filename, you will need to change all letters to +uppercase and if necessary append the subarchitecture name. </para><para> @@ -325,7 +325,7 @@ the <userinput>filename=</userinput> option in <para> You don't have to configure DHCP in a special way because you'll pass the -full path of the file to the loaded to CFE. +full path of the file to be loaded to CFE. </para> </sect3> diff --git a/en/install-methods/ipl-tape.xml b/en/install-methods/ipl-tape.xml index 383a302fc..fe8080e79 100644 --- a/en/install-methods/ipl-tape.xml +++ b/en/install-methods/ipl-tape.xml @@ -17,7 +17,7 @@ need to write to the tape are (in this order): <filename>parmfile.debian</filename> and <filename>initrd.debian</filename>. The files can be downloaded from the <filename>tape</filename> sub-directory, see -<xref linkend="where-files"/>, +<xref linkend="where-files"/>. </para> </sect1> diff --git a/en/install-methods/tftp/bootp.xml b/en/install-methods/tftp/bootp.xml index 0f1fb963d..cda0f9c66 100644 --- a/en/install-methods/tftp/bootp.xml +++ b/en/install-methods/tftp/bootp.xml @@ -6,11 +6,11 @@ <title>Setting up BOOTP server</title> <para> -There are two BOOTP servers available for GNU/Linux, the CMU -<command>bootpd</command> and the other is actually a DHCP server, ISC -<command>dhcpd</command>, which are contained in the +There are two BOOTP servers available for GNU/Linux. The first is CMU +<command>bootpd</command>. The other is actually a DHCP server: ISC +<command>dhcpd</command>. In &debian; these are contained in the <classname>bootp</classname> and <classname>dhcp</classname> packages -in &debian;. +respectively. </para><para> @@ -18,8 +18,8 @@ To use CMU <command>bootpd</command>, you must first uncomment (or add) the relevant line in <filename>/etc/inetd.conf</filename>. On &debian;, you can run <userinput>update-inetd --enable bootps</userinput>, then <userinput>/etc/init.d/inetd -reload</userinput> to do so. Elsewhere, the line in question should -look like: +reload</userinput> to do so. Just in case your BOOTP server does not +run Debian, the line in question should look like: <informalexample><screen> bootps dgram udp wait root /usr/sbin/bootpd bootpd -i -t 120 diff --git a/en/install-methods/usb-setup/i386.xml b/en/install-methods/usb-setup/i386.xml index 47c81e4ec..567a5e837 100644 --- a/en/install-methods/usb-setup/i386.xml +++ b/en/install-methods/usb-setup/i386.xml @@ -13,7 +13,7 @@ instead of the entire device. Since most USB sticks come pre-configured with a single FAT16 partition, you probably won't have to repartition or reformat the stick. If you have to do that anyway, use <command>cfdisk</command> -or any other partitioning tool for creating a FAT16 partition and then +or any other partitioning tool to create a FAT16 partition, and then create the filesystem using: <informalexample><screen> |