Index: basicnet/mailnews/fetchmail.xml
===================================================================
--- basicnet/mailnews/fetchmail.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ basicnet/mailnews/fetchmail.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="fetchmail" xreflabel="Fetchmail">
-<?dbhtml filename="fetchmail.html" dir="basicnet"?>
+<?dbhtml filename="fetchmail.html"?>
 <title>Fetchmail-&fetchmail-version;</title>
 
Index: basicnet/mailnews/mailnews.xml
===================================================================
--- basicnet/mailnews/mailnews.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ basicnet/mailnews/mailnews.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <chapter id="basicnet-mailnews">
-<?dbhtml filename="mailnews.html" dir="basicnet"?>
+<?dbhtml filename="mailnews.html"?>
 <title>Mail/News Clients</title>
 
Index: basicnet/mailnews/mutt.xml
===================================================================
--- basicnet/mailnews/mutt.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ basicnet/mailnews/mutt.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="mutt" xreflabel="Mutt-&mutt-version;">
-<?dbhtml filename="mutt.html" dir="basicnet"?>
+<?dbhtml filename="mutt.html"?>
 <title>Mutt-&mutt-version;</title>
 
Index: basicnet/mailnews/nail.xml
===================================================================
--- basicnet/mailnews/nail.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ basicnet/mailnews/nail.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="nail" xreflabel="Nail-&nail-version;">
-<?dbhtml filename="nail.html" dir="basicnet"?>
+<?dbhtml filename="nail.html"?>
 <title>Nail-&nail-version;</title>
 
Index: basicnet/mailnews/other.xml
===================================================================
--- basicnet/mailnews/other.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ basicnet/mailnews/other.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="basicnet-mailnews-other">
-<?dbhtml filename="othermn.html" dir="basicnet"?>
+<?dbhtml filename="othermn.html"?>
 <title>Other Mail and News programs</title>
 
Index: basicnet/mailnews/pine.xml
===================================================================
--- basicnet/mailnews/pine.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ basicnet/mailnews/pine.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="pine" xreflabel="Pine-&pine-version;">
-<?dbhtml filename="pine.html" dir="basicnet"?>
+<?dbhtml filename="pine.html"?>
 <title>Pine-&pine-version;</title>
 
Index: basicnet/mailnews/procmail.xml
===================================================================
--- basicnet/mailnews/procmail.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ basicnet/mailnews/procmail.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="procmail" xreflabel="Procmail-&procmail-version;">
-<?dbhtml filename="procmail.html" dir="basicnet"?>
+<?dbhtml filename="procmail.html"?>
 <title>Procmail-&procmail-version;</title>
 
Index: basicnet/mailnews/slrn.xml
===================================================================
--- basicnet/mailnews/slrn.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ basicnet/mailnews/slrn.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="slrn" xreflabel="slrn-&slrn-version;">
-<?dbhtml filename="slrn.html" dir="basicnet"?>
+<?dbhtml filename="slrn.html"?>
 <title>slrn-&slrn-version;</title>
 
Index: basicnet/netlibs/curl.xml
===================================================================
--- basicnet/netlibs/curl.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ basicnet/netlibs/curl.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="curl" xreflabel="cURL-&curl-version;">
-<?dbhtml filename="curl.html" dir="basicnet"?>
+<?dbhtml filename="curl.html"?>
 <title>cURL-&curl-version;</title>
 
Index: basicnet/netlibs/gnet.xml
===================================================================
--- basicnet/netlibs/gnet.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ basicnet/netlibs/gnet.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="gnet" xreflabel="GNet-&gnet-version;">
-<?dbhtml filename="gnet.html" dir="basicnet"?>
+<?dbhtml filename="gnet.html"?>
 <title>GNet-&gnet-version;</title>
 
Index: basicnet/netlibs/libsoup.xml
===================================================================
--- basicnet/netlibs/libsoup.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ basicnet/netlibs/libsoup.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="libsoup" xreflabel="libsoup-&libsoup-version;">
-<?dbhtml filename="libsoup.html" dir="basicnet"?>
+<?dbhtml filename="libsoup.html"?>
 <title>libsoup-&libsoup-version;</title>
 
