Index: general.ent
===================================================================
--- general.ent	(revision 5a2505c7efbbd0aab48a3fc731fc482f73045a54)
+++ general.ent	(revision 89c72ef401fa80d408435d3ac796abe48d6b5260)
@@ -1,3 +1,3 @@
-<!ENTITY day          "15">                   <!-- Always 2 digits -->
+<!ENTITY day          "16">                   <!-- Always 2 digits -->
 <!ENTITY month        "03">                   <!-- Always 2 digits -->
 <!ENTITY year         "2006">
@@ -566,4 +566,5 @@
 <!ENTITY udftools-version             "1.0.0b3">
 <!ENTITY dvd-rw-tools-version         "6.1">
+<!ENTITY k3b-version                  "0.12.14">
 
 <!-- Part XII -->
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 5a2505c7efbbd0aab48a3fc731fc482f73045a54)
+++ introduction/welcome/changelog.xml	(revision 89c72ef401fa80d408435d3ac796abe48d6b5260)
@@ -43,4 +43,14 @@
 
     <listitem>
+      <para>March 16th, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[randy] - Created two XInclude files to replace instances of
+          identical text in several KDE packages.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>March 15th, 2006</para>
       <itemizedlist>
@@ -123,15 +133,14 @@
 
     <listitem>
+      <para>March 4th, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Updated JDK to account for Xorg-7.0.0.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>March 3rd, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[dj] - Updated JDK to account for Xorg-7.0.0.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-
-    <listitem>
-      <para>March 2nd, 2006</para>
       <itemizedlist>
         <listitem>
Index: kde/add/kdegames.xml
===================================================================
--- kde/add/kdegames.xml	(revision 5a2505c7efbbd0aab48a3fc731fc482f73045a54)
+++ kde/add/kdegames.xml	(revision 89c72ef401fa80d408435d3ac796abe48d6b5260)
@@ -83,5 +83,5 @@
 make</userinput></screen>
 
-    <note>
+    <!-- <note>
       <para>If you wish to create the API documentation
       and you have <application>Doxygen</application> and
@@ -89,5 +89,8 @@
       apidox</command> must be done before <command>make
       install</command>.</para>
-    </note>
+    </note> -->
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/kde-apidocs.xml"/>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
Index: kde/add/kdegraphics.xml
===================================================================
--- kde/add/kdegraphics.xml	(revision 5a2505c7efbbd0aab48a3fc731fc482f73045a54)
+++ kde/add/kdegraphics.xml	(revision 89c72ef401fa80d408435d3ac796abe48d6b5260)
@@ -114,10 +114,13 @@
 make</userinput></screen>
 
-    <note>
+    <!-- <note>
       <para>If you wish to create the API documentation and you have
       <application>Doxygen</application> and <application>GraphViz</application>
       installed, <command>make apidox</command> must be done before
       <command>make install</command>.</para>
-    </note>
+    </note> -->
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/kde-apidocs.xml"/>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
Index: kde/add/kdemultimedia.xml
===================================================================
--- kde/add/kdemultimedia.xml	(revision 5a2505c7efbbd0aab48a3fc731fc482f73045a54)
+++ kde/add/kdemultimedia.xml	(revision 89c72ef401fa80d408435d3ac796abe48d6b5260)
@@ -230,8 +230,11 @@
     <para>Install <application>kdemultimedia</application> with:</para>
 
-    <note>
-      <para> The --sysconfdir parameter must be the same as command used in
+    <!-- <note>
+      <para> The -\-sysconfdir parameter must be the same as command used in
       kdelibs.</para>
-    </note>
+    </note> -->
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/kde-sysconfdir.xml"/>
 
 <screen><userinput>patch -Np1 -i ../kdemultimedia-&kde-version;-libtunepimp_0.4.x-1.patch &amp;&amp;
Index: kde/add/kdepim.xml
===================================================================
--- kde/add/kdepim.xml	(revision 5a2505c7efbbd0aab48a3fc731fc482f73045a54)
+++ kde/add/kdepim.xml	(revision 89c72ef401fa80d408435d3ac796abe48d6b5260)
@@ -102,5 +102,5 @@
 make</userinput></screen>
 
-    <note>
+    <!-- <note>
       <para>If you wish to create the API documentation and
       you have <application>Doxygen</application> and
