Index: xsoft/graphweb/dillo.xml
===================================================================
--- xsoft/graphweb/dillo.xml	(revision 4f9d28c86f323b1185f70e15767d2146ec3fad65)
+++ xsoft/graphweb/dillo.xml	(revision 6a1f1202bcfaed7e60677cf502c8ffa573a3c8bd)
@@ -1,4 +1,4 @@
 <sect1 id="dillo" xreflabel="Dillo-&dillo-version;">
-<?dbhtml filename="dillo.html" dir="xsoft"?>
+<?dbhtml filename="dillo.html" ?>
 <title>Dillo-&dillo-version;</title>
 
Index: xsoft/graphweb/firefox.xml
===================================================================
--- xsoft/graphweb/firefox.xml	(revision 4f9d28c86f323b1185f70e15767d2146ec3fad65)
+++ xsoft/graphweb/firefox.xml	(revision 6a1f1202bcfaed7e60677cf502c8ffa573a3c8bd)
@@ -1,4 +1,4 @@
 <sect1 id="firefox" xreflabel="MozillaFirefox-&firefox-version;">
-<?dbhtml filename="firefox.html" dir="xsoft"?>
+<?dbhtml filename="firefox.html" ?>
 <title>MozillaFirefox-&firefox-version;</title>
 
Index: xsoft/graphweb/galeon.xml
===================================================================
--- xsoft/graphweb/galeon.xml	(revision 4f9d28c86f323b1185f70e15767d2146ec3fad65)
+++ xsoft/graphweb/galeon.xml	(revision 6a1f1202bcfaed7e60677cf502c8ffa573a3c8bd)
@@ -1,4 +1,4 @@
 <sect1 id="galeon" xreflabel="Galeon-&galeon-version;">
-<?dbhtml filename="galeon.html" dir="xsoft"?>
+<?dbhtml filename="galeon.html" ?>
 <title>Galeon-&galeon-version;</title>
 
Index: xsoft/graphweb/graphweb.xml
===================================================================
--- xsoft/graphweb/graphweb.xml	(revision 4f9d28c86f323b1185f70e15767d2146ec3fad65)
+++ xsoft/graphweb/graphweb.xml	(revision 6a1f1202bcfaed7e60677cf502c8ffa573a3c8bd)
@@ -1,4 +1,4 @@
 <chapter id="xsoft-graphweb">
-<?dbhtml filename="graphweb.html" dir="xsoft"?>
+<?dbhtml filename="graphweb.html" ?>
 <title>Graphical Web Browsers</title>
 
Index: xsoft/graphweb/konq.xml
===================================================================
--- xsoft/graphweb/konq.xml	(revision 4f9d28c86f323b1185f70e15767d2146ec3fad65)
+++ xsoft/graphweb/konq.xml	(revision 6a1f1202bcfaed7e60677cf502c8ffa573a3c8bd)
@@ -1,4 +1,4 @@
 <sect1 id="konq" xreflabel="Konqueror-&kde-version;">
-<?dbhtml filename="konq.html" dir="xsoft"?>
+<?dbhtml filename="konq.html" ?>
 <title>Konqueror-&kde-version;</title>
 
Index: xsoft/graphweb/mozilla.xml
===================================================================
--- xsoft/graphweb/mozilla.xml	(revision 4f9d28c86f323b1185f70e15767d2146ec3fad65)
+++ xsoft/graphweb/mozilla.xml	(revision 6a1f1202bcfaed7e60677cf502c8ffa573a3c8bd)
@@ -1,4 +1,4 @@
 <sect1 id="mozilla" xreflabel="Mozilla-&mozilla-version;">
-<?dbhtml filename="mozilla.html" dir="xsoft"?>
+<?dbhtml filename="mozilla.html" ?>
 <title>Mozilla-&mozilla-version;</title>
 
