From 2837fef478112b527fc85776e67baca55e7bce0f Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 4 Sep 2004 14:47:12 +0000
Subject: - Remove unused entities - Fix syntax error in xslt/pearson.xsl -
 Ignore some autogenerated files - Remove xinclude.dtd (available on the web)
 (This used to be commit f09d8dccd3d50fd2f7bbd1c35a58868e8030a2dc)

---
 .../Samba-Guide/Chap01-WindowsNetworkingPrimer.xml |  4 --
 docs/Samba-Guide/Chap02-SimpleOfficeServer.xml     |  4 --
 docs/Samba-Guide/Chap03-TheSmallOffice.xml         |  4 --
 docs/Samba-Guide/Chap04-SecureOfficeServer.xml     |  4 --
 docs/Samba-Guide/Chap05-500UserNetwork.xml         |  4 --
 docs/Samba-Guide/Chap06-MakingHappyUsers.xml       |  4 --
 docs/Samba-Guide/Chap07-2000UserNetwork.xml        |  4 --
 docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml       |  4 --
 docs/Samba-Guide/Chap09-AddingUNIXClients.xml      |  4 --
 docs/Samba-Guide/Chap10-KerberosFastStart.xml      |  4 --
 docs/Samba-Guide/Chap10b-DomainAppsSupport.xml     |  4 --
 docs/Samba-Guide/Chap11-HighAvailability.xml       |  4 --
 docs/Samba-Guide/Chap12-Appendix.xml               |  4 --
 docs/Samba-Guide/acknowledgements.xml              |  4 --
 docs/Samba-Guide/conventions.xml                   |  4 --
 docs/Samba-Guide/foreword.xml                      |  4 --
 docs/Samba-Guide/front-matter.xml                  |  4 --
 docs/Samba-Guide/glossary.xml                      |  4 --
 docs/Samba-Guide/inside-cover.xml                  |  4 --
 docs/Samba-Guide/preface.xml                       |  4 --
 docs/entities/global.entities                      | 64 ----------------------
 docs/entities/xinclude.dtd                         | 31 -----------
 docs/xslt/pearson.xsl                              |  2 +-
 23 files changed, 1 insertion(+), 176 deletions(-)
 delete mode 100644 docs/entities/xinclude.dtd

diff --git a/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml b/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml
index 6058411b35..c86137b15b 100644
--- a/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml
+++ b/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 
-  <!-- Stuff for xincludes -->
-  <!ENTITY % xinclude SYSTEM "../entities/xinclude.dtd">
-  %xinclude;
-
   <!-- entities files to use -->
   <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
   %global_entities;
diff --git a/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml b/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml
index 8a0d359cf9..613e0f8483 100644
--- a/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml
+++ b/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 
-  <!-- Stuff for xincludes -->
-  <!ENTITY % xinclude SYSTEM "../entities/xinclude.dtd">
-  %xinclude;
-
   <!-- entities files to use -->
   <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
   %global_entities;
diff --git a/docs/Samba-Guide/Chap03-TheSmallOffice.xml b/docs/Samba-Guide/Chap03-TheSmallOffice.xml
index 8a4e1ef2b2..afe5200ca9 100644
--- a/docs/Samba-Guide/Chap03-TheSmallOffice.xml
+++ b/docs/Samba-Guide/Chap03-TheSmallOffice.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 
-  <!-- Stuff for xincludes -->
-  <!ENTITY % xinclude SYSTEM "../entities/xinclude.dtd">
-  %xinclude;
-
   <!-- entities files to use -->
   <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
   %global_entities;
diff --git a/docs/Samba-Guide/Chap04-SecureOfficeServer.xml b/docs/Samba-Guide/Chap04-SecureOfficeServer.xml
index 5ccea8c636..6d52053fe0 100644
--- a/docs/Samba-Guide/Chap04-SecureOfficeServer.xml
+++ b/docs/Samba-Guide/Chap04-SecureOfficeServer.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 
-  <!-- Stuff for xincludes -->
-  <!ENTITY % xinclude SYSTEM "../entities/xinclude.dtd">
-  %xinclude;
-
   <!-- entities files to use -->
   <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
   %global_entities;
