Index: gnome/add/gnome-audio.xml
===================================================================
--- gnome/add/gnome-audio.xml	(revision 2ddb3bd717a0db18efd22a92946b70018777182d)
+++ gnome/add/gnome-audio.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
@@ -67,5 +67,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../without-gnome.xml"/>
+    href="../../xincludes/without-gnome.xml"/>
 
     <para>Install <application>gnome-audio</application> by running the
Index: gnome/add/gtksourceview.xml
===================================================================
--- gnome/add/gtksourceview.xml	(revision 2ddb3bd717a0db18efd22a92946b70018777182d)
+++ gnome/add/gtksourceview.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
@@ -97,5 +97,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-prefix.xml"/>
+    href="../../xincludes/gnome-prefix.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: gnome/add/gucharmap.xml
===================================================================
--- gnome/add/gucharmap.xml	(revision 2ddb3bd717a0db18efd22a92946b70018777182d)
+++ gnome/add/gucharmap.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
@@ -78,5 +78,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../without-gnome.xml"/>
+    href="../../xincludes/without-gnome.xml"/>
 
     <para>Install <application>gucharmap</application> by running the following
Index: gnome/add/libgnomecups.xml
===================================================================
--- gnome/add/libgnomecups.xml	(revision 2ddb3bd717a0db18efd22a92946b70018777182d)
+++ gnome/add/libgnomecups.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
@@ -77,5 +77,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../without-gnome.xml"/>
+    href="../../xincludes/without-gnome.xml"/>
 
     <para>Install <application>libgnomecups</application> by running the following
Index: gnome/add/libgnomeprint.xml
===================================================================
--- gnome/add/libgnomeprint.xml	(revision 2ddb3bd717a0db18efd22a92946b70018777182d)
+++ gnome/add/libgnomeprint.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
@@ -83,5 +83,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../without-gnome.xml"/>
+    href="../../xincludes/without-gnome.xml"/>
 
     <para>Install <application>libgnomeprint</application> by running the
Index: gnome/add/libgnomeprintui.xml
===================================================================
--- gnome/add/libgnomeprintui.xml	(revision 2ddb3bd717a0db18efd22a92946b70018777182d)
+++ gnome/add/libgnomeprintui.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
@@ -75,5 +75,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../without-gnome.xml"/>
+    href="../../xincludes/without-gnome.xml"/>
 
     <para>Install <application>libgnomeprintui</application> by running the
Index: gnome/add/system-tools-backends.xml
===================================================================
--- gnome/add/system-tools-backends.xml	(revision 2ddb3bd717a0db18efd22a92946b70018777182d)
+++ gnome/add/system-tools-backends.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
@@ -75,5 +75,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../without-gnome.xml"/>
+    href="../../xincludes/without-gnome.xml"/>
 
     <para>Install <application>system-tools-backends</application> by running
Index: gnome/core/control-center.xml
===================================================================
--- gnome/core/control-center.xml	(revision 2ddb3bd717a0db18efd22a92946b70018777182d)
+++ gnome/core/control-center.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
@@ -107,8 +107,8 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-prefix.xml"/>
+    href="../../xincludes/gnome-prefix.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-sysconfdir.xml"/>
+    href="../../xincludes/gnome-sysconfdir.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: gnome/core/eel.xml
===================================================================
--- gnome/core/eel.xml	(revision 2ddb3bd717a0db18efd22a92946b70018777182d)
+++ gnome/core/eel.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
@@ -92,5 +92,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-prefix.xml"/>
+    href="../../xincludes/gnome-prefix.xml"/>
 
   </sect2>
Index: gnome/core/gail.xml
===================================================================
--- gnome/core/gail.xml	(revision 2ddb3bd717a0db18efd22a92946b70018777182d)
+++ gnome/core/gail.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
@@ -73,5 +73,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../without-gnome.xml"/>
+    href="../../xincludes/without-gnome.xml"/>
 
     <para>Install <application>GAIL</application> by running
@@ -104,5 +104,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-prefix.xml"/>
+    href="../../xincludes/gnome-prefix.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: gnome/core/gconf.xml
===================================================================
--- gnome/core/gconf.xml	(revision 2ddb3bd717a0db18efd22a92946b70018777182d)
+++ gnome/core/gconf.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
@@ -99,5 +99,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-prefix.xml"/>
+    href="../../xincludes/gnome-prefix.xml"/>
 
     <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This parameter
