Update of original English docs

3 files changed, 93 insertions, 19 deletions

diff --git a/nl/appendix/chroot-install.xml b/nl/appendix/chroot-install.xml
index 14114911a..3a47deb1c 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: 40980 untranslated -->
+<!-- original version: 41453 untranslated -->
 
  <sect1 id="linux-upgrade">
  <title>Installing &debian; from a Unix/Linux System</title>
@@ -126,22 +126,15 @@ archive (be sure to select the proper file for your
 architecture). Download the <command>debootstrap</command> .deb from
 the <ulink url="http://ftp.debian.org/debian/pool/main/d/debootstrap/">
 pool</ulink>, copy the package to the work folder, and extract the
-binary files from it. You will need to have root privileges to install
-the binaries.
+files from it. You will need to have root privileges to install
+the files.
 
 <informalexample><screen>
-# ar -x debootstrap_0.X.X_arch.deb
+# ar -x debootstrap_0.X.X_all.deb
 # cd /
 # 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>
 
diff --git a/nl/appendix/preseed.xml b/nl/appendix/preseed.xml
index 85113571c..f06f7fe89 100644
--- a/nl/appendix/preseed.xml
+++ b/nl/appendix/preseed.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 40460 untranslated -->
+<!-- original version: 41551 untranslated -->
 
 <!--
 Be carefull with the format of this file as it is parsed to generate
@@ -738,9 +738,8 @@ correct one will be selected before using preseeding.
 #d-i partman-auto/init_automatically_partition \
 #      select Use the largest continuous free space
 
-# Alternatively, you can specify a disk to partition. The device name can
-# be given in either devfs or traditional non-devfs format. If the method
-# supports it, you can specify several disks separated by spaces.
+# Alternatively, you can specify a disk to partition. The device name
+# can be given in either devfs or traditional non-devfs format.
 # For example, to use the first disk:
 d-i partman-auto/disk string /dev/discs/disc0/disc
 # In addition, you'll need to specify the method to use.
@@ -751,6 +750,8 @@ d-i partman-auto/method string lvm
 # contains an old LVM configuration, the user will normally receive a
 # warning. This can be preseeded away...
 d-i partman-auto/purge_lvm_from_device boolean true
+# And the same goes for the confirmation to write the lvm partitions.
+d-i partman-lvm/confirm boolean true
 
 # You can choose from any of the predefined partitioning recipes.
 # Note: this must be preseeded with a localized (translated) value.
@@ -796,6 +797,84 @@ d-i partman/confirm boolean true
 
   </sect2>
 
+  <sect2 id="preseed-partman-raid">
+  <title>Partitioning using RAID</title>
+<para>
+
+You can also use preseeding to set up partitions on software RAID arrays.
+Supported are RAID levels 0, 1 and 5, creating degraded arrays and
+specifying spare devices.
+If you are using RAID 1, you can preseed grub to install to all devices
+used in the array; see <xref linkend="preseed-bootloader"/>.
+
+</para>
+
+<warning><para>
+
+This type of automated partitioning is easy to get wrong. It is also a
+very new component that may still have some bugs or missing error
+handling. The responsibility to get the various recipes right (so they
+make sense and don't conflict) lies with the user.
+Check <filename>/var/log/syslog</filename> if you run into problems.
+
+</para><para>
+
+Note that only RAID 0 and RAID 1 have been tested by the developers of the
+component. RAID 5 is untested. Advanced RAID setup with degraded arrays or
+spare devices has only been tested lightly.
+
+</para></warning>
+
+<informalexample><screen>
+# NOTE: this option is of beta release quality and should be used carefully
+
+# The method should be set to "raid".
+#d-i partman-auto/method string raid
+# Specify the disks to be partitioned. They will all get the same layout,
+# so this will only work if the disks are the same size.
+#d-i partman-auto/disk string /dev/discs/disc0/disc /dev/discs/disc1/disc
+
+# Next you need to specify the physical partitions that will be used. 
+#d-i partman-auto/expert_recipe string \
+#      multiraid ::                                         \
+#              1000 5000 4000 raid                          \
+#                      $primary{ } method{ raid }           \
+#              .                                            \
+#              64 512 300% raid                             \
+#                      method{ raid }                       \
+#              .                                            \
+#              500 10000 1000000000 raid                    \
+#                      method{ raid }                       \
+#              .
+
+# Last you need to specify how the previously defined partitions will be
+# used in the RAID setup. Remember to use the correct partition numbers
+# for logical partitions.
+# Parameters are:
+# <raidtype> <devcount> <sparecount> <fstype> <mountpoint> \
+#          <devices> <sparedevices>
+# RAID levels 0, 1 and 5 are supported; devices are separated using "#"
+#d-i partman-auto-raid/recipe string \
+#    1 2 0 ext3 /                                           \
+#          /dev/discs/disc0/part1#/dev/discs/disc1/part1    \
+#    .                                                      \
+#    1 2 0 swap -                                           \
+#          /dev/discs/disc0/part5#/dev/discs/disc1/part5    \
+#    .                                                      \
+#    0 2 0 ext3 /home                                       \
+#          /dev/discs/disc0/part6#/dev/discs/disc1/part6    \
+#    .
+
+# This makes partman automatically partition without confirmation.
+d-i partman-md/confirm boolean true
+d-i partman/confirm_write_new_label boolean true
+d-i partman/choose_partition \
+       select Finish partitioning and write changes to disk
+d-i partman/confirm boolean true
+</screen></informalexample>
+
+  </sect2>
+
   <sect2 id="preseed-time">
   <title>Clock and time zone setup</title>
 
@@ -829,9 +908,11 @@ earlier questions. You can optionally add other (local) repositories.
 #d-i apt-setup/security_host string
 
 # Additional repositories, local[0-9] available
-#d-i apt-setup/local0/comment string local server
-#d-i apt-setup/local0/source string \
+#d-i apt-setup/local0/repository string \
 #       deb http://local.server/debian stable main
+#d-i apt-setup/local0/comment string local server
+# Enable deb-src lines
+#d-i apt-setup/local0/source boolean true
 # URL to the public key of the local repository
 #d-i apt-setup/local0/key string http://local.server/key
 </screen></informalexample>
diff --git a/nl/hardware/supported/hppa.xml b/nl/hardware/supported/hppa.xml
index 6f3c8c8ee..47578abcb 100644
--- a/nl/hardware/supported/hppa.xml
+++ b/nl/hardware/supported/hppa.xml
@@ -1,11 +1,11 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 11648 untranslated -->
+<!-- original version: 41452 untranslated -->
 
 
   <sect2 arch="hppa"><title>CPU, Main Boards, and Video Support</title>
 <para>
 
-The are two major support <emphasis>&architecture;</emphasis> flavors:
+There are two major support <emphasis>&architecture;</emphasis> flavors:
 PA-RISC 1.1 and PA-RISC 2.0.  The PA-RISC 1.1 architecture is targeted
 at 32-bit processors whereas the 2.0 architecture is targeted to
 the 64-bit processors.  Some systems are able to run either kernel.