From 9ed71b96e35fea4a6113c0f0f42bdfdb86cea198 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@debian.org>
Date: Thu, 27 Apr 2006 15:14:51 +0000
Subject: * 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.

---
 en/appendix/preseed.xml | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

(limited to 'en/appendix')

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,
-- 
cgit v1.2.3