@@ -118,5 +118,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-mandir.xml"/>
+    href="../../xincludes/gnome-mandir.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: gnome/core/gnome-applets.xml
===================================================================
--- gnome/core/gnome-applets.xml	(revision 2ddb3bd717a0db18efd22a92946b70018777182d)
+++ gnome/core/gnome-applets.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
@@ -106,8 +106,8 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-prefix.xml"/>
+    href="../../xincludes/gnome-prefix.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-sysconfdir.xml"/>
+    href="../../xincludes/gnome-sysconfdir.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -122,5 +122,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-mandir.xml"/>
+    href="../../xincludes/gnome-mandir.xml"/>
 
     <para><command>make -C man install-man</command>: This command installs
Index: gnome/core/gnome-backgrounds.xml
===================================================================
--- gnome/core/gnome-backgrounds.xml	(revision 2ddb3bd717a0db18efd22a92946b70018777182d)
+++ gnome/core/gnome-backgrounds.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
@@ -75,5 +75,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../without-gnome.xml"/>
+    href="../../xincludes/without-gnome.xml"/>
 
     <para>Install <application>gnome-backgrounds</application> by running the
@@ -95,5 +95,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-prefix.xml"/>
+    href="../../xincludes/gnome-prefix.xml"/>
 
   </sect2>
Index: gnome/core/gnome-desktop.xml
===================================================================
--- gnome/core/gnome-desktop.xml	(revision 2ddb3bd717a0db18efd22a92946b70018777182d)
+++ gnome/core/gnome-desktop.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
@@ -96,8 +96,8 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-prefix.xml"/>
+    href="../../xincludes/gnome-prefix.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-sysconfdir.xml"/>
+    href="../../xincludes/gnome-sysconfdir.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -113,5 +113,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-mandir.xml"/>
+    href="../../xincludes/gnome-mandir.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: gnome/core/gnome-doc-utils.xml
===================================================================
--- gnome/core/gnome-doc-utils.xml	(revision 2ddb3bd717a0db18efd22a92946b70018777182d)
+++ gnome/core/gnome-doc-utils.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
@@ -88,5 +88,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../without-gnome.xml"/>
+    href="../../xincludes/without-gnome.xml"/>
 
     <para>Install <application>GNOME Doc Utils</application>
@@ -110,8 +110,8 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-prefix.xml"/>
+    href="../../xincludes/gnome-prefix.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-mandir.xml"/>
+    href="../../xincludes/gnome-mandir.xml"/>
 
   </sect2>
Index: gnome/core/gnome-keyring.xml
===================================================================
--- gnome/core/gnome-keyring.xml	(revision 2ddb3bd717a0db18efd22a92946b70018777182d)
+++ gnome/core/gnome-keyring.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
@@ -69,5 +69,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../without-gnome.xml"/>
+    href="../../xincludes/without-gnome.xml"/>
 
     <para>Install <application>gnome-keyring</application> by running the
