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)

37 files changed, 37 insertions, 37 deletions

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">