Index: general/genlib/aspell.xml
===================================================================
--- general/genlib/aspell.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/genlib/aspell.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="aspell" xreflabel="aspell-&aspell-version;">
-<?dbhtml filename="aspell.html" dir="general"?>
+<?dbhtml filename="aspell.html"?>
 <title>aspell-&aspell-version;</title>
 
Index: general/genlib/expat.xml
===================================================================
--- general/genlib/expat.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/genlib/expat.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="expat" xreflabel="expat-&expat-version;">
-<?dbhtml filename="expat.html" dir="general"?>
+<?dbhtml filename="expat.html"?>
 <title>expat-&expat-version;</title>
 
Index: general/genlib/fam.xml
===================================================================
--- general/genlib/fam.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/genlib/fam.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="fam" xreflabel="FAM-&fam-version;">
-<?dbhtml filename="fam.html" dir="general"?>
+<?dbhtml filename="fam.html"?>
 <title>FAM-&fam-version;</title>
 
Index: general/genlib/gdbm.xml
===================================================================
--- general/genlib/gdbm.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/genlib/gdbm.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="gdbm" xreflabel="GDBM-&gdbm-version;">
-<?dbhtml filename="gdbm.html" dir="general"?>
+<?dbhtml filename="gdbm.html"?>
 <title>GDBM-&gdbm-version;</title>
 
Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/genlib/genlib.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <chapter id="general-genlib">
-<?dbhtml filename="genlib.html" dir="general"?>
+<?dbhtml filename="genlib.html"?>
 <title>General Libraries</title>
 
Index: general/genlib/glib.xml
===================================================================
--- general/genlib/glib.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/genlib/glib.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="GLib" xreflabel="GLib-&GLib-version;">
-<?dbhtml filename="glib.html" dir="general"?>
+<?dbhtml filename="glib.html"?>
 <title>GLib-&GLib-version;</title>
 
Index: general/genlib/glib2.xml
===================================================================
--- general/genlib/glib2.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/genlib/glib2.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="GLib2" xreflabel="GLib-&GLib2-version;">
-<?dbhtml filename="glib2.html" dir="general"?>
+<?dbhtml filename="glib2.html"?>
 <title>GLib-&GLib2-version;</title>
 
Index: general/genlib/gmp.xml
===================================================================
--- general/genlib/gmp.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/genlib/gmp.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="gmp" xreflabel="GMP-&gmp-version;">
-<?dbhtml filename="gmp.html" dir="general"?>
+<?dbhtml filename="gmp.html"?>
 <title>GMP-&gmp-version;</title>
 
Index: general/genlib/guile.xml
===================================================================
--- general/genlib/guile.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/genlib/guile.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="guile" xreflabel="Guile-&guile-version;">
-<?dbhtml filename="guile.html" dir="general"?>
+<?dbhtml filename="guile.html"?>
 <title>Guile-&guile-version;</title>
 
Index: general/genlib/gwrap.xml
===================================================================
--- general/genlib/gwrap.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/genlib/gwrap.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="gwrap" xreflabel="gwrap-&gwrap-version;">
-<?dbhtml filename="gwrap.html" dir="general"?>
+<?dbhtml filename="gwrap.html"?>
 <title>G-Wrap-&gwrap-version;</title>
 
Index: general/genlib/ispell.xml
===================================================================
--- general/genlib/ispell.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/genlib/ispell.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="ispell" xreflabel="ispell-&ispell-version;">
-<?dbhtml filename="ispell.html" dir="general"?>
+<?dbhtml filename="ispell.html"?>
 <title>ispell-&ispell-version;</title>
 
Index: general/genlib/libesmtp.xml
===================================================================
--- general/genlib/libesmtp.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/genlib/libesmtp.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="libesmtp" xreflabel="libesmtp-&libesmtp-version;">
-<?dbhtml filename="libesmtp.html" dir="general"?>
+<?dbhtml filename="libesmtp.html"?>
 <title>libesmtp-&libesmtp-version;</title>
 