diff --git a/docs/Samba-Guide/Chap05-500UserNetwork.xml b/docs/Samba-Guide/Chap05-500UserNetwork.xml
index 640dc69dab..6835beed79 100644
--- a/docs/Samba-Guide/Chap05-500UserNetwork.xml
+++ b/docs/Samba-Guide/Chap05-500UserNetwork.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 
-  <!-- Stuff for xincludes -->
-  <!ENTITY % xinclude SYSTEM "../entities/xinclude.dtd">
-  %xinclude;
-
   <!-- entities files to use -->
   <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
   %global_entities;
diff --git a/docs/Samba-Guide/Chap06-MakingHappyUsers.xml b/docs/Samba-Guide/Chap06-MakingHappyUsers.xml
index 26ab2925d9..1b075e73f7 100644
--- a/docs/Samba-Guide/Chap06-MakingHappyUsers.xml
+++ b/docs/Samba-Guide/Chap06-MakingHappyUsers.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 
-  <!-- Stuff for xincludes -->
-  <!ENTITY % xinclude SYSTEM "../entities/xinclude.dtd">
-  %xinclude;
-
   <!-- entities files to use -->
   <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
   %global_entities;
diff --git a/docs/Samba-Guide/Chap07-2000UserNetwork.xml b/docs/Samba-Guide/Chap07-2000UserNetwork.xml
index bb78494657..64ced919a4 100644
--- a/docs/Samba-Guide/Chap07-2000UserNetwork.xml
+++ b/docs/Samba-Guide/Chap07-2000UserNetwork.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 
-  <!-- Stuff for xincludes -->
-  <!ENTITY % xinclude SYSTEM "../entities/xinclude.dtd">
-  %xinclude;
-
   <!-- entities files to use -->
   <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
   %global_entities;
diff --git a/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml b/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml
index e8f55b8611..a0a2a37f32 100644
--- a/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml
+++ b/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 
-  <!-- Stuff for xincludes -->
-  <!ENTITY % xinclude SYSTEM "../entities/xinclude.dtd">
-  %xinclude;
-
   <!-- entities files to use -->
   <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
   %global_entities;
diff --git a/docs/Samba-Guide/Chap09-AddingUNIXClients.xml b/docs/Samba-Guide/Chap09-AddingUNIXClients.xml
index dee2d9507e..4e2297f640 100644
--- a/docs/Samba-Guide/Chap09-AddingUNIXClients.xml
+++ b/docs/Samba-Guide/Chap09-AddingUNIXClients.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 
-  <!-- Stuff for xincludes -->
-  <!ENTITY % xinclude SYSTEM "../entities/xinclude.dtd">
-  %xinclude;
-
   <!-- entities files to use -->
   <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
   %global_entities;
diff --git a/docs/Samba-Guide/Chap10-KerberosFastStart.xml b/docs/Samba-Guide/Chap10-KerberosFastStart.xml
index 0851421dfa..1bee207791 100644
--- a/docs/Samba-Guide/Chap10-KerberosFastStart.xml
+++ b/docs/Samba-Guide/Chap10-KerberosFastStart.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 
-  <!-- Stuff for xincludes -->
-  <!ENTITY % xinclude SYSTEM "../entities/xinclude.dtd">
-  %xinclude;
-
   <!-- entities files to use -->
   <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
   %global_entities;
diff --git a/docs/Samba-Guide/Chap10b-DomainAppsSupport.xml b/docs/Samba-Guide/Chap10b-DomainAppsSupport.xml
index 7188e7747d..b585ee58ef 100644
--- a/docs/Samba-Guide/Chap10b-DomainAppsSupport.xml
+++ b/docs/Samba-Guide/Chap10b-DomainAppsSupport.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 
-  <!-- Stuff for xincludes -->
-  <!ENTITY % xinclude SYSTEM "../entities/xinclude.dtd">
-  %xinclude;
-
   <!-- entities files to use -->
   <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
   %global_entities;
