Update of original English docs

35 files changed, 207 insertions, 204 deletions

diff --git a/fi/appendix/chroot-install.xml b/fi/appendix/chroot-install.xml
index e5df2d236..cd72a3a88 100644
--- a/fi/appendix/chroot-install.xml
+++ b/fi/appendix/chroot-install.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 34713 untranslated -->
+<!-- original version: 36758 untranslated -->
 
  <sect1 id="linux-upgrade">
  <title>Installing &debian; from a Unix/Linux System</title>
@@ -284,8 +284,9 @@ configured for the next reboot.
 
 To configure networking, edit
 <filename>/etc/network/interfaces</filename>,
-<filename>/etc/resolv.conf</filename>, and
-<filename>/etc/hostname</filename>.
+<filename>/etc/resolv.conf</filename>,
+<filename>/etc/hostname</filename> and
+<filename>/etc/hosts</filename>.
 
 <informalexample><screen>
 # editor /etc/network/interfaces
@@ -380,13 +381,13 @@ If you intend to boot this system, you probably want a Linux kernel
 and a boot loader. Identify available pre-packaged kernels with
 
 <informalexample><screen>
-# apt-cache search kernel-image
+# apt-cache search <phrase condition="classic-kpkg">kernel</phrase><phrase condition="common-kpkg">linux</phrase>-image
 </screen></informalexample>
 
 Then install your choice using its package name.
 
 <informalexample><screen>
-# apt-get install kernel-image-<replaceable>2.X.X-arch-etc</replaceable>
+# apt-get install <phrase condition="classic-kpkg">kernel</phrase><phrase condition="common-kpkg">linux</phrase>-image-<replaceable>&kernelversion;-arch-etc</replaceable>
 </screen></informalexample>
 
 </para>
diff --git a/fi/appendix/preseed.xml b/fi/appendix/preseed.xml
index 17be3b04b..b64c281f2 100644
--- a/fi/appendix/preseed.xml
+++ b/fi/appendix/preseed.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 36269 untranslated -->
+<!-- original version: 36758 untranslated -->
 
 <!--
 Be carefull with the format of this file as it is parsed to generate
@@ -380,6 +380,14 @@ can still be fully automated, since you can pass preseed values to the kernel
 on the command line. Just pass <userinput>path/to/var=value</userinput>
 for any of the preseed variables listed in the examples.
 
+</para><para>
+
+A <quote>&ndash;&ndash;</quote> in the boot options has special meaning.
+Kernel parameters that appear after it will be copied into the installed
+bootloader configuration (if supported by the installer for the
+bootloader). Note that the <quote>&ndash;&ndash;</quote> may already be
+present in the default boot parameters.
+
 </para>
 <note><para>
 
@@ -909,31 +917,37 @@ Available tasks as of this writing include:
 
 <itemizedlist>
 <listitem><para>
-  <userinput>Standard system</userinput>
+  <userinput>standard</userinput>
+</para></listitem>
+<listitem><para>
+  <userinput>desktop</userinput>
+</para></listitem>
+<listitem><para>
+  <userinput>gnome-desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>Desktop environment</userinput>
+  <userinput>kde-desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>Web server</userinput>
+  <userinput>web-server</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>Print server</userinput>
+  <userinput>print-server</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>DNS server</userinput>
+  <userinput>dns-server</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>File server</userinput>
+  <userinput>file-server</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>Mail server</userinput>
+  <userinput>mail-server</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>SQL database</userinput>
+  <userinput>sql-database</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>Laptop</userinput>
+  <userinput>laptop</userinput>
 </para></listitem>
 </itemizedlist>
 
@@ -941,13 +955,14 @@ Available tasks as of this writing include:
 
 You can also choose to install no tasks, and force the installation of a
 set of packages in some other way. We recommend always including the
-<userinput>Standard system</userinput> task.
+<userinput>standard</userinput> task.
 
 </para>
 
 <informalexample role="example"><screen>
