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)

22 files changed, 22 insertions, 181 deletions

diff --git a/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml b/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml
index dc35822cdb..f3d39ad04c 100644
--- a/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml
+++ b/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.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="primer">
   <title>Networking Primer</title>
 
diff --git a/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml b/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml
index 89aedf2cac..9b39685ce0 100644
--- a/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml
+++ b/docs/Samba-Guide/Chap02-SimpleOfficeServer.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="simple">
   <title>No Frills Samba Servers</title>
 
diff --git a/docs/Samba-Guide/Chap03-TheSmallOffice.xml b/docs/Samba-Guide/Chap03-TheSmallOffice.xml
index da8013a476..d700a1850c 100644
--- a/docs/Samba-Guide/Chap03-TheSmallOffice.xml
+++ b/docs/Samba-Guide/Chap03-TheSmallOffice.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="small">
   <title>Small Office Networking</title>
 
diff --git a/docs/Samba-Guide/Chap04-SecureOfficeServer.xml b/docs/Samba-Guide/Chap04-SecureOfficeServer.xml
index 947ac4a9b7..20103e0904 100644
--- a/docs/Samba-Guide/Chap04-SecureOfficeServer.xml
+++ b/docs/Samba-Guide/Chap04-SecureOfficeServer.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="secure">
   <title>Secure Office Networking</title>
 
diff --git a/docs/Samba-Guide/Chap05-500UserNetwork.xml b/docs/Samba-Guide/Chap05-500UserNetwork.xml
index 0b38bfde83..47d1b21d5a 100644
--- a/docs/Samba-Guide/Chap05-500UserNetwork.xml
+++ b/docs/Samba-Guide/Chap05-500UserNetwork.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="Big500users">
   <title>The 500-User Office</title>
 
diff --git a/docs/Samba-Guide/Chap06-MakingHappyUsers.xml b/docs/Samba-Guide/Chap06-MakingHappyUsers.xml
index d0f1515652..b3df50ef87 100644
--- a/docs/Samba-Guide/Chap06-MakingHappyUsers.xml
+++ b/docs/Samba-Guide/Chap06-MakingHappyUsers.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="happy">
   <title>Making Happy Users</title>
 
diff --git a/docs/Samba-Guide/Chap07-2000UserNetwork.xml b/docs/Samba-Guide/Chap07-2000UserNetwork.xml
index 529b66918c..68457abaf3 100644
--- a/docs/Samba-Guide/Chap07-2000UserNetwork.xml
+++ b/docs/Samba-Guide/Chap07-2000UserNetwork.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="2000users">
   <title>A Distributed 2000 User Network</title>
 
diff --git a/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml b/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml
index 4f0f74744c..4611fc6187 100644
--- a/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml
+++ b/docs/Samba-Guide/Chap08-MigrateNT4Samba3.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="migration">
   <title>Migrating NT4 Domain to Samba-3</title>
 
diff --git a/docs/Samba-Guide/Chap08b-MigrateNW4Samba3.xml b/docs/Samba-Guide/Chap08b-MigrateNW4Samba3.xml
index 24d9ddc0a8..0f3eefd99c 100644
--- a/docs/Samba-Guide/Chap08b-MigrateNW4Samba3.xml
+++ b/docs/Samba-Guide/Chap08b-MigrateNW4Samba3.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="nw4migration">
   <title>Migrating NetWare 4.11 Server to Samba-3</title>
 
diff --git a/docs/Samba-Guide/Chap09-AddingUNIXClients.xml b/docs/Samba-Guide/Chap09-AddingUNIXClients.xml
index 95fa2d947a..5cfc48d684 100644
--- a/docs/Samba-Guide/Chap09-AddingUNIXClients.xml
+++ b/docs/Samba-Guide/Chap09-AddingUNIXClients.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="unixclients">
   <title>Adding UNIX/LINUX Servers and Clients</title>
 
diff --git a/docs/Samba-Guide/Chap10-KerberosFastStart.xml b/docs/Samba-Guide/Chap10-KerberosFastStart.xml
index 1bee207791..02650ebb69 100644
--- a/docs/Samba-Guide/Chap10-KerberosFastStart.xml
+++ b/docs/Samba-Guide/Chap10-KerberosFastStart.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="kerberos">
   <title>Active Directory, Kerberos, and Security</title>
 
