16 files changed, 247 insertions, 120 deletions

diff --git a/nl/appendix/chroot-install.xml b/nl/appendix/chroot-install.xml
index 3a47deb1c..798904902 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: 41453 untranslated -->
+<!-- original version: 43576 untranslated -->
 
  <sect1 id="linux-upgrade">
  <title>Installing &debian; from a Unix/Linux System</title>
@@ -33,17 +33,18 @@ media.
 
 With your current *nix partitioning tools, repartition the hard
 drive as needed, creating at least one filesystem plus swap. You
-need at least 150MB of space available for a console only install,
-or at least 300MB if you plan to install X.
+need around 350MB of space available for a console only install,
+or about 1GB if you plan to install X (more if you intend to
+install destop environments like GNOME or KDE).
 
 </para><para>
 
-Create file systems on your partitions. For example, to create an
+Next, create file systems on the partitions. For example, to create an
 ext3 file system on partition <filename>/dev/hda6</filename> (that's
 our example root partition):
 
 <informalexample><screen>
-# mke2fs -j /dev/hda6
+# mke2fs -j /dev/<replaceable>hda6</replaceable>
 </screen></informalexample>
 
 To create an ext2 file system instead, omit <userinput>-j</userinput>.
@@ -54,9 +55,9 @@ Initialize and activate swap (substitute the partition number for
 your intended Debian swap partition):
 
 <informalexample><screen>
-# mkswap /dev/hda5
+# mkswap /dev/<replaceable>hda5</replaceable>
 # sync; sync; sync
