Remove the deprecated item(IMAGES_EN+= install/desktop.scr

install/xf86setup.scr) link of IMAGE_EN to avoid building failure. Sorry.
svn path=/head/; revision=30352
2007-06-27 15:42:51 +00:00 · 2007-06-27 15:42:51 +00:00 · f7c4c3dcc1 · 2020-12-08 03:00:23 +00:00
commit f7c4c3dcc1
parent bd441c853a
25 changed files with 0 additions and 196 deletions
--- a/es_ES.ISO8859-1/books/handbook/Makefile
+++ b/es_ES.ISO8859-1/books/handbook/Makefile
@ -51,7 +51,6 @@ IMAGES_EN+= install/console-saver1.scr
 IMAGES_EN+= install/console-saver2.scr
 IMAGES_EN+= install/console-saver3.scr
 IMAGES_EN+= install/console-saver4.scr
-IMAGES_EN+= install/desktop.scr
 IMAGES_EN+= install/disklabel-auto.scr
 IMAGES_EN+= install/disklabel-ed1.scr
 IMAGES_EN+= install/disklabel-ed2.scr
@ -106,7 +105,6 @@ IMAGES_EN+= install/timezone2.scr
 IMAGES_EN+= install/timezone3.scr
 IMAGES_EN+= install/userconfig.scr
 IMAGES_EN+= install/userconfig2.scr
-IMAGES_EN+= install/xf86setup.scr
 IMAGES_EN+= mail/mutt1.scr
 IMAGES_EN+= mail/mutt2.scr
 IMAGES_EN+= mail/mutt3.scr
--- a/es_ES.ISO8859-1/books/handbook/install/chapter.sgml
+++ b/es_ES.ISO8859-1/books/handbook/install/chapter.sgml
@ -4168,17 +4168,6 @@ Edite /etc/rc.conf para modificar la configuraci
 	monitor puede pasar a la configuraci&oacute;n de su servidor X: 
 	seleccione &gui.yes; y pulse <keycap>Intro</keycap>.</para>

-      <figure id="xserver2">
-	<title>Men&uacute; de selecci&oacute;n del m&eacute;todo de 
-	  configuraci&oacute;n</title>
-
-	<mediaobject>
-	  <imageobject>
-	    <imagedata fileref="install/xf86setup" format="PNG">
-	  </imageobject>
-	</mediaobject>
-      </figure>
-
      <para>Hay varios m&eacute;todos de configuraci&oacute;n del 
 	servidor X.  Use las flechas para seleccionar el m&eacute;todo 
 	que prefiera y pulse <keycap>Intro</keycap>.  Lea atentamente todos 
@ -4687,17 +4676,6 @@ failed.  Would you like to try again?
 	que sea su escritorio por defecto.  As&iacute; podr&aacute; comenzar 
 	en cuanto acabe con la instalaci&oacute;n.</para>

-      <figure id="x-desktop">
-	<title>Elecci&oacute;n del escritorio por defecto</title>
-
-	<mediaobject>
-	  <imageobject>
-	    <imagedata fileref="install/desktop" format="PNG">
-	  </imageobject>
-	</mediaobject>
-      </figure>
-
-
      <para>Seleccione un escritorio con las flechas y pulse 
 	<keycap>Intro</keycap>.  El escritorio que haya elegido se 
 	instalar&aacute;.</para>
--- a/es_ES.ISO8859-1/books/handbook/txtfiles.ent
+++ b/es_ES.ISO8859-1/books/handbook/txtfiles.ent
@ -21,7 +21,6 @@
 <!ENTITY txt.install.console-saver2	SYSTEM "install/console-saver2.txt">
 <!ENTITY txt.install.console-saver3	SYSTEM "install/console-saver3.txt">
 <!ENTITY txt.install.console-saver4	SYSTEM "install/console-saver4.txt">
-<!ENTITY txt.install.desktop	 	SYSTEM "install/desktop.txt">
 <!ENTITY txt.install.disklabel-auto	SYSTEM "install/disklabel-auto.txt">
 <!ENTITY txt.install.disklabel-ed1	SYSTEM "install/disklabel-ed1.txt">
 <!ENTITY txt.install.disklabel-ed2	SYSTEM "install/disklabel-ed2.txt">
