From f3141e115a7d155d6a4116e6172b8031a0a4a68b Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 11 Mar 2005 21:33:28 +0000
Subject: [PATCH] Use the Samba DTD rather then the original DocBook one. This
 step will (after the DTD is finished) allow us to validate the source
 documents. This all is require for generating PDF's thru XML-FO.

---
 docs/Makefile                                            | 13 +++++--------
 docs/Samba-Developers-Guide/index.xml                    |  4 +---
 docs/Samba-Guide/index.xml                               |  7 +------
 docs/Samba-HOWTO-Collection/AccessControls.xml           |  6 +-----
 docs/Samba-HOWTO-Collection/AdvancedNetworkAdmin.xml     |  6 +-----
 docs/Samba-HOWTO-Collection/BDC.xml                      | 10 +---------
 docs/Samba-HOWTO-Collection/Backup.xml                   |  6 +-----
 docs/Samba-HOWTO-Collection/Bugs.xml                     |  6 +-----
 docs/Samba-HOWTO-Collection/CUPS-printing.xml            |  7 +------
 docs/Samba-HOWTO-Collection/Compiling.xml                |  6 +-----
 docs/Samba-HOWTO-Collection/DNS-DHCP-Configuration.xml   |  6 +-----
 docs/Samba-HOWTO-Collection/Diagnosis.xml                |  6 +-----
 docs/Samba-HOWTO-Collection/DomainMember.xml             | 10 +---------
 docs/Samba-HOWTO-Collection/FastStart.xml                | 10 +---------
 docs/Samba-HOWTO-Collection/Further-Resources.xml        |  7 +------
 docs/Samba-HOWTO-Collection/Group-Mapping.xml            | 10 +---------
 docs/Samba-HOWTO-Collection/HighAvailability.xml         |  6 +-----
 docs/Samba-HOWTO-Collection/IDMAP.xml                    | 10 +---------
 docs/Samba-HOWTO-Collection/Install.xml                  | 10 +---------
 docs/Samba-HOWTO-Collection/Integrating-with-Windows.xml | 10 +---------
 docs/Samba-HOWTO-Collection/InterdomainTrusts.xml        |  7 +------
 docs/Samba-HOWTO-Collection/IntroSMB.xml                 | 10 +---------
 docs/Samba-HOWTO-Collection/LargeFile.xml                |  5 +----
 docs/Samba-HOWTO-Collection/NT4Migration.xml             |  6 +-----
 docs/Samba-HOWTO-Collection/NetworkBrowsing.xml          |  7 +------
 docs/Samba-HOWTO-Collection/Other-Clients.xml            |  6 +-----
 docs/Samba-HOWTO-Collection/PAM.xml                      |  6 +-----
 docs/Samba-HOWTO-Collection/PDC.xml                      | 10 +---------
 docs/Samba-HOWTO-Collection/Passdb.xml                   |  7 +------
 docs/Samba-HOWTO-Collection/PolicyMgmt.xml               |  6 +-----
 docs/Samba-HOWTO-Collection/Portability.xml              |  6 +-----
 docs/Samba-HOWTO-Collection/Printing.xml                 |  7 +------
 docs/Samba-HOWTO-Collection/Problems.xml                 |  6 +-----
 docs/Samba-HOWTO-Collection/ProfileMgmt.xml              |  6 +-----
 docs/Samba-HOWTO-Collection/RightsAndPriviliges.xml      | 10 +---------
 docs/Samba-HOWTO-Collection/SWAT.xml                     |  6 +-----
 docs/Samba-HOWTO-Collection/Securing.xml                 |  7 +------
 docs/Samba-HOWTO-Collection/ServerType.xml               | 10 +---------
 docs/Samba-HOWTO-Collection/Speed.xml                    |  6 +-----
 docs/Samba-HOWTO-Collection/StandAloneServer.xml         | 10 +---------
 docs/Samba-HOWTO-Collection/Unicode.xml                  |  6 +-----
 docs/Samba-HOWTO-Collection/VFS.xml                      |  7 +------
 docs/Samba-HOWTO-Collection/Winbind.xml                  |  6 +-----
 docs/Samba-HOWTO-Collection/WindowsClientConfig.xml      |  7 +------
 docs/Samba-HOWTO-Collection/foreword-tridge.xml          |  1 +
 docs/Samba-HOWTO-Collection/glossary.xml                 |  6 +-----
 docs/Samba-HOWTO-Collection/index.xml                    |  4 +---
 docs/Samba-HOWTO-Collection/locking.xml                  | 10 +---------
 docs/Samba-HOWTO-Collection/msdfs.xml                    |  7 +------
 docs/Samba-HOWTO-Collection/upgrading-to-3.0.xml         |  6 +-----
 50 files changed, 54 insertions(+), 306 deletions(-)