Index: basicnet/netlibs/netlibs.xml
===================================================================
--- basicnet/netlibs/netlibs.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ basicnet/netlibs/netlibs.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <chapter id="basicnet-netlibs">
-<?dbhtml filename="netlibs.html" dir="basicnet"?>
+<?dbhtml filename="netlibs.html"?>
 <title>Networking Libraries</title>
 
Index: basicnet/netlibs/wvstreams.xml
===================================================================
--- basicnet/netlibs/wvstreams.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ basicnet/netlibs/wvstreams.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="wvstreams" xreflabel="WvStreams-&wvstreams-version;">
-<?dbhtml filename="wvstreams.html" dir="basicnet"?>
+<?dbhtml filename="wvstreams.html"?>
 <title>WvStreams-&wvstreams-version;</title>
 
Index: basicnet/netprogs/cvs.xml
===================================================================
--- basicnet/netprogs/cvs.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ basicnet/netprogs/cvs.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="cvs" xreflabel="CVS-&cvs-version;">
-<?dbhtml filename="cvs.html" dir="basicnet"?>
+<?dbhtml filename="cvs.html"?>
 <title>CVS-&cvs-version;</title>
 
Index: basicnet/netprogs/inetutils.xml
===================================================================
--- basicnet/netprogs/inetutils.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ basicnet/netprogs/inetutils.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="inetutils" xreflabel="Inetutils-&inetutils-version;">
-<?dbhtml filename="inetutils.html" dir="basicnet"?>
+<?dbhtml filename="inetutils.html"?>
 <title>Inetutils-&inetutils-version;</title>
 
Index: basicnet/netprogs/ncftp.xml
===================================================================
--- basicnet/netprogs/ncftp.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ basicnet/netprogs/ncftp.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="ncftp" xreflabel="NcFTP-&ncftp-version;">
-<?dbhtml filename="ncftp.html" dir="basicnet"?>
+<?dbhtml filename="ncftp.html"?>
 <title>NcFTP-&ncftp-version;</title>
 
Index: basicnet/netprogs/ncpfs.xml
===================================================================
--- basicnet/netprogs/ncpfs.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ basicnet/netprogs/ncpfs.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="ncpfs" xreflabel="NCPFS-&ncpfs-version;">
-<?dbhtml filename="ncpfs.html" dir="basicnet"?>
+<?dbhtml filename="ncpfs.html"?>
 <title>NCPFS-&ncpfs-version;</title>
 
Index: basicnet/netprogs/netprogs.xml
===================================================================
--- basicnet/netprogs/netprogs.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ basicnet/netprogs/netprogs.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <chapter id="basicnet-netprogs">
-<?dbhtml filename="netprogs.html" dir="basicnet"?>
+<?dbhtml filename="netprogs.html"?>
 <title>Basic Networking Programs</title>
 
Index: basicnet/netprogs/nfs-utils.xml
===================================================================
--- basicnet/netprogs/nfs-utils.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ basicnet/netprogs/nfs-utils.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="nfs-utils" xreflabel="NFS Utilities-&nfs-utils-version;">
-<?dbhtml filename="nfs-utils.html" dir="basicnet"?>
+<?dbhtml filename="nfs-utils.html"?>
 <title>NFS Utilities-&nfs-utils-version;</title>
 
Index: basicnet/netprogs/ntp.xml
===================================================================
--- basicnet/netprogs/ntp.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ basicnet/netprogs/ntp.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="ntp" xreflabel="NTP-&ntp-version;">
-<?dbhtml filename="ntp.html" dir="basicnet"?>
+<?dbhtml filename="ntp.html"?>
 <title>NTP-&ntp-version;</title>
 