@ -70,4 +69,3 @@
 <!ENTITY txt.install.timezone3	 	SYSTEM "install/timezone3.txt">
 <!ENTITY txt.install.userconfig	 	SYSTEM "../../../share/images/books/handbook/install/userconfig.txt">
 <!ENTITY txt.install.userconfig2	SYSTEM "../../../share/images/books/handbook/install/userconfig2.txt">
-<!ENTITY txt.install.xf86setup	 	SYSTEM "install/xf86setup.txt">
--- a/fr_FR.ISO8859-1/books/handbook/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/Makefile
@ -93,8 +93,6 @@ IMAGES_EN+= install/mouse3.scr
 IMAGES_EN+= install/mouse4.scr
 IMAGES_EN+= install/mouse5.scr
 IMAGES_EN+= install/mouse6.scr
-IMAGES_EN+= install/xf86setup.scr
-IMAGES_EN+= install/desktop.scr
 IMAGES_EN+= install/pkg-cat.scr
 IMAGES_EN+= install/pkg-sel.scr
 IMAGES_EN+= install/pkg-install.scr
--- a/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml
+++ b/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml
@ -3860,16 +3860,6 @@ Press [Enter] now to invoke an editor on /etc/exports
 	sur <keycap>Entr&eacute;e</keycap> pour continuer la configuration du
 	serveur X.</para>

-      <figure id="xserver2">
-	<title>S&eacute;lectionnez la m&eacute;thode de configuration</title>
-
-	<mediaobject>
-	  <imageobject>
-	    <imagedata fileref="install/xf86setup" format="PNG">
-	  </imageobject>
-	</mediaobject>
-      </figure>
-
      <para>Il y a plusieurs fa&ccedil;ons de configurer le serveur X.
 	Utilisez les touches fl&eacute;ch&eacute;es pour s&eacute;lectionner
 	une des m&eacute;thodes et appuyez sur <keycap>Entr&eacute;e</keycap>.
@ -4413,16 +4403,6 @@ failed.  Would you like to try again?
 	Cela vous permettra de le lancer juste apr&egrave;s
 	l'installation.</para>

-      <figure id="x-desktop">
-	<title>S&eacute;lectionner l'environnement par d&eacute;faut</title>
-
-	<mediaobject>
-	  <imageobject>
-	    <imagedata fileref="install/desktop" format="PNG">
-	  </imageobject>
-	</mediaobject>
-      </figure>
-
      <para>Utilisez les touches fl&eacute;ch&eacute;es pour
 	s&eacute;lectionner un
 	environnement et appuyez sur <keycap>Enter</keycap>.
--- a/it_IT.ISO8859-15/books/handbook/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/Makefile
@ -54,7 +54,6 @@ IMAGES_EN+= install/console-saver1.scr
 IMAGES_EN+= install/console-saver2.scr
 IMAGES_EN+= install/console-saver3.scr
 IMAGES_EN+= install/console-saver4.scr
-IMAGES_EN+= install/desktop.scr
 IMAGES_EN+= install/disklabel-auto.scr
 IMAGES_EN+= install/disklabel-ed1.scr
 IMAGES_EN+= install/disklabel-ed2.scr
@ -114,7 +113,6 @@ IMAGES_EN+= install/timezone2.scr
 IMAGES_EN+= install/timezone3.scr
 IMAGES_EN+= install/userconfig.scr
 IMAGES_EN+= install/userconfig2.scr
-IMAGES_EN+= install/xf86setup.scr
 IMAGES_EN+= mail/mutt1.scr
 IMAGES_EN+= mail/mutt2.scr
 IMAGES_EN+= mail/mutt3.scr
--- a/it_IT.ISO8859-15/books/handbook/txtfiles.ent
+++ b/it_IT.ISO8859-15/books/handbook/txtfiles.ent
@ -22,7 +22,6 @@
 <!ENTITY txt.install.console-saver2     SYSTEM "install/console-saver2.txt">
 <!ENTITY txt.install.console-saver3     SYSTEM "install/console-saver3.txt">
 <!ENTITY txt.install.console-saver4     SYSTEM "install/console-saver4.txt">
