Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 8a690106e50b7fc617b5fc846827e635851f65bd)
+++ introduction/welcome/changelog.xml	(revision 7ce6b7ca026c0324e5836d3e935e1330a42613a8)
@@ -11,4 +11,7 @@
 
 <itemizedlist>
+
+<listitem><para>Sepember 27th, 2003 [larry]: updated to
+xfce-4.0.0.</para></listitem>
 
 <listitem><para>September 27th, 2003 [tushar]: Updated Mozilla instructions
Index: x/wm/xfce.xml
===================================================================
--- x/wm/xfce.xml	(revision 8a690106e50b7fc617b5fc846827e635851f65bd)
+++ x/wm/xfce.xml	(revision 7ce6b7ca026c0324e5836d3e935e1330a42613a8)
@@ -5,5 +5,4 @@
 &xfce-intro;
 &xfce-inst;
-&xfce-exp;
 &xfce-config;
 &xfce-desc;
Index: x/wm/xfce/xfce-config.xml
===================================================================
--- x/wm/xfce/xfce-config.xml	(revision 8a690106e50b7fc617b5fc846827e635851f65bd)
+++ x/wm/xfce/xfce-config.xml	(revision 7ce6b7ca026c0324e5836d3e935e1330a42613a8)
@@ -8,9 +8,16 @@
 <sect3><title>Configuration Information</title>
 
-<para><application>XFce</application> includes a script named 
-<filename>xfce_setup</filename> which
-will set up xfce for the user.  Also included is a script named 
-<filename>xfce_remove</filename> which returns the configuration files to their 
-previous state.</para>
+<para>Be sure to backup your current <filename>.xinitrc</filename>
+before
+proceeding.</para>
+<screen><userinput><command>cat &gt;&gt; ~/.xinitrc &lt;&lt; "EOF"</command>>
+xfce-mcs-manager
+xfwm4 --daemon
+xftaskbar4 &
+xfdesktop &
+exec xfce4-panel
+<command>EOF</command></userinput></screen>
+
+
 </sect3>
 
Index: x/wm/xfce/xfce-desc.xml
===================================================================
--- x/wm/xfce/xfce-desc.xml	(revision 8a690106e50b7fc617b5fc846827e635851f65bd)
+++ x/wm/xfce/xfce-desc.xml	(revision 7ce6b7ca026c0324e5836d3e935e1330a42613a8)
@@ -3,20 +3,14 @@
 
 <para>The <application>XFce</application> package contains 
-<command>CDE2Xfcepal</command>,
-<command>startxfce</command>, <command>xfbd</command>, 
-<command>xfbdmgr</command>, <command>xfce</command>, 
-<command>xfce_remove</command>,
-<command>xfce_setup</command>, <command>xfce_upgrade</command>,
-<command>xfclock</command>, <command>xfdiff</command>,
-<command>xfglob</command>, <command>xfgnome</command>,
-<command>xfhelp</command>, <command>xflock</command>,
-<command>xfmenu</command>, <command>xfmountdev</command>,
-<command>xfmouse</command>, <command>xfmouse</command>,
-<command>xfpager</command>, <command>xfplay</command>,
-<command>xfprint</command>, <command>xfrun</command>,
-<command>xfsamba</command>, <command>xfskin</command>,
-<command>xfsound</command>, <command>xfterm</command>,
-<command>xftrash</command>, <command>xftree</command>,
-<command>xfumed</command> and <command>xfwm</command>.</para>
+<command>xfce-mcs-manager</command>, <command>xfce4-about</command>,
+<command>xfce-setting-show</command>, <command>xfce4-panel</command>,
+<command>xfdesktop</command>,
+<command>xfhelp4</command>, <command>xflock4</command>,
+<command>xfmountdev4</command>, <command>xfrun4</command>,
+<command>xfsamba4</command>, <command>xftaskbar4</command>,
+<command>xfterm4</command>, <command>xftrash4</command>, 
+<command>xftree4</command>, <command>xfwm4</command> and
+<filename>libxfce4mcs</filename>, <filename>libxfce4util</filename>,
+and <filename>libxfcegui4</filename> libraries.</para>
 
 </sect2>