Index: basicnet/netprogs/openssh-client.xml
===================================================================
--- basicnet/netprogs/openssh-client.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ basicnet/netprogs/openssh-client.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="basicnet-netprogs-openssh">
-<?dbhtml filename="openssh.html" dir="basicnet"?>
+<?dbhtml filename="openssh.html"?>
 <title>OpenSSH-&openssh-version; client</title>
 
Index: basicnet/netprogs/portmap.xml
===================================================================
--- basicnet/netprogs/portmap.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ basicnet/netprogs/portmap.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="portmap" xreflabel="portmap-&portmap-version;">
-<?dbhtml filename="portmap.html" dir="basicnet"?>
+<?dbhtml filename="portmap.html"?>
 <title>portmap-&portmap-version;</title>
 
Index: basicnet/netprogs/rsync-client.xml
===================================================================
--- basicnet/netprogs/rsync-client.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ basicnet/netprogs/rsync-client.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="basicnet-netprogs-rsync">
-<?dbhtml filename="rsync.html" dir="basicnet"?>
+<?dbhtml filename="rsync.html"?>
 <title>rsync-&rsync-version; client</title>
 
Index: basicnet/netprogs/tcpwrappers.xml
===================================================================
--- basicnet/netprogs/tcpwrappers.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ basicnet/netprogs/tcpwrappers.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="tcpwrappers" xreflabel="tcpwrappers-&tcpwrappers-version;">
-<?dbhtml filename="tcpwrappers.html" dir="basicnet"?>
+<?dbhtml filename="tcpwrappers.html"?>
 <title>tcpwrappers-&tcpwrappers-version;</title>
 
Index: basicnet/netprogs/wget.xml
===================================================================
--- basicnet/netprogs/wget.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ basicnet/netprogs/wget.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="wget" xreflabel="Wget-&wget-version;">
-<?dbhtml filename="wget.html" dir="basicnet"?>
+<?dbhtml filename="wget.html"?>
 <title>Wget-&wget-version;</title>
 
Index: basicnet/netutils/bind-utils.xml
===================================================================
--- basicnet/netutils/bind-utils.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ basicnet/netutils/bind-utils.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="bind-utils" xreflabel="BIND Utilities-&bind-version;">
-<?dbhtml filename="bind-utils.html" dir="basicnet"?>
+<?dbhtml filename="bind-utils.html"?>
 <title>BIND Utilities-&bind-version;</title>
 
Index: basicnet/netutils/netutils.xml
===================================================================
--- basicnet/netutils/netutils.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ basicnet/netutils/netutils.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <chapter id="basicnet-netutils">
-<?dbhtml filename="netutils.html" dir="basicnet"?>
+<?dbhtml filename="netutils.html"?>
 <title>Basic Networking Utilities</title>
 
Index: basicnet/netutils/nmap.xml
===================================================================
--- basicnet/netutils/nmap.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ basicnet/netutils/nmap.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="nmap" xreflabel="Nmap-&nmap-version;">
-<?dbhtml filename="nmap.html" dir="basicnet"?>
+<?dbhtml filename="nmap.html"?>
 <title>Nmap-&nmap-version;</title>
 
Index: basicnet/netutils/traceroute.xml
===================================================================
--- basicnet/netutils/traceroute.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ basicnet/netutils/traceroute.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="traceroute" xreflabel="Traceroute-&traceroute-version;">
-<?dbhtml filename="traceroute.html" dir="basicnet"?>
+<?dbhtml filename="traceroute.html"?>
 <title>Traceroute-&traceroute-version;</title>
 
Index: basicnet/netutils/whois.xml
===================================================================
--- basicnet/netutils/whois.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ basicnet/netutils/whois.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="whois" xreflabel="Whois-&whois-version;">
-<?dbhtml filename="whois.html" dir="basicnet"?>
+<?dbhtml filename="whois.html"?>
 <title>Whois-&whois-version;</title>
 