-# swapon /dev/hda5
+# swapon /dev/<replaceable>hda5</replaceable>
 </screen></informalexample>
 
 Mount one partition as <filename>/mnt/debinst</filename> (the
@@ -66,7 +67,7 @@ referenced later below.
 
 <informalexample><screen>
 # mkdir /mnt/debinst
-# mount /dev/hda6 /mnt/debinst
+# mount /dev/<replaceable>hda6</replaceable> /mnt/debinst
 </screen></informalexample>
 
 </para>
@@ -161,6 +162,7 @@ Substitute one of the following for <replaceable>ARCH</replaceable>
 in the <command>debootstrap</command> command:
 
 <userinput>alpha</userinput>,
+<userinput>amd64</userinput>,
 <userinput>arm</userinput>,
 <userinput>hppa</userinput>,
 <userinput>i386</userinput>,
@@ -174,7 +176,7 @@ in the <command>debootstrap</command> command:
 
 <informalexample><screen>
 # /usr/sbin/debootstrap --arch ARCH &releasename; \
-     /mnt/debinst http://http.us.debian.org/debian
+     /mnt/debinst http://ftp.us.debian.org/debian
 </screen></informalexample>
 
 </para>
@@ -185,10 +187,17 @@ in the <command>debootstrap</command> command:
 <para>
 
 Now you've got a real Debian system, though rather lean, on disk.
-<command>Chroot</command> into it:
+<command>chroot</command> into it:
 
 <informalexample><screen>
-# LANG= chroot /mnt/debinst /bin/bash
+# LANG=C chroot /mnt/debinst /bin/bash
+</screen></informalexample>
+
+After chrooting you may need to set the terminal definition to be
+compatible with the Debian base system, for example:
+
+<informalexample><screen>
+# export TERM=<replaceable>xterm-color</replaceable>
 </screen></informalexample>
 
 </para>
@@ -215,8 +224,8 @@ Here is a sample you can modify to suit:
 /dev/XXX         none          swap    sw                       0    0
 proc             /proc         proc    defaults                 0    0
 
-/dev/fd0         /mnt/floppy   auto    noauto,rw,sync,user,exec 0    0
-/dev/cdrom       /mnt/cdrom    iso9660 noauto,ro,user,exec      0    0
+/dev/fd0         /media/floppy auto    noauto,rw,sync,user,exec 0    0
+/dev/cdrom       /media/cdrom  iso9660 noauto,ro,user,exec      0    0
 
 /dev/XXX         /tmp          ext3    rw,nosuid,nodev          0    2
 /dev/XXX         /var          ext3    rw,nosuid,nodev          0    2
@@ -225,13 +234,25 @@ proc             /proc         proc    defaults                 0    0
 </screen></informalexample>
 
 Use <userinput>mount -a</userinput> to mount all the file systems you
-have specified in your <filename>/etc/fstab</filename>, or to mount
-file systems individually use:
+have specified in your <filename>/etc/fstab</filename>, or, to mount
+file systems individually, use:
 
 <informalexample><screen>
 # mount /path   # e.g.: mount /usr
 </screen></informalexample>
 
+Current Debian systems have mountpoints for removable media under
+<filename>/media</filename>, but keep compatibility symlinks in
+<filename>/</filename>. Create these as as needed, for example:
+
+<informalexample><screen>
+# cd /media
+# mkdir cdrom0
+# ln -s cdrom0 cdrom
+# cd /
+# ln -s media/cdrom
+</screen></informalexample>
+
 You can mount the proc file system multiple times and to arbitrary
 locations, though <filename>/proc</filename> is customary. If you didn't use
 <userinput>mount -a</userinput>, be sure to mount proc before continuing:
@@ -254,20 +275,19 @@ the chroot:
    </sect3>
 
    <sect3>
-   <title>Configure Keyboard</title>
+   <title>Setting Timezone</title>
 <para>
 
-To configure your keyboard:
+An option in the file <filename>/etc/default/rcS</filename> determines
+whether the system will interpret the hardware clock as being set to UTC
+or local time. The following command allow you to set that and choose
+your timezone.
 
 <informalexample><screen>
-# dpkg-reconfigure console-data
+# editor /etc/default/rcS
+# tzconfig
 </screen></informalexample>
 
-</para><para>
-
-Note that the keyboard cannot be set while in the chroot, but will be
-configured for the next reboot.
-
 </para>
    </sect3>
 
@@ -337,6 +357,20 @@ Enter your system's host name (2 to 63 characters):
 # echo DebianHostName &gt; /etc/hostname
 </screen></informalexample>
 
+And a basic <filename>/etc/hosts</filename> with IPv6 support:
+
+<informalexample><screen>
+127.0.0.1 localhost DebianHostName
+
+# The following lines are desirable for IPv6 capable hosts
+::1     ip6-localhost ip6-loopback
+fe00::0 ip6-localnet
+ff00::0 ip6-mcastprefix
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters
+ff02::3 ip6-allhosts
+</screen></informalexample>
+
 If you have multiple network cards, you should arrange the names of
 driver modules in the <filename>/etc/modules</filename> file into the
 desired order. Then during boot, each card will be associated with the
@@ -346,22 +380,51 @@ interface name (eth0, eth1, etc.) that you expect.
    </sect3>
 
    <sect3>
-   <title>Configure Locales</title>
+   <title>Configure Apt</title>
+<para>
+
+Debootstrap will have created a very basic
+<filename>/etc/apt/sources.list</filename> that will allow installing
+additional packages. However, you may want to add some additional sources,
+for example for source packages and security updates:
+
+<informalexample><screen>
+deb-src http://ftp.us.debian.org/debian etch main
+
+deb http://security.debian.org/ etch/updates main
+deb-src http://security.debian.org/ etch/updates main
+</screen></informalexample>
+
+Make sure to run <userinput>aptitude update</userinput> after you have
+made changes to the sources list.
+
+</para>
+   </sect3>
+
+   <sect3>
+   <title>Configure Locales and Keyboard</title>
 <para>
 
 To configure your locale settings to use a language other than
 English, install the <classname>locales</classname> support package
-and configure it:
+and configure it. Currently the use of UTF-8 locales is recommended.
 
 <informalexample><screen>
 # aptitude install locales
 # dpkg-reconfigure locales
 </screen></informalexample>
 
-NOTE: <classname>apt</classname> must be configured beforehand by creating
-a sources.list and running <command>aptitude update</command>.
-Before using locales with character sets other than ASCII or latin1,
-please consult the appropriate localization HOWTO.
+To configure your keyboard (if needed):
+
+<informalexample><screen>
+# aptitude install console-data
+# dpkg-reconfigure console-data
+</screen></informalexample>
+
+</para><para>
+
+Note that the keyboard cannot be set while in the chroot, but will be
+configured for the next reboot.
 
 </para>
    </sect3>
@@ -372,7 +435,7 @@ please consult the appropriate localization HOWTO.
 <para>
 
 If you intend to boot this system, you probably want a Linux kernel
-and a boot loader. Identify available pre-packaged kernels with
+and a boot loader. Identify available pre-packaged kernels with:
 
 <informalexample><screen>
 # apt-cache search linux-image
@@ -385,6 +448,15 @@ Then install your choice using its package name.
 </screen></informalexample>
 
 </para>
+<note><para>
+
+The configuration file <filename>/etc/kernel-img.conf</filename> influences
+the installation and upgrade of pre-packaged Debian kernels. A default file
+will be created when you first install a Debian kernel image. For additional
+information about this file, consult its man page which will be available
+after installing the <classname>kernel-package</classname> package.
+
+</para></note>
   </sect2>
 
   <sect2>
@@ -404,16 +476,31 @@ bootloader.  If you are keeping the system you used to install Debian, just
 add an entry for the Debian install to your existing grub
 <filename>menu.lst</filename> or <filename>lilo.conf</filename>.  For
 <filename>lilo.conf</filename>, you could also copy it to the new system and
-edit it there. After you are done editing, call lilo (remember it will use
+edit it there. After you are done editing, call <command>lilo</command>
+(remember it will use
 <filename>lilo.conf</filename> relative to the system you call it from).
 
 </para><para arch="x86">
 
+Installing and setting up <classname>grub</classname> is as easy as:
+
+<informalexample><screen>
+# aptitude install grub
+# grub-install /dev/<replaceable>hda</replaceable>
+# update-grub
+</screen></informalexample>
+
+The second command will install <command>grub</command> (in this case in
+the MBR of <literal>hda</literal>). The last command will create a sane
+and working <filename>/boot/grub/menu.lst</filename>.
+
+</para><para arch="x86">
+
 Here is a basic <filename>/etc/lilo.conf</filename> as an example:
 
 <informalexample><screen>
-boot=/dev/hda6
-root=/dev/hda6
+boot=/dev/<replaceable>hda6</replaceable>
+root=/dev/<replaceable>hda6</replaceable>
 install=menu
 delay=20
 lba32
@@ -451,4 +538,32 @@ instead of <userinput>hd:</userinput>.
 
 </para>
   </sect2>
+
+  <sect2>
+<title>Finishing touches</title>
+<para>
+
+As mentioned earlier, the installed system will be very basic. If you would
+like to make the system a bit more mature, there is an easy method to
+packages of <quote>standard</quote> priority:
+
+<informalexample><screen>
+# tasksel install standard
+</screen></informalexample>
+
+Of course, you can also just use <command>aptitude</command> to install
+packages individually.
+
+</para><para>
+
+After the installation there will be a lot of downloaded packages in
+<filename>/var/cache/apt/archives/</filename>. You can free up some
+diskspace by running:
+
+<informalexample><screen>
+# aptitude clean
+</screen></informalexample>
+
+</para>
+  </sect2>
  </sect1>
diff --git a/nl/appendix/preseed.xml b/nl/appendix/preseed.xml
index cfd607830..35f445ff4 100644
--- a/nl/appendix/preseed.xml
+++ b/nl/appendix/preseed.xml
@@ -1,5 +1,5 @@
-<!-- retain these comments for translator revision tracking -->
-<!-- original version: 43525 untranslated -->
+!-- retain these comments for translator revision tracking -->
+<!-- original version: 43580 untranslated -->
 
 <!--
 Be carefull with the format of this file as it is parsed to generate
@@ -805,9 +805,9 @@ d-i netcfg/wireless_wep string
   <title>Mirror settings</title>
 <para>
 
-Depending on the installation method you use, a mirror may be used both to
-download additional components of the installer, the base system and to
-set up the <filename>/etc/apt/sources.list</filename> for the installed
+Depending on the installation method you use, a mirror may be used to
+download additional components of the installer, to install the base system,
+and to set up the <filename>/etc/apt/sources.list</filename> for the installed
 system.
 
 </para><para>
@@ -846,8 +846,8 @@ d-i mirror/http/proxy string
 <para>
 
 Using preseeding to partition the harddisk is very much limited to what is
-supported by <classname>partman-auto</classname>. You can choose to either
-partition existing free space on a disk or a whole disk. The layout of the
+supported by <classname>partman-auto</classname>. You can choose to partition
+either existing free space on a disk or a whole disk. The layout of the
 disk can be determined by using a predefined recipe, a custom recipe from
 a recipe file or a recipe included in the preconfiguration file. It is
 currently not possible to partition multiple disks using preseeding.
@@ -1142,8 +1142,8 @@ installation. The only questions asked concern the installation of the kernel.
 # if no other operating system is detected on the machine.
 d-i grub-installer/only_debian boolean true
 
-# This one makes grub-installer install to the MBR if if finds some other OS
-# too, which is less safe as it might not be able to boot that other OS.
+# This one makes grub-installer install to the MBR if it also finds some other
+# OS, which is less safe as it might not be able to boot that other OS.
 d-i grub-installer/with_other_os boolean true
 
 # Alternatively, if you want to install to a location other than the mbr,
@@ -1213,8 +1213,8 @@ set of packages in some other way. We recommend always including the
 If you want to install some individual packages in addition to packages
 installed by tasks, you can use the parameter
 <classname>pkgsel/include</classname>. The value of this parameter can be
-either comma-separated or space-separated, so you can also use it easily on
-the kernel command line.
+a list of packages separated by either commas or spaces, which allows it
+to be used easily on the kernel command line as well.
 
 </para>
 
diff --git a/nl/install-methods/install-tftp.xml b/nl/install-methods/install-tftp.xml
index 2f25c4def..ae6b07c48 100644
--- a/nl/install-methods/install-tftp.xml
+++ b/nl/install-methods/install-tftp.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 39614 untranslated -->
+<!-- original version: 43558 untranslated -->
 
  <sect1 condition="supports-tftp" id="install-tftp">
  <title>Preparing Files for TFTP Net Booting</title>
@@ -13,26 +13,27 @@ and the machine configured to support booting of your specific machine.
 
 </para><para>
 
-You need to setup a TFTP server, and for many machines, a BOOTP server
-<phrase condition="supports-rarp">, or RARP server</phrase>
-<phrase condition="supports-dhcp">, or DHCP server</phrase>.
+You need to setup a TFTP server, and for many machines a DHCP 
+server<phrase condition="supports-rarp">, or RARP
+server</phrase><phrase condition="supports-bootp">, or BOOTP
+server</phrase>.
 
 </para><para>
 
 <phrase condition="supports-rarp">The Reverse Address Resolution Protocol (RARP) is
 one way to tell your client what IP address to use for itself. Another
-way is to use the BOOTP protocol. </phrase>
+way is to use the BOOTP protocol.</phrase>
 
 <phrase condition="supports-bootp">BOOTP is an IP protocol that
 informs a computer of its IP address and where on the network to obtain
-a boot image. </phrase>
+a boot image.</phrase>
 
-<phrase arch="m68k"> Yet another alternative exists on VMEbus
-systems: the IP address can be manually configured in boot ROM. </phrase>
+<phrase arch="m68k">Yet another alternative exists on VMEbus
+systems: the IP address can be manually configured in boot ROM.</phrase>
 
-<phrase condition="supports-dhcp">The DHCP (Dynamic Host Configuration
-Protocol) is a more flexible, backwards-compatible extension of BOOTP.
-Some systems can only be configured via DHCP. </phrase>
+The DHCP (Dynamic Host Configuration Protocol) is a more flexible,
+backwards-compatible extension of BOOTP.
+Some systems can only be configured via DHCP.
 
 </para><para arch="powerpc">
 
@@ -101,18 +102,33 @@ tftp dgram udp wait nobody /usr/sbin/tcpd in.tftpd /tftpboot
 Debian packages will in general set this up correctly by default when they
 are installed.
 
-</para><para>
+</para>
+<note><para>
+
+Historically TFTP servers used <filename>/tftpboot</filename> as directory
+to serve images from. However, &debian; packages may use other directories
+to comply with the <ulink url="&url-fhs-home;">Filesystem Hierarchy
+Standard</ulink>. For example, <classname>tftpd-hpa</classname> by default
+uses <filename>/var/lib/tftpboot</filename>. You may have to adjust the
+configuration examples in this section accordingly.
+
+</para></note>
+<para>
+
+Look in <filename>/etc/inetd.conf</filename> and remember the directory which
+is used as the argument of <command>in.tftpd</command><footnote>
 
-Look in that file and remember the directory which is used as the
-argument of <command>in.tftpd</command>; you'll need that below.  The
-<userinput>-l</userinput> argument enables some versions of
+<para>
+The <userinput>-l</userinput> argument enables some versions of
 <command>in.tftpd</command> to log all requests to the system logs;
-this is useful for diagnosing boot errors.  If you've had to change
-<filename>/etc/inetd.conf</filename>, you'll have to notify the
-running <command>inetd</command> process that the file has changed.
-On a Debian machine, run <userinput>/etc/init.d/inetd
-reload</userinput>; on other machines,
-find out the process ID for <command>inetd</command>, and run
+this is useful for diagnosing boot errors.
+</para>
+
+</footnote>; you'll need that below.
+If you've had to change <filename>/etc/inetd.conf</filename>, you'll have to
+notify the running <command>inetd</command> process that the file has changed.
+On a Debian machine, run <userinput>/etc/init.d/inetd reload</userinput>; on
+other machines, find out the process ID for <command>inetd</command>, and run
 <userinput>kill -HUP <replaceable>inetd-pid</replaceable></userinput>.
 
 </para><para arch="mips">
@@ -146,8 +162,7 @@ to adjust the range of source ports the Linux TFTP server uses.
 
 Next, place the TFTP boot image you need, as found in
 <xref linkend="where-files"/>, in the <command>tftpd</command>
-boot image directory.  Generally, this directory will be
-<filename>/tftpboot</filename>.  You'll have to make a link from that
+boot image directory.  You may have to make a link from that
 file to the file which <command>tftpd</command> will use for booting a
 particular client.  Unfortunately, the file name is determined by the
 TFTP client, and there are no strong standards.
@@ -166,7 +181,7 @@ images via TFTP itself.  For net booting, use the
 For PXE booting, everything you should need is set up in the
 <filename>netboot/netboot.tar.gz</filename> tarball. Simply extract this
 tarball into the <command>tftpd</command> boot image directory. Make sure
-your dhcp server is configured to pass <filename>/pxelinux.0</filename>
+your dhcp server is configured to pass <filename>pxelinux.0</filename>
 to <command>tftpd</command> as the filename to boot.
 
 </para><para arch="ia64">
diff --git a/nl/install-methods/tftp/bootp.xml b/nl/install-methods/tftp/bootp.xml
index 6fc3693b2..97ef2f793 100644
--- a/nl/install-methods/tftp/bootp.xml
+++ b/nl/install-methods/tftp/bootp.xml
@@ -1,16 +1,16 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 36841 untranslated -->
+<!-- original version: 43558 untranslated -->
 
 
   <sect2 condition="supports-bootp" id="tftp-bootp">
-  <title>Setting up BOOTP server</title>
+  <title>Setting up a BOOTP server</title>
 <para>
 
 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
-respectively.
+<classname>bootp</classname> and <classname>dhcp3-server</classname>
+packages respectively.
 
 </para><para>
 
@@ -61,11 +61,11 @@ By contrast, setting up BOOTP with ISC <command>dhcpd</command> is
 really easy, because it treats BOOTP clients as a moderately special
 case of DHCP clients.  Some architectures require a complex
 configuration for booting clients via BOOTP.  If yours is one of
-those, read the section <xref linkend="dhcpd"/>.  Otherwise, you
+those, read the section <xref linkend="dhcpd"/>.  In that case, you
 will probably be able to get away with simply adding the
 <userinput>allow bootp</userinput> directive to the configuration
 block for the subnet containing the client, and restart
-<command>dhcpd</command> with <userinput>/etc/init.d/dhcpd
+<command>dhcpd</command> with <userinput>/etc/init.d/dhcpd3-server
 restart</userinput>.
 
 </para>
diff --git a/nl/install-methods/tftp/dhcp.xml b/nl/install-methods/tftp/dhcp.xml
index def86c9cc..a69639ccf 100644
--- a/nl/install-methods/tftp/dhcp.xml
+++ b/nl/install-methods/tftp/dhcp.xml
@@ -1,14 +1,14 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 39614 untranslated -->
+<!-- original version: 43558 untranslated -->
 
-  <sect2 condition="supports-dhcp" id="dhcpd">
+  <sect2 id="dhcpd">
    <title>Setting up a DHCP server</title>
 <para>
 
 One free software DHCP server is ISC <command>dhcpd</command>.
-In &debian;, this is available in the <classname>dhcp</classname> package.
-Here is a sample configuration file for it (usually
-<filename>/etc/dhcpd.conf</filename>):
+For &debian;, the <classname>dhcp3-server</classname> package is
+recommended.  Here is a sample configuration file for it (see
+<filename>/etc/dhcp3/dhcpd.conf</filename>):
 
 <informalexample><screen>
 option domain-name "example.com";
@@ -32,9 +32,6 @@ host clientname {
 }
 </screen></informalexample>
 
-Note: the new (and preferred) <classname>dhcp3</classname> package uses
-<filename>/etc/dhcp3/dhcpd.conf</filename>.
-
 </para><para>
 
 In this example, there is one server
@@ -48,7 +45,7 @@ file which will be retrieved via TFTP.
 </para><para>
 
 After you have edited the <command>dhcpd</command> configuration file,
-restart it with <userinput>/etc/init.d/dhcpd restart</userinput>.
+restart it with <userinput>/etc/init.d/dhcpd3-server restart</userinput>.
 
 </para>
 
@@ -79,11 +76,11 @@ subnet 192.168.1.0 netmask 255.255.255.0 {
 }
 
 group {
- next-server 192.168.1.3;
- host tftpclient {
+  next-server 192.168.1.3;
+  host tftpclient {
 # tftp client hardware address
   hardware ethernet  00:10:DC:27:6C:15;
-  filename "/tftpboot/pxelinux.0";
+  filename "pxelinux.0";
  }
 }
 </screen></informalexample>
diff --git a/nl/post-install/orientation.xml b/nl/post-install/orientation.xml
index 7c9b75a78..c463562f6 100644
--- a/nl/post-install/orientation.xml
+++ b/nl/post-install/orientation.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 31137 untranslated -->
+<!-- original version: 43576 untranslated -->
 
 
  <sect1 id="debian-orientation"><title>Orienting Yourself to Debian</title>
@@ -94,8 +94,8 @@ On the other hand, if you have a cron job that (a) needs to run as a
 special user, or (b) needs to run at a special time or frequency, you
 can use either <filename>/etc/crontab</filename>, or, better yet,
 <filename>/etc/cron.d/whatever</filename>.  These particular files
-also have an extra field that allows you to stipulate the user under
-which the cron job runs.
+also have an extra field that allows you to stipulate the user account
+under which the cron job runs.
 
 </para><para>
 
diff --git a/nl/post-install/post-install.xml b/nl/post-install/post-install.xml
index e9eda62b3..f5c27249c 100644
--- a/nl/post-install/post-install.xml
+++ b/nl/post-install/post-install.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 43500 untranslated -->
+<!-- original version: 43579 untranslated -->
 
 <chapter id="post-install">
  <title>Next Steps and Where to Go From Here</title>
diff --git a/nl/preparing/bios-setup/s390.xml b/nl/preparing/bios-setup/s390.xml
index 5ac12ce19..4ab07415f 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: 36732 untranslated -->
+<!-- original version: 43576 untranslated -->
 
 
   <sect2 arch="s390"><title>BIOS Setup</title>
@@ -30,13 +30,13 @@ an LPAR if the HMC and this option is available for you.
 Before you actually perform an installation, you have to go over some
 design and preparation steps.  IBM has made documentation available
 about the whole process, e.g. how to prepare an installation medium
-and how actually boot from that medium.  Duplicating that information
+and how actually to boot from that medium.  Duplicating that information
 here is neither possible nor necessary.  However, we will describe
-here which kind of Debian-specific data is needed and where do you
-find them.  Based on both sources of information you have to prepare
-your machine and the installation medium and to perform a boot from
-it.  When you see the welcome message in your client session join this
-document again for the Debian-specific installation steps.
+here which kind of Debian-specific data is needed and where to find it.
+Using both sources of information you have to prepare your machine
+and the installation medium do you can perform a boot from it.
+When you see the welcome message in your client session, return to this
+document to go through the Debian-specific installation steps.
 
 </para>
   </sect2>
diff --git a/nl/preparing/nondeb-part/alpha.xml b/nl/preparing/nondeb-part/alpha.xml
index de065da6d..38d1c5c15 100644
--- a/nl/preparing/nondeb-part/alpha.xml
+++ b/nl/preparing/nondeb-part/alpha.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28997 untranslated -->
+<!-- original version: 43576 untranslated -->
 
 
   <sect2 arch="alpha"><title>Partitioning in Tru64 UNIX</title>
@@ -65,7 +65,7 @@ native Windows NT tools (or, more conveniently, you can also
 repartition your disk from the AlphaBIOS setup menu).  Otherwise, it
 is not really necessary to partition from Windows; the Linux
 partitioning tools will generally do a better job.  Note that when you
-run NT, the Disk Administrator may offer you to write a <quote>harmless
+run NT, the Disk Administrator may offer to write a <quote>harmless
 signature</quote> on non-Windows disks if you have any.
 <emphasis>Never</emphasis> let it do that, as this signature will destroy
 the partition information.
diff --git a/nl/preparing/nondeb-part/m68k.xml b/nl/preparing/nondeb-part/m68k.xml
index dbea5b44e..1d4b6f500 100644
--- a/nl/preparing/nondeb-part/m68k.xml
+++ b/nl/preparing/nondeb-part/m68k.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28997 untranslated -->
+<!-- original version: 43576 untranslated -->
 
 
   <sect2 arch="m68k"><title>Partitioning in AmigaOS</title>
@@ -119,8 +119,8 @@ SC Setup</command> using <command>ResEdit</command> can be found at
 
 For IDE based Macs, you need to use <command>Apple Drive Setup</command> to create
 empty space for the Linux partitions, and complete the partitioning under
-Linux, or use the MacOS version of pdisk available from the MkLinux FTP
-server.
+Linux, or use the MacOS version of pdisk available for download from
+<ulink url="http://homepage.mac.com/alk/downloads/pdisk.sit.hqx">Alsoft</ulink>.
 
 </para>
 </sect2>
diff --git a/nl/preparing/nondeb-part/sparc.xml b/nl/preparing/nondeb-part/sparc.xml
index 9bcc1239b..97ed2a4c3 100644
--- a/nl/preparing/nondeb-part/sparc.xml
+++ b/nl/preparing/nondeb-part/sparc.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28997 untranslated -->
+<!-- original version: 43576 untranslated -->
 
 
   <sect2 arch="sparc"><title>Partitioning from SunOS</title>
@@ -13,8 +13,8 @@ kernel understands Sun disk labels, so there are no problems there.
 Just make sure you leave room for the Debian root partition within the
 first 1GB area of the boot disk. You can also place the kernel image on a
 UFS partition if that is easier than putting the root partition there.
-SILO supports booting Linux and SunOS from either EXT2 (Linux), UFS
-(SunOS), romfs and iso9660 (CDROM) partitions.
+SILO supports booting Linux and SunOS from any of EXT2 (Linux), UFS
+(SunOS), romfs or iso9660 (CDROM) partitions.
 
 </para>
   </sect2>
diff --git a/nl/preparing/nondeb-part/x86.xml b/nl/preparing/nondeb-part/x86.xml
index 719630d47..126a03c5c 100644
--- a/nl/preparing/nondeb-part/x86.xml
+++ b/nl/preparing/nondeb-part/x86.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 42250 untranslated -->
+<!-- original version: 43576 untranslated -->
 
 
   <sect2 arch="x86"><title>Partitioning From DOS or Windows</title>
@@ -13,12 +13,12 @@ job.
 
 </para><para>
 
-But if you have a large IDE disk, and are using neither LBA addressing,
-overlay drivers (sometimes provided by hard disk manufacturers), nor a
+But if you have a large IDE disk, and are not using LBA addressing,
+overlay drivers (sometimes provided by hard disk manufacturers), or a
 new (post 1998) BIOS that supports large disk access extensions, then
 you must locate your Debian boot partition carefully. In this case,
 you will have to put the boot partition into the first 1024 cylinders
-of your hard drive (usually around 524 megabytes, without BIOS
+of your hard disk (usually around 524 megabytes, without BIOS
 translation). This may require that you move an existing FAT or NTFS
 partition.
 
diff --git a/nl/using-d-i/modules/alpha/aboot-installer.xml b/nl/using-d-i/modules/alpha/aboot-installer.xml
index 2d58e0f74..ce069fd1b 100644
--- a/nl/using-d-i/modules/alpha/aboot-installer.xml
+++ b/nl/using-d-i/modules/alpha/aboot-installer.xml
@@ -1,11 +1,11 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 25496 untranslated -->
+<!-- original version: 43573 untranslated -->
 
   <sect3 arch="alpha">
   <title>Install <command>aboot</command> on a Hard Disk</title>
 <para>
 
-If you have booted from SRM, if you select this option, the installer
+If you have booted from SRM and you select this option, the installer
 will write <command>aboot</command> to the first sector of the disk on
 which you installed Debian.  Be <emphasis>very</emphasis> careful &mdash; it
 is <emphasis>not</emphasis> possible to boot multiple operating
diff --git a/nl/using-d-i/modules/ia64/elilo-installer.xml b/nl/using-d-i/modules/ia64/elilo-installer.xml
index 7953befe6..3900ce064 100644
--- a/nl/using-d-i/modules/ia64/elilo-installer.xml
+++ b/nl/using-d-i/modules/ia64/elilo-installer.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 24321 untranslated -->
+<!-- original version: 43573 untranslated -->
 
   <sect3 arch="ia64">
   <title>Install the <command>ELILO</command> Boot Loader
@@ -15,10 +15,10 @@ disk partition and modifies the <guimenuitem>EFI Boot Manager</guimenuitem>
 menu in the firmware to point to the files in the EFI partition.
 The <command>elilo</command> boot loader is really in two parts.
 The <filename>/usr/sbin/elilo</filename> command manages the partition and
-copies file into it.
+copies files into it.
 The <filename>elilo.efi</filename> program is copied into the EFI
-partition and then run by the <quote>EFI Boot Manager</quote> to actually
-do the work of loading and starting the Linux kernel.
+partition and then run by the <quote>EFI Boot Manager</quote> to
+do the actual work of loading and starting the Linux kernel.
 
 </para><para>
 
@@ -41,7 +41,7 @@ filesystem with its <emphasis>boot</emphasis> flag set.
 &d-i; may show multiple choices depending on what it finds from scanning
 all of the disks of the system including EFI partitions of other system
 disks and EFI diagnostic partitions.
-Remember, the <command>elilo</command> may format the partition during
+Remember, <command>elilo</command> may format the partition during
 the installation, erasing any previous contents!
 
 </para></warning>
diff --git a/nl/using-d-i/modules/partman-crypto.xml b/nl/using-d-i/modules/partman-crypto.xml
index e2f393f31..4dfece02f 100644
--- a/nl/using-d-i/modules/partman-crypto.xml
+++ b/nl/using-d-i/modules/partman-crypto.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 41817 untranslated -->
+<!-- original version: 43576 untranslated -->
 
    <sect3 id="partman-crypto">
    <title>Configuring Encrypted Volumes</title>
@@ -42,7 +42,7 @@ depends on your CPU speed, chosen cipher and a key length.
 To use encryption, you have to create a new partition by selecting
 some free space in the main partitioning menu. Another option is to
 choose an existing partition (e.g. a regular partition, an LVM logical
-volume or a RAID volume). In the <guimenu>Partition setting</guimenu>
+volume or a RAID volume). In the <guimenu>Partition settings</guimenu>
 menu, you need to select <guimenuitem>physical volume for
 encryption</guimenuitem> at the <menuchoice> <guimenu>Use
 as:</guimenu> </menuchoice> option. The menu will then change to
diff --git a/nl/using-d-i/modules/x86/lilo-installer.xml b/nl/using-d-i/modules/x86/lilo-installer.xml
index 42e93af59..9dd0a65d8 100644
--- a/nl/using-d-i/modules/x86/lilo-installer.xml
+++ b/nl/using-d-i/modules/x86/lilo-installer.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 43514 untranslated -->
+<!-- original version: 43573 untranslated -->
 
   <sect3 arch="x86">
   <title>Install the <command>LILO</command> Boot Loader
@@ -24,7 +24,7 @@ systems like GNU/Linux and GNU/Hurd after the installation.
 </para></note>
 <para>
 
-&d-i; presents you three choices where to install the
+&d-i; offers you three choices on where to install the
 <command>LILO</command> boot loader:
 
 <variablelist>