Index: multimedia/libdriv/libfame.xml
===================================================================
--- multimedia/libdriv/libfame.xml	(revision 91c2c77d9802e15a48f6c2016947ab5a47303aa3)
+++ multimedia/libdriv/libfame.xml	(revision c7bedf4bd56689ad2e9a56e176c8dfe55b4c6787)
@@ -1,4 +1,4 @@
 <sect1 id="libfame" xreflabel="libFAME-&libfame-version;">
-<?dbhtml filename="libfame.html" dir="basicnet"?>
+<?dbhtml filename="libfame.html" dir="multimedia"?>
 <title>libFAME-&libfame-version;</title>
 
Index: multimedia/libdriv/openquicktime.xml
===================================================================
--- multimedia/libdriv/openquicktime.xml	(revision 91c2c77d9802e15a48f6c2016947ab5a47303aa3)
+++ multimedia/libdriv/openquicktime.xml	(revision c7bedf4bd56689ad2e9a56e176c8dfe55b4c6787)
@@ -1,4 +1,4 @@
 <sect1 id="openquicktime" xreflabel="OpenQuicktime-&openquicktime-version;">
-<?dbhtml filename="openquicktime.html" dir="basicnet"?>
+<?dbhtml filename="openquicktime.html" dir="multimedia"?>
 <title>OpenQuicktime-&openquicktime-version;</title>
 
Index: multimedia/libdriv/speex.xml
===================================================================
--- multimedia/libdriv/speex.xml	(revision 91c2c77d9802e15a48f6c2016947ab5a47303aa3)
+++ multimedia/libdriv/speex.xml	(revision c7bedf4bd56689ad2e9a56e176c8dfe55b4c6787)
@@ -1,4 +1,4 @@
 <sect1 id="speex" xreflabel="Speex-&speex-version;">
-<?dbhtml filename="speex.html" dir="basicnet"?>
+<?dbhtml filename="speex.html" dir="multimedia"?>
 <title>Speex-&speex-version;</title>
 
Index: x/lib/fontconfig/fontconfig.ent
===================================================================
--- x/lib/fontconfig/fontconfig.ent	(revision 91c2c77d9802e15a48f6c2016947ab5a47303aa3)
+++ x/lib/fontconfig/fontconfig.ent	(revision c7bedf4bd56689ad2e9a56e176c8dfe55b4c6787)
@@ -6,5 +6,5 @@
 <!ENTITY fontconfig-buildsize "9.6 MB">
 <!ENTITY fontconfig-version "2.2.1">
-<!ENTITY fontconfig-download-http "http://fontconfig.org/release/">
+<!ENTITY fontconfig-download-http "http://pdx.freedesktop.org/software/fontconfig.org/releases/fontconfig-2.2.1.tar.gz">
 <!ENTITY fontconfig-download-ftp "">
 <!ENTITY fontconfig-size "1.4 MB">
Index: x/lib/freetype2.xml
===================================================================
--- x/lib/freetype2.xml	(revision 91c2c77d9802e15a48f6c2016947ab5a47303aa3)
+++ x/lib/freetype2.xml	(revision c7bedf4bd56689ad2e9a56e176c8dfe55b4c6787)
@@ -6,5 +6,4 @@
 &freetype2-inst;
 &freetype2-exp;
-&freetype2-config;
 &freetype2-desc;
 
Index: x/lib/gtk+.xml
===================================================================
--- x/lib/gtk+.xml	(revision 91c2c77d9802e15a48f6c2016947ab5a47303aa3)
+++ x/lib/gtk+.xml	(revision c7bedf4bd56689ad2e9a56e176c8dfe55b4c6787)
@@ -6,5 +6,4 @@
 &GTK-inst;
 &GTK-exp;
-&GTK-config;
 &GTK-desc;
 
Index: x/lib/gtk+2.xml
===================================================================
--- x/lib/gtk+2.xml	(revision 91c2c77d9802e15a48f6c2016947ab5a47303aa3)
+++ x/lib/gtk+2.xml	(revision c7bedf4bd56689ad2e9a56e176c8dfe55b4c6787)
@@ -6,5 +6,4 @@
 &GTK2-inst;
 &GTK2-exp;
-&GTK2-config;
 &GTK2-desc;
 
Index: x/wm/fluxbox/fluxbox-config.xml
===================================================================
--- x/wm/fluxbox/fluxbox-config.xml	(revision 91c2c77d9802e15a48f6c2016947ab5a47303aa3)
+++ x/wm/fluxbox/fluxbox-config.xml	(revision c7bedf4bd56689ad2e9a56e176c8dfe55b4c6787)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring fluxbox</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.</para>
-
-<para><screen><userinput>cat &gt;&gt; ~/.xinitrc &lt;&lt; "EOF"</userinput>
+proceeding.
+<screen><userinput>cat &gt;&gt; ~/.xinitrc &lt;&lt; "EOF"</userinput>
 exec fluxbox
 <userinput>EOF</userinput></screen></para>
 
-<para><screen><userinput>mkdir ~/.fluxbox &amp;&amp;
+<screen><userinput>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></para>
+cp /usr/share/fluxbox/menu ~/.fluxbox/menu </userinput></screen>
 
-<para>Menu Items are added by editing<filename>~/.fluxbox/menu</filename>. The syntax is explained on the fluxbox man page.</para>
+<para>Menu Items are added by editing<filename>~/.fluxbox/menu</filename>. The 
+syntax is explained on the <application>fluxbox</application> man page.</para>
 </sect3>
 
Index: x/wm/fluxbox/fluxbox.ent
===================================================================
--- x/wm/fluxbox/fluxbox.ent	(revision 91c2c77d9802e15a48f6c2016947ab5a47303aa3)
+++ x/wm/fluxbox/fluxbox.ent	(revision c7bedf4bd56689ad2e9a56e176c8dfe55b4c6787)
@@ -5,8 +5,8 @@
 <!ENTITY fluxbox-desc SYSTEM "fluxbox-desc.xml">
 <!ENTITY fluxbox-config SYSTEM "fluxbox-config.xml">
-<!ENTITY fluxbox-buildsize "6.5 MB">
-<!ENTITY fluxbox-version "0.1.14">
-<!ENTITY fluxbox-download-http "http://telia.dl.sourceforge.net/sourceforge/fluxbox/fluxbox-0.1.14.tar.bz2">
+<!ENTITY fluxbox-buildsize "53.9 MB">
+<!ENTITY fluxbox-version "0.9.5">
+<!ENTITY fluxbox-download-http "http://telia.dl.sourceforge.net/sourceforge/fluxbox/fluxbox-0.9.5.tar.bz2">
 <!ENTITY fluxbox-download-ftp "">
 <!ENTITY fluxbox-size "372 KB">
-<!ENTITY fluxbox-time "1.11 SBU">
+<!ENTITY fluxbox-time "1.28 SBU">
Index: x/wm/metacity/metacity-desc.xml
===================================================================
--- x/wm/metacity/metacity-desc.xml	(revision 91c2c77d9802e15a48f6c2016947ab5a47303aa3)
+++ x/wm/metacity/metacity-desc.xml	(revision c7bedf4bd56689ad2e9a56e176c8dfe55b4c6787)
@@ -10,5 +10,6 @@
 
 <sect3><title>metacity</title>
-<para><command>metacity</command> is a window manager used mainly by Gnome.</para></sect3>
+<para><command>metacity</command> is a window manager used mainly by GNOME.
+</para></sect3>
 
 </sect2>
