Index: basicnet/basicnet.xml
===================================================================
--- basicnet/basicnet.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ basicnet/basicnet.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -17,10 +17,10 @@
 
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="connect/connect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="netlibs/netlibs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="textweb/textweb.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="netprogs/netprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="netutils/netutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mailnews/mailnews.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="connect/connect.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="netlibs/netlibs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="textweb/textweb.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="netprogs/netprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="netutils/netutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mailnews/mailnews.xml"/>
 
 </part>
Index: basicnet/connect/connect.xml
===================================================================
--- basicnet/connect/connect.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ basicnet/connect/connect.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -32,7 +32,7 @@
   providers to authenticate the Internet connections.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="dhcpcd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="dhcp-client.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppp.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhcpcd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhcp-client.xml"/>
 
 </chapter>
Index: basicnet/mailnews/mailnews.xml
===================================================================
--- basicnet/mailnews/mailnews.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ basicnet/mailnews/mailnews.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -24,14 +24,14 @@
   (NNTP).</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mailx.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="procmail.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="fetchmail.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mutt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="pine.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mailx.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procmail.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fetchmail.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mutt.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pine.xml"/>
   <!-- Commenting out slrn as tin has replaced it
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="slrn.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="slrn.xml"/>
   -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="tin.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tin.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="other.xml"/>
 
 </chapter>
Index: basicnet/netlibs/libsoup.xml
===================================================================
--- basicnet/netlibs/libsoup.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ basicnet/netlibs/libsoup.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -102,5 +102,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: basicnet/netlibs/netlibs.xml
===================================================================
--- basicnet/netlibs/netlibs.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ basicnet/netlibs/netlibs.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -22,9 +22,9 @@
 
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="curl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnet.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libproxy.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libsoup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libpcap.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="curl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnet.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libproxy.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsoup.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpcap.xml"/>
 
 </chapter>
Index: basicnet/netprogs/netprogs.xml
===================================================================
--- basicnet/netprogs/netprogs.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ basicnet/netprogs/netprogs.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -21,21 +21,21 @@
   are support programs for daemons that you may have running on your machine.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="cvs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="inetutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ncftp.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ncpfs.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="net-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="nfs-utils-client.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ntp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="openssh-client.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="portmap.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="rsync-client.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="samba3-client.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="subversion.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="tcpwrappers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="wget.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="wireless-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ggz-client-libs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="othernetprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cvs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inetutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ncftp.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ncpfs.xml"/> -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="net-tools.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nfs-utils-client.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ntp.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openssh-client.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="portmap.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rsync-client.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="samba3-client.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="subversion.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tcpwrappers.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wget.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wireless-tools.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ggz-client-libs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="othernetprogs.xml"/>
 
 </chapter>
Index: basicnet/netutils/netutils.xml
===================================================================
--- basicnet/netutils/netutils.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ basicnet/netutils/netutils.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -23,9 +23,9 @@
 
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="traceroute.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="nmap.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="whois.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bind-utils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="wireshark.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="traceroute.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nmap.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="whois.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bind-utils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wireshark.xml"/>
 
 </chapter>
Index: basicnet/textweb/textweb.xml
===================================================================
--- basicnet/textweb/textweb.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ basicnet/textweb/textweb.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -30,7 +30,7 @@
   instructions for three console web browsers:</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="links.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="lynx.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="w3m.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="links.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lynx.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="w3m.xml"/>
 
 </chapter>
Index: book/preface.xml
===================================================================
--- book/preface.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ book/preface.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -119,8 +119,8 @@
   </blockquote>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="foreword.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="whoread.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="organization.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="errata.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="foreword.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="whoread.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="organization.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="errata.xml"/>
 
 </preface>
Index: general/general.xml
===================================================================
--- general/general.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ general/general.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -16,9 +16,9 @@
   <title>General Libraries and Utilities</title>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="genlib/genlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="graphlib/graphlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="genutils/genutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sysutils/sysutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prog/prog.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="genlib/genlib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="graphlib/graphlib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="genutils/genutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysutils/sysutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prog/prog.xml"/>
 
 </part>
Index: general/genlib/dbus-bindings.xml
===================================================================
--- general/genlib/dbus-bindings.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ general/genlib/dbus-bindings.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -180,5 +180,5 @@
       class="directory">/usr/libexec</filename>.</para>
 
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/gtk-doc-rebuild.xml"/>
 
@@ -502,5 +502,5 @@
       <title>Command Explanations</title>
 
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ general/genlib/genlib.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -44,61 +44,61 @@
   explain why you may want to install them.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="pcre.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="popt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gamin.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libxml2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libxslt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libgtkhtml.xml"/>
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gdbm.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="glib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="glib2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="glibmm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libidl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libcroco.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libgsf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libglade.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="expat.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libesmtp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="aspell.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="enchant.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="slib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gwrap.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="lzo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libusb.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libusb-compat.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="icu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="iso-codes.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gmime.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libidn.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xcb-proto.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libxcb.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libdrm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="dbus-bindings.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libpthread-stubs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="pth.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libassuan.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libgpg-error.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libgcrypt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libksba.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mowgli.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mcs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libtasn1.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libunique.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="liboil.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="nspr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libffi.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gobject-introspection.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gir-repository.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libnotify.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libical.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libelf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libggz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libsigc++.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ptlib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pcre.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="popt.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gamin.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxml2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxslt.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgtkhtml.xml"/>
+  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gmp.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gdbm.xml"/> -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glib2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glibmm.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libidl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcroco.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgsf.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libglade.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libesmtp.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aspell.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="enchant.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="slib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gwrap.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lzo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libusb.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libusb-compat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="icu.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iso-codes.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gmime.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libidn.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xcb-proto.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxcb.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdrm.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus-bindings.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpthread-stubs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pth.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libassuan.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgpg-error.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgcrypt.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libksba.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mowgli.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mcs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libtasn1.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libunique.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="liboil.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nspr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libffi.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gobject-introspection.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gir-repository.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libnotify.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libical.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libelf.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libggz.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsigc++.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ptlib.xml"/>
 
-  <!--  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libxml.xml"/> -->
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ispell.xml"/> -->
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="fam.xml"/> -->
+  <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxml.xml"/> -->
+  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ispell.xml"/> -->
+  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fam.xml"/> -->
 
 </chapter>
Index: general/genlib/glib2.xml
===================================================================
--- general/genlib/glib2.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ general/genlib/glib2.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -123,5 +123,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: general/genlib/gmime.xml
===================================================================
--- general/genlib/gmime.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ general/genlib/gmime.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -126,5 +126,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: general/genlib/gobject-introspection.xml
===================================================================
--- general/genlib/gobject-introspection.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ general/genlib/gobject-introspection.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -91,5 +91,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: general/genlib/libglade.xml
===================================================================
--- general/genlib/libglade.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ general/genlib/libglade.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -94,5 +94,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: general/genlib/libgsf.xml
===================================================================
--- general/genlib/libgsf.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ general/genlib/libgsf.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -117,5 +117,5 @@
     <application>Python</application> is installed.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: general/genlib/libidn.xml