-tasksel tasksel/first multiselect Standard system, Desktop environment
-#tasksel tasksel/first multiselect Standard system, Web server
+tasksel tasksel/first multiselect standard, desktop
+#tasksel tasksel/first multiselect standard, web-server
+#tasksel tasksel/first multiselect standard, kde-desktop
 
 # 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,
diff --git a/fi/boot-installer/i386.xml b/fi/boot-installer/i386.xml
index 709718c2b..24560c444 100644
--- a/fi/boot-installer/i386.xml
+++ b/fi/boot-installer/i386.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 33886 untranslated -->
+<!-- original version: 36744 untranslated -->
 
   <sect2 arch="i386"><title>Booting from a CD-ROM</title>
 
@@ -203,15 +203,6 @@ computer.  The system should boot up, and you should be presented with
 the <prompt>boot:</prompt> prompt.  Here you can enter optional boot
 arguments, or just hit &enterkey;.
 
-</para><para condition="supports-floppy-boot">
-
-In case your computer doesn't support booting from USB memory devices,
-you can still use a single floppy to do the initial boot and then
-switch to USB. Boot your system as described in <xref linkend="floppy-boot"/>;
-the kernel on the boot floppy should detect your USB stick automatically.
-When it asks for the root floppy, simply press &enterkey;. You should see
-&d-i; starting.
-
 </para>
   </sect2>
 
diff --git a/fi/boot-installer/parameters.xml b/fi/boot-installer/parameters.xml
index 5367bf52b..630a7e645 100644
--- a/fi/boot-installer/parameters.xml
+++ b/fi/boot-installer/parameters.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 33725 untranslated -->
+<!-- original version: 36744 untranslated -->
 
  <sect1 id="boot-parms"><title>Boot Parameters</title>
 <para>
@@ -200,9 +200,9 @@ Debian installer from. For example,
 
 </para><para>
 
-The boot floppy, which normally scans all floppies and USB storage
-devices it can to find the root floppy, can be overridden by this
-parameter to only look at the one device.
+The boot floppy, which normally scans all floppies it can to find the
+root floppy, can be overridden by this parameter to only look at the
+one device.
 
 </para></listitem>
 </varlistentry>
diff --git a/fi/hardware/hardware-supported.xml b/fi/hardware/hardware-supported.xml
index 756827adb..d05839f16 100644
--- a/fi/hardware/hardware-supported.xml
+++ b/fi/hardware/hardware-supported.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 35813 untranslated -->
+<!-- original version: 36733 untranslated -->
 
  <sect1 id="hardware-supported">
  <title>Supported Hardware</title>
@@ -280,7 +280,7 @@ with GNU/Linux, see the
 <para>
 
 Multi-processor support &mdash; also called <quote>symmetric multi-processing</quote>
-or SMP &mdash; is supported for this architecture.  The standard Debian
+or SMP &mdash; is available for this architecture.  The standard Debian
 &release; kernel image was compiled with SMP support.  This should not
 prevent installation, since the SMP kernel should boot on non-SMP systems;
 the kernel will simply cause a bit more overhead.
@@ -304,7 +304,7 @@ section of the kernel config.
 <para>
 
 Multi-processor support &mdash; also called <quote>symmetric
-multi-processing</quote> or SMP &mdash; is supported for this architecture.
+multi-processing</quote> or SMP &mdash; is available for this architecture.
 However, the standard Debian &release; kernel image does not support
 SMP.  This should not prevent installation, since the standard,
 non-SMP kernel should boot on SMP systems; the kernel will simply use
@@ -327,7 +327,7 @@ section of the kernel config.
 <para>
 
 Multi-processor support &mdash; also called <quote>symmetric
-multi-processing</quote> or SMP &mdash; is supported for this architecture,
+multi-processing</quote> or SMP &mdash; is available for this architecture,
 and is supported by a precompiled Debian kernel image. Depending on your
 install media, this SMP-capable kernel may or may not be installed by
 default. This should not prevent installation, since the standard,
