Update of original English docs

8 files changed, 50 insertions, 35 deletions

diff --git a/nl/appendix/preseed.xml b/nl/appendix/preseed.xml
index fa1fdf396..256a8cac1 100644
--- a/nl/appendix/preseed.xml
+++ b/nl/appendix/preseed.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 37311 untranslated -->
+<!-- original version: 38290 untranslated -->
 
 <!--
 Be carefull with the format of this file as it is parsed to generate
@@ -318,8 +318,14 @@ Boot parameters to specify:
 
 <para>
 
+Note that <filename>preseed/url</filename> can be shortened to just
+<filename>url</filename> and <filename>preseed/file</filename> to just
+<filename>file</filename> when they are passed as boot parameters.
+
+</para><para>
+
 While you're at it, you may want to add a boot parameter
-<userinput>debconf/priority=critical</userinput>. This will avoid most
+<userinput>priority=critical</userinput>. This will avoid most
 questions even if the preseeding below misses some.
 
 </para>
@@ -382,6 +388,12 @@ for any of the preseed variables listed in the examples.
 
 </para><para>
 
+Note that some variables that are frequently set at the boot prompt have a
+shorter alias. If an alias is available, it is used in the examples in
+this appendix instead of the full variable.
+
+</para><para>
+
 A <quote>--</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
@@ -542,7 +554,7 @@ these questions have been asked.
 
 The locale can be used to specify both language and country.
 To specify the locale as a boot parameter, use
-<userinput>debian-installer/locale=<replaceable>en_US</replaceable></userinput>.
+<userinput>locale=<replaceable>en_US</replaceable></userinput>.
 
 <informalexample role="example"><screen>
 # Locale sets language and country.
@@ -596,7 +608,7 @@ kernel boot parameters.
 
 If you need to pick a particular interface when netbooting before loading
 a preconfiguration file from the network, use a boot parameter such as
-<userinput>netcfg/choose_interface=<replaceable>eth1</replaceable></userinput>.
+<userinput>interface=<replaceable>eth1</replaceable></userinput>.
 
 </para>
 
@@ -794,7 +806,7 @@ earlier questions. You can optionally add other (local) repositories.
 
 # Additional repositories, local[0-9] available
 #d-i apt-setup/local0/comment string local server
-#d-i apt-setup/local0/repository string \
+#d-i apt-setup/local0/source string \
 #       deb http://local.server/debian stable main
 # URL to the public key of the local repository
 #d-i apt-setup/local0/key string http://local.server/key
diff --git a/nl/boot-installer/i386.xml b/nl/boot-installer/i386.xml
index 24560c444..ab6130b4b 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: 36744 untranslated -->
+<!-- original version: 38231 untranslated -->
 
   <sect2 arch="i386"><title>Booting from a CD-ROM</title>
 
@@ -334,7 +334,7 @@ be useful can be found by pressing <keycap>F2</keycap> through
 <keycap>F8</keycap>. If you add any parameters to
 the boot command line, be sure to type the boot method (the default is
 <userinput>linux</userinput>) and a space before the first parameter (e.g.,
-<userinput>linux debconf/priority=medium</userinput>).
+<userinput>linux fb=false</userinput>).
 
 <note><para>
 
@@ -358,7 +358,7 @@ enact this keypress, for example the IRA uses <keycombo> <keycap>Ctrl</keycap>
 past the splash screen and at the help text your keystrokes will be echoed
 at the prompt as expected. To prevent the installer from using the
 framebuffer for the rest of the installation, you will also want to add
-<userinput>debian-installer/framebuffer=false</userinput> to the boot prompt,
+<userinput>fb=false</userinput> to the boot prompt,
 as described in the help text.
 
 </para></note>
diff --git a/nl/boot-installer/m68k.xml b/nl/boot-installer/m68k.xml
index 83fcced23..47b539087 100644
--- a/nl/boot-installer/m68k.xml
+++ b/nl/boot-installer/m68k.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 33725 untranslated -->
+<!-- original version: 38231 untranslated -->
 
   <sect2 arch="m68k"><title>Choosing an Installation Method</title>
 
@@ -48,8 +48,8 @@ The only method of installation available to amiga is the hard drive
 </para><para>
 
 Amiga does not currently work with bogl, so if
