summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog5
-rw-r--r--en/appendix/preseed.xml8
2 files changed, 11 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 8aa4e963c..f928cd20c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,10 @@ installation-guide (2007xxxx) UNRELEASED; urgency=low
* Remove all information about RiscPC because these machines are
no longer supported.
- -- Frans Pop <fjp@debian.org> Mon, 19 Mar 2007 20:38:37 +0100
+ [ Joey Hess ]
+ * Document the new tasksel/desktop preseed for lenny.
+
+ -- Joey Hess <joeyh@debian.org> Tue, 17 Apr 2007 21:53:35 -0400
installation-guide (20070319) unstable; urgency=low
diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml
index ad28addb8..9137433bb 100644
--- a/en/appendix/preseed.xml
+++ b/en/appendix/preseed.xml
@@ -1237,9 +1237,15 @@ to be used easily on the kernel command line as well.
</para>
<informalexample role="example"><screen>
-tasksel tasksel/first multiselect standard, desktop
#tasksel tasksel/first multiselect standard, web-server
+<phrase condition="lenny">
+# If the desktop task is selected, install the kde and xfce desktops
+# instead of the default gnome desktop.
+#tasksel tasksel/desktop multiselect kde-desktop, xfce-desktop
+</phrase>
+<phrase condition="etch">
#tasksel tasksel/first multiselect standard, kde-desktop
+</phrase>
# Individual additional packages to install
#d-i pkgsel/include string openssh-server build-essential