diff --git a/fi/hardware/installation-media.xml b/fi/hardware/installation-media.xml
index b80060bf7..34a6e015f 100644
--- a/fi/hardware/installation-media.xml
+++ b/fi/hardware/installation-media.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 35612 untranslated -->
+<!-- original version: 36732 untranslated -->
 
  <sect1 id="installation-media">
  <title>Installation Media</title>
@@ -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/fi/hardware/network-cards.xml b/fi/hardware/network-cards.xml
index f24a7f481..deb384f58 100644
--- a/fi/hardware/network-cards.xml
+++ b/fi/hardware/network-cards.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 35304 untranslated -->
+<!-- original version: 36732 untranslated -->
 
  <sect1 id="network-cards">
  <title>Network Connectivity Hardware</title>
@@ -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/fi/hardware/supported-peripherals.xml b/fi/hardware/supported-peripherals.xml
index 8792dca6d..43512b498 100644
--- a/fi/hardware/supported-peripherals.xml
+++ b/fi/hardware/supported-peripherals.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 35612 untranslated -->
+<!-- original version: 36732 untranslated -->
 
  <sect1 id="supported-peripherals">
  <title>Peripherals and Other Hardware</title>
@@ -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/fi/hardware/supported/m68k.xml b/fi/hardware/supported/m68k.xml
index 4de0bc0f8..036cff146 100644
--- a/fi/hardware/supported/m68k.xml
+++ b/fi/hardware/supported/m68k.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28997 untranslated -->
+<!-- original version: 36732 untranslated -->
 
   <sect2 arch="m68k"><title>CPU, Main Boards, and Video Support</title>
 <para>
@@ -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/fi/hardware/supported/mipsel.xml b/fi/hardware/supported/mipsel.xml
index 97bfa182f..b5c9dec91 100644
--- a/fi/hardware/supported/mipsel.xml
+++ b/fi/hardware/supported/mipsel.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 35612 untranslated -->
+<!-- original version: 36732 untranslated -->
 
 
   <sect2 arch="mipsel"><title>CPU, Main Boards, and Video Support</title>
@@ -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/fi/partitioning/partition-programs.xml b/fi/partitioning/partition-programs.xml
index 57b95e11f..4bd51a9bb 100644
--- a/fi/partitioning/partition-programs.xml
+++ b/fi/partitioning/partition-programs.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 31619 untranslated -->
+<!-- original version: 36732 untranslated -->
 
  <sect1 id="partition-programs">
  <title>Debian Partitioning Programs</title>
@@ -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/fi/post-install/kernel-baking.xml b/fi/post-install/kernel-baking.xml
index c106274db..433375fd7 100644
--- a/fi/post-install/kernel-baking.xml
+++ b/fi/post-install/kernel-baking.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 36614 untranslated -->
+<!-- original version: 36730 untranslated -->
 
  <sect1 id="kernel-baking"><title>Compiling a New Kernel</title>
 <para>
@@ -137,42 +137,39 @@ parameters.  To do that, do <userinput>make-kpkg clean</userinput>.
 </para><para>
 
 Now, compile the kernel:
-<userinput>fakeroot make-kpkg --revision=custom.1.0 kernel_image</userinput>.
+<userinput>fakeroot make-kpkg --initrd --revision=custom.1.0 kernel_image</userinput>.
 The version number of <quote>1.0</quote> can be changed at will; this is just
 a version number that you will use to track your kernel builds.
 Likewise, you can put any word you like in place of <quote>custom</quote>
 (e.g., a host name).  Kernel compilation may take quite a while, depending on
 the power of your machine.
 
-</para><para condition="supports-pcmcia">
-
-If you require PCMCIA support, you'll also need to install the
-<classname>pcmcia-source</classname> package.  Unpack the gzipped tar file
-as root in the directory <filename>/usr/src</filename> (it's important that
-modules are found where they are expected to be found, namely,
-<filename>/usr/src/modules</filename>).  Then, as root, do <userinput>make-kpkg
-modules_image</userinput>.
-
 </para><para>
 
 Once the compilation is complete, you can install your custom kernel
-like any package.  As root, do <userinput>dpkg -i
+like any package.  As root, do 
+<phrase condition="classic-kpkg">
+<userinput>dpkg -i
 ../kernel-image-&kernelversion;-<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</userinput>.
