Update to latest english versions.

7 files changed, 73 insertions, 26 deletions

diff --git a/ca/appendix/chroot-install.xml b/ca/appendix/chroot-install.xml
index 6f32a25b1..cdd173363 100644
--- a/ca/appendix/chroot-install.xml
+++ b/ca/appendix/chroot-install.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28997 untranslated -->
+<!-- original version: 31190 untranslated -->
 
  <sect1 id="linux-upgrade">
  <title>Installing &debian; from a Unix/Linux System</title>
@@ -70,6 +70,13 @@ referenced later below.
 </screen></informalexample>
 
 </para>
+<note><para>
+
+If you want to have parts of the filesystem (e.g. /usr) mounted on
+separate partitions, you will need to create and mount these directories
+manually before proceding with the next stage.
+
+</para></note>
   </sect2>
 
   <sect2>
@@ -114,6 +121,13 @@ the binaries.
 # zcat /full-path-to-work/work/data.tar.gz | tar xv
 </screen></informalexample>
 
+</para><para>
+
+Note that running <command>debootstrap</command> may require you to have
+a minimal version of <classname>glibc</classname> installed (currently
+GLIBC_2.3). <command>debootstrap</command> itself is a shell script, but
+it calls various utilities that require <classname>glibc</classname>.
+
 </para>
   </sect2>
 
@@ -188,8 +202,8 @@ Here is a sample you can modify to suit:
 # /etc/fstab: static file system information.
 #
 # file system    mount point   type    options                  dump pass
-/dev/XXX         /             ext2    defaults                 0    0
-/dev/XXX         /boot         ext2    ro,nosuid,nodev          0    2
+/dev/XXX         /             ext3    defaults                 0    1
+/dev/XXX         /boot         ext3    ro,nosuid,nodev          0    2
 
 /dev/XXX         none          swap    sw                       0    0
 proc             /proc         proc    defaults                 0    0
@@ -197,10 +211,10 @@ 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/XXX         /tmp          ext2    rw,nosuid,nodev          0    2
-/dev/XXX         /var          ext2    rw,nosuid,nodev          0    2
-/dev/XXX         /usr          ext2    rw,nodev                 0    2
-/dev/XXX         /home         ext2    rw,nosuid,nodev          0    2
+/dev/XXX         /tmp          ext3    rw,nosuid,nodev          0    2
+/dev/XXX         /var          ext3    rw,nosuid,nodev          0    2
+/dev/XXX         /usr          ext3    rw,nodev                 0    2
+/dev/XXX         /home         ext3    rw,nosuid,nodev          0    2
 </screen></informalexample>
 
 Use <userinput>mount -a</userinput> to mount all the file systems you
@@ -212,14 +226,23 @@ file systems individually use:
 </screen></informalexample>
 
 You can mount the proc file system multiple times and to arbitrary
-locations, though /proc is customary. If you didn't use
-<userinput>mount -a</userinput>, be sure to mount proc before
-continuing:
+locations, though <filename>/proc</filename> is customary. If you didn't use
+<userinput>mount -a</userinput>, be sure to mount proc before continuing:
 
 <informalexample><screen>
 # mount -t proc proc /proc
 </screen></informalexample>
 
+</para><para>
+
+The command <userinput>ls /proc</userinput> should now show a non-empty
+directory. Should this fail, you may be able to mount proc from outside
+the chroot:
+
+<informalexample><screen>
+# mount -t proc proc /mnt/debinst/proc
+</screen></informalexample>
+
 </para>
    </sect3>
 
@@ -233,6 +256,11 @@ To configure your keyboard:
 # 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>
 
@@ -390,7 +418,7 @@ Here is a basic <filename>/etc/lilo.conf</filename> as an example:
 <informalexample><screen>
 boot=/dev/hda6
 root=/dev/hda6
-install=/boot/boot-menu.b
+install=menu
 delay=20
 lba32
 image=/vmlinuz
diff --git a/ca/install-methods/install-tftp.xml b/ca/install-methods/install-tftp.xml
index 5aa11a9ef..b3f577937 100644
--- a/ca/install-methods/install-tftp.xml
+++ b/ca/install-methods/install-tftp.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 29334 untranslated -->
+<!-- original version: 31138 untranslated -->
 
  <sect1 condition="supports-tftp" id="install-tftp">
  <title>Preparing Files for TFTP Net Booting</title>
@@ -60,7 +60,7 @@ interfaces directly in the SRM console.
 </para><para arch="hppa">
 
 Some older HPPA machines (e.g. 715/75) use RBOOTD rather than BOOTP.
-An RBOOTD package is available on the parisc-linux web site.
+There is an <classname>rbootd</classname> package available in Debian.
 
 </para><para>
 
