Fix samba-docs build after svn conversion and Samba3 By Example addition.

Now we are able to build everything in samba-docs properly.
(This used to be commit bb09f771958150e9465a5dc9d8e62aa8477c17a4)

44 files changed, 167 insertions, 133 deletions

diff --git a/docs/Makefile.in b/docs/Makefile.in
index 7602476cb4..791a1532a9 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -31,24 +31,25 @@ LATEX += --interaction nonstopmode
 endif
 
 # Paths
-OUTPUTDIR = output
-ARCHIVEDIR = output/archive
+TOPDIR = $(shell pwd)
+OUTPUTDIR = $(TOPDIR)/output
+ARCHIVEDIR = $(OUTPUTDIR)/archive
 SRCDIR = @srcdir@
 MANDIR=$(OUTPUTDIR)/manpages
 EPSTOPDF = @EPSTOPDF@
-MANPAGEDIR = manpages
-HOWTODIR = howto
+MANPAGEDIR = $(TOPDIR)/manpages
+HOWTODIR = $(TOPDIR)/howto
 MAKEINDEX = @MAKEINDEX@
 IMAGEPROJDIR = $(HOWTODIR)/imagefiles
-GUIDEDOC = guide
-EXAMPLESDIR = examples
-DEVDOC = devdoc
-SMBDOTCONFDOC = smbdotconf
+GUIDEDOC = $(TOPDIR)/guide
+EXAMPLESDIR = $(TOPDIR)/examples
+DEVDOC = $(TOPDIR)/devdoc
+SMBDOTCONFDOC = $(TOPDIR)/smbdotconf
 PSDIR = $(OUTPUTDIR)
 PDFDIR = $(OUTPUTDIR)
 DVIDIR = $(OUTPUTDIR)
 TXTDIR = $(OUTPUTDIR)/textdocs
-FAQHOWTODIR = faq
+FAQHOWTODIR = $(TOPDIR)/faq
 FAQDIR = $(OUTPUTDIR)/faq
 HTMLDIR=$(OUTPUTDIR)/htmldocs
 PLUCKERDIR=$(OUTPUTDIR)/plucker