Index: xsoft/office/gnumeric/gnumeric-exp.xml
===================================================================
--- xsoft/office/gnumeric/gnumeric-exp.xml	(revision 4f9d28c86f323b1185f70e15767d2146ec3fad65)
+++ xsoft/office/gnumeric/gnumeric-exp.xml	(revision 6a1f1202bcfaed7e60677cf502c8ffa573a3c8bd)
@@ -5,13 +5,13 @@
 puts <application>ScrollKeeper</application> files in <filename
 class="directory">/var/lib/scrollkeeper</filename>
-instead of <filename class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
+instead of <filename class="directory">/usr/var/scrollkeeper</filename>.</para>
 
-<para><parameter>--sysconfdir=/etc/gnome</parameter>: This switch
-puts configuration files in <filename class="directory">/etc/gnome</filename> instead of
-<filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
+<para><parameter>--sysconfdir=/etc</parameter>: This switch
+puts configuration files in <filename class="directory">/etc</filename> instead of
+<filename class="directory">/usr/etc</filename>.</para>
 
-<para><parameter>--libexecdir=$GNOME_PREFIX/sbin</parameter>: This switch
-puts libexec files in <filename class="directory">$GNOME_PREFIX/sbin</filename> instead of
-<filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
+<para><parameter>--libexecdir=/usr/sbin</parameter>: This switch
+puts libexec files in <filename class="directory">/usr/sbin</filename> instead of
+<filename class="directory">/usr/libexec</filename>.</para>
 
 </sect2>
Index: xsoft/office/gnumeric/gnumeric-inst.xml
===================================================================
--- xsoft/office/gnumeric/gnumeric-inst.xml	(revision 4f9d28c86f323b1185f70e15767d2146ec3fad65)
+++ xsoft/office/gnumeric/gnumeric-inst.xml	(revision 6a1f1202bcfaed7e60677cf502c8ffa573a3c8bd)
@@ -4,7 +4,6 @@
 <para>Install <application>Gnumeric</application> by running the following commands:</para>
 
-<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-   --localstatedir=/var/lib \
-   --sysconfdir=/etc/gnome --libexecdir=`pkg-config --variable=prefix ORBit-2.0`/sbin &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr --libexecdir=/usr/sbin \
+   --localstatedir=/var/lib  --sysconfdir=/etc &amp;&amp;
 make &amp;&amp;
 make install</command></userinput></screen>
Index: xsoft/office/gnumeric/gnumeric.ent
===================================================================
--- xsoft/office/gnumeric/gnumeric.ent	(revision 4f9d28c86f323b1185f70e15767d2146ec3fad65)
+++ xsoft/office/gnumeric/gnumeric.ent	(revision 6a1f1202bcfaed7e60677cf502c8ffa573a3c8bd)
@@ -4,8 +4,8 @@
 <!ENTITY gnumeric-exp SYSTEM "gnumeric-exp.xml">
 <!ENTITY gnumeric-desc SYSTEM "gnumeric-desc.xml">
-<!ENTITY gnumeric-version "1.2.6">
+<!ENTITY gnumeric-version "1.2.10">
 <!ENTITY gnumeric-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnumeric/1.2/gnumeric-&gnumeric-version;.tar.bz2">
 <!ENTITY gnumeric-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnumeric/1.2/gnumeric-&gnumeric-version;.tar.bz2">
-<!ENTITY gnumeric-size "10.9 MB">
-<!ENTITY gnumeric-buildsize "295.3 MB">
+<!ENTITY gnumeric-size "13.9 MB">
+<!ENTITY gnumeric-buildsize "270.7 MB">
 <!ENTITY gnumeric-time "2.81 SBU">
Index: xsoft/other/balsa.xml
===================================================================
--- xsoft/other/balsa.xml	(revision 4f9d28c86f323b1185f70e15767d2146ec3fad65)
+++ xsoft/other/balsa.xml	(revision 6a1f1202bcfaed7e60677cf502c8ffa573a3c8bd)
@@ -1,4 +1,4 @@
 <sect1 id="balsa" xreflabel="Balsa-&balsa-version;">
