Updating docbook sources for the new processing system.

All files now use xi:include to include external files, this mechanism
replaces the entity based inclusion mechanism. It is no longer necessary
to define a new SGML entity to include an external file. External XML
files can be included with:
  <xi:include href="filename.xml"/>

External data files (i.e. files that should not be parsed by the XML
parser) can be included with:
  <xi:include href="cfg_file.txt" parse="text"/>

The toplevel element of all docbook documents that use the inclusion
mechanism described above must have the following attribute:
  xmlns:xi="http://www.w3.org/2001/XIinclude"

XML files included with XInclude must be complete, that means we need to
add the XML header and DOCTYPE to all documents that did not have such
header before (typically docbook files included into other docbook
files).

And finally, all files include the merged entity file in
docbok/entities.xml, this file contains SGML entities from both SER and
kamailio.

modules/auth_radius/doc/auth_radius.xml

@@ -2,16 +2,13 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-<!ENTITY admin SYSTEM "auth_radius_admin.xml">
-<!ENTITY faq SYSTEM "../../../doc/module_faq.xml">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
 	<bookinfo>
 	<title>Auth_radius Module</title>
 	<authorgroup>
@@ -65,7 +62,5 @@
 	</bookinfo>
 	<toc></toc>
 	
-	&admin;
-	&faq;
-
+	<xi:include href="auth_radius_admin.xml"/>
 </book>

modules/auth_radius/doc/auth_radius_admin.xml

@@ -1,4 +1,11 @@
-<!-- Auth_radius Module User's Guide -->
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+]>
 
 <chapter>
 	
