21 files changed, 25 insertions, 21 deletions
diff --git a/docs/Samba-Developers-Guide/CodingSuggestions.xml b/docs/Samba-Developers-Guide/CodingSuggestions.xml
index 09d842639e..caf93d84ad 100644
--- a/docs/Samba-Developers-Guide/CodingSuggestions.xml
+++ b/docs/Samba-Developers-Guide/CodingSuggestions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <chapter id="CodingSuggestions">
 <chapterinfo>
 	<author>
diff --git a/docs/Samba-Developers-Guide/NetBIOS.xml b/docs/Samba-Developers-Guide/NetBIOS.xml
index d1fdd21737..04eaecd4ab 100644
--- a/docs/Samba-Developers-Guide/NetBIOS.xml
+++ b/docs/Samba-Developers-Guide/NetBIOS.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <chapter id="netbios">
 <chapterinfo>
 	<author>
diff --git a/docs/Samba-Developers-Guide/Tracing.xml b/docs/Samba-Developers-Guide/Tracing.xml
index 7586f3c4c5..3eaab6373e 100644
--- a/docs/Samba-Developers-Guide/Tracing.xml
+++ b/docs/Samba-Developers-Guide/Tracing.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <chapter id="tracing">
 <chapterinfo>
 	<author>
diff --git a/docs/Samba-Developers-Guide/architecture.xml b/docs/Samba-Developers-Guide/architecture.xml
index da276ca91e..bb0f29981b 100644
--- a/docs/Samba-Developers-Guide/architecture.xml
+++ b/docs/Samba-Developers-Guide/architecture.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <chapter id="architecture">
 <chapterinfo>
 	<author>
diff --git a/docs/Samba-Developers-Guide/cifsntdomain.xml b/docs/Samba-Developers-Guide/cifsntdomain.xml
index fd19205ada..2626c8fc13 100644
--- a/docs/Samba-Developers-Guide/cifsntdomain.xml
+++ b/docs/Samba-Developers-Guide/cifsntdomain.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <chapter id="ntdomain">
 <chapterinfo>
 	<author>
diff --git a/docs/Samba-Developers-Guide/contributing.xml b/docs/Samba-Developers-Guide/contributing.xml
index acb8085cbe..01e6fb2863 100644
--- a/docs/Samba-Developers-Guide/contributing.xml
+++ b/docs/Samba-Developers-Guide/contributing.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+
 <chapter id="contributing">
 <chapterinfo>
 	&author.jelmer;
diff --git a/docs/Samba-Developers-Guide/debug.xml b/docs/Samba-Developers-Guide/debug.xml
index 5ffc0cbc74..a55facedff 100644
--- a/docs/Samba-Developers-Guide/debug.xml
+++ b/docs/Samba-Developers-Guide/debug.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <chapter id="debug">
 <chapterinfo>
 	<author>
diff --git a/docs/Samba-Developers-Guide/encryption.xml b/docs/Samba-Developers-Guide/encryption.xml
index 5ab711014b..be00beba5d 100644
--- a/docs/Samba-Developers-Guide/encryption.xml
+++ b/docs/Samba-Developers-Guide/encryption.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <chapter id="pwencrypt">
 
 
diff --git a/docs/Samba-Developers-Guide/gencache.xml b/docs/Samba-Developers-Guide/gencache.xml
index 7def6f21d2..7e8475c192 100644
--- a/docs/Samba-Developers-Guide/gencache.xml
+++ b/docs/Samba-Developers-Guide/gencache.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <chapter id="gencache">
 <chapterinfo>
 	<author>
diff --git a/docs/Samba-Developers-Guide/index.xml b/docs/Samba-Developers-Guide/index.xml
index 9d3cc9aea7..c02e30fdce 100644
--- a/docs/Samba-Developers-Guide/index.xml
+++ b/docs/Samba-Developers-Guide/index.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc" [
+<!ATTLIST book 
+	xmlns:xi CDATA #FIXED "http://www.w3.org/2003/XInclude">
+]>
 
 <book id="Samba-Developers-Guide"
 	xmlns:xi="http://www.w3.org/2003/XInclude">