===================================================================
--- general/genlib/libidn.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ general/genlib/libidn.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -136,5 +136,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: general/genlib/liboil.xml
===================================================================
--- general/genlib/liboil.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ general/genlib/liboil.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -86,5 +86,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: general/genlib/libtasn1.xml
===================================================================
--- general/genlib/libtasn1.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ general/genlib/libtasn1.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -97,5 +97,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: general/genlib/libunique.xml
===================================================================
--- general/genlib/libunique.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ general/genlib/libunique.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -91,5 +91,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: general/genlib/libxml.xml
===================================================================
--- general/genlib/libxml.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ general/genlib/libxml.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -86,5 +86,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: general/genutils/genutils.xml
===================================================================
--- general/genutils/genutils.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ general/genutils/genutils.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -21,28 +21,28 @@
   PIN numbers and pass-phrases, and a hash generator.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="rep-gtk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="compface.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="imagemagick.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="hd2u.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gtk-doc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="scrollkeeper.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="intltool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="screen.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="tidy.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="desktop-file-utils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xscreensaver.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="pilot-link.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="unixodbc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="graphviz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xcb-util.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xterm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="rman.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="recode.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="icon-naming-utils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="rxvt-unicode.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="pinentry.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gperf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="rarian.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rep-gtk.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="compface.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="imagemagick.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hd2u.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk-doc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="scrollkeeper.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intltool.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="screen.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tidy.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="desktop-file-utils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xscreensaver.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pilot-link.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="unixodbc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="graphviz.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xcb-util.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xterm.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rman.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="recode.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="icon-naming-utils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rxvt-unicode.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pinentry.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gperf.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rarian.xml"/>
 
 </chapter>
Index: general/genutils/gtk-doc.xml
===================================================================
--- general/genutils/gtk-doc.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ general/genutils/gtk-doc.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -119,5 +119,5 @@
 
     \<\!\-\- no scrollkeeper files with this version
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/scrollkeeper-dir.xml"/> \-\-\>
 
Index: general/graphlib/clutter-gtk.xml
===================================================================
--- general/graphlib/clutter-gtk.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ general/graphlib/clutter-gtk.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -91,5 +91,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: general/graphlib/clutter.xml
===================================================================
--- general/graphlib/clutter.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ general/graphlib/clutter.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -107,5 +107,5 @@
     application developers manual.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: general/graphlib/graphlib.xml
===================================================================
--- general/graphlib/graphlib.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ general/graphlib/graphlib.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -21,29 +21,29 @@
   other hand, will not require them.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libjpeg.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libpng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libtiff.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libjpeg.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpng.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libtiff.xml"/>
   <!--
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libungif.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libungif.xml"/>
   -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="giflib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="lcms.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libmng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="freetype2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="fontconfig.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libart_lgpl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="librsvg.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="giflib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lcms.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmng.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="freetype2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fontconfig.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libart_lgpl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="librsvg.xml"/>
   <!--
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="imlib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="imlib.xml"/>
   -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="aalib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="imlib2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libexif.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="fribidi.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="poppler.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="jasper.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="pixman.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="clutter.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="clutter-gtk.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aalib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="imlib2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libexif.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fribidi.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="poppler.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="jasper.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pixman.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clutter.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clutter-gtk.xml"/>
 
 </chapter>
Index: general/graphlib/jasper.xml
===================================================================
--- general/graphlib/jasper.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ general/graphlib/jasper.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -134,5 +134,5 @@
       <title>Configuration Information</title>
 
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/lib-config.xml"/>
 
Index: general/graphlib/libjpeg.xml
===================================================================
--- general/graphlib/libjpeg.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ general/graphlib/libjpeg.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -95,5 +95,5 @@
       <title>Configuration Information</title>
 
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/lib-config.xml"/>
 
Index: general/graphlib/libpng.xml
===================================================================
--- general/graphlib/libpng.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ general/graphlib/libpng.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -119,5 +119,5 @@
       <title>Configuration Information</title>
 
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/lib-config.xml"/>
 
Index: general/prog/gcc2.xml
===================================================================
--- general/prog/gcc2.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ general/prog/gcc2.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -111,5 +111,5 @@
 <sect3><title>Configuration Information</title>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../../lib-config.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../../lib-config.xml"/>
 
 <para>The instructions given above make compatibility symlinks that pre-compiled
Index: general/prog/jdk.SAVE
===================================================================
--- general/prog/jdk.SAVE	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ general/prog/jdk.SAVE	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -287,5 +287,5 @@
     j2se/make/common/shared/Compiler-gcc.gmk</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/X11R6_symlink.xml"/>
 
Index: general/prog/prog.xml
===================================================================
--- general/prog/prog.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ general/prog/prog.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -23,25 +23,25 @@
   system's development capabilities.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="dejagnu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="doxygen.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gcc3.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="guile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="jdk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="junit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="librep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="nasm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="pdl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="perl-modules.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="php.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="python.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="python-modules.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ruby.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="slang.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="tk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other-tools.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dejagnu.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="doxygen.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expect.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcc3.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="guile.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="jdk.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="junit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="librep.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nasm.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pdl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="perl-modules.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="php.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python-modules.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ruby.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="slang.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tcl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tk.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="other-tools.xml"/>
 
 </chapter>
Index: general/prog/python-modules.xml
===================================================================
--- general/prog/python-modules.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ general/prog/python-modules.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -665,5 +665,5 @@
       <application>DocBook</application> is not installed.</para>
 
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: general/sysutils/sysutils.xml
===================================================================
--- general/sysutils/sysutils.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ general/sysutils/sysutils.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -20,25 +20,25 @@
   installation or configuration purposes.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gpm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="fcron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="hdparm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="which.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="unzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="zip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="unrar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="pciutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="usbutils.xml"/>
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="pkgconfig.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="cpio.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sysstat.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="apache-ant.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="dbus.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="hal.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="DeviceKit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="DeviceKit-power.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="Device-mapper.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="lzma-utils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gpm.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fcron.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hdparm.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="which.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="unzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="zip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="unrar.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pciutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="usbutils.xml"/>
+  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgconfig.xml"/> -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cpio.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysstat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apache-ant.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hal.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="DeviceKit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="DeviceKit-power.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Device-mapper.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lzma-utils.xml"/>
 
 </chapter>
Index: general/sysutils/udev.xml
===================================================================
--- general/sysutils/udev.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ general/sysutils/udev.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -98,5 +98,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: gnome/add/add.xml
===================================================================
--- gnome/add/add.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/add.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -21,66 +21,66 @@
 
   <!-- This is used as a TOC separator -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="dummy-libraries.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dummy-libraries.xml"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="evolution-data-server.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gtkhtml.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gtksourceview.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libgnomecups.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libgnomeprint.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libgnomeprintui.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="system-tools-backends.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="totem-pl-parser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="evolution-data-server.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtkhtml.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtksourceview.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgnomecups.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgnomeprint.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgnomeprintui.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="system-tools-backends.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="totem-pl-parser.xml"/>
 
   <!-- This is used as a TOC separator -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="dummy-utilities.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dummy-utilities.xml"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="brasero.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bug-buddy.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ekiga.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="eog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="epiphany.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="evince.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="file-roller.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gcalctool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gconf-editor.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gdm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gedit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-games.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-media.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-mount.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-netstatus.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-power-manager.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-screensaver.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-system-monitor.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-utils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gucharmap.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sound-juicer.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="totem.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="zenity.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="brasero.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bug-buddy.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ekiga.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="eog.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="epiphany.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="evince.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="file-roller.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcalctool.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gconf-editor.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gdm.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gedit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-games.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-media.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-mount.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-netstatus.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-power-manager.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-screensaver.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-system-monitor.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-utils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gucharmap.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sound-juicer.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="totem.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="zenity.xml"/>
 
   <!-- This is used as a TOC separator -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="dummy-accessibility.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dummy-accessibility.xml"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="at-spi.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-mag.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-speech.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gok.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="java-access-bridge.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libgail-gnome.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="orca.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="at-spi.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-mag.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-speech.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gok.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="java-access-bridge.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgail-gnome.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="orca.xml"/>
 
   <!-- excluding these packages from the project as they are now obsolete
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="nautilus-media.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gal.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gpdf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ggv.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnopernicus.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-vfs-monikers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-audio.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-volume-manager.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="nautilus-cd-burner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="eel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gail.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-keyring-manager.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nautilus-media.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gal.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gpdf.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ggv.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnopernicus.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-vfs-monikers.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-audio.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-volume-manager.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nautilus-cd-burner.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="eel.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gail.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-keyring-manager.xml"/>
   -->
 