@@ -316,4 +323,3 @@ if (!radius_proxy_authorize("$pd", "$pU")) { # Realm and URI user are taken
 	</section>
 	</section>
 </chapter>
-

modules/carrierroute/doc/carrierroute.xml

@@ -2,18 +2,12 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-
-<!ENTITY admin SYSTEM "carrierroute_admin.xml">
-<!ENTITY db SYSTEM "carrierroute_db.xml">
-<!ENTITY faq SYSTEM "../../../doc/module_faq.xml">
-
-<!-- Include general Kamailio documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
 	<bookinfo>
 	<title>carrierroute</title>
 	<productname class="trade">&kamailioname;</productname>
@@ -58,9 +52,7 @@
 	</revhistory>
 	</bookinfo>
 	<toc></toc>
-	
-	&admin;
-	&db;
-	&faq;
-	
+
+	<xi:include href="carrierroute_admin.xml"/>
+	<xi:include href="carrierroute_db.xml"/>
 </book>

modules/carrierroute/doc/carrierroute_admin.xml

@@ -1,4 +1,11 @@
-<!-- Module User's Guide -->
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
 
 <chapter>
     <title>&adminguide;</title>

modules/carrierroute/doc/carrierroute_db.xml

@@ -1,3 +1,12 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
+
 <!--
 WARNING:
 This file was autogenerated from the XML source file

modules/db_berkeley/doc/db_berkeley.xml

@@ -2,17 +2,13 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-
-<!ENTITY admin SYSTEM "db_berkeley_admin.xml">
-<!ENTITY faq SYSTEM "../../../doc/module_faq.xml">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
     <bookinfo>
 	<title>Berkeley DB Module</title>
 	<productname class="trade">&kamailioname;</productname>
@@ -49,7 +45,5 @@
     </bookinfo>
     <toc></toc>
     
-    &admin;
-    &faq;
-    
+	<xi:include href="db_berkeley_admin.xml"/>
 </book>

modules/db_berkeley/doc/db_berkeley_admin.xml

@@ -1,4 +1,12 @@
-<!-- Module User's Guide -->
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
 
 <chapter>
 	

modules/db_berkeley/km_doc/db_berkeley.xml

@@ -2,17 +2,13 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-
-<!ENTITY admin SYSTEM "db_berkeley_admin.xml">
-<!ENTITY faq SYSTEM "../../../doc/module_faq.xml">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
     <bookinfo>
 	<title>Berkeley DB Module</title>
 	<productname class="trade">&kamailioname;</productname>
@@ -48,8 +44,6 @@
 	</revhistory>
     </bookinfo>
     <toc></toc>
-    
-    &admin;
-    &faq;
-    
+
+	<xi:include href="db_berkeley_admin.xml"/>
 </book>

modules/db_berkeley/km_doc/db_berkeley_admin.xml

@@ -1,4 +1,12 @@
-<!-- Module User's Guide -->
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
 
 <chapter>
 	

modules/db_flatstore/km_doc/db_flatstore.xml

@@ -2,18 +2,13 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-
-<!ENTITY admin SYSTEM "db_flatstore_admin.xml">
-<!ENTITY devel SYSTEM "db_flatstore_devel.xml">
-<!ENTITY faq SYSTEM "../../../doc/module_faq.xml">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
 	<bookinfo>
 	<title>Flatstore Module</title>
 	<productname class="trade">&kamailioname;</productname>
@@ -48,8 +43,6 @@
 	</bookinfo>
 	<toc></toc>
 	
-	&admin;
-	&devel;
-	&faq;
-	
+	<xi:include href="db_flatstore_admin.xml"/>
+	<xi:include href="db_flatstore_devel.xml"/>
 </book>

modules/db_flatstore/km_doc/db_flatstore_admin.xml

@@ -1,3 +1,13 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
+
 <!-- Module User's Guide -->
 
 <chapter>

modules/db_flatstore/km_doc/db_flatstore_devel.xml

@@ -1,3 +1,13 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
+
 <!-- Module Developer's Guide -->
 
 <chapter>

modules/db_mysql/km_doc/db_mysql.xml

@@ -2,17 +2,13 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-
-<!ENTITY admin SYSTEM "db_mysql_admin.xml">
-<!ENTITY faq SYSTEM "../../../doc/module_faq.xml">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
     <bookinfo>
 	<title>mysql Module</title>
 	<productname class="trade">&kamailioname;</productname>
@@ -35,7 +31,5 @@
     </bookinfo>
     <toc></toc>
     
-    &admin;
-    &faq;
-    
+	<xi:include href="db_mysql_admin.xml"/>
 </book>

modules/db_mysql/km_doc/db_mysql_admin.xml

@@ -1,3 +1,13 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
+
 <!-- Module User's Guide -->
 
 <chapter>

modules/db_postgres/km_doc/db_postgres.xml

@@ -2,17 +2,13 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-
-<!ENTITY admin SYSTEM "db_postgres_admin.xml">
-<!ENTITY faq SYSTEM "../../../doc/module_faq.xml">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
     <bookinfo>
 	<title>postgres Module</title>
 	<productname class="trade">&kamailioname;</productname>
@@ -45,8 +41,6 @@
 	</revhistory>
     </bookinfo>
     <toc></toc>
-    
-    &admin;
-    &faq;
-    
+
+	<xi:include href="db_postgres_admin.xml"/>
 </book>

modules/db_postgres/km_doc/db_postgres_admin.xml

@@ -1,3 +1,13 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
+
 <!-- Module User's Guide -->
 
 <chapter>

modules/dialplan/doc/dialplan.xml

@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding='ISO-8859-1'?>
-<!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook V4.2//EN"
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-
-<!ENTITY admin SYSTEM "dialplan_admin.xml">
-<!ENTITY devel SYSTEM "dialplan_devel.xml">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
 	<bookinfo>
 	<title>dialplan Module</title>
 	<productname class="trade">&kamailioname;</productname>
@@ -58,7 +54,6 @@
 	</bookinfo>
 	<toc></toc>
 	
-	&admin;
-	&devel;
-	
+	<xi:include href="dialplan_admin.xml"/>
+	<xi:include href="dialplan_devel.xml"/>
 </book>

modules/dialplan/doc/dialplan_admin.xml

@@ -1,3 +1,13 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
+
 <!-- Module User's Guide -->
 
 <chapter>

modules/dialplan/doc/dialplan_devel.xml

@@ -1,3 +1,13 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
+
 <!-- Module Developer's Guide -->
 
 <chapter>

modules/enum/doc/enum.xml

@@ -2,16 +2,13 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-<!ENTITY admin SYSTEM "enum_admin.xml">
-<!ENTITY faq SYSTEM "../../../doc/module_faq.xml">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
     <bookinfo>
 	<title>Enum Module</title>
 	<authorgroup>
@@ -40,7 +37,5 @@
     </bookinfo>
     <toc></toc>
     
-    &admin;
-    &faq;
-
+	<xi:include href="enum_admin.xml"/>
 </book>

modules/enum/doc/enum_admin.xml

@@ -1,3 +1,13 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
+
 <!-- Enum Module User's Guide -->
 
 <chapter>

modules/mediaproxy/doc/mediaproxy.xml

@@ -2,16 +2,13 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-<!ENTITY admin SYSTEM "mediaproxy_admin.xml">
-<!ENTITY faq SYSTEM "../../../doc/module_faq.xml">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
   <bookinfo>
   <title>Mediaproxy Module</title>
   <authorgroup>
@@ -39,7 +36,5 @@
   </bookinfo>
   <toc></toc>
 
-  &admin;
-  &faq;
-
+  <xi:include href="mediaproxy_admin.xml"/>
 </book>

modules/mediaproxy/doc/mediaproxy_admin.xml

@@ -1,3 +1,13 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
+
 <!-- Module User's Guide -->
 
 <chapter>

modules/misc_radius/doc/misc_radius.xml

@@ -2,16 +2,13 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-<!ENTITY admin SYSTEM "misc_radius_admin.xml">
-<!ENTITY faq SYSTEM "../../../doc/module_faq.xml">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
 	<bookinfo>
 	<title>misc_radius Module</title>
 	<authorgroup>
@@ -39,7 +36,5 @@
 	</bookinfo>
 	<toc></toc>
 	
-	&admin;
-	&faq;
-
+	<xi:include href="misc_radius_admin.xml"/>
 </book>

modules/misc_radius/doc/misc_radius_admin.xml

@@ -1,3 +1,14 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
+
+
 <!-- misc_radius Module User's Guide -->
 
 <chapter>

modules/peering/doc/peering.xml

@@ -2,16 +2,13 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-<!ENTITY admin SYSTEM "peering_admin.xml">
-<!ENTITY faq SYSTEM "../../../doc/module_faq.xml">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
     <bookinfo>
 	<title>Peering Module</title>
 	<authorgroup>
@@ -38,8 +35,7 @@
 	</revhistory>
     </bookinfo>
     <toc></toc>
-    
-    &admin;
-    &faq;
+
+	<xi:include href="peering_admin.xml"/>
 
 </book>

modules/peering/doc/peering_admin.xml

@@ -1,3 +1,13 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
+
 <!-- Peering Module User's Guide -->
 
 <chapter>

modules_k/acc/doc/acc.xml

@@ -2,16 +2,13 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-<!ENTITY admin SYSTEM "acc_admin.xml">
-<!ENTITY faq SYSTEM "acc_faq.xml">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/kam_entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
 	<bookinfo>
 	<title>Acc Module</title>
 	<productname class="trade">&kamailio;</productname>
@@ -59,8 +56,7 @@
 	</revhistory>
 	</bookinfo>
 	<toc></toc>
-	
-	&admin;
-	&faq;
 
+	<xi:include href="acc_admin.xml"/>
+	<xi:include href="acc_faq.xml"/>
 </book>

modules_k/acc/doc/acc_admin.xml

@@ -1,3 +1,13 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
+
 <!-- Acc Module User's Guide -->
 
 <chapter>

modules_k/acc/doc/acc_faq.xml

@@ -1,3 +1,13 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
+
 <!-- Module FAQ -->
 
 <chapter>

modules_k/alias_db/doc/alias_db.xml

@@ -2,18 +2,13 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-<!ENTITY admin SYSTEM "alias_db_admin.xml">
-<!ENTITY faq SYSTEM "../../../doc/kam_module_faq.xml">
-
-<!ENTITY aliasdbsql SYSTEM "alias_db.sql">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/kam_entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
     <bookinfo>
 	<title>ALIAS_DB Module</title>
 	<productname class="trade">&kamailioname;</productname>
@@ -45,7 +40,6 @@
     </bookinfo>
     <toc></toc>
     
-    &admin;
-    &faq;
+	<xi:include href="alias_db_admin.xml"/>
 
 </book>

modules_k/alias_db/doc/alias_db_admin.xml

@@ -1,3 +1,13 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
+
 <!-- Module User's Guide -->
 
 <chapter>

modules_k/auth/doc/auth.xml

@@ -2,16 +2,13 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-<!ENTITY admin SYSTEM "auth_admin.xml">
-<!ENTITY faq SYSTEM "../../../doc/kam_module_faq.xml">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/kam_entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
 	<bookinfo>
 	<title>Auth Module</title>
 	<productname class="trade">&kamailioname;</productname>
@@ -63,7 +60,6 @@
 	</bookinfo>
 	<toc></toc>
 
-    &admin;
-    &faq;
+	<xi:include href="auth_admin.xml"/>
 
 </book>

modules_k/auth/doc/auth_admin.xml

@@ -1,3 +1,13 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
+
 <!-- Auth Module User's Guide -->
 
 <chapter>

modules_k/auth_db/doc/auth_db.xml

@@ -2,16 +2,13 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-<!ENTITY admin SYSTEM "auth_db_admin.xml">
-<!ENTITY faq SYSTEM "../../../doc/module_faq.xml">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
 	<bookinfo>
 	<title>Auth_db Module</title>
 	<authorgroup>
@@ -60,8 +57,7 @@
 	</revhistory>
 	</bookinfo>
 	<toc></toc>
-	
-	&admin;
-	&faq;
+
+	<xi:include href="auth_db_admin.xml"/>
 
 </book>

modules_k/auth_db/doc/auth_db_admin.xml

@@ -1,3 +1,13 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
+
 <!-- Auth_db Module User's Guide -->
 
 <chapter>

modules_k/auth_diameter/doc/auth_diameter.xml

@@ -2,17 +2,13 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-
-<!ENTITY admin SYSTEM "auth_diameter_admin.xml">
-<!ENTITY faq SYSTEM "../../../doc/module_faq.xml">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
     <bookinfo>
 	<title>AUTH_DIAMETER Module</title>
 	<productname class="trade">&kamailioname;</productname>
@@ -47,7 +43,6 @@
     </bookinfo>
     <toc></toc>
     
-    &admin;
-    &faq;
+	<xi:include href="auth_diameter_admin.xml"/>
     
 </book>

modules_k/auth_diameter/doc/auth_diameter_admin.xml

@@ -1,3 +1,13 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
+
 <!-- Module User's Guide -->
 
 <chapter>

modules_k/avpops/doc/avpops.xml

@@ -2,17 +2,13 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-
-<!ENTITY admin SYSTEM "avpops_admin.xml">
-<!ENTITY faq SYSTEM "../../../doc/module_faq.xml">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
 	<bookinfo>
 	<title>AVPops Module</title>
 	<productname class="trade">&kamailioname;</productname>
@@ -42,7 +38,6 @@
 	</bookinfo>
 	<toc></toc>
 
-	&admin;
-	&faq;
+	<xi:include href="avpops_admin.xml"/>
 
 </book>

modules_k/avpops/doc/avpops_admin.xml

@@ -1,3 +1,13 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
+
 <!-- Module User's Guide -->
 
 <chapter>

modules_k/benchmark/doc/benchmark.xml

@@ -2,18 +2,13 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-
-<!ENTITY admin SYSTEM "benchmark_admin.xml">
-<!ENTITY devel SYSTEM "benchmark_devel.xml">
-<!ENTITY faq SYSTEM "../../../doc/module_faq.xml">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
     <bookinfo>
 	<title>Benchmark Module</title>
 	<productname class="trade">&kamailioname;</productname>
@@ -52,8 +47,6 @@
     </bookinfo>
     <toc></toc>
     
-    &admin;
-    &devel;
-    &faq;
-    
+	<xi:include href="benchmark_admin.xml"/>
+	<xi:include href="benchmark_devel.xml"/>
 </book>

modules_k/benchmark/doc/benchmark_admin.xml

@@ -1,3 +1,13 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
+
 <!-- Module User's Guide -->
 
 <chapter>

modules_k/benchmark/doc/benchmark_devel.xml

@@ -1,3 +1,13 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
+
 <!-- Module Developer's Guide -->
 
 <chapter>

modules_k/cfgutils/doc/cfgutils.xml

@@ -2,16 +2,13 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-<!ENTITY admin SYSTEM "cfgutils_admin.xml">
-<!ENTITY faq SYSTEM "../../../doc/module_faq.xml">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
 	<bookinfo>
 	<title>cfgutils Module</title>
 	<authorgroup>
@@ -63,8 +60,7 @@
 	</revhistory>
 	</bookinfo>
 	<toc></toc>
-	
-	&admin;
-	&faq;
+
+	<xi:include href="cfgutils_admin.xml"/>
 
 </book>

modules_k/cfgutils/doc/cfgutils_admin.xml

@@ -1,3 +1,13 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
+
 <!-- cfgutils Module User's Guide -->
 
 <chapter>

modules_k/cpl-c/doc/cpl-c.xml

@@ -2,17 +2,13 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-
-<!ENTITY admin SYSTEM "cpl-c_admin.xml">
-<!ENTITY faq SYSTEM "../../../doc/module_faq.xml">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
 	<bookinfo>
 	<title>cpl-c Module</title>
 	<productname class="trade">&kamailioname;</productname>
@@ -46,7 +42,6 @@
 	</bookinfo>
 	<toc></toc>
 
-	&admin;
-	&faq;
+	<xi:include href="cpl-c_admin.xml"/>
 
 </book>

modules_k/cpl-c/doc/cpl-c_admin.xml

@@ -1,3 +1,13 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
+
 <!-- Module User's Guide -->
 
 <chapter>

modules_k/db_oracle/doc/db_oracle.xml

@@ -2,17 +2,13 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-
-<!ENTITY admin SYSTEM "db_oracle_admin.xml">
-<!ENTITY faq SYSTEM "../../../doc/module_faq.xml">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
     <bookinfo>
 	<title>oracle Module</title>
 	<productname class="trade">&kamailioname;</productname>
@@ -51,7 +47,7 @@
     </bookinfo>
     <toc></toc>
 
-    &admin;
-    &faq;
+    <xi:include href="db_oracle_admin.xml"/>
+    
 
 </book>

modules_k/db_oracle/doc/db_oracle_admin.xml

@@ -1,3 +1,12 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
 <!-- Module User's Guide -->
 
 <chapter>

modules_k/db_text/doc/db_text.xml

@@ -2,19 +2,13 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-<!ENTITY admin SYSTEM "db_text_admin.xml">
-<!ENTITY devel SYSTEM "db_text_devel.xml">
-<!ENTITY faq SYSTEM "../../../doc/module_faq.xml">
-
-<!ENTITY dbtextsercfg SYSTEM "db_text.cfg">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
     <bookinfo>
 	<title>DBTEXT Module</title>
 	<productname class="trade">&kamailioname;</productname>
@@ -44,8 +38,8 @@
     </bookinfo>
     <toc></toc>
     
-    &admin;
-    &devel;
-    &faq;
+    <xi:include href="db_text_admin.xml"/>
+    <xi:include href="db_text_devel.xml"/>
+    
 
 </book>

modules_k/db_text/doc/db_text_admin.xml

@@ -1,7 +1,15 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
 <!-- Module User's Guide -->
 
-<chapter>
-	
+<chapter xmlns:xi="http://www.w3.org/2001/XInclude">
 	<title>&adminguide;</title>
 
 	<section>
@@ -333,7 +341,7 @@ aliases:6
 		<title>Configuration file</title>
 <programlisting format="linespecific">
 ...
-&dbtextsercfg;
+<xi:include href="db_text.cfg" parse="text"/>
 ...
 </programlisting>
 		</example>

modules_k/db_text/doc/db_text_devel.xml

@@ -1,3 +1,13 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
+
 <!-- Module Developer's Guide -->
 
 <chapter>

modules_k/db_unixodbc/doc/db_unixodbc.xml

@@ -2,18 +2,13 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-
-<!ENTITY admin SYSTEM "db_unixodbc_admin.xml">
-<!ENTITY devel SYSTEM "db_unixodbc_devel.xml">
-<!ENTITY faq SYSTEM "../../../doc/module_faq.xml">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
 	<bookinfo>
 	<title>unixodbc Module</title>
 	<productname class="trade">&kamailioname;</productname>
@@ -48,8 +43,8 @@
 	</bookinfo>
 	<toc></toc>
 	
-	&admin;
-	&devel;
-	&faq;
+	<xi:include href="db_unixodbc_admin.xml"/>
+	<xi:include href="db_unixodbc_devel.xml"/>
+	
 	
 </book>

modules_k/db_unixodbc/doc/db_unixodbc_admin.xml

@@ -1,3 +1,12 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
 <!-- Module User's Guide -->
 
 <chapter>

modules_k/db_unixodbc/doc/db_unixodbc_devel.xml

@@ -1,3 +1,12 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
 <!-- Module Developer's Guide -->
 
 <chapter>

modules_k/dialog/doc/dialog.xml

@@ -2,18 +2,13 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-
-<!ENTITY admin SYSTEM "dialog_admin.xml">
-<!ENTITY devel SYSTEM "dialog_devel.xml">
-<!ENTITY faq SYSTEM "dialog_faq.xml">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
 	<bookinfo>
 	<title>dialog Module</title>
 	<productname class="trade">&kamailioname;</productname>
@@ -47,8 +42,8 @@
 	</bookinfo>
 	<toc></toc>
 	
-	&admin;
-	&devel;
-	&faq;
+	<xi:include href="dialog_admin.xml"/>
+	<xi:include href="dialog_devel.xml"/>
+	<xi:include href="dialog_faq.xml"/>
 	
 </book>

modules_k/dialog/doc/dialog_admin.xml

@@ -1,3 +1,12 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
 <!-- Module User's Guide -->
 
 <chapter>

modules_k/dialog/doc/dialog_devel.xml

@@ -1,3 +1,12 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
 <!-- Module Developer's Guide -->
 
 <chapter>

modules_k/dialog/doc/dialog_faq.xml

@@ -1,3 +1,13 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
+
 <!-- Module FAQ -->
 
 <chapter>

modules_k/dispatcher/doc/dispatcher.xml

@@ -2,19 +2,13 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-<!ENTITY admin SYSTEM "dispatcher_admin.xml">
-<!ENTITY faq SYSTEM "dispatcher_faq.xml">
-
-<!ENTITY dispatcherlist SYSTEM "dispatcher.list">
-<!ENTITY dispatchercfg SYSTEM "dispatcher.cfg">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/kam_entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
     <bookinfo>
 	<title>DISPATCHER Module</title>
 	<productname class="trade">&kamailioname;</productname>
@@ -55,7 +49,7 @@
     </bookinfo>
     <toc></toc>
     
-    &admin;
-    &faq;
+    <xi:include href="dispatcher_admin.xml"/>
+    <xi:include href="dispatcher_faq.xml"/>
 
 </book>

modules_k/dispatcher/doc/dispatcher_admin.xml

@@ -1,6 +1,15 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
 <!-- Module User's Guide -->
 
-<chapter>
+<chapter xmlns:xi="http://www.w3.org/2001/XInclude">
 	
 	<title>&adminguide;</title>
 
@@ -831,7 +840,7 @@ ds_select_dst("1", "0");
 		<title>dispatcher list file</title>
 		<programlisting format="linespecific">
 ...
-&dispatcherlist;
+<xi:include href="dispatcher.list" parse="text"/>
 ...
 </programlisting>
 		</example>
@@ -846,7 +855,7 @@ ds_select_dst("1", "0");
 		<title>&kamailio; config script - sample dispatcher usage</title>
 		<programlisting format="linespecific">
 ...
-&dispatchercfg;
+<xi:include href="dispatcher.cfg" parse="text"/>
 ...
 		</programlisting>
 		</example>

modules_k/dispatcher/doc/dispatcher_faq.xml

@@ -1,3 +1,12 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
 <!-- Module FAQ -->
 
 <chapter>

modules_k/diversion/doc/diversion.xml

@@ -2,18 +2,13 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-
-<!ENTITY admin SYSTEM "diversion_admin.xml">
-<!ENTITY devel SYSTEM "diversion_devel.xml">
-<!ENTITY faq SYSTEM "../../../doc/module_faq.xml">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
     <bookinfo>
 	<title>Diversion Module</title>
 	<productname class="trade">&kamailioname;</productname>
@@ -47,8 +42,8 @@
     </bookinfo>
     <toc></toc>
     
-    &admin;
-    &devel;
-    &faq;
+    <xi:include href="diversion_admin.xml"/>
+    <xi:include href="diversion_devel.xml"/>
+    
     
 </book>

modules_k/diversion/doc/diversion_admin.xml

@@ -1,3 +1,12 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
 <!-- Module User's Guide -->
 
 <chapter>
@@ -16,7 +25,7 @@
 	</para>
 	<warning><para>
 		The draft-levy-sip-diversion-08 is expired!! See
-		<ulink url="https://datatracker.ietf.org/public/idindex.cgi?command=id_detail&and;id=6002"> IETF I-D tracker</ulink>.
+		<ulink url="https://datatracker.ietf.org/public/idindex.cgi?command=id_detail&amp;and;id=6002"> IETF I-D tracker</ulink>.
 	</para></warning>
 	</section>
 

modules_k/diversion/doc/diversion_devel.xml

@@ -1,3 +1,12 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
 <!-- Module Developer's Guide -->
 
 <chapter>

modules_k/domain/doc/domain.xml

@@ -2,17 +2,13 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-<!ENTITY admin SYSTEM "domain_admin.xml">
-<!ENTITY devel SYSTEM "domain_devel.xml">
-<!ENTITY faq SYSTEM "../../../doc/module_faq.xml">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
     <bookinfo>
 	<title>Domain Module</title>
 	<authorgroup>
@@ -40,8 +36,8 @@
     </bookinfo>
     <toc></toc>
     
-    &admin;
-    &devel;
-    &faq;
+    <xi:include href="domain_admin.xml"/>
+    <xi:include href="domain_devel.xml"/>
+    
 
 </book>

modules_k/domain/doc/domain_admin.xml

@@ -1,3 +1,12 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
 <!-- Domain Module User's Guide -->
 
 <chapter>

modules_k/domain/doc/domain_devel.xml

@@ -1,3 +1,13 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
+
 <!-- Domain Module Developer's Guide -->
 
 <chapter>

modules_k/domainpolicy/doc/domainpolicy.xml

@@ -2,16 +2,13 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-<!ENTITY admin SYSTEM "domainpolicy_admin.xml">
-<!ENTITY faq SYSTEM "../../../doc/module_faq.xml">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
     <bookinfo>
 	<title>Domain Policy Module</title>
 	<authorgroup>
@@ -51,7 +48,7 @@
     </bookinfo>
     <toc></toc>
     
-    &admin;
-    &faq;
+    <xi:include href="domainpolicy_admin.xml"/>
+    
 
 </book>

modules_k/domainpolicy/doc/domainpolicy_admin.xml

@@ -1,3 +1,12 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
 <!-- Domain Policy Module User's Guide -->
 
 <chapter>
@@ -374,9 +383,6 @@ switch(retcode) {
 			Setting an override port disables NAPTR and
 			SRV lookups according to RFC 3263.
 		</para>
-		<para>
-		&nbsp;
-		</para>
 		</listitem>
 		<listitem>
 		<para>
@@ -386,9 +392,6 @@ switch(retcode) {
 			Setting an override transport also disables NAPTR lookups, but retains 
 			an SRV lookup according to RFC 3263.
 		</para>
-		<para>
-		&nbsp;
-		</para>
 		</listitem>
 		<listitem>
 		<para>
@@ -399,9 +402,6 @@ switch(retcode) {
 			A non-terminal NAPTR and thus a referral to a new domain implicitly
 			sets <emphasis>domain_replacement_avp</emphasis> to the new domain.
 		</para>
-		<para>
-		&nbsp;
-		</para>
 		</listitem>
 		<listitem>
 		<para>
@@ -411,9 +411,6 @@ switch(retcode) {
 			"example.com" and the domain_prefix_avp contains "inbound", the domain 
 			in the destinaton URI is set to "inbound.example.com".
 		</para>
-		<para>
-		&nbsp;
-		</para>
 		</listitem>
 		<listitem>
 		<para>
@@ -423,9 +420,6 @@ switch(retcode) {
 			"example.com" and the domain_suffix_avp contains "myroot.com", the domain 
 			in the destination URI is set to "example.com.myroot.com".
 		</para>
-		<para>
-		&nbsp;
-		</para>
 		</listitem>
 		<listitem>
 		<para>
@@ -495,9 +489,6 @@ if (dp_apply_policy()) {
 			with other incoming connection. Thus we need to use tls_server_domain[] to
 			dedicate a TCP port for this federation. 
 		</para>
-		<para>
-		&nbsp;
-		</para>
 		<programlisting format="linespecific">
 tls_server_domain[1.2.3.4:5066] {
  tls_certificate   = "/path/to/tlsfed/example-com.key"
@@ -508,9 +499,6 @@ tls_server_domain[1.2.3.4:5066] {
  tls_require_cleint_certificate = 1
 }
 		</programlisting>
-		<para>
-		&nbsp;
-		</para>
 		</listitem>
 
 		<listitem>
@@ -522,9 +510,6 @@ tls_server_domain[1.2.3.4:5066] {
 			content of the "tls_client_domain_avp" must be set to this identifier 
 			(e.g. by putting it as rule into the domainpolicy table).
 		</para>
-		<para>
-		&nbsp;
-		</para>
 		<programlisting format="linespecific">
 tls_client_domain["tlsfed"] {
  tls_certificate   = "/path/to/tlsfed/example-com.key"
@@ -560,17 +545,11 @@ tls_client_domain["tlsfed"] {
 			The destination network announces its membership in this
 			federation.
 		</para>
-		<para>
-		&nbsp;
-		</para>
 		<programlisting format="linespecific">
 $ORIGIN destination.example.org
 @ IN NAPTR 10 50   "U"  "D2P+SIP:fed" (
                  "!^.*$!http://HUBFED.org/!" . )
 		</programlisting>
-		<para>
-		&nbsp;
-		</para>
 		</listitem>
 
 
@@ -581,9 +560,6 @@ $ORIGIN destination.example.org
 			The domainpolicy table just needs to list the federation and link
 			it to the central proxy's domain name:
 		</para>
-		<para>
-		&nbsp;
-		</para>
 		<programlisting format="linespecific">
 mysql> select * from domainpolicy;
 +----+--------------------+------+-------------------+----------------+
@@ -592,9 +568,6 @@ mysql> select * from domainpolicy;
 | 1  | http://HUBFED.org/ | fed  | domainreplacement | sip.HUBFED.org |
 +----+--------------------+------+-------------------+----------------+
 		</programlisting>
-		<para>
-		&nbsp;
-		</para>
 		</listitem>
 	</itemizedlist>
 	</section>
@@ -631,9 +604,6 @@ mysql> select * from domainpolicy;
 			The destination network announces its membership in this
 			federation.
 		</para>
-		<para>
-		&nbsp;
-		</para>
 		<programlisting format="linespecific">
 $ORIGIN example.com
 @ IN NAPTR 10 50   "U"  "D2P+SIP:fed" (
@@ -644,9 +614,6 @@ _sip._udp.l3fe IN SRV 10 10 5060 l3fedsip.example.com.
 publicsip      IN A   193.XXX.YYY.ZZZ 
 l3fedsip       IN A   10.0.0.42
 		</programlisting>
-		<para>
-		&nbsp;
-		</para>
 		</listitem>
 
 
@@ -656,9 +623,6 @@ l3fedsip       IN A   10.0.0.42
 			The domainpolicy table just needs to link the federation identifier
 			to the agreed apon prefix:
 		</para>
-		<para>
-		&nbsp;
-		</para>
 		<programlisting format="linespecific">
 mysql> select * from domainpolicy;
 +----+-------------------+------+--------------+-------+
@@ -667,9 +631,7 @@ mysql> select * from domainpolicy;
 | 1  | http://l3fed.org/ | fed  | domainprefix | l3fed |
 +----+-------------------+------+--------------+-------+
 		</programlisting>
-		<para>
-		&nbsp;
-		</para>
+
 		</listitem>
 	</itemizedlist>
 	</section>

modules_k/exec/doc/exec.xml

@@ -2,17 +2,13 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-
-<!ENTITY admin SYSTEM "exec_admin.xml">
-<!ENTITY faq SYSTEM "../../../doc/module_faq.xml">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
     <bookinfo>
 	<title>exec Module</title>
 	<productname class="trade">&kamailioname;</productname>
@@ -51,7 +47,7 @@
     </bookinfo>
     <toc></toc>
     
-    &admin;
-    &faq;
+    <xi:include href="exec_admin.xml"/>
+    
     
 </book>

modules_k/exec/doc/exec_admin.xml

@@ -1,3 +1,12 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
 <!-- Module User's Guide -->
 
 <chapter>

modules_k/group/doc/group.xml

@@ -7,12 +7,12 @@
 <!ENTITY faq SYSTEM "../../../doc/module_faq.xml">
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
     <bookinfo>
 	<title>group Module</title>
 	<productname class="trade">&kamailioname;</productname>
@@ -51,7 +51,7 @@
     </bookinfo>
     <toc></toc>
     
-    &admin;
-    &faq;
+    <xi:include href="group_admin.xml"/>
+    
     
 </book>

modules_k/group/doc/group_admin.xml

@@ -1,3 +1,12 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
 <!-- Module User's Guide -->
 
 <chapter>

modules_k/h350/doc/h350.xml

@@ -2,17 +2,13 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-<!ENTITY admin SYSTEM "h350_admin.xml">
-<!ENTITY faq SYSTEM "../../../doc/module_faq.xml">
-<!ENTITY biblio SYSTEM "h350_biblio.xml">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
         <bookinfo>
         <title>H350 Module</title>
         <productname class="trade">&kamailio;</productname>
@@ -37,8 +33,7 @@
         </bookinfo>
         <toc></toc>
 
-        &admin;
-        &faq;
-	&biblio;
+        <xi:include href="h350_admin.xml"/>
+		<xi:include href="h350_biblio.xml"/>
 
 </book>

modules_k/h350/doc/h350_admin.xml

@@ -1,3 +1,12 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
 <chapter>
     <title>&adminguide;</title>
 

modules_k/h350/doc/h350_biblio.xml

@@ -1,3 +1,12 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
 
   <bibliography>
     <title>Resources</title>
@@ -69,4 +78,3 @@
 
     </bibliodiv>
   </bibliography>
-

modules_k/htable/doc/htable.xml

@@ -2,17 +2,13 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-
-<!ENTITY admin SYSTEM "htable_admin.xml">
-<!ENTITY faq SYSTEM "../../../doc/module_faq.xml">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
     <bookinfo>
 	<title>HTable Module</title>
 	<productname class="trade">&kamailioname;</productname>
@@ -41,7 +37,7 @@
     </bookinfo>
     <toc></toc>
     
-    &admin;
-    &faq;
+    <xi:include href="htable_admin.xml"/>
+    
     
 </book>

modules_k/htable/doc/htable_admin.xml

@@ -1,3 +1,12 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
 <!-- Module User's Guide -->
 
 <chapter>

modules_k/imc/doc/imc.xml

@@ -2,17 +2,13 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-
-<!ENTITY admin SYSTEM "imc_admin.xml">
-<!ENTITY faq SYSTEM "../../../doc/module_faq.xml">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
     <bookinfo>
 	<title>imc Module</title>
 	<productname class="trade">&kamailioname;</productname>
@@ -58,8 +54,8 @@
   </bookinfo>
     <toc></toc>
     
-    &admin;
-    &faq;
+    <xi:include href="imc_admin.xml"/>
+    
     
 </book>
 

modules_k/imc/doc/imc_admin.xml

@@ -1,3 +1,12 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
 <!-- Module User's Guide -->
 
 <chapter>

modules_k/jabber/doc/jabber.xml

@@ -3,16 +3,13 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 
-<!ENTITY admin SYSTEM "jabber_admin.xml">
-<!ENTITY faq SYSTEM "../../../doc/module_faq.xml">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
     <bookinfo>
 	<title>jabber Module</title>
 	<productname class="trade">&kamailioname;</productname>
@@ -41,7 +38,7 @@
     </bookinfo>
     <toc></toc>
     
-    &admin;
-    &faq;
+    <xi:include href="jabber_admin.xml"/>
+    
     
 </book>

modules_k/jabber/doc/jabber_admin.xml

@@ -1,3 +1,12 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
 <!-- Module User's Guide -->
 
 <chapter>

modules_k/kex/doc/kex.xml

@@ -2,17 +2,13 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-
-<!ENTITY admin SYSTEM "kex_admin.xml">
-<!ENTITY faq SYSTEM "../../../doc/module_faq.xml">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
     <bookinfo>
 	<title>KEx Module</title>
 	<productname class="trade">&kamailioname;</productname>
@@ -41,7 +37,7 @@
     </bookinfo>
     <toc></toc>
     
-    &admin;
-    &faq;
+    <xi:include href="kex_admin.xml"/>
+    
     
 </book>

modules_k/kex/doc/kex_admin.xml

@@ -1,3 +1,12 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
 <!-- Module User's Guide -->
 
 <chapter>

modules_k/lcr/doc/lcr.xml

@@ -2,16 +2,13 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-<!ENTITY admin SYSTEM "lcr_admin.xml">
-<!ENTITY faq SYSTEM "../../../doc/module_faq.xml">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
 	<bookinfo>
 	<title>LCR (Least Cost Routing) Module</title>
 	<authorgroup>
@@ -39,7 +36,7 @@
 	</bookinfo>
 	<toc></toc>
 
-	&admin;
-	&faq;
+	<xi:include href="lcr_admin.xml"/>
+	
 
 </book>

modules_k/lcr/doc/lcr_admin.xml

@@ -1,3 +1,12 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
 <!-- Module User's Guide -->
 
 <chapter>

modules_k/ldap/doc/ldap.xml

@@ -2,18 +2,13 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-<!ENTITY admin SYSTEM "ldap_admin.xml">
-<!ENTITY devel SYSTEM "ldap_devel.xml">
-<!ENTITY faq SYSTEM "../../../doc/module_faq.xml">
-<!ENTITY biblio SYSTEM "ldap_biblio.xml">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
         <bookinfo>
         <title>LDAP Module</title>
         <productname class="trade">&kamailio;</productname>
@@ -38,10 +33,9 @@
         </bookinfo>
         <toc></toc>
 
-        &admin;
-        &devel;
-        &faq;
-		&biblio;
+        <xi:include href="ldap_admin.xml"/>
+        <xi:include href="ldap_devel.xml"/>
+		<xi:include href="ldap_biblio.xml"/>
 
 </book>
 

modules_k/ldap/doc/ldap_admin.xml

@@ -1,3 +1,12 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
   <chapter>
     <title>&adminguide;</title>
 

modules_k/ldap/doc/ldap_biblio.xml

@@ -1,3 +1,12 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
 
   <bibliography>
     <title>Resources</title>

modules_k/ldap/doc/ldap_devel.xml

@@ -1,3 +1,12 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
 <!-- LDAP_H350 Module Developer's Guide -->
 
 <chapter>

modules_k/maxfwd/doc/maxfwd.xml

@@ -2,17 +2,13 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-
-<!ENTITY admin SYSTEM "maxfwd_admin.xml">
-<!ENTITY faq SYSTEM "../../../doc/module_faq.xml">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
 	<bookinfo>
 	<title>maxfwd Module</title>
 	<productname class="trade">&kamailioname;</productname>
@@ -46,7 +42,7 @@
 	</bookinfo>
 	<toc></toc>
 	
-	&admin;
-	&faq;
+	<xi:include href="maxfwd_admin.xml"/>
+	
 	
 </book>

modules_k/maxfwd/doc/maxfwd_admin.xml

@@ -1,3 +1,12 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
 <!-- Module User's Guide -->
 
 <chapter>

modules_k/memcached/doc/memcached.xml

@@ -2,17 +2,13 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-
-<!ENTITY admin SYSTEM "memcached_admin.xml">
-<!ENTITY faq SYSTEM "../../../doc/module_faq.xml">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
     <bookinfo>
 	<title>Memcached Module</title>
 	<productname class="trade">&kamailioname;</productname>
@@ -29,7 +25,7 @@
     </bookinfo>
     <toc></toc>
 
-    &admin;
-    &faq;
+    <xi:include href="memcached_admin.xml"/>
+    
 
 </book>

modules_k/memcached/doc/memcached_admin.xml

@@ -1,3 +1,12 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
 <!-- Module User's Guide -->
 
 <chapter>

modules_k/mi_datagram/doc/mi_datagram.xml

@@ -2,17 +2,13 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-
-<!ENTITY admin SYSTEM "mi_datagram_admin.xml">
-<!ENTITY faq SYSTEM "mi_datagram_faq.xml">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
 	<bookinfo>
 	<title>mi_datagram Module</title>
 	<productname class="trade">&kamailioname;</productname>
@@ -49,7 +45,7 @@
 	</bookinfo>
 	<toc></toc>
 	
-	&admin;
-	&faq;
+	<xi:include href="mi_datagram_admin.xml"/>
+	<xi:include href="mi_datagram_faq.xml"/>
 	
 </book>

modules_k/mi_datagram/doc/mi_datagram_admin.xml

@@ -1,3 +1,12 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
 <!-- Module User's Guide -->
 
 <chapter>

modules_k/mi_datagram/doc/mi_datagram_faq.xml

@@ -1,3 +1,12 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
 <!-- Module FAQ -->
 
 <chapter>

modules_k/mi_fifo/doc/mi_fifo.xml

@@ -2,17 +2,13 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-
-<!ENTITY admin SYSTEM "mi_fifo_admin.xml">
-<!ENTITY faq SYSTEM "../../../doc/module_faq.xml">
-
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../doc/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 
 ]>
 
-<book>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
 	<bookinfo>
 	<title>mi_fifo Module</title>
 	<productname class="trade">&kamailioname;</productname>
@@ -49,7 +45,7 @@
 	</bookinfo>
 	<toc></toc>
 	
-	&admin;
-	&faq;
+	<xi:include href="mi_fifo_admin.xml"/>
+	
 	
 </book>

modules_k/mi_fifo/doc/mi_fifo_admin.xml

@@ -1,3 +1,12 @@
+<?xml version="1.0" encoding='ISO-8859-1'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Include general documentation entities -->
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
 <!-- Module User's Guide -->
 
 <chapter>