Index: basicnet/textweb/links.xml
===================================================================
--- basicnet/textweb/links.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ basicnet/textweb/links.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="Links" xreflabel="Links-&Links-version;">
-<?dbhtml filename="Links.html" dir="basicnet"?>
+<?dbhtml filename="Links.html"?>
 <title>Links-&Links-version;</title>
 
Index: basicnet/textweb/lynx.xml
===================================================================
--- basicnet/textweb/lynx.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ basicnet/textweb/lynx.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="lynx" xreflabel="Lynx-&lynx-version;">
-<?dbhtml filename="lynx.html" dir="basicnet"?>
+<?dbhtml filename="lynx.html"?>
 <title>Lynx-&lynx-version;</title>
 
Index: basicnet/textweb/textweb.xml
===================================================================
--- basicnet/textweb/textweb.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ basicnet/textweb/textweb.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <chapter id="basicnet-textweb">
-<?dbhtml filename="textweb.html" dir="basicnet"?>
+<?dbhtml filename="textweb.html"?>
 <title>Text Web Browsers</title>
 
Index: basicnet/textweb/w3m.xml
===================================================================
--- basicnet/textweb/w3m.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ basicnet/textweb/w3m.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="w3m" xreflabel="w3m">
-<?dbhtml filename="w3m.html" dir="basicnet"?>
+<?dbhtml filename="w3m.html"?>
 <title>w3m-&w3m-version;</title>
 
Index: connect/dhcp/dhcp-client.xml
===================================================================
--- connect/dhcp/dhcp-client.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ connect/dhcp/dhcp-client.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="connect-dhcp-client">
-<?dbhtml filename="dhcpclient.html" dir="connect"?>
+<?dbhtml filename="dhcpclient.html"?>
 <title>DHCP-&dhcp-version;</title>
 
Index: connect/dhcp/dhcp.xml
===================================================================
--- connect/dhcp/dhcp.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ connect/dhcp/dhcp.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <chapter id="connect-dhcp">
-<?dbhtml filename="dhcp.html" dir="connect"?>
+<?dbhtml filename="dhcp.html"?>
 <title><acronym>DHCP</acronym> Clients</title>
 
Index: connect/dhcp/dhcpcd.xml
===================================================================
--- connect/dhcp/dhcpcd.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ connect/dhcp/dhcpcd.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="dhcpcd" xreflabel="dhcpcd-&dhcpcd-version;">
-<?dbhtml filename="dhcpcd.html" dir="connect"?>
+<?dbhtml filename="dhcpcd.html"?>
 <title>dhcpcd-&dhcpcd-version;</title>
 
Index: connect/dialup/dialup.xml
===================================================================
--- connect/dialup/dialup.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ connect/dialup/dialup.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <chapter id="connect-dialup">
-<?dbhtml filename="dialup.html" dir="connect"?>
+<?dbhtml filename="dialup.html"?>
 <title>Dial-up networking</title>
 
Index: connect/dialup/ppp.xml
===================================================================
--- connect/dialup/ppp.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ connect/dialup/ppp.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="ppp" xreflabel="PPP-&ppp-version;">
-<?dbhtml filename="ppp.html" dir="connect"?>
+<?dbhtml filename="ppp.html"?>
 <title>PPP-&ppp-version;</title>
 
Index: connect/dialup/wvdial.xml
===================================================================
--- connect/dialup/wvdial.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ connect/dialup/wvdial.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="wvdial" xreflabel="WvDial-&wvdial-version;">
-<?dbhtml filename="wvdial.html" dir="connect"?>
+<?dbhtml filename="wvdial.html"?>
 <title>WvDial-&wvdial-version;</title>
 
Index: connect/other/isdn.xml
===================================================================
--- connect/other/isdn.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ connect/other/isdn.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="isdn" xreflabel="isdn">
-<?dbhtml filename="isdn.html" dir="connect"?>
+<?dbhtml filename="isdn.html"?>
 <title>isdn</title>
 
Index: connect/other/other.xml
===================================================================
--- connect/other/other.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ connect/other/other.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <chapter id="connect-other">
-<?dbhtml filename="other.html" dir="connect"?>
+<?dbhtml filename="other.html"?>
 <title>Other Connections</title>
 