+</phrase>
+<phrase condition="common-kpkg">
+<userinput>dpkg -i
+../linux-image-&kernelversion;-<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</userinput>.
+</phrase>
 The <replaceable>subarchitecture</replaceable> part is an optional
 sub-architecture,
 <phrase arch="i386"> such as <quote>i586</quote>, </phrase>
 depending on what kernel options you set.
-<userinput>dpkg -i kernel-image...</userinput> will install the
+<userinput>dpkg -i</userinput> will install the
 kernel, along with some other nice supporting files.  For instance,
 the <filename>System.map</filename> will be properly installed
 (helpful for debugging kernel problems), and
 <filename>/boot/config-&kernelversion;</filename> will be installed,
 containing your current configuration set.  Your new
-<classname>kernel-image-&kernelversion;</classname> package is also clever
-enough to automatically use your platform's boot-loader to run an
-update on the booting, allowing you to boot without re-running the
-boot loader.  If you have created a modules package, e.g., if you have
-PCMCIA, you'll need to install that package as well.
+kernel package is also clever enough to automatically update your boot
+loader to use the new kernel. If you have created a modules package,
+<phrase condition="classic-kpkg">e.g., if you have PCMCIA,</phrase>
+you'll need to install that package as well.
 
 </para><para>
 
diff --git a/fi/preparing/bios-setup/i386.xml b/fi/preparing/bios-setup/i386.xml
index 668d4ed20..224945c26 100644
--- a/fi/preparing/bios-setup/i386.xml
+++ b/fi/preparing/bios-setup/i386.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28997 untranslated -->
+<!-- original version: 36732 untranslated -->
 
 
   <sect2 arch="i386" id="bios-setup"><title>Invoking the BIOS Set-Up Menu</title>
@@ -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/fi/preparing/bios-setup/powerpc.xml b/fi/preparing/bios-setup/powerpc.xml
index 2368a0853..f170eb172 100644
--- a/fi/preparing/bios-setup/powerpc.xml
+++ b/fi/preparing/bios-setup/powerpc.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28672 untranslated -->
+<!-- original version: 36732 untranslated -->
 
 
   <sect2 arch="powerpc" id="invoking-openfirmware">
@@ -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/fi/preparing/bios-setup/s390.xml b/fi/preparing/bios-setup/s390.xml
index b2ed18855..5ac12ce19 100644
--- a/fi/preparing/bios-setup/s390.xml
+++ b/fi/preparing/bios-setup/s390.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28672 untranslated -->
+<!-- original version: 36732 untranslated -->
 
 
   <sect2 arch="s390"><title>BIOS Setup</title>
@@ -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/fi/preparing/bios-setup/sparc.xml b/fi/preparing/bios-setup/sparc.xml
index 591ea1415..e10786eb6 100644
--- a/fi/preparing/bios-setup/sparc.xml
+++ b/fi/preparing/bios-setup/sparc.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28997 untranslated -->
+<!-- original version: 36732 untranslated -->
 
 
   <sect2 arch="sparc" id="invoking-openboot"><title>Invoking OpenBoot</title>
@@ -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/fi/preparing/nondeb-part/i386.xml b/fi/preparing/nondeb-part/i386.xml
index b89864d7e..eb0b6afb1 100644
--- a/fi/preparing/nondeb-part/i386.xml
+++ b/fi/preparing/nondeb-part/i386.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 29561 untranslated -->
+<!-- original version: 36732 untranslated -->
 
 
   <sect2 arch="i386"><title>Partitioning From DOS or Windows</title>
@@ -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
diff --git a/nl/appendix/chroot-install.xml b/nl/appendix/chroot-install.xml
index e5df2d236..cd72a3a88 100644
--- a/nl/appendix/chroot-install.xml
+++ b/nl/appendix/chroot-install.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 34713 untranslated -->
+<!-- original version: 36758 untranslated -->
 
  <sect1 id="linux-upgrade">
  <title>Installing &debian; from a Unix/Linux System</title>
