Index: general.ent
===================================================================
--- general.ent	(revision 4107abd6e67111c42502b0895ca419ee3570275d)
+++ general.ent	(revision a012c467e704611ff6977281e3bb51c1db2301d5)
@@ -1,3 +1,3 @@
-<!ENTITY day          "14">
+<!ENTITY day          "15">
 <!ENTITY month        "03">
 <!ENTITY year         "2005">
@@ -292,5 +292,5 @@
 <!ENTITY fluxbox-version              "0.9.12"> 
 <!ENTITY metacity-version             "2.8.6">  
-<!ENTITY xfce-version                 "4.0.4">  
+<!ENTITY xfce-version                 "4.2.0">  
 
 <!-- Part IX -->
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 4107abd6e67111c42502b0895ca419ee3570275d)
+++ introduction/welcome/changelog.xml	(revision a012c467e704611ff6977281e3bb51c1db2301d5)
@@ -22,4 +22,7 @@
 
 <itemizedlist>
+
+<listitem><para>March 15th, 2005 [igor]: Updated to
+XFce-4.2.0.</para></listitem>
 
 <listitem><para>March 14th, 2005 [igor]: Courier: removed redundant
Index: x/wm/xfce.xml
===================================================================
--- x/wm/xfce.xml	(revision 4107abd6e67111c42502b0895ca419ee3570275d)
+++ x/wm/xfce.xml	(revision a012c467e704611ff6977281e3bb51c1db2301d5)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY xfce-download-http "http://prdownloads.sourceforge.net/xfce/xfce-&xfce-version;-src.tar.bz2">
+  <!ENTITY xfce-download-http "http://www.us.xfce.org/archive/xfce-&xfce-version;/fat_tarballs/xfce-&xfce-version;-src-bz2.tar.bz2">
   <!ENTITY xfce-download-ftp  " ">
-  <!ENTITY xfce-md5sum        "f49f4dbe575a1d67035e95b3c91e9977">
-  <!ENTITY xfce-size          "18 MB">
-  <!ENTITY xfce-buildsize     "224 MB">
-  <!ENTITY xfce-time          "3.35 SBU">
+  <!ENTITY xfce-md5sum        "8b213c0db2ac25b85a094e5959f5b2c1">
+  <!ENTITY xfce-size          "15 MB">
+  <!ENTITY xfce-buildsize     "215 MB">
+  <!ENTITY xfce-time          "3.24 SBU">
 ]>
 
@@ -56,6 +56,8 @@
 <sect4>
 <title>Optional</title>
-<para><xref linkend="libgtkhtml"/> and 
-      <xref linkend="startup-notification"/>
+<para><xref linkend="libgtkhtml"/>,
+      <xref linkend="startup-notification"/>,
+      <xref linkend="a2ps"/> and
+      <xref linkend="psutils"/>
 </para>
 </sect4>
@@ -81,12 +83,13 @@
 
 <itemizedlist spacing='compact'>
-  <listitem><para>libxfce4util-&xfce-version;.tar.gz</para></listitem>
-  <listitem><para>libxfcegui4-&xfce-version;.tar.gz</para></listitem>
-  <listitem><para>libxfce4mcs-&xfce-version;.tar.gz</para></listitem>
-  <listitem><para>xfce-mcs-manager-&xfce-version;.tar.gz</para></listitem>
-  <listitem><para>xfwm4-&xfce-version;.tar.gz</para></listitem>
-  <listitem><para>xfdesktop-&xfce-version;.tar.gz</para></listitem>
-  <listitem><para>xfce4-panel-&xfce-version;.tar.gz</para></listitem>
-  <listitem><para>xfce-utils-&xfce-version;.tar.gz</para></listitem>
+  <listitem><para>libxfce4util-&xfce-version;</para></listitem>
+  <listitem><para>dbh-1.0.20</para></listitem>
+  <listitem><para>libxfcegui4-&xfce-version;</para></listitem>
+  <listitem><para>libxfce4mcs-&xfce-version;</para></listitem>
+  <listitem><para>xfce-mcs-manager-&xfce-version;</para></listitem>
+  <listitem><para>xfwm4-&xfce-version;</para></listitem>
+  <listitem><para>xfce4-panel-&xfce-version;</para></listitem>
+  <listitem><para>xfdesktop-&xfce-version;</para></listitem>
+  <listitem><para>xfce-utils-&xfce-version;</para></listitem>
 </itemizedlist>
 
@@ -94,19 +97,18 @@
  
 <itemizedlist spacing='compact'>
