doc, modules: updated the path to docbook entities and spec files

doc/docbook/Makefile

@@ -42,8 +42,8 @@ output_dir ?= .
 # auxiliary files that are needed to convert docbook documentation to other
 # formats. You should not need to use this variable under normal
 # circumstances.
-docbook_dir ?= ../../../docbook
-COREPATH ?= $(docbook_dir)/..
+docbook_dir ?= ../../../doc/docbook
+COREPATH ?= $(docbook_dir)/../../src
 
 # This is the stylesheet used to generate a list of dependencies for a docbook
 # source file. The stylesheet walks through the document and prints all files

src/Makefile.modules

@@ -266,7 +266,7 @@ $(share_prefix)/$(share_dir):
 ifneq (,$(wildcard doc/Makefile))
 #doc/Makefile present => we can generate README
 
-README: doc/*.xml ../../../docbook/entities.xml
+README: doc/*.xml ../../../doc/docbook/entities.xml
 	$(MAKE) -C doc $(MOD_NAME).txt
 	mv doc/$(MOD_NAME).txt $@
 

src/lib/cds/doc/Makefile

@@ -1,4 +1,4 @@
 docs = cds.xml
 
-docbook_dir = ../../../docbook
+docbook_dir = ../../../../doc/docbook
 include $(docbook_dir)/Makefile

src/lib/presence/doc/Makefile

@@ -1,4 +1,4 @@
 docs = presence.xml
 
-docbook_dir = ../../../docbook
+docbook_dir = ../../../../doc/docbook
 include $(docbook_dir)/Makefile

src/lib/srdb1/schema/Makefile

@@ -243,7 +243,7 @@ docbook-xml:
 	echo "        \"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd\" [" \
 		>> "$(ROOT)/doc/databases/kamailio/tables.xml"
 	#Include general documentation entities
-	echo "    <!ENTITY % docentities SYSTEM \"../../../docbook/entities.xml\">" \
+	echo "    <!ENTITY % docentities SYSTEM \"../../../../doc/docbook/entities.xml\">" \
 		>> "$(ROOT)/doc/databases/kamailio/tables.xml"
 	echo "    %docentities;" \
 		>> "$(ROOT)/doc/databases/kamailio/tables.xml"
@@ -266,7 +266,7 @@ docbook-xml:
 		> "$(ROOT)/doc/databases/kamailio/Makefile"
 	echo \
 		>> "$(ROOT)/doc/databases/kamailio/Makefile"
-	echo "docbook_dir = ../../../docbook" \
+	echo "docbook_dir = ../../../../doc/docbook" \
 		>> "$(ROOT)/doc/databases/kamailio/Makefile"
 	echo "include \$$(docbook_dir)/Makefile" \
 		>> "$(ROOT)/doc/databases/kamailio/Makefile"
@@ -289,7 +289,7 @@ docbook:
 		echo "  <!ENTITY `basename "$$FILE" | sed -e 's#_#-#g'` SYSTEM \""$$FILE"\">" >> "$(ROOT)/doc/databases/kamailio/tables.sgml" ; \
 	done ; \
 	#Include general documentation entities
-	echo "  <!ENTITY % docentities SYSTEM \"../../../docbook/entities.xml\"> %docentities;" >> "$(ROOT)/doc/databases/kamailio/tables.sgml" ; \
+	echo "  <!ENTITY % docentities SYSTEM \"../../../../doc/docbook/entities.xml\"> %docentities;" >> "$(ROOT)/doc/databases/kamailio/tables.sgml" ; \
 	echo "]>" >> "$(ROOT)/doc/databases/kamailio/tables.sgml"
 	# add bookinfo
 	cat "$(ROOT)/doc/stylesheets/dbschema_k/bookinfo.xml" >> "$(ROOT)/doc/databases/kamailio/tables.sgml"

src/lib/xcap/doc/Makefile

@@ -1,4 +1,4 @@
 docs = xcap.xml
 
-docbook_dir = ../../../docbook
+docbook_dir = ../../../../doc/docbook
 include $(docbook_dir)/Makefile

src/modules/acc/doc/Makefile

@@ -1,4 +1,4 @@
 docs = acc.xml
 
-docbook_dir = ../../../docbook
+docbook_dir = ../../../../doc/docbook
 include $(docbook_dir)/Makefile.module

src/modules/acc/doc/acc.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/acc/doc/acc_admin.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/acc/doc/acc_faq.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/acc_radius/doc/Makefile

@@ -1,4 +1,4 @@
 docs = acc_radius.xml
 
-docbook_dir = ../../../docbook
+docbook_dir = ../../../../doc/docbook
 include $(docbook_dir)/Makefile.module

src/modules/acc_radius/doc/acc_radius.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/acc_radius/doc/acc_radius_admin.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/alias_db/doc/Makefile

@@ -1,4 +1,4 @@
 docs = alias_db.xml
 
-docbook_dir = ../../../docbook
+docbook_dir = ../../../../doc/docbook
 include $(docbook_dir)/Makefile.module

src/modules/alias_db/doc/alias_db.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/alias_db/doc/alias_db_admin.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/app_java/doc/Makefile

@@ -1,4 +1,4 @@
 docs = app_java.xml
 
-docbook_dir = ../../../docbook
+docbook_dir = ../../../../doc/docbook
 include $(docbook_dir)/Makefile.module

src/modules/app_java/doc/app_java.xml

@@ -4,7 +4,7 @@
 	"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 ]>
 

src/modules/app_java/doc/app_java_admin.xml

@@ -4,7 +4,7 @@
 	"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/app_lua/doc/Makefile

@@ -1,4 +1,4 @@
 docs = app_lua.xml
 
-docbook_dir = ../../../docbook
+docbook_dir = ../../../../doc/docbook
 include $(docbook_dir)/Makefile.module

src/modules/app_lua/doc/app_lua.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/app_lua/doc/app_lua_admin.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/app_mono/doc/Makefile

@@ -1,4 +1,4 @@
 docs = app_mono.xml
 
-docbook_dir = ../../../docbook
+docbook_dir = ../../../../doc/docbook
 include $(docbook_dir)/Makefile.module

src/modules/app_mono/doc/app_mono.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/app_mono/doc/app_mono_admin.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/app_perl/doc/Makefile

@@ -1,4 +1,4 @@
 docs = app_perl.xml
 
-docbook_dir = ../../../docbook
+docbook_dir = ../../../../doc/docbook
 include $(docbook_dir)/Makefile.module

src/modules/app_perl/doc/app_perl.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/app_perl/doc/app_perl_admin.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/app_perl/doc/app_perl_faq.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/app_perl/doc/app_perl_pod.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/app_perl/doc/app_perl_samples.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/app_python/doc/Makefile

@@ -1,4 +1,4 @@
 docs = app_python.xml
 
-docbook_dir = ../../../docbook
+docbook_dir = ../../../../doc/docbook
 include $(docbook_dir)/Makefile.module

src/modules/app_python/doc/app_python.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/app_python/doc/app_python_admin.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/async/doc/Makefile

@@ -1,4 +1,4 @@
 docs = async.xml
 
-docbook_dir = ../../../docbook
+docbook_dir = ../../../../doc/docbook
 include $(docbook_dir)/Makefile.module

src/modules/async/doc/async.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/async/doc/async_admin.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/auth/doc/Makefile

@@ -1,4 +1,4 @@
 docs = auth.xml
 
-docbook_dir=../../../docbook
+docbook_dir = ../../../../doc/docbook
 include $(docbook_dir)/Makefile.module

src/modules/auth/doc/auth.xml

@@ -4,7 +4,7 @@
 	[ <!ENTITY % local.common.attrib
 	 "xmlns:xi CDATA #FIXED 'http://www.w3.org/2001/XInclude'">
 	 <!-- Include general documentation entities -->
-	 <!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+	 <!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 	 %docentities;
 	]
 >

src/modules/auth_db/doc/Makefile

@@ -1,4 +1,4 @@
 docs = auth_db.xml
 
-docbook_dir = ../../../docbook
+docbook_dir = ../../../../doc/docbook
 include $(docbook_dir)/Makefile.module

src/modules/auth_db/doc/auth_db.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/auth_db/doc/auth_db_admin.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/auth_diameter/doc/Makefile

@@ -1,4 +1,4 @@
 docs = auth_diameter.xml
 
-docbook_dir = ../../../docbook
+docbook_dir = ../../../../doc/docbook
 include $(docbook_dir)/Makefile.module

src/modules/auth_diameter/doc/auth_diameter.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/auth_diameter/doc/auth_diameter_admin.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/auth_ephemeral/doc/Makefile

@@ -1,4 +1,4 @@
 docs = auth_ephemeral.xml
 
-docbook_dir = ../../../docbook
+docbook_dir = ../../../../doc/docbook
 include $(docbook_dir)/Makefile.module

src/modules/auth_ephemeral/doc/auth_ephemeral.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/auth_ephemeral/doc/auth_ephemeral_admin.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/auth_identity/doc/Makefile

@@ -1,4 +1,4 @@
 docs = auth_identity.xml
 
-docbook_dir=../../../docbook
+docbook_dir = ../../../../doc/docbook
 include $(docbook_dir)/Makefile.module

src/modules/auth_identity/doc/auth_identity.xml

@@ -4,7 +4,7 @@
 	[ <!ENTITY % local.common.attrib
 	 "xmlns:xi CDATA #FIXED 'http://www.w3.org/2001/XInclude'">
 	 <!-- Include general documentation entities -->
-	 <!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+	 <!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 	 %docentities;
 	]
 >

src/modules/auth_identity/doc/auth_identity_functions.xml

@@ -4,7 +4,7 @@
 	[ <!ENTITY % local.common.attrib
 	 "xmlns:xi CDATA #FIXED 'http://www.w3.org/2001/XInclude'">
 	 <!-- Include general documentation entities -->
-	 <!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+	 <!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 	 %docentities;
 	]
 >

src/modules/auth_identity/doc/auth_identity_params.xml

@@ -4,7 +4,7 @@
 	[ <!ENTITY % local.common.attrib
 	 "xmlns:xi CDATA #FIXED 'http://www.w3.org/2001/XInclude'">
 	 <!-- Include general documentation entities -->
-	 <!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+	 <!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 	 %docentities;
 	]
 >

src/modules/auth_radius/doc/Makefile

@@ -1,4 +1,4 @@
 docs = auth_radius.xml
 
-docbook_dir = ../../../docbook
+docbook_dir = ../../../../doc/docbook
 include $(docbook_dir)/Makefile.module

src/modules/auth_radius/doc/auth_radius.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/auth_radius/doc/auth_radius_admin.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 ]>
 

src/modules/auth_xkeys/doc/Makefile

@@ -1,4 +1,4 @@
 docs = auth_xkeys.xml
 
-docbook_dir = ../../../docbook
+docbook_dir = ../../../../doc/docbook
 include $(docbook_dir)/Makefile.module

src/modules/auth_xkeys/doc/auth_xkeys.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/auth_xkeys/doc/auth_xkeys_admin.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/avp/doc/Makefile

@@ -1,4 +1,4 @@
 docs = avp.xml
 
-docbook_dir=../../../docbook
+docbook_dir = ../../../../doc/docbook
 include $(docbook_dir)/Makefile.module

src/modules/avp/doc/avp.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/avp/doc/avp_functions.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/avpops/doc/Makefile

@@ -1,4 +1,4 @@
 docs = avpops.xml
 
-docbook_dir = ../../../docbook
+docbook_dir = ../../../../doc/docbook
 include $(docbook_dir)/Makefile.module

src/modules/avpops/doc/avpops.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/avpops/doc/avpops_admin.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/benchmark/doc/Makefile

@@ -1,4 +1,4 @@
 docs = benchmark.xml
 
-docbook_dir = ../../../docbook
+docbook_dir = ../../../../doc/docbook
 include $(docbook_dir)/Makefile.module

src/modules/benchmark/doc/benchmark.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/benchmark/doc/benchmark_admin.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/benchmark/doc/benchmark_devel.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/blst/doc/Makefile

@@ -1,4 +1,4 @@
 docs = blst.xml
 
-docbook_dir=../../../docbook
+docbook_dir = ../../../../doc/docbook
 include $(docbook_dir)/Makefile.module

src/modules/call_control/doc/Makefile

@@ -1,4 +1,4 @@
 docs = call_control.xml
 
-docbook_dir = ../../../docbook
+docbook_dir = ../../../../doc/docbook
 include $(docbook_dir)/Makefile.module

src/modules/call_control/doc/call_control.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/call_control/doc/call_control_admin.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/carrierroute/doc/Makefile

@@ -1,4 +1,4 @@
 docs = carrierroute.xml
 
-docbook_dir = ../../../docbook
+docbook_dir = ../../../../doc/docbook
 include $(docbook_dir)/Makefile.module

src/modules/carrierroute/doc/carrierroute.xml

@@ -2,7 +2,7 @@
 <!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">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/carrierroute/doc/carrierroute_admin.xml

@@ -2,7 +2,7 @@
 <!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">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/carrierroute/doc/carrierroute_db.xml

@@ -2,7 +2,7 @@
 <!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">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/cdp/doc/Makefile

@@ -1,4 +1,4 @@
 docs = cdp.xml
 
-docbook_dir = ../../../docbook
+docbook_dir = ../../../../doc/docbook
 include $(docbook_dir)/Makefile.module

src/modules/cdp/doc/cdp.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/cdp/doc/cdp_admin.xml

@@ -2,7 +2,7 @@
 <!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">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 ]>
 <!-- Module User's Guide -->

src/modules/cdp/doc/cdp_devel.xml

@@ -2,7 +2,7 @@
 <!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">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 ]>
 <!-- Module Developer's Guide -->

src/modules/cdp/doc/cdp_faq.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/cdp_avp/doc/Makefile

@@ -1,4 +1,4 @@
 docs = cdp_avp.xml
 
-docbook_dir = ../../../docbook
+docbook_dir = ../../../../doc/docbook
 include $(docbook_dir)/Makefile.module

src/modules/cdp_avp/doc/cdp_avp.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/cdp_avp/doc/cdp_avp_admin.xml

@@ -2,7 +2,7 @@
 <!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">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 ]>
 <!-- Module User's Guide -->

src/modules/cdp_avp/doc/cdp_avp_devel.xml

@@ -2,7 +2,7 @@
 <!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">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 ]>
 <!-- Module Developer's Guide -->

src/modules/cdp_avp/doc/cdp_avp_faq.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/cfg_db/doc/Makefile

@@ -1,4 +1,4 @@
 docs = cfg_db.xml
 
-docbook_dir=../../../docbook
+docbook_dir = ../../../../doc/docbook
 include $(docbook_dir)/Makefile.module

src/modules/cfg_db/doc/cfg_db.xml

@@ -2,7 +2,7 @@
 <!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">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/cfg_db/doc/cfg_db_params.xml

@@ -2,7 +2,7 @@
 <!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">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/cfg_rpc/doc/Makefile

@@ -1,4 +1,4 @@
 docs = cfg_rpc.xml
 
-docbook_dir=../../../docbook
+docbook_dir = ../../../../doc/docbook
 include $(docbook_dir)/Makefile.module

src/modules/cfg_rpc/doc/cfg_rpc.xml

@@ -2,7 +2,7 @@
 <!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">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/cfg_rpc/doc/rpc.xml

@@ -2,7 +2,7 @@
 <!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">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/cfgt/doc/Makefile

@@ -1,4 +1,4 @@
 docs = cfgt.xml
 
-docbook_dir = ../../../docbook
+docbook_dir = ../../../../doc/docbook
 include $(docbook_dir)/Makefile.module

src/modules/cfgt/doc/cfgt.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/cfgt/doc/cfgt_admin.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/cfgutils/doc/Makefile

@@ -1,4 +1,4 @@
 docs = cfgutils.xml
 
-docbook_dir = ../../../docbook
+docbook_dir = ../../../../doc/docbook
 include $(docbook_dir)/Makefile.module

src/modules/cfgutils/doc/cfgutils.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/cfgutils/doc/cfgutils_admin.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- Include general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>

src/modules/cnxcc/doc/Makefile

@@ -1,4 +1,4 @@
 docs = cnxcc.xml
 
-docbook_dir = ../../../docbook
+docbook_dir = ../../../../doc/docbook
 include $(docbook_dir)/Makefile.module

src/modules/cnxcc/doc/cnxcc.xml

@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 <!-- general documentation entities -->
-<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml">
 %docentities;
 
 ]>