* Document new aliases added in preseed 1.17 for common debconf boot

  parameters: fb, url, file, locale, interface.

8 files changed, 38 insertions, 26 deletions

diff --git a/debian/changelog b/debian/changelog
index f9d7445d7..32d06ee73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,8 +32,10 @@ installation-guide (2006xxxx) UNRELEASED; urgency=low
   * Prebaseconfig renamed to finish-install, which changes some documentation,
     and. notably, renames one of the xml files.
   * hd-media size changed to 256 mb.
+  * Document new aliases added in preseed 1.17 for common debconf boot
+    parameters: fb, url, file, locale, interface.
 
- -- Joey Hess <joeyh@debian.org>  Sat, 13 May 2006 18:51:17 -0500
+ -- Joey Hess <joeyh@debian.org>  Mon, 19 Jun 2006 17:35:17 -0400
 
 installation-guide (20060427) unstable; urgency=low
 
diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml
index 50dd4deca..e75cb7df3 100644
--- a/en/appendix/preseed.xml
+++ b/en/appendix/preseed.xml
@@ -318,8 +318,15 @@ 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><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>
@@ -542,7 +549,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 +603,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>
 
diff --git a/en/boot-installer/i386.xml b/en/boot-installer/i386.xml
index fe94b6c27..d58bea242 100644
--- a/en/boot-installer/i386.xml
+++ b/en/boot-installer/i386.xml
@@ -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/en/boot-installer/m68k.xml b/en/boot-installer/m68k.xml
index 62f11cb39..25308353d 100644
--- a/en/boot-installer/m68k.xml
+++ b/en/boot-installer/m68k.xml
@@ -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/en/boot-installer/parameters.xml b/en/boot-installer/parameters.xml
index 5c5a35a73..0bad667df 100644
--- a/en/boot-installer/parameters.xml
+++ b/en/boot-installer/parameters.xml
@@ -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 user 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/en/boot-installer/trouble.xml b/en/boot-installer/trouble.xml
index 843f29201..17d1bbc6a 100644
--- a/en/boot-installer/trouble.xml
+++ b/en/boot-installer/trouble.xml
@@ -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/en/using-d-i/modules/kbd-chooser.xml b/en/using-d-i/modules/kbd-chooser.xml
index 31459f284..24d655756 100644
--- a/en/using-d-i/modules/kbd-chooser.xml
+++ b/en/using-d-i/modules/kbd-chooser.xml
@@ -54,7 +54,7 @@ kernel, there is no problem.
 </para><para>
 
 To get a working keyboard, you should boot the installer with parameter
-<userinput>debconf/priority=medium</userinput>. When you get to keyboard
+<userinput>priority=medium</userinput>. When you get to keyboard
 selection<footnote>
 
 <para>
diff --git a/en/using-d-i/using-d-i.xml b/en/using-d-i/using-d-i.xml
index 5162a8470..0ae8e0d8f 100644
--- a/en/using-d-i/using-d-i.xml
+++ b/en/using-d-i/using-d-i.xml
@@ -45,7 +45,7 @@ Power users may be more comfortable with a menu-driven interface,
 where each step is controlled by the user rather than the installer
 performing each step automatically in sequence. To use the installer
 in a manual, menu-driven way, add the boot argument
-<userinput>debconf/priority=medium</userinput>.
+<userinput>priority=medium</userinput>.
 
 </para><para>
 
@@ -53,7 +53,7 @@ If your hardware requires you to pass options to kernel modules as
 they are installed, you will need to start the installer in
 <quote>expert</quote> mode. This can be done by either using the
 <command>expert</command> command to start the installer or by adding
-the boot argument <userinput>debconf/priority=low</userinput>.
+the boot argument <userinput>priority=low</userinput>.
 Expert mode gives you full control over &d-i;.
 
 </para><para>