summaryrefslogtreecommitdiff
path: root/en
diff options
context:
space:
mode:
authorFrans Pop <elendil@planet.nl>2006-04-27 09:33:13 +0000
committerFrans Pop <elendil@planet.nl>2006-04-27 09:33:13 +0000
commite503384da56bdeb5bccc946e94c5c1e1b986640a (patch)
tree0e6e44f198abd1161519c4db7fbbe40e4e7ba170 /en
parent2df31b5466368bda8354964b9f162d8c6d78cfa8 (diff)
downloadinstallation-guide-e503384da56bdeb5bccc946e94c5c1e1b986640a.zip
Various corrections suggested by Clytie Siddall (and one by Jens Seidel)
Diffstat (limited to 'en')
-rw-r--r--en/hardware/installation-media.xml16
-rw-r--r--en/hardware/network-cards.xml2
-rw-r--r--en/hardware/supported-peripherals.xml4
-rw-r--r--en/hardware/supported/m68k.xml2
-rw-r--r--en/hardware/supported/mipsel.xml6
-rw-r--r--en/partitioning/partition-programs.xml14
-rw-r--r--en/preparing/bios-setup/i386.xml8
-rw-r--r--en/preparing/bios-setup/powerpc.xml3
-rw-r--r--en/preparing/bios-setup/s390.xml2
-rw-r--r--en/preparing/bios-setup/sparc.xml6
-rw-r--r--en/preparing/nondeb-part/i386.xml5
11 files changed, 33 insertions, 35 deletions
diff --git a/en/hardware/installation-media.xml b/en/hardware/installation-media.xml
index 2aca9ef9e..cade1842f 100644
--- a/en/hardware/installation-media.xml
+++ b/en/hardware/installation-media.xml
@@ -83,7 +83,7 @@ On RiscPCs, SCSI CD-ROMs are also supported.
On SGI machines, booting from CD-ROM requires a SCSI CD-ROM drive
capable of working with a logical blocksize of 512 bytes. Many of the
-SCSI CD-DROM drives sold for the PC market do not have this
+SCSI CD-ROM drives sold on the PC market do not have this
capability. If your CD-ROM drive has a jumper labeled
<quote>Unix/PC</quote> or <quote>512/2048</quote>, place it in the
<quote>Unix</quote> or <quote>512</quote> position.
@@ -98,7 +98,7 @@ IDE, SATA or SCSI card.
On DECstations, booting from CD-ROM requires a SCSI CD-ROM drive
capable of working with a logical blocksize of 512 bytes. Many of the
-SCSI CD-DROM drives sold for the PC market do not have this capability.
+SCSI CD-ROM drives sold on the PC market do not have this capability.
If your CD-ROM drive has a jumper labeled <quote>Unix/PC</quote> or
<quote>512/2048</quote>, place it in the <quote>Unix</quote> or
<quote>512</quote> position.
@@ -218,15 +218,15 @@ installed on the widest array of hardware.
Generally, the Debian installation system includes support for floppies,
IDE drives, IDE floppies, parallel port IDE devices, SCSI controllers and
-drives, USB, and FireWire. The file systems supported include FAT,
-Win-32 FAT extensions (VFAT), and NTFS, among others.
+drives, USB, and FireWire. The supported file systems include FAT,
+Win-32 FAT extensions (VFAT) and NTFS.
</para><para arch="i386">
-The disk interfaces that emulate the <quote>AT</quote> hard disk interface
-which are often called MFM, RLL, IDE, or ATA are supported. Very old 8 bit
-hard disk controllers used in the IBM XT computer are supported only
-as a module. SCSI disk controllers from many different manufacturers
+Disk interfaces that emulate the <quote>AT</quote> hard disk interface
+&mdash; often called MFM, RLL, IDE, or ATA &mdash; are supported. Very old
+8&ndash;bit hard disk controllers used in the IBM XT computer are supported
+only as a module. SCSI disk controllers from many different manufacturers
are supported. See the
<ulink url="&url-hardware-howto;">Linux Hardware Compatibility HOWTO</ulink>
for more details.
diff --git a/en/hardware/network-cards.xml b/en/hardware/network-cards.xml
index 681c98358..69b7ed1aa 100644
--- a/en/hardware/network-cards.xml
+++ b/en/hardware/network-cards.xml
@@ -124,7 +124,7 @@ do not work.
</para><para arch="s390">
-Any network interface card (NIC) supported by the Linux kernel are
+Any network interface card (NIC) supported by the Linux kernel is
also be supported by the boot disks. All network drivers are compiled
as modules so you need to load one first during the initial network
setup. The list of supported network devices is:
diff --git a/en/hardware/supported-peripherals.xml b/en/hardware/supported-peripherals.xml
index 169f22266..f2ca41329 100644
--- a/en/hardware/supported-peripherals.xml
+++ b/en/hardware/supported-peripherals.xml
@@ -145,8 +145,8 @@ their hardware.
</para><para>
-You can help this situation by encouraging these manufacturers to
-release the documentation and other resources necessary for us to
+You can help improve this situation by encouraging these manufacturers
+to release the documentation and other resources necessary for us to
program their hardware, but the best strategy is simply to avoid this
sort of hardware until it is listed as working in the
<ulink url="&url-hardware-howto;">Linux Hardware Compatibility HOWTO</ulink>.
diff --git a/en/hardware/supported/m68k.xml b/en/hardware/supported/m68k.xml
index 92c8030d3..6f33d20e3 100644
--- a/en/hardware/supported/m68k.xml
+++ b/en/hardware/supported/m68k.xml
@@ -19,7 +19,7 @@ and excludes the <quote>EC</quote> line of 680x0 processors. See the
</para><para>
-There are four major flavors of supported
+There are four major supported
<emphasis>&architecture;</emphasis> flavors: Amiga, Atari, Macintosh
and VME machines. Amiga and Atari were the first two systems to which
Linux was ported; in keeping, they are also the two most
diff --git a/en/hardware/supported/mipsel.xml b/en/hardware/supported/mipsel.xml
index 83f2ca425..99888bde5 100644
--- a/en/hardware/supported/mipsel.xml
+++ b/en/hardware/supported/mipsel.xml
@@ -121,13 +121,13 @@ which are supported in SMP mode.
<sect3><title>Supported console options</title>
<para>
-Serial console is available on all supported DECstations (9600 bps,
-8N1). For using serial console, you have to boot the installer image
+A serial console is available on all supported DECstations (9600 bps,
+8N1). To use the serial console, you have to boot the installer image
with the <literal>console=ttyS</literal><replaceable>x</replaceable> kernel
parameter (with <replaceable>x</replaceable> being the number
of the serial port you have your terminal connected to &mdash; usually
<literal>2</literal>, but <literal>0</literal> for the Personal DECstations).
-On 3MIN and 3MAX+ (DECstation 5000/1xx, 5000/240 and 5000/260) local console
+On 3MIN and 3MAX+ (DECstation 5000/1xx, 5000/240 and 5000/260) a local console
is available with the PMAG-BA and the PMAGB-B graphics options.
</para><para>
diff --git a/en/partitioning/partition-programs.xml b/en/partitioning/partition-programs.xml
index aa37edf13..8cd19e989 100644
--- a/en/partitioning/partition-programs.xml
+++ b/en/partitioning/partition-programs.xml
@@ -110,13 +110,9 @@ Device Drivers and Installation Commands</ulink> for details.
<para>
One of these programs will be run by default when you select
-<guimenuitem>Partition a Hard Disk</guimenuitem>. If the one which is run
-by default isn't the one you want, quit the partitioner, go to the shell
-(<userinput>tty2</userinput>) by pressing <keycap>Alt</keycap>
-and <keycap>F2</keycap> keys together, and manually type in the
-name of the program you want to use (and arguments, if any). Then
-skip the <guimenuitem>Partition a Hard Disk</guimenuitem> step in
-<command>debian-installer</command> and continue to the next step.
+<guimenuitem>Partition disks</guimenuitem> (or similar). It may be possible
+to use a different partitioning tool from the command line on VT2, but this
+is not recommended.
</para><para>
@@ -124,8 +120,8 @@ If you will be working with more than 20 partitions on your ide disk,
you will need to create devices for partitions 21 and beyond. The next
step of initializing the partition will fail unless a proper device is
present. As an example, here are commands you can use in
-<userinput>tty2</userinput> or under Execute A Shell to add a device
-so the 21st partition can be initialized:
+<userinput>tty2</userinput> or under <guimenuitem>Execute a shell</guimenuitem>
+to add a device so the 21st partition can be initialized:
<informalexample><screen>
# cd /dev
diff --git a/en/preparing/bios-setup/i386.xml b/en/preparing/bios-setup/i386.xml
index ed548ce9f..e5e884612 100644
--- a/en/preparing/bios-setup/i386.xml
+++ b/en/preparing/bios-setup/i386.xml
@@ -124,10 +124,10 @@ controller.
</para><para>
-Other popular option is to boot from a USB storage (also called USB
-memory stick or USB key). Some BIOSes can boot USB storage directly,
-and some cannot. You may need to configure your BIOS to boot from
-a <quote>Removable drive</quote> or even a <quote>USB-ZIP</quote> to
+Another popular option is to boot from a USB storage device (also called
+a USB memory stick or USB key). Some BIOSes can boot directly from a USB
+storage device, but some cannot. You may need to configure your BIOS to boot
+from a <quote>Removable drive</quote> or even from <quote>USB-ZIP</quote> to
get it to boot from the USB device.
</para><para>
diff --git a/en/preparing/bios-setup/powerpc.xml b/en/preparing/bios-setup/powerpc.xml
index b676a03bd..6011e6900 100644
--- a/en/preparing/bios-setup/powerpc.xml
+++ b/en/preparing/bios-setup/powerpc.xml
@@ -46,7 +46,8 @@ patch is included in the <application>System Disk 2.3.1</application>
utility, available from Apple at
<ulink url="ftp://ftp.apple.com/developer/macosxserver/utilities/SystemDisk2.3.1.smi.bin"></ulink>.
After unpacking the utility in MacOS, and launching it, select the
-Save button to have the firmware patches installed to nvram.
+<guibutton>Save button</guibutton> to have the firmware patches
+installed to nvram.
</para>
</sect2>
diff --git a/en/preparing/bios-setup/s390.xml b/en/preparing/bios-setup/s390.xml
index 7da892259..cd36b61ef 100644
--- a/en/preparing/bios-setup/s390.xml
+++ b/en/preparing/bios-setup/s390.xml
@@ -94,7 +94,7 @@ FTP.
</para><para>
The installation server needs to copy the exact directory structure
-from any &debian; mirror but of only the s390 and
+from any &debian; 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.
diff --git a/en/preparing/bios-setup/sparc.xml b/en/preparing/bios-setup/sparc.xml
index 6b222a142..e0dfe0bbf 100644
--- a/en/preparing/bios-setup/sparc.xml
+++ b/en/preparing/bios-setup/sparc.xml
@@ -10,7 +10,7 @@ OpenBoot provides the basic functions needed to boot the &arch-title;
architecture. This is rather similar in function to the BIOS in the
x86 architecture, although much nicer. The Sun boot PROMs have a
built-in forth interpreter which lets you do quite a number of things
-with your machine, such as diagnostics, simple scripts, etc.
+with your machine, such as diagnostics and simple scripts.
</para><para>
@@ -41,7 +41,7 @@ emulator if you are using a different program.
You can use OpenBoot to boot from specific devices, and also to change
your default boot device. However, you need to know some details
-about how OpenBoot names devices; it's much different from Linux
+about how OpenBoot names devices; it's considerably different from Linux
device naming, described in <xref linkend="device-names"/>.
Also, the command will vary a bit, depending on what version of
OpenBoot you have. More information about OpenBoot can be found in
@@ -49,7 +49,7 @@ the <ulink url="&url-openboot;">Sun OpenBoot Reference</ulink>.
</para><para>
-Typically, with newer revisions, you can use OpenBoot device such as
+Typically, with newer revisions, you can use OpenBoot devices such as
<quote>floppy</quote>, <quote>cdrom</quote>, <quote>net</quote>,
<quote>disk</quote>, or <quote>disk2</quote>. These have the obvious
meanings; the <quote>net</quote> device is for booting from the network.
diff --git a/en/preparing/nondeb-part/i386.xml b/en/preparing/nondeb-part/i386.xml
index 5509b3d27..3846cec48 100644
--- a/en/preparing/nondeb-part/i386.xml
+++ b/en/preparing/nondeb-part/i386.xml
@@ -108,8 +108,9 @@ other weird errors in DOS or Windows.
</para><para>
Apparently, whenever you create or resize a partition for DOS use,
-it's a good idea to fill the first few sectors with zeros. Do this
-prior to running DOS's <command>format</command> command, from Linux:
+it's a good idea to fill the first few sectors with zeros. You should do
+this prior to running DOS's <command>format</command> command by executing
+the following command from Linux:
<informalexample><screen>
# dd if=/dev/zero of=/dev/hdXX bs=512 count=4