-<?dbhtml filename="balsa.html" dir="xsoft"?>
+<?dbhtml filename="balsa.html" ?>
 <title>Balsa-&balsa-version;</title>
 
Index: xsoft/other/other.xml
===================================================================
--- xsoft/other/other.xml	(revision 4f9d28c86f323b1185f70e15767d2146ec3fad65)
+++ xsoft/other/other.xml	(revision 6a1f1202bcfaed7e60677cf502c8ffa573a3c8bd)
@@ -1,4 +1,4 @@
 <chapter id="xsoft-other">
-<?dbhtml filename="other.html" dir="xsoft"?>
+<?dbhtml filename="other.html" ?>
 <title>Other X-based Internet Programs</title>
 
Index: xsoft/other/pan.xml
===================================================================
--- xsoft/other/pan.xml	(revision 4f9d28c86f323b1185f70e15767d2146ec3fad65)
+++ xsoft/other/pan.xml	(revision 6a1f1202bcfaed7e60677cf502c8ffa573a3c8bd)
@@ -1,4 +1,4 @@
 <sect1 id="pan" xreflabel="Pan-&pan-version;">
-<?dbhtml filename="pan.html" dir="xsoft"?>
+<?dbhtml filename="pan.html" ?>
 <title>Pan-&pan-version;</title>
 
Index: xsoft/other/thunderbird.xml
===================================================================
--- xsoft/other/thunderbird.xml	(revision 4f9d28c86f323b1185f70e15767d2146ec3fad65)
+++ xsoft/other/thunderbird.xml	(revision 6a1f1202bcfaed7e60677cf502c8ffa573a3c8bd)
@@ -1,4 +1,4 @@
 <sect1 id="thunderbird" xreflabel="MozillaThunderbird-&thunderbird-version;">
-<?dbhtml filename="thunderbird.html" dir="xsoft"?>
+<?dbhtml filename="thunderbird.html" ?>
 <title>MozillaThunderbird-&thunderbird-version;</title>
 
Index: xsoft/suites/koffice.xml
===================================================================
--- xsoft/suites/koffice.xml	(revision 4f9d28c86f323b1185f70e15767d2146ec3fad65)
+++ xsoft/suites/koffice.xml	(revision 6a1f1202bcfaed7e60677cf502c8ffa573a3c8bd)
@@ -1,4 +1,4 @@
 <sect1 id="koffice">
-<?dbhtml filename="koffice.html" dir="xsoft"?>
+<?dbhtml filename="koffice.html" ?>
 <title>KOffice-&koffice-version;</title>
 
Index: xsoft/suites/openoffice.xml
===================================================================
--- xsoft/suites/openoffice.xml	(revision 4f9d28c86f323b1185f70e15767d2146ec3fad65)
+++ xsoft/suites/openoffice.xml	(revision 6a1f1202bcfaed7e60677cf502c8ffa573a3c8bd)
@@ -1,4 +1,4 @@
 <sect1 id="openoffice" xreflabel="OpenOffice-&openoffice-version;">
-<?dbhtml filename="openoffice.html" dir="xsoft"?>
+<?dbhtml filename="openoffice.html" ?>
 <title>OpenOffice-&openoffice-version;</title>
 
Index: xsoft/suites/suites.xml
===================================================================
--- xsoft/suites/suites.xml	(revision 4f9d28c86f323b1185f70e15767d2146ec3fad65)
+++ xsoft/suites/suites.xml	(revision 6a1f1202bcfaed7e60677cf502c8ffa573a3c8bd)
@@ -1,4 +1,4 @@
 <chapter id="xsoft-suites">
-<?dbhtml filename="suites.html" dir="xsoft"?>
+<?dbhtml filename="suites.html" ?>
 <title>Office Suites</title>
 
