Update of original English docs

2 files changed, 53 insertions, 16 deletions

diff --git a/nl/appendix/chroot-install.xml b/nl/appendix/chroot-install.xml
index 798904902..884ebc92c 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: 43576 untranslated -->
+<!-- original version: 43724 untranslated -->
 
  <sect1 id="linux-upgrade">
  <title>Installing &debian; from a Unix/Linux System</title>
@@ -441,22 +441,58 @@ and a boot loader. Identify available pre-packaged kernels with:
 # apt-cache search linux-image
 </screen></informalexample>
 
-Then install your choice using its package name.
+</para><para>
+
+If you intend to use a pre-packaged kernel, you may want to create the
+configuration file <filename>/etc/kernel-img.conf</filename> before you
+do so. Here's an example file:
 
 <informalexample><screen>
-# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</replaceable>
+# Kernel image management overrides
+# See kernel-img.conf(5) for details
+do_symlinks = yes
+relative_links = yes
+do_bootloader = yes
+do_bootfloppy = no
+do_initrd = yes
+link_in_boot = no
 </screen></informalexample>
 
-</para>
-<note><para>
+</para><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.
+For detailed information about this file and the various options, consult
+its man page which will be available after installing the
+<classname>kernel-package</classname> package. We recommend that you check
+that the values are appropriate for your system.
 
-</para></note>
+</para><para arch="x86">
+
+If you intend to use <classname>grub</classname> as your bootloader, you
+can set the <literal>do_bootloader</literal> option to <quote>no</quote>.
+To automatically update your <filename>/boot/grub/menu.lst</filename> on
+installation or removal of Debian kernels, add the following lines:
+
+<informalexample><screen>
+postinst_hook = update-grub
+postrm_hook   = update-grub
+</screen></informalexample>
+
+For the <classname>lilo</classname> bootloader, the value of
+<literal>do_bootloader</literal> needs to be <quote>yes</quote>.
+
+</para><para>
+
+Then install the kernel package of your choice using its package name.
+
+<informalexample><screen>
+# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</replaceable>
+</screen></informalexample>
+
+If you did not create a <filename>/etc/kernel-img.conf</filename> before
+installing a pre-packaged kernel, you may be asked some questions during
+its installation that refer to it.
+
+</para>
   </sect2>
 
   <sect2>
@@ -543,9 +579,9 @@ instead of <userinput>hd:</userinput>.
 <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:
+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 install all packages with <quote>standard</quote> priority:
 
 <informalexample><screen>
 # tasksel install standard
diff --git a/nl/appendix/preseed.xml b/nl/appendix/preseed.xml
index 6fd019918..cbe756d94 100644
--- a/nl/appendix/preseed.xml
+++ b/nl/appendix/preseed.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 43583 untranslated -->
+<!-- original version: 43658 untranslated -->
 
 <!--
 Be carefull with the format of this file as it is parsed to generate
@@ -508,9 +508,10 @@ The following aliases can be useful when using (auto mode) preseeding.
 <row><entry>priority</entry><entry>debconf/priority</entry></row>
 <row><entry>file</entry><entry>preseed/file</entry></row>
 <row><entry>url</entry><entry>preseed/url</entry></row>
+<row><entry>interface</entry><entry>netcfg/choose_interface</entry></row>
 <row><entry>hostname&nbsp;&nbsp;&nbsp;</entry><entry>netcfg/get_hostname</entry></row>
 <row><entry>domain</entry><entry>netcfg/get_domain</entry></row>
-<row><entry>interface</entry><entry>netcfg/choose_interface</entry></row>
+<row><entry>protocol</entry><entry>mirror/protocol</entry></row>
 <row><entry>suite</entry><entry>mirror/suite</entry></row>
 </tbody></tgroup>
 </informaltable>