-<!ENTITY txt.install.desktop            SYSTEM "install/desktop.txt">
 <!ENTITY txt.install.disklabel-auto     SYSTEM "install/disklabel-auto.txt">
 <!ENTITY txt.install.disklabel-ed1      SYSTEM "install/disklabel-ed1.txt">
 <!ENTITY txt.install.disklabel-ed2      SYSTEM "install/disklabel-ed2.txt">
@ -71,4 +70,3 @@
 <!ENTITY txt.install.timezone3          SYSTEM "install/timezone3.txt">
 <!ENTITY txt.install.userconfig         SYSTEM "../../../share/images/books/handbook/install/userconfig.txt">
 <!ENTITY txt.install.userconfig2        SYSTEM "../../../share/images/books/handbook/install/userconfig2.txt">
-<!ENTITY txt.install.xf86setup          SYSTEM "install/xf86setup.txt">
--- a/mn_MN.UTF-8/books/handbook/Makefile
+++ b/mn_MN.UTF-8/books/handbook/Makefile
@ -55,7 +55,6 @@ IMAGES_EN+= install/console-saver1.scr
 IMAGES_EN+= install/console-saver2.scr
 IMAGES_EN+= install/console-saver3.scr
 IMAGES_EN+= install/console-saver4.scr
-IMAGES_EN+= install/desktop.scr
 IMAGES_EN+= install/disklabel-auto.scr
 IMAGES_EN+= install/disklabel-ed1.scr
 IMAGES_EN+= install/disklabel-ed2.scr
@ -110,7 +109,6 @@ IMAGES_EN+= install/timezone2.scr
 IMAGES_EN+= install/timezone3.scr
 IMAGES_EN+= install/userconfig.scr
 IMAGES_EN+= install/userconfig2.scr
-IMAGES_EN+= install/xf86setup.scr
 IMAGES_EN+= mail/mutt1.scr
 IMAGES_EN+= mail/mutt2.scr
 IMAGES_EN+= mail/mutt3.scr
--- a/mn_MN.UTF-8/books/handbook/install/chapter.sgml
+++ b/mn_MN.UTF-8/books/handbook/install/chapter.sgml
@ -3171,16 +3171,6 @@ Press [Enter] now to invoke an editor on /etc/exports
      <para>Хэрэв танд дэлгэцийн болон картын тань мэдээлэл байгаа бол 
 	&gui.yes; гэж сонгоод <keycap>Enter</keycap> дээр дарж Х серверийг тохируулахаар үргэлжлүүлэх болно.</para>

-      <figure id="xserver2">
-	<title>Тохируулах горимыг сонгох</title>
-
-	<mediaobject>
-	  <imageobject>
-	    <imagedata fileref="install/xf86setup" format="PNG">
-	  </imageobject>
-	</mediaobject>
-      </figure>
-
      <para>Х серверийг тохируулах хэд хэдэн арга бий.
 	Сумтай товч ашиглан аль нэг аргыг нь сонгоод 
 	<keycap>Enter</keycap> дээр дарах хэрэгтэй.  Бүх заавруудыг нь тун анхааралтай уншаарай.</para>
@ -3641,16 +3631,6 @@ failed.  Would you like to try again?

      <para>Та олонд дэлгэрсэн орчнуудаас нэгийг нь анхдагч орчин болгож сонгож болно. Ингэснээр суулгац дууссан хойно уг график орчноор эхлэх боломж олгодог. </para>

-      <figure id="x-desktop">
-	<title>Анхдагч график орчныг сонгох нь</title>
-
-	<mediaobject>
-	  <imageobject>
-	    <imagedata fileref="install/desktop" format="PNG">
-	  </imageobject>
-	</mediaobject>
-      </figure>
-
      <para>Сумтай товч ашиглан орчноо сонгоод 
 	<keycap>Enter</keycap> дээр дараарай. Сонгосон орчныг суулгах явц эхлэх болно.</para>
    </sect2>
--- a/mn_MN.UTF-8/books/handbook/txtfiles.ent
+++ b/mn_MN.UTF-8/books/handbook/txtfiles.ent
@ -26,7 +26,6 @@
 <!ENTITY txt.install.console-saver2	SYSTEM "install/console-saver2.txt">
 <!ENTITY txt.install.console-saver3	SYSTEM "install/console-saver3.txt">
 <!ENTITY txt.install.console-saver4	SYSTEM "install/console-saver4.txt">