Index: connect/other/pppoe.xml
===================================================================
--- connect/other/pppoe.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ connect/other/pppoe.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="pppoe" xreflabel="RP-PPPoE-&pppoe-version;">
-<?dbhtml filename="pppoe.html" dir="connect"?>
+<?dbhtml filename="pppoe.html"?>
 <title>RP-PPPoE-&pppoe-version;</title>
 
Index: content/databases/databases.xml
===================================================================
--- content/databases/databases.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ content/databases/databases.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <chapter id="content-databases">
-<?dbhtml filename="databases.html" dir="content"?>
+<?dbhtml filename="databases.html"?>
 <title>Databases</title>
 
Index: content/databases/db-3.3.xml
===================================================================
--- content/databases/db-3.3.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ content/databases/db-3.3.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="db-3.3" xreflabel="Berkeley DB-&db-3.3-version;">
-<?dbhtml filename="db-3.3.html" dir="gnome"?>
+<?dbhtml filename="db-3.3.html"?>
 <title>Berkeley DB-&db-3.3-version;</title>
 
Index: content/databases/db.xml
===================================================================
--- content/databases/db.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ content/databases/db.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="db" xreflabel="Berkeley DB-&db-version;">
-<?dbhtml filename="db.html" dir="content"?>
+<?dbhtml filename="db.html"?>
 <title>Berkeley DB-&db-version;</title>
 
Index: content/databases/mysql.xml
===================================================================
--- content/databases/mysql.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ content/databases/mysql.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="mysql" xreflabel="MySQL-&mysql-version;">
-<?dbhtml filename="mysql.html" dir="content"?>
+<?dbhtml filename="mysql.html"?>
 <title>MySQL-&mysql-version;</title>
 
Index: content/databases/postgresql.xml
===================================================================
--- content/databases/postgresql.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ content/databases/postgresql.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="postgresql" xreflabel="PostgreSQL-&postgresql-version;">
-<?dbhtml filename="postgresql.html" dir="content"?>
+<?dbhtml filename="postgresql.html"?>
 <title>Postgre<acronym>SQL</acronym>-&postgresql-version;</title>
 
Index: content/web/apache.xml
===================================================================
--- content/web/apache.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ content/web/apache.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="apache" xreflabel="Apache-&apache-version;">
-<?dbhtml filename="apache.html" dir="content"?>
+<?dbhtml filename="apache.html"?>
 <title>Apache-&apache-version;</title>
 
Index: content/web/php.xml
===================================================================
--- content/web/php.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ content/web/php.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="php" xreflabel="PHP-&php-version;">
-<?dbhtml filename="php.html" dir="content"?>
+<?dbhtml filename="php.html"?>
 <title><acronym>PHP</acronym>-&php-version;</title>
 
Index: content/web/proftpd.xml
===================================================================
--- content/web/proftpd.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ content/web/proftpd.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="proftpd" xreflabel="ProFTPD-&proftpd-version;">
-<?dbhtml filename="proftpd.html" dir="content"?>
+<?dbhtml filename="proftpd.html"?>
 <title>ProFTPD-&proftpd-version;</title>
 
Index: content/web/web.xml
===================================================================
--- content/web/web.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ content/web/web.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <chapter id="content-web">
-<?dbhtml filename="web.html" dir="content"?>
+<?dbhtml filename="web.html"?>
 <title>Web serving</title>
 
Index: kde/add/add.xml
===================================================================
--- kde/add/add.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ kde/add/add.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <chapter id="kde-add">
-<?dbhtml filename="add.html" dir="kde"?>
+<?dbhtml filename="add.html"?>
 <title>KDE Additional Packages</title>
 
Index: kde/core/arts.xml
===================================================================
--- kde/core/arts.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ kde/core/arts.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="kde-core-arts" xreflabel="aRts-&arts-version;">
-<?dbhtml filename="arts.html" dir="kde"?>
+<?dbhtml filename="arts.html"?>
 <title>aRts-&arts-version;</title>
 
