Index: x/wm/xfce.xml
===================================================================
--- x/wm/xfce.xml	(revision acf44a9d4efe65282d22d125bed20beaa4655436)
+++ x/wm/xfce.xml	(revision b1deef446b95cc150d0bd26728d1ebade84c847c)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY xfce-download-http "http://prdownloads.sourceforge.net/xfce/xfce-4.2.3.2-src.tar.bz2">
+  <!ENTITY xfce-download-http "http://prdownloads.sourceforge.net/xfce/xfce-&xfce-version;-src.tar.bz2">
   <!ENTITY xfce-download-ftp  " ">
   <!ENTITY xfce-md5sum        "44e126e47657969657ff86fb558d54ea">
   <!ENTITY xfce-size          "25 MB">
-  <!ENTITY xfce-buildsize     "219 MB (to build and install everything without deleting the source)">
+  <!ENTITY xfce-buildsize     "219 MB (to build and install everything without deleting any sources)">
   <!ENTITY xfce-time          "3.5 SBU">
 ]>
@@ -66,9 +66,12 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gdm"/>, <xref linkend="librsvg"/>,
+    <para role="optional"><xref linkend="gdm"/>,
+    <xref linkend="librsvg"/>
     (<application>xffm</application> links to <application>librsvg</application>
-    automatically if it is installed) <xref linkend="libgtkhtml"/>,
-    <xref linkend="startup-notification"/> and <xref linkend="a2ps"/> (required to build
-    <application>xfprint</application>).</para>
+    automatically if <application>librsvg</application> is installed),
+    <xref linkend="libgtkhtml"/>,
+    <xref linkend="startup-notification"/>, and
+    <xref linkend="a2ps"/>
+    (required to build <application>xfprint</application>).</para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -80,6 +83,6 @@
     <title>Installation of XFce</title>
 
-    <para>The following packages will install the bare
-    minimum:</para>
+    <para>A bare minimum <application>XFce</application> setup requires
+    installation of the following packages:</para>
 
     <itemizedlist spacing='compact'>
@@ -127,12 +130,15 @@
     <para><application>xfce4-panel</application>, <application>xfdesktop</application>
     and <application>xfce-utils</application> require a parameter so that the
-    configuration files are installed in /etc/xdg. Configure them like this:</para>
+    configuration files are installed in
+    <filename class='directory'>/etc/xdg</filename>. Configure them by issuing the
+    following commands:</para>
 
 <screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
 make</userinput></screen>
 
-    <para>If you use <xref linkend="gdm"/> as your display manager and would like to
-    be able to log into an xfce session from the login prompt, pass the
-    <parameter>--enable-gdm</parameter> option to the xfce-utils-&xfce-version;
+    <para>If you use <xref linkend="gdm"/> as your display manager and would
+    like to be able to log into an <application>XFce</application> session from
+    the login prompt, pass the <parameter>--enable-gdm</parameter> option to
+    the <application>xfce-utils</application>-&xfce-version;
     <command>configure</command> script (requires <xref linkend="which"/> to be
     installed at run time).</para>
@@ -189,11 +195,12 @@
     </itemizedlist>
 
-    <para>Almost all of these compile with these commands:</para>
+    <para>Configure all but the <application>xfce4-session</application> package
+    using the following commands:</para>
 
 <screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
-    <para>Except for <application>xfce4-session</application> which needs to be
-    configured like this:</para>
+    <para><application>xfce4-session</application> requires the following
+    commands:</para>
 
 <screen><userinput>./configure --prefix=/usr --sysconfdir=/etc \
@@ -202,6 +209,6 @@
 
     <para>Also, <application>xfprint</application> can be configured with
-    <parameter>--enable-cups</parameter>, if you have <xref linkend="cups"/> installed.
-    </para>
+    <parameter>--enable-cups</parameter> if you have <xref linkend="cups"/>
+    installed.</para>
 
     <para>And then as <systemitem class="username">root</systemitem>:</para>
@@ -209,6 +216,7 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <para>As <systemitem class="username">root</systemitem>, move the help documentation
-    to the standard BLFS location and fix the help script to look for it there:</para>
+    <para>As the <systemitem class="username">root</systemitem> user, move the
+    help documentation to the standard BLFS location and modify the help script to
+    look for it there:</para>
 
 <screen role="root"><userinput>mv -vf /usr/share/xfce4/doc /usr/share/doc/xfce4 &amp;&amp;
