Use xi:include instead of entities

(This used to be commit af2cabcc3cb8a2981664811001ed3366089be3b3)

43 files changed, 336 insertions, 93 deletions

diff --git a/docs/Makefile.in b/docs/Makefile.in
index adbf4f00bc..c5a2b0bb52 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -147,7 +147,7 @@ Samba-Developers-Guide.xml: $(DEVDOCDIR)/index.xml $(DEVDOCDIR_DEPS)
 	$(XSLTPROC) --stringparam noreference 1 --xinclude --output $@ xslt/expand-sambadoc.xsl $<
 
 $(HOWTODIR)/attributions.xml: $(HOWTODIR)/index.xml
-	@echo > $@ # Make sure we don't get recursive dependencies, etc!
+	@echo "<empty/>" > $@ # Make sure we don't get recursive dependencies, etc!
 	$(XSLTPROC) --output $@ xslt/generate-attributions.xsl $<
 
 $(DEVDOCDIR)/attributions.xml: $(DEVDOCDIR)/index.xml
diff --git a/docs/entities/global.entities b/docs/entities/global.entities
index 7683668297..3cd743398a 100644
--- a/docs/entities/global.entities
+++ b/docs/entities/global.entities
@@ -502,53 +502,6 @@ an Active Directory environment.
 <!ENTITY MAN-WBINFO SYSTEM "../manpages/wbinfo.1.xml">
 <!ENTITY MAN-WINBINDD SYSTEM "../manpages/winbindd.8.xml">
 
-
-<!ENTITY AccessControls SYSTEM "../howto/AccessControls.xml">
-<!ENTITY AdvancedNetworkAdmin SYSTEM "../howto/AdvancedNetworkAdmin.xml">
-<!ENTITY BUGS SYSTEM "../howto/Bugs.xml">
-<!ENTITY Backup SYSTEM "../howto/Backup.xml">
-<!ENTITY CUPS SYSTEM "../howto/CUPS-printing.xml">
-<!ENTITY Compiling SYSTEM "../howto/Compiling.xml">
-<!ENTITY DNS-DHCP-Configuration SYSTEM "../howto/DNS-DHCP-Configuration.xml">
-<!ENTITY DOMAIN-MEMBER SYSTEM "../howto/DomainMember.xml">
-<!ENTITY Diagnosis SYSTEM "../howto/Diagnosis.xml">
-<!ENTITY FastStart SYSTEM "../howto/FastStart.xml">
-<!ENTITY Further-Resources SYSTEM "../howto/Further-Resources.xml">
-<!ENTITY GROUP-MAPPING-HOWTO SYSTEM "../howto/Group-Mapping.xml">
-<!ENTITY HighAvailability SYSTEM "../howto/HighAvailability.xml">
-<!ENTITY IntegratingWithWindows SYSTEM "../howto/Integrating-with-Windows.xml">
-<!ENTITY IntroSMB SYSTEM "../howto/IntroSMB.xml">
-<!ENTITY MS-Dfs-Setup SYSTEM "../howto/msdfs.xml">
-<!ENTITY NT4Migration SYSTEM "../howto/NT4Migration.xml">
-<!ENTITY NetworkBrowsing SYSTEM "../howto/NetworkBrowsing.xml">
-<!ENTITY Other-Clients SYSTEM "../howto/Other-Clients.xml">
-<!ENTITY PRINTER-DRIVER2 SYSTEM "../howto/Printing.xml">
-<!ENTITY Passdb SYSTEM "../howto/Passdb.xml">
-<!ENTITY PolicyMgmt SYSTEM "../howto/PolicyMgmt.xml">
-<!ENTITY Portability SYSTEM "../howto/Portability.xml">
-<!ENTITY ProfileMgmt SYSTEM "../howto/ProfileMgmt.xml">
-<!ENTITY SPEED SYSTEM "../howto/Speed.xml">
-<!ENTITY SWAT SYSTEM "../howto/SWAT.xml">
-<!ENTITY Samba-BDC-HOWTO SYSTEM "../howto/BDC.xml">
-<!ENTITY Samba-PAM SYSTEM "../howto/PAM.xml">
-<!ENTITY Samba-PDC-HOWTO SYSTEM "../howto/PDC.xml">
-<!ENTITY SecuringSamba SYSTEM "../howto/Securing.xml">
-<!ENTITY ServerType SYSTEM "../howto/ServerType.xml">
-<!ENTITY StandAloneServer SYSTEM "../howto/StandAloneServer.xml">
-<!ENTITY Trusts SYSTEM "../howto/InterdomainTrusts.xml">
-<!ENTITY UNIX-INSTALL SYSTEM "../howto/Install.xml">
-<!ENTITY upgrading SYSTEM "../howto/upgrading-to-3.0.xml">
-<!ENTITY VFS SYSTEM "../howto/VFS.xml">
-<!ENTITY WINBIND SYSTEM "../howto/Winbind.xml">
-<!ENTITY ClientConfig SYSTEM "../howto/WindowsClientConfig.xml">
-<!ENTITY locking SYSTEM "../howto/locking.xml">
-<!ENTITY problems SYSTEM "../howto/Problems.xml">
-<!ENTITY unicode SYSTEM "../howto/Unicode.xml">
-<!ENTITY attributions SYSTEM "../howto/attributions.xml">
-<!ENTITY attributions-dev SYSTEM "../devel/attributions.xml">
-<!ENTITY glossary SYSTEM "../howto/glossary.xml">
-<!ENTITY foreword-tridge SYSTEM "../howto/foreword-tridge.xml">
-
 <!ENTITY not.implemented "<note><para>Currently NOT implemented.</para></note>">
 <!ENTITY rootprompt "<prompt>root# </prompt>">
 <!ENTITY prompt "<prompt>$ </prompt>">