@@ -95,5 +95,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-prefix.xml"/>
+    href="../../xincludes/gnome-prefix.xml"/>
 
     <para><parameter>--libexecdir=$(pkg-config --variable=prefix
Index: gnome/core/gnome-menus.xml
===================================================================
--- gnome/core/gnome-menus.xml	(revision 2ddb3bd717a0db18efd22a92946b70018777182d)
+++ gnome/core/gnome-menus.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
@@ -80,5 +80,5 @@
 
      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-     href="../without-gnome.xml"/>
+     href="../../xincludes/without-gnome.xml"/>
 
     <para>Install <application>gnome-menus</application> by running the
@@ -101,8 +101,8 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-prefix.xml"/>
+    href="../../xincludes/gnome-prefix.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-sysconfdir.xml"/>
+    href="../../xincludes/gnome-sysconfdir.xml"/>
 
   </sect2>
Index: gnome/core/gnome-mime-data.xml
===================================================================
--- gnome/core/gnome-mime-data.xml	(revision 2ddb3bd717a0db18efd22a92946b70018777182d)
+++ gnome/core/gnome-mime-data.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
@@ -70,5 +70,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../without-gnome.xml"/>
+    href="../../xincludes/without-gnome.xml"/>
 
     <para>Install <application>GNOME MIME Data</application> by running
@@ -96,11 +96,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-prefix.xml"/>
+    href="../../xincludes/gnome-prefix.xml"/>
     
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-sysconfdir.xml"/>
+    href="../../xincludes/gnome-sysconfdir.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-mandir.xml"/>
+    href="../../xincludes/gnome-mandir.xml"/>
 
   </sect2>
Index: gnome/core/gnome-panel.xml
===================================================================
--- gnome/core/gnome-panel.xml	(revision 2ddb3bd717a0db18efd22a92946b70018777182d)
+++ gnome/core/gnome-panel.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
@@ -101,8 +101,8 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-prefix.xml"/>
+    href="../../xincludes/gnome-prefix.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-sysconfdir.xml"/>
+    href="../../xincludes/gnome-sysconfdir.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -117,5 +117,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-mandir.xml"/>
+    href="../../xincludes/gnome-mandir.xml"/>
     
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: gnome/core/gnome-session.xml
===================================================================
--- gnome/core/gnome-session.xml	(revision 2ddb3bd717a0db18efd22a92946b70018777182d)
+++ gnome/core/gnome-session.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
@@ -94,11 +94,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-prefix.xml"/>
+    href="../../xincludes/gnome-prefix.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-sysconfdir.xml"/>
+    href="../../xincludes/gnome-sysconfdir.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-mandir.xml"/>
+    href="../../xincludes/gnome-mandir.xml"/>
 
   </sect2>
Index: gnome/core/gnome-terminal.xml
===================================================================
--- gnome/core/gnome-terminal.xml	(revision 2ddb3bd717a0db18efd22a92946b70018777182d)
+++ gnome/core/gnome-terminal.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
@@ -91,8 +91,8 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-prefix.xml"/>
+    href="../../xincludes/gnome-prefix.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-sysconfdir.xml"/>
+    href="../../xincludes/gnome-sysconfdir.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: gnome/core/gnome-user-docs.xml
===================================================================
--- gnome/core/gnome-user-docs.xml	(revision 2ddb3bd717a0db18efd22a92946b70018777182d)
+++ gnome/core/gnome-user-docs.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
@@ -71,5 +71,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../without-gnome.xml"/>
+    href="../../xincludes/without-gnome.xml"/>
 
     <para>Install <application>GNOME User Docs</application>
@@ -92,5 +92,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-prefix.xml"/>
+    href="../../xincludes/gnome-prefix.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: gnome/core/gnome-vfs.xml
===================================================================
--- gnome/core/gnome-vfs.xml	(revision 2ddb3bd717a0db18efd22a92946b70018777182d)
+++ gnome/core/gnome-vfs.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
@@ -119,8 +119,8 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-prefix.xml"/>
+    href="../../xincludes/gnome-prefix.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-sysconfdir.xml"/>
+    href="../../xincludes/gnome-sysconfdir.xml"/>
 
     <para><parameter>--libexecdir=$(pkg-config --variable=prefix
Index: gnome/core/libbonobo.xml
===================================================================
--- gnome/core/libbonobo.xml	(revision 2ddb3bd717a0db18efd22a92946b70018777182d)
+++ gnome/core/libbonobo.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
@@ -99,8 +99,8 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-prefix.xml"/>
+    href="../../xincludes/gnome-prefix.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-sysconfdir.xml"/>
+    href="../../xincludes/gnome-sysconfdir.xml"/>
 
     <para><parameter>--libexecdir=$(pkg-config --variable=prefix
@@ -111,5 +111,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-mandir.xml"/>
+    href="../../xincludes/gnome-mandir.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: gnome/core/libbonoboui.xml
===================================================================
--- gnome/core/libbonoboui.xml	(revision 2ddb3bd717a0db18efd22a92946b70018777182d)
+++ gnome/core/libbonoboui.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
@@ -94,5 +94,5 @@
     
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-prefix.xml"/>
+    href="../../xincludes/gnome-prefix.xml"/>
     
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: gnome/core/libgnome.xml
===================================================================
--- gnome/core/libgnome.xml	(revision 2ddb3bd717a0db18efd22a92946b70018777182d)
+++ gnome/core/libgnome.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
@@ -95,8 +95,8 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-prefix.xml"/>
+    href="../../xincludes/gnome-prefix.xml"/>
     
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-sysconfdir.xml"/>
+    href="../../xincludes/gnome-sysconfdir.xml"/>
 
     <para><parameter>--localstatedir=/var/lib</parameter>: This
@@ -109,5 +109,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-mandir.xml"/>
+    href="../../xincludes/gnome-mandir.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: gnome/core/libgnomecanvas.xml
===================================================================
--- gnome/core/libgnomecanvas.xml	(revision 2ddb3bd717a0db18efd22a92946b70018777182d)
+++ gnome/core/libgnomecanvas.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
@@ -75,5 +75,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../without-gnome.xml"/>
+    href="../../xincludes/without-gnome.xml"/>
 
     <para>Install <application>libgnomecanvas</application> by running the
@@ -95,5 +95,5 @@
     
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-prefix.xml"/>
+    href="../../xincludes/gnome-prefix.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: gnome/core/libgnomeui.xml
===================================================================
--- gnome/core/libgnomeui.xml	(revision 2ddb3bd717a0db18efd22a92946b70018777182d)
+++ gnome/core/libgnomeui.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
@@ -103,5 +103,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-prefix.xml"/>
+    href="../../xincludes/gnome-prefix.xml"/>
 
     <para><parameter>--libexecdir=$(pkg-config --variable=prefix
Index: gnome/core/libgtop.xml
===================================================================
--- gnome/core/libgtop.xml	(revision 2ddb3bd717a0db18efd22a92946b70018777182d)
+++ gnome/core/libgtop.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
@@ -74,5 +74,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../without-gnome.xml"/>
+    href="../../xincludes/without-gnome.xml"/>
 
     <para>Install <application>LibGTop</application> by running the following
@@ -106,5 +106,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-prefix.xml"/>
+    href="../../xincludes/gnome-prefix.xml"/>
 
     <para><parameter>--infodir=$(pkg-config --variable=prefix
Index: gnome/core/nautilus.xml
===================================================================
--- gnome/core/nautilus.xml	(revision 2ddb3bd717a0db18efd22a92946b70018777182d)
+++ gnome/core/nautilus.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
@@ -105,8 +105,8 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-prefix.xml"/>
+    href="../../xincludes/gnome-prefix.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-sysconfdir.xml"/>
+    href="../../xincludes/gnome-sysconfdir.xml"/>
 
   </sect2>
Index: gnome/core/orbit2.xml
===================================================================
--- gnome/core/orbit2.xml	(revision 2ddb3bd717a0db18efd22a92946b70018777182d)
+++ gnome/core/orbit2.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
@@ -99,5 +99,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-sysconfdir.xml"/>
+    href="../../xincludes/gnome-sysconfdir.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: gnome/core/yelp.xml
===================================================================
--- gnome/core/yelp.xml	(revision 2ddb3bd717a0db18efd22a92946b70018777182d)
+++ gnome/core/yelp.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
@@ -111,8 +111,8 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-prefix.xml"/>
+    href="../../xincludes/gnome-prefix.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../gnome-sysconfdir.xml"/>
+    href="../../xincludes/gnome-sysconfdir.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: ome/gnome-mandir.xml
===================================================================
--- gnome/gnome-mandir.xml	(revision 2ddb3bd717a0db18efd22a92946b70018777182d)
+++ 	(revision )
@@ -1,16 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-    <!-- $LastChangedBy$
-         $Date$ -->
-
-    <para><parameter>--mandir=$(pkg-config --variable=prefix
-    ORBit-2.0)/share/man</parameter>: This parameter causes the
-    <filename>man.(X)</filename> files to be installed in
-    <filename class="directory">$GNOME_PREFIX/share/man/man(X)</filename>
-    instead of
-    <filename class="directory">$GNOME_PREFIX/man/man(X)</filename>.</para>
Index: ome/gnome-prefix.xml
===================================================================
--- gnome/gnome-prefix.xml	(revision 2ddb3bd717a0db18efd22a92946b70018777182d)
+++ 	(revision )
@@ -1,12 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" >
-
-    <!-- $LastChangedBy$
-         $Date$ -->
-
-    <para><parameter>--prefix=$(pkg-config --variable=prefix
-    ORBit-2.0)</parameter>: Setting the prefix using this parameter instead of
-    with <envar>$GNOME_PREFIX</envar> will ensure that the prefix is
-    consistent with the installation environment and the package will be
-    installed in the correct location.</para>
Index: ome/gnome-sysconfdir.xml
===================================================================
--- gnome/gnome-sysconfdir.xml	(revision 2ddb3bd717a0db18efd22a92946b70018777182d)
+++ 	(revision )
@@ -1,16 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-    <!-- $LastChangedBy$
-         $Date$ -->
-
-    <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This parameter
-    causes the configuration files to be installed in
-    <filename class="directory">&gnome-etc-dir;</filename> instead of
-    <filename class="directory">$GNOME_PREFIX/etc</filename>. Additionally
-    (if applicable), the parameter ensures that the
-    <application>GConf</application>-2 database is correctly updated.</para>
Index: ome/without-gnome.xml
===================================================================
--- gnome/without-gnome.xml	(revision 2ddb3bd717a0db18efd22a92946b70018777182d)
+++ 	(revision )
@@ -1,15 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" >
-
-    <!-- $LastChangedBy$
-         $Date$ -->
-
-<note>
-  <para>The instructions below are based on installing the package into a
-  GNOME-2 environment. If, for whatever reason, you're installing this package
-  without having <application>ORBit2</application> and the core GNOME-2
-  libraries installed, you'll need to modify the <option>--prefix=</option>
-  parameter on the <command>configure</command> script to point to your desired
-  installation path (e.g., <option>--prefix=/usr</option>).</para>
-</note>
Index: xincludes/gnome-mandir.xml
===================================================================
--- xincludes/gnome-mandir.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
+++ xincludes/gnome-mandir.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+    <!-- $LastChangedBy$
+         $Date$ -->
+
+    <para><parameter>--mandir=$(pkg-config --variable=prefix
+    ORBit-2.0)/share/man</parameter>: This parameter causes the
+    <filename>man.(X)</filename> files to be installed in
+    <filename class="directory">$GNOME_PREFIX/share/man/man(X)</filename>
+    instead of
+    <filename class="directory">$GNOME_PREFIX/man/man(X)</filename>.</para>
Index: xincludes/gnome-prefix.xml
===================================================================
--- xincludes/gnome-prefix.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
+++ xincludes/gnome-prefix.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" >
+
+    <!-- $LastChangedBy$
+         $Date$ -->
+
+    <para><parameter>--prefix=$(pkg-config --variable=prefix
+    ORBit-2.0)</parameter>: Setting the prefix using this parameter instead of
+    with <envar>$GNOME_PREFIX</envar> will ensure that the prefix is
+    consistent with the installation environment and the package will be
+    installed in the correct location.</para>
Index: xincludes/gnome-sysconfdir.xml
===================================================================
--- xincludes/gnome-sysconfdir.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
+++ xincludes/gnome-sysconfdir.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+    <!-- $LastChangedBy$
+         $Date$ -->
+
+    <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This parameter
+    causes the configuration files to be installed in
+    <filename class="directory">&gnome-etc-dir;</filename> instead of
+    <filename class="directory">$GNOME_PREFIX/etc</filename>. Additionally
+    (if applicable), the parameter ensures that the
+    <application>GConf</application>-2 database is correctly updated.</para>
Index: xincludes/without-gnome.xml
===================================================================
--- xincludes/without-gnome.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
+++ xincludes/without-gnome.xml	(revision 7cdaed07ac39ab8fdb17c817cef4f5048cbf91e8)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" >
+
+    <!-- $LastChangedBy$
+         $Date$ -->
+
+<note>
+  <para>The instructions below are based on installing the package into a
+  GNOME-2 environment. If, for whatever reason, you're installing this package
+  without having <application>ORBit2</application> and the core GNOME-2
+  libraries installed, you'll need to modify the <option>--prefix=</option>
+  parameter on the <command>configure</command> script to point to your desired
+  installation path (e.g., <option>--prefix=/usr</option>).</para>
+</note>
