Index: xsoft/graphweb/galeon.xml
===================================================================
--- xsoft/graphweb/galeon.xml	(revision 9f12e36459b28793feec6668926bb7469eedaba5)
+++ xsoft/graphweb/galeon.xml	(revision 56ce09e20be242fb71c6918b626b5240e44a4ad7)
@@ -81,5 +81,5 @@
 
     <para>Compiling must be done with the same compiler version and
-    optimization settings that were used to compile the Gecko rendering
+    optimization settings that were used to compile the Gecko layout
     engine package.</para>
 
@@ -87,7 +87,9 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
             --sysconfdir=&gnome-etc-dir; \
-            --localstatedir=/var/lib &amp;&amp;
+            --localstatedir=/var/lib \
+            --mandir=$(pkg-config \
+                --variable=prefix ORBit-2.0)/share/man &amp;&amp;
 make</userinput></screen>
 
@@ -97,10 +99,27 @@
 
 <screen role='root'><userinput>make install &amp;&amp;
-install -v -m755 -d \
-    `pkg-config --variable=prefix ORBit-2.0`/share/doc/galeon-&galeon-version; &amp;&amp;
-install -v -m644 FAQ README* doc/*.txt \
-    `pkg-config --variable=prefix ORBit-2.0`/share/doc/galeon-&galeon-version; &amp;&amp;
-ln -v -s ../../$PACKAGE_NAME/FAQ.html \
-    `pkg-config --variable=prefix ORBit-2.0`/share/doc/galeon-&galeon-version;</userinput></screen>
+install -v -m755 -d $(pkg-config \
+        --variable=prefix ORBit-2.0)/share/doc/galeon-&galeon-version; &amp;&amp;
+install -v -m644 FAQ README* doc/*.txt $(pkg-config \
+        --variable=prefix ORBit-2.0)/share/doc/galeon-&galeon-version; &amp;&amp;
+ln -v -s ../../$PACKAGE_NAME/FAQ.html $(pkg-config \
+        --variable=prefix ORBit-2.0)/share/doc/galeon-&galeon-version;</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+    
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gnome-prefix.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gnome-sysconfdir.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/scrollkeeper-dir.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gnome-mandir.xml"/>
 
   </sect2>
@@ -117,6 +136,6 @@
         <seg>galeon and galeon-config-tool</seg>
         <seg>None</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas/}apps/galeon
-        and the following subdirectories of $GNOME_PREFIX/share/:
+        <seg>The following subdirectories of
+        <envar>$GNOME_PREFIX</envar>/share/:
         galeon, {gnome/help, omf, sounds}/galeon</seg>
       </seglistitem>
Index: xsoft/office/evolution.xml
===================================================================
--- xsoft/office/evolution.xml	(revision 9f12e36459b28793feec6668926bb7469eedaba5)
+++ xsoft/office/evolution.xml	(revision 56ce09e20be242fb71c6918b626b5240e44a4ad7)
@@ -132,6 +132,6 @@
 
 <screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
+            --sysconfdir=&gnome-etc-dir; \
             --localstatedir=/var/lib \
-            --sysconfdir=&gnome-etc-dir; \
             --libexecdir=$(pkg-config \
                 --variable=prefix ORBit-2.0)/lib \
@@ -160,4 +160,20 @@
     you wish to build and install the documentation.</para>
     -->
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gnome-prefix.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gnome-sysconfdir.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/scrollkeeper-dir.xml"/>
+
+    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
+    ORBit-2.0)/lib</parameter>: This parameter causes the libexec
+    files to be installed in the preferred location of
+    <filename class="directory">$GNOME_PREFIX/lib/evolution</filename> instead
+    of <filename
+    class="directory">$GNOME_PREFIX/libexec/evolution</filename>.</para>
 
     <para><parameter>--enable-nntp</parameter>: This parameter is used to build
@@ -211,5 +227,5 @@
         <seg>$GNOME_PREFIX/lib/evolution/2.6/* (contains support libraries,
         conduits, and other components)</seg>
-        <seg>The following subdirectories of $GNOME_PREFIX/:
+        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
         include/evolution-2.6,
         lib/evolution,
Index: xsoft/office/gimp.xml
===================================================================
--- xsoft/office/gimp.xml	(revision 9f12e36459b28793feec6668926bb7469eedaba5)
+++ xsoft/office/gimp.xml	(revision 56ce09e20be242fb71c6918b626b5240e44a4ad7)
@@ -10,6 +10,6 @@
   <!ENTITY gimp-size          "12.3 MB">
   <!ENTITY gimp-buildsize     "501 MB (includes installing the help system)">
-  <!ENTITY gimp-time          "5.5 SBU (additional 0.8 SBU to run test suite
-                              and additional 8.2 SBU to build help files)">
+  <!ENTITY gimp-time          "5.5 SBU (additional 0.8 SBU to run the test suite
+                              and additional 8.2 SBU to build the help files)">
 
   <!ENTITY gimp-help-version  "0.10">
@@ -112,5 +112,6 @@
     <ulink url="http://wvware.sourceforge.net/libwmf.html">libwmf</ulink></para>
 
-    <bridgehead renderas="sect4">Optional (for Building Documentation from the Help Tarball)</bridgehead>
+    <bridgehead renderas="sect4">Optional (for Building Documentation from
+    the Help Tarball)</bridgehead>
     <para role="optional">
     <xref linkend="libxslt"/>,
@@ -182,4 +183,7 @@
     <para><parameter>--without-libtiff</parameter>: This option is necessary if
     <application>libtiff</application> is not installed.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
 
   </sect2>
Index: xsoft/office/gnucash.xml
===================================================================
--- xsoft/office/gnucash.xml	(revision 9f12e36459b28793feec6668926bb7469eedaba5)
+++ xsoft/office/gnucash.xml	(revision 56ce09e20be242fb71c6918b626b5240e44a4ad7)
@@ -174,4 +174,7 @@
     files in <filename class='directory'>/etc/gnucash</filename> instead of
     <filename class='directory'>/opt/gnome-1.4/etc/gnucash</filename>.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/scrollkeeper-dir.xml"/>
 
     <para><parameter>--disable-guppi</parameter>: This compiles
Index: xsoft/office/gnumeric.xml
===================================================================
--- xsoft/office/gnumeric.xml	(revision 9f12e36459b28793feec6668926bb7469eedaba5)
+++ xsoft/office/gnumeric.xml	(revision 56ce09e20be242fb71c6918b626b5240e44a4ad7)
@@ -95,6 +95,6 @@
 
 <screen><userinput>./configure --prefix=/usr \
-            --localstatedir=/var/lib \
-            --sysconfdir=&gnome-etc-dir; &amp;&amp;
+            --sysconfdir=&gnome-etc-dir; \
+            --localstatedir=/var/lib &amp;&amp;
 make</userinput></screen>
 
@@ -156,16 +156,9 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--localstatedir=/var/lib</parameter>: This switch puts
-    <application>ScrollKeeper</application> files in
-    <filename class="directory">/var/lib/scrollkeeper</filename> instead of
-    <filename class="directory">/usr/var/scrollkeeper</filename>. This
-    switch may not be applicable if you don't have <xref linkend="yelp"/>
-    installed, but won't affect the build otherwise.</para>
-
-    <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This switch puts
-    configuration files in <filename class="directory">&gnome-etc-dir;</filename>
-    instead of <filename class="directory">/usr/etc</filename>. This
-    switch may not be applicable if you don't have <xref linkend="GConf"/>
-    installed, but won't affect the build otherwise.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gnome-sysconfdir.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/scrollkeeper-dir.xml"/>
 
     <para><parameter>--prefix=$(pkg-config
@@ -192,6 +185,5 @@
         <seg>numerous filters, plugins and <application>GNOME</application>
         components</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas/}apps/gnumeric,
-        /usr/lib/gnumeric,
+        <seg>/usr/lib/gnumeric,
         /usr/share/doc/gnumeric-&gnumeric-version;, and
         /usr/share/{{,gnome/help/, omf/, pixmaps/}gnumeric,mc}</seg>
Index: xsoft/other/balsa.xml
===================================================================
--- xsoft/other/balsa.xml	(revision 9f12e36459b28793feec6668926bb7469eedaba5)
+++ xsoft/other/balsa.xml	(revision 56ce09e20be242fb71c6918b626b5240e44a4ad7)
@@ -97,6 +97,8 @@
 
 <screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
+            --sysconfdir=&gnome-etc-dir; \
             --localstatedir=/var/lib \
-            --sysconfdir=&gnome-etc-dir; \
+            --mandir=$(pkg-config \
+                --variable=prefix ORBit-2.0)/share/man &amp;&amp;
             --with-gtkhtml=no \
             --with-esmtp=no &amp;&amp;
@@ -114,12 +116,15 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--localstatedir=/var/lib</parameter>: This switch puts
-    <application>ScrollKeeper</application> files in
-    <filename class="directory">/var/lib/scrollkeeper</filename> instead of
-    <filename class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
-
-    <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This switch puts
-    configuration files in <filename class="directory">&gnome-etc-dir;</filename>
-    instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gnome-prefix.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gnome-sysconfdir.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/scrollkeeper-dir.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gnome-mandir.xml"/>
 
     <para><parameter>--with-gtkhtml=no</parameter>: This parameter is used if
@@ -181,5 +186,6 @@
         <seg>balsa and balsa-ab</seg>
         <seg>None</seg>
-        <seg>The following subdirectories of $GNOME_PREFIX/share/:
+        <seg>The following subdirectories of
+        <envar>$GNOME_PREFIX</envar>/share/:
         {gnome/help, omf, sounds}/balsa</seg>
       </seglistitem>