diff --git a/docs/howto/AccessControls.xml b/docs/howto/AccessControls.xml
index 13228b7ff0..3e933bf01b 100644
--- a/docs/howto/AccessControls.xml
+++ b/docs/howto/AccessControls.xml
@@ -1,3 +1,10 @@
+<?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;
+]>
+
 <chapter id="AccessControls">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/howto/AdvancedNetworkAdmin.xml b/docs/howto/AdvancedNetworkAdmin.xml
index 96b0dd208d..a95b9f2126 100644
--- a/docs/howto/AdvancedNetworkAdmin.xml
+++ b/docs/howto/AdvancedNetworkAdmin.xml
@@ -1,3 +1,9 @@
+<?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;
+]>
 <chapter id="AdvancedNetworkManagement">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/howto/BDC.xml b/docs/howto/BDC.xml
index 72dc69938e..6f70eea867 100644
--- a/docs/howto/BDC.xml
+++ b/docs/howto/BDC.xml
@@ -1,3 +1,13 @@
+<?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;
+
+]>
+
 <chapter id="samba-bdc">
 
 <chapterinfo>
diff --git a/docs/howto/Backup.xml b/docs/howto/Backup.xml
index a998e700ec..5c4dceed38 100644
--- a/docs/howto/Backup.xml
+++ b/docs/howto/Backup.xml
@@ -1,3 +1,9 @@
+<?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;
+]>
 <chapter id="Backup">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/howto/Bugs.xml b/docs/howto/Bugs.xml
index 1520545aa0..12f8055599 100644
--- a/docs/howto/Bugs.xml
+++ b/docs/howto/Bugs.xml
@@ -1,3 +1,9 @@
+<?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;
+]>
 <chapter id="bugreport">
 
 <chapterinfo>
diff --git a/docs/howto/CUPS-printing.xml b/docs/howto/CUPS-printing.xml
index 76b23f1ffb..6dd4d0418d 100644
--- a/docs/howto/CUPS-printing.xml
+++ b/docs/howto/CUPS-printing.xml
@@ -1,3 +1,10 @@
+<?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;
+]>
+
 <chapter id="CUPS-printing">
 
 <chapterinfo>
diff --git a/docs/howto/Compiling.xml b/docs/howto/Compiling.xml
index 9ffd3dfb6a..4260e7dda0 100644
--- a/docs/howto/Compiling.xml
+++ b/docs/howto/Compiling.xml
@@ -1,3 +1,9 @@
+<?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;
+]>
 <chapter id="compiling">
 <chapterinfo>
 	&author.jelmer;