@@ -24,124 +18,64 @@
 <sect2><title>Description</title>
 
-<sect3><title>CDE2Xfcepal</title>
-<para><command>CDE2Xfcepal</command> converts <acronym>CDE</acronym> palettes 
-to <application>XFce</application> palettes.</para></sect3>
-
-<sect3><title>startxfce</title>
-<para><command>startxfce</command> initializes and starts the
-<application>X</application> server using <filename>~/.xinitrc</filename>.
-</para></sect3>
-
-<sect3><title>xfbd</title>
-<para><command>xfbd</command> is the backdrop manager for
+<sect3><title>xfce-mce-manager</title>
+<para><command>xfce-mce-manager</command> is the settings manager for 
 <application>XFce</application>.</para></sect3>
 
-<sect3><title>xfbdmgr</title>
-<para><command>xfbdmgr</command> is the list manager for
+<sect3><title>xfce4-about</title>
+<para><command>xfce4-about</command> displays the about box.</para></sect3>
+
+<sect3><title>xfce-setting-show</title>
+<para><command>xfce_setting-show</command> displays the settings for
 <application>XFce</application>.</para></sect3>
 
-<sect3><title>xfce</title>
-<para><command>xfce</command> is an easy-to-use and easy-to-configure toolbar 
-for <application>X11</application>.</para></sect3>
+<sect3><title>xfce4-panel</title>
+<para><command>xfce4-panel</command> is the panel manager for
+<application>XFce</application>. It contains the lanucher, clock, mail
+check, desktop switcher and separator programs.</para></sect3>
 
-<sect3><title>xfce_remove</title>
-<para><command>xfce_remove</command> is a uninstall script to remove
-<application>XFce</application> as the desktop environment are restore the 
-previous settings.</para></sect3>
+<sect3><title>xfdesktop</title>
+<para><command>xfdesktop </command> is the desktop manager
+for <application>XFce</application>.</para></sect3>
 
-<sect3><title>xfce_setup</title>
-<para><command>xfce_setup</command> is a configuration script to create 
-<filename>~./xinitrc</filename> for <application>XFce</application>.</para>
-</sect3>
+<sect3><title>xfhelp4</title>
+<para><command>xfhelp4</command> is script that launches a
+<acronym>HTML</acronym> browser to display online documentation.</para></sect3>
 
-<sect3><title>xfce_upgrade</title>
-<para><command>xfce_upgrade</command> is the configuration script used to 
-update versions of <application>XFce</application>.</para></sect3>
+<sect3><title>xflock4</title>
+<para><command>xflock4</command> is a script used to lock the current screen 
+during drag and drop actions.</para></sect3>
 
-<sect3><title>xfclock</title>
-<para><command>xfce_clock</command> is a clock and calendar for
+<sect3><title>xfmountdev4</title>
+<para><command>xfmountdev4</command> mounts a device on the specified mount 
+point and launches <command>xftree4</command>, then unmounts the device
+when <command>xftree4</command> finishes.</para></sect3>
+
+<sect3><title>xfrun4</title>
+<para><command>xfrun4</command> is the program launcher for
 <application>XFce</application>.</para></sect3>
 
-<sect3><title>xfdiff</title>
-<para><command>xfdiff</command> is a visual diff for
+<sect3><title>xfsamba4</title>
+<para><command>xfsamba4</command> is <application>Samba</application> front end 
+for <application>XFce</application>.</para></sect3>
+
+<sect3><title>xftaskbar4</title>
+<para><command>xftaskbar4</command> is the taskbar manager for
 <application>XFce</application>.</para></sect3>
 