Index: gnome/add/at-spi.xml
===================================================================
--- gnome/add/at-spi.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/at-spi.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -100,5 +100,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
@@ -109,5 +109,5 @@
     <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: gnome/add/brasero.xml
===================================================================
--- gnome/add/brasero.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/brasero.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -109,5 +109,5 @@
     updates to the scrollkeeper database.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: gnome/add/bug-buddy.xml
===================================================================
--- gnome/add/bug-buddy.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/bug-buddy.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -99,14 +99,14 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/scrollkeeper-dir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-mandir.xml"/>
 
Index: gnome/add/ekiga.xml
===================================================================
--- gnome/add/ekiga.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/ekiga.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -111,11 +111,11 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/scrollkeeper-dir.xml"/>
 
Index: gnome/add/eog.xml
===================================================================
--- gnome/add/eog.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/eog.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -97,11 +97,11 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/scrollkeeper-dir.xml"/>
 
Index: gnome/add/epiphany.xml
===================================================================
--- gnome/add/epiphany.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/epiphany.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -114,14 +114,14 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/scrollkeeper-dir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-mandir.xml"/>
 
@@ -129,5 +129,5 @@
     wish to disable the updates to the scrollkeeper database.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: gnome/add/evince.xml
===================================================================
--- gnome/add/evince.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/evince.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -132,14 +132,14 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/scrollkeeper-dir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-mandir.xml"/>
 
@@ -159,5 +159,5 @@
     <application>Nautilus</application> is installed.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: gnome/add/evolution-data-server.xml
===================================================================
--- gnome/add/evolution-data-server.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/evolution-data-server.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -144,5 +144,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
@@ -173,5 +173,5 @@
     <application>libgweather</application> is not installed.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: gnome/add/file-roller.xml
===================================================================
--- gnome/add/file-roller.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/file-roller.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -96,11 +96,11 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/scrollkeeper-dir.xml"/>
 
Index: gnome/add/gcalctool.xml
===================================================================
--- gnome/add/gcalctool.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/gcalctool.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -96,14 +96,14 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/scrollkeeper-dir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-mandir.xml"/>
 
Index: gnome/add/gconf-editor.xml
===================================================================
--- gnome/add/gconf-editor.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/gconf-editor.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -93,11 +93,11 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/scrollkeeper-dir.xml"/>
 
Index: gnome/add/gdm.xml
===================================================================
--- gnome/add/gdm.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/gdm.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -132,8 +132,8 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
Index: gnome/add/gedit.xml
===================================================================
--- gnome/add/gedit.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/gedit.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -104,11 +104,11 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/scrollkeeper-dir.xml"/>
 
@@ -117,5 +117,5 @@
     <application>Enchant</application> is not installed.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: gnome/add/gnome-games.xml
===================================================================
--- gnome/add/gnome-games.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/gnome-games.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -119,8 +119,8 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
Index: gnome/add/gnome-mag.xml
===================================================================
--- gnome/add/gnome-mag.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/gnome-mag.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -105,8 +105,8 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
Index: gnome/add/gnome-media.xml
===================================================================
--- gnome/add/gnome-media.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/gnome-media.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -101,11 +101,11 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/scrollkeeper-dir.xml"/>
 
Index: gnome/add/gnome-mount.xml
===================================================================
--- gnome/add/gnome-mount.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/gnome-mount.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -106,8 +106,8 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
Index: gnome/add/gnome-netstatus.xml
===================================================================
--- gnome/add/gnome-netstatus.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/gnome-netstatus.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -93,11 +93,11 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/scrollkeeper-dir.xml"/>
 
Index: gnome/add/gnome-screensaver.xml
===================================================================
--- gnome/add/gnome-screensaver.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/gnome-screensaver.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -170,8 +170,8 @@
     configuration file is not displayed.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
Index: gnome/add/gnome-speech.xml
===================================================================
--- gnome/add/gnome-speech.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/gnome-speech.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -123,5 +123,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
Index: gnome/add/gnome-system-monitor.xml
===================================================================
--- gnome/add/gnome-system-monitor.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/gnome-system-monitor.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -116,11 +116,11 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/scrollkeeper-dir.xml"/>
 
Index: gnome/add/gnome-utils.xml
===================================================================
--- gnome/add/gnome-utils.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/gnome-utils.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -98,11 +98,11 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/scrollkeeper-dir.xml"/>
 
@@ -114,8 +114,8 @@
     <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-mandir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: gnome/add/gok.xml
===================================================================
--- gnome/add/gok.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/gok.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -103,14 +103,14 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/scrollkeeper-dir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: gnome/add/gtkhtml.xml
===================================================================
--- gnome/add/gtkhtml.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/gtkhtml.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -102,5 +102,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
Index: gnome/add/gtksourceview.xml
===================================================================
--- gnome/add/gtksourceview.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/gtksourceview.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -98,8 +98,8 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: gnome/add/gucharmap.xml
===================================================================
--- gnome/add/gucharmap.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/gucharmap.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -80,5 +80,5 @@
     <title>Installation of gucharmap</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/without-gnome.xml"/>
 
@@ -101,8 +101,8 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/scrollkeeper-dir.xml"/>
 
@@ -119,5 +119,5 @@
     wish to disable the updates to the scrollkeeper database.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: gnome/add/java-access-bridge.xml
===================================================================
--- gnome/add/java-access-bridge.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/java-access-bridge.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -99,5 +99,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
Index: gnome/add/libgail-gnome.xml
===================================================================
--- gnome/add/libgail-gnome.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/libgail-gnome.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -89,5 +89,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
Index: gnome/add/libgnomecups.xml
===================================================================
--- gnome/add/libgnomecups.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/libgnomecups.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -76,5 +76,5 @@
     <title>Installation of libgnomecups</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/without-gnome.xml"/>
 
@@ -96,5 +96,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
Index: gnome/add/libgnomeprint.xml
===================================================================
--- gnome/add/libgnomeprint.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/libgnomeprint.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -80,5 +80,5 @@
     <title>Installation of libgnomeprint</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/without-gnome.xml"/>
 
@@ -106,5 +106,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
Index: gnome/add/libgnomeprintui.xml
===================================================================
--- gnome/add/libgnomeprintui.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/libgnomeprintui.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -74,5 +74,5 @@
     <title>Installation of libgnomeprintui</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/without-gnome.xml"/>
 
@@ -94,5 +94,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
Index: gnome/add/obsolete/eel.xml
===================================================================
--- gnome/add/obsolete/eel.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/obsolete/eel.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -91,5 +91,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
Index: gnome/add/obsolete/gail.xml
===================================================================
--- gnome/add/obsolete/gail.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/obsolete/gail.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -79,5 +79,5 @@
     <title>Installation of GAIL</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/without-gnome.xml"/>
 
@@ -105,8 +105,8 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: gnome/add/obsolete/gnome-audio.xml
===================================================================
--- gnome/add/obsolete/gnome-audio.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/obsolete/gnome-audio.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -66,5 +66,5 @@
     <title>Installation of gnome-audio</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/without-gnome.xml"/>
 
Index: gnome/add/obsolete/gnome-keyring-manager.xml
===================================================================
--- gnome/add/obsolete/gnome-keyring-manager.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/obsolete/gnome-keyring-manager.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -95,14 +95,14 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/scrollkeeper-dir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-mandir.xml"/>
 