diff --git a/docs/howto/DNS-DHCP-Configuration.xml b/docs/howto/DNS-DHCP-Configuration.xml
index fa1c7636d2..67a3142572 100644
--- a/docs/howto/DNS-DHCP-Configuration.xml
+++ b/docs/howto/DNS-DHCP-Configuration.xml
@@ -1,3 +1,9 @@
+<?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;
+]>
 <chapter id="DNSDHCP">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/howto/Diagnosis.xml b/docs/howto/Diagnosis.xml
index dc3b43972a..eb7e29797d 100644
--- a/docs/howto/Diagnosis.xml
+++ b/docs/howto/Diagnosis.xml
@@ -1,3 +1,9 @@
+<?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;
+]>
 <chapter id="diagnosis">
 <chapterinfo>
 	&author.tridge;
diff --git a/docs/howto/DomainMember.xml b/docs/howto/DomainMember.xml
index 72b00663f7..df38cef0b6 100644
--- a/docs/howto/DomainMember.xml
+++ b/docs/howto/DomainMember.xml
@@ -1,3 +1,13 @@
+<?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;
+
+]>
+
 <chapter id="domain-member">
 
 <chapterinfo>
diff --git a/docs/howto/FastStart.xml b/docs/howto/FastStart.xml
index c8ba33c70f..3a9d95fcdc 100644
--- a/docs/howto/FastStart.xml
+++ b/docs/howto/FastStart.xml
@@ -1,3 +1,13 @@
+<?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;
+
+]>
+
 <chapter id="FastStart">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/howto/Group-Mapping.xml b/docs/howto/Group-Mapping.xml
index 475f7f6289..7197b12a21 100644
--- a/docs/howto/Group-Mapping.xml
+++ b/docs/howto/Group-Mapping.xml
@@ -1,4 +1,13 @@
-<?xml version="1.0" encoding="iso8859-1"?>
+<?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;
+
+]>
+
 <chapter id="groupmapping">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/howto/HighAvailability.xml b/docs/howto/HighAvailability.xml
index 9af1abe9cd..b3c94dd79d 100644
--- a/docs/howto/HighAvailability.xml
+++ b/docs/howto/HighAvailability.xml
@@ -1,3 +1,9 @@
+<?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;
+]>
 <chapter id="SambaHA">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/howto/Install.xml b/docs/howto/Install.xml
index a4ba1c0aa7..1390fd2310 100644
--- a/docs/howto/Install.xml
+++ b/docs/howto/Install.xml
@@ -1,3 +1,13 @@
+<?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;
+
+]>
+
 <chapter id="install">
 <chapterinfo>
 	&author.tridge;
diff --git a/docs/howto/InterdomainTrusts.xml b/docs/howto/InterdomainTrusts.xml
index 22ccb2e7c3..78e92db5a8 100644
--- a/docs/howto/InterdomainTrusts.xml
+++ b/docs/howto/InterdomainTrusts.xml
@@ -1,3 +1,10 @@
+<?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;
+]>
+
 <chapter id="InterdomainTrusts">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/howto/IntroSMB.xml b/docs/howto/IntroSMB.xml
index 5cb5be57ef..9e91d1f70d 100644
--- a/docs/howto/IntroSMB.xml
+++ b/docs/howto/IntroSMB.xml
@@ -1,3 +1,13 @@
+<?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;
+
+]>
+
 <preface id="IntroSMB">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/howto/NT4Migration.xml b/docs/howto/NT4Migration.xml
index 5cb4e0c117..2b34fa8b26 100644
--- a/docs/howto/NT4Migration.xml
+++ b/docs/howto/NT4Migration.xml
@@ -1,3 +1,9 @@
+<?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;
+]>
 <chapter id="NT4Migration">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/howto/NetworkBrowsing.xml b/docs/howto/NetworkBrowsing.xml
index 0bb464bf79..1855fa1809 100644
--- a/docs/howto/NetworkBrowsing.xml
+++ b/docs/howto/NetworkBrowsing.xml
@@ -1,3 +1,10 @@
+<?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;
+]>
+
 <chapter id="NetworkBrowsing">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/howto/Other-Clients.xml b/docs/howto/Other-Clients.xml
index 19c1af60d9..3cfc02b068 100644
--- a/docs/howto/Other-Clients.xml
+++ b/docs/howto/Other-Clients.xml
@@ -1,3 +1,9 @@
+<?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;
+]>
 <chapter id="Other-Clients">
 <chapterinfo>
 	&author.jelmer;