diff --git a/docs/Makefile b/docs/Makefile
index e08a1152770..97bf3634b49 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -30,15 +30,13 @@ help:
 	@echo " all - Build all docs that can be build using the utilities found by configure"
 	@echo " everything - Build all of the above"
 	@echo " pdf,tex,dvi,ps,manpages,txt,pearson,fo,htmlhelp - Build specific output format"
-	@echo " html - Build multi-file HTML version of HOWTO Collection, Guide and Dev-Guide"
-	@echo " html-single - Build single-file HTML version of HOWTO Collection, Guide and Dev-Guide"
+	@echo " html - Build multi-file HTML versions"
+	@echo " html-single - Build single-file HTML versions"
 	@echo " htmlman - Build HTML version of manpages"
 	@echo " undocumented - Output list of undocumented smb.conf options"
 	@echo " samples - Extract examples"
 	@echo " files - Extract other files"
 
-
-
 Samba-Guide/index.xml: $(subst Samba-Guide/index.xml,,$(wildcard Samba-Guide/*.xml))
 Samba-HOWTO-Collection/index.xml: $(subst Samba-HOWTO-Collection/index.xml,,$(wildcard Samba-HOWTO-Collection/*.xml)) Samba-HOWTO-Collection-attributions.xml
 Samba-Developers-Guide/index.xml: $(subst Samba-Developers-Guide/index.xml,,$(wildcard Samba-Developers-Guide/*.xml)) Samba-Developers-Guide-attributions.xml
@@ -67,6 +65,7 @@ htmlman: $(patsubst $(MANPAGEDIR)/%.xml,$(HTMLDIR)/%.html,$(MANPAGES)) $(HTMLDIR
 html-single: $(patsubst $(DOCBOOKDIR)/%.xml,$(HTMLDIR)/%.html,$(MAIN_DOCS))
 html: $(patsubst $(DOCBOOKDIR)/%.xml,$(HTMLDIR)/%/index.html,$(MAIN_DOCS)) $(HTMLDIR)/index.html
 htmlhelp: $(patsubst $(DOCBOOKDIR)/%.xml,$(HTMLHELPDIR)/%,$(MAIN_DOCS))
+validate: $(patsubst $(DOCBOOKDIR)/%.xml,$(VALIDATEDIR)/%.report.html,$(MAIN_DOCS))
 
 # Intermediate docbook docs
 
@@ -230,8 +229,6 @@ $(VALIDATEDIR)/%.report.html: %/index.xml
 	mkdir -p $(@D)
 	$(XMLLINT) --xinclude --postvalid --noout --htmlout $< 2> $@
 
-validate: $(VALIDATEDIR)/Samba-HOWTO-Collection.report.html $(VALIDATEDIR)/Samba-Developers-Guide.report.html $(VALIDATEDIR)/Samba-Guide.report.html 
-
 # Find undocumented parameters
 undocumented: $(SMBDOTCONFDOC)/parameters.all.xml scripts/find_missing_doc.pl scripts/find_missing_manpages.pl
 	@$(PERL) scripts/find_missing_doc.pl $(SRCDIR)
@@ -249,8 +246,8 @@ samples: $(DOCBOOKDIR)/Samba-HOWTO-Collection.xml xslt/extract-examples.xsl scri
 # Archiving
 archive: pdf
 	mkdir -p $(ARCHIVEDIR)
-	cp $(PDFDIR)/Samba-HOWTO-Collection.pdf $(ARCHIVEDIR)/TOSHARG-`date +%Y%m%d%H%M%S`.pdf
-	cp $(PDFDIR)/Samba-Guide.pdf $(ARCHIVEDIR)/S3bE-`date +%Y%m%d%H%M%S`.pdf
+	cp $(PDFDIR)/Samba-HOWTO-Collection.pdf $(ARCHIVEDIR)/TOSHARG-$(shell date +%Y%m%d%H%M%S).pdf
+	cp $(PDFDIR)/Samba-Guide.pdf $(ARCHIVEDIR)/S3bE-$(shell date +%Y%m%d%H%M%S).pdf
 
 # XSL scripts
 xslt/html.xsl: xslt/html-common.xsl settings.xsl
diff --git a/docs/Samba-Developers-Guide/index.xml b/docs/Samba-Developers-Guide/index.xml
index 1917c675e61..9d3cc9aea79 100644
--- a/docs/Samba-Developers-Guide/index.xml
+++ b/docs/Samba-Developers-Guide/index.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//samba//DTD Samba XML V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc" [
-<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 
 <book id="Samba-Developers-Guide"
 	xmlns:xi="http://www.w3.org/2003/XInclude">
diff --git a/docs/Samba-Guide/index.xml b/docs/Samba-Guide/index.xml
index 549f8e50e73..a4b788ef83b 100644
--- a/docs/Samba-Guide/index.xml
+++ b/docs/Samba-Guide/index.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//Samba//DTD Samba XML 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">
 
-  <!-- entities files to use -->
-  <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
-  %global_entities;
-
-]>
 <book id="S3bE"
 	xmlns:xi="http://www.w3.org/2003/XInclude">
 	<title>Samba-3 by Example</title>
diff --git a/docs/Samba-HOWTO-Collection/AccessControls.xml b/docs/Samba-HOWTO-Collection/AccessControls.xml
index fc129f67128..a331429a23b 100644
--- a/docs/Samba-HOWTO-Collection/AccessControls.xml
+++ b/docs/Samba-HOWTO-Collection/AccessControls.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="AccessControls">
 <chapterinfo>
diff --git a/docs/Samba-HOWTO-Collection/AdvancedNetworkAdmin.xml b/docs/Samba-HOWTO-Collection/AdvancedNetworkAdmin.xml
index a95b9f21262..4582932f93c 100644
--- a/docs/Samba-HOWTO-Collection/AdvancedNetworkAdmin.xml
+++ b/docs/Samba-HOWTO-Collection/AdvancedNetworkAdmin.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="AdvancedNetworkManagement">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/Samba-HOWTO-Collection/BDC.xml b/docs/Samba-HOWTO-Collection/BDC.xml
index a43f5ad4923..8f9dd5efd48 100644
--- a/docs/Samba-HOWTO-Collection/BDC.xml
+++ b/docs/Samba-HOWTO-Collection/BDC.xml
@@ -1,13 +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" [
-
-  <!-- entities files to use -->
-  <!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="samba-bdc">
 
 <chapterinfo>
diff --git a/docs/Samba-HOWTO-Collection/Backup.xml b/docs/Samba-HOWTO-Collection/Backup.xml
index 5c4dceed381..c42ee95f3ca 100644
--- a/docs/Samba-HOWTO-Collection/Backup.xml
+++ b/docs/Samba-HOWTO-Collection/Backup.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="Backup">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/Samba-HOWTO-Collection/Bugs.xml b/docs/Samba-HOWTO-Collection/Bugs.xml
index 936d5a62eb2..0f8378993fa 100644
--- a/docs/Samba-HOWTO-Collection/Bugs.xml
+++ b/docs/Samba-HOWTO-Collection/Bugs.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="bugreport">
 
 <chapterinfo>
diff --git a/docs/Samba-HOWTO-Collection/CUPS-printing.xml b/docs/Samba-HOWTO-Collection/CUPS-printing.xml
index 6504dd8e03e..3c80144a44c 100644
--- a/docs/Samba-HOWTO-Collection/CUPS-printing.xml
+++ b/docs/Samba-HOWTO-Collection/CUPS-printing.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="CUPS-printing">
 
 <chapterinfo>
diff --git a/docs/Samba-HOWTO-Collection/Compiling.xml b/docs/Samba-HOWTO-Collection/Compiling.xml
index 3ff8046dbec..a8182224040 100644
--- a/docs/Samba-HOWTO-Collection/Compiling.xml
+++ b/docs/Samba-HOWTO-Collection/Compiling.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="compiling">
 <chapterinfo>
 	&author.jelmer;
diff --git a/docs/Samba-HOWTO-Collection/DNS-DHCP-Configuration.xml b/docs/Samba-HOWTO-Collection/DNS-DHCP-Configuration.xml
index 67a31425727..74f61248658 100644
--- a/docs/Samba-HOWTO-Collection/DNS-DHCP-Configuration.xml
+++ b/docs/Samba-HOWTO-Collection/DNS-DHCP-Configuration.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="DNSDHCP">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/Samba-HOWTO-Collection/Diagnosis.xml b/docs/Samba-HOWTO-Collection/Diagnosis.xml
index eb7e29797d0..f6403dcf2c5 100644
--- a/docs/Samba-HOWTO-Collection/Diagnosis.xml
+++ b/docs/Samba-HOWTO-Collection/Diagnosis.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="diagnosis">
 <chapterinfo>
 	&author.tridge;
diff --git a/docs/Samba-HOWTO-Collection/DomainMember.xml b/docs/Samba-HOWTO-Collection/DomainMember.xml
index d0c72ee1261..649766b6c1d 100644
--- a/docs/Samba-HOWTO-Collection/DomainMember.xml
+++ b/docs/Samba-HOWTO-Collection/DomainMember.xml
@@ -1,13 +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" [
-
-  <!-- entities files to use -->
-  <!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="domain-member">
 
 <chapterinfo>
diff --git a/docs/Samba-HOWTO-Collection/FastStart.xml b/docs/Samba-HOWTO-Collection/FastStart.xml
index b2cde2bd96c..66c7cec1383 100644
--- a/docs/Samba-HOWTO-Collection/FastStart.xml
+++ b/docs/Samba-HOWTO-Collection/FastStart.xml
@@ -1,13 +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" [
-
-  <!-- entities files to use -->
-  <!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="FastStart">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/Samba-HOWTO-Collection/Further-Resources.xml b/docs/Samba-HOWTO-Collection/Further-Resources.xml
index 8ca95442be6..001ec6a0775 100644
--- a/docs/Samba-HOWTO-Collection/Further-Resources.xml
+++ b/docs/Samba-HOWTO-Collection/Further-Resources.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="Further-Resources">
 <chapterinfo>
 	&author.jelmer;
diff --git a/docs/Samba-HOWTO-Collection/Group-Mapping.xml b/docs/Samba-HOWTO-Collection/Group-Mapping.xml
index 9809517ec50..4d983655b4b 100644
--- a/docs/Samba-HOWTO-Collection/Group-Mapping.xml
+++ b/docs/Samba-HOWTO-Collection/Group-Mapping.xml
@@ -1,13 +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" [
-
-  <!-- entities files to use -->
-  <!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="groupmapping">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/Samba-HOWTO-Collection/HighAvailability.xml b/docs/Samba-HOWTO-Collection/HighAvailability.xml
index b3c94dd79de..3f0186c3737 100644
--- a/docs/Samba-HOWTO-Collection/HighAvailability.xml
+++ b/docs/Samba-HOWTO-Collection/HighAvailability.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="SambaHA">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/Samba-HOWTO-Collection/IDMAP.xml b/docs/Samba-HOWTO-Collection/IDMAP.xml
index 3ce49d9b622..a90902a70ff 100644
--- a/docs/Samba-HOWTO-Collection/IDMAP.xml
+++ b/docs/Samba-HOWTO-Collection/IDMAP.xml
@@ -1,13 +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" [
-
-  <!-- entities files to use -->
-  <!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="idmapper">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/Samba-HOWTO-Collection/Install.xml b/docs/Samba-HOWTO-Collection/Install.xml
index 284d6853cac..c5b579a0464 100644
--- a/docs/Samba-HOWTO-Collection/Install.xml
+++ b/docs/Samba-HOWTO-Collection/Install.xml
@@ -1,13 +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" [
-
-  <!-- entities files to use -->
-  <!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="install">
 <chapterinfo>
 	&author.tridge;
diff --git a/docs/Samba-HOWTO-Collection/Integrating-with-Windows.xml b/docs/Samba-HOWTO-Collection/Integrating-with-Windows.xml
index 468aabb5bc7..bfbd1b52da0 100644
--- a/docs/Samba-HOWTO-Collection/Integrating-with-Windows.xml
+++ b/docs/Samba-HOWTO-Collection/Integrating-with-Windows.xml
@@ -1,13 +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" [
-
-  <!-- entities files to use -->
-  <!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="integrate-ms-networks">
  
 <chapterinfo>
diff --git a/docs/Samba-HOWTO-Collection/InterdomainTrusts.xml b/docs/Samba-HOWTO-Collection/InterdomainTrusts.xml
index c3bfa992bb8..f255924b23f 100644
--- a/docs/Samba-HOWTO-Collection/InterdomainTrusts.xml
+++ b/docs/Samba-HOWTO-Collection/InterdomainTrusts.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="InterdomainTrusts">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/Samba-HOWTO-Collection/IntroSMB.xml b/docs/Samba-HOWTO-Collection/IntroSMB.xml
index 9e91d1f70d2..44fde8301c6 100644
--- a/docs/Samba-HOWTO-Collection/IntroSMB.xml
+++ b/docs/Samba-HOWTO-Collection/IntroSMB.xml
@@ -1,13 +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" [
-
-  <!-- entities files to use -->
-  <!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">
 <preface id="IntroSMB">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/Samba-HOWTO-Collection/LargeFile.xml b/docs/Samba-HOWTO-Collection/LargeFile.xml
index 01ef99fe8b5..441094f2feb 100644
--- a/docs/Samba-HOWTO-Collection/LargeFile.xml
+++ b/docs/Samba-HOWTO-Collection/LargeFile.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//samba//DTD Samba XML V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc" [
-<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
-]>
-
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <chapter id="largefile">
 <chapterinfo>
 	&author.jeremy;
diff --git a/docs/Samba-HOWTO-Collection/NT4Migration.xml b/docs/Samba-HOWTO-Collection/NT4Migration.xml
index 28706041e6a..f26a1d95af2 100644
--- a/docs/Samba-HOWTO-Collection/NT4Migration.xml
+++ b/docs/Samba-HOWTO-Collection/NT4Migration.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="NT4Migration">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml b/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml
index 5dbfddce4ba..54c4846c667 100644
--- a/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml
+++ b/docs/Samba-HOWTO-Collection/NetworkBrowsing.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="NetworkBrowsing">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/Samba-HOWTO-Collection/Other-Clients.xml b/docs/Samba-HOWTO-Collection/Other-Clients.xml
index c0d80ae8610..a53896cd965 100644
--- a/docs/Samba-HOWTO-Collection/Other-Clients.xml
+++ b/docs/Samba-HOWTO-Collection/Other-Clients.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="Other-Clients">
 <chapterinfo>
 	&author.jelmer;
diff --git a/docs/Samba-HOWTO-Collection/PAM.xml b/docs/Samba-HOWTO-Collection/PAM.xml
index d5240f021a9..239d322ecf8 100644
--- a/docs/Samba-HOWTO-Collection/PAM.xml
+++ b/docs/Samba-HOWTO-Collection/PAM.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="pam">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/Samba-HOWTO-Collection/PDC.xml b/docs/Samba-HOWTO-Collection/PDC.xml
index cc973343c22..dd2f73585b5 100644
--- a/docs/Samba-HOWTO-Collection/PDC.xml
+++ b/docs/Samba-HOWTO-Collection/PDC.xml
@@ -1,13 +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" [
-
-  <!-- entities files to use -->
-  <!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="samba-pdc">
 
 <chapterinfo>
diff --git a/docs/Samba-HOWTO-Collection/Passdb.xml b/docs/Samba-HOWTO-Collection/Passdb.xml
index 15983d7420d..adfec20df56 100644
--- a/docs/Samba-HOWTO-Collection/Passdb.xml
+++ b/docs/Samba-HOWTO-Collection/Passdb.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="passdb">
 <chapterinfo>
 	&author.jelmer;
diff --git a/docs/Samba-HOWTO-Collection/PolicyMgmt.xml b/docs/Samba-HOWTO-Collection/PolicyMgmt.xml
index 2f63148a587..e1b33e0916a 100644
--- a/docs/Samba-HOWTO-Collection/PolicyMgmt.xml
+++ b/docs/Samba-HOWTO-Collection/PolicyMgmt.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="PolicyMgmt">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/Samba-HOWTO-Collection/Portability.xml b/docs/Samba-HOWTO-Collection/Portability.xml
index a4f7107e41a..8dd3c28ac89 100644
--- a/docs/Samba-HOWTO-Collection/Portability.xml
+++ b/docs/Samba-HOWTO-Collection/Portability.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="Portability">
 <chapterinfo>
 	&author.jelmer;
diff --git a/docs/Samba-HOWTO-Collection/Printing.xml b/docs/Samba-HOWTO-Collection/Printing.xml
index 9266712727c..b02bab0d526 100644
--- a/docs/Samba-HOWTO-Collection/Printing.xml
+++ b/docs/Samba-HOWTO-Collection/Printing.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="printing">
 
 <chapterinfo>
diff --git a/docs/Samba-HOWTO-Collection/Problems.xml b/docs/Samba-HOWTO-Collection/Problems.xml
index 3bc50968ec2..e6507bf3e1f 100644
--- a/docs/Samba-HOWTO-Collection/Problems.xml
+++ b/docs/Samba-HOWTO-Collection/Problems.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="problems">
 
 <chapterinfo>
diff --git a/docs/Samba-HOWTO-Collection/ProfileMgmt.xml b/docs/Samba-HOWTO-Collection/ProfileMgmt.xml
index f84deca9943..6ac8e7c2958 100644
--- a/docs/Samba-HOWTO-Collection/ProfileMgmt.xml
+++ b/docs/Samba-HOWTO-Collection/ProfileMgmt.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="ProfileMgmt">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/Samba-HOWTO-Collection/RightsAndPriviliges.xml b/docs/Samba-HOWTO-Collection/RightsAndPriviliges.xml
index ef670e201d6..0d16314cd3a 100644
--- a/docs/Samba-HOWTO-Collection/RightsAndPriviliges.xml
+++ b/docs/Samba-HOWTO-Collection/RightsAndPriviliges.xml
@@ -1,13 +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" [
-
-  <!-- entities files to use -->
-  <!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="rights">
 <chapterinfo>
         &author.jerry;
diff --git a/docs/Samba-HOWTO-Collection/SWAT.xml b/docs/Samba-HOWTO-Collection/SWAT.xml
index 1f14d70546e..1902cdd06ce 100644
--- a/docs/Samba-HOWTO-Collection/SWAT.xml
+++ b/docs/Samba-HOWTO-Collection/SWAT.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="SWAT">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/Samba-HOWTO-Collection/Securing.xml b/docs/Samba-HOWTO-Collection/Securing.xml
index 4a21699c61d..28ab3b31cfe 100644
--- a/docs/Samba-HOWTO-Collection/Securing.xml
+++ b/docs/Samba-HOWTO-Collection/Securing.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="securing-samba">
 
 <chapterinfo>
diff --git a/docs/Samba-HOWTO-Collection/ServerType.xml b/docs/Samba-HOWTO-Collection/ServerType.xml
index 042303a3379..8a0fb01c906 100644
--- a/docs/Samba-HOWTO-Collection/ServerType.xml
+++ b/docs/Samba-HOWTO-Collection/ServerType.xml
@@ -1,13 +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" [
-
-  <!-- entities files to use -->
-  <!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="ServerType">
 <chapterinfo>
 	&author.tridge;
diff --git a/docs/Samba-HOWTO-Collection/Speed.xml b/docs/Samba-HOWTO-Collection/Speed.xml
index 44956f68122..74c6ec2b739 100644
--- a/docs/Samba-HOWTO-Collection/Speed.xml
+++ b/docs/Samba-HOWTO-Collection/Speed.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="speed">
 
 <chapterinfo>
diff --git a/docs/Samba-HOWTO-Collection/StandAloneServer.xml b/docs/Samba-HOWTO-Collection/StandAloneServer.xml
index 99396d5b1c4..f493eae71d3 100644
--- a/docs/Samba-HOWTO-Collection/StandAloneServer.xml
+++ b/docs/Samba-HOWTO-Collection/StandAloneServer.xml
@@ -1,13 +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" [
-
-  <!-- entities files to use -->
-  <!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="StandAloneServer">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/Samba-HOWTO-Collection/Unicode.xml b/docs/Samba-HOWTO-Collection/Unicode.xml
index 0f618e9d5b8..3e6428db5da 100644
--- a/docs/Samba-HOWTO-Collection/Unicode.xml
+++ b/docs/Samba-HOWTO-Collection/Unicode.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="unicode">
 <chapterinfo>
 	&author.jelmer;
diff --git a/docs/Samba-HOWTO-Collection/VFS.xml b/docs/Samba-HOWTO-Collection/VFS.xml
index 3fa0068411c..fe01973d972 100644
--- a/docs/Samba-HOWTO-Collection/VFS.xml
+++ b/docs/Samba-HOWTO-Collection/VFS.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="VFS">
 <chapterinfo>
 	&author.jelmer;
diff --git a/docs/Samba-HOWTO-Collection/Winbind.xml b/docs/Samba-HOWTO-Collection/Winbind.xml
index 6405118f2cb..c3762278ee1 100644
--- a/docs/Samba-HOWTO-Collection/Winbind.xml
+++ b/docs/Samba-HOWTO-Collection/Winbind.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="winbind">
 
 <chapterinfo>
diff --git a/docs/Samba-HOWTO-Collection/WindowsClientConfig.xml b/docs/Samba-HOWTO-Collection/WindowsClientConfig.xml
index ec431d28702..86cf7100ba0 100644
--- a/docs/Samba-HOWTO-Collection/WindowsClientConfig.xml
+++ b/docs/Samba-HOWTO-Collection/WindowsClientConfig.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="ClientConfig">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/Samba-HOWTO-Collection/foreword-tridge.xml b/docs/Samba-HOWTO-Collection/foreword-tridge.xml
index f140d6bb095..c89a7a9e283 100644
--- a/docs/Samba-HOWTO-Collection/foreword-tridge.xml
+++ b/docs/Samba-HOWTO-Collection/foreword-tridge.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <preface>
 	<title>Foreword</title>
 
diff --git a/docs/Samba-HOWTO-Collection/glossary.xml b/docs/Samba-HOWTO-Collection/glossary.xml
index 72c27a5dbf5..8aac554782b 100644
--- a/docs/Samba-HOWTO-Collection/glossary.xml
+++ b/docs/Samba-HOWTO-Collection/glossary.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">
 <glossary>
 	<title>Glossary</title>
 
diff --git a/docs/Samba-HOWTO-Collection/index.xml b/docs/Samba-HOWTO-Collection/index.xml
index 14f595cae17..6ec70c83b36 100644
--- a/docs/Samba-HOWTO-Collection/index.xml
+++ b/docs/Samba-HOWTO-Collection/index.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//samba//DTD Samba XML V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc" [
-<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 
 <book id="Samba-HOWTO-Collection"
 	xmlns:xi="http://www.w3.org/2003/XInclude">
diff --git a/docs/Samba-HOWTO-Collection/locking.xml b/docs/Samba-HOWTO-Collection/locking.xml
index 555efd37a8a..3c85e991eef 100644
--- a/docs/Samba-HOWTO-Collection/locking.xml
+++ b/docs/Samba-HOWTO-Collection/locking.xml
@@ -1,13 +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" [
-
-  <!-- entities files to use -->
-  <!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="locking">
 <chapterinfo>
 	&author.jeremy;
diff --git a/docs/Samba-HOWTO-Collection/msdfs.xml b/docs/Samba-HOWTO-Collection/msdfs.xml
index e4a83b787a2..97ddfceec2c 100644
--- a/docs/Samba-HOWTO-Collection/msdfs.xml
+++ b/docs/Samba-HOWTO-Collection/msdfs.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="msdfs">
 
 <chapterinfo>
diff --git a/docs/Samba-HOWTO-Collection/upgrading-to-3.0.xml b/docs/Samba-HOWTO-Collection/upgrading-to-3.0.xml
index 6633a1bab60..82bbe946933 100644
--- a/docs/Samba-HOWTO-Collection/upgrading-to-3.0.xml
+++ b/docs/Samba-HOWTO-Collection/upgrading-to-3.0.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="upgrading-to-3.0">
 <chapterinfo>
 	&author.jelmer;
-- 
2.11.4.GIT