Index: kde/core/config.xml
===================================================================
--- kde/core/config.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ kde/core/config.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="kde-core-config">
-<?dbhtml filename="config.html" dir="kde"?>
+<?dbhtml filename="config.html"?>
 <title>Configuring the core <acronym>KDE</acronym> packages</title>
 
Index: kde/core/core.xml
===================================================================
--- kde/core/core.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ kde/core/core.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <chapter id="kde-core">
-<?dbhtml filename="core.html" dir="kde"?>
+<?dbhtml filename="core.html"?>
 <title>KDE Core Packages</title>
 
Index: kde/inst/kde-addons.xml
===================================================================
--- kde/inst/kde-addons.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ kde/inst/kde-addons.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="kde-addons">
-<?dbhtml filename="kde-addons.html" dir="kde"?>
+<?dbhtml filename="kde-addons.html"?>
 <title>kdeaddons-&kde-version;</title>
 
Index: kde/inst/kde-admin.xml
===================================================================
--- kde/inst/kde-admin.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ kde/inst/kde-admin.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="kde-admin">
-<?dbhtml filename="kde-admin.html" dir="kde"?>
+<?dbhtml filename="kde-admin.html"?>
 <title>kdeadmin-&kde-version;</title>
 
Index: kde/inst/kde-artwork.xml
===================================================================
--- kde/inst/kde-artwork.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ kde/inst/kde-artwork.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="kde-artwork">
-<?dbhtml filename="kde-artwork.html" dir="kde"?>
+<?dbhtml filename="kde-artwork.html"?>
 <title>kdeartwork-&kde-version;</title>
 
Index: kde/inst/kde-base.xml
===================================================================
--- kde/inst/kde-base.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ kde/inst/kde-base.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,3 +1,4 @@
 <sect1 id="kde-base" xreflabel="kdebase-&kde-version;">
+<?dbhtml filename="kdebase.html"?>
 <title>kdebase-&kde-version;</title>
 
Index: kde/inst/kde-edu.xml
===================================================================
--- kde/inst/kde-edu.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ kde/inst/kde-edu.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="kde-edu">
-<?dbhtml filename="kde-edu.html" dir="kde"?>
+<?dbhtml filename="kde-edu.html"?>
 <title>kdeedu-&kde-version;</title>
 
Index: kde/inst/kde-games.xml
===================================================================
--- kde/inst/kde-games.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ kde/inst/kde-games.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="kde-games">
-<?dbhtml filename="kde-games.html" dir="kde"?>
+<?dbhtml filename="kde-games.html"?>
 <title>kdegames-&kde-version;</title>
 
Index: kde/inst/kde-graphics.xml
===================================================================
--- kde/inst/kde-graphics.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ kde/inst/kde-graphics.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="kde-graphics" xreflabel="kdegraphics-&kde-version;">
-<?dbhtml filename="kde-graphics.html" dir="kde"?>
+<?dbhtml filename="kde-graphics.html"?>
 <title>kdegraphics-&kde-version;</title>
 
Index: kde/inst/kde-libs.xml
===================================================================
--- kde/inst/kde-libs.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ kde/inst/kde-libs.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,3 +1,4 @@
 <sect1 id="kde-libs" xreflabel="kdelibs-&kde-version;">
+<?dbhtml filename="kdelibs.html"?>
 <title>kdelibs-&kde-version;</title>
  
Index: kde/inst/kde-multimedia.xml
===================================================================
--- kde/inst/kde-multimedia.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ kde/inst/kde-multimedia.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="kde-multimedia" xreflabel="kdemultimedia-&kde-version;">
-<?dbhtml filename="kde-multimedia.html" dir="kde"?>
+<?dbhtml filename="kde-multimedia.html"?>
 <title>kdemultimedia-&kde-version;</title>
 