diff --git a/docs/Samba-Guide/Chap11-HighAvailability.xml b/docs/Samba-Guide/Chap11-HighAvailability.xml
index d81164a8ee..c4701eb7b0 100644
--- a/docs/Samba-Guide/Chap11-HighAvailability.xml
+++ b/docs/Samba-Guide/Chap11-HighAvailability.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 
-  <!-- Stuff for xincludes -->
-  <!ENTITY % xinclude SYSTEM "../entities/xinclude.dtd">
-  %xinclude;
-
   <!-- entities files to use -->
   <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
   %global_entities;
diff --git a/docs/Samba-Guide/Chap12-Appendix.xml b/docs/Samba-Guide/Chap12-Appendix.xml
index 0d1546d949..8ad63d8724 100644
--- a/docs/Samba-Guide/Chap12-Appendix.xml
+++ b/docs/Samba-Guide/Chap12-Appendix.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 
-  <!-- Stuff for xincludes -->
-  <!ENTITY % xinclude SYSTEM "../entities/xinclude.dtd">
-  %xinclude;
-
   <!-- entities files to use -->
   <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
   %global_entities;
diff --git a/docs/Samba-Guide/acknowledgements.xml b/docs/Samba-Guide/acknowledgements.xml
index 24944fac25..e356732fd0 100644
--- a/docs/Samba-Guide/acknowledgements.xml
+++ b/docs/Samba-Guide/acknowledgements.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 
-  <!-- Stuff for xincludes -->
-  <!ENTITY % xinclude SYSTEM "../entities/xinclude.dtd">
-  %xinclude;
-
   <!-- entities files to use -->
   <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
   %global_entities;
diff --git a/docs/Samba-Guide/conventions.xml b/docs/Samba-Guide/conventions.xml
index 5b069b113a..6d36cbf0e4 100644
--- a/docs/Samba-Guide/conventions.xml
+++ b/docs/Samba-Guide/conventions.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 
-  <!-- Stuff for xincludes -->
-  <!ENTITY % xinclude SYSTEM "../entities/xinclude.dtd">
-  %xinclude;
-
   <!-- entities files to use -->
   <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
   %global_entities;
diff --git a/docs/Samba-Guide/foreword.xml b/docs/Samba-Guide/foreword.xml
index 402f181ac8..d8f063d4e3 100644
--- a/docs/Samba-Guide/foreword.xml
+++ b/docs/Samba-Guide/foreword.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 
-  <!-- Stuff for xincludes -->
-  <!ENTITY % xinclude SYSTEM "../entities/xinclude.dtd">
-  %xinclude;
-
   <!-- entities files to use -->
   <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
   %global_entities;
diff --git a/docs/Samba-Guide/front-matter.xml b/docs/Samba-Guide/front-matter.xml
index 17cf92914a..506a4d6ed5 100644
--- a/docs/Samba-Guide/front-matter.xml
+++ b/docs/Samba-Guide/front-matter.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 
-  <!-- Stuff for xincludes -->
-  <!ENTITY % xinclude SYSTEM "../entities/xinclude.dtd">
-  %xinclude;
-
   <!-- entities files to use -->
   <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
   %global_entities;
diff --git a/docs/Samba-Guide/glossary.xml b/docs/Samba-Guide/glossary.xml
index 9ee3063b13..ec6c5b8e54 100644
--- a/docs/Samba-Guide/glossary.xml
+++ b/docs/Samba-Guide/glossary.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 
-  <!-- Stuff for xincludes -->
-  <!ENTITY % xinclude SYSTEM "../entities/xinclude.dtd">
-  %xinclude;
-
   <!-- entities files to use -->
   <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
   %global_entities;
diff --git a/docs/Samba-Guide/inside-cover.xml b/docs/Samba-Guide/inside-cover.xml
index 934adf7081..7390512448 100644
--- a/docs/Samba-Guide/inside-cover.xml
+++ b/docs/Samba-Guide/inside-cover.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 
-  <!-- Stuff for xincludes -->
-  <!ENTITY % xinclude SYSTEM "../entities/xinclude.dtd">
-  %xinclude;
-
   <!-- entities files to use -->
   <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
   %global_entities;