-<sect3><title>xfglob</title>
-<para><command>xfglob</command> is the file finder of
-<application>XFce</application>.</para></sect3>
-
-<sect3><title>xfgnome</title>
-<para><command>xfgnome</command> is the GNOME compliancy module for
-<command>xfwm</command>.</para></sect3>
-
-<sect3><title>xfhelp</title>
-<para><command>xfhelp</command> is script that launches a
-<acronym>HTML</acronym> browser to display online documentation.</para></sect3>
-
-<sect3><title>xflock</title>
-<para><command>xflock</command> is a script used to lock the current screen 
-during drag and drop actions.</para></sect3>
-
-<sect3><title>xfmenu</title>
-<para><command>xfmenu</command> is the menu launcher for
-<application>XFce</application>.</para></sect3>
-
-<sect3><title>xfmountdev</title>
-<para><command>xfmountdev</command> mounts a device on the specified mount 
-point and launches <command>xftree</command>, then unmounts the device
-when <command>xftree</command> finishes.</para></sect3>
-
-<sect3><title>xfmouse</title>
-<para><command>xfmouse</command> is a mouse configurator for
-<application>XFce</application>.</para></sect3>
-
-<sect3><title>xfpager</title>
-<para><command>xfpager</command> is the pager of <command>xfwm</command>.
-</para></sect3>
-
-<sect3><title>xfplay</title>
-<para><command>xfplay</command> is a script that executes the play program (not 
-included in package.</para></sect3>
-
-<sect3><title>xfprint</title>
-<para><command>xfprint</command> is a minimalist printing wrapper to be used as 
-a drag and drop action for the <application>XFce</application> front panel.
-</para></sect3>
-
-<sect3><title>xfrun</title>
-<para><command>xfrun</command> is the program launcher for
-<application>XFce</application>.</para></sect3>
-
-<sect3><title>xfsamba</title>
-<para><command>xfsamba</command> is <application>Samba</application> front end 
-for <application>XFce</application>.</para></sect3>
-
-<sect3><title>xfskin</title>
-<para><command>xfskin</command> is a script to manage themes for
-<application>XFce</application>.</para></sect3>
-
-<sect3><title>xfsound</title>
-<para><command>xfsound</command> is the sound server for
-<application>XFce</application>.</para></sect3>
-
-<sect3><title>xfterm</title>
-<para><command>xfterm</command> is a small terminal wrapper to be used as a 
+<sect3><title>xfterm4</title>
+<para><command>xfterm4</command> is a small terminal wrapper to be used as a 
 drag and drop action for the <application>XFce</application> front panel.
 </para></sect3>
 
-<sect3><title>xftrash</title>
-<para><command>xftrash</command> is a small script to be used as a drag and 
+<sect3><title>xftrash4</title>
+<para><command>xftrash4</command> is a small script to be used as a drag and 
 drop action for the <application>XFce</application> front panel.</para></sect3>
 
-<sect3><title>xftree</title>
-<para><command>xftree</command> is the file manager for
+<sect3><title>xftree4</title>
+<para><command>xftree4</command> is the file manager for
 <application>XFce</application>.</para></sect3>
 
-<sect3><title>xfumed</title>
-<para><command>xfumed</command> is the user menu editor for
-<application>XFce</application>.</para></sect3>
-
-<sect3><title>xfwm</title>
-<para><command>xfwm</command> is a window manager for
+<sect3><title>xfwm4</title>
+<para><command>xfwm4</command> is a window manager for
 <application>X11</application>.</para></sect3>
 
Index: x/wm/xfce/xfce-inst.xml
===================================================================
--- x/wm/xfce/xfce-inst.xml	(revision 8a690106e50b7fc617b5fc846827e635851f65bd)
+++ x/wm/xfce/xfce-inst.xml	(revision 7ce6b7ca026c0324e5836d3e935e1330a42613a8)
@@ -2,10 +2,63 @@
 <title>Installation of <application>XFce</application></title>
 
+<para><application>XFce</application> now distributes as a tarball of
+base packages and module packages. These instructions will only cover
+the bare minimum to run the application.  The remaining modules would
+all follow the same pattern which will soon become obvious.</para>
 <para>Install <application>XFce</application> by running the following commands:</para>
 
-<screen><userinput><command>./configure --prefix=/usr --datadir=/usr/share --sysconfdir=/etc &amp;&amp;
+<screen><userinput><command>cd src &amp;&amp;
+tar -xzvf libxfce4util-&xfce-version; &amp;&amp;
+cd libxfce4util-&xfce-version; &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+cd .. &amp;&amp;
+tar -xzvf libxfcegui4-&xfce-version; &amp;&amp;
+cd libxfcegui4-&xfce-version; &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+cd .. &amp;&amp;
+tar -xzvf libxfce4mcs-&xfce-version; &amp;&amp;
+cd libxfce4mcs-&xfce-version; &amp;&amp;
+./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+cd .. &amp;&amp;
+tar -xzvf xfce-mcs-manager-&xfce-version; &amp;&amp;
+cd xfce-mcs-manager-&xfce-version; &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+cd .. &amp;&amp;
+tar -xzvf xfwm4-&xfce-version; &amp;&amp;
+cd xfwm4r-&xfce-version; &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+cd .. &amp;&amp;
+tar -xzvf xfdesktop-&xfce-version; &amp;&amp;
+cd xfdesktop-&xfce-version; &amp;&amp;
+./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+cd .. &amp;&amp;
+tar -xzvf xfce4-panel-&xfce-version; &amp;&amp;
+cd xfce4-panel-&xfce-version; &amp;&amp;
+./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+cd .. &amp;&amp;
+tar -xzvf xfce-utils-&xfce-version; &amp;&amp;
+cd xfce-utils-&xfce-version; &amp;&amp;
+./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
 make &amp;&amp;
 make install</command></userinput></screen>
 
+<para>Modules not installed above are: dbh-1.0.15 (required for xffm),
+gtk-xfce-engine-2.1.6, xfce-mcs-plugins, xfce4-iconbox, xfce4-mixer,
+xfce4-systray, sxfce4-themes, xfce4-toys, xfce4-trigger-launcher, xffm,
+xffm-icons, xfprint, and xfwm4-themes.</para>
+
 </sect2>
-
Index: x/wm/xfce/xfce-intro.xml
===================================================================
--- x/wm/xfce/xfce-intro.xml	(revision 8a690106e50b7fc617b5fc846827e635851f65bd)
+++ x/wm/xfce/xfce-intro.xml	(revision 7ce6b7ca026c0324e5836d3e935e1330a42613a8)
@@ -19,9 +19,8 @@
 <sect3><title><application>template</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="xfree86"/>, <xref linkend="GTK"/> and <xref
-linkend="GLib"/></para></sect4>
+<para><xref linkend="xfree86"/>, <xref linkend="GTK2"/>, <xref
+linkend="pkgconfig"/> and <xref linkend="libxml2"/></para></sect4>
 <sect4><title>Optional</title>
-<para><xref linkend="gdk"/>, <xref linkend="imlib"/>, <xref
-linkend="libpng"/>,
+<para><xref linkend="imlib"/>, <xref linkend="libpng"/>,
 <xref linkend="libjpeg"/>, <xref linkend="libungif"/> and <xref
 linkend="libtiff"/></para></sect4>
Index: x/wm/xfce/xfce.ent
===================================================================
--- x/wm/xfce/xfce.ent	(revision 8a690106e50b7fc617b5fc846827e635851f65bd)
+++ x/wm/xfce/xfce.ent	(revision 7ce6b7ca026c0324e5836d3e935e1330a42613a8)
@@ -5,8 +5,9 @@
 <!ENTITY xfce-desc SYSTEM "xfce-desc.xml">
 <!ENTITY xfce-config SYSTEM "xfce-config.xml">
-<!ENTITY xfce-buildsize "26.3 MB">
-<!ENTITY xfce-version "3.8.18">
-<!ENTITY xfce-download-http "http://telia.dl.sourceforge.net/xfce/xfce-3.8.18.tar.gz">
+<!ENTITY xfce-buildsize "107 MB">
+<!ENTITY xfce-version "4.0.0">
+<!ENTITY xfce-download-http
+"http://telia.dl.sourceforge.net/xfce/xfce-4.0.0-src.tar.bz2">
 <!ENTITY xfce-download-ftp "">
-<!ENTITY xfce-size "5.1 MB">
-<!ENTITY xfce-time "">
+<!ENTITY xfce-size "16 MB">
+<!ENTITY xfce-time "varies">