@@ -284,8 +284,9 @@ configured for the next reboot.
 
 To configure networking, edit
 <filename>/etc/network/interfaces</filename>,
-<filename>/etc/resolv.conf</filename>, and
-<filename>/etc/hostname</filename>.
+<filename>/etc/resolv.conf</filename>,
+<filename>/etc/hostname</filename> and
+<filename>/etc/hosts</filename>.
 
 <informalexample><screen>
 # editor /etc/network/interfaces
@@ -380,13 +381,13 @@ If you intend to boot this system, you probably want a Linux kernel
 and a boot loader. Identify available pre-packaged kernels with
 
 <informalexample><screen>
-# apt-cache search kernel-image
+# apt-cache search <phrase condition="classic-kpkg">kernel</phrase><phrase condition="common-kpkg">linux</phrase>-image
 </screen></informalexample>
 
 Then install your choice using its package name.
 
 <informalexample><screen>
-# apt-get install kernel-image-<replaceable>2.X.X-arch-etc</replaceable>
+# apt-get install <phrase condition="classic-kpkg">kernel</phrase><phrase condition="common-kpkg">linux</phrase>-image-<replaceable>&kernelversion;-arch-etc</replaceable>
 </screen></informalexample>
 
 </para>
diff --git a/nl/appendix/preseed.xml b/nl/appendix/preseed.xml
index 17be3b04b..b64c281f2 100644
--- a/nl/appendix/preseed.xml
+++ b/nl/appendix/preseed.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 36269 untranslated -->
+<!-- original version: 36758 untranslated -->
 
 <!--
 Be carefull with the format of this file as it is parsed to generate
@@ -380,6 +380,14 @@ can still be fully automated, since you can pass preseed values to the kernel
 on the command line. Just pass <userinput>path/to/var=value</userinput>
 for any of the preseed variables listed in the examples.
 
+</para><para>
+
+A <quote>&ndash;&ndash;</quote> in the boot options has special meaning.
+Kernel parameters that appear after it will be copied into the installed
+bootloader configuration (if supported by the installer for the
+bootloader). Note that the <quote>&ndash;&ndash;</quote> may already be
+present in the default boot parameters.
+
 </para>
 <note><para>
 
@@ -909,31 +917,37 @@ Available tasks as of this writing include:
 
 <itemizedlist>
 <listitem><para>
-  <userinput>Standard system</userinput>
+  <userinput>standard</userinput>
+</para></listitem>
+<listitem><para>
+  <userinput>desktop</userinput>
+</para></listitem>
+<listitem><para>
+  <userinput>gnome-desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>Desktop environment</userinput>
+  <userinput>kde-desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>Web server</userinput>
+  <userinput>web-server</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>Print server</userinput>
+  <userinput>print-server</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>DNS server</userinput>
+  <userinput>dns-server</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>File server</userinput>
+  <userinput>file-server</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>Mail server</userinput>
+  <userinput>mail-server</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>SQL database</userinput>
+  <userinput>sql-database</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>Laptop</userinput>
+  <userinput>laptop</userinput>
 </para></listitem>
 </itemizedlist>
 
@@ -941,13 +955,14 @@ Available tasks as of this writing include:
 
 You can also choose to install no tasks, and force the installation of a
 set of packages in some other way. We recommend always including the
-<userinput>Standard system</userinput> task.
+<userinput>standard</userinput> task.
 
 </para>
 
 <informalexample role="example"><screen>
-tasksel tasksel/first multiselect Standard system, Desktop environment
-#tasksel tasksel/first multiselect Standard system, Web server
+tasksel tasksel/first multiselect standard, desktop
+#tasksel tasksel/first multiselect standard, web-server
+#tasksel tasksel/first multiselect standard, kde-desktop
 
 # 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,
diff --git a/nl/boot-installer/i386.xml b/nl/boot-installer/i386.xml
index 709718c2b..24560c444 100644
--- a/nl/boot-installer/i386.xml
+++ b/nl/boot-installer/i386.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 33886 untranslated -->
+<!-- original version: 36744 untranslated -->
 
   <sect2 arch="i386"><title>Booting from a CD-ROM</title>
 