-<!ENTITY txt.install.desktop	 	SYSTEM "install/desktop.txt">
 <!ENTITY txt.install.disklabel-auto	SYSTEM "install/disklabel-auto.txt">
 <!ENTITY txt.install.disklabel-ed1	SYSTEM "install/disklabel-ed1.txt">
 <!ENTITY txt.install.disklabel-ed2	SYSTEM "install/disklabel-ed2.txt">
@ -75,4 +74,3 @@
 <!ENTITY txt.install.timezone3	 	SYSTEM "install/timezone3.txt">
 <!ENTITY txt.install.userconfig	 	SYSTEM "../../../share/images/books/handbook/install/userconfig.txt">
 <!ENTITY txt.install.userconfig2	SYSTEM "../../../share/images/books/handbook/install/userconfig2.txt">
-<!ENTITY txt.install.xf86setup	 	SYSTEM "install/xf86setup.txt">
--- a/nl_NL.ISO8859-1/books/handbook/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/Makefile
@ -55,7 +55,6 @@ IMAGES_EN+= install/console-saver1.scr
 IMAGES_EN+= install/console-saver2.scr
 IMAGES_EN+= install/console-saver3.scr
 IMAGES_EN+= install/console-saver4.scr
-IMAGES_EN+= install/desktop.scr
 IMAGES_EN+= install/disklabel-auto.scr
 IMAGES_EN+= install/disklabel-ed1.scr
 IMAGES_EN+= install/disklabel-ed2.scr
@ -110,7 +109,6 @@ IMAGES_EN+= install/timezone2.scr
 IMAGES_EN+= install/timezone3.scr
 IMAGES_EN+= install/userconfig.scr
 IMAGES_EN+= install/userconfig2.scr
-IMAGES_EN+= install/xf86setup.scr
 IMAGES_EN+= mail/mutt1.scr
 IMAGES_EN+= mail/mutt2.scr
 IMAGES_EN+= mail/mutt3.scr
--- a/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml
+++ b/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml
@ -3626,16 +3626,6 @@ To change any of these settings later, edit /etc/rc.conf
 	kies dan &gui.yes; en druk op <keycap>Enter</keycap> om verder
 	te gaan met het instellen van de X-server.</para>

-      <figure id="xserver2">
-	<title>Menu Instelmethode kiezen</title>
-
-	<mediaobject>
-	  <imageobject>
-	    <imagedata fileref="install/xf86setup" format="PNG">
-	  </imageobject>
-	</mediaobject>
-      </figure>
-
      <para>Er zijn diverse manieren om de X-server in te stellen.
 	Kies een methode met de pijltjestoetsen en druk op
 	<keycap>Enter</keycap>.  Lees alle instructies
@ -4151,16 +4141,6 @@ failed.  Would you like to try again?
 	bureaublad.  Hierdoor kan direct na de installatie begonnen
 	worden met productief zijn.</para>

-      <figure id="x-desktop">
-	<title>Standaard bureaublad kiezen</title>
-
-	<mediaobject>
-	  <imageobject>
-	    <imagedata fileref="install/desktop" format="PNG">
-	  </imageobject>
-	</mediaobject>
-      </figure>
-
      <para>Kies een bureaublad met de pijltjestoetsen en druk op
 	<keycap>Enter</keycap>.  De installatie van het geselecteerde
 	bureaublad start.</para>
--- a/nl_NL.ISO8859-1/books/handbook/txtfiles.ent
+++ b/nl_NL.ISO8859-1/books/handbook/txtfiles.ent
@ -20,7 +20,6 @@
 <!ENTITY txt.install.console-saver2	SYSTEM "install/console-saver2.txt">
 <!ENTITY txt.install.console-saver3	SYSTEM "install/console-saver3.txt">
 <!ENTITY txt.install.console-saver4	SYSTEM "install/console-saver4.txt">