-  <listitem><para>dbh-1.0.15 (required for xffm)</para></listitem>
-  <listitem><para>gtk-xfce-engine-2.1.9</para></listitem>
-  <listitem><para>xfcalendar-0.1.6</para></listitem>
-  <listitem><para>xfce-mcs-plugins</para></listitem>
-  <listitem><para>xfce4-iconbox</para></listitem>
-  <listitem><para>xfce4-mixer</para></listitem>
-  <listitem><para>xfce4-systray</para></listitem>
-  <listitem><para>xfce4-systray</para></listitem>
-  <listitem><para>xfce4-themes</para></listitem>
-  <listitem><para>xfce4-toys</para></listitem>
-  <listitem><para>xfce4-trigger-launcher</para></listitem>
-  <listitem><para>xffm</para></listitem>
-  <listitem><para>xffm-icons</para></listitem>
-  <listitem><para>xfprint</para></listitem>
-  <listitem><para>xfwm4-themes.</para></listitem>
+  <listitem><para>gtk-xfce-engine-2.2.5</para></listitem>
+  <listitem><para>xfcalendar-&xfce-version;</para></listitem>
+  <listitem><para>xfce-mcs-plugins-&xfce-version;</para></listitem>
+  <listitem><para>xfce4-appfinder-&xfce-version;</para></listitem>
+  <listitem><para>xfce4-icon-theme-&xfce-version;</para></listitem>
+  <listitem><para>xfce4-iconbox-&xfce-version;</para></listitem>
+  <listitem><para>xfce4-mixer-&xfce-version;</para></listitem>
+  <listitem><para>xfce4-session-&xfce-version;</para></listitem>
+  <listitem><para>xfce4-systray-&xfce-version;</para></listitem>
+  <listitem><para>xfce4-toys-&xfce-version;</para></listitem>
+  <listitem><para>xfce4-trigger-launcher-&xfce-version;</para></listitem>
+  <listitem><para>xffm-&xfce-version;</para></listitem>
+  <listitem><para>xfprint-&xfce-version;</para></listitem>
+  <listitem><para>xfwm4-themes-&xfce-version;</para></listitem>
 </itemizedlist>
 
@@ -151,10 +153,15 @@
  
   <seglistitem>
-    <seg>fgr, scramble, startxfce4, xfapps, xfapps4, xfbook, xfbook4, xfcalendar, xfce-mcs-manager,
-         xfce-setting-show, xfce4-about, xfce4-iconbox, xfce4-panel, xfce4-tips, xfdesktop,
-         xfdiff4, xffm, xffstab, xffstab4, xfglob4, xfhelp4, xflock4. xfmountdev4,
-         xfprint-manager, xfprint4, xfrun4, xfsamba4, xftaskbar4, xfterm4,
-         xftrash4, xftree4, xfwm4</seg>
-    <seg id='xfcelibs'>libdbh, libxfce4mcs, libxfce4util, libxfcegui4, libxffm, libxfprint</seg>
+    <seg>fgr, scramble, startxfce4, xfbook, xfbook4, xfcalendar,
+         xfce-mcs-manager, xfce-setting-show, xfce4-about,
+         xfce4-appfinder, xfce4-iconbox, xfce4-kiosk-query,
+         xfce4-menueditor, xfce4-mixer, xfce4-panel, xfce4-session,
+         xfce4-session-logout, xfce4-tips, xfdesktop, xfdiff4, xffm,
+         xffrequent, xffrequent4, xffstab, xffstab4, xfglob4, xfhelp4,
+         xflock4, xfmime-edit, xfmountdev4, xfrecent, xfrecent4,
+         xfprint-manager, xfprint4, xfrun4, xfsamba4, xftaskbar4,
+         xfterm4, xftrash4, xftree4, xfwm4</seg>
+    <seg id='xfcelibs'>libdbh, libxfce4mcs, libxfce4util, libxfcegui4,
+         libxffm, libxfsm, libxfprint</seg>
     <seg>None</seg>
   </seglistitem>
@@ -182,4 +189,8 @@
  
 <indexterm zone="xfce xfcelibs">
+  <primary sortas="c-libxfsm">libxfsm.so</primary>
+</indexterm>
+ 
+<indexterm zone="xfce xfcelibs">
   <primary sortas="c-libxfprint">libxfprint.so</primary>
 </indexterm>
@@ -215,4 +226,25 @@
     <indexterm zone="xfce xfce4-about">
       <primary sortas="b-xfce4-about">xfce4-about</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="xfce4-session">
+  <term><command>xfce4-session</command></term>
+  <listitem>
+    <para>starts up the <application>XFce</application> Desktop
+          Environment.</para>
+    <indexterm zone="xfce xfce4-session">
+      <primary sortas="b-xfce4-session">xfce4-session</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="xfce4-session-logout">
+  <term><command>xfce4-session-logout</command></term>
+  <listitem>
+    <para>logs out from <application>XFce</application>.</para>
+    <indexterm zone="xfce xfce4-session-logout">
+      <primary sortas="b-xfce4-session-logout">xfce4-session-logout</primary>
     </indexterm>
   </listitem>
@@ -347,5 +379,5 @@
   <term><command>xfwm4</command></term>
   <listitem>
-    <para>is an <application>X11></application> window manager for <application>XFce</application>.</para>
+    <para>is an <application>X11</application> window manager for <application>XFce</application>.</para>
     <indexterm zone="xfce xfwm4">
       <primary sortas="b-xfwm4">xfwm4</primary>
@@ -357,3 +389,2 @@
 </sect2>
 </sect1>
-