@@ -203,15 +203,6 @@ computer.  The system should boot up, and you should be presented with
 the <prompt>boot:</prompt> prompt.  Here you can enter optional boot
 arguments, or just hit &enterkey;.
 
-</para><para condition="supports-floppy-boot">
-
-In case your computer doesn't support booting from USB memory devices,
-you can still use a single floppy to do the initial boot and then
-switch to USB. Boot your system as described in <xref linkend="floppy-boot"/>;
-the kernel on the boot floppy should detect your USB stick automatically.
-When it asks for the root floppy, simply press &enterkey;. You should see
-&d-i; starting.
-
 </para>
   </sect2>
 
diff --git a/nl/boot-installer/parameters.xml b/nl/boot-installer/parameters.xml
index 5367bf52b..630a7e645 100644
--- a/nl/boot-installer/parameters.xml
+++ b/nl/boot-installer/parameters.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 33725 untranslated -->
+<!-- original version: 36744 untranslated -->
 
  <sect1 id="boot-parms"><title>Boot Parameters</title>
 <para>
@@ -200,9 +200,9 @@ Debian installer from. For example,
 
 </para><para>
 
-The boot floppy, which normally scans all floppies and USB storage
-devices it can to find the root floppy, can be overridden by this
-parameter to only look at the one device.
+The boot floppy, which normally scans all floppies it can to find the
+root floppy, can be overridden by this parameter to only look at the
+one device.
 
 </para></listitem>
 </varlistentry>
diff --git a/nl/hardware/hardware-supported.xml b/nl/hardware/hardware-supported.xml
index 756827adb..d05839f16 100644
--- a/nl/hardware/hardware-supported.xml
+++ b/nl/hardware/hardware-supported.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 35813 untranslated -->
+<!-- original version: 36733 untranslated -->
 
  <sect1 id="hardware-supported">
  <title>Supported Hardware</title>
@@ -280,7 +280,7 @@ with GNU/Linux, see the
 <para>
 
 Multi-processor support &mdash; also called <quote>symmetric multi-processing</quote>
-or SMP &mdash; is supported for this architecture.  The standard Debian
+or SMP &mdash; is available for this architecture.  The standard Debian
 &release; kernel image was compiled with SMP support.  This should not
 prevent installation, since the SMP kernel should boot on non-SMP systems;
 the kernel will simply cause a bit more overhead.
@@ -304,7 +304,7 @@ section of the kernel config.
 <para>
 
 Multi-processor support &mdash; also called <quote>symmetric
-multi-processing</quote> or SMP &mdash; is supported for this architecture.
+multi-processing</quote> or SMP &mdash; is available for this architecture.
 However, the standard Debian &release; kernel image does not support
 SMP.  This should not prevent installation, since the standard,
 non-SMP kernel should boot on SMP systems; the kernel will simply use
@@ -327,7 +327,7 @@ section of the kernel config.
 <para>
 
 Multi-processor support &mdash; also called <quote>symmetric
-multi-processing</quote> or SMP &mdash; is supported for this architecture,
+multi-processing</quote> or SMP &mdash; is available for this architecture,
 and is supported by a precompiled Debian kernel image. Depending on your
 install media, this SMP-capable kernel may or may not be installed by
 default. This should not prevent installation, since the standard,
diff --git a/nl/hardware/installation-media.xml b/nl/hardware/installation-media.xml
index b80060bf7..34a6e015f 100644
--- a/nl/hardware/installation-media.xml
+++ b/nl/hardware/installation-media.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 35612 untranslated -->
+<!-- original version: 36732 untranslated -->
 
  <sect1 id="installation-media">
  <title>Installation Media</title>
@@ -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/nl/hardware/network-cards.xml b/nl/hardware/network-cards.xml
index f24a7f481..deb384f58 100644
--- a/nl/hardware/network-cards.xml
+++ b/nl/hardware/network-cards.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 35304 untranslated -->
+<!-- original version: 36732 untranslated -->
 
  <sect1 id="network-cards">
  <title>Network Connectivity Hardware</title>
