Index: server/mail/courier/courier.ent
===================================================================
--- server/mail/courier/courier.ent	(revision 0f472264e16ecb4d7f04f4f8779df2210daa7307)
+++ server/mail/courier/courier.ent	(revision 8a690106e50b7fc617b5fc846827e635851f65bd)
@@ -6,7 +6,7 @@
 <!ENTITY courier-config SYSTEM "courier-config.xml">
 <!ENTITY courier-buildsize "55 MB">
-<!ENTITY courier-version "0.42.2">
-<!ENTITY courier-download-http "http://osdn.dl.sourceforge.net/sourceforge/courier/courier-0.42.2.tar.bz2">
-<!ENTITY courier-download-ftp "ftp://courier.sourceforge.net/courier/courier-0.42.2.tar.bz2">
+<!ENTITY courier-version "0.43.2">
+<!ENTITY courier-download-http "http://osdn.dl.sourceforge.net/sourceforge/courier/courier-0.43.2.tar.bz2">
+<!ENTITY courier-download-ftp "ftp://courier.sourceforge.net/courier/courier-0.43.2.tar.bz2">
 <!ENTITY courier-size "3.3 MB">
 <!ENTITY courier-time "">
Index: x/wm/enlightenment/enlightenment-config.xml
===================================================================
--- x/wm/enlightenment/enlightenment-config.xml	(revision 0f472264e16ecb4d7f04f4f8779df2210daa7307)
+++ x/wm/enlightenment/enlightenment-config.xml	(revision 8a690106e50b7fc617b5fc846827e635851f65bd)
@@ -1,7 +1,7 @@
 <sect2>
-<title>Configuring enlightenment</title>
+<title>Configuring <application>enlightenment</application></title>
 
 <sect3><title>Config files</title>
