summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/Makefile4
-rw-r--r--docs/Samba-Developers-Guide/CodingSuggestions.xml6
-rw-r--r--docs/Samba-Developers-Guide/NetBIOS.xml6
-rw-r--r--docs/Samba-Developers-Guide/Tracing.xml6
-rw-r--r--docs/Samba-Developers-Guide/architecture.xml6
-rw-r--r--docs/Samba-Developers-Guide/cifsntdomain.xml6
-rw-r--r--docs/Samba-Developers-Guide/contributing.xml6
-rw-r--r--docs/Samba-Developers-Guide/debug.xml6
-rw-r--r--docs/Samba-Developers-Guide/encryption.xml6
-rw-r--r--docs/Samba-Developers-Guide/gencache.xml7
-rw-r--r--docs/Samba-Developers-Guide/internals.xml6
-rw-r--r--docs/Samba-Developers-Guide/modules.xml6
-rw-r--r--docs/Samba-Developers-Guide/packagers.xml6
-rw-r--r--docs/Samba-Developers-Guide/parsing.xml6
-rw-r--r--docs/Samba-Developers-Guide/printing.xml6
-rw-r--r--docs/Samba-Developers-Guide/registry.xml6
-rw-r--r--docs/Samba-Developers-Guide/rpc_plugin.xml6
-rw-r--r--docs/Samba-Developers-Guide/unix-smb.xml6
-rw-r--r--docs/Samba-Developers-Guide/vfs.xml6
-rw-r--r--docs/Samba-Developers-Guide/windows-debug.xml6
-rw-r--r--docs/Samba-Developers-Guide/wins.xml6
-rw-r--r--docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml10
-rw-r--r--docs/Samba-Guide/Chap02-SimpleOfficeServer.xml10
-rw-r--r--docs/Samba-Guide/Chap03-TheSmallOffice.xml10
-rw-r--r--docs/Samba-Guide/Chap04-SecureOfficeServer.xml10
-rw-r--r--docs/Samba-Guide/Chap05-500UserNetwork.xml10
-rw-r--r--docs/Samba-Guide/Chap06-MakingHappyUsers.xml10
-rw-r--r--docs/Samba-Guide/Chap07-2000UserNetwork.xml10
-rw-r--r--docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml10
-rw-r--r--docs/Samba-Guide/Chap08b-MigrateNW4Samba3.xml10
-rw-r--r--docs/Samba-Guide/Chap09-AddingUNIXClients.xml10
-rw-r--r--docs/Samba-Guide/Chap10-KerberosFastStart.xml10
-rw-r--r--docs/Samba-Guide/Chap10b-DomainAppsSupport.xml9
-rw-r--r--docs/Samba-Guide/Chap11-HighAvailability.xml9
-rw-r--r--docs/Samba-Guide/Chap12-Appendix.xml9
-rw-r--r--docs/Samba-Guide/acknowledgements.xml9
-rw-r--r--docs/Samba-Guide/conventions.xml9
-rw-r--r--docs/Samba-Guide/foreword.xml9
-rw-r--r--docs/Samba-Guide/front-matter.xml9
-rw-r--r--docs/Samba-Guide/glossary.xml10
-rw-r--r--docs/Samba-Guide/gpl.xml1
-rw-r--r--docs/Samba-Guide/inside-cover.xml10
-rw-r--r--docs/Samba-Guide/preface.xml9
-rw-r--r--docs/entities/global.entities454
-rw-r--r--docs/manpages/editreg.1.xml5
-rw-r--r--docs/manpages/findsmb.1.xml5
-rw-r--r--docs/manpages/lmhosts.5.xml5
-rw-r--r--docs/manpages/log2pcap.1.xml5
-rw-r--r--docs/manpages/mount.cifs.8.xml5
-rw-r--r--docs/manpages/net.8.xml5
-rw-r--r--docs/manpages/nmbd.8.xml5
-rw-r--r--docs/manpages/nmblookup.1.xml5
-rw-r--r--docs/manpages/ntlm_auth.1.xml5
-rw-r--r--docs/manpages/pam_winbind.8.xml5
-rw-r--r--docs/manpages/pdbedit.8.xml5
-rw-r--r--docs/manpages/profiles.1.xml5
-rw-r--r--docs/manpages/rpcclient.1.xml5
-rw-r--r--docs/manpages/samba.7.xml5
-rw-r--r--docs/manpages/smbcacls.1.xml5
-rw-r--r--docs/manpages/smbclient.1.xml5
-rw-r--r--docs/manpages/smbcontrol.1.xml5
-rw-r--r--docs/manpages/smbcquotas.1.xml5
-rw-r--r--docs/manpages/smbd.8.xml5
-rw-r--r--docs/manpages/smbget.1.xml5
-rw-r--r--docs/manpages/smbgetrc.5.xml5
-rw-r--r--docs/manpages/smbmnt.8.xml5
-rw-r--r--docs/manpages/smbmount.8.xml5
-rw-r--r--docs/manpages/smbpasswd.5.xml5
-rw-r--r--docs/manpages/smbpasswd.8.xml5
-rw-r--r--docs/manpages/smbsh.1.xml5
-rw-r--r--docs/manpages/smbspool.8.xml5
-rw-r--r--docs/manpages/smbstatus.1.xml5
-rw-r--r--docs/manpages/smbtar.1.xml5
-rw-r--r--docs/manpages/smbtree.1.xml5
-rw-r--r--docs/manpages/smbumount.8.xml5
-rw-r--r--docs/manpages/swat.8.xml5
-rw-r--r--docs/manpages/tdbbackup.8.xml5
-rw-r--r--docs/manpages/tdbdump.8.xml5
-rw-r--r--docs/manpages/testparm.1.xml5
-rw-r--r--docs/manpages/testprns.1.xml5
-rw-r--r--docs/manpages/vfstest.1.xml5
-rw-r--r--docs/manpages/wbinfo.1.xml5
-rw-r--r--docs/manpages/winbindd.8.xml5
83 files changed, 83 insertions, 894 deletions
diff --git a/docs/Makefile b/docs/Makefile
index 97bf3634b4..f918df1aa0 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -92,7 +92,7 @@ $(HTMLDIR)/index.html: htmldocs.html
$(HTMLDIR)/%/index.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/%/samba.css xslt/html-chunk.xsl
mkdir -p $(@D)
$(XSLTPROC) --stringparam base.dir "$(HTMLDIR)/$*/" xslt/html-chunk.xsl $<
- -mkdir $(@D)/images
+ mkdir -p $(@D)/images
$(COPY_IMAGES) html $(DOCBOOKDIR)/$*.xml $* $(@D)
# Single large HTML files
@@ -175,7 +175,7 @@ $(FOPDFDIR)/%.pdf: $(FODIR)/%.fo
$(FOP) -q -d $< -pdf $@
$(HTMLHELPDIR)/%: $(DOCBOOKDIR)/%.xml
- -mkdir -p $@/images
+ mkdir -p $@/images
$(COPY_IMAGES) html $(DOCBOOKDIR)/$*.xml $* $@
$(XSLTPROC) --stringparam htmlhelp.chm $*.chm --stringparam manifest.in.base.dir "$@/" --stringparam base.dir "$@/" http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl $<
diff --git a/docs/Samba-Developers-Guide/CodingSuggestions.xml b/docs/Samba-Developers-Guide/CodingSuggestions.xml
index 04465a1fcd..09d842639e 100644
--- a/docs/Samba-Developers-Guide/CodingSuggestions.xml
+++ b/docs/Samba-Developers-Guide/CodingSuggestions.xml
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-]>
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<chapter id="CodingSuggestions">
<chapterinfo>
<author>
diff --git a/docs/Samba-Developers-Guide/NetBIOS.xml b/docs/Samba-Developers-Guide/NetBIOS.xml
index 6375bc1dc6..d1fdd21737 100644
--- a/docs/Samba-Developers-Guide/NetBIOS.xml
+++ b/docs/Samba-Developers-Guide/NetBIOS.xml
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-]>
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<chapter id="netbios">
<chapterinfo>
<author>
diff --git a/docs/Samba-Developers-Guide/Tracing.xml b/docs/Samba-Developers-Guide/Tracing.xml
index 3868eaab7b..7586f3c4c5 100644
--- a/docs/Samba-Developers-Guide/Tracing.xml
+++ b/docs/Samba-Developers-Guide/Tracing.xml
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-]>
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<chapter id="tracing">
<chapterinfo>
<author>
diff --git a/docs/Samba-Developers-Guide/architecture.xml b/docs/Samba-Developers-Guide/architecture.xml
index fb1fe52546..da276ca91e 100644
--- a/docs/Samba-Developers-Guide/architecture.xml
+++ b/docs/Samba-Developers-Guide/architecture.xml
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-]>
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<chapter id="architecture">
<chapterinfo>
<author>
diff --git a/docs/Samba-Developers-Guide/cifsntdomain.xml b/docs/Samba-Developers-Guide/cifsntdomain.xml
index 5e57833b69..fd19205ada 100644
--- a/docs/Samba-Developers-Guide/cifsntdomain.xml
+++ b/docs/Samba-Developers-Guide/cifsntdomain.xml
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-]>
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<chapter id="ntdomain">
<chapterinfo>
<author>
diff --git a/docs/Samba-Developers-Guide/contributing.xml b/docs/Samba-Developers-Guide/contributing.xml
index 8749c00084..acb8085cbe 100644
--- a/docs/Samba-Developers-Guide/contributing.xml
+++ b/docs/Samba-Developers-Guide/contributing.xml
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-]>
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<chapter id="contributing">
<chapterinfo>
&author.jelmer;
diff --git a/docs/Samba-Developers-Guide/debug.xml b/docs/Samba-Developers-Guide/debug.xml
index f627833557..5ffc0cbc74 100644
--- a/docs/Samba-Developers-Guide/debug.xml
+++ b/docs/Samba-Developers-Guide/debug.xml
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-]>
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<chapter id="debug">
<chapterinfo>
<author>
diff --git a/docs/Samba-Developers-Guide/encryption.xml b/docs/Samba-Developers-Guide/encryption.xml
index 0a1fbbbbed..5ab711014b 100644
--- a/docs/Samba-Developers-Guide/encryption.xml
+++ b/docs/Samba-Developers-Guide/encryption.xml
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-]>
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<chapter id="pwencrypt">
diff --git a/docs/Samba-Developers-Guide/gencache.xml b/docs/Samba-Developers-Guide/gencache.xml
index 94184bf865..7def6f21d2 100644
--- a/docs/Samba-Developers-Guide/gencache.xml
+++ b/docs/Samba-Developers-Guide/gencache.xml
@@ -1,10 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-]>
-
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<chapter id="gencache">
<chapterinfo>
<author>
diff --git a/docs/Samba-Developers-Guide/internals.xml b/docs/Samba-Developers-Guide/internals.xml
index 7decd9d06c..a6d6435ac7 100644
--- a/docs/Samba-Developers-Guide/internals.xml
+++ b/docs/Samba-Developers-Guide/internals.xml
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-]>
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<chapter id="internals">
<chapterinfo>
<author>
diff --git a/docs/Samba-Developers-Guide/modules.xml b/docs/Samba-Developers-Guide/modules.xml
index c14fda04dd..30768e47ed 100644
--- a/docs/Samba-Developers-Guide/modules.xml
+++ b/docs/Samba-Developers-Guide/modules.xml
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-]>
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<chapter id="modules">
<chapterinfo>
<author>
diff --git a/docs/Samba-Developers-Guide/packagers.xml b/docs/Samba-Developers-Guide/packagers.xml
index 2d85430676..470e1e8288 100644
--- a/docs/Samba-Developers-Guide/packagers.xml
+++ b/docs/Samba-Developers-Guide/packagers.xml
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-]>
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<chapter id="Packaging">
<chapterinfo>
<author>
diff --git a/docs/Samba-Developers-Guide/parsing.xml b/docs/Samba-Developers-Guide/parsing.xml
index d989c97809..1b3df637cd 100644
--- a/docs/Samba-Developers-Guide/parsing.xml
+++ b/docs/Samba-Developers-Guide/parsing.xml
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-]>
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<chapter id="parsing">
<chapterinfo>
<author>
diff --git a/docs/Samba-Developers-Guide/printing.xml b/docs/Samba-Developers-Guide/printing.xml
index cd29b5010b..d41bc22ddf 100644
--- a/docs/Samba-Developers-Guide/printing.xml
+++ b/docs/Samba-Developers-Guide/printing.xml
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-]>
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<chapter id="printing">
<chapterinfo>
<author>
diff --git a/docs/Samba-Developers-Guide/registry.xml b/docs/Samba-Developers-Guide/registry.xml
index 078e926de9..62925c62f4 100644
--- a/docs/Samba-Developers-Guide/registry.xml
+++ b/docs/Samba-Developers-Guide/registry.xml
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-]>
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<chapter id="registry">
<chapterinfo>
&author.jelmer;
diff --git a/docs/Samba-Developers-Guide/rpc_plugin.xml b/docs/Samba-Developers-Guide/rpc_plugin.xml
index 478847b192..dc91129f38 100644
--- a/docs/Samba-Developers-Guide/rpc_plugin.xml
+++ b/docs/Samba-Developers-Guide/rpc_plugin.xml
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-]>
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<chapter id="rpc-plugin">
<chapterinfo>
<author>
diff --git a/docs/Samba-Developers-Guide/unix-smb.xml b/docs/Samba-Developers-Guide/unix-smb.xml
index 9521404feb..3c63c74dfd 100644
--- a/docs/Samba-Developers-Guide/unix-smb.xml
+++ b/docs/Samba-Developers-Guide/unix-smb.xml
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-]>
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<chapter id="unix-smb">
<chapterinfo>
<author>
diff --git a/docs/Samba-Developers-Guide/vfs.xml b/docs/Samba-Developers-Guide/vfs.xml
index 6819faf05d..652bc61eb9 100644
--- a/docs/Samba-Developers-Guide/vfs.xml
+++ b/docs/Samba-Developers-Guide/vfs.xml
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-]>
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<chapter id="vfs">
<chapterinfo>
<author>
diff --git a/docs/Samba-Developers-Guide/windows-debug.xml b/docs/Samba-Developers-Guide/windows-debug.xml
index 27ffbc063c..e04ccd3797 100644
--- a/docs/Samba-Developers-Guide/windows-debug.xml
+++ b/docs/Samba-Developers-Guide/windows-debug.xml
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-]>
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<chapter id="windows-debug">
<chapterinfo>
&author.jelmer;
diff --git a/docs/Samba-Developers-Guide/wins.xml b/docs/Samba-Developers-Guide/wins.xml
index ad3ad67b42..7793160b03 100644
--- a/docs/Samba-Developers-Guide/wins.xml
+++ b/docs/Samba-Developers-Guide/wins.xml
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-]>
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<chapter id="wins">
<chapterinfo>
<author>
diff --git a/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml b/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml
index dc35822cdb..f3d39ad04c 100644
--- a/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml
+++ b/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml
@@ -1,13 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-
- <!-- entities files to use -->
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-
-]>
-
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<chapter id="primer">
<title>Networking Primer</title>
diff --git a/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml b/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml
index 89aedf2cac..9b39685ce0 100644
--- a/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml
+++ b/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml
@@ -1,13 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-
- <!-- entities files to use -->
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-
-]>
-
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<chapter id="simple">
<title>No Frills Samba Servers</title>
diff --git a/docs/Samba-Guide/Chap03-TheSmallOffice.xml b/docs/Samba-Guide/Chap03-TheSmallOffice.xml
index da8013a476..d700a1850c 100644
--- a/docs/Samba-Guide/Chap03-TheSmallOffice.xml
+++ b/docs/Samba-Guide/Chap03-TheSmallOffice.xml
@@ -1,13 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-
- <!-- entities files to use -->
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-
-]>
-
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<chapter id="small">
<title>Small Office Networking</title>
diff --git a/docs/Samba-Guide/Chap04-SecureOfficeServer.xml b/docs/Samba-Guide/Chap04-SecureOfficeServer.xml
index 947ac4a9b7..20103e0904 100644
--- a/docs/Samba-Guide/Chap04-SecureOfficeServer.xml
+++ b/docs/Samba-Guide/Chap04-SecureOfficeServer.xml
@@ -1,13 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-
- <!-- entities files to use -->
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-
-]>
-
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<chapter id="secure">
<title>Secure Office Networking</title>
diff --git a/docs/Samba-Guide/Chap05-500UserNetwork.xml b/docs/Samba-Guide/Chap05-500UserNetwork.xml
index 0b38bfde83..47d1b21d5a 100644
--- a/docs/Samba-Guide/Chap05-500UserNetwork.xml
+++ b/docs/Samba-Guide/Chap05-500UserNetwork.xml
@@ -1,13 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-
- <!-- entities files to use -->
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-
-]>
-
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<chapter id="Big500users">
<title>The 500-User Office</title>
diff --git a/docs/Samba-Guide/Chap06-MakingHappyUsers.xml b/docs/Samba-Guide/Chap06-MakingHappyUsers.xml
index d0f1515652..b3df50ef87 100644
--- a/docs/Samba-Guide/Chap06-MakingHappyUsers.xml
+++ b/docs/Samba-Guide/Chap06-MakingHappyUsers.xml
@@ -1,13 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-
- <!-- entities files to use -->
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-
-]>
-
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<chapter id="happy">
<title>Making Happy Users</title>
diff --git a/docs/Samba-Guide/Chap07-2000UserNetwork.xml b/docs/Samba-Guide/Chap07-2000UserNetwork.xml
index 529b66918c..68457abaf3 100644
--- a/docs/Samba-Guide/Chap07-2000UserNetwork.xml
+++ b/docs/Samba-Guide/Chap07-2000UserNetwork.xml
@@ -1,13 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-
- <!-- entities files to use -->
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-
-]>
-
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<chapter id="2000users">
<title>A Distributed 2000 User Network</title>
diff --git a/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml b/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml
index 4f0f74744c..4611fc6187 100644
--- a/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml
+++ b/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml
@@ -1,13 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-
- <!-- entities files to use -->
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-
-]>
-
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<chapter id="migration">
<title>Migrating NT4 Domain to Samba-3</title>
diff --git a/docs/Samba-Guide/Chap08b-MigrateNW4Samba3.xml b/docs/Samba-Guide/Chap08b-MigrateNW4Samba3.xml
index 24d9ddc0a8..0f3eefd99c 100644
--- a/docs/Samba-Guide/Chap08b-MigrateNW4Samba3.xml
+++ b/docs/Samba-Guide/Chap08b-MigrateNW4Samba3.xml
@@ -1,13 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-
- <!-- entities files to use -->
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-
-]>
-
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<chapter id="nw4migration">
<title>Migrating NetWare 4.11 Server to Samba-3</title>
diff --git a/docs/Samba-Guide/Chap09-AddingUNIXClients.xml b/docs/Samba-Guide/Chap09-AddingUNIXClients.xml
index 95fa2d947a..5cfc48d684 100644
--- a/docs/Samba-Guide/Chap09-AddingUNIXClients.xml
+++ b/docs/Samba-Guide/Chap09-AddingUNIXClients.xml
@@ -1,13 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-
- <!-- entities files to use -->
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-
-]>
-
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<chapter id="unixclients">
<title>Adding UNIX/LINUX Servers and Clients</title>
diff --git a/docs/Samba-Guide/Chap10-KerberosFastStart.xml b/docs/Samba-Guide/Chap10-KerberosFastStart.xml
index 1bee207791..02650ebb69 100644
--- a/docs/Samba-Guide/Chap10-KerberosFastStart.xml
+++ b/docs/Samba-Guide/Chap10-KerberosFastStart.xml
@@ -1,13 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-
- <!-- entities files to use -->
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-
-]>
-
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<chapter id="kerberos">
<title>Active Directory, Kerberos, and Security</title>
diff --git a/docs/Samba-Guide/Chap10b-DomainAppsSupport.xml b/docs/Samba-Guide/Chap10b-DomainAppsSupport.xml
index e2adbe9951..cd2894ec02 100644
--- a/docs/Samba-Guide/Chap10b-DomainAppsSupport.xml
+++ b/docs/Samba-Guide/Chap10b-DomainAppsSupport.xml
@@ -1,12 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-
- <!-- entities files to use -->
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-
-]>
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<chapter id="DomApps">
<title>Integrating Additional Services</title>
diff --git a/docs/Samba-Guide/Chap11-HighAvailability.xml b/docs/Samba-Guide/Chap11-HighAvailability.xml
index c4701eb7b0..60b1ef8ad1 100644
--- a/docs/Samba-Guide/Chap11-HighAvailability.xml
+++ b/docs/Samba-Guide/Chap11-HighAvailability.xml
@@ -1,12 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-
- <!-- entities files to use -->
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-
-]>
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<chapter id="HA">
<title>Performance, Reliability, and Availability</title>
diff --git a/docs/Samba-Guide/Chap12-Appendix.xml b/docs/Samba-Guide/Chap12-Appendix.xml
index 1b13d63ce5..3ce6739c66 100644
--- a/docs/Samba-Guide/Chap12-Appendix.xml
+++ b/docs/Samba-Guide/Chap12-Appendix.xml
@@ -1,12 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-
- <!-- entities files to use -->
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-
-]>
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<appendix id="appendix">
<title>Appendix: A Collection of Useful Tid-bits</title>
diff --git a/docs/Samba-Guide/acknowledgements.xml b/docs/Samba-Guide/acknowledgements.xml
index e356732fd0..edc72ca03e 100644
--- a/docs/Samba-Guide/acknowledgements.xml
+++ b/docs/Samba-Guide/acknowledgements.xml
@@ -1,12 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-
- <!-- entities files to use -->
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-
-]>
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<preface lang="en-US">
<title>Acknowledgments</title>
diff --git a/docs/Samba-Guide/conventions.xml b/docs/Samba-Guide/conventions.xml
index 6d36cbf0e4..82763d5369 100644
--- a/docs/Samba-Guide/conventions.xml
+++ b/docs/Samba-Guide/conventions.xml
@@ -1,12 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-
- <!-- entities files to use -->
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-
-]>
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<sect1>
<title>Conventions Used</title>
diff --git a/docs/Samba-Guide/foreword.xml b/docs/Samba-Guide/foreword.xml
index d8f063d4e3..20060a8701 100644
--- a/docs/Samba-Guide/foreword.xml
+++ b/docs/Samba-Guide/foreword.xml
@@ -1,12 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-
- <!-- entities files to use -->
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-
-]>
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<preface lang="en-US">
<title>Foreword</title>
diff --git a/docs/Samba-Guide/front-matter.xml b/docs/Samba-Guide/front-matter.xml
index 506a4d6ed5..93f542e5b8 100644
--- a/docs/Samba-Guide/front-matter.xml
+++ b/docs/Samba-Guide/front-matter.xml
@@ -1,12 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-
- <!-- entities files to use -->
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-
-]>
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<preface lang="en-US">
<title>Front Matter</title>
diff --git a/docs/Samba-Guide/glossary.xml b/docs/Samba-Guide/glossary.xml
index ec6c5b8e54..54e72f681b 100644
--- a/docs/Samba-Guide/glossary.xml
+++ b/docs/Samba-Guide/glossary.xml
@@ -1,13 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-
- <!-- entities files to use -->
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-
-]>
-
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<glossary>
<title>Glossary</title>
diff --git a/docs/Samba-Guide/gpl.xml b/docs/Samba-Guide/gpl.xml
index 4d0b778031..2084034c7b 100644
--- a/docs/Samba-Guide/gpl.xml
+++ b/docs/Samba-Guide/gpl.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<appendix>
<appendixinfo>
<title>GNU General Public License</title>
diff --git a/docs/Samba-Guide/inside-cover.xml b/docs/Samba-Guide/inside-cover.xml
index 7390512448..877d01a334 100644
--- a/docs/Samba-Guide/inside-cover.xml
+++ b/docs/Samba-Guide/inside-cover.xml
@@ -1,13 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-
- <!-- entities files to use -->
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-
-]>
-
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<preface lang="en-US">
<title>About the Cover Artwork</title>
diff --git a/docs/Samba-Guide/preface.xml b/docs/Samba-Guide/preface.xml
index f63e468dcd..04bc17bd72 100644
--- a/docs/Samba-Guide/preface.xml
+++ b/docs/Samba-Guide/preface.xml
@@ -1,12 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-
- <!-- entities files to use -->
- <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
- %global_entities;
-
-]>
+<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<preface id="preface">
<title>Preface</title>
diff --git a/docs/entities/global.entities b/docs/entities/global.entities
deleted file mode 100644
index 727d27a80d..0000000000
--- a/docs/entities/global.entities
+++ /dev/null
@@ -1,454 +0,0 @@
-<!-- Global Entities File -->
-
-
-<!-- Email Address' -->
-<!ENTITY email.dbannon 'D.Bannon@latrobe.edu.au'>
-<!ENTITY email.jmoore 'jmoore@php.net'>
-<!ENTITY email.jerry 'jerry@samba.org'>
-<!ENTITY email.patches 'samba-patches@samba.org'>
-<!ENTITY email.jelmer 'jelmer@samba.org'>
-<!ENTITY email.jht 'jht@samba.org'>
-
-
-<!-- Author entities -->
-<!ENTITY person.jelmer '
-<firstname>Jelmer</firstname><othername>R.</othername><surname>Vernooij</surname><othername>R.</othername>
-<affiliation>
- <orgname>The Samba Team</orgname>
- <address><email>jelmer@samba.org</email></address>
-</affiliation>'>
-
-<!ENTITY author.jelmer '<author>&person.jelmer;</author>'>
-
-<!ENTITY person.jerry '
-<firstname>Gerald</firstname><surname>Carter</surname><othername>(Jerry)</othername>
-<affiliation>
- <orgname>Samba Team</orgname>
- <address><email>jerry@samba.org</email></address>
-</affiliation>'>
-
-<!ENTITY author.jerry '<author>&person.jerry;</author>'>
-
-<!ENTITY author.jeremy '
-<author>
- <firstname>Jeremy</firstname><surname>Allison</surname>
- <affiliation>
- <orgname>Samba Team</orgname>
- <address><email>jra@samba.org</email></address>
- </affiliation>
-</author>'>
-
-<!ENTITY person.jht '
-<firstname>John</firstname><surname>Terpstra</surname><othername>H.</othername>
-<affiliation>
- <orgname>Samba Team</orgname>
- <address><email>jht@samba.org</email></address>
-</affiliation>'>
-
-<!ENTITY author.jht '<author>&person.jht;</author>'>
-
-<!ENTITY person.gd '
-<firstname>Guenther</firstname><surname>Deschner</surname>
-<affiliation>
- <orgname>SuSE</orgname>
- <address><email>gd@suse.de</email></address>
-</affiliation>'>
-
-<!ENTITY author.gd '<author>&person.gd;</author>'>
-
-<!ENTITY person.kauer '
-<firstname>Karl</firstname><surname>Auer</surname>
-<affiliation>
- <orgname>Samba Team</orgname>
- <address><email>kauer@biplane.com.au</email></address>
-</affiliation>
-'>
-
-<!ENTITY author.kauer '<author>&person.kauer;</author>'>
-
-<!ENTITY person.danshearer '
-<firstname>Dan</firstname><surname>Shearer</surname>
-<affiliation>
- <orgname>Samba Team</orgname>
- <address><email>dan@samba.org</email></address>
-</affiliation>
-'>
-
-<!ENTITY author.danshearer '<author>&person.danshearer;</author>'>
-
-<!ENTITY person.tpot '
-<firstname>Tim</firstname><surname>Potter</surname>
-<affiliation>
- <orgname>Samba Team</orgname>
- <address><email>tpot@samba.org</email></address>
-</affiliation>
-'>
-
-<!ENTITY author.tpot '<author>&person.tpot;</author>'>
-
-<!ENTITY author.tridge '
-<author>
- <firstname>Andrew</firstname><surname>Tridgell</surname>
- <affiliation>
- <orgname>Samba Team</orgname>
- <address><email>tridge@samba.org</email></address>
- </affiliation>
-</author>'>
-
-<!ENTITY person.jmcd '
- <firstname>Jim</firstname><surname>McDonough</surname>
- <affiliation>
- <orgname>IBM</orgname>
- <address><email>jmcd@us.ibm.com</email></address>
- </affiliation>'>
-
-<!ENTITY author.jmcd '<author>&person.jmcd;</author>'>
-
-<!ENTITY author.vl '
-<author>
- <firstname>Volker</firstname><surname>Lendecke</surname>
- <affiliation>
- <orgname>Samba Team</orgname>
- <address><email>Volker.Lendecke@SerNet.DE</email></address>
- </affiliation>
-</author>'>
-
-<!ENTITY author.dbannon '
-<author>
- <firstname>David</firstname><surname>Bannon</surname>
- <affiliation>
- <orgname>Samba Team</orgname>
- <address><email>dbannon@samba.org</email></address>
- </affiliation>
-</author>'>
-
-<!ENTITY author.mimir '
-<author>
- <firstname>Rafal</firstname><surname>Szczesniak</surname>
- <affiliation>
- <orgname>Samba Team</orgname>
- <address><email>mimir@samba.org</email></address>
- </affiliation>
-</author>'>
-
-<!ENTITY author.dlechnyr '
-<author>
- <firstname>David</firstname><surname>Lechnyr</surname>
- <affiliation>
- <orgname>Unofficial HOWTO</orgname>
- <address><email>david@lechnyr.com</email></address>
- </affiliation>
-</author>'>
-
-<!ENTITY author.eroseme '
-<author>
- <firstname>Eric</firstname><surname>Roseme</surname>
- <affiliation>
- <orgname>HP Oplocks Usage Recommendations Whitepaper</orgname>
- <address><email>eric.roseme@hp.com</email></address>
- </affiliation>
-</author>'>
-
-
-<!-- URL's -->
-<!ENTITY url.samba.cvsinfo 'http://pserver.samba.org/samba/cvs.html'>
-<!ENTITY url.pdc-howto.local 'samba-pdc-howto.html'>
-<!ENTITY url.samba-tng 'http://www.samba-tng.org'>
-<!ENTITY url.samba.doc 'http://bioserve.latrobe.edu.au/samba/'>
-<!ENTITY url.ultraedit 'http://www.ultraedit.com'>
-<!ENTITY url.vi-windows 'http://home.snafu.de/ramo/WinViEn.htm'>
-<!ENTITY url.pfe 'http://www.lancs.ac.uk/people/cpaap/pfe/'>
-<!ENTITY url.server-tools.win95 'ftp://ftp.microsoft.com/Softlib/MSLFILES/NEXUS.EXE'>
-<!ENTITY url.server-tools.winnt 'ftp://ftp.microsoft.com/Softlib/MSLFILES/SRVTOOLS.EXE'>
-<!ENTITY url.tcpdump 'http://www.tcpdump.org/'>
-<!ENTITY url.samba 'http://samba.org'>
-<!ENTITY url.samba-ldap-howto 'http://www.unav.es/cti/ldap-smb-howto.html'>
-<!ENTITY url.samba-tng.home 'http://www.kneschke.de/projekte/samba_tng/'>
-<!ENTITY url.samba.mailinglist.ntdom 'http://lists.samba.org/mailman/samba-ntdom'>
-<!ENTITY url.samba.cifs 'http://samba.org/cifs/'>
-<!ENTITY url.ntdomains-for-unix 'http://mailhost.cb1.com/~lkcl/ntdom/'>
-<!ENTITY url.samba.specs.old 'ftp://ftp.microsoft.com/developr/drg/CIFS/'>
-<!ENTITY url.rfc.1001 'http://ds.internic.net/rfc/rfc1001.txt'>
-<!ENTITY url.rfc.1002 'http://ds.internic.net/rfc/rfc1002.txt'>
-
-<!-- Misc -->
-<!ENTITY samba.pub.cvshost 'pserver.samba.org'>
-
-<!ENTITY stdarg.debug '
-<varlistentry>
-<term>-d|--debug=debuglevel</term>
-<listitem>
-<para><replaceable>debuglevel</replaceable> is an integer
-from 0 to 10. The default value if this parameter is
-not specified is zero.</para>
-
-<para>The higher this value, the more detail will be
-logged to the log files about the activities of the
-server. At level 0, only critical errors and serious
-warnings will be logged. Level 1 is a reasonable level for
-day-to-day running - it generates a small amount of
-information about operations carried out.</para>
-
-<para>Levels above 1 will generate considerable
-amounts of log data, and should only be used when
-investigating a problem. Levels above 3 are designed for
-use only by developers and generate HUGE amounts of log
-data, most of which is extremely cryptic.</para>
-
-<para>Note that specifying this parameter here will
-override the <smbconfoption><name>log level</name></smbconfoption> parameter
-in the &smb.conf; file.</para>
-</listitem>
-</varlistentry>'>
-
-<!ENTITY stdarg.configfile '
-<varlistentry>
-<term>-s &lt;configuration file&gt;</term>
-<listitem><para>The file specified contains the
-configuration details required by the server. The
-information in this file includes server-specific
-information such as what printcap file to use, as well
-as descriptions of all the services that the server is
-to provide. See &smb.conf; for more information.
-The default configuration file name is determined at
-compile time.</para></listitem>
-</varlistentry>'>
-
-<!ENTITY stdarg.version '
-<varlistentry>
-<term>-V</term>
-<listitem><para>Prints the program version number.
-</para></listitem>
-</varlistentry>'>
-
-<!ENTITY stdarg.logfile '
-<varlistentry>
-<term>-l|--logfile=logdirectory</term>
-<listitem><para>Base directory name for log/debug files. The extension
-<constant>".progname"</constant> will be appended (e.g. log.smbclient,
-log.smbd, etc...). The log file is never removed by the client.
-</para></listitem>
-</varlistentry>'>
-
-<!ENTITY popt.common.samba '
-&stdarg.version;
-&stdarg.configfile;
-&stdarg.debug;
-&stdarg.logfile;
-'>
-
-<!ENTITY stdarg.resolve.order '
-<varlistentry>
-<term>-R &lt;name resolve order&gt;</term>
-<listitem><para>This option is used to determine what naming
-services and in what order to resolve
-host names to IP addresses. The option takes a space-separated
-string of different name resolution options.</para>
-
-<para>The options are: "lmhosts", "host", "wins" and "bcast".
-They cause names to be resolved as follows :</para>
-
-<itemizedlist>
-<listitem><para><constant>lmhosts</constant>:
-Lookup an IP address in the Samba lmhosts file. If the
-line in lmhosts has no name type attached to the
-NetBIOS name
-(see the <citerefentry><refentrytitle>lmhosts</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry> for details)
-then any name type matches for lookup.
-</para></listitem>
-
-<listitem><para><constant>host</constant>:
-Do a standard host name to IP address resolution, using
-the system <filename>/etc/hosts</filename>, NIS, or DNS
-lookups. This method of name resolution is operating
-system dependent, for instance on IRIX or Solaris this
-may be controlled by the <filename>/etc/nsswitch.conf
-</filename> file). Note that this method is only used
-if the NetBIOS name type being queried is the 0x20
-(server) name type, otherwise it is ignored.
-</para></listitem>
-
-<listitem><para><constant>wins</constant>:
-Query a name with the IP address listed in the
-<parameter>wins server</parameter> parameter. If no
-WINS server has been specified this method will be
-ignored.
-</para></listitem>
-
-<listitem><para><constant>bcast</constant>:
-Do a broadcast on each of the known local interfaces
-listed in the <parameter>interfaces</parameter>
-parameter. This is the least reliable of the name
-resolution methods as it depends on the target host
-being on a locally connected subnet.
-</para></listitem>
-</itemizedlist>
-
-<para>If this parameter is not set then the name resolve order
-defined in the &smb.conf; file parameter
-(<smbconfoption><name>name resolve order</name></smbconfoption>) will be used.
-</para>
-
-<para>The default order is lmhosts, host, wins, bcast. Without
-this parameter or any entry in the <smbconfoption><name>name resolve order</name></smbconfoption> parameter of the &smb.conf; file, the name
-resolution methods will be attempted in this order. </para></listitem>
-</varlistentry>'>
-
-<!ENTITY stdarg.netbios.name '
-<varlistentry>
-<term>-n &lt;primary NetBIOS name&gt;</term>
-<listitem><para>This option allows you to override
-the NetBIOS name that Samba uses for itself. This is identical
-to setting the <smbconfoption><name>netbios name</name></smbconfoption> parameter in the &smb.conf; file.
-However, a command
-line setting will take precedence over settings in
-&smb.conf;.</para></listitem>
-</varlistentry>'>
-
-<!ENTITY stdarg.scope '
-<varlistentry>
-<term>-i &lt;scope&gt;</term>
-<listitem><para>This specifies a NetBIOS scope that
-<command>nmblookup</command> will use to communicate with when
-generating NetBIOS names. For details on the use of NetBIOS
-scopes, see rfc1001.txt and rfc1002.txt. NetBIOS scopes are
-<emphasis>very</emphasis> rarely used, only set this parameter
-if you are the system administrator in charge of all the
-NetBIOS systems you communicate with.</para></listitem>
-</varlistentry>'>
-
-<!ENTITY stdarg.workgroup '
-<varlistentry>
-<term>-W|--workgroup=domain</term>
-<listitem><para>Set the SMB domain of the username. This
-overrides the default domain which is the domain defined in
-smb.conf. If the domain specified is the same as the servers
-NetBIOS name, it causes the client to log on using the servers local
-SAM (as opposed to the Domain SAM). </para></listitem>
-</varlistentry>'>
-
-<!ENTITY stdarg.socket.options '
-<varlistentry>
-<term>-O socket options</term>
-<listitem><para>TCP socket options to set on the client
-socket. See the socket options parameter in
-the &smb.conf; manual page for the list of valid
-options. </para></listitem>
-</varlistentry>
-'>
-
-<!ENTITY popt.common.connection '
-&stdarg.netbios.name;
-&stdarg.scope;
-&stdarg.workgroup;
-&stdarg.socket.options;
-'>
-
-<!ENTITY stdarg.nopass '
-<varlistentry>
-<term>-N</term>
-<listitem><para>If specified, this parameter suppresses the normal
-password prompt from the client to the user. This is useful when
-accessing a service that does not require a password. </para>
-
-<para>Unless a password is specified on the command line or
-this parameter is specified, the client will request a
-password.</para></listitem>
-</varlistentry>'>
-
-<!ENTITY pct "&#37;">
-
-<!ENTITY stdarg.username '
-<varlistentry>
-<term>-U|--user=username[&pct;password]</term>
-<listitem><para>Sets the SMB username or username and password. </para>
-
-<para>If &pct;password is not specified, the user will be prompted. The
-client will first check the <envar>USER</envar> environment variable, then the
-<envar>LOGNAME</envar> variable and if either exists, the
-string is uppercased. If these environmental variables are not
-found, the username <constant>GUEST</constant> is used. </para>
-
-<para>A third option is to use a credentials file which
-contains the plaintext of the username and password. This
-option is mainly provided for scripts where the admin does not
-wish to pass the credentials on the command line or via environment
-variables. If this method is used, make certain that the permissions
-on the file restrict access from unwanted users. See the
-<parameter>-A</parameter> for more details. </para>
-
-<para>Be cautious about including passwords in scripts. Also, on
-many systems the command line of a running process may be seen
-via the <command>ps</command> command. To be safe always allow
-<command>rpcclient</command> to prompt for a password and type
-it in directly. </para></listitem>
-</varlistentry>
-'>
-
-<!ENTITY stdarg.authfile '
-<varlistentry>
-<term>-A|--authentication-file=filename</term>
-<listitem><para>This option allows
-you to specify a file from which to read the username and
-password used in the connection. The format of the file is
-</para>
-
-<para><programlisting>
-username = &lt;value&gt;
-password = &lt;value&gt;
-domain = &lt;value&gt;
-</programlisting></para>
-
-<para>Make certain that the permissions on the file restrict
-access from unwanted users. </para></listitem>
-</varlistentry>'>
-
-<!ENTITY stdarg.kerberos '
-<varlistentry>
-<term>-k</term>
-<listitem><para>
-Try to authenticate with kerberos. Only useful in
-an Active Directory environment.
-</para></listitem>
-</varlistentry>
-'>
-
-
-<!ENTITY stdarg.help '
-<varlistentry>
-<term>-h|--help</term>
-<listitem><para>Print a summary of command line options.
-</para></listitem>
-</varlistentry>'>
-
-<!ENTITY popt.common.credentials '
-&stdarg.nopass;
-&stdarg.kerberos;
-&stdarg.authfile;
-&stdarg.username;
-'>
-
-<!-- Entities for the various programs -->
-<!ENTITY smbd '<application>smbd</application>'>
-<!ENTITY nmbd '<application>nmbd</application>'>
-<!ENTITY testparm '<application>testparm</application>'>
-<!ENTITY smb.conf '<filename>smb.conf</filename>'>
-<!ENTITY smbclient '<application>smbclient</application>'>
-<!ENTITY winbindd '<application>winbindd</application>'>
-<!ENTITY net '<application>net</application>'>
-
-<!ENTITY not.implemented "<note><para>Currently NOT implemented.</para></note>">
-<!ENTITY rootprompt "<prompt>root# </prompt>">
-<!ENTITY prompt "<prompt>$ </prompt>">
-<!ENTITY dosprompt "<prompt>C:\&gt; </prompt>">
-
-<!ENTITY example.workgroup "MIDEARTH">
-<!ENTITY example.server.samba "GANDALF">
-<!ENTITY example.server.windows "SARUMAN">
-<!ENTITY example.workstation.windows "FRODO">
-<!ENTITY example.workstation.samba "BILBO">
-<!ENTITY example.pdc.samba "SAURON">
-<!ENTITY example.server.wins "noldor">
-
-<!ENTITY smbmdash "<?latex --- ?>">
diff --git a/docs/manpages/editreg.1.xml b/docs/manpages/editreg.1.xml
index be95eadac5..2b08555a4f 100644
--- a/docs/manpages/editreg.1.xml
+++ b/docs/manpages/editreg.1.xml
@@ -1,8 +1,5 @@
<?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 '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="editreg.1">
<refmeta>
diff --git a/docs/manpages/findsmb.1.xml b/docs/manpages/findsmb.1.xml
index c14bff91b6..ac8c8c010f 100644
--- a/docs/manpages/findsmb.1.xml
+++ b/docs/manpages/findsmb.1.xml
@@ -1,8 +1,5 @@
<?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 '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="findsmb.1">
<refmeta>
diff --git a/docs/manpages/lmhosts.5.xml b/docs/manpages/lmhosts.5.xml
index 15bea4ef62..f797569102 100644
--- a/docs/manpages/lmhosts.5.xml
+++ b/docs/manpages/lmhosts.5.xml
@@ -1,8 +1,5 @@
<?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 '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="lmhosts.5">
<refmeta>
diff --git a/docs/manpages/log2pcap.1.xml b/docs/manpages/log2pcap.1.xml
index 69b153fc76..16155c4312 100644
--- a/docs/manpages/log2pcap.1.xml
+++ b/docs/manpages/log2pcap.1.xml
@@ -1,8 +1,5 @@
<?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 '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="log2pcap.1">
<refmeta>
diff --git a/docs/manpages/mount.cifs.8.xml b/docs/manpages/mount.cifs.8.xml
index 8100ce04a8..d397d88544 100644
--- a/docs/manpages/mount.cifs.8.xml
+++ b/docs/manpages/mount.cifs.8.xml
@@ -1,8 +1,5 @@
<?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 '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="mount.cifs.8">
<refmeta>
diff --git a/docs/manpages/net.8.xml b/docs/manpages/net.8.xml
index 4268af2c44..6a9001b046 100644
--- a/docs/manpages/net.8.xml
+++ b/docs/manpages/net.8.xml
@@ -1,8 +1,5 @@
<?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 '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="net.8">
<refmeta>
diff --git a/docs/manpages/nmbd.8.xml b/docs/manpages/nmbd.8.xml
index 85274fe9e1..2bd5385d8b 100644
--- a/docs/manpages/nmbd.8.xml
+++ b/docs/manpages/nmbd.8.xml
@@ -1,8 +1,5 @@
<?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 '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="nmbd.8">
<refmeta>
diff --git a/docs/manpages/nmblookup.1.xml b/docs/manpages/nmblookup.1.xml
index 569a7b9ce7..551235b53a 100644
--- a/docs/manpages/nmblookup.1.xml
+++ b/docs/manpages/nmblookup.1.xml
@@ -1,8 +1,5 @@
<?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 '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="nmblookup">
<refmeta>
diff --git a/docs/manpages/ntlm_auth.1.xml b/docs/manpages/ntlm_auth.1.xml
index ef3e84d374..84799ee75d 100644
--- a/docs/manpages/ntlm_auth.1.xml
+++ b/docs/manpages/ntlm_auth.1.xml
@@ -1,8 +1,5 @@
<?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 '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="ntlm-auth.1">
<refmeta>
diff --git a/docs/manpages/pam_winbind.8.xml b/docs/manpages/pam_winbind.8.xml
index 8f8150ec23..00d219fc72 100644
--- a/docs/manpages/pam_winbind.8.xml
+++ b/docs/manpages/pam_winbind.8.xml
@@ -1,8 +1,5 @@
<?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 '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="pam_winbind.8">
<refmeta>
diff --git a/docs/manpages/pdbedit.8.xml b/docs/manpages/pdbedit.8.xml
index 5e2d619b9c..ecb70d917a 100644
--- a/docs/manpages/pdbedit.8.xml
+++ b/docs/manpages/pdbedit.8.xml
@@ -1,8 +1,5 @@
<?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 '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="pdbedit.8">
<refmeta>
diff --git a/docs/manpages/profiles.1.xml b/docs/manpages/profiles.1.xml
index b27fe35425..9738cf4ab1 100644
--- a/docs/manpages/profiles.1.xml
+++ b/docs/manpages/profiles.1.xml
@@ -1,8 +1,5 @@
<?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 '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="profiles.1">
<refmeta>
diff --git a/docs/manpages/rpcclient.1.xml b/docs/manpages/rpcclient.1.xml
index b6e946ee97..00448dc5bb 100644
--- a/docs/manpages/rpcclient.1.xml
+++ b/docs/manpages/rpcclient.1.xml
@@ -1,8 +1,5 @@
<?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 '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="rpcclient.1">
<refmeta>
diff --git a/docs/manpages/samba.7.xml b/docs/manpages/samba.7.xml
index cc46922d3f..56e3a7994e 100644
--- a/docs/manpages/samba.7.xml
+++ b/docs/manpages/samba.7.xml
@@ -1,8 +1,5 @@
<?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 '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="samba.7">
<refmeta>
diff --git a/docs/manpages/smbcacls.1.xml b/docs/manpages/smbcacls.1.xml
index 0e5dd67878..e3cefe57d7 100644
--- a/docs/manpages/smbcacls.1.xml
+++ b/docs/manpages/smbcacls.1.xml
@@ -1,8 +1,5 @@
<?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 '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="smbcacls.1">
<refmeta>
diff --git a/docs/manpages/smbclient.1.xml b/docs/manpages/smbclient.1.xml
index ab66fd7edc..b7ee8f8338 100644
--- a/docs/manpages/smbclient.1.xml
+++ b/docs/manpages/smbclient.1.xml
@@ -1,8 +1,5 @@
<?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 '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="smbclient.1">
<refmeta>
diff --git a/docs/manpages/smbcontrol.1.xml b/docs/manpages/smbcontrol.1.xml
index 87d188fd9a..8bbe211f41 100644
--- a/docs/manpages/smbcontrol.1.xml
+++ b/docs/manpages/smbcontrol.1.xml
@@ -1,8 +1,5 @@
<?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 '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="smbcontrol.1">
<refmeta>
diff --git a/docs/manpages/smbcquotas.1.xml b/docs/manpages/smbcquotas.1.xml
index 04df53f907..239315e9dc 100644
--- a/docs/manpages/smbcquotas.1.xml
+++ b/docs/manpages/smbcquotas.1.xml
@@ -1,8 +1,5 @@
<?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 '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="smbcquotas.1">
<refmeta>
diff --git a/docs/manpages/smbd.8.xml b/docs/manpages/smbd.8.xml
index 3b028dfc81..8b7007b1be 100644
--- a/docs/manpages/smbd.8.xml
+++ b/docs/manpages/smbd.8.xml
@@ -1,8 +1,5 @@
<?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 '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="smbd.8">
<refmeta>
diff --git a/docs/manpages/smbget.1.xml b/docs/manpages/smbget.1.xml
index 80a23842a6..7c4f2956a8 100644
--- a/docs/manpages/smbget.1.xml
+++ b/docs/manpages/smbget.1.xml
@@ -1,8 +1,5 @@
<?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 '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="smbget.1">
<refmeta>
diff --git a/docs/manpages/smbgetrc.5.xml b/docs/manpages/smbgetrc.5.xml
index eaa886248c..59d492a29b 100644
--- a/docs/manpages/smbgetrc.5.xml
+++ b/docs/manpages/smbgetrc.5.xml
@@ -1,8 +1,5 @@
<?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 '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="smbgetrc.5">
<refmeta>
diff --git a/docs/manpages/smbmnt.8.xml b/docs/manpages/smbmnt.8.xml
index 4f57234345..9425ce7c31 100644
--- a/docs/manpages/smbmnt.8.xml
+++ b/docs/manpages/smbmnt.8.xml
@@ -1,8 +1,5 @@
<?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 '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="smbmnt.8">
<refmeta>
diff --git a/docs/manpages/smbmount.8.xml b/docs/manpages/smbmount.8.xml
index 6727a17095..68e0b351e0 100644
--- a/docs/manpages/smbmount.8.xml
+++ b/docs/manpages/smbmount.8.xml
@@ -1,8 +1,5 @@
<?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 '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="smbmount.8">
<refmeta>
diff --git a/docs/manpages/smbpasswd.5.xml b/docs/manpages/smbpasswd.5.xml
index e323f827b8..a04ea4c831 100644
--- a/docs/manpages/smbpasswd.5.xml
+++ b/docs/manpages/smbpasswd.5.xml
@@ -1,8 +1,5 @@
<?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 '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="smbpasswd.5">
<refmeta>
diff --git a/docs/manpages/smbpasswd.8.xml b/docs/manpages/smbpasswd.8.xml
index c09245a28f..0e41ae9410 100644
--- a/docs/manpages/smbpasswd.8.xml
+++ b/docs/manpages/smbpasswd.8.xml
@@ -1,8 +1,5 @@
<?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 '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="smbpasswd.8">
<refmeta>
diff --git a/docs/manpages/smbsh.1.xml b/docs/manpages/smbsh.1.xml
index d5515b80c3..48655b0ab1 100644
--- a/docs/manpages/smbsh.1.xml
+++ b/docs/manpages/smbsh.1.xml
@@ -1,8 +1,5 @@
<?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 '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="smbsh.1">
<refmeta>
diff --git a/docs/manpages/smbspool.8.xml b/docs/manpages/smbspool.8.xml
index 5f2cb33cdb..6ed2d607e2 100644
--- a/docs/manpages/smbspool.8.xml
+++ b/docs/manpages/smbspool.8.xml
@@ -1,8 +1,5 @@
<?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 '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="smbspool.8">
<refmeta>
diff --git a/docs/manpages/smbstatus.1.xml b/docs/manpages/smbstatus.1.xml
index b4ccce58a4..a0f4efb145 100644
--- a/docs/manpages/smbstatus.1.xml
+++ b/docs/manpages/smbstatus.1.xml
@@ -1,8 +1,5 @@
<?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 '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="smbstatus.1">
<refmeta>
diff --git a/docs/manpages/smbtar.1.xml b/docs/manpages/smbtar.1.xml
index f7d45d6b81..e0fe2130f4 100644
--- a/docs/manpages/smbtar.1.xml
+++ b/docs/manpages/smbtar.1.xml
@@ -1,8 +1,5 @@
<?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 '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="smbtar.1">
<refmeta>
diff --git a/docs/manpages/smbtree.1.xml b/docs/manpages/smbtree.1.xml
index 592f303845..e493ef25d5 100644
--- a/docs/manpages/smbtree.1.xml
+++ b/docs/manpages/smbtree.1.xml
@@ -1,8 +1,5 @@
<?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 '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="smbtree.1">
<refmeta>
diff --git a/docs/manpages/smbumount.8.xml b/docs/manpages/smbumount.8.xml
index 43178ea432..55e4f3995b 100644
--- a/docs/manpages/smbumount.8.xml
+++ b/docs/manpages/smbumount.8.xml
@@ -1,8 +1,5 @@
<?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 '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="smbumount.8">
<refmeta>
diff --git a/docs/manpages/swat.8.xml b/docs/manpages/swat.8.xml
index 39e44619e9..897be4a21c 100644
--- a/docs/manpages/swat.8.xml
+++ b/docs/manpages/swat.8.xml
@@ -1,8 +1,5 @@
<?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 '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="swat.8">
<refmeta>
diff --git a/docs/manpages/tdbbackup.8.xml b/docs/manpages/tdbbackup.8.xml
index c9ce73171a..1a1adf13df 100644
--- a/docs/manpages/tdbbackup.8.xml
+++ b/docs/manpages/tdbbackup.8.xml
@@ -1,8 +1,5 @@
<?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 '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="tdbbackup.8">
<refmeta>
diff --git a/docs/manpages/tdbdump.8.xml b/docs/manpages/tdbdump.8.xml
index fc2c9b3ca7..cf3b7b462b 100644
--- a/docs/manpages/tdbdump.8.xml
+++ b/docs/manpages/tdbdump.8.xml
@@ -1,8 +1,5 @@
<?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 '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="tdbdump.8">
<refmeta>
diff --git a/docs/manpages/testparm.1.xml b/docs/manpages/testparm.1.xml
index e820d91666..5687dc12d8 100644
--- a/docs/manpages/testparm.1.xml
+++ b/docs/manpages/testparm.1.xml
@@ -1,8 +1,5 @@
<?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 '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="testparm.1">
<refmeta>
diff --git a/docs/manpages/testprns.1.xml b/docs/manpages/testprns.1.xml
index 6e71b31207..88734c9637 100644
--- a/docs/manpages/testprns.1.xml
+++ b/docs/manpages/testprns.1.xml
@@ -1,8 +1,5 @@
<?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 '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="testprns.1">
<refmeta>
diff --git a/docs/manpages/vfstest.1.xml b/docs/manpages/vfstest.1.xml
index fb23493d0a..30ff7b2b65 100644
--- a/docs/manpages/vfstest.1.xml
+++ b/docs/manpages/vfstest.1.xml
@@ -1,8 +1,5 @@
<?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 '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="vfstest.1">
<refmeta>
diff --git a/docs/manpages/wbinfo.1.xml b/docs/manpages/wbinfo.1.xml
index c7245ae009..9dd55a7ec2 100644
--- a/docs/manpages/wbinfo.1.xml
+++ b/docs/manpages/wbinfo.1.xml
@@ -1,8 +1,5 @@
<?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 '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="wbinfo.1">
<refmeta>
diff --git a/docs/manpages/winbindd.8.xml b/docs/manpages/winbindd.8.xml
index 445c75c3d9..dd98cfd8e5 100644
--- a/docs/manpages/winbindd.8.xml
+++ b/docs/manpages/winbindd.8.xml
@@ -1,8 +1,5 @@
<?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 '../entities/global.entities'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="winbindd.8">
<refmeta>