@@ -108,5 +108,8 @@
       <command>make apidox</command> must be done before
       <command>make install</command>.</para>
-    </note>
+    </note> -->
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/kde-apidocs.xml"/>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
Index: kde/core/kdebase.xml
===================================================================
--- kde/core/kdebase.xml	(revision 5a2505c7efbbd0aab48a3fc731fc482f73045a54)
+++ kde/core/kdebase.xml	(revision 89c72ef401fa80d408435d3ac796abe48d6b5260)
@@ -113,8 +113,11 @@
     <para>Install <application>kdebase</application> with:</para>
 
-    <note>
-      <para>The <parameter>--sysconfdir</parameter> parameter must be
+    <!-- <note>
+      <para>The <parameter>-\-sysconfdir</parameter> parameter must be
       the same as the command used in <application>kdelibs</application>.</para>
-    </note>
+    </note> -->
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/kde-sysconfdir.xml"/>
 
 <screen><userinput>./configure --prefix=&kde-dir; --sysconfdir=/etc/kde \
@@ -122,10 +125,13 @@
 make</userinput></screen>
 
-    <note>
+    <!-- <note>
       <para>If you wish to create the API documentation and you have
       <application>Doxygen</application> and <application>GraphViz</application>
       installed, <command>make apidox</command> must be done before
       <command>make install</command>.</para>
-    </note>
+    </note> -->
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/kde-apidocs.xml"/>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
Index: kde/core/kdelibs.xml
===================================================================
--- kde/core/kdelibs.xml	(revision 5a2505c7efbbd0aab48a3fc731fc482f73045a54)
+++ kde/core/kdelibs.xml	(revision 89c72ef401fa80d408435d3ac796abe48d6b5260)
@@ -108,5 +108,6 @@
   </sect2>
 
-  <sect2 role="installation">
+  <sect2 role="installation" id="kdelibs-install"
+         xreflabel="the installation of kdelibs">
     <title>Installation of Kdelibs</title>
 
Index: kde/devel/kdevelop.xml
===================================================================
--- kde/devel/kdevelop.xml	(revision 5a2505c7efbbd0aab48a3fc731fc482f73045a54)
+++ kde/devel/kdevelop.xml	(revision 89c72ef401fa80d408435d3ac796abe48d6b5260)
@@ -86,5 +86,5 @@
 make</userinput></screen>
 
-    <note>
+    <!-- <note>
       <para>If you wish to create the API documentation and you have
       <application>Doxygen</application> and <application>GraphViz</application>
@@ -92,5 +92,8 @@
       <command>make install</command>. You'll also need to run <command>make
       install-apidox</command> to install the API documentation.</para>
-    </note>
+    </note> -->
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/kde-apidocs.xml"/>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
@@ -98,4 +101,8 @@
 <screen role="root"><userinput>make install &amp;&amp;
 chown -v -R root:root &kde-dir;/kdevbdb</userinput></screen>
+
+    <para>If you created the API documentation, install it with:</para>
+
+<screen role="root"><userinput>make install-apidox</userinput></screen>
 
   </sect2>
Index: xincludes/kde-apidocs.xml
===================================================================
--- xincludes/kde-apidocs.xml	(revision 89c72ef401fa80d408435d3ac796abe48d6b5260)
+++ xincludes/kde-apidocs.xml	(revision 89c72ef401fa80d408435d3ac796abe48d6b5260)
@@ -0,0 +1,11 @@
+<?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>If you wish to create the API documentation and you have
+  <application>Doxygen</application> and
+  <application>GraphViz</application> installed,
+  <command>make apidox</command> must be done before
+  <command>make install</command>.</para>
+</note>
Index: xincludes/kde-sysconfdir.xml
===================================================================
--- xincludes/kde-sysconfdir.xml	(revision 89c72ef401fa80d408435d3ac796abe48d6b5260)
+++ xincludes/kde-sysconfdir.xml	(revision 89c72ef401fa80d408435d3ac796abe48d6b5260)
@@ -0,0 +1,8 @@
+<?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 <parameter>--sysconfdir</parameter> parameter must be the
+  same as the command used in <xref linkend="kdelibs-install"/>.</para>
+</note>
