s#XFCE#Xfce#g - use actual Xfce name

3 files changed, 12 insertions, 12 deletions

diff --git a/README b/README
index a1d4df92..9c8ef55d 100644
--- a/README
+++ b/README
@@ -32,13 +32,13 @@ Installation tests with g-i, the graphical version of d-i, the debian-installer.
 ** boot of rescue system with daily build sid image
 
 * 'g-i-installation_debian_sid_daily-lxde' and '-xfce'
-** sid installation of XFCE/LXDE desktop with daily build sid image
+** sid installation of Xfce/LXDE desktop with daily build sid image
 
 * 'g-i-installation_debian_wheezy_lxde','-xfce','-kde' and '-gnome'
-** wheezy installation of XFCE/LXDE/KDE desktop with weekly build wheezy image
+** wheezy installation of Xfce/LXDE/KDE desktop with weekly build wheezy image
 
 * 'g-i-installation_debian_squeeze_xfce'
-** wheezy installation of XFCE desktop with squeeze image
+** wheezy installation of Xfce desktop with squeeze image
 
 * Debian Edu installation tests of specific profiles and suites:
 ** 'g-i-installation_debian-edu_squeeze-test_standalone'
diff --git a/job-cfg/chroot-installation.yaml b/job-cfg/chroot-installation.yaml
index 7f493efb..f5f3ce68 100644
--- a/job-cfg/chroot-installation.yaml
+++ b/job-cfg/chroot-installation.yaml
@@ -319,7 +319,7 @@
 
       - '{name}_sid_install_xfce':
          installation_params: 'sid xfce'
-         my_description: 'Debootstrap sid, then install XFCE.'
+         my_description: 'Debootstrap sid, then install Xfce.'
          my_recipients: 'jenkins+debian-qa holger@layer-acht.org'
 
       - '{name}_sid_install_full_desktop':
@@ -401,7 +401,7 @@
 
       - '{name}_wheezy_install_xfce':
          installation_params: 'wheezy xfce'
-         my_description: 'Debootstrap wheezy, then install XFCE.'
+         my_description: 'Debootstrap wheezy, then install Xfce.'
          my_recipients: 'jenkins+debian-qa holger@layer-acht.org'
 
       - '{name}_wheezy_install_lxde':
@@ -442,7 +442,7 @@
 
       - '{name}_jessie_install_xfce':
          installation_params: 'jessie xfce'
-         my_description: 'Debootstrap jessie, then install XFCE.'
+         my_description: 'Debootstrap jessie, then install Xfce.'
          my_recipients: 'jenkins+debian-qa holger@layer-acht.org'
 
       - '{name}_jessie_install_lxde':
diff --git a/job-cfg/g-i-installation.yaml b/job-cfg/g-i-installation.yaml
index 330abd41..73c400a6 100644
--- a/job-cfg/g-i-installation.yaml
+++ b/job-cfg/g-i-installation.yaml
@@ -321,9 +321,9 @@
          my_timed: '42 15 2,9,16,23 * *'
          my_recipients: 'holger@layer-acht.org'  # FIXME readd jenkins+debian-boot here and for other jobs - once we made this more stable
       - '{name}_debian_wheezy_xfce':
-         my_title: 'Debian (wheezy) XFCE desktop install'
+         my_title: 'Debian (wheezy) Xfce desktop install'
          my_shell: '/srv/jenkins/bin/g-i-installation.sh 12 debian_wheezy_xfce 10 http://d-i.debian.org/daily-images/amd64/daily/netboot/gtk/debian-installer/amd64/'
-         my_description: 'Do a fully automated installation of Debian XFCE desktop - via d-i preseeding (with <a href="http://jenkins.debian.net/d-i-preseed-cfgs/debian_wheezy_xfce_preseed.cfg">this preseed.cfg</a>) using netboot gtk.'
+         my_description: 'Do a fully automated installation of Debian Xfce desktop - via d-i preseeding (with <a href="http://jenkins.debian.net/d-i-preseed-cfgs/debian_wheezy_xfce_preseed.cfg">this preseed.cfg</a>) using netboot gtk.'
          my_timed: '42 16 2,9,16,23 * *'
          my_recipients: 'holger@layer-acht.org'
       - '{name}_debian_wheezy_kfreebsd':
@@ -345,15 +345,15 @@
          my_timed: '42 19 2,9,16,23 * *'
          my_recipients: 'holger@layer-acht.org'
       - '{name}_debian_squeeze_xfce':
-         my_title: 'Debian (squeeze) XFCE desktop install'
+         my_title: 'Debian (squeeze) Xfce desktop install'
          my_shell: '/srv/jenkins/bin/g-i-installation.sh 16 debian_squeeze_xfce 10 http://ftp.de.debian.org/debian/dists/squeeze/main/installer-amd64/current/images/netboot/gtk/debian-installer/amd64/'
-         my_description: 'Do a fully automated installation of Debian XFCE desktop - via d-i preseeding (with <a href="http://jenkins.debian.net/d-i-preseed-cfgs/debian_squeeze_xfce_preseed.cfg">this preseed.cfg</a>) using netboot gtk.'
+         my_description: 'Do a fully automated installation of Debian Xfce desktop - via d-i preseeding (with <a href="http://jenkins.debian.net/d-i-preseed-cfgs/debian_squeeze_xfce_preseed.cfg">this preseed.cfg</a>) using netboot gtk.'
          my_timed: '# debian squeeze jobs are only build on request. squeeze is stable.'
          my_recipients: 'holger@layer-acht.org'
       - '{name}_debian_sid_daily_xfce':
-         my_title: 'Debian (sid daily build CD) XFCE desktop install'
+         my_title: 'Debian (sid daily build CD) Xfce desktop install'
          my_shell: '/srv/jenkins/bin/g-i-installation.sh 17 debian_sid_daily_xfce 10 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso'
-         my_description: 'Do a fully automated installation of Debian XFCE desktop - via d-i preseeding (with <a href="http://jenkins.debian.net/d-i-preseed-cfgs/debian_sid_daily_xfce_preseed.cfg">this preseed.cfg</a>) using netboot gtk.'
+         my_description: 'Do a fully automated installation of Debian Xfce desktop - via d-i preseeding (with <a href="http://jenkins.debian.net/d-i-preseed-cfgs/debian_sid_daily_xfce_preseed.cfg">this preseed.cfg</a>) using netboot gtk.'
          my_timed: '42 8 * * *'
          my_recipients: 'holger@layer-acht.org'
       - '{name}_debian_sid_daily_kfreebsd':