diff --git a/docs/Samba-Guide/preface.xml b/docs/Samba-Guide/preface.xml
index 4e847b309a..3ba9a2ec69 100644
--- a/docs/Samba-Guide/preface.xml
+++ b/docs/Samba-Guide/preface.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 
-  <!-- Stuff for xincludes -->
-  <!ENTITY % xinclude SYSTEM "../entities/xinclude.dtd">
-  %xinclude;
-
   <!-- entities files to use -->
   <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
   %global_entities;
diff --git a/docs/entities/global.entities b/docs/entities/global.entities
index 3cd743398a..6a35de4d6c 100644
--- a/docs/entities/global.entities
+++ b/docs/entities/global.entities
@@ -438,70 +438,6 @@ an Active Directory environment.
 <!ENTITY winbindd '<application>winbindd</application>'>
 <!ENTITY net '<application>net</application>'>
 
-<!-- We only need this for SGML, and not for XML... -->
-<!-- <!ENTITY percnt '%'> -->
-
-<!-- IDs for various Samba documentation sections -->
-
-<!ENTITY ID-UNIX-INSTALL SYSTEM "install">
-<!ENTITY ID-ENCRYPTION SYSTEM "pwencrypt">
-<!ENTITY ID-MS-Dfs-Setup SYSTEM "msdfs">
-<!ENTITY ID-PRINTER-DRIVER2 SYSTEM "printing">
-<!ENTITY ID-DOMAIN-MEMBER SYSTEM "domain-security">
-<!ENTITY ID-WINBIND SYSTEM "winbind">
-<!ENTITY ID-NT-Security SYSTEM "unix-permissions">
-<!ENTITY ID-Samba-PDC-HOWTO SYSTEM "samba-pdc">
-<!ENTITY ID-Samba-BDC-HOWTO SYSTEM "samba-bdc">
-<!ENTITY ID-CVS-Access SYSTEM "cvs-access">
-<!ENTITY ID-IntegratingWithWindows SYSTEM "integrate-ms-networks">
-<!ENTITY ID-Samba-PAM SYSTEM "pam">
-<!ENTITY ID-Samba-LDAP SYSTEM "samba-ldap-howto">
-<!ENTITY ID-Diagnosis SYSTEM "diagnosis">
-<!ENTITY ID-BUGS SYSTEM "bugreport">
-<!ENTITY ID-StandAloneServer SYSTEM "standaloneserver">
-<!ENTITY ID-SPEED SYSTEM "speed">
-<!ENTITY ID-NetworkBrowsing SYSTEM "network-browsing">
-<!ENTITY ID-GROUP-MAPPING-HOWTO SYSTEM "groupmapping">
-<!ENTITY ID-Portability SYSTEM "Portability">
-<!ENTITY ID-Other-Clients SYSTEM "Other-Clients">
-<!ENTITY ID-pdb-mysql SYSTEM "pdb-mysql">
-<!ENTITY ID-pdb-xml SYSTEM "pdb-xml">
-<!ENTITY ID-VFS SYSTEM "VFS">
-<!ENTITY ID-Further-Resources SYSTEM "further-resources">
-
-<!ENTITY MANUALPAGES SYSTEM "../manpages/manuals.xml">
-<!ENTITY MAN-FINDSMB SYSTEM "../manpages/findsmb.1.xml">
-<!ENTITY MAN-NMBLOOKUP SYSTEM "../manpages/nmblookup.1.xml">
-<!ENTITY MAN-RPCCLIENT SYSTEM "../manpages/rpcclient.1.xml">
-<!ENTITY MAN-SMBCACLS SYSTEM "../manpages/smbcacls.1.xml">
-<!ENTITY MAN-SMBCLIENT SYSTEM "../manpages/smbclient.1.xml">
-<!ENTITY MAN-SMBCONTROL SYSTEM "../manpages/smbcontrol.1.xml">
-<!ENTITY MAN-LMHOSTS SYSTEM "../manpages/lmhosts.5.xml">
-<!ENTITY MAN-SMBCONF SYSTEM "../smbdotconf/smb.conf.5.xml">
-<!ENTITY MAN-SAMBA SYSTEM "../manpages/samba.7.xml">
-<!ENTITY MAN-NET SYSTEM "../manpages/net.8.xml">
-<!ENTITY MAN-NMBD SYSTEM "../manpages/nmbd.8.xml">
-<!ENTITY MAN-PDBEDIT SYSTEM "../manpages/pdbedit.8.xml">
-<!ENTITY MAN-SMBD SYSTEM "../manpages/smbd.8.xml">
-<!ENTITY MAN-SMBMOUNT SYSTEM "../manpages/smbmount.8.xml">
-<!ENTITY MAN-SMBMNT SYSTEM "../manpages/smbmnt.8.xml">
-<!ENTITY MAN-SMBPASSWDCONF SYSTEM "../manpages/smbpasswd.5.xml">
-<!ENTITY MAN-SMBPASSWD SYSTEM "../manpages/smbpasswd.8.xml">
-<!ENTITY MAN-SMBSH SYSTEM "../manpages/smbsh.1.xml">
-<!ENTITY MAN-SMBTAR SYSTEM "../manpages/smbtar.1.xml">
-<!ENTITY MAN-SMBTREE SYSTEM "../manpages/smbtree.1.xml">
-<!ENTITY MAN-SMBCQUOTAS SYSTEM "../manpages/smbcquotas.1.xml">
-<!ENTITY MAN-SMBSPOOL SYSTEM "../manpages/smbspool.8.xml">
-<!ENTITY MAN-SMBSTATUS SYSTEM "../manpages/smbstatus.1.xml">
-<!ENTITY MAN-SMBUMOUNT SYSTEM "../manpages/smbumount.8.xml">
-<!ENTITY MAN-SWAT SYSTEM "../manpages/swat.8.xml">
-<!ENTITY MAN-TDBBACKUP SYSTEM "../manpages/tdbbackup.8.xml">
-<!ENTITY MAN-TESTPARM SYSTEM "../manpages/testparm.1.xml">
-<!ENTITY MAN-TESTPRNS SYSTEM "../manpages/testprns.1.xml">
-<!ENTITY MAN-VFSTEST SYSTEM "../manpages/vfstest.1.xml">
-<!ENTITY MAN-WBINFO SYSTEM "../manpages/wbinfo.1.xml">
-<!ENTITY MAN-WINBINDD SYSTEM "../manpages/winbindd.8.xml">
-
 <!ENTITY not.implemented "<note><para>Currently NOT implemented.</para></note>">
 <!ENTITY rootprompt "<prompt>root# </prompt>">
 <!ENTITY prompt "<prompt>$ </prompt>">