Index: general/genlib/libpcap.xml
===================================================================
--- general/genlib/libpcap.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/genlib/libpcap.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="libpcap" xreflabel="libpcap-&libpcap-version;">
-<?dbhtml filename="libpcap.html" dir="general"?>
+<?dbhtml filename="libpcap.html"?>
 <title><acronym>libpcap</acronym>-&libpcap-version;</title>
 
Index: general/genlib/libxml.xml
===================================================================
--- general/genlib/libxml.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/genlib/libxml.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="libxml" xreflabel="libxml-&libxml-version;">
-<?dbhtml filename="libxml.html" dir="general"?>
+<?dbhtml filename="libxml.html"?>
 <title>libxml-&libxml-version;</title>
 
Index: general/genlib/libxml2.xml
===================================================================
--- general/genlib/libxml2.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/genlib/libxml2.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="libxml2" xreflabel="libxml2-&libxml2-version;">
-<?dbhtml filename="libxml2.html" dir="general"?>
+<?dbhtml filename="libxml2.html"?>
 <title>libxml2-&libxml2-version;</title>
 
Index: general/genlib/libxslt.xml
===================================================================
--- general/genlib/libxslt.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/genlib/libxslt.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="libxslt" xreflabel="libxslt-&libxslt-version;">
-<?dbhtml filename="libxslt.html" dir="general"?>
+<?dbhtml filename="libxslt.html"?>
 <title>libxslt-&libxslt-version;</title>
 
Index: general/genlib/lzo.xml
===================================================================
--- general/genlib/lzo.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/genlib/lzo.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="LZO" xreflabel="LZO-&LZO-version;">
-<?dbhtml filename="LZO.html" dir="general"?>
+<?dbhtml filename="LZO.html"?>
 <title><acronym>LZO</acronym>-&LZO-version;</title>
 
Index: general/genlib/openssl.xml
===================================================================
--- general/genlib/openssl.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/genlib/openssl.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="openssl" xreflabel="OpenSSL-&openssl-version;">
-<?dbhtml filename="openssl.html" dir="general"?>
+<?dbhtml filename="openssl.html"?>
 <title>OpenSSL-&openssl-version;</title>
 
Index: general/genlib/pcre.xml
===================================================================
--- general/genlib/pcre.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/genlib/pcre.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="pcre" xreflabel="PCRE-&pcre-version;">
-<?dbhtml filename="pcre.html" dir="general"?>
+<?dbhtml filename="pcre.html"?>
 <title>PCRE-&pcre-version;</title>
 
Index: general/genlib/popt.xml
===================================================================
--- general/genlib/popt.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/genlib/popt.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="popt" xreflabel="popt-&popt-version;">
-<?dbhtml filename="popt.html" dir="general"?>
+<?dbhtml filename="popt.html"?>
 <title>popt-&popt-version;</title>
 
Index: general/genlib/pspell.xml
===================================================================
--- general/genlib/pspell.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/genlib/pspell.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="pspell" xreflabel="pspell-&pspell-version;">
-<?dbhtml filename="pspell.html" dir="general"?>
+<?dbhtml filename="pspell.html"?>
 <title>pspell-&pspell-version;</title>
 
Index: general/genlib/readline.xml
===================================================================
--- general/genlib/readline.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/genlib/readline.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="readline" xreflabel="readline-&readline-version;">
-<?dbhtml filename="readline.html" dir="general"?>
+<?dbhtml filename="readline.html"?>
 <title>readline-&readline-version;</title>
 
Index: general/genlib/slang.xml
===================================================================
--- general/genlib/slang.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/genlib/slang.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="slang" xreflabel="slang-&slang-version;">
-<?dbhtml filename="slang.html" dir="general"?>
+<?dbhtml filename="slang.html"?>
 <title>slang-&slang-version;</title>
 
