- Document mirror/protocol boot parameter with short explanation of ftp protocol

- Use a clearer way to list the short form of parameters

4 files changed, 47 insertions, 23 deletions

diff --git a/debian/changelog b/debian/changelog
index 974877699..1d7150171 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -112,7 +112,8 @@ installation-guide (2006xxxx) UNRELEASED; urgency=low
     - Rewrite of NIC support, document wireless support (for selected arches)
       and explain issues surrounding drivers that require firmware.
   * boot-installer/parameters:
-    - Document anna/choose_modules boot parameter.
+    - Document anna/choose_modules and mirror/protocol boot parameters.
+    - Use a clearer way to list the short form of parameters.
   * boot-installer/trouble:
     - Fix reference to Save debug logs menu option.
       Thanks, Philippe Batailler. Closes: #402439.
@@ -146,7 +147,7 @@ installation-guide (2006xxxx) UNRELEASED; urgency=low
   * appendix/chroot-install:
     - Changes suggested in review by Wiktor Wandachowicz. Closes: #394929.
 
- -- Frans Pop <fjp@debian.org>  Fri, 29 Dec 2006 06:19:58 +0100
+ -- Frans Pop <fjp@debian.org>  Fri, 29 Dec 2006 19:42:47 +0100
 
 installation-guide (20060726) unstable; urgency=low
 
diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml
index c4f63a279..fafe6244e 100644
--- a/en/appendix/preseed.xml
+++ b/en/appendix/preseed.xml
@@ -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>
diff --git a/en/boot-installer/parameters.xml b/en/boot-installer/parameters.xml
index 8f67c5b75..7d458f50d 100644
--- a/en/boot-installer/parameters.xml
+++ b/en/boot-installer/parameters.xml
@@ -81,15 +81,22 @@ With current kernels (2.6.9 or newer) you can use 32 command line options and
 
 </footnote> which may be useful.
 
+</para><para>
+
+A number of parameters have a <quote>short form</quote> that helps avoid
+the limitations of the kernel command line options and makes entering the
+parameters easier. If a parameter has a short form, it will be listed in
+brackets behind the (normal) long form. Examples in this manual will
+normally use the short form too.
+
 </para>
 
 <variablelist>
 <varlistentry>
-<term>debconf/priority</term>
+<term>debconf/priority (priority)</term>
 <listitem><para>
 
 This parameter sets the lowest priority of messages to be displayed.
-Short form: <userinput>priority</userinput>.
 
 </para><para>
 
@@ -238,15 +245,14 @@ parameter <userinput>debian-installer/framebuffer=true</userinput> or
 </varlistentry>
 
 <varlistentry arch="not-s390">
-<term>debian-installer/theme</term>
+<term>debian-installer/theme (theme)</term>
 <listitem><para>
 
 A theme determines how the user interface of the installer looks (colors,
 icons, etc.). What themes are available differs per frontend.  Currently
 both the newt and gtk frontends only have a <quote>dark</quote> theme that was
-designed for visually impaired users. Set the theme by booting with parameter
-<userinput>debian-installer/theme=<replaceable>dark</replaceable></userinput>
-or <userinput>theme=<replaceable>dark</replaceable></userinput>.
+designed for visually impaired users. Set the theme by booting with 
+<userinput>theme=<replaceable>dark</replaceable></userinput>.
 
 </para></listitem>
 </varlistentry>
@@ -292,33 +298,31 @@ this misbehavior.
 </varlistentry>
 
 <varlistentry>
-<term>preseed/url</term>
+<term>preseed/url (url)</term>
 <listitem><para>
 
 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>
 
 <varlistentry>
-<term>preseed/file</term>
+<term>preseed/file (file)</term>
 <listitem><para>
 
 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>
 
 <varlistentry>
-<term>auto-install/enabled</term>
+<term>auto-install/enabled (auto)</term>
 <listitem><para>
 
 Delay questions that are normally asked before preseeding is possible until
-after the network is configured. Short form: <userinput>auto=true</userinput>.
+after the network is configured.
 See <xref linkend="preseed-auto"/> for details about using this to
 automate installs.
 
@@ -402,12 +406,11 @@ cases. General instructions how to do this can be found in
 <variablelist>
 
 <varlistentry>
-<term>debian-installer/locale</term>
+<term>debian-installer/locale (locale)</term>
 <listitem><para>
 
 Can be used to set both the language and country for the installation.
 This will only work if the locale is supported in Debian.
-Short form: <userinput>locale</userinput>.
 For example, use <userinput>locale=de_CH</userinput> to select German as
 language and Switzerland as country.
 
@@ -415,11 +418,11 @@ language and Switzerland as country.
 </varlistentry>
 
 <varlistentry>
-<term>anna/choose_modules</term>
+<term>anna/choose_modules (modules)</term>
 <listitem><para>
 
 Can be used to automatically load installer components that are not loaded
-by default. Short form: <userinput>modules</userinput>.
+by default.
 Examples of optional components that may be useful are
 <classname>openssh-client-udeb</classname> (so you can use
 <command>scp</command> during the installation) and
@@ -439,13 +442,26 @@ force static network configuration.
 </varlistentry>
 
 <varlistentry>
-<term>tasksel:tasksel/first</term>
+<term>mirror/protocol (protocol)</term>
+<listitem><para>
+
+By default the installer will use the http protocol to download files from
+Debian mirrors and changing that to ftp is not possible during installations
+at normal priority. By setting this parameter to <userinput>ftp</userinput>,
+you can force the installer to use that protocol instead. Note that you
+cannot select an ftp mirror from a list, you have to enter the hostname
+manually.
+
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>tasksel:tasksel/first (tasks)</term>
 <listitem><para>
 
 Can be used to select tasks that are not available from the interactive task
 list, such as the <literal>kde-desktop</literal> task.
 See <xref linkend="pkgsel"/> for additional information.
-Short form: <userinput>tasks</userinput>.
 
 </para></listitem>
 </varlistentry>
diff --git a/en/using-d-i/modules/choose-mirror.xml b/en/using-d-i/modules/choose-mirror.xml
index b9e3ba30f..ec4e98b08 100644
--- a/en/using-d-i/modules/choose-mirror.xml
+++ b/en/using-d-i/modules/choose-mirror.xml
@@ -2,16 +2,22 @@
 <!-- $Id$ -->
 
 <!--
+Hmm. This really does need documenting :-/
+
 - Component is only selected and executed if the installer needs to load
   installer components or the base system from the network
   (either local or the internet).
 - This means you first have to configure a network interface.
+- Mirror selection is delayed until apt-setup for CD-based installs (except
+  businesscard)
 - A list of countries is displayed with the default based on the country you
   selected earlier.
-- Note that not all mirrors are equal (see http://www.nl.debian.org/mirror/list)
 - Selection of a local mirror (at top of the list: manual selection).
 - After selecting a country, a list of mirrors in the country will be shown.
+  (not for ftp)
+- Forcing to ftp can be done using "protocol=ftp"
+- Note that not all mirrors are equal (see http://www.nl.debian.org/mirror/list)
 
 - The selected mirror will be tested.
 - How to handle problems with mirrors.
--->
\ No newline at end of file
+-->