-<!ENTITY txt.install.desktop	 	SYSTEM "install/desktop.txt">
 <!ENTITY txt.install.disklabel-auto	SYSTEM "install/disklabel-auto.txt">
 <!ENTITY txt.install.disklabel-ed1	SYSTEM "install/disklabel-ed1.txt">
 <!ENTITY txt.install.disklabel-ed2	SYSTEM "install/disklabel-ed2.txt">
@ -69,4 +68,3 @@
 <!ENTITY txt.install.timezone3	 	SYSTEM "install/timezone3.txt">
 <!ENTITY txt.install.userconfig	 	SYSTEM "../../../share/images/books/handbook/install/userconfig.txt">
 <!ENTITY txt.install.userconfig2	SYSTEM "../../../share/images/books/handbook/install/userconfig2.txt">
-<!ENTITY txt.install.xf86setup	 	SYSTEM "install/xf86setup.txt">
--- a/pl_PL.ISO8859-2/books/handbook/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/Makefile
@ -54,7 +54,6 @@ IMAGES_EN+= install/console-saver1.scr
 IMAGES_EN+= install/console-saver2.scr
 IMAGES_EN+= install/console-saver3.scr
 IMAGES_EN+= install/console-saver4.scr
-IMAGES_EN+= install/desktop.scr
 IMAGES_EN+= install/disklabel-auto.scr
 IMAGES_EN+= install/disklabel-ed1.scr
 IMAGES_EN+= install/disklabel-ed2.scr
@ -109,7 +108,6 @@ IMAGES_EN+= install/timezone2.scr
 IMAGES_EN+= install/timezone3.scr
 IMAGES_EN+= install/userconfig.scr
 IMAGES_EN+= install/userconfig2.scr
-IMAGES_EN+= install/xf86setup.scr
 IMAGES_EN+= mail/mutt1.scr
 IMAGES_EN+= mail/mutt2.scr
 IMAGES_EN+= mail/mutt3.scr
--- a/pl_PL.ISO8859-2/books/handbook/install/chapter.sgml
+++ b/pl_PL.ISO8859-2/books/handbook/install/chapter.sgml
@ -3436,16 +3436,6 @@ To change any of these settings later, edit /etc/rc.conf
        wybieramy &gui.yes; i wciskamy <keycap>Enter</keycap>,
        rozpoczynając konfigurację serwera X.</para>

-      <figure id="xserver2">
-        <title>Wybór metody konfiguracji</title>
-
-	<mediaobject>
-	  <imageobject>
-	    <imagedata fileref="install/xf86setup" format="PNG">
-	  </imageobject>
-	</mediaobject>
-      </figure>
-
      <para>Serwer X można konfigurować na kilka sposobów.
        Wybieramy jedną z metod przy pomocy klawiszy kursora
        i naciskamy <keycap>Enter</keycap>.  Pamiętajmy o uważnym
@ -3953,16 +3943,6 @@ failed.  Would you like to try again?
        go jako domyślny.  Dzięki temu będziemy mieć możliwość uruchomienia
        go zaraz po zakończeniu instalacji.</para>

-      <figure id="x-desktop">
-        <title>Wybór domy¶lnego mened¿era okien</title>
-
-	<mediaobject>
-	  <imageobject>
-	    <imagedata fileref="install/desktop" format="PNG">
-	  </imageobject>
-	</mediaobject>
-      </figure>
-
      <para>Klawiszami kursora wybieramy jedną z opcji i wciskamy
        <keycap>Enter</keycap>.  Wybrany menedżer okien zostanie
        zainstalowany.</para>
--- a/pl_PL.ISO8859-2/books/handbook/txtfiles.ent
+++ b/pl_PL.ISO8859-2/books/handbook/txtfiles.ent
@ -20,7 +20,6 @@
 <!ENTITY txt.install.console-saver2	SYSTEM "install/console-saver2.txt">
 <!ENTITY txt.install.console-saver3	SYSTEM "install/console-saver3.txt">
 <!ENTITY txt.install.console-saver4	SYSTEM "install/console-saver4.txt">
-<!ENTITY txt.install.desktop	 	SYSTEM "install/desktop.txt">
 <!ENTITY txt.install.disklabel-auto	SYSTEM "install/disklabel-auto.txt">
 <!ENTITY txt.install.disklabel-ed1	SYSTEM "install/disklabel-ed1.txt">
 <!ENTITY txt.install.disklabel-ed2	SYSTEM "install/disklabel-ed2.txt">
