Large number of small fixes to the layout and the build system.

(This used to be commit 73fac0653c774a8ed8654b064fd63d4e486f6b0f)

207 files changed, 86 insertions, 128 deletions

diff --git a/docs/Makefile b/docs/Makefile
index 5bf87c9f48..65d05a203d 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -40,9 +40,9 @@ help:
 	@echo " samples - Extract examples"
 	@echo " files - Extract other files"
 
-$(DOCBOOKDIR)/Samba-Guide.xml: $(filter-out Samba-Guide/index.xml,$(wildcard Samba-Guide/*.xml))
-$(DOCBOOKDIR)/Samba-HOWTO-Collection.xml: $(filter-out Samba-HOWTO-Collection/index.xml,$(wildcard Samba-HOWTO-Collection/*.xml)) Samba-HOWTO-Collection-attributions.xml
-Samba-HOWTO-Collection/manpages.xml: $(MANPAGEDIR3)/smb.conf.5.xml
+$(DOCBOOKDIR)/Samba3-ByExample.xml: $(filter-out Samba3-ByExample/index.xml,$(wildcard Samba3-ByExample/*.xml))
+$(DOCBOOKDIR)/Samba3-HOWTO.xml: $(filter-out Samba3-HOWTO/index.xml,$(wildcard Samba3-HOWTO/*.xml)) Samba3-HOWTO-attributions.xml
+Samba3-HOWTO/manpages.xml: $(MANPAGEDIR3)/smb.conf.5.xml
 $(DOCBOOKDIR)/Samba3-Developers-Guide.xml: $(filter-out Samba3-Developers-Guide/index.xml,$(wildcard Samba3-Developers-Guide/*.xml)) Samba3-Developers-Guide-attributions.xml
 $(DOCBOOKDIR)/Samba4-HOWTO.xml: $(filter-out Samba4-HOWTO/index.xml,$(wildcard Samba4-HOWTO/*.xml)) Samba4-HOWTO-attributions.xml
 
@@ -64,8 +64,8 @@ texi: $(patsubst %,$(TEXINFODIR)/%.texi,$(MAIN_DOCS))
 texiinfo: $(patsubst %,$(TEXINFODIR)/%.info,$(MAIN_DOCS))
 manpages3: $(patsubst $(MANPAGEDIR3)/%.xml,$(OUTPUTDIR)/manpages-3/%,$(MANPAGES3))
 manpages4: $(patsubst $(MANPAGEDIR4)/%.xml,$(OUTPUTDIR)/manpages-4/%,$(MANPAGES4))
-pearson: $(PEARSONDIR)/Samba-HOWTO-Collection.xml
-pearson-verify: $(PEARSONDIR)/Samba-HOWTO-Collection.report.html
+pearson: $(PEARSONDIR)/Samba3-HOWTO.xml
+pearson-verify: $(PEARSONDIR)/Samba3-HOWTO.report.html
 plucker: $(patsubst %,$(PLUCKERDIR)/%.pdb,$(MAIN_DOCS))
 htmlman3: $(patsubst $(MANPAGEDIR3)/%.xml,$(HTMLDIR)/manpages-3/%.html,$(MANPAGES3)) $(HTMLDIR)/manpages-3/index.html
 htmlman4: $(patsubst $(MANPAGEDIR4)/%.xml,$(HTMLDIR)/manpages-4/%.html,$(MANPAGES4)) $(HTMLDIR)/manpages-4/index.html
@@ -279,10 +279,10 @@ undocumented: $(SMBDOTCONFDOC)/parameters.all.xml scripts/find_missing_doc.pl sc
 	@$(PERL) scripts/find_missing_manpages.pl $(SRCDIR)
 
 # Examples and the like
-files: Samba-HOWTO-Collection/index.xml xslt/extract-smbfiles.xsl
+files: Samba3-HOWTO/index.xml xslt/extract-smbfiles.xsl
 	$(XSLTPROC) xslt/extract-smbfiles.xsl $< > /dev/null
 
-samples: $(DOCBOOKDIR)/Samba-HOWTO-Collection.xml xslt/extract-examples.xsl scripts/indent-smb.conf.pl
+samples: $(DOCBOOKDIR)/Samba3-HOWTO.xml xslt/extract-examples.xsl scripts/indent-smb.conf.pl
 	mkdir -p $(EXAMPLESDIR)
 	$(XSLTPROC) --xinclude xslt/extract-examples.xsl $< > /dev/null 2> examples/README
 	for I in examples/*.conf; do { ./scripts/indent-smb.conf.pl < $$I > $$I.tmp; mv $$I.tmp $$I; } done
@@ -290,8 +290,8 @@ samples: $(DOCBOOKDIR)/Samba-HOWTO-Collection.xml xslt/extract-examples.xsl scri
 # Archiving
 archive: pdf
 	mkdir -p $(ARCHIVEDIR)
-	cp $(PDFDIR)/Samba-HOWTO-Collection.pdf $(ARCHIVEDIR)/TOSHARG-$(DATETIME).pdf
-	cp $(PDFDIR)/Samba-Guide.pdf $(ARCHIVEDIR)/S3bE-$(DATETIME).pdf
+	cp $(PDFDIR)/Samba3-HOWTO.pdf $(ARCHIVEDIR)/TOSHARG-$(DATETIME).pdf
+	cp $(PDFDIR)/Samba3-ByExample.pdf $(ARCHIVEDIR)/S3bE-$(DATETIME).pdf
 
 # XSL scripts
 xslt/html.xsl: xslt/html-common.xsl settings.xsl
diff --git a/docs/Samba-Guide/SBE-2000UserNetwork.xml b/docs/Samba3-ByExample/SBE-2000UserNetwork.xml
index 2023e43f92..2023e43f92 100644
--- a/docs/Samba-Guide/SBE-2000UserNetwork.xml
+++ b/docs/Samba3-ByExample/SBE-2000UserNetwork.xml
diff --git a/docs/Samba-Guide/SBE-500UserNetwork.xml b/docs/Samba3-ByExample/SBE-500UserNetwork.xml
index 11bd09ac04..11bd09ac04 100644
--- a/docs/Samba-Guide/SBE-500UserNetwork.xml
+++ b/docs/Samba3-ByExample/SBE-500UserNetwork.xml
diff --git a/docs/Samba-Guide/SBE-AddingUNIXClients.xml b/docs/Samba3-ByExample/SBE-AddingUNIXClients.xml
index 49db512a44..49db512a44 100644
--- a/docs/Samba-Guide/SBE-AddingUNIXClients.xml
+++ b/docs/Samba3-ByExample/SBE-AddingUNIXClients.xml
diff --git a/docs/Samba-Guide/SBE-Appendix1.xml b/docs/Samba3-ByExample/SBE-Appendix1.xml
index 9d0e816e42..9d0e816e42 100644
--- a/docs/Samba-Guide/SBE-Appendix1.xml
+++ b/docs/Samba3-ByExample/SBE-Appendix1.xml
diff --git a/docs/Samba-Guide/SBE-Appendix2.xml b/docs/Samba3-ByExample/SBE-Appendix2.xml
index c2e8f29de0..c2e8f29de0 100644
--- a/docs/Samba-Guide/SBE-Appendix2.xml
+++ b/docs/Samba3-ByExample/SBE-Appendix2.xml
diff --git a/docs/Samba-Guide/SBE-DomainAppsSupport.xml b/docs/Samba3-ByExample/SBE-DomainAppsSupport.xml
index eefc9c9fb2..eefc9c9fb2 100644
--- a/docs/Samba-Guide/SBE-DomainAppsSupport.xml
+++ b/docs/Samba3-ByExample/SBE-DomainAppsSupport.xml
diff --git a/docs/Samba-Guide/SBE-HighAvailability.xml b/docs/Samba3-ByExample/SBE-HighAvailability.xml
index db94af4d2f..db94af4d2f 100644
--- a/docs/Samba-Guide/SBE-HighAvailability.xml
+++ b/docs/Samba3-ByExample/SBE-HighAvailability.xml
diff --git a/docs/Samba-Guide/SBE-KerberosFastStart.xml b/docs/Samba3-ByExample/SBE-KerberosFastStart.xml
index 58ac2b6931..58ac2b6931 100644
--- a/docs/Samba-Guide/SBE-KerberosFastStart.xml
+++ b/docs/Samba3-ByExample/SBE-KerberosFastStart.xml
diff --git a/docs/Samba-Guide/SBE-MakingHappyUsers.xml b/docs/Samba3-ByExample/SBE-MakingHappyUsers.xml
index f5cf133a60..f5cf133a60 100644
--- a/docs/Samba-Guide/SBE-MakingHappyUsers.xml
+++ b/docs/Samba3-ByExample/SBE-MakingHappyUsers.xml
diff --git a/docs/Samba-Guide/SBE-MigrateNT4Samba3.xml b/docs/Samba3-ByExample/SBE-MigrateNT4Samba3.xml
index ffeba2254e..ffeba2254e 100644
--- a/docs/Samba-Guide/SBE-MigrateNT4Samba3.xml
+++ b/docs/Samba3-ByExample/SBE-MigrateNT4Samba3.xml
diff --git a/docs/Samba-Guide/SBE-MigrateNW4Samba3.xml b/docs/Samba3-ByExample/SBE-MigrateNW4Samba3.xml
index fcdf69abbd..fcdf69abbd 100644
--- a/docs/Samba-Guide/SBE-MigrateNW4Samba3.xml
+++ b/docs/Samba3-ByExample/SBE-MigrateNW4Samba3.xml
diff --git a/docs/Samba-Guide/SBE-SecureOfficeServer.xml b/docs/Samba3-ByExample/SBE-SecureOfficeServer.xml
index cc67cd4c39..cc67cd4c39 100644
--- a/docs/Samba-Guide/SBE-SecureOfficeServer.xml
+++ b/docs/Samba3-ByExample/SBE-SecureOfficeServer.xml
diff --git a/docs/Samba-Guide/SBE-SimpleOfficeServer.xml b/docs/Samba3-ByExample/SBE-SimpleOfficeServer.xml
index 036953b584..036953b584 100644
--- a/docs/Samba-Guide/SBE-SimpleOfficeServer.xml
+++ b/docs/Samba3-ByExample/SBE-SimpleOfficeServer.xml
diff --git a/docs/Samba-Guide/SBE-TheSmallOffice.xml b/docs/Samba3-ByExample/SBE-TheSmallOffice.xml
index 8cb71820ed..8cb71820ed 100644
--- a/docs/Samba-Guide/SBE-TheSmallOffice.xml
+++ b/docs/Samba3-ByExample/SBE-TheSmallOffice.xml
diff --git a/docs/Samba-Guide/SBE-UpgradingSamba.xml b/docs/Samba3-ByExample/SBE-UpgradingSamba.xml
index 1bc1f1f7ed..1bc1f1f7ed 100644
--- a/docs/Samba-Guide/SBE-UpgradingSamba.xml
+++ b/docs/Samba3-ByExample/SBE-UpgradingSamba.xml
diff --git a/docs/Samba-Guide/SBE-acknowledgements.xml b/docs/Samba3-ByExample/SBE-acknowledgements.xml
index 2d02ed3795..2d02ed3795 100644
--- a/docs/Samba-Guide/SBE-acknowledgements.xml
+++ b/docs/Samba3-ByExample/SBE-acknowledgements.xml
diff --git a/docs/Samba-Guide/SBE-foreword.xml b/docs/Samba3-ByExample/SBE-foreword.xml
index d90aead066..d90aead066 100644
--- a/docs/Samba-Guide/SBE-foreword.xml
+++ b/docs/Samba3-ByExample/SBE-foreword.xml
diff --git a/docs/Samba-Guide/SBE-front-matter.xml b/docs/Samba3-ByExample/SBE-front-matter.xml
index 1afd6cd14b..1afd6cd14b 100644
--- a/docs/Samba-Guide/SBE-front-matter.xml
+++ b/docs/Samba3-ByExample/SBE-front-matter.xml
diff --git a/docs/Samba-Guide/SBE-glossary.xml b/docs/Samba3-ByExample/SBE-glossary.xml
index 1066d253c7..1066d253c7 100644
--- a/docs/Samba-Guide/SBE-glossary.xml
+++ b/docs/Samba3-ByExample/SBE-glossary.xml
diff --git a/docs/Samba-Guide/SBE-inside-cover.xml b/docs/Samba3-ByExample/SBE-inside-cover.xml
index 492a581cf5..492a581cf5 100644
--- a/docs/Samba-Guide/SBE-inside-cover.xml
+++ b/docs/Samba3-ByExample/SBE-inside-cover.xml
diff --git a/docs/Samba-Guide/SBE-preface.xml b/docs/Samba3-ByExample/SBE-preface.xml
index 8c99546a6c..8c99546a6c 100644
--- a/docs/Samba-Guide/SBE-preface.xml
+++ b/docs/Samba3-ByExample/SBE-preface.xml
diff --git a/docs/Samba-Guide/conventions.xml b/docs/Samba3-ByExample/conventions.xml
index d4bbde8f85..d4bbde8f85 100644
--- a/docs/Samba-Guide/conventions.xml
+++ b/docs/Samba3-ByExample/conventions.xml
diff --git a/docs/Samba-Guide/gpl.xml b/docs/Samba3-ByExample/gpl.xml
index 8f3b8b40e4..8f3b8b40e4 100644
--- a/docs/Samba-Guide/gpl.xml
+++ b/docs/Samba3-ByExample/gpl.xml
diff --git a/docs/Samba-Guide/images/AccountingNetwork.dia b/docs/Samba3-ByExample/images/AccountingNetwork.dia
index 3484dbad75..3484dbad75 100644
--- a/docs/Samba-Guide/images/AccountingNetwork.dia
+++ b/docs/Samba3-ByExample/images/AccountingNetwork.dia
diff --git a/docs/Samba-Guide/images/Charity-Network.dia b/docs/Samba3-ByExample/images/Charity-Network.dia
index ab9c7f5834..ab9c7f5834 100644
--- a/docs/Samba-Guide/images/Charity-Network.dia
+++ b/docs/Samba3-ByExample/images/Charity-Network.dia
diff --git a/docs/Samba-Guide/images/Domain-WorkgroupAnnouncement.png b/docs/Samba3-ByExample/images/Domain-WorkgroupAnnouncement.png
index e65882b2ce..e65882b2ce 100644
--- a/docs/Samba-Guide/images/Domain-WorkgroupAnnouncement.png
+++ b/docs/Samba3-ByExample/images/Domain-WorkgroupAnnouncement.png
diff --git a/docs/Samba-Guide/images/HostAnnouncment.png b/docs/Samba3-ByExample/images/HostAnnouncment.png
index 56f9fb8576..56f9fb8576 100644
--- a/docs/Samba-Guide/images/HostAnnouncment.png
+++ b/docs/Samba3-ByExample/images/HostAnnouncment.png
diff --git a/docs/Samba-Guide/images/LocalMasterAnnouncement.png b/docs/Samba3-ByExample/images/LocalMasterAnnouncement.png
index 8b22bc35c5..8b22bc35c5 100644
--- a/docs/Samba-Guide/images/LocalMasterAnnouncement.png
+++ b/docs/Samba3-ByExample/images/LocalMasterAnnouncement.png
diff --git a/docs/Samba-Guide/images/NullConnect.png b/docs/Samba3-ByExample/images/NullConnect.png
index 5320fc6db1..5320fc6db1 100644
--- a/docs/Samba-Guide/images/NullConnect.png
+++ b/docs/Samba3-ByExample/images/NullConnect.png
diff --git a/docs/Samba-Guide/images/UNIX-Samba-and-LDAP.dia b/docs/Samba3-ByExample/images/UNIX-Samba-and-LDAP.dia
index dfd30fc022..dfd30fc022 100644
--- a/docs/Samba-Guide/images/UNIX-Samba-and-LDAP.dia
+++ b/docs/Samba3-ByExample/images/UNIX-Samba-and-LDAP.dia
diff --git a/docs/Samba-Guide/images/UserConnect.png b/docs/Samba3-ByExample/images/UserConnect.png
index 0b9acce15e..0b9acce15e 100644
--- a/docs/Samba-Guide/images/UserConnect.png
+++ b/docs/Samba3-ByExample/images/UserConnect.png
diff --git a/docs/Samba-Guide/images/UserMgrNT4.png b/docs/Samba3-ByExample/images/UserMgrNT4.png
index 516c75b4b1..516c75b4b1 100644
--- a/docs/Samba-Guide/images/UserMgrNT4.png
+++ b/docs/Samba3-ByExample/images/UserMgrNT4.png
diff --git a/docs/Samba-Guide/images/WINREPRESSME-Capture.png b/docs/Samba3-ByExample/images/WINREPRESSME-Capture.png
index 3b6dc3ae56..3b6dc3ae56 100644
--- a/docs/Samba-Guide/images/WINREPRESSME-Capture.png
+++ b/docs/Samba3-ByExample/images/WINREPRESSME-Capture.png
diff --git a/docs/Samba-Guide/images/WINREPRESSME-Capture2.png b/docs/Samba3-ByExample/images/WINREPRESSME-Capture2.png
index b9b82c2287..b9b82c2287 100644
--- a/docs/Samba-Guide/images/WINREPRESSME-Capture2.png
+++ b/docs/Samba3-ByExample/images/WINREPRESSME-Capture2.png
diff --git a/docs/Samba-Guide/images/Windows-ME-WINEPRESSME-Startup-30min-ProtocolStats.png b/docs/Samba3-ByExample/images/Windows-ME-WINEPRESSME-Startup-30min-ProtocolStats.png
index 6e23d1632a..6e23d1632a 100644
--- a/docs/Samba-Guide/images/Windows-ME-WINEPRESSME-Startup-30min-ProtocolStats.png
+++ b/docs/Samba3-ByExample/images/Windows-ME-WINEPRESSME-Startup-30min-ProtocolStats.png
diff --git a/docs/Samba-Guide/images/Windows-ME-WINEPRESSME-Startup-30min-TraceStats.png b/docs/Samba3-ByExample/images/Windows-ME-WINEPRESSME-Startup-30min-TraceStats.png
index f5fd738475..f5fd738475 100644
--- a/docs/Samba-Guide/images/Windows-ME-WINEPRESSME-Startup-30min-TraceStats.png
+++ b/docs/Samba3-ByExample/images/Windows-ME-WINEPRESSME-Startup-30min-TraceStats.png
diff --git a/docs/Samba-Guide/images/WindowsXP-NullConnection.png b/docs/Samba3-ByExample/images/WindowsXP-NullConnection.png
index 76d1ac2c9a..76d1ac2c9a 100644
--- a/docs/Samba-Guide/images/WindowsXP-NullConnection.png
+++ b/docs/Samba3-ByExample/images/WindowsXP-NullConnection.png
diff --git a/docs/Samba-Guide/images/WindowsXP-UserConnection.png b/docs/Samba3-ByExample/images/WindowsXP-UserConnection.png
index d60fefc659..d60fefc659 100644
--- a/docs/Samba-Guide/images/WindowsXP-UserConnection.png
+++ b/docs/Samba3-ByExample/images/WindowsXP-UserConnection.png
diff --git a/docs/Samba-Guide/images/XP-screen001.png b/docs/Samba3-ByExample/images/XP-screen001.png
index 6f0fe58e78..6f0fe58e78 100644
--- a/docs/Samba-Guide/images/XP-screen001.png
+++ b/docs/Samba3-ByExample/images/XP-screen001.png
diff --git a/docs/Samba-Guide/images/acct2net.dia b/docs/Samba3-ByExample/images/acct2net.dia
index ca1716254b..ca1716254b 100644
--- a/docs/Samba-Guide/images/acct2net.dia
+++ b/docs/Samba3-ByExample/images/acct2net.dia
diff --git a/docs/Samba-Guide/images/ch7-dual-additive-LDAP-Ok.dia b/docs/Samba3-ByExample/images/ch7-dual-additive-LDAP-Ok.dia
index e6464b9a13..e6464b9a13 100644
--- a/docs/Samba-Guide/images/ch7-dual-additive-LDAP-Ok.dia
+++ b/docs/Samba3-ByExample/images/ch7-dual-additive-LDAP-Ok.dia
diff --git a/docs/Samba-Guide/images/ch7-dual-additive-LDAP.dia b/docs/Samba3-ByExample/images/ch7-dual-additive-LDAP.dia
index 6e1e4979d6..6e1e4979d6 100644
--- a/docs/Samba-Guide/images/ch7-dual-additive-LDAP.dia
+++ b/docs/Samba3-ByExample/images/ch7-dual-additive-LDAP.dia
diff --git a/docs/Samba-Guide/images/ch7-fail-overLDAP.dia b/docs/Samba3-ByExample/images/ch7-fail-overLDAP.dia
index f676e2adfe..f676e2adfe 100644
--- a/docs/Samba-Guide/images/ch7-fail-overLDAP.dia
+++ b/docs/Samba3-ByExample/images/ch7-fail-overLDAP.dia
diff --git a/docs/Samba-Guide/images/ch7-singleLDAP.dia b/docs/Samba3-ByExample/images/ch7-singleLDAP.dia
index b03e7d354a..b03e7d354a 100644
--- a/docs/Samba-Guide/images/ch7-singleLDAP.dia
+++ b/docs/Samba3-ByExample/images/ch7-singleLDAP.dia
diff --git a/docs/Samba-Guide/images/ch8-migration.dia b/docs/Samba3-ByExample/images/ch8-migration.dia
index 04a513bcf0..04a513bcf0 100644
--- a/docs/Samba-Guide/images/ch8-migration.dia
+++ b/docs/Samba3-ByExample/images/ch8-migration.dia
diff --git a/docs/Samba-Guide/images/chap4-net.dia b/docs/Samba3-ByExample/images/chap4-net.dia
index e8c56643c7..e8c56643c7 100644
--- a/docs/Samba-Guide/images/chap4-net.dia
+++ b/docs/Samba3-ByExample/images/chap4-net.dia
diff --git a/docs/Samba-Guide/images/chap5-net.dia b/docs/Samba3-ByExample/images/chap5-net.dia
index f4f77ea064..f4f77ea064 100644
--- a/docs/Samba-Guide/images/chap5-net.dia
+++ b/docs/Samba3-ByExample/images/chap5-net.dia
diff --git a/docs/Samba-Guide/images/chap6-net.dia b/docs/Samba3-ByExample/images/chap6-net.dia
index aa079a4291..aa079a4291 100644
--- a/docs/Samba-Guide/images/chap6-net.dia
+++ b/docs/Samba3-ByExample/images/chap6-net.dia
diff --git a/docs/Samba-Guide/images/chap7-idresol.dia b/docs/Samba3-ByExample/images/chap7-idresol.dia
index 349d0588a6..349d0588a6 100644
--- a/docs/Samba-Guide/images/chap7-idresol.dia
+++ b/docs/Samba3-ByExample/images/chap7-idresol.dia
diff --git a/docs/Samba-Guide/images/chap7-net-A.dia b/docs/Samba3-ByExample/images/chap7-net-A.dia
index 5286014a83..5286014a83 100644
--- a/docs/Samba-Guide/images/chap7-net-A.dia
+++ b/docs/Samba3-ByExample/images/chap7-net-A.dia
diff --git a/docs/Samba-Guide/images/chap7-net-Ar.png b/docs/Samba3-ByExample/images/chap7-net-Ar.png
index 2f4d80f47b..2f4d80f47b 100644
--- a/docs/Samba-Guide/images/chap7-net-Ar.png
+++ b/docs/Samba3-ByExample/images/chap7-net-Ar.png
diff --git a/docs/Samba-Guide/images/chap7-net.dia b/docs/Samba3-ByExample/images/chap7-net.dia
index a136874e74..a136874e74 100644
--- a/docs/Samba-Guide/images/chap7-net.dia
+++ b/docs/Samba3-ByExample/images/chap7-net.dia
diff --git a/docs/Samba-Guide/images/chap7-net2-B.dia b/docs/Samba3-ByExample/images/chap7-net2-B.dia
index 761e41e91a..761e41e91a 100644
--- a/docs/Samba-Guide/images/chap7-net2-B.dia
+++ b/docs/Samba3-ByExample/images/chap7-net2-B.dia
diff --git a/docs/Samba-Guide/images/chap7-net2-Br.png b/docs/Samba3-ByExample/images/chap7-net2-Br.png
index a75a47dc5d..a75a47dc5d 100644
--- a/docs/Samba-Guide/images/chap7-net2-Br.png
+++ b/docs/Samba3-ByExample/images/chap7-net2-Br.png
diff --git a/docs/Samba-Guide/images/chap7-net2.dia b/docs/Samba3-ByExample/images/chap7-net2.dia
index 653d2b2f69..653d2b2f69 100644
--- a/docs/Samba-Guide/images/chap7-net2.dia
+++ b/docs/Samba3-ByExample/images/chap7-net2.dia
diff --git a/docs/Samba-Guide/images/chap7-net2r.png b/docs/Samba3-ByExample/images/chap7-net2r.png
index 194fd3c350..194fd3c350 100644
--- a/docs/Samba-Guide/images/chap7-net2r.png
+++ b/docs/Samba3-ByExample/images/chap7-net2r.png
diff --git a/docs/Samba-Guide/images/chap7-netr.png b/docs/Samba3-ByExample/images/chap7-netr.png
index bbbbbf1cc7..bbbbbf1cc7 100644
--- a/docs/Samba-Guide/images/chap7-netr.png
+++ b/docs/Samba3-ByExample/images/chap7-netr.png
diff --git a/docs/Samba-Guide/images/chap9-ADSDC.dia b/docs/Samba3-ByExample/images/chap9-ADSDC.dia
index dd52341d54..dd52341d54 100644
--- a/docs/Samba-Guide/images/chap9-ADSDC.dia
+++ b/docs/Samba3-ByExample/images/chap9-ADSDC.dia
diff --git a/docs/Samba-Guide/images/chap9-SambaDC.dia b/docs/Samba3-ByExample/images/chap9-SambaDC.dia
index 884a4d134a..884a4d134a 100644
--- a/docs/Samba-Guide/images/chap9-SambaDC.dia
+++ b/docs/Samba3-ByExample/images/chap9-SambaDC.dia
diff --git a/docs/Samba-Guide/images/lam-config.png b/docs/Samba3-ByExample/images/lam-config.png
index 15f989bf37..15f989bf37 100644
--- a/docs/Samba-Guide/images/lam-config.png
+++ b/docs/Samba3-ByExample/images/lam-config.png
diff --git a/docs/Samba-Guide/images/lam-group-members.png b/docs/Samba3-ByExample/images/lam-group-members.png
index cab8e42fc7..cab8e42fc7 100644
--- a/docs/Samba-Guide/images/lam-group-members.png
+++ b/docs/Samba3-ByExample/images/lam-group-members.png
diff --git a/docs/Samba-Guide/images/lam-groups.png b/docs/Samba3-ByExample/images/lam-groups.png
index da17b19a77..da17b19a77 100644
--- a/docs/Samba-Guide/images/lam-groups.png
+++ b/docs/Samba3-ByExample/images/lam-groups.png
diff --git a/docs/Samba-Guide/images/lam-hosts.png b/docs/Samba3-ByExample/images/lam-hosts.png
index 27806eb9ab..27806eb9ab 100644
--- a/docs/Samba-Guide/images/lam-hosts.png
+++ b/docs/Samba3-ByExample/images/lam-hosts.png
diff --git a/docs/Samba-Guide/images/lam-login.png b/docs/Samba3-ByExample/images/lam-login.png
index cce500fc43..cce500fc43 100644
--- a/docs/Samba-Guide/images/lam-login.png
+++ b/docs/Samba3-ByExample/images/lam-login.png
diff --git a/docs/Samba-Guide/images/lam-users.png b/docs/Samba3-ByExample/images/lam-users.png
index 0ca4b437ec..0ca4b437ec 100644
--- a/docs/Samba-Guide/images/lam-users.png
+++ b/docs/Samba3-ByExample/images/lam-users.png
diff --git a/docs/Samba-Guide/images/openmag.png b/docs/Samba3-ByExample/images/openmag.png
index 52eca30c35..52eca30c35 100644
--- a/docs/Samba-Guide/images/openmag.png
+++ b/docs/Samba3-ByExample/images/openmag.png
diff --git a/docs/Samba-Guide/images/wxpp001.png b/docs/Samba3-ByExample/images/wxpp001.png
index 2e689a17e2..2e689a17e2 100644
--- a/docs/Samba-Guide/images/wxpp001.png
+++ b/docs/Samba3-ByExample/images/wxpp001.png
diff --git a/docs/Samba-Guide/images/wxpp004.png b/docs/Samba3-ByExample/images/wxpp004.png
index 656f67942e..656f67942e 100644
--- a/docs/Samba-Guide/images/wxpp004.png
+++ b/docs/Samba3-ByExample/images/wxpp004.png
diff --git a/docs/Samba-Guide/images/wxpp006.png b/docs/Samba3-ByExample/images/wxpp006.png
index a20b3ed583..a20b3ed583 100644
--- a/docs/Samba-Guide/images/wxpp006.png
+++ b/docs/Samba3-ByExample/images/wxpp006.png
diff --git a/docs/Samba-Guide/images/wxpp007.png b/docs/Samba3-ByExample/images/wxpp007.png
index cf41352220..cf41352220 100644
--- a/docs/Samba-Guide/images/wxpp007.png
+++ b/docs/Samba3-ByExample/images/wxpp007.png
diff --git a/docs/Samba-Guide/images/wxpp008.png b/docs/Samba3-ByExample/images/wxpp008.png
index 9958c7c873..9958c7c873 100644
--- a/docs/Samba-Guide/images/wxpp008.png
+++ b/docs/Samba3-ByExample/images/wxpp008.png
diff --git a/docs/Samba-Guide/images/wxpp010.png b/docs/Samba3-ByExample/images/wxpp010.png
index 068a0dfc73..068a0dfc73 100644
--- a/docs/Samba-Guide/images/wxpp010.png
+++ b/docs/Samba3-ByExample/images/wxpp010.png
diff --git a/docs/Samba-Guide/images/wxpp011.png b/docs/Samba3-ByExample/images/wxpp011.png
index 0cf88c04a6..0cf88c04a6 100644
--- a/docs/Samba-Guide/images/wxpp011.png
+++ b/docs/Samba3-ByExample/images/wxpp011.png
diff --git a/docs/Samba-Guide/images/wxpp012.png b/docs/Samba3-ByExample/images/wxpp012.png
index d89f3b5d31..d89f3b5d31 100644
--- a/docs/Samba-Guide/images/wxpp012.png
+++ b/docs/Samba3-ByExample/images/wxpp012.png
diff --git a/docs/Samba-Guide/images/wxpp013.png b/docs/Samba3-ByExample/images/wxpp013.png
index 451240ee38..451240ee38 100644
--- a/docs/Samba-Guide/images/wxpp013.png
+++ b/docs/Samba3-ByExample/images/wxpp013.png
diff --git a/docs/Samba-Guide/images/wxpp015.png b/docs/Samba3-ByExample/images/wxpp015.png
index 12fe2f31b2..12fe2f31b2 100644
--- a/docs/Samba-Guide/images/wxpp015.png
+++ b/docs/Samba3-ByExample/images/wxpp015.png
diff --git a/docs/Samba-Guide/index.xml b/docs/Samba3-ByExample/index.xml
index 89c17c5873..89c17c5873 100644
--- a/docs/Samba-Guide/index.xml
+++ b/docs/Samba3-ByExample/index.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-AccessControls.xml b/docs/Samba3-HOWTO/TOSHARG-AccessControls.xml
index f074d2c140..f074d2c140 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-AccessControls.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-AccessControls.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-AdvancedNetworkAdmin.xml b/docs/Samba3-HOWTO/TOSHARG-AdvancedNetworkAdmin.xml
index 66b4c27406..66b4c27406 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-AdvancedNetworkAdmin.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-AdvancedNetworkAdmin.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-BDC.xml b/docs/Samba3-HOWTO/TOSHARG-BDC.xml
index 7d4ff18dd7..7d4ff18dd7 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-BDC.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-BDC.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-Backup.xml b/docs/Samba3-HOWTO/TOSHARG-Backup.xml
index 7844fb13f2..7844fb13f2 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-Backup.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-Backup.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-Bugs.xml b/docs/Samba3-HOWTO/TOSHARG-Bugs.xml
index 5af66fc05a..5af66fc05a 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-Bugs.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-Bugs.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-CUPS-printing.xml b/docs/Samba3-HOWTO/TOSHARG-CUPS-printing.xml
index aac9bc4999..aac9bc4999 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-CUPS-printing.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-CUPS-printing.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-Compiling.xml b/docs/Samba3-HOWTO/TOSHARG-Compiling.xml
index 4473e60fbf..4473e60fbf 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-Compiling.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-Compiling.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-DNS-DHCP-Configuration.xml b/docs/Samba3-HOWTO/TOSHARG-DNS-DHCP-Configuration.xml
index d693c7edf6..d693c7edf6 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-DNS-DHCP-Configuration.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-DNS-DHCP-Configuration.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-Diagnosis.xml b/docs/Samba3-HOWTO/TOSHARG-Diagnosis.xml
index 9f4f3dd2c0..9f4f3dd2c0 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-Diagnosis.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-Diagnosis.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-DomainMember.xml b/docs/Samba3-HOWTO/TOSHARG-DomainMember.xml
index 0c7689c32f..0c7689c32f 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-DomainMember.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-DomainMember.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-FastStart.xml b/docs/Samba3-HOWTO/TOSHARG-FastStart.xml
index 4469bc88ef..4469bc88ef 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-FastStart.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-FastStart.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-Further-Resources.xml b/docs/Samba3-HOWTO/TOSHARG-Further-Resources.xml
index 0a9d7d1cd5..0a9d7d1cd5 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-Further-Resources.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-Further-Resources.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-Group-Mapping.xml b/docs/Samba3-HOWTO/TOSHARG-Group-Mapping.xml
index c64347c58b..4a1664b1f6 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-Group-Mapping.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-Group-Mapping.xml
@@ -88,7 +88,7 @@
 	<command>groupdel</command>, and <command>groupmod</command>), the resulting UNIX/Linux group names will be subject
 	to any limits imposed by these tools. If the tool does not allow upper case characters
 	or space characters, then the creation of an MS Windows NT4/200x style group of
-	<ntgroup>Engineering Managers</ntgroup> will attempt to create an identically named
+	<literal>Engineering Managers</literal> will attempt to create an identically named
 	UNIX/Linux group, an attempt that will of course fail.
 	</para>
 
@@ -655,8 +655,8 @@ exit 0
 	<title>Script to Configure Group Mapping</title>
 
 	<para>
-		In our example we have created a UNIX/Linux group called <ntgroup>ntadmin</ntgroup>.
-		Our script will create the additional groups <ntgroup>Orks</ntgroup>, <ntgroup>Elves</ntgroup>, and <ntgroup>Gnomes</ntgroup>.
+		In our example we have created a UNIX/Linux group called <literal>ntadmin</literal>.
+		Our script will create the additional groups <literal>Orks</literal>, <literal>Elves</literal>, and <literal>Gnomes</literal>.
 		It is a good idea to save this shell script for later re-use just in case you ever need to rebuild your mapping database.
 		For the sake of convenience we elect to save this script as a file called <filename>initGroups.sh</filename>.
 		This script is given in <link linkend="set-group-map">intGroups.sh</link>.
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-HighAvailability.xml b/docs/Samba3-HOWTO/TOSHARG-HighAvailability.xml
index 385646d91f..385646d91f 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-HighAvailability.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-HighAvailability.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-IDMAP.xml b/docs/Samba3-HOWTO/TOSHARG-IDMAP.xml
index 0ea50280a7..0ea50280a7 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-IDMAP.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-IDMAP.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-Install.xml b/docs/Samba3-HOWTO/TOSHARG-Install.xml
index 1cec899cdd..1cec899cdd 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-Install.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-Install.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-Integrating-with-Windows.xml b/docs/Samba3-HOWTO/TOSHARG-Integrating-with-Windows.xml
index 0fa90c9cb2..0fa90c9cb2 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-Integrating-with-Windows.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-Integrating-with-Windows.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-InterdomainTrusts.xml b/docs/Samba3-HOWTO/TOSHARG-InterdomainTrusts.xml
index 18f0d28454..18f0d28454 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-InterdomainTrusts.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-InterdomainTrusts.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-IntroSMB.xml b/docs/Samba3-HOWTO/TOSHARG-IntroSMB.xml
index 547a55f43a..547a55f43a 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-IntroSMB.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-IntroSMB.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-LargeFile.xml b/docs/Samba3-HOWTO/TOSHARG-LargeFile.xml
index 44f054236e..44f054236e 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-LargeFile.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-LargeFile.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-NT4Migration.xml b/docs/Samba3-HOWTO/TOSHARG-NT4Migration.xml
index 4f65b8c0a7..4f65b8c0a7 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-NT4Migration.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-NT4Migration.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-NetworkBrowsing.xml b/docs/Samba3-HOWTO/TOSHARG-NetworkBrowsing.xml
index 9592982429..9592982429 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-NetworkBrowsing.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-NetworkBrowsing.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-Other-Clients.xml b/docs/Samba3-HOWTO/TOSHARG-Other-Clients.xml
index 0a0d78fd91..0a0d78fd91 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-Other-Clients.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-Other-Clients.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-PAM.xml b/docs/Samba3-HOWTO/TOSHARG-PAM.xml
index 4a09e808b4..4a09e808b4 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-PAM.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-PAM.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-PDC.xml b/docs/Samba3-HOWTO/TOSHARG-PDC.xml
index ee9d5155c0..ee9d5155c0 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-PDC.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-PDC.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-Passdb.xml b/docs/Samba3-HOWTO/TOSHARG-Passdb.xml
index 2ee109db01..2ee109db01 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-Passdb.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-Passdb.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-PolicyMgmt.xml b/docs/Samba3-HOWTO/TOSHARG-PolicyMgmt.xml
index c529963155..c529963155 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-PolicyMgmt.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-PolicyMgmt.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-Portability.xml b/docs/Samba3-HOWTO/TOSHARG-Portability.xml
index a5455a6c67..a5455a6c67 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-Portability.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-Portability.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-Printing.xml b/docs/Samba3-HOWTO/TOSHARG-Printing.xml
index 349d64f7f9..349d64f7f9 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-Printing.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-Printing.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-Problems.xml b/docs/Samba3-HOWTO/TOSHARG-Problems.xml
index 1aa065d1c8..1aa065d1c8 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-Problems.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-Problems.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-ProfileMgmt.xml b/docs/Samba3-HOWTO/TOSHARG-ProfileMgmt.xml
index 8b137dd4ef..8b137dd4ef 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-ProfileMgmt.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-ProfileMgmt.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-RightsAndPriviliges.xml b/docs/Samba3-HOWTO/TOSHARG-RightsAndPriviliges.xml
index a8c2811511..a8c2811511 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-RightsAndPriviliges.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-RightsAndPriviliges.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-SWAT.xml b/docs/Samba3-HOWTO/TOSHARG-SWAT.xml
index 349312d61a..349312d61a 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-SWAT.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-SWAT.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-SecureLDAP.xml b/docs/Samba3-HOWTO/TOSHARG-SecureLDAP.xml
index 2fa4423d37..2fa4423d37 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-SecureLDAP.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-SecureLDAP.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-Securing.xml b/docs/Samba3-HOWTO/TOSHARG-Securing.xml
index b8d65c08ae..b8d65c08ae 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-Securing.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-Securing.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-ServerType.xml b/docs/Samba3-HOWTO/TOSHARG-ServerType.xml
index cd7f578cc0..cd7f578cc0 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-ServerType.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-ServerType.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-Speed.xml b/docs/Samba3-HOWTO/TOSHARG-Speed.xml
index 1e74a22396..1e74a22396 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-Speed.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-Speed.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-StandAloneServer.xml b/docs/Samba3-HOWTO/TOSHARG-StandAloneServer.xml
index ad1b69e79e..ad1b69e79e 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-StandAloneServer.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-StandAloneServer.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-TheNetCommand.xml b/docs/Samba3-HOWTO/TOSHARG-TheNetCommand.xml
index e811fa150c..e811fa150c 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-TheNetCommand.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-TheNetCommand.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-Unicode.xml b/docs/Samba3-HOWTO/TOSHARG-Unicode.xml
index a858a38508..a858a38508 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-Unicode.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-Unicode.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-VFS.xml b/docs/Samba3-HOWTO/TOSHARG-VFS.xml
index 3fdcc0ea81..3fdcc0ea81 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-VFS.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-VFS.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-Winbind.xml b/docs/Samba3-HOWTO/TOSHARG-Winbind.xml
index eabdcf9a72..eabdcf9a72 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-Winbind.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-Winbind.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-WindowsClientConfig.xml b/docs/Samba3-HOWTO/TOSHARG-WindowsClientConfig.xml
index be080638f6..be080638f6 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-WindowsClientConfig.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-WindowsClientConfig.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-foreword-tridge.xml b/docs/Samba3-HOWTO/TOSHARG-foreword-tridge.xml
index 34bc37314d..34bc37314d 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-foreword-tridge.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-foreword-tridge.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-glossary.xml b/docs/Samba3-HOWTO/TOSHARG-glossary.xml
index 3a36e2c553..c83ba05675 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-glossary.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-glossary.xml
@@ -233,7 +233,4 @@
 		The UNC syntax was developed in the early days of MS DOS 3.x and is used internally by the SMB protocol.
 		</para></glossdef>
 	</glossentry>
-
-	
-
 </glossary>
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-locking.xml b/docs/Samba3-HOWTO/TOSHARG-locking.xml
index 2aa6b622a2..2aa6b622a2 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-locking.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-locking.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-msdfs.xml b/docs/Samba3-HOWTO/TOSHARG-msdfs.xml
index 126edd0eb6..126edd0eb6 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-msdfs.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-msdfs.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-preface.xml b/docs/Samba3-HOWTO/TOSHARG-preface.xml
index 43df53e523..43df53e523 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-preface.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-preface.xml
diff --git a/docs/Samba-HOWTO-Collection/TOSHARG-upgrading-to-3.0.xml b/docs/Samba3-HOWTO/TOSHARG-upgrading-to-3.0.xml
index 6f3853fd6f..6f3853fd6f 100644
--- a/docs/Samba-HOWTO-Collection/TOSHARG-upgrading-to-3.0.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-upgrading-to-3.0.xml
diff --git a/docs/Samba-HOWTO-Collection/conventions.xml b/docs/Samba3-HOWTO/conventions.xml
index d4bbde8f85..d4bbde8f85 100644
--- a/docs/Samba-HOWTO-Collection/conventions.xml
+++ b/docs/Samba3-HOWTO/conventions.xml
diff --git a/docs/Samba-HOWTO-Collection/hitlist-content b/docs/Samba3-HOWTO/hitlist-content
index 66f3b1a603..66f3b1a603 100644
--- a/docs/Samba-HOWTO-Collection/hitlist-content
+++ b/docs/Samba3-HOWTO/hitlist-content
diff --git a/docs/Samba-HOWTO-Collection/images/.cvsignore b/docs/Samba3-HOWTO/images/.cvsignore
index f7b5423899..f7b5423899 100644
--- a/docs/Samba-HOWTO-Collection/images/.cvsignore
+++ b/docs/Samba3-HOWTO/images/.cvsignore
diff --git a/docs/Samba-HOWTO-Collection/images/10small.png b/docs/Samba3-HOWTO/images/10small.png
index 56a9b0cd67..56a9b0cd67 100644
--- a/docs/Samba-HOWTO-Collection/images/10small.png
+++ b/docs/Samba3-HOWTO/images/10small.png
diff --git a/docs/Samba-HOWTO-Collection/images/11small.png b/docs/Samba3-HOWTO/images/11small.png
index 18f5d9e4dd..18f5d9e4dd 100644
--- a/docs/Samba-HOWTO-Collection/images/11small.png
+++ b/docs/Samba3-HOWTO/images/11small.png
diff --git a/docs/Samba-HOWTO-Collection/images/12small.png b/docs/Samba3-HOWTO/images/12small.png
index 5bdf809c1b..5bdf809c1b 100644
--- a/docs/Samba-HOWTO-Collection/images/12small.png
+++ b/docs/Samba3-HOWTO/images/12small.png
diff --git a/docs/Samba-HOWTO-Collection/images/13small.png b/docs/Samba3-HOWTO/images/13small.png
index 536b2fc2c2..536b2fc2c2 100644
--- a/docs/Samba-HOWTO-Collection/images/13small.png
+++ b/docs/Samba3-HOWTO/images/13small.png
diff --git a/docs/Samba-HOWTO-Collection/images/14small.png b/docs/Samba3-HOWTO/images/14small.png
index 89054249c0..89054249c0 100644
--- a/docs/Samba-HOWTO-Collection/images/14small.png
+++ b/docs/Samba3-HOWTO/images/14small.png
diff --git a/docs/Samba-HOWTO-Collection/images/1small.png b/docs/Samba3-HOWTO/images/1small.png
index c4905163c9..c4905163c9 100644
--- a/docs/Samba-HOWTO-Collection/images/1small.png
+++ b/docs/Samba3-HOWTO/images/1small.png
diff --git a/docs/Samba-HOWTO-Collection/images/2small.png b/docs/Samba3-HOWTO/images/2small.png
index 5fd9071349..5fd9071349 100644
--- a/docs/Samba-HOWTO-Collection/images/2small.png
+++ b/docs/Samba3-HOWTO/images/2small.png
diff --git a/docs/Samba-HOWTO-Collection/images/3small.png b/docs/Samba3-HOWTO/images/3small.png
index 22a39bae52..22a39bae52 100644
--- a/docs/Samba-HOWTO-Collection/images/3small.png
+++ b/docs/Samba3-HOWTO/images/3small.png
diff --git a/docs/Samba-HOWTO-Collection/images/4small.png b/docs/Samba3-HOWTO/images/4small.png
index 6b7f1b1fd4..6b7f1b1fd4 100644
--- a/docs/Samba-HOWTO-Collection/images/4small.png
+++ b/docs/Samba3-HOWTO/images/4small.png
diff --git a/docs/Samba-HOWTO-Collection/images/5small.png b/docs/Samba3-HOWTO/images/5small.png
index b23e1fc2c7..b23e1fc2c7 100644
--- a/docs/Samba-HOWTO-Collection/images/5small.png
+++ b/docs/Samba3-HOWTO/images/5small.png
diff --git a/docs/Samba-HOWTO-Collection/images/6small.png b/docs/Samba3-HOWTO/images/6small.png
index 35a646d826..35a646d826 100644
--- a/docs/Samba-HOWTO-Collection/images/6small.png
+++ b/docs/Samba3-HOWTO/images/6small.png
diff --git a/docs/Samba-HOWTO-Collection/images/7small.png b/docs/Samba3-HOWTO/images/7small.png
index d182677510..d182677510 100644
--- a/docs/Samba-HOWTO-Collection/images/7small.png
+++ b/docs/Samba3-HOWTO/images/7small.png
diff --git a/docs/Samba-HOWTO-Collection/images/8small.png b/docs/Samba3-HOWTO/images/8small.png
index 08aca66386..08aca66386 100644
--- a/docs/Samba-HOWTO-Collection/images/8small.png
+++ b/docs/Samba3-HOWTO/images/8small.png
diff --git a/docs/Samba-HOWTO-Collection/images/9small.png b/docs/Samba3-HOWTO/images/9small.png
index 90c2cde327..90c2cde327 100644
--- a/docs/Samba-HOWTO-Collection/images/9small.png
+++ b/docs/Samba3-HOWTO/images/9small.png
diff --git a/docs/Samba-HOWTO-Collection/images/WME001.png b/docs/Samba3-HOWTO/images/WME001.png
index c5db7570bc..c5db7570bc 100644
--- a/docs/Samba-HOWTO-Collection/images/WME001.png
+++ b/docs/Samba3-HOWTO/images/WME001.png
diff --git a/docs/Samba-HOWTO-Collection/images/WME002.png b/docs/Samba3-HOWTO/images/WME002.png
index 641f2179a0..641f2179a0 100644
--- a/docs/Samba-HOWTO-Collection/images/WME002.png
+++ b/docs/Samba3-HOWTO/images/WME002.png
diff --git a/docs/Samba-HOWTO-Collection/images/WME003.png b/docs/Samba3-HOWTO/images/WME003.png
index 073c58eddd..073c58eddd 100644
--- a/docs/Samba-HOWTO-Collection/images/WME003.png
+++ b/docs/Samba3-HOWTO/images/WME003.png
diff --git a/docs/Samba-HOWTO-Collection/images/WME004.png b/docs/Samba3-HOWTO/images/WME004.png
index 5053adeeec..5053adeeec 100644
--- a/docs/Samba-HOWTO-Collection/images/WME004.png
+++ b/docs/Samba3-HOWTO/images/WME004.png
diff --git a/docs/Samba-HOWTO-Collection/images/WME005.png b/docs/Samba3-HOWTO/images/WME005.png
index 5e4e72e498..5e4e72e498 100644
--- a/docs/Samba-HOWTO-Collection/images/WME005.png
+++ b/docs/Samba3-HOWTO/images/WME005.png
diff --git a/docs/Samba-HOWTO-Collection/images/WME006.png b/docs/Samba3-HOWTO/images/WME006.png
index cbd3183696..cbd3183696 100644
--- a/docs/Samba-HOWTO-Collection/images/WME006.png
+++ b/docs/Samba3-HOWTO/images/WME006.png
diff --git a/docs/Samba-HOWTO-Collection/images/WME007.png b/docs/Samba3-HOWTO/images/WME007.png
index e0a113b080..e0a113b080 100644
--- a/docs/Samba-HOWTO-Collection/images/WME007.png
+++ b/docs/Samba3-HOWTO/images/WME007.png
diff --git a/docs/Samba-HOWTO-Collection/images/WME008.png b/docs/Samba3-HOWTO/images/WME008.png
index b03a7853b4..b03a7853b4 100644
--- a/docs/Samba-HOWTO-Collection/images/WME008.png
+++ b/docs/Samba3-HOWTO/images/WME008.png
diff --git a/docs/Samba-HOWTO-Collection/images/WME009.png b/docs/Samba3-HOWTO/images/WME009.png
index f851876cee..f851876cee 100644
--- a/docs/Samba-HOWTO-Collection/images/WME009.png
+++ b/docs/Samba3-HOWTO/images/WME009.png
diff --git a/docs/Samba-HOWTO-Collection/images/WME010.png b/docs/Samba3-HOWTO/images/WME010.png
index 589be02b22..589be02b22 100644
--- a/docs/Samba-HOWTO-Collection/images/WME010.png
+++ b/docs/Samba3-HOWTO/images/WME010.png
diff --git a/docs/Samba-HOWTO-Collection/images/WME011.png b/docs/Samba3-HOWTO/images/WME011.png
index f15399b4a2..f15399b4a2 100644
--- a/docs/Samba-HOWTO-Collection/images/WME011.png
+++ b/docs/Samba3-HOWTO/images/WME011.png
diff --git a/docs/Samba-HOWTO-Collection/images/WME012.png b/docs/Samba3-HOWTO/images/WME012.png
index d2e46212f6..d2e46212f6 100644
--- a/docs/Samba-HOWTO-Collection/images/WME012.png
+++ b/docs/Samba3-HOWTO/images/WME012.png
diff --git a/docs/Samba-HOWTO-Collection/images/WME013.png b/docs/Samba3-HOWTO/images/WME013.png
index 0f0a70d062..0f0a70d062 100644
--- a/docs/Samba-HOWTO-Collection/images/WME013.png
+++ b/docs/Samba3-HOWTO/images/WME013.png
diff --git a/docs/Samba-HOWTO-Collection/images/WME014.png b/docs/Samba3-HOWTO/images/WME014.png
index 73f1dde37c..73f1dde37c 100644
--- a/docs/Samba-HOWTO-Collection/images/WME014.png
+++ b/docs/Samba3-HOWTO/images/WME014.png
diff --git a/docs/Samba-HOWTO-Collection/images/WXPP002.png b/docs/Samba3-HOWTO/images/WXPP002.png
index b87001bca4..b87001bca4 100644
--- a/docs/Samba-HOWTO-Collection/images/WXPP002.png
+++ b/docs/Samba3-HOWTO/images/WXPP002.png
diff --git a/docs/Samba-HOWTO-Collection/images/WXPP003.png b/docs/Samba3-HOWTO/images/WXPP003.png
index a60d6c413a..a60d6c413a 100644
--- a/docs/Samba-HOWTO-Collection/images/WXPP003.png
+++ b/docs/Samba3-HOWTO/images/WXPP003.png
diff --git a/docs/Samba-HOWTO-Collection/images/WXPP005.png b/docs/Samba3-HOWTO/images/WXPP005.png
index 4aa091767b..4aa091767b 100644
--- a/docs/Samba-HOWTO-Collection/images/WXPP005.png
+++ b/docs/Samba3-HOWTO/images/WXPP005.png
diff --git a/docs/Samba-HOWTO-Collection/images/WXPP009.png b/docs/Samba3-HOWTO/images/WXPP009.png
index b540e238b8..b540e238b8 100644
--- a/docs/Samba-HOWTO-Collection/images/WXPP009.png
+++ b/docs/Samba3-HOWTO/images/WXPP009.png
diff --git a/docs/Samba-HOWTO-Collection/images/WXPP014.png b/docs/Samba3-HOWTO/images/WXPP014.png
index f1e02d3ce3..f1e02d3ce3 100644
--- a/docs/Samba-HOWTO-Collection/images/WXPP014.png
+++ b/docs/Samba3-HOWTO/images/WXPP014.png
diff --git a/docs/Samba-HOWTO-Collection/images/a_small.png b/docs/Samba3-HOWTO/images/a_small.png
index a6622ef6cf..a6622ef6cf 100644
--- a/docs/Samba-HOWTO-Collection/images/a_small.png
+++ b/docs/Samba3-HOWTO/images/a_small.png
diff --git a/docs/Samba-HOWTO-Collection/images/access1.dia b/docs/Samba3-HOWTO/images/access1.dia
index 7fd2673800..7fd2673800 100644
--- a/docs/Samba-HOWTO-Collection/images/access1.dia
+++ b/docs/Samba3-HOWTO/images/access1.dia
diff --git a/docs/Samba-HOWTO-Collection/images/browsing1.dia b/docs/Samba3-HOWTO/images/browsing1.dia
index 8235df45f6..8235df45f6 100644
--- a/docs/Samba-HOWTO-Collection/images/browsing1.dia
+++ b/docs/Samba3-HOWTO/images/browsing1.dia
diff --git a/docs/Samba-HOWTO-Collection/images/cups1.dia b/docs/Samba3-HOWTO/images/cups1.dia
index e4cd3b1239..e4cd3b1239 100644
--- a/docs/Samba-HOWTO-Collection/images/cups1.dia
+++ b/docs/Samba3-HOWTO/images/cups1.dia
diff --git a/docs/Samba-HOWTO-Collection/images/cups2.dia b/docs/Samba3-HOWTO/images/cups2.dia
index 9dfb60f335..9dfb60f335 100644
--- a/docs/Samba-HOWTO-Collection/images/cups2.dia
+++ b/docs/Samba3-HOWTO/images/cups2.dia
diff --git a/docs/Samba-HOWTO-Collection/images/domain.dia b/docs/Samba3-HOWTO/images/domain.dia
index a994d423e2..a994d423e2 100644
--- a/docs/Samba-HOWTO-Collection/images/domain.dia
+++ b/docs/Samba3-HOWTO/images/domain.dia
diff --git a/docs/Samba-HOWTO-Collection/images/ethereal1.png b/docs/Samba3-HOWTO/images/ethereal1.png
index c8655389d0..c8655389d0 100644
--- a/docs/Samba-HOWTO-Collection/images/ethereal1.png
+++ b/docs/Samba3-HOWTO/images/ethereal1.png
diff --git a/docs/Samba-HOWTO-Collection/images/ethereal2.png b/docs/Samba3-HOWTO/images/ethereal2.png
index f366772d3b..f366772d3b 100644
--- a/docs/Samba-HOWTO-Collection/images/ethereal2.png
+++ b/docs/Samba3-HOWTO/images/ethereal2.png
diff --git a/docs/Samba-HOWTO-Collection/images/idmap-gid2sid.dia b/docs/Samba3-HOWTO/images/idmap-gid2sid.dia
index b3b1d88c50..b3b1d88c50 100644
--- a/docs/Samba-HOWTO-Collection/images/idmap-gid2sid.dia
+++ b/docs/Samba3-HOWTO/images/idmap-gid2sid.dia
diff --git a/docs/Samba-HOWTO-Collection/images/idmap-groups.dia b/docs/Samba3-HOWTO/images/idmap-groups.dia
index 04da158c53..04da158c53 100644
--- a/docs/Samba-HOWTO-Collection/images/idmap-groups.dia
+++ b/docs/Samba3-HOWTO/images/idmap-groups.dia
diff --git a/docs/Samba-HOWTO-Collection/images/idmap-sid2gid.dia b/docs/Samba3-HOWTO/images/idmap-sid2gid.dia
index e6e5107698..e6e5107698 100644
--- a/docs/Samba-HOWTO-Collection/images/idmap-sid2gid.dia
+++ b/docs/Samba3-HOWTO/images/idmap-sid2gid.dia
diff --git a/docs/Samba-HOWTO-Collection/images/idmap-sid2uid.dia b/docs/Samba3-HOWTO/images/idmap-sid2uid.dia
index 91e00530a6..91e00530a6 100644
--- a/docs/Samba-HOWTO-Collection/images/idmap-sid2uid.dia
+++ b/docs/Samba3-HOWTO/images/idmap-sid2uid.dia
diff --git a/docs/Samba-HOWTO-Collection/images/idmap-store-gid2sid.dia b/docs/Samba3-HOWTO/images/idmap-store-gid2sid.dia
index 957613b6f3..957613b6f3 100644
--- a/docs/Samba-HOWTO-Collection/images/idmap-store-gid2sid.dia
+++ b/docs/Samba3-HOWTO/images/idmap-store-gid2sid.dia
diff --git a/docs/Samba-HOWTO-Collection/images/idmap-uid2sid.dia b/docs/Samba3-HOWTO/images/idmap-uid2sid.dia
index de6ccaacb3..de6ccaacb3 100644
--- a/docs/Samba-HOWTO-Collection/images/idmap-uid2sid.dia
+++ b/docs/Samba3-HOWTO/images/idmap-uid2sid.dia
diff --git a/docs/Samba-HOWTO-Collection/images/idmap.dia b/docs/Samba3-HOWTO/images/idmap.dia
index 555933978b..555933978b 100644
--- a/docs/Samba-HOWTO-Collection/images/idmap.dia
+++ b/docs/Samba3-HOWTO/images/idmap.dia
diff --git a/docs/Samba-HOWTO-Collection/images/idmap_winbind_no_loop.png b/docs/Samba3-HOWTO/images/idmap_winbind_no_loop.png
index 5393f6a192..5393f6a192 100644
--- a/docs/Samba-HOWTO-Collection/images/idmap_winbind_no_loop.png
+++ b/docs/Samba3-HOWTO/images/idmap_winbind_no_loop.png
diff --git a/docs/Samba-HOWTO-Collection/images/pdftoepsonusb.dia b/docs/Samba3-HOWTO/images/pdftoepsonusb.dia
index 2f846ee8d4..2f846ee8d4 100644
--- a/docs/Samba-HOWTO-Collection/images/pdftoepsonusb.dia
+++ b/docs/Samba3-HOWTO/images/pdftoepsonusb.dia
diff --git a/docs/Samba-HOWTO-Collection/images/pdftosocket.dia b/docs/Samba3-HOWTO/images/pdftosocket.dia
index 53b6b7117c..53b6b7117c 100644
--- a/docs/Samba-HOWTO-Collection/images/pdftosocket.dia
+++ b/docs/Samba3-HOWTO/images/pdftosocket.dia
diff --git a/docs/Samba-HOWTO-Collection/images/trusts1.dia b/docs/Samba3-HOWTO/images/trusts1.dia
index 95cbbaa42f..95cbbaa42f 100644
--- a/docs/Samba-HOWTO-Collection/images/trusts1.dia
+++ b/docs/Samba3-HOWTO/images/trusts1.dia
diff --git a/docs/Samba-HOWTO-Collection/images/w2kp001.png b/docs/Samba3-HOWTO/images/w2kp001.png
index 43adf23463..43adf23463 100644
--- a/docs/Samba-HOWTO-Collection/images/w2kp001.png
+++ b/docs/Samba3-HOWTO/images/w2kp001.png
diff --git a/docs/Samba-HOWTO-Collection/images/w2kp002.png b/docs/Samba3-HOWTO/images/w2kp002.png
index 13bb029f53..13bb029f53 100644
--- a/docs/Samba-HOWTO-Collection/images/w2kp002.png
+++ b/docs/Samba3-HOWTO/images/w2kp002.png
diff --git a/docs/Samba-HOWTO-Collection/images/w2kp003.png b/docs/Samba3-HOWTO/images/w2kp003.png
index c7b779900e..c7b779900e 100644
--- a/docs/Samba-HOWTO-Collection/images/w2kp003.png
+++ b/docs/Samba3-HOWTO/images/w2kp003.png
diff --git a/docs/Samba-HOWTO-Collection/images/w2kp004.png b/docs/Samba3-HOWTO/images/w2kp004.png
index d0e005a36e..d0e005a36e 100644
--- a/docs/Samba-HOWTO-Collection/images/w2kp004.png
+++ b/docs/Samba3-HOWTO/images/w2kp004.png
diff --git a/docs/Samba-HOWTO-Collection/images/w2kp005.png b/docs/Samba3-HOWTO/images/w2kp005.png
index a729b40cd7..a729b40cd7 100644
--- a/docs/Samba-HOWTO-Collection/images/w2kp005.png
+++ b/docs/Samba3-HOWTO/images/w2kp005.png
diff --git a/docs/Samba-HOWTO-Collection/images/w2kp006.png b/docs/Samba3-HOWTO/images/w2kp006.png
index ea96db055a..ea96db055a 100644
--- a/docs/Samba-HOWTO-Collection/images/w2kp006.png
+++ b/docs/Samba3-HOWTO/images/w2kp006.png
diff --git a/docs/Samba-HOWTO-Collection/images/wxpp001.png b/docs/Samba3-HOWTO/images/wxpp001.png
index 2e689a17e2..2e689a17e2 100644
--- a/docs/Samba-HOWTO-Collection/images/wxpp001.png
+++ b/docs/Samba3-HOWTO/images/wxpp001.png
diff --git a/docs/Samba-HOWTO-Collection/images/wxpp004.png b/docs/Samba3-HOWTO/images/wxpp004.png
index 656f67942e..656f67942e 100644
--- a/docs/Samba-HOWTO-Collection/images/wxpp004.png
+++ b/docs/Samba3-HOWTO/images/wxpp004.png
diff --git a/docs/Samba-HOWTO-Collection/images/wxpp006.png b/docs/Samba3-HOWTO/images/wxpp006.png
index a20b3ed583..a20b3ed583 100644
--- a/docs/Samba-HOWTO-Collection/images/wxpp006.png
+++ b/docs/Samba3-HOWTO/images/wxpp006.png
diff --git a/docs/Samba-HOWTO-Collection/images/wxpp007.png b/docs/Samba3-HOWTO/images/wxpp007.png
index cf41352220..cf41352220 100644
--- a/docs/Samba-HOWTO-Collection/images/wxpp007.png
+++ b/docs/Samba3-HOWTO/images/wxpp007.png
diff --git a/docs/Samba-HOWTO-Collection/images/wxpp008.png b/docs/Samba3-HOWTO/images/wxpp008.png
index 9958c7c873..9958c7c873 100644
--- a/docs/Samba-HOWTO-Collection/images/wxpp008.png
+++ b/docs/Samba3-HOWTO/images/wxpp008.png
diff --git a/docs/Samba-HOWTO-Collection/images/wxpp010.png b/docs/Samba3-HOWTO/images/wxpp010.png
index 068a0dfc73..068a0dfc73 100644
--- a/docs/Samba-HOWTO-Collection/images/wxpp010.png
+++ b/docs/Samba3-HOWTO/images/wxpp010.png
diff --git a/docs/Samba-HOWTO-Collection/images/wxpp011.png b/docs/Samba3-HOWTO/images/wxpp011.png
index 0cf88c04a6..0cf88c04a6 100644
--- a/docs/Samba-HOWTO-Collection/images/wxpp011.png
+++ b/docs/Samba3-HOWTO/images/wxpp011.png
diff --git a/docs/Samba-HOWTO-Collection/images/wxpp012.png b/docs/Samba3-HOWTO/images/wxpp012.png
index d89f3b5d31..d89f3b5d31 100644
--- a/docs/Samba-HOWTO-Collection/images/wxpp012.png
+++ b/docs/Samba3-HOWTO/images/wxpp012.png
diff --git a/docs/Samba-HOWTO-Collection/images/wxpp013.png b/docs/Samba3-HOWTO/images/wxpp013.png
index 451240ee38..451240ee38 100644
--- a/docs/Samba-HOWTO-Collection/images/wxpp013.png
+++ b/docs/Samba3-HOWTO/images/wxpp013.png
diff --git a/docs/Samba-HOWTO-Collection/images/wxpp015.png b/docs/Samba3-HOWTO/images/wxpp015.png
index 12fe2f31b2..12fe2f31b2 100644
--- a/docs/Samba-HOWTO-Collection/images/wxpp015.png
+++ b/docs/Samba3-HOWTO/images/wxpp015.png
diff --git a/docs/Samba-HOWTO-Collection/index.xml b/docs/Samba3-HOWTO/index.xml
index 7ccbb834d3..7ccbb834d3 100644
--- a/docs/Samba-HOWTO-Collection/index.xml
+++ b/docs/Samba3-HOWTO/index.xml
diff --git a/docs/Samba-HOWTO-Collection/manpages.xml b/docs/Samba3-HOWTO/manpages.xml
index 69801c44ec..69801c44ec 100644
--- a/docs/Samba-HOWTO-Collection/manpages.xml
+++ b/docs/Samba3-HOWTO/manpages.xml
diff --git a/docs/configure.in b/docs/configure.in
index d2057cac60..b958b4f28d 100644
--- a/docs/configure.in
+++ b/docs/configure.in
@@ -1,7 +1,8 @@
 AC_INIT(settings.xsl.in)
 
 PAPERSIZE=""
-DUPLICATE_ULINKS=""
+ULINK_IN_FOOTNOTE="0"
+ULINK_SHOW="1"
 
 DOCROP="0"
 
@@ -11,7 +12,7 @@ AC_ARG_WITH(samba-sources,
 
 AC_ARG_ENABLE(crop,
 [ --enable-crop            Whether to use a crop template],
-[ test "$withval" && DOCROP="1" ])
+[ test "$enableval" && DOCROP="1" ])
 
 PAPERSIZE="a4paper"
 
@@ -27,13 +28,17 @@ AC_ARG_WITH(fontsize,
 
 AC_ARG_ENABLE(printable,
 [ --enable-printable       Printable output (expand ulinks, etc)],
-[ test "$withval" && DUPLICATE_ULINKS="footnote" ])
+[ if test "$enableval"; then
+ ULINK_IN_FOOTNOTE="1"
+ ULINK_SHOW="0"
+ fi ])
 
 
 DOC_BUILD_DATE=`date '+%d-%m-%Y'`
 AC_SUBST(DOC_BUILD_DATE)
 AC_SUBST(PAPERSIZE)
-AC_SUBST(DUPLICATE_ULINKS)
+AC_SUBST(ULINK_IN_FOOTNOTE)
+AC_SUBST(ULINK_SHOW)
 AC_SUBST(FONTSIZE)
 AC_SUBST(DOCROP)
 AC_SUBST(SAMBASOURCEDIR)
diff --git a/docs/htmldocs.html b/docs/htmldocs.html
index 9f6eef673b..a363c3461e 100644
--- a/docs/htmldocs.html
+++ b/docs/htmldocs.html
@@ -15,11 +15,11 @@
  <td valign="top">This book is a collection of documents that might be useful for people developing samba or those interested in doing so. It's nothing more than a collection of documents written by samba developers about the internals of various parts of samba and the SMB protocol. It's still (and will always be) incomplete.</td>
 </tr>
 <tr>
-<td valign="top">Samba-3 by <a href="Samba-Guide/index.html">Example</a></td>
+<td valign="top">Samba-3 by <a href="Samba3-ByExample/index.html">Example</a></td>
  <td valign="top">Practical Exercises in Successful Samba Deployment.</td>
 </tr>
 <tr>
- <td valign="top">The Official Samba-3 <a href="Samba-HOWTO-Collection/index.html">HOWTO</a> and Reference Guide</td>
+ <td valign="top">The Official Samba-3 <a href="Samba3-HOWTO/index.html">HOWTO</a> and Reference Guide</td>
  <td valign="top">This book provides example configurations, it documents key aspects of Microsoft Windows networking, provides in-depth insight into the important configuration of Samba-3, and helps to put all of these into a useful framework.</td>
 </tr>
 <tr>
diff --git a/docs/settings.xsl.in b/docs/settings.xsl.in
index 52f48a65e2..a5be331635 100644
--- a/docs/settings.xsl.in
+++ b/docs/settings.xsl.in
@@ -4,6 +4,7 @@
 
 <xsl:param name="papersize"><xsl:text>@PAPERSIZE@</xsl:text></xsl:param>
 <xsl:param name="docrop"><xsl:text>@DOCROP@</xsl:text></xsl:param>
-<xsl:param name="duplicate_ulinks"><xsl:text>@DUPLICATE_ULINKS@</xsl:text></xsl:param>
+<xsl:param name="ulink.footnotes"><xsl:text>@ULINK_IN_FOOTNOTE@</xsl:text></xsl:param>
+<xsl:param name="ulink.show"><xsl:text>@ULINK_SHOW@</xsl:text></xsl:param>
 <xsl:param name="fontsize"><xsl:text>@FONTSIZE@</xsl:text></xsl:param>
 </xsl:stylesheet>
diff --git a/docs/xslt/expand-sambadoc.xsl b/docs/xslt/expand-sambadoc.xsl
index f74d14c66b..12ea497101 100644
--- a/docs/xslt/expand-sambadoc.xsl
+++ b/docs/xslt/expand-sambadoc.xsl
@@ -27,17 +27,6 @@
 		</xsl:if>
 	</xsl:template>
 
-	<xsl:template match="translator">
-		<xsl:element name="othercredit">
-			<xsl:element name="author">
-				<xsl:apply-templates/>
-				<xsl:element name="contrib">
-					<xsl:text>Translation to </xsl:text><xsl:value-of select="@lang"/>
-				</xsl:element>
-			</xsl:element>
-		</xsl:element>
-	</xsl:template>
-
 	<xsl:template match="reference/refentry">
 		<xsl:element name="section">
 			<xsl:attribute name="id">
@@ -45,9 +34,6 @@
 			</xsl:attribute>
 			<xsl:element name="title">
 				<xsl:value-of select="refmeta/refentrytitle"/>
-				<!--			<xsl:text> (</xsl:text>
-				<xsl:value-of select="refnamediv/refpurpose"/>
-				<xsl:text>)</xsl:text>-->
 			</xsl:element>
 			<xsl:apply-templates/>
 		</xsl:element>
@@ -157,13 +143,6 @@
 		</xsl:choose>
 	</xsl:template>
 
-	<!-- FIXME: Needs extension sometime -->
-	<xsl:template match="ntgroup|ntuser">
-		<xsl:element name="emphasis">
-			<xsl:apply-templates/>
-		</xsl:element>
-	</xsl:template>
-
 	<xsl:template match="smbconfexample">
 		<xsl:choose>
 			<xsl:when test="title = ''">
@@ -466,35 +445,6 @@
 		</xsl:element>
 	</xsl:template>
 
-	<xsl:template match="ulink">
-		<xsl:element name="ulink">
-			<xsl:attribute name="url">
-				<xsl:value-of select="@url"/>
-			</xsl:attribute>
-
-			<xsl:apply-templates/>
-			<xsl:if test="contains(@url,'http://') or contains(@url,'ftp://')">
-				<xsl:if test="$duplicate_ulinks='brackets'">
-					<xsl:text> (</xsl:text>
-					<xsl:value-of select="@url"/>
-					<xsl:text>)</xsl:text>
-				</xsl:if>
-				<xsl:if test="$duplicate_ulinks='footnote'">
-					<xsl:element name="footnote">
-						<xsl:element name="para">
-							<xsl:value-of select="@url"/>
-						</xsl:element>
-					</xsl:element>
-				</xsl:if>
-			</xsl:if>
-		</xsl:element>
-	</xsl:template>
-
-	<!-- Just ignore these -->
-	<xsl:template match="smbfile">
-		<xsl:apply-templates/>
-	</xsl:template>
-
 	<xsl:template match="quote">
 		<xsl:element name="quote">
 			<xsl:element name="emphasis">
diff --git a/docs/xslt/latex.overrides.xml b/docs/xslt/latex.overrides.xml
new file mode 100644
index 0000000000..73967c6487
--- /dev/null
+++ b/docs/xslt/latex.overrides.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0'?>
+<!DOCTYPE latexbindings SYSTEM "http://db2latex.sourceforge.net/xsl/latex.mapping.dtd">
+<latexbindings>
+	<latexmapping role="begin">
+	</latexmapping>
+	<latexmapping role="end">
+		<mapping key="glossary" text=""/>
+	</latexmapping>
+</latexbindings>
diff --git a/docs/xslt/latex.xsl b/docs/xslt/latex.xsl
index cb0ecd6874..56db80e7cc 100644
--- a/docs/xslt/latex.xsl
+++ b/docs/xslt/latex.xsl
@@ -1,9 +1,31 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'>
 <xsl:import href="../settings.xsl"/>
-<!--<xsl:import href="docbook.xsl"/>-->
 <xsl:import href="http://db2latex.sourceforge.net/xsl/docbook.xsl"/>
 
+<xsl:param name="latex.mapping.xml" select="document('latex.overrides.xml')"/>
+
+<xsl:param name="generate.toc">
+	/appendix toc,title
+	article/appendix  nop
+	/article  toc,title
+	book      toc,title,figure,table,example,equation
+	/chapter  toc,title,lop
+	part      toc,title
+	/preface  toc,title
+	qandadiv  toc
+	qandaset  toc
+	procedure lop
+	reference toc,title
+	/sect1    toc
+	/sect2    toc
+	/sect3    toc
+	/sect4    toc
+	/sect5    toc
+	/section  toc
+	set       toc,title
+</xsl:param>
+
 <xsl:template name="link">
 	<xsl:element name="link">
 		<xsl:copy-of select="@*"/>
@@ -13,11 +35,7 @@
 <xsl:output method="text" encoding="ISO-8859-1" indent="yes"/>
 <xsl:param name="l10n.gentext.default.language" select="'en'"/>
 <xsl:param name="latex.example.caption.style"></xsl:param>
-<xsl:variable name="latex.documentclass">sambadoc</xsl:variable>
-<xsl:variable name="latex.documentclass.common">twoside,11pt,letterpaper</xsl:variable>
-<xsl:variable name="latex.documentclass.book"></xsl:variable>
 <xsl:variable name="latex.hyperref.param.pdftex">hyperfigures,hyperindex,citecolor=black,urlcolor=black,filecolor=black,linkcolor=black,menucolor=red,pagecolor=black</xsl:variable>
-<xsl:variable name="latex.document.font">default</xsl:variable>
 <xsl:variable name="admon.graphics.path">xslt/figures</xsl:variable>
 <xsl:variable name="latex.use.tabularx">1</xsl:variable>
 <xsl:variable name="latex.fancyhdr.lh"></xsl:variable>
@@ -41,63 +59,14 @@
 <xsl:variable name="latex.book.preamblestart">
 \documentclass[twoside,openright,<xsl:value-of select="$fontsize"/>pt]{xslt/latex/sambadoc}
 
-\usepackage[twoside,dvips]{geometry}
-
-%\usepackage[section]{placeins}
-
-\geometry{%
-paperwidth=7in,
-paperheight=9.25in,
-lmargin=.75in,
-rmargin=.75in,
-bmargin=.625in,
-tmargin=.625in,
-width=5.5in,
-height=7.525in, %7.3
-marginparwidth=0.35in,
-headheight=0.2in,
-headsep=.25in,
-footskip=.025in}
-
-\setlength{\headwidth}{\textwidth}
-
-<xsl:if test="$docrop != '0'">
-\usepackage[letter,center,dvips]{crop}
-</xsl:if>
 \usepackage{amsmath}%
 \usepackage{amsfonts}%
 \usepackage{amssymb}
 
-<xsl:if test="$docrop != '0'">
-\special{papersize=11in,8.5in}
-
-%\crop[frame]
-\crop
-</xsl:if>
-
 \makeindex           
 
-%% Preamble:
-
-% New commands and/or command redefinitions
-%
-% Added for the samba book
-%----------------------- paragraph ----------------------------------
-\cleardoublepage
-\pagenumbering{roman}
-
-\setcounter{page}{2}
-\setcounter{totalnumber}{8}
-\setcounter{bottomnumber}{3}
-\setcounter{topnumber}{3}
-\renewcommand{\textfraction}{0.1}
-\renewcommand{\topfraction}{1.0}
-\renewcommand{\bottomfraction}{1.0}
-
-%% Document Parts
 </xsl:variable>
 <xsl:param name="latex.babel.language">english</xsl:param>
-<xsl:param name="ulink.url">1</xsl:param>
 
 <xsl:template match="//title/filename|//title/command|//title/parameter|//title/constant">
   <xsl:variable name="content">
@@ -108,6 +77,4 @@ footskip=.025in}
   </xsl:if>
 </xsl:template>
 
-
 </xsl:stylesheet>
-
diff --git a/docs/xslt/latex/sambadoc.cls b/docs/xslt/latex/sambadoc.cls
index c55bc970a5..c80f143caf 100644
--- a/docs/xslt/latex/sambadoc.cls
+++ b/docs/xslt/latex/sambadoc.cls
@@ -464,3 +464,32 @@ page \thepage \space undefined}}%
 \renewcommand\listfigurename{\uppercase{List Of Figures}}
 \renewcommand\listtablename{\uppercase{List Of Tables}}
 
+\setlength{\emergencystretch}{0cm}
+\cleardoublepage
+\pagenumbering{roman}
+
+\setcounter{page}{2}
+\setcounter{totalnumber}{8}
+\setcounter{bottomnumber}{3}
+\setcounter{topnumber}{3}
+\renewcommand{\textfraction}{0.1}
+\renewcommand{\topfraction}{1.0}
+\renewcommand{\bottomfraction}{1.0}
+
+\usepackage[twoside,dvips]{geometry}
+
+\geometry{%
+paperwidth=7in,
+paperheight=9.25in,
+lmargin=.75in,
+rmargin=.75in,
+bmargin=.625in,
+tmargin=.625in,
+width=5.5in,
+height=7.525in, %7.3
+marginparwidth=0.35in,
+headheight=0.2in,
+headsep=.25in,
+footskip=.025in}
+
+\setlength{\headwidth}{\textwidth}