Index: gnome/add/obsolete/gnome-vfs-monikers.xml
===================================================================
--- gnome/add/obsolete/gnome-vfs-monikers.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/obsolete/gnome-vfs-monikers.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -90,5 +90,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
Index: gnome/add/obsolete/gnome-volume-manager.xml
===================================================================
--- gnome/add/obsolete/gnome-volume-manager.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/obsolete/gnome-volume-manager.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -105,8 +105,8 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
Index: gnome/add/obsolete/gnopernicus.xml
===================================================================
--- gnome/add/obsolete/gnopernicus.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/obsolete/gnopernicus.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -98,11 +98,11 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/scrollkeeper-dir.xml"/>
 
Index: gnome/add/obsolete/nautilus-cd-burner.xml
===================================================================
--- gnome/add/obsolete/nautilus-cd-burner.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/obsolete/nautilus-cd-burner.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -103,8 +103,8 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
Index: gnome/add/sound-juicer.xml
===================================================================
--- gnome/add/sound-juicer.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/sound-juicer.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -126,11 +126,11 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/scrollkeeper-dir.xml"/>
 
Index: gnome/add/system-tools-backends.xml
===================================================================
--- gnome/add/system-tools-backends.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/system-tools-backends.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -75,5 +75,5 @@
     <title>Installation of system-tools-backends</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/without-gnome.xml"/>
 
@@ -96,5 +96,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
Index: gnome/add/totem-pl-parser.xml
===================================================================
--- gnome/add/totem-pl-parser.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/totem-pl-parser.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -90,5 +90,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: gnome/add/totem.xml
===================================================================
--- gnome/add/totem.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/totem.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -127,11 +127,11 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/scrollkeeper-dir.xml"/>
 
@@ -143,5 +143,5 @@
     of <filename class='directory'>$GNOME_PREFIX/libexec</filename>.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-mandir.xml"/>
 
Index: gnome/add/zenity.xml
===================================================================
--- gnome/add/zenity.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/add/zenity.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -97,11 +97,11 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/scrollkeeper-dir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-mandir.xml"/>
 
Index: gnome/core/core.xml
===================================================================
--- gnome/core/core.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/core/core.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -31,48 +31,48 @@
 
   <!-- This is used as a TOC separator -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="pre-install-config.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pre-install-config.xml"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="dummy-platform.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dummy-platform.xml"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="orbit2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libbonobo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gconf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-shared-mime-info.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-mime-data.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-hicolor-icon-theme.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-desktop-file-utils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-vfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libgnome.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libgnomecanvas.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libbonoboui.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libgnomeui.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="orbit2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libbonobo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gconf.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-shared-mime-info.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-mime-data.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-hicolor-icon-theme.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-desktop-file-utils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-vfs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgnome.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgnomecanvas.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libbonoboui.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgnomeui.xml"/>
 
   <!-- This is used as a TOC separator -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="dummy-desktop.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dummy-desktop.xml"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-keyring.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gvfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gtk-engines.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-themes.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-doc-utils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-desktop.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-backgrounds.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-menus.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libgweather.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-panel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="vte.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-terminal.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libgtop.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libgnomekbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="nautilus.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-settings-daemon.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-control-center.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-icon-theme.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-applets.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-session.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="yelp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-user-docs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-keyring.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gvfs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk-engines.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-themes.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-doc-utils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-desktop.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-backgrounds.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-menus.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgweather.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-panel.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vte.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-terminal.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgtop.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgnomekbd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nautilus.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-settings-daemon.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-control-center.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-icon-theme.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-applets.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-session.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="yelp.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-user-docs.xml"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="config.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="config.xml"/>
 
 </chapter>
Index: gnome/core/gconf.xml
===================================================================
--- gnome/core/gconf.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/core/gconf.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -132,5 +132,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
@@ -151,8 +151,8 @@
     <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-mandir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: gnome/core/gnome-applets.xml
===================================================================
--- gnome/core/gnome-applets.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/core/gnome-applets.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -120,11 +120,11 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/scrollkeeper-dir.xml"/>
 
@@ -136,5 +136,5 @@
     <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-mandir.xml"/>
 
Index: gnome/core/gnome-backgrounds.xml
===================================================================
--- gnome/core/gnome-backgrounds.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/core/gnome-backgrounds.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -74,5 +74,5 @@
     <title>Installation of gnome-backgrounds</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/without-gnome.xml"/>
 
@@ -94,5 +94,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
Index: gnome/core/gnome-control-center.xml
===================================================================
--- gnome/core/gnome-control-center.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/core/gnome-control-center.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -107,11 +107,11 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/scrollkeeper-dir.xml"/>
 
Index: gnome/core/gnome-desktop.xml
===================================================================
--- gnome/core/gnome-desktop.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/core/gnome-desktop.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -94,11 +94,11 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/scrollkeeper-dir.xml"/>
 
@@ -111,5 +111,5 @@
     other than <filename class='directory'>/usr</filename>.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: gnome/core/gnome-doc-utils.xml
===================================================================
--- gnome/core/gnome-doc-utils.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/core/gnome-doc-utils.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -90,5 +90,5 @@
     <title>Installation of GNOME Doc Utils</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/without-gnome.xml"/>
 
@@ -112,8 +112,8 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-mandir.xml"/>
 
Index: gnome/core/gnome-keyring.xml
===================================================================
--- gnome/core/gnome-keyring.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/core/gnome-keyring.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -76,5 +76,5 @@
     <title>Installation of gnome-keyring</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/without-gnome.xml"/>
 
@@ -103,5 +103,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
Index: gnome/core/gnome-menus.xml
===================================================================
--- gnome/core/gnome-menus.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/core/gnome-menus.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -76,5 +76,5 @@
     <title>Installation of gnome-menus</title>
 
-     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../xincludes/without-gnome.xml"/>
 
@@ -97,8 +97,8 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
Index: gnome/core/gnome-mime-data.xml
===================================================================
--- gnome/core/gnome-mime-data.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/core/gnome-mime-data.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -69,5 +69,5 @@
     <title>Installation of GNOME MIME Data</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/without-gnome.xml"/>
 
@@ -95,11 +95,11 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-mandir.xml"/>
 
Index: gnome/core/gnome-panel.xml
===================================================================
--- gnome/core/gnome-panel.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/core/gnome-panel.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -118,11 +118,11 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/scrollkeeper-dir.xml"/>
 
@@ -134,8 +134,8 @@
     <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-mandir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: gnome/core/gnome-session.xml
===================================================================
--- gnome/core/gnome-session.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/core/gnome-session.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -97,11 +97,11 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-mandir.xml"/>
 
Index: gnome/core/gnome-settings-daemon.xml
===================================================================
--- gnome/core/gnome-settings-daemon.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/core/gnome-settings-daemon.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -95,8 +95,8 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
Index: gnome/core/gnome-terminal.xml
===================================================================
--- gnome/core/gnome-terminal.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/core/gnome-terminal.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -90,11 +90,11 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/scrollkeeper-dir.xml"/>
 
Index: gnome/core/gnome-user-docs.xml
===================================================================
--- gnome/core/gnome-user-docs.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/core/gnome-user-docs.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -72,5 +72,5 @@
     <title>Installation of GNOME User Docs</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/without-gnome.xml"/>
 
@@ -93,8 +93,8 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/scrollkeeper-dir.xml"/>
 
Index: gnome/core/gnome-vfs.xml
===================================================================
--- gnome/core/gnome-vfs.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/core/gnome-vfs.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -113,8 +113,8 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
@@ -142,5 +142,5 @@
     installed.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: gnome/core/gvfs.xml
===================================================================
--- gnome/core/gvfs.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/core/gvfs.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -108,8 +108,8 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
Index: gnome/core/libbonobo.xml
===================================================================
--- gnome/core/libbonobo.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/core/libbonobo.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -101,8 +101,8 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
@@ -113,8 +113,8 @@
     <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-mandir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: gnome/core/libbonoboui.xml