diff --git a/ca/partitioning/partition-programs.xml b/ca/partitioning/partition-programs.xml
index c0b5bdaf7..57b95e11f 100644
--- a/ca/partitioning/partition-programs.xml
+++ b/ca/partitioning/partition-programs.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28997 untranslated -->
+<!-- original version: 31619 untranslated -->
 
  <sect1 id="partition-programs">
  <title>Debian Partitioning Programs</title>
@@ -18,7 +18,7 @@ your architecture.
 <term><command>partman</command></term>
 <listitem><para>
 
-Recommended partitioning tool in Debian. This swiss army knife can
+Recommended partitioning tool in Debian. This Swiss army knife can
 also resize partitions, create filesystems
 <phrase arch="i386"> (<quote>format</quote> in Windows speak)</phrase>
 and assign them to the mountpoints.
diff --git a/ca/partitioning/partition/i386.xml b/ca/partitioning/partition/i386.xml
index c4d621477..fced09dca 100644
--- a/ca/partitioning/partition/i386.xml
+++ b/ca/partitioning/partition/i386.xml
@@ -1,12 +1,12 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28997 untranslated -->
+<!-- original version: 31618 untranslated -->
 
 
   <sect2 arch="i386"><title>Partitioning for &arch-title;</title>
 <para>
 
 If you have an existing other operating system such as DOS or Windows and
-you want to preseve that operating system while installing Debian, you may
+you want to preserve that operating system while installing Debian, you may
 need to resize its partition to free up space for the Debian installation.
 The installer supports resizing of both FAT and NTFS filesystems; when you
 get to the installer's partitioning step, select the option to partition
diff --git a/ca/partitioning/schemes.xml b/ca/partitioning/schemes.xml
index 1a98c734e..64f99c2db 100644
--- a/ca/partitioning/schemes.xml
+++ b/ca/partitioning/schemes.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28672 untranslated -->
+<!-- original version: 31069 untranslated -->
 
 
  <sect1>
@@ -71,7 +71,7 @@ As an example, an older home machine might have 32MB of RAM and a
 500MB partition for another operating system on
 <filename>/dev/hda1</filename>, a 32MB swap partition on
 <filename>/dev/hda3</filename> and about 1.2GB on
-<filename>/dev/hda2</filename>) as the Linux partition.
+<filename>/dev/hda2</filename> as the Linux partition.
 
 </para><para>
 
diff --git a/ca/preparing/needed-info.xml b/ca/preparing/needed-info.xml
index c3ccc9b5c..4a2e392a0 100644
--- a/ca/preparing/needed-info.xml
+++ b/ca/preparing/needed-info.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28672 untranslated -->
+<!-- original version: 31136 untranslated -->
 
  <sect1 id="needed-info">
  <title>Information You Will Need</title>
@@ -10,17 +10,36 @@
    <sect3>
    <title>Installation Manual</title>
 
-<para>
+<para condition="for_cd">
 
-This file you are now reading, in plain ASCII, HTML or PDF format.
+This document you are now reading, in plain ASCII, HTML or PDF format.
 
 </para>
 
-<itemizedlist>
+<itemizedlist condition="for_cd">
 
 &list-install-manual-files;
 
 </itemizedlist>
+
+<para condition="for_wdo">
+
+The document you are now reading, which is the official version of the
+Installation Guide for the &releasename; release of Debian; available
+in <ulink url="&url-release-area;/installmanual">various formats and
+translations</ulink>.
+
+</para>
+
+<para condition="for_alioth">
+
+The document you are now reading, which is a development version of the
+Installation Guide for the next release of Debian; available in
+<ulink url="&url-d-i-alioth-manual;">various formats and
+translations</ulink>.
+
+</para>
+
 </sect3>
 
 
@@ -60,7 +79,7 @@ Often contains useful information on configuring or using your hardware.
 
 <listitem arch="mips;mipsel"><para>
 
-<ulink url="&url-mips-howto;">Linux/Mips Howto</ulink>
+<ulink url="&url-linux-mips;">Linux/Mips website</ulink>
 
 </para></listitem>
 
diff --git a/ca/using-d-i/modules/network-console.xml b/ca/using-d-i/modules/network-console.xml
index 40e90f6ee..505280b55 100644
--- a/ca/using-d-i/modules/network-console.xml
+++ b/ca/using-d-i/modules/network-console.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 30086 untranslated -->
+<!-- original version: 31173 untranslated -->
 
    <sect3 id="network-console">
    <title>Installation Over the Network</title>
@@ -85,7 +85,7 @@ have two possibilities called <guimenuitem>Start menu</guimenuitem> and
 <guimenuitem>Start shell</guimenuitem>. The former brings you to the
 main installer menu, where you can continue with the installation as
 usual. The latter starts a shell from which you can examine and possibly
-fix the the remote system. You should only start one SSH session for the
+fix the remote system. You should only start one SSH session for the
 installation menu, but may start multiple sessions for shells.
 
 </para><warning><para>