Index: kde/inst/kde-network.xml
===================================================================
--- kde/inst/kde-network.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ kde/inst/kde-network.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="kde-network" xreflabel="kdenetwork-&kde-version;">
-<?dbhtml filename="kde-network.html" dir="kde"?>
+<?dbhtml filename="kde-network.html"?>
 <title>kdenetwork-&kde-version;</title>
 
Index: kde/inst/kde-pim.xml
===================================================================
--- kde/inst/kde-pim.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ kde/inst/kde-pim.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="kde-pim">
-<?dbhtml filename="kde-pim.html" dir="kde"?>
+<?dbhtml filename="kde-pim.html"?>
 <title>kdepim-&kde-version;</title>
 
Index: kde/inst/kde-toys.xml
===================================================================
--- kde/inst/kde-toys.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ kde/inst/kde-toys.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="kde-toys">
-<?dbhtml filename="kde-toys.html" dir="kde"?>
+<?dbhtml filename="kde-toys.html"?>
 <title>kdetoys-&kde-version;</title>
 
Index: kde/inst/kde-utils.xml
===================================================================
--- kde/inst/kde-utils.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ kde/inst/kde-utils.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="kde-utils">
-<?dbhtml filename="kde-utils.html" dir="kde"?>
+<?dbhtml filename="kde-utils.html"?>
 <title>kdeutils-&kde-version;</title>
 
Index: kde/other/other.xml
===================================================================
--- kde/other/other.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ kde/other/other.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <chapter id="kde-other">
-<?dbhtml filename="other.html" dir="kde"?>
+<?dbhtml filename="other.html"?>
 <title>Other KDE Packages</title>
 
Index: server/mail/courier.xml
===================================================================
--- server/mail/courier.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ server/mail/courier.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="courier" xreflabel="Courier-&courier-version;">
-<?dbhtml filename="courier.html" dir="server"?>
+<?dbhtml filename="courier.html"?>
 <title>Courier-&courier-version;</title>
 
Index: server/mail/exim.xml
===================================================================
--- server/mail/exim.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ server/mail/exim.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="exim" xreflabel="Exim-&exim-version;">
-<?dbhtml filename="exim.html" dir="server"?>
+<?dbhtml filename="exim.html"?>
 <title>Exim-&exim-version;</title>
 
Index: server/mail/mail.xml
===================================================================
--- server/mail/mail.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ server/mail/mail.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <chapter id="server-mail">
-<?dbhtml filename="mail.html" dir="server"?>
+<?dbhtml filename="mail.html"?>
 <title>Mail Server Software</title>
 
Index: server/mail/postfix.xml
===================================================================
--- server/mail/postfix.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ server/mail/postfix.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="postfix" xreflabel="Postfix-&postfix-version;">
-<?dbhtml filename="postfix.html" dir="server"?>
+<?dbhtml filename="postfix.html"?>
 <title>Postfix-&postfix-version;</title>
 
Index: server/mail/qpopper.xml
===================================================================
--- server/mail/qpopper.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ server/mail/qpopper.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="qpopper" xreflabel="Qpopper-&qpopper-version;">
-<?dbhtml filename="qpopper.html" dir="server"?>
+<?dbhtml filename="qpopper.html"?>
 <title>Qpopper-&qpopper-version;</title>
 
Index: server/mail/sendmail.xml
===================================================================
--- server/mail/sendmail.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ server/mail/sendmail.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="sendmail" xreflabel="Sendmail-&sendmail-version;">
-<?dbhtml filename="sendmail.html" dir="server"?>
+<?dbhtml filename="sendmail.html"?>
 <title>Sendmail-&sendmail-version;</title>
 
Index: server/other/bind.xml
===================================================================
--- server/other/bind.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ server/other/bind.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="bind" xreflabel="BIND-&bind-version;">
-<?dbhtml filename="bind.html" dir="server"?>
+<?dbhtml filename="bind.html"?>
 <title><acronym>BIND</acronym>-&bind-version;</title>
 