-you are seeing bogl errors, you need to include the kernel parameter
-<userinput>debian-installer/framebuffer=false</userinput>.
+you are seeing bogl errors, you need to include the boot parameter
+<userinput>fb=false</userinput>.
 
 </para>
     </sect3>
@@ -65,8 +65,8 @@ drive (see <xref linkend="m68k-boot-hd"/>) or from floppies
 </para><para>
 
 Atari does not currently work with bogl, so if
-you are seeing bogl errors, you need to include the kernel parameter
-<userinput>debian-installer/framebuffer=false</userinput>.
+you are seeing bogl errors, you need to include the boot parameter
+<userinput>fb=false</userinput>.
 
 </para>
     </sect3>
diff --git a/nl/boot-installer/parameters.xml b/nl/boot-installer/parameters.xml
index 630a7e645..c7e2d454f 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: 36744 untranslated -->
+<!-- original version: 38289 untranslated -->
 
  <sect1 id="boot-parms"><title>Boot Parameters</title>
 <para>
@@ -74,10 +74,10 @@ The installation system recognizes a few additional boot parameters<footnote>
 
 <para>
 
-Note that the kernel accepts a maximum of 8 command line options and
+Note that the 2.4 kernel accepts a maximum of 8 command line options and
 8 environment options (including any options added by default for the
 installer). If these numbers are exceeded, 2.4 kernels will drop any
-excess options and 2.6 kernels will panic. With kernel 2.6.9 or newer,
+excess options. With kernel 2.6.9 or newer,
 you can use 32 command line options and 32 environment options.
 
 </para>
@@ -92,21 +92,22 @@ you can use 32 command line options and 32 environment options.
 <listitem><para>
 
 This parameter sets the lowest priority of messages to be displayed.
+Short form: <userinput>priority</userinput>
 
 </para><para>
 
-The default installation uses <userinput>debconf/priority=high</userinput>.
+The default installation uses <userinput>priority=high</userinput>.
 This means that both high and critical priority messages are shown, but medium
 and low priority messages are skipped.
 If problems are encountered, the installer adjusts the priority as needed.
 
 </para><para>
 
-If you add <userinput>debconf/priority=medium</userinput> as boot parameter, you
+If you add <userinput>priority=medium</userinput> as boot parameter, you
 will be shown the installation menu and gain more control over the installation.
-When <userinput>debconf/priority=low</userinput> is used, all messages are shown
+When <userinput>priority=low</userinput> is used, all messages are shown
 (this is equivalent to the <emphasis>expert</emphasis> boot method).
-With <userinput>debconf/priority=critical</userinput>, the installation system
+With <userinput>priority=critical</userinput>, the installation system
 will display only critical messages and try to do the right thing without fuss.
 
 </para></listitem>
@@ -214,15 +215,16 @@ one device.
 Some architectures use the kernel framebuffer to offer installation in
 a number of languages. If framebuffer causes a problem on your system
 you can disable the feature by the parameter
-<userinput>debian-installer/framebuffer=false</userinput>. Problem
-symptoms are error messages about bterm or bogl, a blank screen, or
-a freeze within a few minutes after starting the install.
+<userinput>debian-installer/framebuffer=false</userinput>, or
+<userinput>fb=false</userinput> for short. Problem symptoms are error messages
+about bterm or bogl, a blank screen, or a freeze within a few minutes after
+starting the install.
 
 </para><para arch="i386">
 
 The <userinput>video=vga16:off</userinput> argument may also be used
-to disable the framebuffer. Such problems have been reported on a Dell
-Inspiron with Mobile Radeon card.
+to disable the kernel's use of the framebuffer. Such problems have been
+reported on a Dell Inspiron with Mobile Radeon card.
 
 </para><para arch="m68k">
 
@@ -290,6 +292,7 @@ this misbehavior.
 
 Specify the url to a preconfiguration file to download and use in
 automating the install. See <xref linkend="automatic-install"/>.
+Short form: <userinput>url</userinput>
 
 </para></listitem>
 </varlistentry>
@@ -300,6 +303,7 @@ automating the install. See <xref linkend="automatic-install"/>.
 
 Specify the path to a preconfiguration file to load to
 automating the install. See <xref linkend="automatic-install"/>.
