Use the Samba Variant of the DocBook DTD rather then

the original one. Entities are now in samba-web/, so remove them
from here.
(This used to be commit a66ba7c7e0b00eb9475a495d18e18cada3f6f9dd)

20 files changed, 20 insertions, 101 deletions

diff --git a/docs/Samba-Developers-Guide/CodingSuggestions.xml b/docs/Samba-Developers-Guide/CodingSuggestions.xml
index 04465a1fcd..09d842639e 100644
--- a/docs/Samba-Developers-Guide/CodingSuggestions.xml
+++ b/docs/Samba-Developers-Guide/CodingSuggestions.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-  <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
-  %global_entities;
-]>
+<!DOCTYPE book 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 6375bc1dc6..d1fdd21737 100644
--- a/docs/Samba-Developers-Guide/NetBIOS.xml
+++ b/docs/Samba-Developers-Guide/NetBIOS.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-  <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
-  %global_entities;
-]>
+<!DOCTYPE book 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 3868eaab7b..7586f3c4c5 100644
--- a/docs/Samba-Developers-Guide/Tracing.xml
+++ b/docs/Samba-Developers-Guide/Tracing.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-  <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
-  %global_entities;
-]>
+<!DOCTYPE book 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 fb1fe52546..da276ca91e 100644
--- a/docs/Samba-Developers-Guide/architecture.xml
+++ b/docs/Samba-Developers-Guide/architecture.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-  <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
-  %global_entities;
-]>
+<!DOCTYPE book 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 5e57833b69..fd19205ada 100644
--- a/docs/Samba-Developers-Guide/cifsntdomain.xml
+++ b/docs/Samba-Developers-Guide/cifsntdomain.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-  <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
-  %global_entities;
-]>
+<!DOCTYPE book 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 8749c00084..acb8085cbe 100644
--- a/docs/Samba-Developers-Guide/contributing.xml
+++ b/docs/Samba-Developers-Guide/contributing.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-  <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
-  %global_entities;
-]>
+<!DOCTYPE book 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 f627833557..5ffc0cbc74 100644
--- a/docs/Samba-Developers-Guide/debug.xml
+++ b/docs/Samba-Developers-Guide/debug.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-  <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
-  %global_entities;
-]>
+<!DOCTYPE book 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 0a1fbbbbed..5ab711014b 100644
--- a/docs/Samba-Developers-Guide/encryption.xml
+++ b/docs/Samba-Developers-Guide/encryption.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-  <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
-  %global_entities;
-]>
+<!DOCTYPE book 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 94184bf865..7def6f21d2 100644
--- a/docs/Samba-Developers-Guide/gencache.xml
+++ b/docs/Samba-Developers-Guide/gencache.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-  <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
-  %global_entities;
-]>
-
+<!DOCTYPE book 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/internals.xml b/docs/Samba-Developers-Guide/internals.xml
index 7decd9d06c..a6d6435ac7 100644
--- a/docs/Samba-Developers-Guide/internals.xml
+++ b/docs/Samba-Developers-Guide/internals.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-  <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
-  %global_entities;
-]>
+<!DOCTYPE book 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 c14fda04dd..30768e47ed 100644
--- a/docs/Samba-Developers-Guide/modules.xml
+++ b/docs/Samba-Developers-Guide/modules.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-  <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
-  %global_entities;
-]>
+<!DOCTYPE book 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 2d85430676..470e1e8288 100644
--- a/docs/Samba-Developers-Guide/packagers.xml
+++ b/docs/Samba-Developers-Guide/packagers.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-  <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
-  %global_entities;
-]>
+<!DOCTYPE book 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 d989c97809..1b3df637cd 100644
--- a/docs/Samba-Developers-Guide/parsing.xml
+++ b/docs/Samba-Developers-Guide/parsing.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-  <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
-  %global_entities;
-]>
+<!DOCTYPE book 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 cd29b5010b..d41bc22ddf 100644
--- a/docs/Samba-Developers-Guide/printing.xml
+++ b/docs/Samba-Developers-Guide/printing.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-  <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
-  %global_entities;
-]>
+<!DOCTYPE book 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 078e926de9..62925c62f4 100644
--- a/docs/Samba-Developers-Guide/registry.xml
+++ b/docs/Samba-Developers-Guide/registry.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-  <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
-  %global_entities;
-]>
+<!DOCTYPE book 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 478847b192..dc91129f38 100644
--- a/docs/Samba-Developers-Guide/rpc_plugin.xml
+++ b/docs/Samba-Developers-Guide/rpc_plugin.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-  <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
-  %global_entities;
-]>
+<!DOCTYPE book 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 9521404feb..3c63c74dfd 100644
--- a/docs/Samba-Developers-Guide/unix-smb.xml
+++ b/docs/Samba-Developers-Guide/unix-smb.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-  <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
-  %global_entities;
-]>
+<!DOCTYPE book 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 6819faf05d..652bc61eb9 100644
--- a/docs/Samba-Developers-Guide/vfs.xml
+++ b/docs/Samba-Developers-Guide/vfs.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-  <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
-  %global_entities;
-]>
+<!DOCTYPE book 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 27ffbc063c..e04ccd3797 100644
--- a/docs/Samba-Developers-Guide/windows-debug.xml
+++ b/docs/Samba-Developers-Guide/windows-debug.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-  <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
-  %global_entities;
-]>
+<!DOCTYPE book 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 ad3ad67b42..7793160b03 100644
--- a/docs/Samba-Developers-Guide/wins.xml
+++ b/docs/Samba-Developers-Guide/wins.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-  <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
-  %global_entities;
-]>
+<!DOCTYPE book 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>