@ -69,4 +68,3 @@
 <!ENTITY txt.install.timezone3	 	SYSTEM "install/timezone3.txt">
 <!ENTITY txt.install.userconfig	 	SYSTEM "../../../share/images/books/handbook/install/userconfig.txt">
 <!ENTITY txt.install.userconfig2	SYSTEM "../../../share/images/books/handbook/install/userconfig2.txt">
-<!ENTITY txt.install.xf86setup	 	SYSTEM "install/xf86setup.txt">
--- a/ru_RU.KOI8-R/books/handbook/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/Makefile
@ -56,7 +56,6 @@ IMAGES_EN+= install/console-saver1.scr
 IMAGES_EN+= install/console-saver2.scr
 IMAGES_EN+= install/console-saver3.scr
 IMAGES_EN+= install/console-saver4.scr
-IMAGES_EN+= install/desktop.scr
 IMAGES_EN+= install/disklabel-auto.scr
 IMAGES_EN+= install/disklabel-ed1.scr
 IMAGES_EN+= install/disklabel-ed2.scr
@ -111,7 +110,6 @@ IMAGES_EN+= install/timezone2.scr
 IMAGES_EN+= install/timezone3.scr
 IMAGES_EN+= install/userconfig.scr
 IMAGES_EN+= install/userconfig2.scr
-IMAGES_EN+= install/xf86setup.scr
 IMAGES_EN+= mail/mutt1.scr
 IMAGES_EN+= mail/mutt2.scr
 IMAGES_EN+= mail/mutt3.scr
--- a/ru_RU.KOI8-R/books/handbook/install/chapter.sgml
+++ b/ru_RU.KOI8-R/books/handbook/install/chapter.sgml
@ -3461,16 +3461,6 @@ To change any of these settings later, edit /etc/rc.conf
 	выберите &gui.yes; и нажмите
 	<keycap>Enter</keycap> для начала настройки X сервера.</para>

-      <figure id="xserver2">
-	<title>íÅÎÀ ×ÙÂÏÒÁ ÓÐÏÓÏÂÁ ËÏÎÆÉÇÕÒÁÃÉÉ</title>
-
-	<mediaobject>
-	  <imageobject>
-	    <imagedata fileref="install/xf86setup" format="PNG">
-	  </imageobject>
-	</mediaobject>
-      </figure>
-
      <para>Есть несколько путей настройки X сервера.  Используйте
 	клавиши навигации для выбора одного из методов и нажмите
 	<keycap>Enter</keycap>.  Внимательно прочтите все инструкции.</para>
@ -3977,16 +3967,6 @@ failed.  Would you like to try again?
 	установлен и настроен в качестве десктопа по умолчанию.
 	Это позволит запустить его сразу после установки.</para>

-      <figure id="x-desktop">
-	<title>÷ÙÂÏÒ ÄÅÓËÔÏÐÁ ÐÏ ÕÍÏÌÞÁÎÉÀ</title>
-
-	<mediaobject>
-	  <imageobject>
-	    <imagedata fileref="install/desktop" format="PNG">
-	  </imageobject>
-	</mediaobject>
-      </figure>
-
      <para>Используйте клавиши навигации, чтобы выбрать десктоп, и нажмите
 	<keycap>Enter</keycap>.  Будет запущена установка выбранного
 	десктопа.</para>
--- a/ru_RU.KOI8-R/books/handbook/txtfiles.ent
+++ b/ru_RU.KOI8-R/books/handbook/txtfiles.ent
@ -26,7 +26,6 @@
 <!ENTITY txt.install.console-saver2	SYSTEM "install/console-saver2.txt">
 <!ENTITY txt.install.console-saver3	SYSTEM "install/console-saver3.txt">
 <!ENTITY txt.install.console-saver4	SYSTEM "install/console-saver4.txt">
-<!ENTITY txt.install.desktop	 	SYSTEM "install/desktop.txt">
 <!ENTITY txt.install.disklabel-auto	SYSTEM "install/disklabel-auto.txt">
 <!ENTITY txt.install.disklabel-ed1	SYSTEM "install/disklabel-ed1.txt">
 <!ENTITY txt.install.disklabel-ed2	SYSTEM "install/disklabel-ed2.txt">