Index: server/other/cvsserver.xml
===================================================================
--- server/other/cvsserver.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ server/other/cvsserver.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="cvsserver" xreflabel="cvsserver">
-<?dbhtml filename="cvsserver.html" dir="server"?>
+<?dbhtml filename="cvsserver.html"?>
 <title>Running a CVS server</title>
 
Index: server/other/dhcp.xml
===================================================================
--- server/other/dhcp.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ server/other/dhcp.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="dhcp" xreflabel="DHCP-&dhcp-version;">
-<?dbhtml filename="dhcp.html" dir="server"?>
+<?dbhtml filename="dhcp.html"?>
 <title><acronym>DHCP</acronym>-&dhcp-version;</title>
 
Index: server/other/leafnode.xml
===================================================================
--- server/other/leafnode.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ server/other/leafnode.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="leafnode" xreflabel="Leafnode-&leafnode-version;">
-<?dbhtml filename="leafnode.html" dir="server"?>
+<?dbhtml filename="leafnode.html"?>
 <title>Leafnode-&leafnode-version;</title>
 
Index: server/other/openldap.xml
===================================================================
--- server/other/openldap.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ server/other/openldap.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="openldap" xreflabel="OpenLDAP-&openldap-version;">
-<?dbhtml filename="openldap.html" dir="server"?>
+<?dbhtml filename="openldap.html"?>
 <title>Open<acronym>LDAP</acronym>-&openldap-version;</title>
 
Index: server/other/openssh.xml
===================================================================
--- server/other/openssh.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ server/other/openssh.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="openssh" xreflabel="OpenSSH-&openssh-version;">
-<?dbhtml filename="openssh.html" dir="server"?>
+<?dbhtml filename="openssh.html"?>
 <title>Open<acronym>SSH</acronym>-&openssh-version;</title>
 
Index: server/other/other.xml
===================================================================
--- server/other/other.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ server/other/other.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <chapter id="server-other">
-<?dbhtml filename="other.html" dir="server"?>
+<?dbhtml filename="other.html"?>
 <title>Other Server Software</title>
 
Index: server/other/rsync.xml
===================================================================
--- server/other/rsync.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ server/other/rsync.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="rsync" xreflabel="rsync-&rsync-version;">
-<?dbhtml filename="rsync.html" dir="server"?>
+<?dbhtml filename="rsync.html"?>
 <title>rsync-&rsync-version;</title>
 
Index: server/other/samba.xml
===================================================================
--- server/other/samba.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ server/other/samba.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="samba" xreflabel="Samba-&samba-version;">
-<?dbhtml filename="samba.html" dir="server"?>
+<?dbhtml filename="samba.html"?>
 <title>Samba-&samba-version;</title>
 
Index: server/other/xinetd.xml
===================================================================
--- server/other/xinetd.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ server/other/xinetd.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="xinetd" xreflabel="xinetd-&xinetd-version;">
-<?dbhtml filename="xinetd.html" dir="server"?>
+<?dbhtml filename="xinetd.html"?>
 <title>xinetd-&xinetd-version;</title>
 
Index: x/installing/xfree86-setup.xml
===================================================================
--- x/installing/xfree86-setup.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ x/installing/xfree86-setup.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="x-setup">
-<?dbhtml filename="xfree86-setup.html" dir="x"?>
+<?dbhtml filename="xfree86-setup.html"?>
 <title>X Window Components</title>
 
Index: x/xorg/xorg.xml
===================================================================
--- x/xorg/xorg.xml	(revision 7f72cbff961b39051656a860e1f61cc5378679ed)
+++ x/xorg/xorg.xml	(revision 00bb024cb22697ed8dbb02a2295282188162bc8e)
@@ -1,4 +1,4 @@
 <sect1 id="xorg" xreflabel="X.org-&xorg-version;">
-<?dbhtml filename="xorg.html" ?>
+<?dbhtml filename="xorg.html"?>
 <title>Xorg-&xorg-version;</title>
 