Index: general/genlib/slib.xml
===================================================================
--- general/genlib/slib.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/genlib/slib.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="slib" xreflabel="slib-&slib-version;">
-<?dbhtml filename="slib.html" dir="general"?>
+<?dbhtml filename="slib.html"?>
 <title>slib-&slib-version;</title>
 
Index: general/genlib/stlport.xml
===================================================================
--- general/genlib/stlport.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/genlib/stlport.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="STLport" xreflabel="STLport-&STLport-version;">
-<?dbhtml filename="stlport.html" dir="general"?>
+<?dbhtml filename="stlport.html"?>
 <title>STLport-&STLport-version;</title>
 
Index: general/genutils/bc.xml
===================================================================
--- general/genutils/bc.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/genutils/bc.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="bc" xreflabel="bc-&bc-version;">
-<?dbhtml filename="bc.html" dir="general"?>
+<?dbhtml filename="bc.html"?>
 <title>bc-&bc-version;</title>
 
Index: general/genutils/compface.xml
===================================================================
--- general/genutils/compface.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/genutils/compface.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="compface" xreflabel="Compface-&compface-version;">
-<?dbhtml filename="compface.html" dir="general"?>
+<?dbhtml filename="compface.html"?>
 <title>Compface-&compface-version;</title>
 
Index: general/genutils/genutils.xml
===================================================================
--- general/genutils/genutils.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/genutils/genutils.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <chapter id="general-genutils">
-<?dbhtml filename="genutils.html" dir="general"?>
+<?dbhtml filename="genutils.html"?>
 <title>General Utilities</title>
 
Index: general/genutils/hd2u.xml
===================================================================
--- general/genutils/hd2u.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/genutils/hd2u.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="hd2u" xreflabel="hd2u-&hd2u-version;">
-<?dbhtml filename="hd2u.html" dir="general"?>
+<?dbhtml filename="hd2u.html"?>
 <title>hd2u-&hd2u-version;</title>
 
Index: general/genutils/imagemagick.xml
===================================================================
--- general/genutils/imagemagick.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/genutils/imagemagick.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="imagemagick" xreflabel="ImageMagick-&imagemagick-version;-&imagemagick-patch-version;">
-<?dbhtml filename="imagemagick.html" dir="general"?>
+<?dbhtml filename="imagemagick.html"?>
 <title>ImageMagick-&imagemagick-version;-&imagemagick-patch-version;</title>
 
Index: general/genutils/rep-gtk.xml
===================================================================
--- general/genutils/rep-gtk.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/genutils/rep-gtk.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="rep-gtk" xreflabel="rep-gtk-&rep-gtk-version;">
-<?dbhtml filename="rep-gtk.html" dir="general"?>
+<?dbhtml filename="rep-gtk.html"?>
 <title>rep-gtk-&rep-gtk-version;</title>
 
Index: general/graphlib/aalib.xml
===================================================================
--- general/graphlib/aalib.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/graphlib/aalib.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="aalib" xreflabel="AAlib-&aalib-version;">
-<?dbhtml filename="aalib.html" dir="general"?>
+<?dbhtml filename="aalib.html"?>
 <title>AAlib-&aalib-version;</title>
 
Index: general/graphlib/directfb.xml
===================================================================
--- general/graphlib/directfb.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/graphlib/directfb.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="DirectFB" xreflabel="DirectFB-&DirectFB-version;">
-<?dbhtml filename="DirectFB.html" dir="general"?>
+<?dbhtml filename="DirectFB.html"?>
 <title>DirectFB-&DirectFB-version;</title>
 
Index: general/graphlib/fontconfig.xml
===================================================================
--- general/graphlib/fontconfig.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/graphlib/fontconfig.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="fontconfig" xreflabel="Fontconfig-&fontconfig-version;">
-<?dbhtml filename="fontconfig.html" dir="general"?>
+<?dbhtml filename="fontconfig.html"?>
 <title>Fontconfig-&fontconfig-version;</title>
 