@@ -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/nl/hardware/supported-peripherals.xml b/nl/hardware/supported-peripherals.xml
index 8792dca6d..43512b498 100644
--- a/nl/hardware/supported-peripherals.xml
+++ b/nl/hardware/supported-peripherals.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 35612 untranslated -->
+<!-- original version: 36732 untranslated -->
 
  <sect1 id="supported-peripherals">
  <title>Peripherals and Other Hardware</title>
@@ -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/nl/hardware/supported/m68k.xml b/nl/hardware/supported/m68k.xml
index 4de0bc0f8..036cff146 100644
--- a/nl/hardware/supported/m68k.xml
+++ b/nl/hardware/supported/m68k.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28997 untranslated -->
+<!-- original version: 36732 untranslated -->
 
   <sect2 arch="m68k"><title>CPU, Main Boards, and Video Support</title>
 <para>
@@ -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/nl/hardware/supported/mipsel.xml b/nl/hardware/supported/mipsel.xml
index 97bfa182f..b5c9dec91 100644
--- a/nl/hardware/supported/mipsel.xml
+++ b/nl/hardware/supported/mipsel.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 35612 untranslated -->
+<!-- original version: 36732 untranslated -->
 
 
   <sect2 arch="mipsel"><title>CPU, Main Boards, and Video Support</title>
@@ -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/nl/howto/installation-howto.xml b/nl/howto/installation-howto.xml
index bae28e530..5cc11c22f 100644
--- a/nl/howto/installation-howto.xml
+++ b/nl/howto/installation-howto.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 33725 untranslated -->
+<!-- original version: 36744 untranslated -->
 
 <appendix id="installation-howto">
 <title>Installation Howto</title>
@@ -156,9 +156,8 @@ sticks. For details, see <xref linkend="boot-usb-files" />.
 
 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 get it to boot from the USB device. If it
-doesn't, you can boot from one floppy and use the USB stick for the rest of
-the install. For helpful hints and details, see <xref linkend="usb-boot" />.
+<quote>USB-ZIP</quote> to get it to boot from the USB device. For helpful
+hints and details, see <xref linkend="usb-boot" />.
 
 </para><para arch="powerpc">
 
diff --git a/nl/partitioning/partition-programs.xml b/nl/partitioning/partition-programs.xml
index 57b95e11f..4bd51a9bb 100644
--- a/nl/partitioning/partition-programs.xml
+++ b/nl/partitioning/partition-programs.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 31619 untranslated -->
+<!-- original version: 36732 untranslated -->
 
  <sect1 id="partition-programs">
  <title>Debian Partitioning Programs</title>
@@ -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/nl/post-install/kernel-baking.xml b/nl/post-install/kernel-baking.xml
index c106274db..433375fd7 100644
--- a/nl/post-install/kernel-baking.xml
+++ b/nl/post-install/kernel-baking.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 36614 untranslated -->
+<!-- original version: 36730 untranslated -->
 
  <sect1 id="kernel-baking"><title>Compiling a New Kernel</title>
 <para>
@@ -137,42 +137,39 @@ parameters.  To do that, do <userinput>make-kpkg clean</userinput>.
 </para><para>
 
 Now, compile the kernel:
-<userinput>fakeroot make-kpkg --revision=custom.1.0 kernel_image</userinput>.
+<userinput>fakeroot make-kpkg --initrd --revision=custom.1.0 kernel_image</userinput>.
 The version number of <quote>1.0</quote> can be changed at will; this is just
 a version number that you will use to track your kernel builds.
 Likewise, you can put any word you like in place of <quote>custom</quote>
 (e.g., a host name).  Kernel compilation may take quite a while, depending on
 the power of your machine.
 