===================================================================
--- gnome/core/libbonoboui.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/core/libbonoboui.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -94,8 +94,8 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: gnome/core/libgnome.xml
===================================================================
--- gnome/core/libgnome.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/core/libgnome.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -98,8 +98,8 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
@@ -112,5 +112,5 @@
     <filename class='directory'>/var/lib/games</filename>.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-mandir.xml"/>
 
@@ -118,5 +118,5 @@
     <xref linkend="esound"/> is not installed.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: gnome/core/libgnomecanvas.xml
===================================================================
--- gnome/core/libgnomecanvas.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/core/libgnomecanvas.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -74,5 +74,5 @@
     <title>Installation of libgnomecanvas</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/without-gnome.xml"/>
 
@@ -94,8 +94,8 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: gnome/core/libgnomekbd.xml
===================================================================
--- gnome/core/libgnomekbd.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/core/libgnomekbd.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -92,8 +92,8 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
Index: gnome/core/libgnomeui.xml
===================================================================
--- gnome/core/libgnomeui.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/core/libgnomeui.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -100,5 +100,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
@@ -113,5 +113,5 @@
     other than <filename class='directory'>/usr</filename>.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: gnome/core/libgtop.xml
===================================================================
--- gnome/core/libgtop.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/core/libgtop.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -74,5 +74,5 @@
     <title>Installation of LibGTop</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/without-gnome.xml"/>
 
@@ -103,5 +103,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
@@ -115,5 +115,5 @@
     than <filename class='directory'>/usr</filename>.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: gnome/core/libgweather.xml
===================================================================
--- gnome/core/libgweather.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/core/libgweather.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -91,8 +91,8 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
@@ -104,5 +104,5 @@
     build libgweather python bindings.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: gnome/core/nautilus.xml
===================================================================
--- gnome/core/nautilus.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/core/nautilus.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -103,8 +103,8 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
Index: gnome/core/orbit2.xml
===================================================================
--- gnome/core/orbit2.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/core/orbit2.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -99,8 +99,8 @@
     install directory as described in the introduction of this Chapter.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: gnome/core/vte.xml
===================================================================
--- gnome/core/vte.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/core/vte.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -108,5 +108,5 @@
     <application>VTE</application> library.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: gnome/core/yelp.xml
===================================================================
--- gnome/core/yelp.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/core/yelp.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -107,11 +107,11 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/scrollkeeper-dir.xml"/>
 
Index: gnome/gnome.xml
===================================================================
--- gnome/gnome.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/gnome.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -16,10 +16,10 @@
   <title>GNOME</title>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-intro.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="core/core.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="add/add.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-intro.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="core/core.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="add/add.xml"/>
 
   <!-- Obsoleting the GNOME-1.4 stuff
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="otherlibs/otherlibs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="otherlibs/otherlibs.xml"/>
   -->
 
Index: gnome/otherlibs/otherlibs.xml
===================================================================
--- gnome/otherlibs/otherlibs.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ gnome/otherlibs/otherlibs.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -21,20 +21,20 @@
   a <application>GNOME</application> desktop installation.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="otherlibs-config.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="orbit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="oaf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-libs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gdk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-print.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bonobo14.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gconf1.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-vfs1.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libglade14.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gal1.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="guppi.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libcapplet.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="soup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libghttp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gtkhtml1.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="otherlibs-config.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="orbit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="oaf.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-libs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gdk.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-print.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bonobo14.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gconf1.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-vfs1.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libglade14.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gal1.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="guppi.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcapplet.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="soup.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libghttp.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtkhtml1.xml"/>
 
 </chapter>
Index: index.xml
===================================================================
--- index.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ index.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -11,25 +11,25 @@
 
   <!-- Front Matter -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="book/bookinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="book/dedication.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="book/preface.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="book/bookinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="book/dedication.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="book/preface.xml"/>
 
   <!-- Parts -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="introduction/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="postlfs/postlfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="general/general.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="basicnet/basicnet.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="server/server.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x/x.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="kde/kde.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome/gnome.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xsoft/xsoft.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multimedia/multimedia.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="pst/pst.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introduction/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="postlfs/postlfs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="general/general.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="basicnet/basicnet.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="server/server.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x/x.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde/kde.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome/gnome.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xsoft/xsoft.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multimedia/multimedia.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pst/pst.xml"/>
 
   <!-- Appendices -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/creat-comm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/mit-lic.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/glossary.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/creat-comm.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/mit-lic.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/glossary.xml"/>
 
   <index/>
Index: introduction/important/important.xml
===================================================================
--- introduction/important/important.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ introduction/important/important.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -21,12 +21,12 @@
 
   <!-- Moved to LFS
-     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="pkgmgt.xml"/> 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgmgt.xml"/> 
   -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="building-notes.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="position.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="patches.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="locale-issues.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="beyond.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="building-notes.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="position.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="patches.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootscripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="locale-issues.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="beyond.xml"/>
 
 </chapter>
Index: introduction/introduction.xml
===================================================================
--- introduction/introduction.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ introduction/introduction.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -16,6 +16,6 @@
   <title>Introduction</title>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="welcome/welcome.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="important/important.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="welcome/welcome.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="important/important.xml"/>
 
 </part>
Index: introduction/welcome/welcome.xml
===================================================================
--- introduction/welcome/welcome.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ introduction/welcome/welcome.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -24,17 +24,17 @@
   quite a few of the conventions used throughout the book.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="acknowledgments.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="credits.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="which.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="conventions.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="version.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mirrors.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="maillists.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="wiki.xml"/>
-  <!--   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="newsserver.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="askhelp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="contact.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="acknowledgments.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="credits.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="which.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="conventions.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="version.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mirrors.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="packages.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="changelog.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="maillists.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wiki.xml"/>
+  <!--   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="newsserver.xml"/> -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="askhelp.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="contact.xml"/>
 
 </chapter>
Index: kde/add/add.xml
===================================================================
--- kde/add/add.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ kde/add/add.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -22,23 +22,23 @@
   ones desired.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="kdeadmin.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="kdenetwork.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="kdepim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="kdemultimedia.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="kdegraphics.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="kdeutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="kdeedu.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdeadmin.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdenetwork.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdepim.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdemultimedia.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdegraphics.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdeutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdeedu.xml"/>
   <!--
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="kdesdk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="kdevelop.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="kdewebdev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="kdebindings.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdesdk.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdevelop.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdewebdev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdebindings.xml"/>
   -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="kdeaccessibility.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="kdetoys.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="kdegames.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="kdeartwork.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="kdeaddons.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="kde-i18n.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdeaccessibility.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdetoys.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdegames.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdeartwork.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdeaddons.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde-i18n.xml"/>
 
 </chapter>
Index: kde/add/kdegames.xml
===================================================================
--- kde/add/kdegames.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ kde/add/kdegames.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -81,5 +81,5 @@
 make</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/kde-apidocs.xml"/>
 
Index: kde/add/kdegraphics.xml
===================================================================
--- kde/add/kdegraphics.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ kde/add/kdegraphics.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -139,5 +139,5 @@
 make</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/kde-apidocs.xml"/>
 
Index: kde/add/kdemultimedia.xml
===================================================================
--- kde/add/kdemultimedia.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ kde/add/kdemultimedia.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -242,5 +242,5 @@
     </note> -->
 
-<!--    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/kde-sysconfdir.xml"/> -->
 
@@ -252,5 +252,5 @@
     The apidox target has been removed from this package.
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/kde-apidocs.xml"/>
 -->
Index: kde/add/kdenetwork.xml
===================================================================
--- kde/add/kdenetwork.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ kde/add/kdenetwork.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -95,5 +95,5 @@
 make</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/kde-apidocs.xml"/>
 