diff --git a/docs/howto/PAM.xml b/docs/howto/PAM.xml
index 7e5911bb19..49ff65f25a 100644
--- a/docs/howto/PAM.xml
+++ b/docs/howto/PAM.xml
@@ -1,3 +1,9 @@
+<?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;
+]>
 <chapter id="pam">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/howto/PDC.xml b/docs/howto/PDC.xml
index 09947ca522..4504c480b8 100644
--- a/docs/howto/PDC.xml
+++ b/docs/howto/PDC.xml
@@ -1,3 +1,13 @@
+<?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;
+
+]>
+
 <chapter id="samba-pdc">
 
 <chapterinfo>
diff --git a/docs/howto/Passdb.xml b/docs/howto/Passdb.xml
index a6e3388c45..0b7c8ccd20 100644
--- a/docs/howto/Passdb.xml
+++ b/docs/howto/Passdb.xml
@@ -1,3 +1,10 @@
+<?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;
+]>
+
 <chapter id="passdb">
 <chapterinfo>
 	&author.jelmer;
diff --git a/docs/howto/PolicyMgmt.xml b/docs/howto/PolicyMgmt.xml
index a12a8a586c..5134684678 100644
--- a/docs/howto/PolicyMgmt.xml
+++ b/docs/howto/PolicyMgmt.xml
@@ -1,3 +1,9 @@
+<?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;
+]>
 <chapter id="PolicyMgmt">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/howto/Portability.xml b/docs/howto/Portability.xml
index ef84cf9c3e..956fe74afb 100644
--- a/docs/howto/Portability.xml
+++ b/docs/howto/Portability.xml
@@ -1,3 +1,9 @@
+<?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;
+]>
 <chapter id="Portability">
 <chapterinfo>
 	&author.jelmer;
diff --git a/docs/howto/Printing.xml b/docs/howto/Printing.xml
index 4bf11c0531..9266712727 100644
--- a/docs/howto/Printing.xml
+++ b/docs/howto/Printing.xml
@@ -1,3 +1,10 @@
+<?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;
+]>
+
 <chapter id="printing">
 
 <chapterinfo>
diff --git a/docs/howto/Problems.xml b/docs/howto/Problems.xml
index 01879599bd..3bc50968ec 100644
--- a/docs/howto/Problems.xml
+++ b/docs/howto/Problems.xml
@@ -1,3 +1,9 @@
+<?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;
+]>
 <chapter id="problems">
 
 <chapterinfo>
diff --git a/docs/howto/ProfileMgmt.xml b/docs/howto/ProfileMgmt.xml
index 1996f9469e..e1e45538ae 100644
--- a/docs/howto/ProfileMgmt.xml
+++ b/docs/howto/ProfileMgmt.xml
@@ -1,3 +1,9 @@
+<?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;
+]>
 <chapter id="ProfileMgmt">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/howto/SWAT.xml b/docs/howto/SWAT.xml
index dabc661909..6a67db2418 100644
--- a/docs/howto/SWAT.xml
+++ b/docs/howto/SWAT.xml
@@ -1,3 +1,9 @@
+<?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;
+]>
 <chapter id="SWAT">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/howto/Securing.xml b/docs/howto/Securing.xml
index 85d81289e2..4a21699c61 100644
--- a/docs/howto/Securing.xml
+++ b/docs/howto/Securing.xml
@@ -1,3 +1,10 @@
+<?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;
+]>
+
 <chapter id="securing-samba">
 
 <chapterinfo>
diff --git a/docs/howto/ServerType.xml b/docs/howto/ServerType.xml
index dc127b7e83..6c89a792a6 100644
--- a/docs/howto/ServerType.xml
+++ b/docs/howto/ServerType.xml
@@ -1,3 +1,13 @@
+<?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;
+
+]>
+
 <chapter id="ServerType">
 <chapterinfo>
 	&author.tridge;
diff --git a/docs/howto/Speed.xml b/docs/howto/Speed.xml
index 1ad6833aae..44956f6812 100644
--- a/docs/howto/Speed.xml
+++ b/docs/howto/Speed.xml
@@ -1,3 +1,9 @@
+<?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;
+]>
 <chapter id="speed">
 
 <chapterinfo>