Index: general/graphlib/freetype2.xml
===================================================================
--- general/graphlib/freetype2.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/graphlib/freetype2.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="freetype2" xreflabel="FreeType-&freetype2-version;">
-<?dbhtml filename="freetype2.html" dir="x"?>
+<?dbhtml filename="freetype2.html"?>
 <title>FreeType-&freetype2-version;</title>
 
Index: general/graphlib/graphlib.xml
===================================================================
--- general/graphlib/graphlib.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/graphlib/graphlib.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <chapter id="general-graphlib">
-<?dbhtml filename="graphlib.html" dir="general"?>
+<?dbhtml filename="graphlib.html"?>
 <title>Graphics and Font Libraries</title>
 
Index: general/graphlib/imlib.xml
===================================================================
--- general/graphlib/imlib.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/graphlib/imlib.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="imlib" xreflabel="Imlib-&imlib-version;">
-<?dbhtml filename="imlib.html" dir="general"?>
+<?dbhtml filename="imlib.html"?>
 <title>Imlib-&imlib-version;</title>
 
Index: general/graphlib/imlib2.xml
===================================================================
--- general/graphlib/imlib2.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/graphlib/imlib2.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="imlib2" xreflabel="Imlib2-&imlib2-version;">
-<?dbhtml filename="imlib2.html" dir="general"?>
+<?dbhtml filename="imlib2.html"?>
 <title>Imlib2-&imlib2-version;</title>
 
Index: general/graphlib/lcms.xml
===================================================================
--- general/graphlib/lcms.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/graphlib/lcms.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="lcms" xreflabel="lcms-&lcms-version;">
-<?dbhtml filename="lcms.html" dir="general"?>
+<?dbhtml filename="lcms.html"?>
 <title>lcms-&lcms-version;</title>
 
Index: general/graphlib/libmng.xml
===================================================================
--- general/graphlib/libmng.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/graphlib/libmng.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="libmng" xreflabel="libmng-&libmng-version;">
-<?dbhtml filename="libmng.html" dir="general"?>
+<?dbhtml filename="libmng.html"?>
 <title>libmng-&libmng-version;</title>
 
Index: general/graphlib/libpng.xml
===================================================================
--- general/graphlib/libpng.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/graphlib/libpng.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="libpng" xreflabel="libpng-&libpng-version;">
-<?dbhtml filename="libpng.html" dir="general"?>
+<?dbhtml filename="libpng.html"?>
 <title>libpng-&libpng-version;</title>
 
Index: general/graphlib/libtiff.xml
===================================================================
--- general/graphlib/libtiff.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/graphlib/libtiff.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="libtiff" xreflabel="libtiff-&libtiff-version;">
-<?dbhtml filename="libtiff.html" dir="general"?>
+<?dbhtml filename="libtiff.html"?>
 <title>libtiff-&libtiff-version;</title>
 
Index: general/graphlib/libungif.xml
===================================================================
--- general/graphlib/libungif.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/graphlib/libungif.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="libungif" xreflabel="libungif-&libungif-version;">
-<?dbhtml filename="libungif.html" dir="general"?>
+<?dbhtml filename="libungif.html"?>
 <title>libungif-&libungif-version;</title>
 
Index: general/graphlib/svgalib.xml
===================================================================
--- general/graphlib/svgalib.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/graphlib/svgalib.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="SVGAlib" xreflabel="SVGAlib-&SVGAlib-version;">
-<?dbhtml filename="SVGAlib.html" dir="general"?>
+<?dbhtml filename="SVGAlib.html"?>
 <title>SVGAlib-&SVGAlib-version;</title>
 
