Index: basicnet/netlibs/wvstreams.xml
===================================================================
--- basicnet/netlibs/wvstreams.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
+++ basicnet/netlibs/wvstreams.xml	(revision ebabf243d99370ba7f21e94e9e2041b6529c8863)
@@ -4,16 +4,4 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-
-    <!-- Inserted as a reminder to do this. The mention of a test suite
-         is usually right before the root user installation commands. Please
-         delete these 12 (including one blank) lines after you are done.-->
-
-    <!-- Use one of the two mentions below about a test suite,
-         delete the line that is not applicable. Of course, if the
-         test suite uses syntax other than "make check", revise the
-         line to reflect the actual syntax to run the test suite -->
-
-    <!-- <para>This package does not come with a test suite.</para> -->
-    <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
 
   <!ENTITY wvstreams-download-http "http://open.nit.ca/download/wvstreams-&wvstreams-version;.tar.gz">
@@ -119,4 +107,6 @@
 <screen><userinput>make doxygen</userinput></screen>
 
+    <para>To test the results, issue: <command>make test</command>.</para>
+
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
@@ -164,5 +154,6 @@
       <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/2003/XInclude"
+      href="../../xincludes/lib-config.xml"/>
 
     </sect3>
Index: general/genlib/slang.xml
===================================================================
--- general/genlib/slang.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
+++ general/genlib/slang.xml	(revision ebabf243d99370ba7f21e94e9e2041b6529c8863)
@@ -59,5 +59,6 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="libpng"/> and <xref linkend="pcre"/></para>
+    <para role="optional"><xref linkend="libpng"/> and
+    <xref linkend="pcre"/></para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -119,5 +120,6 @@
       <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/2003/XInclude"
+      href="../../xincludes/lib-config.xml"/>
 
     </sect3>
Index: general/graphlib/libjpeg.xml
===================================================================
--- general/graphlib/libjpeg.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
+++ general/graphlib/libjpeg.xml	(revision ebabf243d99370ba7f21e94e9e2041b6529c8863)
@@ -93,5 +93,6 @@
       <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/2003/XInclude"
+      href="../../xincludes/lib-config.xml"/>
 
     </sect3>
Index: general/graphlib/libpng.xml
===================================================================
--- general/graphlib/libpng.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
+++ general/graphlib/libpng.xml	(revision ebabf243d99370ba7f21e94e9e2041b6529c8863)
@@ -111,5 +111,6 @@
       <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/2003/XInclude"
+      href="../../xincludes/lib-config.xml"/>
 
     </sect3>
Index: b-config.xml
===================================================================
--- lib-config.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" >
-
-<para>As with most libraries, there is no configuration to do, save that the
-library directory i.e., <filename class="directory">/opt/lib</filename> or
-<filename class="directory">/usr/local/lib</filename> should appear in
-<filename>/etc/ld.so.conf</filename> so that <command>ldd</command> can find
-the shared libraries.  After checking that this is the case,
-<command>/sbin/ldconfig</command> should be run while logged in as
-<systemitem class="username">root</systemitem>.</para>
Index: multimedia/audioutils/cdparanoia.xml
===================================================================
--- multimedia/audioutils/cdparanoia.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
+++ multimedia/audioutils/cdparanoia.xml	(revision ebabf243d99370ba7f21e94e9e2041b6529c8863)
@@ -97,5 +97,6 @@
       <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/2003/XInclude"
+      href="../../xincludes/lib-config.xml"/>
 
     </sect3>
Index: multimedia/libdriv/alsa-oss.xml
===================================================================
--- multimedia/libdriv/alsa-oss.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
+++ multimedia/libdriv/alsa-oss.xml	(revision ebabf243d99370ba7f21e94e9e2041b6529c8863)
@@ -89,5 +89,6 @@
       <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/2003/XInclude"
+      href="../../xincludes/lib-config.xml"/>
 
     </sect3>
Index: multimedia/libdriv/sdl.xml
===================================================================
--- multimedia/libdriv/sdl.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
+++ multimedia/libdriv/sdl.xml	(revision ebabf243d99370ba7f21e94e9e2041b6529c8863)
@@ -4,16 +4,4 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-
-    <!-- Inserted as a reminder to do this. The mention of a test suite
-         is usually right before the root user installation commands. Please
-         delete these 12 (including one blank) lines after you are done.-->
-
-    <!-- Use one of the two mentions below about a test suite,
-         delete the line that is not applicable. Of course, if the
-         test suite uses syntax other than "make check", revise the
-         line to reflect the actual syntax to run the test suite -->
-
-    <!-- <para>This package does not come with a test suite.</para> -->
-    <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
 
   <!ENTITY sdl-download-http "http://www.libsdl.org/release/SDL-&sdl-version;.tar.gz">