Index: kde/add/kdepim.xml
===================================================================
--- kde/add/kdepim.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ kde/add/kdepim.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -112,5 +112,5 @@
 make</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/kde-apidocs.xml"/>
 
Index: kde/add/kdeutils.xml
===================================================================
--- kde/add/kdeutils.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ kde/add/kdeutils.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -111,5 +111,5 @@
 make</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/kde-apidocs.xml"/>
 
Index: kde/core/core.xml
===================================================================
--- kde/core/core.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ kde/core/core.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -16,9 +16,9 @@
   <title>KDE Core Packages</title>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="pre-install-config.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="arts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="kdelibs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="kdebase.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="config.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pre-install-config.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="arts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdelibs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdebase.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="config.xml"/>
 
 </chapter>
Index: kde/core/kdebase.xml
===================================================================
--- kde/core/kdebase.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ kde/core/kdebase.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -134,5 +134,5 @@
     <para>Install <application>kdebase</application> with:</para>
 
-<!--    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/kde-sysconfdir.xml"/> -->
 
@@ -141,5 +141,5 @@
 make</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/kde-apidocs.xml"/>
 
Index: kde/devel/devel.xml
===================================================================
--- kde/devel/devel.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ kde/devel/devel.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -20,8 +20,8 @@
   a loss of functionality.  </para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="kdesdk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="kdevelop.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="kdewebdev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="kdebindings.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdesdk.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdevelop.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdewebdev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdebindings.xml"/>
 
 </chapter>
Index: kde/kde.xml
===================================================================
--- kde/kde.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ kde/kde.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -16,8 +16,8 @@
   <title>KDE</title>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="kde-intro.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="core/core.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="add/add.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="devel/devel.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde-intro.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="core/core.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="add/add.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="devel/devel.xml"/>
 
 </part>
Index: multimedia/audioutils/audioutils.xml
===================================================================
--- multimedia/audioutils/audioutils.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ multimedia/audioutils/audioutils.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -23,12 +23,12 @@
   installed.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mpg123.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="vorbistools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xmms.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="lame.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="cdparanoia.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="freetts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="audacious.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="amarok.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mpg123.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vorbistools.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xmms.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lame.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cdparanoia.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="freetts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="audacious.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="amarok.xml"/>
 
 </chapter>
Index: multimedia/audioutils/cdparanoia.xml
===================================================================
--- multimedia/audioutils/cdparanoia.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ multimedia/audioutils/cdparanoia.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -107,5 +107,5 @@
       <title>Configuration Information</title>
 
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/lib-config.xml"/>
 
Index: multimedia/cdwriteutils/cdwriteutils.xml
===================================================================
--- multimedia/cdwriteutils/cdwriteutils.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ multimedia/cdwriteutils/cdwriteutils.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -37,9 +37,9 @@
   </itemizedlist>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="cdrtools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="cdrdao.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="udftools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="dvd+rw-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="k3b.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cdrtools.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cdrdao.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udftools.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dvd+rw-tools.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="k3b.xml"/>
 
 </chapter>
Index: multimedia/cdwriteutils/k3b.xml
===================================================================
--- multimedia/cdwriteutils/k3b.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ multimedia/cdwriteutils/k3b.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -138,5 +138,5 @@
     commands:</para>
 
-<!--    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/kde-sysconfdir.xml"/> -->
 
Index: multimedia/libdriv/alsa-oss.xml
===================================================================
--- multimedia/libdriv/alsa-oss.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ multimedia/libdriv/alsa-oss.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -91,5 +91,5 @@
       <title>Configuration Information</title>
 
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/lib-config.xml"/>
 
Index: multimedia/libdriv/gst-plugins-base.xml
===================================================================
--- multimedia/libdriv/gst-plugins-base.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ multimedia/libdriv/gst-plugins-base.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -139,5 +139,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: multimedia/libdriv/gstreamer.xml
===================================================================
--- multimedia/libdriv/gstreamer.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ multimedia/libdriv/gstreamer.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -181,5 +181,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: multimedia/libdriv/libdriv.xml
===================================================================
--- multimedia/libdriv/libdriv.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ multimedia/libdriv/libdriv.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -22,48 +22,48 @@
   enable it to support certain functionality.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alsa.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alsa-lib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alsa-plugins.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alsa-utils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alsa-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alsa-firmware.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alsa-oss.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="arts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="audiofile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="esound.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sdl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libao.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libogg.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libvorbis.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libcanberra.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="faac.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="faad2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="nas.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libmpeg3.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libmad.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libquicktime.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libfame.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="speex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="id3lib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="flac.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libdvdcss.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libdvdread.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libdv.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="liba52.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xvid.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libtheora.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xine-lib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libmikmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gstreamer.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gst-plugins-base.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gst-plugins-good.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gst-plugins-ugly.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libmusicbrainz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libmpeg2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="opal.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa-lib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa-plugins.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa-utils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa-tools.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa-firmware.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa-oss.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="arts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="audiofile.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="esound.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sdl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libao.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libogg.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libvorbis.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcanberra.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="faac.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="faad2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nas.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmpeg3.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmad.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libquicktime.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libfame.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="speex.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="id3lib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="flac.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdvdcss.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdvdread.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdv.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="liba52.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xvid.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libtheora.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xine-lib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmikmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gstreamer.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gst-plugins-base.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gst-plugins-good.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gst-plugins-ugly.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmusicbrainz.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmpeg2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="opal.xml"/>
 
   <!-- Obsolete
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="openquicktime.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gst-plugins.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openquicktime.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gst-plugins.xml"/>
   -->
 
Index: multimedia/libdriv/nas.xml
===================================================================
--- multimedia/libdriv/nas.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ multimedia/libdriv/nas.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -96,5 +96,5 @@
     <title>Installation of NAS</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/X11R6_symlink.xml"/>
 
Index: multimedia/libdriv/sdl.xml
===================================================================
--- multimedia/libdriv/sdl.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ multimedia/libdriv/sdl.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -80,5 +80,5 @@
     <title>Installation of SDL</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/X11R6_symlink.xml"/>
 
@@ -139,5 +139,5 @@
       <title>Configuration Information</title>
 
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/lib-config.xml"/>
 
Index: multimedia/multimedia.xml
===================================================================
--- multimedia/multimedia.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ multimedia/multimedia.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -16,8 +16,8 @@
   <title>Multimedia</title>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libdriv/libdriv.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="audioutils/audioutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="videoutils/videoutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="cdwriteutils/cdwriteutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdriv/libdriv.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="audioutils/audioutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="videoutils/videoutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cdwriteutils/cdwriteutils.xml"/>
 
 </part>
Index: multimedia/videoutils/mplayer.xml
===================================================================
--- multimedia/videoutils/mplayer.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ multimedia/videoutils/mplayer.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -347,5 +347,5 @@
       </note>
 
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/X11R6_symlink.xml"/>
 
Index: multimedia/videoutils/videoutils.xml
===================================================================
--- multimedia/videoutils/videoutils.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ multimedia/videoutils/videoutils.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -23,9 +23,9 @@
   CODEC to install.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ffmpeg.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="avifile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mplayer.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xine-ui.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="transcode.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ffmpeg.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="avifile.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mplayer.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xine-ui.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="transcode.xml"/>
 
 </chapter>
Index: postlfs/config/config.xml
===================================================================
--- postlfs/config/config.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ postlfs/config/config.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -45,17 +45,17 @@
   don't have much interaction with the other topics in this chapter.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootdisk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="skel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="users.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="devices.xml"/>
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="inputrc.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="profile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="vimrc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="logon.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="etcshells.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="random.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="compressdoc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="autofs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="netfs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootdisk.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="skel.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="users.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="devices.xml"/>
+  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inputrc.xml"/> -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="profile.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vimrc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="logon.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="etcshells.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="random.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="compressdoc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="autofs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="netfs.xml"/>
 
 </chapter>
