installation-guide:

Reword the "Installing Additional Software" section to make it easier
to change the default desktop environment in the installation guide.

3 files changed, 26 insertions, 23 deletions

diff --git a/debian/changelog b/debian/changelog
index feb98a3e7..a60463d76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,9 @@ installation-guide (201312xx) UNRELEASED; urgency=low
   * Remove ia64 and s390 from the supported architecture list
     for Jessie.
   * Update several common entities for Jessie.
+  * Reword the "Installing Additional Software" section to make it 
+    easier to change the default desktop environment in the installation
+    guide.
  
  -- Martin Michlmayr <tbm@cyrius.com>  Sat, 14 Dec 2013 10:20:37 +0000
 
diff --git a/en/using-d-i/modules/apt-setup.xml b/en/using-d-i/modules/apt-setup.xml
index 8d152db5d..40d2402e7 100644
--- a/en/using-d-i/modules/apt-setup.xml
+++ b/en/using-d-i/modules/apt-setup.xml
@@ -88,13 +88,6 @@ packages you may need from the Internet by using a mirror.
 The same goes for DVD sets: the first DVD, or maybe the first two DVDs
 will cover most needs.
 
-</para><para>
-
-A good rule of thumb is that for a regular desktop installation (using the
-GNOME desktop environment) only the first three CDs are needed. For the
-alternative desktop environments (KDE or Xfce), additional CDs are needed.
-The first DVD easily covers all three desktop environments.
-
 </para></note>
 <para>
 
diff --git a/en/using-d-i/modules/pkgsel.xml b/en/using-d-i/modules/pkgsel.xml
index 6a12b13aa..2882be26a 100644
--- a/en/using-d-i/modules/pkgsel.xml
+++ b/en/using-d-i/modules/pkgsel.xml
@@ -55,22 +55,29 @@ to toggle selection of a task.
 </para></tip>
 <note><para>
 
-Unless you are using the special KDE or Xfce/LXDE CDs, the <quote>Desktop
-environment</quote> task will install the GNOME desktop environment.
+The <quote>Desktop environment</quote> task will install a graphical
+desktop environment.
 
 </para><para>
 
-It is not possible to interactively select a different desktop during
-the installation. However, it <emphasis>is</emphasis> possible to get &d-i;
-to install a KDE desktop environment instead of GNOME by using preseeding
-(see <xref linkend="preseed-pkgsel"/>) or by adding the parameter
-<literal>desktop=kde</literal> at the boot prompt when starting the
-installer. Alternatively the more lightweight Xfce and LXDE desktop
-environments can be selected by using <literal>desktop=xfce</literal> or
-<literal>desktop=lxde</literal>.
+By default, &d-i; installs the Xfce desktop environment.
+It is not possible to interactively select a different desktop 
+environment during the installation, however, it <emphasis>is</emphasis>
+possible to have the installer install a different desktop environment 
+by using preseeding (see <xref linkend="preseed-pkgsel"/>) or by
+adding the parameter 
+<literal>desktop=name_of_the_desktop_environment</literal>
+at the boot prompt when starting the installer. Possible variants
+in this case are <literal>desktop=gnome</literal>, 
+<literal>desktop=kde</literal>, <literal>desktop=lxde</literal> or 
+<literal>desktop=xfce</literal>.
 
 </para><para arch="x86">
 
+If you use the special GNOME-, KDE- or LXDE-variant of the first
+CD in the full CD set, the installer installs the respective desktop
+environment instead of the default.
+
 Some CD images (netinst and DVD) also allow selection of
 the desired desktop environment from the graphical boot menu. Select the
 <quote>Advanced options</quote> option in the main menu and look for
@@ -78,12 +85,12 @@ the desired desktop environment from the graphical boot menu. Select the
 
 </para><para>
 
-Note that this will only work if the packages needed for the desired
-desktop environment
-are actually available. If you are installing using a single full CD image,
-they will need to be downloaded from a mirror as most needed packages are
-only included on later CDs; installing KDE, Xfce or LXDE this way should work
-fine if you are using a DVD image or any other installation method.
+Note that this will only work if the packages needed for the desired desktop
+environment are actually available.  If you are installing using a single
+full CD image, they will possibly need to be downloaded from a network mirror as
+some of the needed packages for your choice might only be included on later
+CDs. Installing any of the available desktop environments this way should
+work fine if you are using a DVD image or any other installation method.
 
 </para></note>
 <para>