@@ -153,5 +141,6 @@
       <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/2003/XInclude"
+      href="../../xincludes/lib-config.xml"/>
 
     </sect3>
Index: pst/sgml/sgml-dtd-3.xml
===================================================================
--- pst/sgml/sgml-dtd-3.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
+++ pst/sgml/sgml-dtd-3.xml	(revision ebabf243d99370ba7f21e94e9e2041b6529c8863)
@@ -74,5 +74,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../use-unzip.xml"/>
+    href="../../xincludes/use-unzip.xml"/>
 
     <para>Install <application>DocBook SGML DTD</application> by running
Index: pst/sgml/sgml-dtd.xml
===================================================================
--- pst/sgml/sgml-dtd.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
+++ pst/sgml/sgml-dtd.xml	(revision ebabf243d99370ba7f21e94e9e2041b6529c8863)
@@ -74,5 +74,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../use-unzip.xml"/>
+    href="../../xincludes/use-unzip.xml"/>
 
     <para>Install <application>DocBook SGML DTD</application> by running
Index: pst/xml/docbook.xml
===================================================================
--- pst/xml/docbook.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
+++ pst/xml/docbook.xml	(revision ebabf243d99370ba7f21e94e9e2041b6529c8863)
@@ -4,16 +4,4 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-
-    <!-- Inserted as a reminder to do this. The mention of a test suite
-         is usually right before the root user installation commands. Please
-         delete these 12 (including one blank) lines after you are done.-->
-
-    <!-- Use one of the two mentions below about a test suite,
-         delete the line that is not applicable. Of course, if the
-         test suite uses syntax other than "make check", revise the
-         line to reflect the actual syntax to run the test suite -->
-
-    <!-- <para>This package does not come with a test suite.</para> -->
-    <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
 
   <!ENTITY DocBook-download-http "http://www.docbook.org/xml/&DocBook-version;/docbook-xml-&DocBook-version;.zip">
@@ -85,5 +73,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../use-unzip.xml"/>
+    href="../../xincludes/use-unzip.xml"/>
 
     <para>Install <application>DocBook XML DTD</application> by running the
Index: e-unzip.xml
===================================================================
--- use-unzip.xml	(revision 551b93899a928215226a0b6ab0b347c794d29983)
+++ 	(revision )
@@ -1,10 +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" >
-
-<note>
-  <para>The package source is distributed in <filename>zip</filename>
-  format and requires <command>unzip</command>. You should create a directory
-  and change to that directory before unzipping the file to
-  ease the removal of the source files after the package has been installed.</para>
-</note>
Index: xincludes/lib-config.xml
===================================================================
--- xincludes/lib-config.xml	(revision ebabf243d99370ba7f21e94e9e2041b6529c8863)
+++ xincludes/lib-config.xml	(revision ebabf243d99370ba7f21e94e9e2041b6529c8863)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" >
+
+<!-- $LastChangedBy$
+     $Date$ -->
+
+<para>As with most libraries, there is no configuration to do, save that the
+library directory, i.e., <filename class="directory">/opt/lib</filename> or
+<filename class="directory">/usr/local/lib</filename> should appear in
+<filename>/etc/ld.so.conf</filename> so that <command>ldd</command> can find
+the shared libraries.  After checking that this is the case,
+<command>/sbin/ldconfig</command> should be run while logged in as
+<systemitem class="username">root</systemitem>.</para>
Index: xincludes/use-unzip.xml
===================================================================
--- xincludes/use-unzip.xml	(revision ebabf243d99370ba7f21e94e9e2041b6529c8863)
+++ xincludes/use-unzip.xml	(revision ebabf243d99370ba7f21e94e9e2041b6529c8863)
@@ -0,0 +1,13 @@
+<?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 package source is distributed in <filename>zip</filename>
+  format and requires <command>unzip</command>. You should create a directory
+  and change to that directory before unzipping the file to
+  ease the removal of the source files after the package has been installed.</para>
+</note>