diff --git a/docs/Samba-Guide/Chap10b-DomainAppsSupport.xml b/docs/Samba-Guide/Chap10b-DomainAppsSupport.xml
index e2adbe9951..cd2894ec02 100644
--- a/docs/Samba-Guide/Chap10b-DomainAppsSupport.xml
+++ b/docs/Samba-Guide/Chap10b-DomainAppsSupport.xml
@@ -1,12 +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="DomApps">
   <title>Integrating Additional Services</title>
diff --git a/docs/Samba-Guide/Chap11-HighAvailability.xml b/docs/Samba-Guide/Chap11-HighAvailability.xml
index c4701eb7b0..60b1ef8ad1 100644
--- a/docs/Samba-Guide/Chap11-HighAvailability.xml
+++ b/docs/Samba-Guide/Chap11-HighAvailability.xml
@@ -1,12 +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="HA">
   <title>Performance, Reliability, and Availability</title>
diff --git a/docs/Samba-Guide/Chap12-Appendix.xml b/docs/Samba-Guide/Chap12-Appendix.xml
index 1b13d63ce5..3ce6739c66 100644
--- a/docs/Samba-Guide/Chap12-Appendix.xml
+++ b/docs/Samba-Guide/Chap12-Appendix.xml
@@ -1,12 +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">
 
 <appendix id="appendix">
   <title>Appendix: A Collection of Useful Tid-bits</title>
diff --git a/docs/Samba-Guide/acknowledgements.xml b/docs/Samba-Guide/acknowledgements.xml
index e356732fd0..edc72ca03e 100644
--- a/docs/Samba-Guide/acknowledgements.xml
+++ b/docs/Samba-Guide/acknowledgements.xml
@@ -1,12 +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 lang="en-US">
 <title>Acknowledgments</title>
diff --git a/docs/Samba-Guide/conventions.xml b/docs/Samba-Guide/conventions.xml
index 6d36cbf0e4..82763d5369 100644
--- a/docs/Samba-Guide/conventions.xml
+++ b/docs/Samba-Guide/conventions.xml
@@ -1,12 +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">
 
   <sect1>
     <title>Conventions Used</title>
diff --git a/docs/Samba-Guide/foreword.xml b/docs/Samba-Guide/foreword.xml
index d8f063d4e3..20060a8701 100644
--- a/docs/Samba-Guide/foreword.xml
+++ b/docs/Samba-Guide/foreword.xml
@@ -1,12 +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 lang="en-US">
 <title>Foreword</title>
diff --git a/docs/Samba-Guide/front-matter.xml b/docs/Samba-Guide/front-matter.xml
index 506a4d6ed5..93f542e5b8 100644
--- a/docs/Samba-Guide/front-matter.xml
+++ b/docs/Samba-Guide/front-matter.xml
@@ -1,12 +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 lang="en-US">
 <title>Front Matter</title>
diff --git a/docs/Samba-Guide/glossary.xml b/docs/Samba-Guide/glossary.xml
index ec6c5b8e54..54e72f681b 100644
--- a/docs/Samba-Guide/glossary.xml
+++ b/docs/Samba-Guide/glossary.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">
 <glossary>
 	<title>Glossary</title>
 
diff --git a/docs/Samba-Guide/gpl.xml b/docs/Samba-Guide/gpl.xml
index 4d0b778031..2084034c7b 100644
--- a/docs/Samba-Guide/gpl.xml
+++ b/docs/Samba-Guide/gpl.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">
 <appendix>
   <appendixinfo>
     <title>GNU General Public License</title>
diff --git a/docs/Samba-Guide/inside-cover.xml b/docs/Samba-Guide/inside-cover.xml
index 7390512448..877d01a334 100644
--- a/docs/Samba-Guide/inside-cover.xml
+++ b/docs/Samba-Guide/inside-cover.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 lang="en-US">
 <title>About the Cover Artwork</title>
 
diff --git a/docs/Samba-Guide/preface.xml b/docs/Samba-Guide/preface.xml
index f63e468dcd..04bc17bd72 100644
--- a/docs/Samba-Guide/preface.xml
+++ b/docs/Samba-Guide/preface.xml
@@ -1,12 +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="preface">
   <title>Preface</title>