-</para><para condition="supports-pcmcia">
-
-If you require PCMCIA support, you'll also need to install the
-<classname>pcmcia-source</classname> package.  Unpack the gzipped tar file
-as root in the directory <filename>/usr/src</filename> (it's important that
-modules are found where they are expected to be found, namely,
-<filename>/usr/src/modules</filename>).  Then, as root, do <userinput>make-kpkg
-modules_image</userinput>.
-
 </para><para>
 
 Once the compilation is complete, you can install your custom kernel
-like any package.  As root, do <userinput>dpkg -i
+like any package.  As root, do 
+<phrase condition="classic-kpkg">
+<userinput>dpkg -i
 ../kernel-image-&kernelversion;-<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</userinput>.
+</phrase>
+<phrase condition="common-kpkg">
+<userinput>dpkg -i
+../linux-image-&kernelversion;-<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</userinput>.
+</phrase>
 The <replaceable>subarchitecture</replaceable> part is an optional
 sub-architecture,
 <phrase arch="i386"> such as <quote>i586</quote>, </phrase>
 depending on what kernel options you set.
-<userinput>dpkg -i kernel-image...</userinput> will install the
+<userinput>dpkg -i</userinput> will install the
 kernel, along with some other nice supporting files.  For instance,
 the <filename>System.map</filename> will be properly installed
 (helpful for debugging kernel problems), and
 <filename>/boot/config-&kernelversion;</filename> will be installed,
 containing your current configuration set.  Your new
-<classname>kernel-image-&kernelversion;</classname> package is also clever
-enough to automatically use your platform's boot-loader to run an
-update on the booting, allowing you to boot without re-running the
-boot loader.  If you have created a modules package, e.g., if you have
-PCMCIA, you'll need to install that package as well.
+kernel package is also clever enough to automatically update your boot
+loader to use the new kernel. If you have created a modules package,
+<phrase condition="classic-kpkg">e.g., if you have PCMCIA,</phrase>
+you'll need to install that package as well.
 
 </para><para>
 
diff --git a/nl/preparing/bios-setup/i386.xml b/nl/preparing/bios-setup/i386.xml
index 668d4ed20..224945c26 100644
--- a/nl/preparing/bios-setup/i386.xml
+++ b/nl/preparing/bios-setup/i386.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28997 untranslated -->
+<!-- original version: 36732 untranslated -->
 
 
   <sect2 arch="i386" id="bios-setup"><title>Invoking the BIOS Set-Up Menu</title>
@@ -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/nl/preparing/bios-setup/powerpc.xml b/nl/preparing/bios-setup/powerpc.xml
index 2368a0853..f170eb172 100644
--- a/nl/preparing/bios-setup/powerpc.xml
+++ b/nl/preparing/bios-setup/powerpc.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28672 untranslated -->
+<!-- original version: 36732 untranslated -->
 
 
   <sect2 arch="powerpc" id="invoking-openfirmware">
@@ -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/nl/preparing/bios-setup/s390.xml b/nl/preparing/bios-setup/s390.xml
index b2ed18855..5ac12ce19 100644
--- a/nl/preparing/bios-setup/s390.xml
+++ b/nl/preparing/bios-setup/s390.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28672 untranslated -->
+<!-- original version: 36732 untranslated -->
 
 
   <sect2 arch="s390"><title>BIOS Setup</title>
@@ -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/nl/preparing/bios-setup/sparc.xml b/nl/preparing/bios-setup/sparc.xml
index 591ea1415..e10786eb6 100644
--- a/nl/preparing/bios-setup/sparc.xml
+++ b/nl/preparing/bios-setup/sparc.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28997 untranslated -->
+<!-- original version: 36732 untranslated -->
 
 
   <sect2 arch="sparc" id="invoking-openboot"><title>Invoking OpenBoot</title>
@@ -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/nl/preparing/nondeb-part/i386.xml b/nl/preparing/nondeb-part/i386.xml
index b89864d7e..eb0b6afb1 100644
--- a/nl/preparing/nondeb-part/i386.xml
+++ b/nl/preparing/nondeb-part/i386.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 29561 untranslated -->
+<!-- original version: 36732 untranslated -->
 
 
   <sect2 arch="i386"><title>Partitioning From DOS or Windows</title>
@@ -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