Index: postlfs/editors/editors.xml
===================================================================
--- postlfs/editors/editors.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ postlfs/editors/editors.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -21,11 +21,11 @@
   have been installed.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="emacs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="nano.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="joe.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bluefish.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="others.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vim.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="emacs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nano.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="joe.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ed.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bluefish.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="others.xml"/>
 
 </chapter>
Index: postlfs/filesystems/filesystems.xml
===================================================================
--- postlfs/filesystems/filesystems.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ postlfs/filesystems/filesystems.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -23,7 +23,7 @@
   system.</para>
 
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ext3.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="reiser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xfs.xml"/>
+  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ext3.xml"/> -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="reiser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfs.xml"/>
 
 </chapter>
Index: postlfs/postlfs.xml
===================================================================
--- postlfs/postlfs.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ postlfs/postlfs.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -16,9 +16,9 @@
   <title>Post LFS Configuration and Extra Software</title>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="config/config.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="security/security.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="filesystems/filesystems.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="editors/editors.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="shells/shells.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="config/config.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="security/security.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="filesystems/filesystems.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="editors/editors.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shells/shells.xml"/>
 
 </part>
Index: postlfs/security/gnutls.xml
===================================================================
--- postlfs/security/gnutls.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ postlfs/security/gnutls.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -138,5 +138,5 @@
     -->
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: postlfs/security/policykit.xml
===================================================================
--- postlfs/security/policykit.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ postlfs/security/policykit.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -106,5 +106,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: postlfs/security/polkit-gnome.xml
===================================================================
--- postlfs/security/polkit-gnome.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ postlfs/security/polkit-gnome.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -91,5 +91,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: postlfs/security/polkit.xml
===================================================================
--- postlfs/security/polkit.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ postlfs/security/polkit.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -106,5 +106,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: postlfs/security/security.xml
===================================================================
--- postlfs/security/security.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ postlfs/security/security.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -40,26 +40,26 @@
   "signatures" and compares for files that have been changed.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="openssl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnutls.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="cracklib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="linux-pam.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="iptables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="firewalling.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnupg.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnupg2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="tripwire.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="heimdal.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mitkrb.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="cyrus-sasl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="stunnel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sudo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="nss.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="policykit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="polkit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="polkit-gnome.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="consolekit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="attr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="acl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openssl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnutls.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cracklib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="linux-pam.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iptables.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="firewalling.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnupg.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnupg2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tripwire.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="heimdal.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mitkrb.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cyrus-sasl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="stunnel.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sudo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nss.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="policykit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="polkit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="polkit-gnome.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="consolekit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="attr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="acl.xml"/>
 
 </chapter>
Index: postlfs/shells/shells.xml
===================================================================
--- postlfs/shells/shells.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ postlfs/shells/shells.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -21,9 +21,9 @@
   packages compatible with these additional shell types.</para>
 
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ash.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="tcsh.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="zsh.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="dash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ksh.xml"/>
+  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ash.xml"/> -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tcsh.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="zsh.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dash.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ksh.xml"/>
 
 </chapter>
Index: pst/printing/printing.xml
===================================================================
--- pst/printing/printing.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ pst/printing/printing.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -20,12 +20,12 @@
   or paper.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="cups.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="lprng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gutenprint.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cups.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lprng.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gutenprint.xml"/>
 
   <!-- Obsolete
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="espgs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gimp-print.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="espgs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gimp-print.xml"/>
   -->
 
Index: pst/ps/ps.xml
===================================================================
--- pst/ps/ps.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ pst/ps/ps.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -20,13 +20,13 @@
   PDF files.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="a2ps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="enscript.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="psutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gsview.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xpdf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="epdfview.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="fop.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="paps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="a2ps.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="enscript.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="psutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gsview.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xpdf.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="epdfview.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fop.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="paps.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="other.xml"/>
 
 </chapter>
Index: pst/pst.xml
===================================================================
--- pst/pst.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ pst/pst.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -16,10 +16,10 @@
   <title>Printing, Scanning and Typesetting</title>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="printing/printing.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="scanning/scanning.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sgml/sgml.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xml/xml.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ps/ps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="typesetting/typesetting.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="printing/printing.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="scanning/scanning.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sgml/sgml.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xml/xml.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ps/ps.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="typesetting/typesetting.xml"/>
 
 </part>
Index: pst/scanning/scanning.xml
===================================================================
--- pst/scanning/scanning.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ pst/scanning/scanning.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -20,6 +20,6 @@
   applications.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sane.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xsane.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sane.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xsane.xml"/>
 
 </chapter>
Index: pst/sgml/sgml-dtd-3.xml
===================================================================
--- pst/sgml/sgml-dtd-3.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ pst/sgml/sgml-dtd-3.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -75,5 +75,5 @@
     <title>Installation of DocBook SGML DTD</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/use-unzip.xml"/>
 
Index: pst/sgml/sgml-dtd.xml
===================================================================
--- pst/sgml/sgml-dtd.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ pst/sgml/sgml-dtd.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -75,5 +75,5 @@
     <title>Installation of DocBook SGML DTD</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/use-unzip.xml"/>
 
Index: pst/sgml/sgml.xml
===================================================================
--- pst/sgml/sgml.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ pst/sgml/sgml.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -20,11 +20,11 @@
   and publish DocBook documents.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sgml-common.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sgml-dtd-3.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sgml-dtd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="opensp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="openjade.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="docbook-dsssl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="docbook-utils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sgml-common.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sgml-dtd-3.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sgml-dtd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="opensp.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openjade.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="docbook-dsssl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="docbook-utils.xml"/>
 
 </chapter>
Index: pst/typesetting/typesetting.xml
===================================================================
--- pst/typesetting/typesetting.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ pst/typesetting/typesetting.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -19,6 +19,6 @@
   typesetting.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="tetex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="jadetex.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tetex.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="jadetex.xml"/>
 
 </chapter>
Index: pst/xml/docbook.xml
===================================================================
--- pst/xml/docbook.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ pst/xml/docbook.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -74,5 +74,5 @@
     <title>Installation of DocBook XML DTD</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/use-unzip.xml"/>
 
Index: pst/xml/xml.xml
===================================================================
--- pst/xml/xml.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ pst/xml/xml.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -20,7 +20,7 @@
   format and publish DocBook documents.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="docbook.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="docbook-xsl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xmlto.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="docbook.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="docbook-xsl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xmlto.xml"/>
 
 </chapter>
Index: server/databases/databases.xml
===================================================================
--- server/databases/databases.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ server/databases/databases.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -22,8 +22,8 @@
   entirely possible.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="db.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mysql.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="postgresql.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sqlite.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="db.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="postgresql.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sqlite.xml"/>
 
 </chapter>
Index: server/mail/mail.xml
===================================================================
--- server/mail/mail.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ server/mail/mail.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -23,9 +23,9 @@
   server (Courier-IMAP).</para>
 
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="courier.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="exim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="postfix.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="qpopper.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sendmail.xml"/>
+  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="courier.xml"/> -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="exim.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="postfix.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qpopper.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sendmail.xml"/>
 
 </chapter>
Index: server/major/major.xml
===================================================================
--- server/major/major.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ server/major/major.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -19,12 +19,12 @@
   to users or other programs.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="apache.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bind.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="nfs-utils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="openssh.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="proftpd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="samba3.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="vsftpd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xinetd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apache.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bind.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nfs-utils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openssh.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="proftpd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="samba3.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vsftpd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xinetd.xml"/>
 
 </chapter>