@ -75,4 +74,3 @@
 <!ENTITY txt.install.timezone3	 	SYSTEM "install/timezone3.txt">
 <!ENTITY txt.install.userconfig	 	SYSTEM "../../../share/images/books/handbook/install/userconfig.txt">
 <!ENTITY txt.install.userconfig2	SYSTEM "../../../share/images/books/handbook/install/userconfig2.txt">
-<!ENTITY txt.install.xf86setup	 	SYSTEM "install/xf86setup.txt">
--- a/zh_CN.GB2312/books/handbook/Makefile
+++ b/zh_CN.GB2312/books/handbook/Makefile
@ -53,7 +53,6 @@ IMAGES_EN+= install/console-saver1.scr
 IMAGES_EN+= install/console-saver2.scr
 IMAGES_EN+= install/console-saver3.scr
 IMAGES_EN+= install/console-saver4.scr
-IMAGES_EN+= install/desktop.scr
 IMAGES_EN+= install/disklabel-auto.scr
 IMAGES_EN+= install/disklabel-ed1.scr
 IMAGES_EN+= install/disklabel-ed2.scr
@ -108,7 +107,6 @@ IMAGES_EN+= install/timezone2.scr
 IMAGES_EN+= install/timezone3.scr
 IMAGES_EN+= install/userconfig.scr
 IMAGES_EN+= install/userconfig2.scr
-IMAGES_EN+= install/xf86setup.scr
 IMAGES_EN+= mail/mutt1.scr
 IMAGES_EN+= mail/mutt2.scr
 IMAGES_EN+= mail/mutt3.scr
--- a/zh_CN.GB2312/books/handbook/install/chapter.sgml
+++ b/zh_CN.GB2312/books/handbook/install/chapter.sgml
@ -2864,16 +2864,6 @@ Press [Enter] now to invoke an editor on /etc/exports
 	&gui.yes; 并按 <keycap>Enter</keycap>
 	来配置 X-server。</para>

-      <figure id="xserver2">
-	<title>选择配置方法菜单</title>
-
-	<mediaobject>
-	  <imageobject>
-	    <imagedata fileref="install/xf86setup" format="PNG">
-	  </imageobject>
-	</mediaobject>
-      </figure>
-
      <para>您可以通过许多方法来配置 X server。在认真读了所有的说明后，
 	请使用方向键来选择一种配置方式，并按<keycap>Enter</keycap>
 	键确认。</para>
@ -3353,16 +3343,6 @@ failed.  Would you like to try again?
      <para>您可以选择一个流行的桌面配置成为默认的桌面，可以使您在安装完
 	成后立刻启动它。</para>

-      <figure id="x-desktop">
-	<title>选择默认桌面</title>
-
-	<mediaobject>
-	  <imageobject>
-	    <imagedata fileref="install/desktop" format="PNG">
-	  </imageobject>
-	</mediaobject>
-      </figure>
-
      <para>使用箭头选择一个桌面，然后键入<keycap>Enter</keycap>键。选择的桌面将被
 	安装。</para>
    </sect2>
--- a/zh_CN.GB2312/books/handbook/txtfiles.ent
+++ b/zh_CN.GB2312/books/handbook/txtfiles.ent
@ -20,7 +20,6 @@
 <!ENTITY txt.install.console-saver2	SYSTEM "install/console-saver2.txt">
 <!ENTITY txt.install.console-saver3	SYSTEM "install/console-saver3.txt">
 <!ENTITY txt.install.console-saver4	SYSTEM "install/console-saver4.txt">
-<!ENTITY txt.install.desktop	 	SYSTEM "install/desktop.txt">
 <!ENTITY txt.install.disklabel-auto	SYSTEM "install/disklabel-auto.txt">
 <!ENTITY txt.install.disklabel-ed1	SYSTEM "install/disklabel-ed1.txt">
 <!ENTITY txt.install.disklabel-ed2	SYSTEM "install/disklabel-ed2.txt">