diff --git a/docs/howto/StandAloneServer.xml b/docs/howto/StandAloneServer.xml
index a996aac22e..99396d5b1c 100644
--- a/docs/howto/StandAloneServer.xml
+++ b/docs/howto/StandAloneServer.xml
@@ -1,3 +1,13 @@
+<?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;
+
+]>
+
 <chapter id="StandAloneServer">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/howto/Unicode.xml b/docs/howto/Unicode.xml
index 253af6a0ee..396703a705 100644
--- a/docs/howto/Unicode.xml
+++ b/docs/howto/Unicode.xml
@@ -1,3 +1,9 @@
+<?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;
+]>
 <chapter id="unicode">
 <chapterinfo>
 	&author.jelmer;
diff --git a/docs/howto/VFS.xml b/docs/howto/VFS.xml
index 0ea39272ba..d73f55380a 100644
--- a/docs/howto/VFS.xml
+++ b/docs/howto/VFS.xml
@@ -1,3 +1,10 @@
+<?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;
+]>
+
 <chapter id="VFS">
 <chapterinfo>
 	&author.jelmer;
diff --git a/docs/howto/Winbind.xml b/docs/howto/Winbind.xml
index 98a17ca08a..e5c039e9a1 100644
--- a/docs/howto/Winbind.xml
+++ b/docs/howto/Winbind.xml
@@ -1,3 +1,9 @@
+<?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;
+]>
 <chapter id="winbind">
 
 <chapterinfo>
diff --git a/docs/howto/WindowsClientConfig.xml b/docs/howto/WindowsClientConfig.xml
index afa18eaf1e..ec431d2870 100644
--- a/docs/howto/WindowsClientConfig.xml
+++ b/docs/howto/WindowsClientConfig.xml
@@ -1,3 +1,10 @@
+<?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;
+]>
+
 <chapter id="ClientConfig">
 <chapterinfo>
 	&author.jht;
diff --git a/docs/howto/glossary.xml b/docs/howto/glossary.xml
index 03a465049c..72c27a5dbf 100644
--- a/docs/howto/glossary.xml
+++ b/docs/howto/glossary.xml
@@ -1,3 +1,9 @@
+<?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;
+]>
 <glossary>
 	<title>Glossary</title>
 
diff --git a/docs/howto/index.xml b/docs/howto/index.xml
index 79d7c24617..d9386152f8 100644
--- a/docs/howto/index.xml
+++ b/docs/howto/index.xml
@@ -4,7 +4,8 @@
 <!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>
 
-<book id="Samba-HOWTO-Collection">
+<book id="Samba-HOWTO-Collection"
+	xmlns:xi="http://www.w3.org/2003/XInclude">
 <title>The Official Samba-3 HOWTO and Reference Guide</title>
 
 <bookinfo>
@@ -22,7 +23,7 @@
 <preface>
 	<title>Attribution</title>
 	<para>
-		&attributions;
+		<xi:include href="attributions.xml"/>
 	</para>
 </preface>
 
@@ -85,7 +86,7 @@ submission.
 
 <?latex \cleardoublepage ?>
 
-&foreword-tridge;
+<xi:include href="foreword-tridge.xml"/>
 
 <?latex \cleardoublepage ?>
 <!-- Contents -->
@@ -94,7 +95,7 @@ submission.
 
 <lot/>
 
-&IntroSMB;
+<xi:include href="IntroSMB.xml"/>
 
 <!-- Chapters -->
 <part id="introduction">
@@ -106,8 +107,8 @@ submission.
 and how to configure the parts of Samba you will most likely need.
 PLEASE read this.</para>
 </partintro>
-&UNIX-INSTALL;
-&FastStart;
+<xi:include href="Install.xml"/>
+<xi:include href="FastStart.xml"/>
 </part>
 
 <part id="type">
@@ -120,12 +121,12 @@ configuring Samba to function as the type of server your network requires. Pleas
 section carefully.
 </para>
 </partintro>
-&ServerType;
-&Samba-PDC-HOWTO;
-&Samba-BDC-HOWTO;
-&DOMAIN-MEMBER;
-&StandAloneServer;
-&ClientConfig;
+<xi:include href="ServerType.xml"/>
+<xi:include href="PDC.xml"/>
+<xi:include href="BDC.xml"/>
+<xi:include href="DomainMember.xml"/>
+<xi:include href="StandAloneServer.xml"/>
+<xi:include href="WindowsClientConfig.xml"/>
 </part>
 
 <part id="optional">