@@ -153,7 +154,7 @@ clean:
 	rm -f $(PLUCKERDIR)/*.pdb
 
 # Text files
-$(TXTDIR):
+$(TXTDIR): $(OUTPUTDIR)
 	mkdir $(TXTDIR)
 
 $(TXTDIR)/%.txt: %.xml
@@ -196,12 +197,14 @@ $(PSDIR)/%.ps: $(DVIDIR)/%.dvi
 xslt/figures/%.pdf: xslt/figures/%.eps
 	$(EPSTOPDF) $<
 
+$(OUTPUTDIR):
+	mkdir $(OUTPUTDIR)
 # Single large HTML files
 
-$(HTMLDIR):
+$(HTMLDIR): $(OUTPUTDIR)
 	mkdir $(HTMLDIR)
 
-$(PLUCKERDIR):
+$(PLUCKERDIR): $(OUTPUTDIR)
 	mkdir $(PLUCKERDIR)
 
 CSS: $(HTMLDIR) xslt/html/samba.css
@@ -248,7 +251,7 @@ smb.conf.5.xml: $(SMBDOTCONFDOC)/smb.conf.5.xml $(SMBDOTCONFDOC)/parameters.all.
  		$(SMBDOTCONFDOC)/parameters.global.xml $(SMBDOTCONFDOC)/parameters.service.xml 
 	$(XSLTPROC) --stringparam noreference 1 --xinclude --output $@ xslt/expand-sambadoc.xsl $<
 
-$(MANDIR): 
+$(MANDIR): $(OUTPUTDIR)
 	mkdir $(MANDIR)
 
 $(MANDIR)/%: %.xml
diff --git a/docs/configure.in b/docs/configure.in
index 5c21f08a83..1fa6c915a2 100644
--- a/docs/configure.in
+++ b/docs/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(global.ent)
+AC_INIT(entities/global.entities)
 
 AC_PATH_PROG(XSLTPROC, xsltproc)
 if test "x$XSLTPROC" = x; then
diff --git a/docs/devel/dev-doc.xml b/docs/devel/dev-doc.xml
index b97b3d8f86..8a9e165a79 100644
--- a/docs/devel/dev-doc.xml
+++ b/docs/devel/dev-doc.xml
@@ -1,6 +1,6 @@
 <?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 % globalentities SYSTEM '../global.ent'> %globalentities;
+<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 <!ENTITY NetBIOS SYSTEM "NetBIOS.xml">
 <!ENTITY Architecture SYSTEM "architecture.xml">
 <!ENTITY debug SYSTEM "debug.xml">
diff --git a/docs/global.ent b/docs/entities/global.entities
index 1efdd62528..c4b1d7f33e 100644
--- a/docs/global.ent
+++ b/docs/entities/global.entities
@@ -469,85 +469,85 @@ an Active Directory environment.
 <!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 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 "devdoc/attributions.xml">
-<!ENTITY glossary SYSTEM "howto/glossary.xml">
-<!ENTITY foreword-tridge SYSTEM "howto/foreword-tridge.xml">
+<!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 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 "../devdoc/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>">
diff --git a/docs/entities/xinclude.dtd b/docs/entities/xinclude.dtd
new file mode 100644
index 0000000000..1634275be0
--- /dev/null
+++ b/docs/entities/xinclude.dtd
@@ -0,0 +1,31 @@
+<!--
+   $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/howto/index.xml b/docs/howto/index.xml
index 410cbc010a..79d7c24617 100644
--- a/docs/howto/index.xml
+++ b/docs/howto/index.xml
@@ -1,7 +1,7 @@
 <?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 % globalentities SYSTEM '../global.ent'> %globalentities;
+<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>
 
 <book id="Samba-HOWTO-Collection">
diff --git a/docs/manpages/editreg.1.xml b/docs/manpages/editreg.1.xml
index 0a6b36bcf0..1022887edf 100644
--- a/docs/manpages/editreg.1.xml
+++ b/docs/manpages/editreg.1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 				  
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>
 <refentry id="editreg.1">
 
diff --git a/docs/manpages/findsmb.1.xml b/docs/manpages/findsmb.1.xml
index 8a89b2ce24..7159e41566 100644
--- a/docs/manpages/findsmb.1.xml
+++ b/docs/manpages/findsmb.1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 				  
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>
 <refentry id="findsmb.1">
 
diff --git a/docs/manpages/lmhosts.5.xml b/docs/manpages/lmhosts.5.xml
index afee69bc96..246db3035d 100644
--- a/docs/manpages/lmhosts.5.xml
+++ b/docs/manpages/lmhosts.5.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 				  
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>
 <refentry id="lmhosts.5">
 
diff --git a/docs/manpages/log2pcap.1.xml b/docs/manpages/log2pcap.1.xml
index e8c03c5dc1..bf40a2ef59 100644
--- a/docs/manpages/log2pcap.1.xml
+++ b/docs/manpages/log2pcap.1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 				  
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>
 <refentry id="log2pcap.1">
 
diff --git a/docs/manpages/mount.cifs.8.xml b/docs/manpages/mount.cifs.8.xml
index d674d03cac..b57480e02e 100644
--- a/docs/manpages/mount.cifs.8.xml
+++ b/docs/manpages/mount.cifs.8.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 				  
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>
 <refentry id="mount.cifs.8">
 
diff --git a/docs/manpages/net.8.xml b/docs/manpages/net.8.xml
index 21dc54d452..a6d4099045 100644
--- a/docs/manpages/net.8.xml
+++ b/docs/manpages/net.8.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 				  
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>
 <refentry id="net.8">
 
diff --git a/docs/manpages/nmbd.8.xml b/docs/manpages/nmbd.8.xml
index db65c48919..31b1d123a3 100644
--- a/docs/manpages/nmbd.8.xml
+++ b/docs/manpages/nmbd.8.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 				  
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>
 <refentry id="nmbd.8">
 
diff --git a/docs/manpages/nmblookup.1.xml b/docs/manpages/nmblookup.1.xml
index 14df0066f5..46cfd7a926 100644
--- a/docs/manpages/nmblookup.1.xml
+++ b/docs/manpages/nmblookup.1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 				  
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>
 <refentry id="nmblookup">
 
diff --git a/docs/manpages/ntlm_auth.1.xml b/docs/manpages/ntlm_auth.1.xml
index f4478f7d41..fc5b34c3e4 100644
--- a/docs/manpages/ntlm_auth.1.xml
+++ b/docs/manpages/ntlm_auth.1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 				  
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>
 <refentry id="ntlm-auth.1">
 
diff --git a/docs/manpages/pdbedit.8.xml b/docs/manpages/pdbedit.8.xml
index e05c729572..06b53f1bcd 100644
--- a/docs/manpages/pdbedit.8.xml
+++ b/docs/manpages/pdbedit.8.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 				  
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>
 <refentry id="pdbedit.8">
 
diff --git a/docs/manpages/profiles.1.xml b/docs/manpages/profiles.1.xml
index 3ae823f634..52cd9dfcfc 100644
--- a/docs/manpages/profiles.1.xml
+++ b/docs/manpages/profiles.1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 				  
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>
 <refentry id="profiles.1">
 
diff --git a/docs/manpages/rpcclient.1.xml b/docs/manpages/rpcclient.1.xml
index 3510458610..35c71ddd61 100644
--- a/docs/manpages/rpcclient.1.xml
+++ b/docs/manpages/rpcclient.1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 				  
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>
 <refentry id="rpcclient.1">
 
diff --git a/docs/manpages/samba.7.xml b/docs/manpages/samba.7.xml
index 7f31ab3bc5..bf791cf253 100644
--- a/docs/manpages/samba.7.xml
+++ b/docs/manpages/samba.7.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 				  
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>
 <refentry id="samba.7">
 
diff --git a/docs/manpages/smbcacls.1.xml b/docs/manpages/smbcacls.1.xml
index 78980a6aec..cfc5ddbd36 100644
--- a/docs/manpages/smbcacls.1.xml
+++ b/docs/manpages/smbcacls.1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 				  
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>
 <refentry id="smbcacls.1">
 
diff --git a/docs/manpages/smbclient.1.xml b/docs/manpages/smbclient.1.xml
index 78cc642e76..e268019fea 100644
--- a/docs/manpages/smbclient.1.xml
+++ b/docs/manpages/smbclient.1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 				  
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>
 <refentry id="smbclient.1">
 
diff --git a/docs/manpages/smbcontrol.1.xml b/docs/manpages/smbcontrol.1.xml
index af6054de58..5315b25e7b 100644
--- a/docs/manpages/smbcontrol.1.xml
+++ b/docs/manpages/smbcontrol.1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 				  
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>
 <refentry id="smbcontrol.1">
 
diff --git a/docs/manpages/smbcquotas.1.xml b/docs/manpages/smbcquotas.1.xml
index 280d1b6364..a1e2ad9b24 100644
--- a/docs/manpages/smbcquotas.1.xml
+++ b/docs/manpages/smbcquotas.1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 				  
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>
 <refentry id="smbcquotas.1">
 
diff --git a/docs/manpages/smbd.8.xml b/docs/manpages/smbd.8.xml
index 4a3d3fdc0c..cf98be9fcb 100644
--- a/docs/manpages/smbd.8.xml
+++ b/docs/manpages/smbd.8.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 				  
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>
 <refentry id="smbd.8">
 
diff --git a/docs/manpages/smbget.1.xml b/docs/manpages/smbget.1.xml
index 96b8cf10c8..6f899e04ad 100644
--- a/docs/manpages/smbget.1.xml
+++ b/docs/manpages/smbget.1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 				  
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>
 <refentry id="smbget.1">
 
diff --git a/docs/manpages/smbmnt.8.xml b/docs/manpages/smbmnt.8.xml
index 0495fa5be0..4f57234345 100644
--- a/docs/manpages/smbmnt.8.xml
+++ b/docs/manpages/smbmnt.8.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 				  
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>
 <refentry id="smbmnt.8">
 
diff --git a/docs/manpages/smbmount.8.xml b/docs/manpages/smbmount.8.xml
index 0017c99cd5..ffcac0fbfa 100644
--- a/docs/manpages/smbmount.8.xml
+++ b/docs/manpages/smbmount.8.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 				  
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>
 <refentry id="smbmount.8">
 
diff --git a/docs/manpages/smbpasswd.5.xml b/docs/manpages/smbpasswd.5.xml
index cb6a6070bd..375d3e38eb 100644
--- a/docs/manpages/smbpasswd.5.xml
+++ b/docs/manpages/smbpasswd.5.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 				  
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>
 <refentry id="smbpasswd.5">
 
diff --git a/docs/manpages/smbpasswd.8.xml b/docs/manpages/smbpasswd.8.xml
index 3ee3a9e12e..0407027907 100644
--- a/docs/manpages/smbpasswd.8.xml
+++ b/docs/manpages/smbpasswd.8.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 				  
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>
 <refentry id="smbpasswd.8">
 
diff --git a/docs/manpages/smbsh.1.xml b/docs/manpages/smbsh.1.xml
index 36319085b8..ebd4d1d240 100644
--- a/docs/manpages/smbsh.1.xml
+++ b/docs/manpages/smbsh.1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 				  
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>
 <refentry id="smbsh.1">
 
diff --git a/docs/manpages/smbspool.8.xml b/docs/manpages/smbspool.8.xml
index ec62a0d5df..72cea33f3e 100644
--- a/docs/manpages/smbspool.8.xml
+++ b/docs/manpages/smbspool.8.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 				  
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>
 <refentry id="smbspool.8">
 
diff --git a/docs/manpages/smbstatus.1.xml b/docs/manpages/smbstatus.1.xml
index 1e96b39263..5c0bad5219 100644
--- a/docs/manpages/smbstatus.1.xml
+++ b/docs/manpages/smbstatus.1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 				  
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>
 <refentry id="smbstatus.1">
 
diff --git a/docs/manpages/smbtar.1.xml b/docs/manpages/smbtar.1.xml
index c773937844..4843085565 100644
--- a/docs/manpages/smbtar.1.xml
+++ b/docs/manpages/smbtar.1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 				  
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>
 <refentry id="smbtar.1">
 
diff --git a/docs/manpages/smbtree.1.xml b/docs/manpages/smbtree.1.xml
index f9661f4849..05c843614f 100644
--- a/docs/manpages/smbtree.1.xml
+++ b/docs/manpages/smbtree.1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 				  
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>
 <refentry id="smbtree.1">
 
diff --git a/docs/manpages/smbumount.8.xml b/docs/manpages/smbumount.8.xml
index d8feb8e938..43178ea432 100644
--- a/docs/manpages/smbumount.8.xml
+++ b/docs/manpages/smbumount.8.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 				  
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>
 <refentry id="smbumount.8">
 
diff --git a/docs/manpages/swat.8.xml b/docs/manpages/swat.8.xml
index 902918d932..f10a3c7591 100644
--- a/docs/manpages/swat.8.xml
+++ b/docs/manpages/swat.8.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 				  
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>
 <refentry id="swat.8">
 
diff --git a/docs/manpages/tdbbackup.8.xml b/docs/manpages/tdbbackup.8.xml
index e5f060b101..321ec3f8f9 100644
--- a/docs/manpages/tdbbackup.8.xml
+++ b/docs/manpages/tdbbackup.8.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 				  
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>
 <refentry id="tdbbackup.8">
 
diff --git a/docs/manpages/tdbdump.8.xml b/docs/manpages/tdbdump.8.xml
index c31bef480b..38119678c6 100644
--- a/docs/manpages/tdbdump.8.xml
+++ b/docs/manpages/tdbdump.8.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 				  
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>
 <refentry id="tdbdump.8">
 
diff --git a/docs/manpages/testparm.1.xml b/docs/manpages/testparm.1.xml
index 84ead17234..3b282e44ec 100644
--- a/docs/manpages/testparm.1.xml
+++ b/docs/manpages/testparm.1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 				  
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>
 <refentry id="testparm.1">
 
diff --git a/docs/manpages/testprns.1.xml b/docs/manpages/testprns.1.xml
index 50584f5a18..9f03910482 100644
--- a/docs/manpages/testprns.1.xml
+++ b/docs/manpages/testprns.1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 				  
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>
 <refentry id="testprns.1">
 
diff --git a/docs/manpages/vfstest.1.xml b/docs/manpages/vfstest.1.xml
index 7b68963fba..69f617c922 100644
--- a/docs/manpages/vfstest.1.xml
+++ b/docs/manpages/vfstest.1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 				  
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>
 <refentry id="vfstest.1">
 
diff --git a/docs/manpages/wbinfo.1.xml b/docs/manpages/wbinfo.1.xml
index 728e4f166a..c9f3b3a252 100644
--- a/docs/manpages/wbinfo.1.xml
+++ b/docs/manpages/wbinfo.1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 				  
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>
 <refentry id="wbinfo.1">
 
diff --git a/docs/manpages/winbindd.8.xml b/docs/manpages/winbindd.8.xml
index 0986b10119..bfa3b4ff53 100644
--- a/docs/manpages/winbindd.8.xml
+++ b/docs/manpages/winbindd.8.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 				  
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+<!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>
 <refentry id="winbindd.8">
 
diff --git a/docs/xslt/expand-sambadoc.xsl b/docs/xslt/expand-sambadoc.xsl
index 2c9aa0a82a..d72725ab26 100644
--- a/docs/xslt/expand-sambadoc.xsl
+++ b/docs/xslt/expand-sambadoc.xsl
@@ -75,7 +75,7 @@
 			&lt;!DOCTYPE </xsl:text><xsl:value-of select="name(.)"/><xsl:text disable-output-escaping="yes"> PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 			"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 
-			&lt;!ENTITY % globalentities SYSTEM 'global.ent'> %globalentities;
+			&lt;!ENTITY % globalentities SYSTEM 'entities/global.entities'> %globalentities;
 			]>
 		</xsl:text>
 		<xsl:copy>