@ -69,4 +68,3 @@
 <!ENTITY txt.install.timezone3	 	SYSTEM "install/timezone3.txt">
 <!ENTITY txt.install.userconfig	 	SYSTEM "../../../share/images/books/handbook/install/userconfig.txt">
 <!ENTITY txt.install.userconfig2	SYSTEM "../../../share/images/books/handbook/install/userconfig2.txt">
-<!ENTITY txt.install.xf86setup	 	SYSTEM "install/xf86setup.txt">
--- a/zh_TW.Big5/books/handbook/Makefile
+++ b/zh_TW.Big5/books/handbook/Makefile
@ -53,7 +53,6 @@ IMAGES_EN+= install/console-saver1.scr
 IMAGES_EN+= install/console-saver2.scr
 IMAGES_EN+= install/console-saver3.scr
 IMAGES_EN+= install/console-saver4.scr
-IMAGES_EN+= install/desktop.scr
 IMAGES_EN+= install/disklabel-auto.scr
 IMAGES_EN+= install/disklabel-ed1.scr
 IMAGES_EN+= install/disklabel-ed2.scr
@ -108,7 +107,6 @@ IMAGES_EN+= install/timezone2.scr
 IMAGES_EN+= install/timezone3.scr
 IMAGES_EN+= install/userconfig.scr
 IMAGES_EN+= install/userconfig2.scr
-IMAGES_EN+= install/xf86setup.scr
 IMAGES_EN+= mail/mutt1.scr
 IMAGES_EN+= mail/mutt2.scr
 IMAGES_EN+= mail/mutt3.scr
--- a/zh_TW.Big5/books/handbook/install/chapter.sgml
+++ b/zh_TW.Big5/books/handbook/install/chapter.sgml
@ -3178,16 +3178,6 @@ To change any of these settings later, edit /etc/rc.conf
 	&gui.yes; and press <keycap>Enter</keycap>
 	to proceed with configuring the X server.</para>

-      <figure id="xserver2">
-	<title>Select Configuration Method Menu</title>
-
-	<mediaobject>
-	  <imageobject>
-	    <imagedata fileref="install/xf86setup" format="PNG">
-	  </imageobject>
-	</mediaobject>
-      </figure>
-
      <para>There are several ways to configure the X server.
 	Use the arrow keys to select one of the methods  and press
 	<keycap>Enter</keycap>.  Be sure to read all instructions
@ -3699,16 +3689,6 @@ failed.  Would you like to try again?
 	and configured as the default desktop.  This will allow you
 	to start it right after installation.</para>

-      <figure id="x-desktop">
-	<title>Select Default Desktop</title>
-
-	<mediaobject>
-	  <imageobject>
-	    <imagedata fileref="install/desktop" format="PNG">
-	  </imageobject>
-	</mediaobject>
-      </figure>
-
      <para>Use the arrow keys to select a desktop and press
 	<keycap>Enter</keycap>.  Installation of the selected desktop will
 	proceed.</para>
--- a/zh_TW.Big5/books/handbook/txtfiles.ent
+++ b/zh_TW.Big5/books/handbook/txtfiles.ent
@ -20,7 +20,6 @@
 <!ENTITY txt.install.console-saver2	SYSTEM "install/console-saver2.txt">
 <!ENTITY txt.install.console-saver3	SYSTEM "install/console-saver3.txt">
 <!ENTITY txt.install.console-saver4	SYSTEM "install/console-saver4.txt">
-<!ENTITY txt.install.desktop	 	SYSTEM "install/desktop.txt">
 <!ENTITY txt.install.disklabel-auto	SYSTEM "install/disklabel-auto.txt">
 <!ENTITY txt.install.disklabel-ed1	SYSTEM "install/disklabel-ed1.txt">
 <!ENTITY txt.install.disklabel-ed2	SYSTEM "install/disklabel-ed2.txt">
@ -69,4 +68,3 @@
 <!ENTITY txt.install.timezone3	 	SYSTEM "install/timezone3.txt">
 <!ENTITY txt.install.userconfig	 	SYSTEM "../../../share/images/books/handbook/install/userconfig.txt">
 <!ENTITY txt.install.userconfig2	SYSTEM "../../../share/images/books/handbook/install/userconfig2.txt">
-<!ENTITY txt.install.xf86setup	 	SYSTEM "install/xf86setup.txt">