Index: server/other/other.xml
===================================================================
--- server/other/other.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ server/other/other.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -23,10 +23,10 @@
   that you can analyze the risks.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="dhcp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="leafnode.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="openldap.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="rsync.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="cvsserver.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="svnserver.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhcp.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="leafnode.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openldap.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rsync.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cvsserver.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="svnserver.xml"/>
 
 </chapter>
Index: server/server.xml
===================================================================
--- server/server.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ server/server.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -16,8 +16,8 @@
   <title>Servers</title>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="major/major.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mail/mail.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="databases/databases.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other/other.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="major/major.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mail/mail.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="databases/databases.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="other/other.xml"/>
 
 </part>
Index: x/installing/installing.xml
===================================================================
--- x/installing/installing.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ x/installing/installing.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -26,22 +26,22 @@
   decided to use the <application>Xorg</application> package.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xorg7-dummy.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xorg7.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x7proto.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x7util.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libXau.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libXdmcp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x7lib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xbitmaps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x7app.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xcursorthemes.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x7font.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xkeyboard-config.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="luit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x7server.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x7driver.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xconfig-dummy.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x-setup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x-config.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xorg7-dummy.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xorg7.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7proto.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7util.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libXau.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libXdmcp.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7lib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xbitmaps.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7app.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xcursorthemes.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7font.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xkeyboard-config.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="luit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7server.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7driver.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xconfig-dummy.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x-setup.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x-config.xml"/>
 
 </chapter>
Index: x/lib/atk.xml
===================================================================
--- x/lib/atk.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ x/lib/atk.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -92,5 +92,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: x/lib/cairo.xml
===================================================================
--- x/lib/cairo.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ x/lib/cairo.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -136,5 +136,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: x/lib/goffice.xml
===================================================================
--- x/lib/goffice.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ x/lib/goffice.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -123,5 +123,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: x/lib/lib.xml
===================================================================
--- x/lib/lib.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ x/lib/lib.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -25,25 +25,25 @@
   assist programmers by supplying common elements.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="qt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="qt4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gtk+.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="cairo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="cairomm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="pango.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="pangomm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="atk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gtk+2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gtkmm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="lesstif.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="startup-notification.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libwnck.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="shared-mime-info.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="hicolor-icon-theme.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libxklavier.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="freeglut.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="goffice.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mesalib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xulrunner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="webkitgtk.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt4.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk+.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cairo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cairomm.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pango.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pangomm.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="atk.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk+2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtkmm.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lesstif.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="startup-notification.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libwnck.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shared-mime-info.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hicolor-icon-theme.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxklavier.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="freeglut.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="goffice.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mesalib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xulrunner.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkitgtk.xml"/>
 
 </chapter>
Index: x/lib/libwnck.xml
===================================================================
--- x/lib/libwnck.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ x/lib/libwnck.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -93,5 +93,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: x/lib/libxklavier.xml
===================================================================
--- x/lib/libxklavier.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ x/lib/libxklavier.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -97,5 +97,5 @@
     <filename class='directory'>/usr</filename>.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: x/lib/pango.xml
===================================================================
--- x/lib/pango.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ x/lib/pango.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -132,5 +132,5 @@
     instead of <filename class="directory">/usr/etc</filename>.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: x/lib/qt.xml
===================================================================
--- x/lib/qt.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ x/lib/qt.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -92,5 +92,5 @@
     <title>Installation of Qt</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/X11R6_symlink.xml"/>
 
Index: x/lib/webkitgtk.xml
===================================================================
--- x/lib/webkitgtk.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ x/lib/webkitgtk.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -119,5 +119,5 @@
     Web Sockets.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: x/wm/wm.xml
===================================================================
--- x/wm/wm.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ x/wm/wm.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -54,9 +54,9 @@
   </sect1>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sawfish.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="fluxbox.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="metacity.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xfce.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other-wms.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sawfish.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fluxbox.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="metacity.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfce.xml"/> -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="other-wms.xml"/>
 
 </chapter>
Index: x/x.xml
===================================================================
--- x/x.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ x/x.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -16,7 +16,7 @@
   <title>X + Window Managers</title>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="installing/installing.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="lib/lib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="wm/wm.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="installing/installing.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lib/lib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wm/wm.xml"/>
 
 </part>
Index: xsoft/graphweb/galeon.xml
===================================================================
--- xsoft/graphweb/galeon.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ xsoft/graphweb/galeon.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -110,14 +110,14 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/scrollkeeper-dir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-mandir.xml"/>
 
Index: xsoft/graphweb/graphweb.xml
===================================================================
--- xsoft/graphweb/graphweb.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ xsoft/graphweb/graphweb.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -19,9 +19,9 @@
   you can find one you enjoy using or give them each a trial run.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="seamonkey.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="firefox.xml"/>
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="galeon.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="konq.xml"/>
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="dillo.xml"/> -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="seamonkey.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="firefox.xml"/>
+  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="galeon.xml"/> -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="konq.xml"/>
+  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dillo.xml"/> -->
 
 </chapter>
Index: xsoft/office/evolution.xml
===================================================================
--- xsoft/office/evolution.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ xsoft/office/evolution.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -162,11 +162,11 @@
     -->
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/scrollkeeper-dir.xml"/>
 
Index: xsoft/office/gimp.xml
===================================================================
--- xsoft/office/gimp.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ xsoft/office/gimp.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -185,5 +185,5 @@
     <application>libtiff</application> is not installed.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
Index: xsoft/office/gnucash.xml
===================================================================
--- xsoft/office/gnucash.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ xsoft/office/gnucash.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -246,5 +246,5 @@
     to the original location.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/scrollkeeper-dir.xml"/>
 
Index: xsoft/office/gnumeric.xml
===================================================================
--- xsoft/office/gnumeric.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ xsoft/office/gnumeric.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -156,8 +156,8 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/scrollkeeper-dir.xml"/>
 
Index: xsoft/office/office.xml
===================================================================
--- xsoft/office/office.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ xsoft/office/office.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -21,9 +21,9 @@
   they excel in doing one thing and doing it well.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="abiword.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnumeric.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnucash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gimp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="evolution.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="abiword.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnumeric.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnucash.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gimp.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="evolution.xml"/>
 
 </chapter>
Index: xsoft/other/balsa.xml
===================================================================
--- xsoft/other/balsa.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ xsoft/other/balsa.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -120,11 +120,11 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/scrollkeeper-dir.xml"/>
 
Index: xsoft/other/other.xml
===================================================================
--- xsoft/other/other.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ xsoft/other/other.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -19,9 +19,9 @@
   applications that utilize other areas of the Internet.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="thunderbird.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="pan.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="balsa.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="pidgin.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xchat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="thunderbird.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pan.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="balsa.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pidgin.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xchat.xml"/>
 
 </chapter>
Index: xsoft/other/xchat.xml
===================================================================
--- xsoft/other/xchat.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ xsoft/other/xchat.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -119,5 +119,5 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
Index: xsoft/suites/koffice.xml
===================================================================
--- xsoft/suites/koffice.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ xsoft/suites/koffice.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -118,5 +118,5 @@
 make</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/kde-apidocs.xml"/>
 
Index: xsoft/suites/suites.xml
===================================================================
--- xsoft/suites/suites.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ xsoft/suites/suites.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -21,6 +21,6 @@
   applications.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="koffice.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="openoffice.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="koffice.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openoffice.xml"/>
 
 </chapter>
Index: xsoft/xsoft.xml
===================================================================
--- xsoft/xsoft.xml	(revision ea5027b960ecac298af0a55a0638eea19f8d7e13)
+++ xsoft/xsoft.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
@@ -16,8 +16,8 @@
   <title>X Software</title>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="office/office.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="suites/suites.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="graphweb/graphweb.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other/other.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="office/office.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="suites/suites.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="graphweb/graphweb.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="other/other.xml"/>
 
 </part>