-<para><userinput>~/.enlightenment/*</userinput></para>
+<para><filename>~/.enlightenment/*</filename></para>
 </sect3>
 
@@ -11,7 +11,7 @@
 proceeding.</para>
 
-<para><screen><userinput>cat &gt;&gt; ~/.xinitrc &lt;&lt; "EOF"</userinput>
+<screen><userinput><command>cat &gt;&gt; ~/.xinitrc &lt;&lt; "EOF"</command>
 exec enlightenment
-<userinput>EOF</userinput></screen></para>
+<command>EOF</command></userinput></screen>
 
 </sect3>
Index: x/wm/enlightenment/enlightenment-inst.xml
===================================================================
--- x/wm/enlightenment/enlightenment-inst.xml	(revision 0f472264e16ecb4d7f04f4f8779df2210daa7307)
+++ x/wm/enlightenment/enlightenment-inst.xml	(revision 8a690106e50b7fc617b5fc846827e635851f65bd)
@@ -1,10 +1,10 @@
 <sect2>
-<title>Installation of enlightenment</title>
+<title>Installation of <application>enlightenment</application></title>
 
-<para>Install enlightenment by running the following commands:</para>
+<para>Install <application>enlightenment</application> by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr --enable-fsstd &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr --enable-fsstd &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: x/wm/fluxbox.xml
===================================================================
--- x/wm/fluxbox.xml	(revision 0f472264e16ecb4d7f04f4f8779df2210daa7307)
+++ x/wm/fluxbox.xml	(revision 8a690106e50b7fc617b5fc846827e635851f65bd)
@@ -1,5 +1,5 @@
-<sect1 id="fluxbox" xreflabel="fluxbox-&fluxbox-version;">
+<sect1 id="fluxbox" xreflabel="Fluxbox-&fluxbox-version;">
 <?dbhtml filename="fluxbox.html" dir="x"?>
-<title>fluxbox-&fluxbox-version;</title>
+<title>Fluxbox-&fluxbox-version;</title>
 
 &fluxbox-intro;
Index: x/wm/fluxbox/fluxbox-config.xml
===================================================================
--- x/wm/fluxbox/fluxbox-config.xml	(revision 0f472264e16ecb4d7f04f4f8779df2210daa7307)
+++ x/wm/fluxbox/fluxbox-config.xml	(revision 8a690106e50b7fc617b5fc846827e635851f65bd)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring <application>fluxbox</application></title>
+<title>Configuring <application>Fluxbox</application></title>
 
 <sect3><title>Config files</title>
@@ -11,16 +11,16 @@
 
 <para>Be sure to backup your current <filename>.xinitrc</filename> before
-proceeding.
-<screen><userinput>cat &gt;&gt; ~/.xinitrc &lt;&lt; "EOF"</userinput>
+proceeding.</para>
+<screen><userinput><command>cat &gt;&gt; ~/.xinitrc &lt;&lt; "EOF"</command>>
 exec fluxbox
-<userinput>EOF</userinput></screen></para>
+<command>EOF</command></userinput></screen>
 
-<screen><userinput>mkdir ~/.fluxbox &amp;&amp;
+<screen><userinput><command>mkdir ~/.fluxbox &amp;&amp;
 cp /usr/share/fluxbox/init ~/.fluxbox/init &amp;&amp;
 cp /usr/share/fluxbox/keys ~/.fluxbox/keys &amp;&amp;
-cp /usr/share/fluxbox/menu ~/.fluxbox/menu </userinput></screen>
+cp /usr/share/fluxbox/menu ~/.fluxbox/menu </command></userinput></screen>
 
 <para>Menu Items are added by editing<filename>~/.fluxbox/menu</filename>. The 
-syntax is explained on the <application>fluxbox</application> man page.</para>
+syntax is explained on the fluxbox man page.</para>
 </sect3>
 
Index: x/wm/fluxbox/fluxbox-desc.xml
===================================================================
--- x/wm/fluxbox/fluxbox-desc.xml	(revision 0f472264e16ecb4d7f04f4f8779df2210daa7307)
+++ x/wm/fluxbox/fluxbox-desc.xml	(revision 8a690106e50b7fc617b5fc846827e635851f65bd)
@@ -2,6 +2,7 @@
 <title>Contents</title>
 
-<para>The <application>fluxbox</application> package contains <command>fluxbox</command>,
-<command>bsetbg</command> and <command>bsetroot</command>.</para>
+<para>The <application>Fluxbox</application> package contains 
+<command>fluxbox</command>, <command>bsetbg</command> and 
+<command>bsetroot</command>.</para>
 
 </sect2>
@@ -21,5 +22,5 @@
 
 <sect3><title>bsetroot</title>
-<para><command>bsetroot</command> is a <application>blackbox</application> 
+<para><command>bsetroot</command> is a <application>Blackbox</application> 
 utility to change root window appearance.</para></sect3>
 
Index: x/wm/fluxbox/fluxbox-exp.xml
===================================================================
--- x/wm/fluxbox/fluxbox-exp.xml	(revision 0f472264e16ecb4d7f04f4f8779df2210daa7307)
+++ x/wm/fluxbox/fluxbox-exp.xml	(revision 8a690106e50b7fc617b5fc846827e635851f65bd)
@@ -3,9 +3,9 @@
 
 <para><command>--enable-kde</command> : This command activates
-<application>fluxbox</application>'s ability to allow <acronym>KDE</acronym> 
+<application>Fluxbox</application>'s ability to allow KDE
 tray icons to be placed in the slit.</para>
 
 <para><command>--enable-gnome</command> : This command activates
-<application>fluxbox</application>'s ability to support GNOME.</para>
+<application>Fluxbox</application>'s ability to support GNOME.</para>
 
 </sect2>
Index: x/wm/fluxbox/fluxbox-inst.xml
===================================================================
--- x/wm/fluxbox/fluxbox-inst.xml	(revision 0f472264e16ecb4d7f04f4f8779df2210daa7307)
+++ x/wm/fluxbox/fluxbox-inst.xml	(revision 8a690106e50b7fc617b5fc846827e635851f65bd)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Installation of <application>fluxbox</application></title>
+<title>Installation of <application>Fluxbox</application></title>
 
-<para>Install <application>fluxbox</application> by running the following 
+<para>Install <application>Fluxbox</application> by running the following 
 commands:</para>
 
Index: x/wm/fluxbox/fluxbox-intro.xml
===================================================================
--- x/wm/fluxbox/fluxbox-intro.xml	(revision 0f472264e16ecb4d7f04f4f8779df2210daa7307)
+++ x/wm/fluxbox/fluxbox-intro.xml	(revision 8a690106e50b7fc617b5fc846827e635851f65bd)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Introduction to <application>fluxbox</application></title>
+<title>Introduction to <application>Fluxbox</application></title>
 
-<para>The <application>fluxbox</application> package contains a windows manager.
+<para>The <application>Fluxbox</application> package contains a windows manager.
 </para>
 
@@ -18,5 +18,5 @@
 </sect3>
 
-<sect3><title><application>fluxbox</application> dependencies</title>
+<sect3><title><application>Fluxbox</application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="xfree86"/></para></sect4>
Index: x/wm/metacity.xml
===================================================================
--- x/wm/metacity.xml	(revision 0f472264e16ecb4d7f04f4f8779df2210daa7307)
+++ x/wm/metacity.xml	(revision 8a690106e50b7fc617b5fc846827e635851f65bd)
@@ -1,5 +1,5 @@
-<sect1 id="metacity" xreflabel="metacity-&metacity-version;">
+<sect1 id="metacity" xreflabel="Metacity-&metacity-version;">
 <?dbhtml filename="metacity.html" dir="x"?>
-<title>metacity-&metacity-version;</title>
+<title>Metacity-&metacity-version;</title>
 
 &metacity-intro;
Index: x/wm/metacity/metacity-config.xml
===================================================================
--- x/wm/metacity/metacity-config.xml	(revision 0f472264e16ecb4d7f04f4f8779df2210daa7307)
+++ x/wm/metacity/metacity-config.xml	(revision 8a690106e50b7fc617b5fc846827e635851f65bd)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring <application>metacity</application></title>
+<title>Configuring <application>Metacity</application></title>
 
 <sect3><title>Configuration Information</title>
Index: x/wm/metacity/metacity-desc.xml
===================================================================
--- x/wm/metacity/metacity-desc.xml	(revision 0f472264e16ecb4d7f04f4f8779df2210daa7307)
+++ x/wm/metacity/metacity-desc.xml	(revision 8a690106e50b7fc617b5fc846827e635851f65bd)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The <application>metacity</application> package contains
+<para>The <application>Metacity</application> package contains
 <command>metacity</command>.</para>
 
Index: x/wm/metacity/metacity-inst.xml
===================================================================
--- x/wm/metacity/metacity-inst.xml	(revision 0f472264e16ecb4d7f04f4f8779df2210daa7307)
+++ x/wm/metacity/metacity-inst.xml	(revision 8a690106e50b7fc617b5fc846827e635851f65bd)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Installation of <application>metacity</application></title>
+<title>Installation of <application>Metacity</application></title>
 
-<para>Install <application>metacity</application> by running the following commands:</para>
+<para>Install <application>Metacity</application> by running the following commands:</para>
 
 <screen><userinput><command>./configure --prefix=/usr --libexec=/usr/sbin --sysconfdir=/etc &amp;&amp;
Index: x/wm/metacity/metacity-intro.xml
===================================================================
--- x/wm/metacity/metacity-intro.xml	(revision 0f472264e16ecb4d7f04f4f8779df2210daa7307)
+++ x/wm/metacity/metacity-intro.xml	(revision 8a690106e50b7fc617b5fc846827e635851f65bd)
@@ -1,7 +1,7 @@
 <sect2>
-<title>Introduction to <application>metacity</application></title>
+<title>Introduction to <application>Metacity</application></title>
 
-<para>The <application>metacity</application> package contains a window manager. This is useful for
-organizing and displaying windows.</para>
+<para>The <application>Metacity</application> package contains a window 
+manager. This is useful for organizing and displaying windows.</para>
 
 <sect3><title>Package information</title>
@@ -18,5 +18,5 @@
 </sect3>
 
-<sect3><title><application>metacity</application> dependencies</title>
+<sect3><title><application>Metacity</application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="xfree86"/>, <xref linkend="intltool"/> and <xref
Index: x/wm/sawfish/sawfish-desc.xml
===================================================================
--- x/wm/sawfish/sawfish-desc.xml	(revision 0f472264e16ecb4d7f04f4f8779df2210daa7307)
+++ x/wm/sawfish/sawfish-desc.xml	(revision 8a690106e50b7fc617b5fc846827e635851f65bd)
@@ -11,5 +11,5 @@
 <sect3><title>sawfish</title>
 <para><command>sawfish</command> is the extensible window manager using a 
-Lisp-based scripting language.</para></sect3>
+<application>Lisp</application>-based scripting language.</para></sect3>
 
 </sect2>
Index: x/wm/xfce.xml
===================================================================
--- x/wm/xfce.xml	(revision 0f472264e16ecb4d7f04f4f8779df2210daa7307)
+++ x/wm/xfce.xml	(revision 8a690106e50b7fc617b5fc846827e635851f65bd)
@@ -1,5 +1,5 @@
-<sect1 id="xfce" xreflabel="xfce-&xfce-version;">
+<sect1 id="xfce" xreflabel="XFce-&xfce-version;">
 <?dbhtml filename="xfce.html" dir="x"?>
-<title>xfce-&xfce-version;</title>
+<title>XFce-&xfce-version;</title>
 
 &xfce-intro;
Index: x/wm/xfce/xfce-config.xml
===================================================================
--- x/wm/xfce/xfce-config.xml	(revision 0f472264e16ecb4d7f04f4f8779df2210daa7307)
+++ x/wm/xfce/xfce-config.xml	(revision 8a690106e50b7fc617b5fc846827e635851f65bd)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring XFce</title>
+<title>Configuring <application>XFce</application></title>
 
 <sect3><title>Config files</title>
@@ -8,6 +8,9 @@
 <sect3><title>Configuration Information</title>
 
-<para>XFce 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><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>
 </sect3>
 
Index: x/wm/xfce/xfce-desc.xml
===================================================================
--- x/wm/xfce/xfce-desc.xml	(revision 0f472264e16ecb4d7f04f4f8779df2210daa7307)
+++ x/wm/xfce/xfce-desc.xml	(revision 8a690106e50b7fc617b5fc846827e635851f65bd)
@@ -2,18 +2,21 @@
 <title>Contents</title>
 
-<para>The XFce package contains <userinput>CDE2Xfcepal</userinput>,
-<userinput>startxfce</userinput>, <userinput>xfbd</userinput>, <userinput>xfbdmgr</userinput>, <userinput>xfce</userinput>, <userinput>xfce_remove</userinput>,
-<userinput>xfce_setup</userinput>, <userinput>xfce_upgrade</userinput>,
-<userinput>xfclock</userinput>, <userinput>xfdiff</userinput>,
-<userinput>xfglob</userinput>, <userinput>xfgnome</userinput>,
-<userinput>xfhelp</userinput>, <userinput>xflock</userinput>,
-<userinput>xfmenu</userinput>, <userinput>xfmountdev</userinput>,
-<userinput>xfmouse</userinput>, <userinput>xfmouse</userinput>,
-<userinput>xfpager</userinput>, <userinput>xfplay</userinput>,
-<userinput>xfprint</userinput>, <userinput>xfrun</userinput>,
-<userinput>xfsamba</userinput>, <userinput>xfskin</userinput>,
-<userinput>xfsound</userinput>, <userinput>xfterm</userinput>,
-<userinput>xftrash</userinput>, <userinput>xftree</userinput>,
-<userinput>xfumed</userinput> and <userinput>xfwm</userinput>.</para>
+<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>
 
 </sect2>
@@ -22,99 +25,124 @@
 
 <sect3><title>CDE2Xfcepal</title>
-<para>CDE2Xfcepal converts CDE palettes to XFce palettes.</para></sect3>
+<para><command>CDE2Xfcepal</command> converts <acronym>CDE</acronym> palettes 
+to <application>XFce</application> palettes.</para></sect3>
 
 <sect3><title>startxfce</title>
-<para>startxfce initializes and starts the X server using
-<filename>~/.xinitrc</filename>.</para></sect3>
+<para><command>startxfce</command> initializes and starts the
+<application>X</application> server using <filename>~/.xinitrc</filename>.
+</para></sect3>
 
 <sect3><title>xfbd</title>
-<para>xfbd is the backdrop manager for XFce.</para></sect3>
+<para><command>xfbd</command> is the backdrop manager for
+<application>XFce</application>.</para></sect3>
 
 <sect3><title>xfbdmgr</title>
-<para>xfbdmgr is the list manager for XFce.</para></sect3>
+<para><command>xfbdmgr</command> is the list manager for
+<application>XFce</application>.</para></sect3>
 
 <sect3><title>xfce</title>
-<para>xfce is an easy-to-use and easy-to-configure toolbar for
-X11.</para></sect3>
+<para><command>xfce</command> is an easy-to-use and easy-to-configure toolbar 
+for <application>X11</application>.</para></sect3>
 
 <sect3><title>xfce_remove</title>
-<para>xfce_remove is a uninstall script to remove XFce as the desktop
-environment are restore the previous settings.</para></sect3>
+<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>xfce_setup</title>
-<para>xfce_setup is a configuration script to create <filename>~./xinitrc</filename> for XFce.</para></sect3>
+<para><command>xfce_setup</command> is a configuration script to create 
+<filename>~./xinitrc</filename> for <application>XFce</application>.</para>
+</sect3>
 
 <sect3><title>xfce_upgrade</title>
-<para>xfce_upgrade is the configuration script used to update versions
-of XFce.</para></sect3>
+<para><command>xfce_upgrade</command> is the configuration script used to 
+update versions of <application>XFce</application>.</para></sect3>
 
 <sect3><title>xfclock</title>
-<para>xfce_clock is a clock and calendar for XFce.</para></sect3>
+<para><command>xfce_clock</command> is a clock and calendar for
+<application>XFce</application>.</para></sect3>
 
 <sect3><title>xfdiff</title>
-<para>xfdiff is a visual diff for XFce.</para></sect3>
+<para><command>xfdiff</command> is a visual diff for
+<application>XFce</application>.</para></sect3>
 
 <sect3><title>xfglob</title>
-<para>xfglob is the file finder of XFce.</para></sect3>
+<para><command>xfglob</command> is the file finder of
+<application>XFce</application>.</para></sect3>
 
 <sect3><title>xfgnome</title>
-<para>xfgnome is the GNOME compliancy module for XFwm.</para></sect3>
+<para><command>xfgnome</command> is the GNOME compliancy module for
+<command>xfwm</command>.</para></sect3>
 
 <sect3><title>xfhelp</title>
-<para>xfhelp is script that launches a HTML browser to display online documentation.</para></sect3>
+<para><command>xfhelp</command> is script that launches a
+<acronym>HTML</acronym> browser to display online documentation.</para></sect3>
 
 <sect3><title>xflock</title>
-<para>xflock is a script used to lock the current screen during drag and
-drop actions.</para></sect3>
+<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>xfmenu is the menu launcher for XFce.</para></sect3>
+<para><command>xfmenu</command> is the menu launcher for
+<application>XFce</application>.</para></sect3>
 
 <sect3><title>xfmountdev</title>
-<para>xfmountdev mounts a device on the specified mount point and
-launches xftree, then unmounts the device when xftree finishes.</para></sect3>
+<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>xfmouse is a mouse configurator for XFce.</para></sect3>
+<para><command>xfmouse</command> is a mouse configurator for
+<application>XFce</application>.</para></sect3>
 
 <sect3><title>xfpager</title>
-<para>xfpager is the pager of XFwm.</para></sect3>
+<para><command>xfpager</command> is the pager of <command>xfwm</command>.
+</para></sect3>
 
 <sect3><title>xfplay</title>
-<para>xfplay is a script that executes the play program (not included in
-package.</para></sect3>
+<para><command>xfplay</command> is a script that executes the play program (not 
+included in package.</para></sect3>
 
 <sect3><title>xfprint</title>
-<para>xfprint is a minimalist printing wrapper to be used as a drag and drop
-action for the XFce front panel.</para></sect3>
+<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>xfrun is the program launcher for XFce.</para></sect3>
+<para><command>xfrun</command> is the program launcher for
+<application>XFce</application>.</para></sect3>
 
 <sect3><title>xfsamba</title>
-<para>xfsamba is samba front end for XFce.</para></sect3>
+<para><command>xfsamba</command> is <application>Samba</application> front end 
+for <application>XFce</application>.</para></sect3>
 
 <sect3><title>xfskin</title>
-<para>xfskin is a script to manage themes for XFce.</para></sect3>
+<para><command>xfskin</command> is a script to manage themes for
+<application>XFce</application>.</para></sect3>
 
 <sect3><title>xfsound</title>
-<para>xfsound is the sound server for XFce.</para></sect3>
+<para><command>xfsound</command> is the sound server for
+<application>XFce</application>.</para></sect3>
 
 <sect3><title>xfterm</title>
-<para>xfterm is a small terminal wrapper to be used as a drag and drop
-action for the XFce front panel.</para></sect3>
+<para><command>xfterm</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>xftrash is a small script to be used as a drag and drop action for
-the XFce front panel.</para></sect3>
+<para><command>xftrash</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>xftree is the file manager for XFce.</para></sect3>
+<para><command>xftree</command> is the file manager for
+<application>XFce</application>.</para></sect3>
 
 <sect3><title>xfumed</title>
-<para>xfumed is the user menu editor for XFce.</para></sect3>
+<para><command>xfumed</command> is the user menu editor for
+<application>XFce</application>.</para></sect3>
 
 <sect3><title>xfwm</title>
-<para>xfwm is a window manager for X11.</para></sect3>
+<para><command>xfwm</command> is a window manager for
+<application>X11</application>.</para></sect3>
 
 
Index: x/wm/xfce/xfce-exp.xml
===================================================================
--- x/wm/xfce/xfce-exp.xml	(revision 0f472264e16ecb4d7f04f4f8779df2210daa7307)
+++ x/wm/xfce/xfce-exp.xml	(revision 8a690106e50b7fc617b5fc846827e635851f65bd)
@@ -2,5 +2,5 @@
 <title>Command explanations</title>
 
-<para><userinput>--datadir=/usr/share</userinput> : This command puts
+<para><command>--datadir=/usr/share</command> : This command puts
 resource files into <filename>/usr/share/xfce</filename> instead of
 <filename>/usr/local/share/xfce</filename>.</para>
Index: x/wm/xfce/xfce-inst.xml
===================================================================
--- x/wm/xfce/xfce-inst.xml	(revision 0f472264e16ecb4d7f04f4f8779df2210daa7307)
+++ x/wm/xfce/xfce-inst.xml	(revision 8a690106e50b7fc617b5fc846827e635851f65bd)
@@ -1,10 +1,10 @@
 <sect2>
-<title>Installation of XFce</title>
+<title>Installation of <application>XFce</application></title>
 
-<para>Install XFce by running the following commands:</para>
+<para>Install <application>XFce</application> by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr --datadir=/usr/share --sysconfdir=/etc &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr --datadir=/usr/share --sysconfdir=/etc &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: x/wm/xfce/xfce-intro.xml
===================================================================
--- x/wm/xfce/xfce-intro.xml	(revision 0f472264e16ecb4d7f04f4f8779df2210daa7307)
+++ x/wm/xfce/xfce-intro.xml	(revision 8a690106e50b7fc617b5fc846827e635851f65bd)
@@ -1,18 +1,30 @@
 <sect2>
-<title>Introduction to XFce</title>
+<title>Introduction to <application>XFce</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&xfce-download-http;"/>
-Download location (FTP):        <ulink url="&xfce-download-ftp;"/>
-Version used:                   &xfce-version;
-Package size:                   &xfce-size;
-Estimated Disk space required:  &xfce-buildsize;</screen>
+<para>The <application>XFce</application> package contains a lightweight desktop environment.</para>
 
-<para>The XFce package contains a lightweight desktop environment.</para>
-
-<screen>XFce depends on:
-<xref linkend="xfree86"/>, <xref linkend="GTK"/> and <xref linkend="GLib"/>
-XFce will utilize:
-<xref linkend="gdk"/>, <xref linkend="imlib"/>, <xref linkend="libpng"/>, 
-<xref linkend="libjpeg"/>, <xref linkend="libungif"/> and <xref linkend="libtiff"/></screen>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&xfce-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&xfce-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &xfce-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&xfce-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&xfce-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application>template</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="xfree86"/>, <xref linkend="GTK"/> and <xref
+linkend="GLib"/></para></sect4>
+<sect4><title>Optional</title>
+<para><xref linkend="gdk"/>, <xref linkend="imlib"/>, <xref
+linkend="libpng"/>,
+<xref linkend="libjpeg"/>, <xref linkend="libungif"/> and <xref
+linkend="libtiff"/></para></sect4>
+</sect3>
 
 </sect2>
Index: x/wm/xfce/xfce.ent
===================================================================
--- x/wm/xfce/xfce.ent	(revision 0f472264e16ecb4d7f04f4f8779df2210daa7307)
+++ x/wm/xfce/xfce.ent	(revision 8a690106e50b7fc617b5fc846827e635851f65bd)
@@ -10,2 +10,3 @@
 <!ENTITY xfce-download-ftp "">
 <!ENTITY xfce-size "5.1 MB">
+<!ENTITY xfce-time "">