@@ -136,56 +137,56 @@ section carefully.
 Samba has several features that you might want or might not want to use. The chapters in this part each cover specific Samba features.
 </para>
 </partintro>
-&NetworkBrowsing;
-&Passdb;
-&GROUP-MAPPING-HOWTO;
-&AccessControls;
-&locking;
-&SecuringSamba;
-&Trusts;
-&MS-Dfs-Setup;
-&PRINTER-DRIVER2;
-&CUPS;
-&VFS;
-&WINBIND;
-&AdvancedNetworkAdmin;
-&PolicyMgmt;
-&ProfileMgmt;
-&Samba-PAM;
-&IntegratingWithWindows;
-&unicode;
-&Backup;
-&HighAvailability;
+<xi:include href="NetworkBrowsing.xml"/>
+<xi:include href="Passdb.xml"/>
+<xi:include href="Group-Mapping.xml"/>
+<xi:include href="AccessControls.xml"/>
+<xi:include href="locking.xml"/>
+<xi:include href="Securing.xml"/>
+<xi:include href="InterdomainTrusts.xml"/>
+<xi:include href="msdfs.xml"/>
+<xi:include href="Printing.xml"/>
+<xi:include href="CUPS-printing.xml"/>
+<xi:include href="VFS.xml"/>
+<xi:include href="Winbind.xml"/>
+<xi:include href="AdvancedNetworkAdmin.xml"/>
+<xi:include href="PolicyMgmt.xml"/>
+<xi:include href="ProfileMgmt.xml"/>
+<xi:include href="PAM.xml"/>
+<xi:include href="Integrating-With_windows.xml"/>
+<xi:include href="Unicode.xml"/>
+<xi:include href="Backup.xml"/>
+<xi:include href="HighAvailability.xml"/>
 </part>
 
 <part id="migration">
 <title>Migration and Updating</title>
-&upgrading;
-&NT4Migration;
-&SWAT;
+<xi:include href="upgrading-to-3.0.xml"/>
+<xi:include href="NT4Migration.xml"/>
+<xi:include href="SWAT.xml"/>
 </part>
 
 <part id="troubleshooting">
 <title>Troubleshooting</title>
-&Diagnosis;
-&problems;
-&BUGS;
+<xi:include href="Diagnosis.xml"/>
+<xi:include href="Problems.xml"/>
+<xi:include href="Bugs.xml"/>
 </part>
 
 <part id="Appendix">
 <title>Appendixes</title>
-&Compiling;
-&Portability;
-&Other-Clients;
-&SPEED;
-&DNS-DHCP-Configuration;
+<xi:include href="Compiling.xml"/>
+<xi:include href="Portability.xml"/>
+<xi:include href="Other-Clients.xml"/>
+<xi:include href="Speed.xml"/>
+<xi:include href="DNS-DHCP-Configuration.xml"/>
 </part>
 
 
 
 <?latex \include{gpl}?>
 
-&glossary;
+<xi:include href="glossary.xml"/>
 
 <?latex \chaptermark{Subject index} ?>
 <index/>
diff --git a/docs/howto/locking.xml b/docs/howto/locking.xml
index 636b0dfd68..555efd37a8 100644
--- a/docs/howto/locking.xml
+++ b/docs/howto/locking.xml
@@ -1,3 +1,13 @@
+<?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;
+
+]>
+
 <chapter id="locking">
 <chapterinfo>
 	&author.jeremy;
diff --git a/docs/howto/msdfs.xml b/docs/howto/msdfs.xml
index ebc5cfc069..90debc9a7c 100644
--- a/docs/howto/msdfs.xml
+++ b/docs/howto/msdfs.xml
@@ -1,3 +1,10 @@
+<?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;
+]>
+
 <chapter id="msdfs">
 
 <chapterinfo>
diff --git a/docs/howto/upgrading-to-3.0.xml b/docs/howto/upgrading-to-3.0.xml
index 292aa435af..8c8b023981 100644
--- a/docs/howto/upgrading-to-3.0.xml
+++ b/docs/howto/upgrading-to-3.0.xml
@@ -1,3 +1,9 @@
+<?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;
+]>
 <chapter id="upgrading-to-3.0">
 <chapterinfo>
 	&author.jelmer;