diff --git a/docs/Samba-Developers-Guide/internals.xml b/docs/Samba-Developers-Guide/internals.xml
index a6d6435ac7..6178028600 100644
--- a/docs/Samba-Developers-Guide/internals.xml
+++ b/docs/Samba-Developers-Guide/internals.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <chapter id="internals">
 <chapterinfo>
 	<author>
diff --git a/docs/Samba-Developers-Guide/modules.xml b/docs/Samba-Developers-Guide/modules.xml
index 30768e47ed..a74c176844 100644
--- a/docs/Samba-Developers-Guide/modules.xml
+++ b/docs/Samba-Developers-Guide/modules.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <chapter id="modules">
 <chapterinfo>
 	<author>
diff --git a/docs/Samba-Developers-Guide/packagers.xml b/docs/Samba-Developers-Guide/packagers.xml
index 470e1e8288..5c834b09fe 100644
--- a/docs/Samba-Developers-Guide/packagers.xml
+++ b/docs/Samba-Developers-Guide/packagers.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <chapter id="Packaging">
 <chapterinfo>
 	<author>
diff --git a/docs/Samba-Developers-Guide/parsing.xml b/docs/Samba-Developers-Guide/parsing.xml
index 1b3df637cd..d695f9313c 100644
--- a/docs/Samba-Developers-Guide/parsing.xml
+++ b/docs/Samba-Developers-Guide/parsing.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <chapter id="parsing">
 <chapterinfo>
 	<author>
diff --git a/docs/Samba-Developers-Guide/printing.xml b/docs/Samba-Developers-Guide/printing.xml
index d41bc22ddf..fc0a1ee4b7 100644
--- a/docs/Samba-Developers-Guide/printing.xml
+++ b/docs/Samba-Developers-Guide/printing.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <chapter id="printing">
 <chapterinfo>
 	<author>
diff --git a/docs/Samba-Developers-Guide/registry.xml b/docs/Samba-Developers-Guide/registry.xml
index 62925c62f4..bc394d71b7 100644
--- a/docs/Samba-Developers-Guide/registry.xml
+++ b/docs/Samba-Developers-Guide/registry.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <chapter id="registry">
 	<chapterinfo>
 		&author.jelmer;
diff --git a/docs/Samba-Developers-Guide/rpc_plugin.xml b/docs/Samba-Developers-Guide/rpc_plugin.xml
index dc91129f38..cc263ffc3e 100644
--- a/docs/Samba-Developers-Guide/rpc_plugin.xml
+++ b/docs/Samba-Developers-Guide/rpc_plugin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <chapter id="rpc-plugin">
 <chapterinfo>
 	<author>
diff --git a/docs/Samba-Developers-Guide/unix-smb.xml b/docs/Samba-Developers-Guide/unix-smb.xml
index 3c63c74dfd..b700dfc9dc 100644
--- a/docs/Samba-Developers-Guide/unix-smb.xml
+++ b/docs/Samba-Developers-Guide/unix-smb.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <chapter id="unix-smb">
 <chapterinfo>
 	<author>
diff --git a/docs/Samba-Developers-Guide/vfs.xml b/docs/Samba-Developers-Guide/vfs.xml
index 652bc61eb9..25a45b6875 100644
--- a/docs/Samba-Developers-Guide/vfs.xml
+++ b/docs/Samba-Developers-Guide/vfs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <chapter id="vfs">
 <chapterinfo>
 	<author>
diff --git a/docs/Samba-Developers-Guide/windows-debug.xml b/docs/Samba-Developers-Guide/windows-debug.xml
index e04ccd3797..db0560c6e1 100644
--- a/docs/Samba-Developers-Guide/windows-debug.xml
+++ b/docs/Samba-Developers-Guide/windows-debug.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <chapter id="windows-debug">
 	<chapterinfo>
 		&author.jelmer;
diff --git a/docs/Samba-Developers-Guide/wins.xml b/docs/Samba-Developers-Guide/wins.xml
index 7793160b03..df29627bfd 100644
--- a/docs/Samba-Developers-Guide/wins.xml
+++ b/docs/Samba-Developers-Guide/wins.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <chapter id="wins">
 <chapterinfo>
 	<author>