diff --git a/docs/entities/xinclude.dtd b/docs/entities/xinclude.dtd
deleted file mode 100644
index 1634275be0..0000000000
--- a/docs/entities/xinclude.dtd
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
-   $Id: xinclude.dtd,v 1.2 2003/02/07 13:01:13 toms Exp $
-
- The XInclude DTD is from
-
-   http://www.w3.org/TR/xinclude/
-
- and modified in a way which support our needs.
-
--->
-
-<!ENTITY % xmlnsxi 'xmlns:xi CDATA  #FIXED "http://www.w3.org/2001/XInclude"'>
-
-
-<!ELEMENT xi:include (xi:fallback)?>
-
-<!-- Just for some modifications -->
-<!ENTITY % local.xinclude.attrib "">
-<!ATTLIST xi:include
-	%xmlnsxi;
-	href       CDATA       #REQUIRED
-	parse      (xml|text)  "xml"
-	encoding   CDATA       #IMPLIED
-	%local.xinclude.attrib;
->
-
-<!ELEMENT xi:fallback ANY>
-<!ATTLIST xi:fallback
-	%xmlnsxi;
-	%local.xinclude.attrib;
->
diff --git a/docs/xslt/pearson.xsl b/docs/xslt/pearson.xsl
index 99ee05b5af..0324ef5ca8 100644
--- a/docs/xslt/pearson.xsl
+++ b/docs/xslt/pearson.xsl
@@ -629,7 +629,7 @@
    <xsl:template match="programlisting">
 	   <listing>
 		   <xsl:if test="title != ''">
-			   <xsl:description><xsl:value-of select="title"/></xsl:description>
+			   <description><xsl:value-of select="title"/></description>
 		   </xsl:if>
 		   <listingcode>
 			   <xsl:apply-templates/>
-- 
cgit