+Short form: <userinput>file</userinput>
 
 </para></listitem>
 </varlistentry>
diff --git a/nl/boot-installer/trouble.xml b/nl/boot-installer/trouble.xml
index 6413f4833..bd3a3be40 100644
--- a/nl/boot-installer/trouble.xml
+++ b/nl/boot-installer/trouble.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 33725 untranslated -->
+<!-- original version: 38231 untranslated -->
 
  <sect1 id="boot-troubleshooting">
  <title>Troubleshooting the Installation Process</title>
@@ -115,8 +115,7 @@ If your screen begins to show a weird picture while the kernel boots,
 eg. pure white, pure black or colored pixel garbage, your system may
 contain a problematic video card which does not switch to the
 framebuffer mode properly.  Then you can use the boot parameter
-<userinput>debian-installer/framebuffer=false</userinput> or
-<userinput>video=vga16:off</userinput> to disable the framebuffer
+<userinput>fb=false video=vga16:off</userinput> to disable the framebuffer
 console. Only the English
 language will be available during the installation due to limited
 console features. See <xref linkend="boot-parms"/> for details.
diff --git a/nl/howto/installation-howto.xml b/nl/howto/installation-howto.xml
index af3827707..438c3be8a 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: 37295 untranslated -->
+<!-- original version: 37809 untranslated -->
 
 <appendix id="installation-howto">
 <title>Installation Howto</title>
@@ -28,7 +28,7 @@ If you encounter bugs during your install, please refer to
 on how to report them. If you have questions which cannot be
 answered by this document, please direct them to the debian-boot
 mailing list (&email-debian-boot-list;) or ask on IRC (#debian-boot
-on the freenode network).
+on the OFTC network).
 
 </para>
  </sect1>
diff --git a/nl/using-d-i/modules/kbd-chooser.xml b/nl/using-d-i/modules/kbd-chooser.xml
index deec0b9a8..b32ae07bc 100644
--- a/nl/using-d-i/modules/kbd-chooser.xml
+++ b/nl/using-d-i/modules/kbd-chooser.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- original version: 28672 -->
+<!-- original version: 38231 -->
 
    <sect3 id="kbd-chooser">
    <title>Een toetsenbord selecteren</title>
@@ -57,7 +57,7 @@ selecteert, zal dit resulteren in een niet werkend toetsenbord. Als u met de
 </para><para>
 
 Om een werkend toetsenbord te krijgen, kunt u het installatiesysteem het beste
-starten met parameter <userinput>debconf/priority=medium</userinput>. Op het
+starten met parameter <userinput>priority=medium</userinput>. Op het
 moment dat u bij de toetsenbordselectie komt<footnote>
 
 <para>
diff --git a/nl/using-d-i/using-d-i.xml b/nl/using-d-i/using-d-i.xml
index e62b55dc4..529212659 100644
--- a/nl/using-d-i/using-d-i.xml
+++ b/nl/using-d-i/using-d-i.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- original version: 36647 -->
+<!-- original version: 38231 -->
 
  <chapter id="d-i-intro"><title>Het Debian installatiesysteem gebruiken</title>
 
@@ -50,7 +50,7 @@ menugestuurde interface, waarbij niet het installatiesysteem automatisch
 elke stap in volgorde uitvoert maar elke stap door de gebruiker zelf
 wordt bepaald. Om het installatiesysteem op een handmatige, menugestuurde
 manier uit te voeren, moet de opstartparameter
-<userinput>debconf/priority=medium</userinput> worden toegevoegd.
+<userinput>priority=medium</userinput> worden toegevoegd.
 
 </para><para>
 
@@ -58,7 +58,7 @@ Als het voor uw apparatuur noodzakelijk is om parameters mee te geven bij de
 installatie van kernelmodules, dan zal u het installatiesysteem moeten starten
 in de <quote>expert</quote> modus. Dit is mogelijk door voor het opstarten
 van het installatiesysteem ofwel het commando <command>expert</command> te
-gebruiken ofwel de opstartparameter <userinput>debconf/priority=low</userinput>
+gebruiken ofwel de opstartparameter <userinput>priority=low</userinput>
 toe te voegen. De expert modus geeft u volledige controle over &d-i;.
 
 </para><para>