Update of original English docs

3 files changed, 110 insertions, 38 deletions

diff --git a/nl/boot-installer/parameters.xml b/nl/boot-installer/parameters.xml
index 7591d2bf7..0ff49ff2c 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: 43527 untranslated -->
+<!-- original version: 43675 untranslated -->
 
  <sect1 id="boot-parms"><title>Boot Parameters</title>
 <para>
@@ -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>
 
@@ -199,14 +206,13 @@ one device.
 </varlistentry>
 
 <varlistentry>
-<term>debian-installer/framebuffer</term>
+<term>debian-installer/framebuffer (fb)</term>
 <listitem><para>
 
 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>, or
-<userinput>fb=false</userinput> for short. Problem symptoms are error messages
+<userinput>fb=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.
 
@@ -237,16 +243,15 @@ parameter <userinput>debian-installer/framebuffer=true</userinput> or
 </para></note></listitem>
 </varlistentry>
 
-<varlistentry>
-<term>debian-installer/theme</term>
+<varlistentry arch="not-s390">
+<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 +297,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 +405,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 +417,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 +441,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/nl/boot-installer/sparc.xml b/nl/boot-installer/sparc.xml
index 81cad25e7..f737c2fc7 100644
--- a/nl/boot-installer/sparc.xml
+++ b/nl/boot-installer/sparc.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28997 untranslated -->
+<!-- original version: 43724 untranslated -->
 
   <sect2 arch="sparc" id="boot-tftp"><title>Booting with TFTP</title>
 
@@ -13,9 +13,7 @@ machine which is being installed (see
 Use the command <userinput>boot net</userinput> to boot from a TFTP
 and RARP server, or try <userinput>boot net:bootp</userinput> or
 <userinput>boot net:dhcp</userinput> to boot from a TFTP and BOOTP
-or DHCP server. Some older OpenBoot revisions require using
-the device name, such as <userinput>boot le()</userinput>; these
-probably don't support BOOTP nor DHCP.
+or DHCP server.
 
 </para>
   </sect2>
@@ -29,10 +27,7 @@ probably don't support BOOTP nor DHCP.
 
 Most OpenBoot versions support the <userinput>boot cdrom</userinput>
 command which is simply an alias to boot from the SCSI device on ID 6
-(or the secondary master for IDE based systems). You may have to use
-the actual device name for older OpenBoot versions that don't support
-this special command. Note that some problems have been reported on Sun4m
-(e.g., Sparc 10s and Sparc 20s) systems booting from CD-ROM.
+(or the secondary master for IDE based systems).
 
 </para>
   </sect2>
@@ -42,6 +37,15 @@ this special command. Note that some problems have been reported on Sun4m
   <title>Booting from Floppies</title>
 <para>
 
+Floppy images are currently only available for sparc32, but, for techinical
+reasons, not for official releases. (The reason is that they can only be
+built as root, which is not supported by our build daemons.)
+Look under <quote>daily built images</quote> on the
+<ulink url="&url-d-i;">Debian Installer project website</ulink> for links
+to floppy images for sparc32.
+
+</para><para>
+
 To boot from floppy on a Sparc, use
 
 <informalexample><screen>
@@ -51,8 +55,6 @@ Stop-A -&gt; OpenBoot: "boot floppy"
 Be warned that the newer Sun4u (ultra) architecture does not support
 floppy booting. A typical error message is <computeroutput>Bad magic
 number in disk label - Can't open disk label package</computeroutput>.
-Furthermore, a number of Sun4c models (such as the IPX) do not support
-the compressed images found on the disks, so also are not supported.
 
 </para><para>
 
diff --git a/nl/boot-installer/trouble.xml b/nl/boot-installer/trouble.xml
index 3a715fc89..e4efda20d 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: 43514 untranslated -->
+<!-- original version: 43694 untranslated -->
 
  <sect1 id="boot-troubleshooting">
  <title>Troubleshooting the Installation Process</title>
@@ -368,7 +368,7 @@ installer.
    </sect3>
 
    <sect3>
-   <title>System Freeze while Loading the USB Modules</title>
+   <title>System Freeze while Loading USB Modules</title>
 <para>
 
 The kernel normally tries to install USB modules and the USB keyboard driver
@@ -382,6 +382,58 @@ at the boot prompt, which will prevent the modules from being loaded.
    </sect3>
   </sect2>
 
+  <sect2 arch="sparc" id="sparc-boot-problems">
+  <title>Common &arch-title; Installation Problems</title>
+<para>
+
+There are some common installation problems that are worth mentioning.
+
+</para>
+   <sect3>
+   <title>Misdirected video output</title>
+<para>
+
+It is fairly common for &arch-title; to have two video cards in one machine,
+for example an ATI card and a Sun Creator 3D. In some cases, this may result
+in the video output getting misdirected soon after the system boots. In
+typical cases, the display will only show:
+
+<informalexample><screen>
+Remapping the kernel... done
+Booting Linux...
+</screen></informalexample>
+
+To work around this, you can either pull out one of the video cards, or
+disable the one not used during the OpenProm boot phase using a kernel
+parameter. For example, to disable an ATI card, you should boot the
+installer with <userinput>video=atyfb:off</userinput>.
+
+</para><para>
+
+Note that you may also have to manually add this parameter to the silo
+configuration (edit <filename>/target/etc/silo.conf</filename> before
+rebooting) and, if you installed X11, modify the video driver in
+<filename>/etc/X11/xorg.conf</filename>.
+
+</para>
+   </sect3>
+
+   <sect3>
+   <title>Failure to Boot or Install from CD-ROM</title>
+<para>
+
+Some Sparc systems are notoriously difficult to boot from CD-ROM and
+even if they do boot, there may be inexplicable failures during the
+installation. Most problems have been reported with SunBlade systems.
+
+</para><para>
+
+We recommend to install such systems by netbooting the installer.
+
+</para>
+   </sect3>
+  </sect2>
+
   <sect2 id="kernel-msgs">
   <title>Interpreting the Kernel Startup Messages</title>
 
@@ -450,9 +502,12 @@ you use an E-Mail address that you do not mind being made public.
 </para><para>
 
 If you have a working Debian system, the easiest way to send an installation
-report is to install the installation-report and reportbug packages
-(<command>apt-get install installation-report reportbug</command>) and run
-the command <command>reportbug installation-report</command>.
+report is to install the <classname>installation-report</classname> and
+<classname>reportbug</classname> packages
+(<command>aptitude install installation-report reportbug</command>),
+configure <classname>reportbug</classname> as explained in
+<xref linkend="mail-outgoing"/>, and run the command <command>reportbug
+installation-report</command>.
 
 </para><para>