* Booting a USB stick via a boot floppy is not supported by current

  installer images.
* Update preseeding docs to use task names, not short descriptions, since
  that will work now and is more convenient for preseeding.
* Document the kde-desktop and gnome-desktop subtasks.

4 files changed, 24 insertions, 27 deletions

diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml
index a3aae0784..df97955f6 100644
--- a/en/appendix/preseed.xml
+++ b/en/appendix/preseed.xml
@@ -909,31 +909,37 @@ Available tasks as of this writing include:
 
 <itemizedlist>
 <listitem><para>
-  <userinput>Standard system</userinput>
+  <userinput>standard</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>Desktop environment</userinput>
+  <userinput>desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>Web server</userinput>
+  <userinput>gnome-desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>Print server</userinput>
+  <userinput>kde-desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>DNS server</userinput>
+  <userinput>web-server</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>File server</userinput>
+  <userinput>print-server</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>Mail server</userinput>
+  <userinput>dns-server</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>SQL database</userinput>
+  <userinput>file-server</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>Laptop</userinput>
+  <userinput>mail-server</userinput>
+</para></listitem>
+<listitem><para>
+  <userinput>sql-database</userinput>
+</para></listitem>
+<listitem><para>
+  <userinput>laptop</userinput>
 </para></listitem>
 </itemizedlist>
 
@@ -941,13 +947,14 @@ Available tasks as of this writing include:
 
 You can also choose to install no tasks, and force the installation of a
 set of packages in some other way. We recommend always including the
-<userinput>Standard system</userinput> task.
+<userinput>standard</userinput> task.
 
 </para>
 
 <informalexample role="example"><screen>
-tasksel tasksel/first multiselect Standard system, Desktop environment
-#tasksel tasksel/first multiselect Standard system, Web server
+tasksel tasksel/first multiselect standard, desktop
+#tasksel tasksel/first multiselect standard, web-server
+#tasksel tasksel/first multiselect standard, kde-desktop
 
 # Some versions of the installer can report back on what software you have
 # installed, and what software you use. The default is not to report back,
diff --git a/en/boot-installer/i386.xml b/en/boot-installer/i386.xml
index a9b01492b..fe94b6c27 100644
--- a/en/boot-installer/i386.xml
+++ b/en/boot-installer/i386.xml
@@ -203,15 +203,6 @@ computer.  The system should boot up, and you should be presented with
 the <prompt>boot:</prompt> prompt.  Here you can enter optional boot
 arguments, or just hit &enterkey;.
 
-</para><para condition="supports-floppy-boot">
-
-In case your computer doesn't support booting from USB memory devices,
-you can still use a single floppy to do the initial boot and then
-switch to USB. Boot your system as described in <xref linkend="floppy-boot"/>;
-the kernel on the boot floppy should detect your USB stick automatically.
-When it asks for the root floppy, simply press &enterkey;. You should see
-&d-i; starting.
-
 </para>
   </sect2>
 
diff --git a/en/boot-installer/parameters.xml b/en/boot-installer/parameters.xml
index a2c2e7e58..5c5a35a73 100644
--- a/en/boot-installer/parameters.xml
+++ b/en/boot-installer/parameters.xml
@@ -200,9 +200,9 @@ Debian installer from. For example,
 
 </para><para>
 
-The boot floppy, which normally scans all floppies and USB storage
-devices it can to find the root floppy, can be overridden by this
-parameter to only look at the one device.
+The boot floppy, which normally scans all floppies it can to find the
+root floppy, can be overridden by this parameter to only look at the
+one device.
 
 </para></listitem>
 </varlistentry>
diff --git a/en/howto/installation-howto.xml b/en/howto/installation-howto.xml
index 62cf57877..b821d07f1 100644
--- a/en/howto/installation-howto.xml
+++ b/en/howto/installation-howto.xml
@@ -156,9 +156,8 @@ sticks. For details, see <xref linkend="boot-usb-files" />.
 
 Some BIOSes can boot USB storage directly, and some cannot. You may need to
 configure your BIOS to boot from a <quote>removable drive</quote> or even a
-<quote>USB-ZIP</quote> to get it to boot from the USB device. If it
-doesn't, you can boot from one floppy and use the USB stick for the rest of
-the install. For helpful hints and details, see <xref linkend="usb-boot" />.
+<quote>USB-ZIP</quote> to get it to boot from the USB device. For helpful
+hints and details, see <xref linkend="usb-boot" />.
 
 </para><para arch="powerpc">