Index: general/sysutils/cpio.xml
===================================================================
--- general/sysutils/cpio.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/sysutils/cpio.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="cpio" xreflabel="cpio-&cpio-version;">
-<?dbhtml filename="cpio.html" dir="general"?>
+<?dbhtml filename="cpio.html"?>
 <title>cpio-&cpio-version;</title>
 
Index: general/sysutils/fcron.xml
===================================================================
--- general/sysutils/fcron.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/sysutils/fcron.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="fcron" xreflabel="Fcron-&fcron-version;">
-<?dbhtml filename="fcron.html" dir="general"?>
+<?dbhtml filename="fcron.html"?>
 <title>Fcron-&fcron-version;</title>
 
Index: general/sysutils/gpm.xml
===================================================================
--- general/sysutils/gpm.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/sysutils/gpm.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,3 +1,4 @@
 <sect1 id="gpm" xreflabel="GPM-&gpm-version;">
+<?dbhtml filename="gpm.html"?>
 <title><acronym>GPM</acronym>-&gpm-version;</title>
 
Index: general/sysutils/hdparm.xml
===================================================================
--- general/sysutils/hdparm.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/sysutils/hdparm.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="hdparm" xreflabel="hdparm-&hdparm-version;">
-<?dbhtml filename="hdparm.html" dir="general"?>
+<?dbhtml filename="hdparm.html"?>
 <title>hdparm-&hdparm-version;</title>
 
Index: general/sysutils/mc.xml
===================================================================
--- general/sysutils/mc.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/sysutils/mc.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="mc" xreflabel="MC-&mc-version;">
-<?dbhtml filename="mc.html" dir="general"?>
+<?dbhtml filename="mc.html"?>
 <title><acronym>MC</acronym>-&mc-version;</title>
 
Index: general/sysutils/pciutils.xml
===================================================================
--- general/sysutils/pciutils.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/sysutils/pciutils.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="pciutils" xreflabel="PCI Utilities-&pciutils-version;">
-<?dbhtml filename="pciutils.html" dir="general"?>
+<?dbhtml filename="pciutils.html"?>
 <title>PCI Utilities-&pciutils-version;</title>
 
Index: general/sysutils/pkgconfig.xml
===================================================================
--- general/sysutils/pkgconfig.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/sysutils/pkgconfig.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="pkgconfig" xreflabel="pkgconfig-&pkgconfig-version;">
-<?dbhtml filename="pkgconfig.html" dir="general"?>
+<?dbhtml filename="pkgconfig.html"?>
 <title>pkgconfig-&pkgconfig-version;</title>
 
Index: general/sysutils/sysutils.xml
===================================================================
--- general/sysutils/sysutils.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/sysutils/sysutils.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <chapter id="general-sysutils">
-<?dbhtml filename="sysutils.html" dir="general"?>
+<?dbhtml filename="sysutils.html"?>
 <title>System Utilities</title>
 
Index: general/sysutils/unzip.xml
===================================================================
--- general/sysutils/unzip.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/sysutils/unzip.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,3 +1,4 @@
 <sect1 id="unzip" xreflabel="UnZip-&unzip-version;">
+<?dbhtml filename="unzip.html"?>
 <title>UnZip-&unzip-version;</title>
 
Index: general/sysutils/which.xml
===================================================================
--- general/sysutils/which.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/sysutils/which.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="which" xreflabel="which-&which-version;">
-<?dbhtml filename="which.html" dir="general"?>
+<?dbhtml filename="which.html"?>
 <title>which-&which-version; and alternatives</title>
 
Index: general/sysutils/zip.xml
===================================================================
--- general/sysutils/zip.xml	(revision fbd3d0a173e1dc7ca41fb6778ac2d0a394eb0cef)
+++ general/sysutils/zip.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="zip" xreflabel="Zip-&zip-version;">
-<?dbhtml filename="zip.html" dir="general"?>
+<?dbhtml filename="zip.html"?>
 <title>Zip-&zip-version;</title>
 
