249 files changed, 286 insertions, 564 deletions

diff --git a/docs/Makefile.in b/docs/Makefile.in
index 7bd60d7886..f675dd61ea 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -4,12 +4,6 @@
 # 		James Moore <jmoore@php.net>
 # 		Gerald Carter <jerry@samba.org>
 # 		Jelmer Vernooij <jelmer@samba.org>
-#
-# Please see http://www.samba.org/samba/cvs.html
-# for information on getting the latest  
-# source and documentation source files.  
-#
-#
 
 # Programs
 WGET = @WGET@
@@ -38,14 +32,10 @@ SRCDIR = @SAMBASOURCEDIR@
 MANDIR = $(OUTPUTDIR)/manpages
 EPSTOPDF = @EPSTOPDF@
 MANPAGEDIR = manpages
-HOWTODIR = howto
-GUIDEDOC = guide
-DEVDOCDIR = devel
 MAKEINDEX = @MAKEINDEX@
-IMAGEPROJDIR = $(HOWTODIR)/imagefiles
-IMAGEGUIDEDIR = $(GUIDEDOC)/images
 EXAMPLESDIR = examples
 SMBDOTCONFDOC = smbdotconf
+DOCBOOKDIR = tmp
 PSDIR = $(OUTPUTDIR)
 PDFDIR = $(OUTPUTDIR)
 DVIDIR = $(OUTPUTDIR)
@@ -57,127 +47,121 @@ TXTDIR = $(OUTPUTDIR)/textdocs
 HTMLDIR=$(OUTPUTDIR)/htmldocs
 PLUCKERDIR=$(OUTPUTDIR)/plucker
 
+# Docs to build
+MAIN_DOCS = $(patsubst %/index.xml,$(DOCBOOKDIR)/%.xml,$(wildcard */index.xml))
+MANPAGES = $(wildcard $(MANPAGEDIR)/*.?.xml)
+
 # Lists of files to process
 LATEX_FIGURES = xslt/figures/caution.pdf xslt/figures/important.pdf xslt/figures/note.pdf xslt/figures/tip.pdf xslt/figures/warning.pdf
-MANPAGES_SOURCES = $(wildcard $(MANPAGEDIR)/*.?.xml)
-MANPAGES = $(patsubst $(MANPAGEDIR)/%.xml,$(MANDIR)/%,$(MANPAGES_SOURCES)) $(MANDIR)/smb.conf.5
-MANPAGES_HTML = $(patsubst $(MANPAGEDIR)/%.xml,$(HTMLDIR)/%.html,$(MANPAGES_SOURCES)) $(HTMLDIR)/smb.conf.5.html $(HTMLDIR)/manpages.html
-MANPAGES_PLUCKER = $(patsubst $(MANPAGEDIR)/%.xml,$(PLUCKERDIR)/%.pdb,$(MANPAGES_SOURCES)) $(PLUCKERDIR)/smb.conf.5.pdb
+MANPAGES_PLUCKER = $(patsubst $(MANPAGEDIR)/%.xml,$(PLUCKERDIR)/%.pdb,$(MANPAGES_SOURCES))
+
+Samba_HOWTO_Collection_IMAGES_PNG = $(wildcard Samba-HOWTO-Collection/imagefiles/*.png)
+Samba_Guide_IMAGES_PNG = $(wildcard Samba-Guide/images/*.png)
 
-HOWTODIR_IMAGES_PNG = $(wildcard $(IMAGEPROJDIR)/*.png)
-GUIDEDOC_IMAGES_PNG = $(wildcard $(IMAGEGUIDEDIR)/*.png)
-HOWTODIR_IMAGES_EPS=$(patsubst %.png,%.eps,$(wildcard $(IMAGEPROJDIR)/*.png))
-HOWTODIR_DEPS = $(HOWTODIR)/*.xml $(HOWTODIR)/attributions.xml $(MANPAGEDIR)/*.xml smb.conf.5.xml $(SMBDOTCONFDOC)/parameters.all.xml $(SMBDOTCONFDOC)/parameters.global.xml $(SMBDOTCONFDOC)/parameters.service.xml 
-DEVDOCDIR_DEPS = $(DEVDOCDIR)/*.xml $(DEVDOCDIR)/attributions.xml
+Samba_HOWTO_Collection_IMAGEDIR = Samba-HOWTO-Collection/imagefiles
+Samba_Guide_IMAGEDIR = Samba-Guide/images
+
+Samba_HOWTO_Collection_IMAGES_EPS = $(patsubst %.png,%.eps,$(Samba_HOWTO_Collection_IMAGES_PNG))
+Samba_Guide_IMAGES_EPS = $(patsubst %.png,%.eps,$(Samba_Guide_IMAGES_PNG))
 
 help: 
 	@echo "Supported make targets:"
-	@echo "release - Build the docs needed for a Samba release"
-	@echo "pdf - Build PDF version of book"
-	@echo "tex - Build Latex version of book"
-	@echo "dvi - Build Device Independant File of book"
-	@echo "ps - Build PostScript version of book"
-	@echo "manpages - Build manpages"
-	@echo "txt - Build plain text version of HOWTO Collection and Developers Guide"
-	@echo -n "html-single - Build single file HTML version of HOWTO Collection"
-	@echo " and developers guide"
-	@echo "html - Build HTML version of HOWTO Collection and Developers Guide"
-	@echo "htmlman - Build html version of manpages"
-	@echo "plucker - Build HOWTO, Developers Guide, man pages in Plucker format for PDA"
-	@echo "undocumented - Output list of undocumented smb.conf options"
-	@echo "samples - Extract examples"
-	@echo "files - Extract other files"
-	@echo "all - Build all docs that can be build using the utilities found by configure"
-	@echo "everything - Build all of the above"
-
+	@echo " release - Build the docs needed for a Samba release"
+	@echo " all - Build all docs that can be build using the utilities found by configure"
+	@echo " everything - Build all of the above"
+	@echo " pdf,tex,dvi,ps,manpages,txt,pearson,fo,htmlhelp - Build specific output format"
+	@echo " html - Build multi-file HTML version of HOWTO Collection, Guide and Dev-Guide"
+	@echo " html-single - Build single-file HTML version of HOWTO Collection, Guide and Dev-Guide"
+	@echo " htmlman - Build HTML version of manpages"
+	@echo " undocumented - Output list of undocumented smb.conf options"
+	@echo " samples - Extract examples"
+	@echo " files - Extract other files"
+
+Samba-Guide/index.xml: $(subst Samba-Guide/index.xml,,$(wildcard Samba-Guide/*.xml))
+Samba-HOWTO-Collection/index.xml: $(subst Samba-HOWTO-Collection/index.xml,,$(wildcard Samba-HOWTO-Collection/*.xml)) Samba-HOWTO-Collection-attributions.xml
+Samba-Developers-Guide/index.xml: $(subst Samba-Developers-Guide/index.xml,,$(wildcard Samba-Developers-Guide/*.xml)) Samba-Developers-Guide-attributions.xml
+
+# Pseudo targets 
 all: @TARGETS@
-
-everything: manpages pdf html-single html htmlman txt ps
-
+everything: manpages pdf html-single html htmlman txt ps fo htmlhelp pearson verify
 release: manpages htmlman html pdf guide
 
-# Global rules
-
-pdf: $(PDFDIR) $(PDFDIR)/Samba-HOWTO-Collection.pdf $(PDFDIR)/Samba-Developers-Guide.pdf
-
-dvi: $(DVIDIR) $(DVIDIR)/Samba-HOWTO-Collection.dvi $(DVIDIR)/Samba-Developers-Guide.dvi
-
-ps: $(PSDIR) $(PSDIR)/Samba-HOWTO-Collection.ps $(PSDIR)/Samba-Developers-Guide.ps
+# Output format targets
+pdf: $(patsubst $(DOCBOOKDIR)/%.xml,$(PDFDIR)/%.pdf,$(MAIN_DOCS))
+dvi: $(patsubst $(DOCBOOKDIR)/%.xml,$(DVIDIR)/%.dvi,$(MAIN_DOCS))
+ps: $(patsubst $(DOCBOOKDIR)/%.xml,$(PSDIR)/%.ps,$(MAIN_DOCS))
+txt: $(patsubst $(DOCBOOKDIR)/%.xml,$(TXTDIR)/%.txt,$(MAIN_DOCS))
+fo: $(patsubst $(DOCBOOKDIR)/%.xml,$(FODIR)/%.fo,$(MAIN_DOCS))
+tex: $(patsubst $(DOCBOOKDIR)/%.xml,%.tex,$(MAIN_DOCS))
+manpages: $(patsubst $(MANPAGEDIR)/%.xml,$(MANDIR)/%,$(MANPAGES)) 
+pearson: $(PEARSONDIR)/Samba-HOWTO-Collection.xml
+pearson-verify: $(PEARSONDIR)/Samba-HOWTO-Collection.report.html
+plucker: $(patsubst $(DOCBOOKDIR)/%.xml,$(PLUCKERDIR)/%.pdb,$(MAIN_DOCS))
+htmlman: $(patsubst $(MANPAGEDIR)/%.xml,$(HTMLDIR)/%.html,$(MANPAGES)) $(HTMLDIR)/manpages.html
+html-single: $(patsubst $(DOCBOOKDIR)/%.xml,$(HTMLDIR)/%.html,$(MAIN_DOCS))
+html: $(patsubst $(DOCBOOKDIR)/%.xml,$(HTMLDIR)/%/index.html,$(MAIN_DOCS)) $(HTMLDIR)/index.html
+htmlhelp: $(patsubst $(DOCBOOKDIR)/%.xml,$(HTMLHELPDIR)/%,$(MAIN_DOCS))
 
-txt: $(TXTDIR) $(TXTDIR)/Samba-HOWTO-Collection.txt $(TXTDIR)/Samba-Developers-Guide.txt
+# Intermediate docbook docs
 
-fo: $(FODIR) $(FODIR)/Samba-HOWTO-Collection.fo $(FODIR)/Samba-Developers-Guide.fo
+$(DOCBOOKDIR):
+	mkdir $@
 
-htmlman: $(HTMLDIR) $(MANPAGES_HTML) $(HTMLDIR)/samba.css
+$(DOCBOOKDIR)/%.xml: %/index.xml $(DOCBOOKDIR) xslt/expand-sambadoc.xsl
+	$(XSLTPROC) --stringparam noreference 1 --stringparam imagedir "$($(subst -,_,$*)_IMAGEDIR)/" --xinclude --output $@ xslt/expand-sambadoc.xsl $<
 
-html-single: $(HTMLDIR) $(HTMLDIR)/samba.css $(HTMLDIR)/Samba-HOWTO-Collection.html  $(HTMLDIR)/Samba-Developers-Guide.html $(HTMLDIR)/Samba-Guide.html
-	cp -p $(GUIDEDOC_IMAGES_PNG) $(HOWTODIR_IMAGES_PNG) $(HTMLDIR)/images/
+$(DOCBOOKDIR)/%.xml: $(MANPAGEDIR)/%.xml $(DOCBOOKDIR) xslt/expand-sambadoc.xsl
+	$(XSLTPROC) --stringparam noreference 1 --output $@ xslt/expand-sambadoc.xsl $<
 
-html: $(HTMLDIR)/howto $(HTMLDIR)/guide $(HTMLDIR)/devel $(HTMLDIR)/index.html
+manpages.xml: $(MANPAGES_SOURCES) xslt/manpage-summary.xsl
+	echo "<article><variablelist>" > $@
+	for I in $(MANPAGES_SOURCES); do $(XSLTPROC) xslt/manpage-summary.xsl $$I >> $@; done
+	echo "</variablelist></article>" >> $@
 
-htmlhelp: $(HTMLHELPDIR)/Samba-HOWTO-Collection $(HTMLHELPDIR)/Samba-Developers-Guide $(HTMLHELPDIR)/Samba-Guide
+# HTML docs
 
 $(HTMLDIR)/index.html: htmldocs.html $(HTMLDIR)
 	cp $< $@
 	
-$(HTMLDIR)/howto: $(HTMLDIR) $(HTMLDIR)/howto/samba.css Samba-HOWTO-Collection.xml
-	$(XSLTPROC) --stringparam base.dir "$(HTMLDIR)/howto/" xslt/html-chunk.xsl Samba-HOWTO-Collection.xml
-	-mkdir $(HTMLDIR)/howto/images
-	cp -R $(HOWTODIR_IMAGES_PNG) $(HTMLDIR)/howto/images
-
-$(HTMLDIR)/devel: $(HTMLDIR) $(HTMLDIR)/devel/samba.css Samba-Developers-Guide.xml
-	$(XSLTPROC) --stringparam base.dir "$(HTMLDIR)/devel/" xslt/html-chunk.xsl Samba-Developers-Guide.xml
-
-$(HTMLDIR)/guide: $(HTMLDIR) $(HTMLDIR)/guide/samba.css Samba-Guide.xml
-	$(XSLTPROC) --stringparam base.dir "$(HTMLDIR)/guide/" xslt/html-chunk.xsl Samba-Guide.xml
-	-mkdir $(HTMLDIR)/guide/images
-	cp -R $(GUIDEDOC_IMAGES_PNG) $(HTMLDIR)/guide/images
-
-manpages: $(MANDIR) $(MANPAGES)
-
-manpages.xml: $(MANPAGES_SOURCES)
-	echo "<article><variablelist>" > $@
-	for I in $(MANPAGES_SOURCES); do $(XSLTPROC) xslt/manpage-summary.xsl $$I >> $@; done
-	echo "</variablelist></article>" >> $@
-
-tex: Samba-HOWTO-Collection.tex Samba-Developers-Guide.tex gpl.tex
+$(HTMLDIR)/%/index.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/% $(HTMLDIR)/%/samba.css  xslt/html-chunk.xsl
+	$(XSLTPROC) --stringparam base.dir "$(HTMLDIR)/$*/" xslt/html-chunk.xsl $<
+	-mkdir $(HTMLDIR)/$*/images
 
-plucker: html-single htmlman $(PLUCKERDIR) $(MANPAGES_PLUCKER) $(PLUCKERDIR)/Samba-Developers-Guide.pdb $(PLUCKERDIR)/Samba-HOWTO-Collection.pdb
+# Single large HTML files
+$(HTMLDIR):
+	mkdir $(HTMLDIR)
+	mkdir $(HTMLDIR)/images
 
-Samba-HOWTO-Collection.xml: $(HOWTODIR)/index.xml $(HOWTODIR_DEPS)
-	$(XSLTPROC) --stringparam noreference 1 --xinclude --output $@ xslt/expand-sambadoc.xsl $<
+$(OUTPUTDIR)/%/samba.css: xslt/html/samba.css
+	cp $< $@
 
-Samba-Guide.xml: $(GUIDEDOC)/guide-main.xml
-	$(XSLTPROC) --stringparam noreference 1 --xinclude --output $@ xslt/expand-sambadoc.xsl $<
+$(HTMLDIR)/%.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR) $(HTMLDIR)/samba.css $(patsubst %.png,$(HTMLDIR)/images/%.png,$(%_IMAGES_PNG)) xslt/html.xsl
+	echo $^
+	$(XSLTPROC) --output $@ xslt/html.xsl $<
 
-Samba-Developers-Guide.xml: $(DEVDOCDIR)/index.xml $(DEVDOCDIR_DEPS)
-	$(XSLTPROC) --stringparam noreference 1 --xinclude --output $@ xslt/expand-sambadoc.xsl $<
+$(patsubst $(DOCBOOKDIR)/%.xml,$(HTMLDIR)/%,$(MAIN_DOCS)): $(HTMLDIR)
+	-mkdir $@
 
-%/attributions.xml: %/index.xml
-	@echo "<empty/>" > $@ # Make sure we don't get recursive dependencies, etc!
-	$(XSLTPROC) --output $@ xslt/generate-attributions.xsl $<
+%-attributions.xml: 
+	echo "<para/>" > $@
+	$(XSLTPROC) --xinclude xslt/generate-attributions.xsl $*/index.xml > $@
 
 clean: 
-	rm -rf $(OUTPUTDIR)/*
-	rm -f *.xml $(MANPAGES) $(TXTDIR)/*.txt $(PSDIR)/*.ps \
-	    $(PDFDIR)/*.pdf $(HTMLDIR)/*html $(HTMLDIR)/samba.css
+	rm -rf $(OUTPUTDIR)/* $(DOCBOOKDIR)
+	rm -f *.xml
 	rm -f xslt/figures/*pdf
-	rm -f $(SMBDOTCONFDOC)/parameters.*.xml $(DVIDIR)/*.dvi
-	rm -f samba-doc.* index.* $(HOWTODIR)/changelog.xml $(HOWTODIR)/attributions.xml $(DEVDOCDIR)/attributions.xml
-	rm -f Samba-HOWTO-Collection.*
-	rm -f Samba-Developers-Guide.*
-	rm -f Samba-Guide.*
-	rm -f $(IMAGEPROJDIR)/*.eps
+	rm -f $(SMBDOTCONFDOC)/parameters.*.xml
+	rm -f $(patsubst $(DOCBOOKDIR)/%.xml,%.*,$(MAIN_DOCS))
 
 # Text files
 $(TXTDIR):
 	mkdir $(TXTDIR)
 
-$(TXTDIR)/%.txt: $(HTMLDIR)/%.html
+$(TXTDIR)/%.txt: $(HTMLDIR)/%.html $(TXTDIR)
 	$(HTML2TEXT) -nobs -style pretty -o $@ $<
 
 # Tex files
-%.tex: %.xml
+%.tex: $(DOCBOOKDIR)/%.xml xslt/latex.xsl
 	$(XSLTPROC) --output $@ xslt/latex.xsl $<
 
 gpl.tex:
@@ -189,29 +173,27 @@ latexfigures: $(LATEX_FIGURES)
 	-$(PDFLATEX) $<
 	
 %.idx: %.aux
-	$(MAKEINDEX) `echo $< | sed -e 's/.aux//'`
+	$(MAKEINDEX) $*
 
 # Adobe PDF files
-$(PDFDIR)/%.pdf: %.tex %.aux %.idx latexfigures gpl.tex
+$(PDFDIR)/%.pdf: %.tex %.aux %.idx latexfigures gpl.tex $(PDFDIR) $(%_IMAGES_PNG)
 	-$(PDFLATEX) $<
 	-$(PDFLATEX) $<
-	$(THUMBPDF) $(patsubst %.tex,%.pdf,$<)
+	$(THUMBPDF) $*.pdf
 	-$(PDFLATEX) $<
-	mv $(patsubst %.tex,%.pdf,$<) $@
-
-epsimages: $(HOWTODIR_IMAGES_EPS)
+	mv $*.pdf $@
 
 # DVI files
-$(DVIDIR)/%.dvi: %.tex %.aux %.idx epsimages gpl.tex
+$(DVIDIR)/%.dvi: %.tex %.aux %.idx gpl.tex $(DVIDIR) $(%_IMAGES_EPS)
 	-$(LATEX) $< 
 	-$(LATEX) $< 
-	mv $(patsubst %.tex,%.dvi,$<) $@
+	mv $*.dvi $@
 
 %.eps: %.png
 	$(PNGTOPNM) $< | $(PNMTOPS) > $@
 
 # PostScript files
-$(PSDIR)/%.ps: $(DVIDIR)/%.dvi
+$(PSDIR)/%.ps: $(DVIDIR)/%.dvi $(PSDIR)
 	$(DVIPS) -o $@ $<
 
 xslt/figures/%.pdf: xslt/figures/%.eps
@@ -221,103 +203,74 @@ xslt/figures/%.pdf: xslt/figures/%.eps
 $(FODIR):
 	mkdir $(FODIR)
 
-$(FODIR)/%.fo: %.xml $(FODIR)
+$(FODIR)/%.fo: $(DOCBOOKDIR)/%.xml $(FODIR)
 	$(XSLTPROC) --output $@ http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl $<
 
 # HTML Help
-
 $(HTMLHELPDIR):
 	mkdir $(HTMLHELPDIR)
 
-$(HTMLHELPDIR)/Samba-HOWTO-Collection/images: 
-	-mkdir -p $@
-	cp -p $(HOWTODIR_IMAGES_PNG) $@
+$(HTMLHELPDIR)/%/images/%.png: $(%_IMAGEDIR)/%.png
+	cp $< $@
 
-$(HTMLHELPDIR)/Samba-Guide/images:
-	-mkdir -p $@
-	cp -p $(GUIDEDOC_IMAGES_PNG) $@
+$(HTMLHELPDIR)/%/images: $(HTMLHELPDIR)/%
+	mkdir -p $@
 
-$(HTMLHELPDIR)/Samba-Developers-Guide/images:
+$(HTMLHELPDIR)/%/images/: $@ $(subst $($*_IMAGEDIR),$@/,$($*_IMAGES_PNG))
 
-$(HTMLHELPDIR)/%: %.xml $(HTMLHELPDIR) $(HTMLHELPDIR)/%/images
+$(HTMLHELPDIR)/%: $(DOCBOOKDIR)/%.xml $(HTMLHELPDIR) $(HTMLHELPDIR)/%/images/
 	-mkdir $@
-	$(XSLTPROC) --stringparam htmlhelp.chm $(patsubst %.xml,%.chm,$<) --stringparam manifest.in.base.dir "$@/" --stringparam base.dir "$@/" http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl $<
-
-# Single large HTML files
-
-$(HTMLDIR):
-	mkdir $(HTMLDIR)
-	mkdir $(HTMLDIR)/howto
-	mkdir $(HTMLDIR)/guide
-	mkdir $(HTMLDIR)/devel
-	mkdir $(HTMLDIR)/images
+	$(XSLTPROC) --stringparam htmlhelp.chm $*.chm --stringparam manifest.in.base.dir "$@/" --stringparam base.dir "$@/" http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl $<
 
+# Plucker docs
 $(PLUCKERDIR):
 	mkdir $(PLUCKERDIR)
 
-%/samba.css: xslt/html/samba.css
-	if [ ! -d `dirname $@` ]; then mkdir -p `dirname $@`; fi
-	cp $< $@
-
-$(HTMLDIR)/Samba-HOWTO-Collection.html: Samba-HOWTO-Collection.xml $(HOWTODIR_DEPS) $(HOWTODIR_IMAGES_PNG)
-	$(XSLTPROC) --output $@ xslt/html.xsl $<
-
-$(HTMLDIR)/Samba-Guide.html: Samba-Guide.xml $(GUIDEDOC_IMAGES_PNG)
-	$(XSLTPROC) --output $@ xslt/html.xsl $<
-
-$(HTMLDIR)/Samba-Developers-Guide.html: Samba-Developers-Guide.xml $(DEVDOCDIR_DEPS)
-	$(XSLTPROC) --output $@ xslt/html.xsl $<
-
-$(HTMLDIR)/%.html: %.xml
-	$(XSLTPROC) --output $@ xslt/html.xsl $<
-
-$(PLUCKERDIR)/%.pdb: $(HTMLDIR)/%.html
-	$(PLUCKERBUILD) -v -M1 --stayonhost  --noimages --zlib-compression -H file:$< -f $(patsubst $(PLUCKERDIR)/%.pdb,%,$@) -p $(PLUCKERDIR)
-
-%.xml: $(MANPAGEDIR)/%.xml
-	$(XSLTPROC) --stringparam noreference 1 --output $@ xslt/expand-sambadoc.xsl $<
+$(PLUCKERDIR)/%.pdb: $(HTMLDIR)/%.html $(PLUCKERDIR)
+	$(PLUCKERBUILD) -v -M1 --stayonhost  --noimages --zlib-compression -H file:$< -f $* -p $(PLUCKERDIR)
 
 # Manpages
 $(MANPAGEDIR)/smb.conf.5.xml: $(SMBDOTCONFDOC)/parameters.all.xml $(SMBDOTCONFDOC)/parameters.service.xml $(SMBDOTCONFDOC)/parameters.global.xml
 
-$(SMBDOTCONF)/parameters.all.xml:
-	@cd $(SMBDOTCONFDOC) && /bin/sh generate-file-list.sh >parameters.all.xml
+$(SMBDOTCONFDOC)/parameters.all.xml: $(shell find $(SMBDOTCONFDOC) -type f -name '*.xml' -mindepth 2 | sort -t/ -k3 | xargs) $(SMBDOTCONFDOC)/generate-file-list.sh
+	$(SMBDOTCONFDOC)/generate-file-list.sh $(SMBDOTCONFDOC) > $@
 
-$(SMBDOTCONFDOC)/parameters.global.xml: $(SMBDOTCONFDOC)/parameters.all.xml
+$(SMBDOTCONFDOC)/parameters.global.xml: $(SMBDOTCONFDOC)/parameters.all.xml $(SMBDOTCONFDOC)/generate-context.xsl
 	$(XSLTPROC) --xinclude --param smb.context "'G'" --output $(SMBDOTCONFDOC)/parameters.global.xml $(SMBDOTCONFDOC)/generate-context.xsl $<
 
-$(SMBDOTCONFDOC)/parameters.service.xml: $(SMBDOTCONFDOC)/parameters.all.xml
+$(SMBDOTCONFDOC)/parameters.service.xml: $(SMBDOTCONFDOC)/parameters.all.xml $(SMBDOTCONFDOC)/generate-context.xsl
 	$(XSLTPROC) --xinclude --param smb.context "'S'" --output $(SMBDOTCONFDOC)/parameters.service.xml $(SMBDOTCONFDOC)/generate-context.xsl $<
 
 $(MANDIR): 
 	mkdir $(MANDIR)
 
-$(MANDIR)/%: %.xml
+$(MANDIR)/%: $(DOCBOOKDIR)/%.xml xslt/man.xsl
 	$(XSLTPROC) --output $@ xslt/man.xsl $<
 
+# Pearson compatible XML
+
 $(PEARSONDIR):
 	mkdir $@
 
-$(PEARSONDIR)/%.xml: %.xml $(PEARSONDIR)
+$(PEARSONDIR)/%.xml: $(DOCBOOKDIR)/%.xml $(PEARSONDIR) xslt/pearson.xsl
 	$(XSLTPROC) --xinclude --output $@ xslt/pearson.xsl $<
 
 $(PEARSONDIR)/%.report.html: $(PEARSONDIR)/%.xml
 	$(XMLLINT) --valid --noout --htmlout $< 2> $@
 
-pearson: $(PEARSONDIR)/Samba-HOWTO-Collection.xml
-pearson-verify: $(PEARSONDIR)/Samba-HOWTO-Collection.report.html
+# Validation verification
 
 $(VALIDATEDIR):
 	mkdir $@
 
-$(VALIDATEDIR)/%.report.html: %.xml
+$(VALIDATEDIR)/%.report.html: $(DOCBOOKDIR)/%.xml
 	$(XMLLINT) --valid --noout --htmlout $< 2> $@
 
 verify: $(VALIDATEDIR) $(VALIDATEDIR)/Samba-HOWTO-Collection.report.html $(VALIDATEDIR)/Samba-Developers-Guide.report.html $(VALIDATEDIR)/Samba-Guide.report.html 
 
 # Find undocumented parameters
 
-undocumented: $(SMBDOTCONFDOC)/parameters.all.xml
+undocumented: $(SMBDOTCONFDOC)/parameters.all.xml scripts/find_missing_doc.pl scripts/find_missing_manpages.pl
 	@$(PERL) scripts/find_missing_doc.pl $(SRCDIR)
 	@$(PERL) scripts/find_missing_manpages.pl $(SRCDIR)
 
@@ -326,19 +279,14 @@ undocumented: $(SMBDOTCONFDOC)/parameters.all.xml
 $(EXAMPLESDIR):
 	mkdir $(EXAMPLESDIR)
 
-files: $(HOWTODIR)/index.xml $(HOWTODIR)/attributions.xml $(EXAMPLESDIR)
+files: $(HOWTODIR)/index.xml $(EXAMPLESDIR) xslt/extract-smbfiles.xsl
 	$(XSLTPROC) xslt/extract-smbfiles.xsl $< > /dev/null
 
-samples: $(EXAMPLESDIR) Samba-HOWTO-Collection.xml
-	$(XSLTPROC) xslt/extract-examples.xsl Samba-HOWTO-Collection.xml > /dev/null 2> examples/README
+samples: $(DOCBOOKDIR)/Samba-HOWTO-Collection.xml $(EXAMPLESDIR) xslt/extract-examples.xsl scripts/indent-smb.conf.pl
+	$(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
 
-howto: $(PDFDIR)/Samba-HOWTO-Collection.pdf
-guide: $(PDFDIR)/Samba-Guide.pdf
-
-%/changelog.xml: % $(wildcard %/CVS/*)
-	touch $@
-	# FIXME
+# Archiving
 
 $(ARCHIVEDIR):
 	mkdir $(ARCHIVEDIR)
@@ -346,3 +294,12 @@ $(ARCHIVEDIR):
 archive: $(ARCHIVEDIR) guide howto
 	cp $(PDFDIR)/Samba-HOWTO-Collection.pdf $(ARCHIVEDIR)/TOSHARG-`date +%Y%m%d`.pdf
 	cp $(PDFDIR)/Samba-Guide.pdf $(ARCHIVEDIR)/S3bE-`date +%Y%m%d`.pdf
+
+# XSL scripts
+xslt/html.xsl: xslt/html-common.xsl settings.xsl
+xslt/html-chunk.xsl: xslt/html-common.xsl settings.xsl
+xslt/latex.xsl: settings.xsl
+xslt/expand-sambadoc.xsl: settings.xsl
+xslt/generate-attributions.xsl: 
+xslt/man.xsl:
+xslt/pearson.xsl:
diff --git a/docs/devel/CodingSuggestions.xml b/docs/Samba-Developers-Guide/CodingSuggestions.xml
index 04465a1fcd..04465a1fcd 100644
--- a/docs/devel/CodingSuggestions.xml
+++ b/docs/Samba-Developers-Guide/CodingSuggestions.xml
diff --git a/docs/devel/NetBIOS.xml b/docs/Samba-Developers-Guide/NetBIOS.xml
index 6bfe0c8647..6bfe0c8647 100644
--- a/docs/devel/NetBIOS.xml
+++ b/docs/Samba-Developers-Guide/NetBIOS.xml
diff --git a/docs/devel/Tracing.xml b/docs/Samba-Developers-Guide/Tracing.xml
index 3868eaab7b..3868eaab7b 100644
--- a/docs/devel/Tracing.xml
+++ b/docs/Samba-Developers-Guide/Tracing.xml
diff --git a/docs/devel/architecture.xml b/docs/Samba-Developers-Guide/architecture.xml
index fb1fe52546..fb1fe52546 100644
--- a/docs/devel/architecture.xml
+++ b/docs/Samba-Developers-Guide/architecture.xml
diff --git a/docs/devel/cifsntdomain.xml b/docs/Samba-Developers-Guide/cifsntdomain.xml
index 5e57833b69..5e57833b69 100644
--- a/docs/devel/cifsntdomain.xml
+++ b/docs/Samba-Developers-Guide/cifsntdomain.xml
diff --git a/docs/devel/contributing.xml b/docs/Samba-Developers-Guide/contributing.xml
index a06dfd14db..a06dfd14db 100644
--- a/docs/devel/contributing.xml
+++ b/docs/Samba-Developers-Guide/contributing.xml
diff --git a/docs/devel/debug.xml b/docs/Samba-Developers-Guide/debug.xml
index f627833557..f627833557 100644
--- a/docs/devel/debug.xml
+++ b/docs/Samba-Developers-Guide/debug.xml
diff --git a/docs/devel/encryption.xml b/docs/Samba-Developers-Guide/encryption.xml
index 0a1fbbbbed..0a1fbbbbed 100644
--- a/docs/devel/encryption.xml
+++ b/docs/Samba-Developers-Guide/encryption.xml
diff --git a/docs/devel/gencache.xml b/docs/Samba-Developers-Guide/gencache.xml
index 265461c5e3..94184bf865 100644
--- a/docs/devel/gencache.xml
+++ b/docs/Samba-Developers-Guide/gencache.xml
@@ -4,6 +4,7 @@
   <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
   %global_entities;
 ]>
+
 <chapter id="gencache">
 <chapterinfo>
 	<author>
@@ -54,8 +55,8 @@ kept together. The form the record has is:
 </para>
 
 <para><programlisting>
-key:     &lt;string&bt;
-value:   &lt;12-digit timeout&bt;/&lt;string&gt;
+key:     &lt;string&gt;
+value:   &lt;12-digit timeout&gt;/&lt;string&gt;
 </programlisting></para>
 
 <para>The timeout part is the ASCII representation of
@@ -118,8 +119,6 @@ void gencache_iterate(void (*fn)(const char* key, const char *value, time_t time
 
 </programlisting></para>
 
-<sect1>
-<title>Writing your own caching layer</title>
 </sect1>
 
 </chapter>
diff --git a/docs/devel/index.xml b/docs/Samba-Developers-Guide/index.xml
index 30e18b20ba..dfbe726a13 100644
--- a/docs/devel/index.xml
+++ b/docs/Samba-Developers-Guide/index.xml
@@ -39,12 +39,7 @@ url="http://www.fsf.org/licenses/gpl.txt">http://www.fsf.org/licenses/gpl.txt</u
 </abstract>
 
 </bookinfo>
-<preface>
-	<title>Attributions</title>
-
-	<xi:include href="attributions.xml"/>
-</preface>
-	
+<xi:include href="../Samba-Developers-Guide-attributions.xml"/>
 
 <!-- Contents -->
 <toc/>
diff --git a/docs/devel/internals.xml b/docs/Samba-Developers-Guide/internals.xml
index 7decd9d06c..7decd9d06c 100644
--- a/docs/devel/internals.xml
+++ b/docs/Samba-Developers-Guide/internals.xml
diff --git a/docs/devel/modules.xml b/docs/Samba-Developers-Guide/modules.xml
index c14fda04dd..c14fda04dd 100644
--- a/docs/devel/modules.xml
+++ b/docs/Samba-Developers-Guide/modules.xml
diff --git a/docs/devel/packagers.xml b/docs/Samba-Developers-Guide/packagers.xml
index a55f4c6581..a55f4c6581 100644
--- a/docs/devel/packagers.xml
+++ b/docs/Samba-Developers-Guide/packagers.xml
diff --git a/docs/devel/parsing.xml b/docs/Samba-Developers-Guide/parsing.xml
index d989c97809..d989c97809 100644
--- a/docs/devel/parsing.xml
+++ b/docs/Samba-Developers-Guide/parsing.xml
diff --git a/docs/devel/printing.xml b/docs/Samba-Developers-Guide/printing.xml
index cd29b5010b..cd29b5010b 100644
--- a/docs/devel/printing.xml
+++ b/docs/Samba-Developers-Guide/printing.xml
diff --git a/docs/devel/registry.dot b/docs/Samba-Developers-Guide/registry.dot
index b26f74b703..b26f74b703 100644
--- a/docs/devel/registry.dot
+++ b/docs/Samba-Developers-Guide/registry.dot
diff --git a/docs/devel/registry.xml b/docs/Samba-Developers-Guide/registry.xml
index 078e926de9..078e926de9 100644
--- a/docs/devel/registry.xml
+++ b/docs/Samba-Developers-Guide/registry.xml
diff --git a/docs/devel/rpc_plugin.xml b/docs/Samba-Developers-Guide/rpc_plugin.xml
index 478847b192..478847b192 100644
--- a/docs/devel/rpc_plugin.xml
+++ b/docs/Samba-Developers-Guide/rpc_plugin.xml
diff --git a/docs/devel/unix-smb.xml b/docs/Samba-Developers-Guide/unix-smb.xml
index 80a6b67649..80a6b67649 100644
--- a/docs/devel/unix-smb.xml
+++ b/docs/Samba-Developers-Guide/unix-smb.xml
diff --git a/docs/devel/vfs.xml b/docs/Samba-Developers-Guide/vfs.xml
index 6819faf05d..6819faf05d 100644
--- a/docs/devel/vfs.xml
+++ b/docs/Samba-Developers-Guide/vfs.xml
diff --git a/docs/devel/windows-debug.xml b/docs/Samba-Developers-Guide/windows-debug.xml
index 27ffbc063c..27ffbc063c 100644
--- a/docs/devel/windows-debug.xml
+++ b/docs/Samba-Developers-Guide/windows-debug.xml
diff --git a/docs/devel/wins.xml b/docs/Samba-Developers-Guide/wins.xml
index ad3ad67b42..ad3ad67b42 100644
--- a/docs/devel/wins.xml
+++ b/docs/Samba-Developers-Guide/wins.xml
diff --git a/docs/guide/Chap01-WindowsNetworkingPrimer.xml b/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml
index 893a7629ee..d677e4cba3 100644
--- a/docs/guide/Chap01-WindowsNetworkingPrimer.xml
+++ b/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml
@@ -288,29 +288,15 @@
 		A screenshot of a later stage of the same capture is shown in <link linkend="pktcap02"/>.
 		</para>
 
-<figure id="pktcap01">
-	<title>Windows Me &smbmdash; Broadcasts &smbmdash; The First 10 Minutes</title>
-	<mediaobject>
-		<imageobject role="latex">
-			<imagedata fileref="guide/images/WINREPRESSME-Capture.png" scale="53" scalefit="1"/>
-		</imageobject>
-		<imageobject>
-			<imagedata fileref="guide/images/WINREPRESSME-Capture.png" scale="53" scalefit="1"/>
-		</imageobject>
-	</mediaobject>
-</figure>
-
-<figure id="pktcap02">
-	<title>Windows Me &smbmdash; Later Broadcast Sample</title>
-	<mediaobject>
-		<imageobject role="latex">
-			<imagedata fileref="guide/images/WINREPRESSME-Capture2.png" scale="57" scalefit="1"/>
-		</imageobject>
-		<imageobject>
-			<imagedata fileref="guide/images/WINREPRESSME-Capture2.png" scale="57" scalefit="1"/>
-		</imageobject>
-	</mediaobject>
-</figure>
+		<image id="pktcap01">
+			<imagefile scale="53">WINREPRESSME-Capture.png</imagefile>
+			<description>Windows Me &smbmdash; Broadcasts &smbmdash; The First 10 Minutes</description>
+		</image>
+
+		<image id="pktcap02">
+			<description>Windows Me &smbmdash; Later Broadcast Sample</description>
+			<imagefile scale="57">WINREPRESSME-Capture2.png</imagefile>
+		</image>
 
 	  <para><indexterm>
 	      <primary>Local Master Browser</primary>
@@ -614,17 +600,10 @@
 
 		</sect3>
 
-<figure id="hostannounce">
-        <title>Typical Windows 9x/Me Host Announcement</title>
-        <mediaobject>
-                <imageobject role="latex">
-                        <imagedata fileref="guide/images/HostAnnouncment.png" scale="55" scalefit="1"/>
-                </imageobject>
-                <imageobject>
-                        <imagedata fileref="guide/images/HostAnnouncment.png" scale="55" scalefit="1"/>
-                </imageobject>
-        </mediaobject>
-</figure>
+		<image id="hostannounce">
+			<description>Typical Windows 9x/Me Host Announcement</description>
+			<imagefile scale="55">HostAnnouncment.png</imagefile>
+		</image>
 
 	</sect2>
 
@@ -745,17 +724,11 @@
 		<link linkend="nullconnect"/>.
 		</para>
 
-<figure id="nullconnect">
-        <title>Typical Windows 9x/Me NULL SessionSetUp AndX Request</title>
-        <mediaobject>
-                <imageobject role="latex">
-                        <imagedata fileref="guide/images/NullConnect.png" scale="65" scalefit="1"/>
-                </imageobject>
-                <imageobject>
-                        <imagedata fileref="guide/images/NullConnect.png" scale="65" scalefit="1"/>
-                </imageobject>
-        </mediaobject>
-</figure>
+		<image id="nullconnect">
+			<description>Typical Windows 9x/Me NULL SessionSetUp AndX Request</description>
+
+			<imagefile scale="65">NullConnect.png</imagefile>
+		</image>
 
 		<para>
 	    	<indexterm><primary>nobody</primary></indexterm>
@@ -769,17 +742,10 @@
 		is shown in <link linkend="userconnect"/>.
 		</para>
 
-<figure id="userconnect">
-        <title>Typical Windows 9x/Me User SessionSetUp AndX Request</title>
-        <mediaobject>
-                <imageobject role="latex">
-                        <imagedata fileref="guide/images/UserConnect.png" scale="65" scalefit="1"/>
-                </imageobject>
-                <imageobject>
-                        <imagedata fileref="guide/images/UserConnect.png" scale="65" scalefit="1"/>
-                </imageobject>
-        </mediaobject>
-</figure>
+		<image id="userconnect">
+			<description>Typical Windows 9x/Me User SessionSetUp AndX Request</description>
+			<imagefile scale="65">UserConnect.png</imagefile>
+		</image>
 
 	 	<para>
 		<indexterm><primary>encrypted</primary></indexterm>
@@ -931,29 +897,15 @@
 
 	</procedure>
 
-<figure id="XPCap01">
-        <title>Typical Windows XP NULL Session Setup AndX Request</title>
-        <mediaobject>
-                <imageobject role="latex">
-                        <imagedata fileref="guide/images/WindowsXP-NullConnection.png" scale="70" scalefit="1"/>
-                </imageobject>
-                <imageobject>
-                        <imagedata fileref="guide/images/WindowsXP-NullConnection.png" scale="70" scalefit="1"/>
-                </imageobject>
-        </mediaobject>
-</figure>
-
-<figure id="XPCap02">
-        <title>Typical Windows XP User Session Setup AndX Request</title>
-        <mediaobject>
-                <imageobject role="latex">
-                        <imagedata fileref="guide/images/WindowsXP-UserConnection.png" scale="70" scalefit="1"/>
-                </imageobject>
-                <imageobject>
-                        <imagedata fileref="guide/images/WindowsXP-UserConnection.png" scale="70" scalefit="1"/>
-                </imageobject>
-        </mediaobject>
-</figure>
+	<image id="XPCap01">
+        <description>Typical Windows XP NULL Session Setup AndX Request</description>
+		<imagefile scale="70">WindowsXP-NullConnection.png</imagefile>
+	</image>
+
+	<image id="XPCap02">
+        <description>Typical Windows XP User Session Setup AndX Request</description>
+		<imagefile scale="70">WindowsXP-UserConnection.png</imagefile>
+	</image>
 
 		<sect3>
 		<title>Discussion</title>
diff --git a/docs/guide/Chap02-SimpleOfficeServer.xml b/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml
index 52e27bd6ce..4e42b52039 100644
--- a/docs/guide/Chap02-SimpleOfficeServer.xml
+++ b/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml
@@ -496,17 +496,10 @@
 		The office network is built as shown in <link linkend="charitynet"/>.
 		</para>
 
-<figure id="charitynet">
-	<title>Charity Administration Office Network</title>
-	<mediaobject>
-		<imageobject role="latex">
-			<imagedata fileref="guide/images/Charity-Network.png" scale="100" scalefit="1"/>
-		</imageobject>
-		<imageobject>
-			<imagedata fileref="guide/images/Charity-Network.png" scale="100" scalefit="1"/>
-		</imageobject>
-	</mediaobject>
-</figure>
+		<image id="charitynet">
+			<description>Charity Administration Office Network</description>
+			<imagefile scale="100">Charity-Network.png</imagefile>
+		</image>
 
 		<procedure>
 		<title>Samba Server Configuration</title>
@@ -992,17 +985,10 @@ C:\WINDOWS: regedit ME-dpwc.reg
 		start of Samba configuration. The following prescriptive steps may now commence.
 		</para>
 
-		<figure id="acctingnet2">
-			<title>Accounting Office Network Topology</title>
-			<mediaobject>
-				<imageobject role="latex">
-					<imagedata fileref="guide/images/AccountingNetwork.png" scale="100" scalefit="1"/>
-				</imageobject>
-				<imageobject>
-					<imagedata fileref="guide/images/AccountingNetwork.png" scale="100" scalefit="1"/>
-				</imageobject>
-			</mediaobject>
-		</figure>
+		<image id="acctingnet2">
+			<description>Accounting Office Network Topology</description>
+			<imagefile scale="100">AccountingNetwork.png</imagefile>
+		</image>
 
 		<table id="acctingnet">
 			<title>Accounting Office Network Information</title>
diff --git a/docs/guide/Chap03-TheSmallOffice.xml b/docs/Samba-Guide/Chap03-TheSmallOffice.xml
index e50af189f1..f874a8b678 100644
--- a/docs/guide/Chap03-TheSmallOffice.xml
+++ b/docs/Samba-Guide/Chap03-TheSmallOffice.xml
@@ -302,17 +302,10 @@
 	by setting the sticky bit (set UID/GID) on the top-level directories.
 	</para>
 
-<figure id="acct2net">
-	<title>Abmas Accounting &smbmdash; 52 User Network Topology</title>
-	<mediaobject>
-		<imageobject role="latex">
-			<imagedata fileref="guide/images/acct2net.png" scale="100" scalefit="1"/>
-		</imageobject>
-		<imageobject>
-			<imagedata fileref="guide/images/acct2net.png" scale="100" scalefit="1"/>
-		</imageobject>
-	</mediaobject>
-</figure>
+	<image id="acct2net">
+		<description>Abmas Accounting &smbmdash; 52 User Network Topology</description>
+		<imagefile scale="100">acct2net.png</imagefile>
+	</image>
 
 	<procedure>
 		<step><para>
diff --git a/docs/guide/Chap04-SecureOfficeServer.xml b/docs/Samba-Guide/Chap04-SecureOfficeServer.xml
index fb375187a6..5ec4ab2166 100644
--- a/docs/guide/Chap04-SecureOfficeServer.xml
+++ b/docs/Samba-Guide/Chap04-SecureOfficeServer.xml
@@ -162,17 +162,10 @@
 			</tgroup>
 		</table>
 
-<figure id="ch04net">
-	<title>Abmas Network Topology &smbmdash; 130 Users</title>
-	<mediaobject>
-		<imageobject role="latex">
-			<imagedata fileref="guide/images/chap4-net.png" scale="90" scalefit="1"/>
-		</imageobject>
-		<imageobject>
-			<imagedata fileref="guide/images/chap4-net.png" scale="90" scalefit="1"/>
-		</imageobject>
-	</mediaobject>
-</figure>
+		<image id="ch04net">
+			<description>Abmas Network Topology &smbmdash; 130 Users</description>
+			<imagefile scale="90">chap4-net.png</imagefile>
+		</image>
 
 		<para>
 		Christine has recommended that desktop systems should be installed from a single cloned
diff --git a/docs/guide/Chap05-500UserNetwork.xml b/docs/Samba-Guide/Chap05-500UserNetwork.xml
index 435d6cea46..3c679c1b09 100644
--- a/docs/guide/Chap05-500UserNetwork.xml
+++ b/docs/Samba-Guide/Chap05-500UserNetwork.xml
@@ -325,17 +325,10 @@
 	selected hardware that is appropriate to the task.
 	</para>
 
-<figure id="chap05net">
-	<title>Network Topology &smbmdash; 500 User Network Using tdbsam passdb backend.</title>
-	<mediaobject>
-		<imageobject role="latex">
-			<imagedata fileref="guide/images/chap5-net.png" scale="80" scalefit="1"/>
-		</imageobject>
-		<imageobject>
-			<imagedata fileref="guide/images/chap5-net.png" scale="80" scalefit="1"/>
-		</imageobject>
-	</mediaobject>
-</figure>
+	<image id="chap05net">
+		<description>Network Topology &smbmdash; 500 User Network Using tdbsam passdb backend.</description>
+		<imagefile scale="80">chap5-net.png</imagefile>
+	</image>
 
 	<sect2 id="ch5-dnshcp-setup">
 	<title>Installation of DHCP, DNS, and Samba Control Files</title>
diff --git a/docs/guide/Chap06-MakingHappyUsers.xml b/docs/Samba-Guide/Chap06-MakingHappyUsers.xml
index b80bd2eed2..c8a547ac67 100644
--- a/docs/guide/Chap06-MakingHappyUsers.xml
+++ b/docs/Samba-Guide/Chap06-MakingHappyUsers.xml
@@ -574,17 +574,10 @@
 	of the UNIX username to the UID. The relationships are demonstrated in <link linkend="ch6-LDAPdiag"/>.
 	</para>
 
-	<figure id="ch6-LDAPdiag">
-		<title>The Interaction of LDAP, UNIX Posix Accounts and Samba Accounts</title>
-		<mediaobject>
-			<imageobject role="latex">
-				<imagedata fileref="guide/images/UNIX-Samba-and-LDAP.png" scale="70" scalefit="1"/>
-			</imageobject>
-			<imageobject>
-				<imagedata fileref="guide/images/UNIX-Samba-and-LDAP.png" scale="70" scalefit="1"/>
-			</imageobject>
-		</mediaobject>
-	</figure>
+	<image id="ch6-LDAPdiag">
+		<description>The Interaction of LDAP, UNIX Posix Accounts and Samba Accounts</description>
+		<imagefile scale="70">UNIX-Samba-and-LDAP.png</imagefile>
+	</image>
 
 	<para><indexterm>
 	    <primary>security</primary>
@@ -965,19 +958,10 @@
 	that you will install additional file servers, and possibly additional BDCs.
 	</para>
 
-<figure id="chap6net">
-	<title>Network Topology &smbmdash; 500 User Network Using ldapsam passdb backend.</title>
-	<mediaobject>
-		<imageobject role="latex">
-			<imagedata scale="70" scalefit="1"
-			  fileref="guide/images/chap6-net.png"/>
-		</imageobject>
-		<imageobject>
-			<imagedata scale="70" scalefit="1"
-			  fileref="guide/images/chap6-net.png"/>
-		</imageobject>
-	</mediaobject>
-</figure>
+	<image id="chap6net">
+		<description>Network Topology &smbmdash; 500 User Network Using ldapsam passdb backend.</description>
+		<imagefile scale="70">chap6-net.png</imagefile>
+	</image>
 
       <para><indexterm>
 	  <primary>SUSE Linux</primary>
@@ -3146,19 +3130,10 @@ HKEY_LOCAL_MACHINE\Default\Software\Microsoft\Windows\
 
 	</procedure>
 
-<figure id="XP-screen001">
-	<title>Windows XP Professional &smbmdash; User Shared Folders</title>
-	<mediaobject>
-		<imageobject role="latex">
-			<imagedata scale="65" scalefit="1"
-			  fileref="guide/images/XP-screen001.png"/>
-		</imageobject>
-		<imageobject>
-			<imagedata scale="65" scalefit="1"
-			  fileref="guide/images/XP-screen001.png"/>
-		</imageobject>
-	</mediaobject>
-</figure>
+	<image id="XP-screen001">
+		<description>Windows XP Professional &smbmdash; User Shared Folders</description>
+		<imagefile scale="65">XP-screen001.png</imagefile>
+	</image>
 
 <table id="proffold">
 	<title>Default Profile Redirections</title>
diff --git a/docs/guide/Chap07-2000UserNetwork.xml b/docs/Samba-Guide/Chap07-2000UserNetwork.xml
index a8f7b91e2d..73134cf108 100644
--- a/docs/guide/Chap07-2000UserNetwork.xml
+++ b/docs/Samba-Guide/Chap07-2000UserNetwork.xml
@@ -708,33 +708,15 @@
 	    procedures for managing the directory, as retroactive correction of
 	    inconsistent directory information can be exceedingly difficult.</para>
 
-<figure id="chap7net">
-	<title>Network Topology &smbmdash; 2000 User Complex Design A</title>
-	<mediaobject>
-		<imageobject role="latex">
-			<imagedata scale="80" scalefit="1"
-			  fileref="guide/images/chap7-net-Ar.png"/>
-		</imageobject>
-		<imageobject>
-			<imagedata scale="80" scalefit="1"
-			  fileref="guide/images/chap7-net-Ar.png"/>
-		</imageobject>
-	</mediaobject>
-</figure>
-
-<figure id="chap7net2">
-	<title>Network Topology &smbmdash; 2000 User Complex Design B</title>
-	<mediaobject>
-		<imageobject role="latex">
-			<imagedata scale="80" scalefit="1"
-			  fileref="guide/images/chap7-net2-Br.png"/>
-		</imageobject>
-		<imageobject>
-			<imagedata scale="80" scalefit="1"
-			  fileref="guide/images/chap7-net2-Br.png"/>
-		</imageobject>
-	</mediaobject>
-</figure>
+	<image id="chap7net">
+		<description>Network Topology &smbmdash; 2000 User Complex Design A</description>
+		<imagefile scale="80">chap7-net-Ar.png</imagefile>
+	</image>
+
+	<image id="chap7net2">
+		<description>Network Topology &smbmdash; 2000 User Complex Design B</description>
+		<imagefile scale="80">chap7-net2-Br.png</imagefile>
+	</image>
 
 	</sect3>
 
@@ -776,19 +758,10 @@
 	(obtaining a UNIX UID/GID) using the specific systems shown.
 	</para>
 
-<figure id="chap7idres">
-	<title>Samba and Authentication Backend Search Pathways</title>
-	<mediaobject>
-		<imageobject role="latex">
-			<imagedata scale="80" scalefit="1"
-			  fileref="guide/images/chap7-idresol.png"/>
-		</imageobject>
-		<imageobject>
-			<imagedata scale="80" scalefit="1"
-			  fileref="guide/images/chap7-idresol.png"/>
-		</imageobject>
-	</mediaobject>
-</figure>
+	<image id="chap7idres">
+		<description>Samba and Authentication Backend Search Pathways</description>
+		<imagefile scale="80">chap7-idresol.png</imagefile>
+	</image>
 
       <para><indexterm>
 	  <primary>smbpasswd</primary>
@@ -826,17 +799,10 @@ passdb backend = ldapsam:ldap://master.abmas.biz
 </screen>
 	This configuration tells Samba to use a single LDAP server as shown in
 	<link linkend="ch7singleLDAP"/>.
-	<figure id="ch7singleLDAP">
-		<title>Samba Configuration to Use a Single LDAP Server</title>
-		<mediaobject>
-			<imageobject role="latex">
-				<imagedata fileref="guide/images/ch7-singleLDAP.png" scale="100" scalefit="1"/>
-			</imageobject>
-			<imageobject>
-				<imagedata fileref="guide/images/ch7-singleLDAP.png" scale="100" scalefit="1"/>
-			</imageobject>
-		</mediaobject>
-	</figure>
+	<image id="ch7singleLDAP">
+		<description>Samba Configuration to Use a Single LDAP Server</description>
+		<imagefile scale="100">ch7-singleLDAP.png</imagefile>
+	</image>
 	<indexterm>
 	  <primary>LDAP</primary>
 	  <secondary>fail-over</secondary>
@@ -855,17 +821,10 @@ passdb backend = ldapsam:"ldap://master.abmas.biz \
 </screen>
 	This configuration tells Samba to use a master LDAP server, with fail-over to a slave server if necessary,
 	as shown in <link linkend="ch7dualLDAP"/>.
-	<figure id="ch7dualLDAP">
-		<title>Samba Configuration to Use a Dual (Fail-over) LDAP Server</title>
-		<mediaobject>
-			<imageobject role="latex">
-				<imagedata fileref="guide/images/ch7-fail-overLDAP.png" scale="100" scalefit="1"/>
-			</imageobject>
-			<imageobject>
-				<imagedata fileref="guide/images/ch7-fail-overLDAP.png" scale="100" scalefit="1"/>
-			</imageobject>
-		</mediaobject>
-	</figure>
+	<image id="ch7dualLDAP">
+		<description>Samba Configuration to Use a Dual (Fail-over) LDAP Server</description>
+		<imagefile scale="100">ch7-fail-overLDAP.png</imagefile>
+	</image>
       </para>
 
       <para>Some folks have tried to implement this without the use of
@@ -887,17 +846,10 @@ passdb backend = ldapsam:ldap://master.abmas.biz \
 	configuration is shown in <link linkend="ch7dualadd"/>
 	</para>
 
-	<figure id="ch7dualadd">
-		<title>Samba Configuration to Use Dual LDAP Databases - Broken - Do Not Use!</title>
-		<mediaobject>
-			<imageobject role="latex">
-				<imagedata fileref="guide/images/ch7-dual-additive-LDAP.png" scale="80" scalefit="1"/>
-			</imageobject>
-			<imageobject>
-				<imagedata fileref="guide/images/ch7-dual-additive-LDAP.png" scale="80" scalefit="1"/>
-			</imageobject>
-		</mediaobject>
-	</figure>
+	<image id="ch7dualadd">
+		<description>Samba Configuration to Use Dual LDAP Databases - Broken - Do Not Use!</description>
+		<imagefile scale="80">ch7-dual-additive-LDAP.png</imagefile>
+	</image>
 
 	<para>
 	If, however, each LDAP database contains unique information, this may 
@@ -906,17 +858,10 @@ passdb backend = ldapsam:ldap://master.abmas.biz \
 	An example of this configuration is shown in <link linkend="ch7dualok"/>.
         </para>
 
-	<figure id="ch7dualok">
-		<title>Samba Configuration to Use Two LDAP Databases - The result is additive.</title>
-		<mediaobject>
-			<imageobject role="latex">
-				<imagedata fileref="guide/images/ch7-dual-additive-LDAP-Ok.png" scale="80" scalefit="1"/>
-			</imageobject>
-			<imageobject>
-				<imagedata fileref="guide/images/ch7-dual-additive-LDAP-Ok.png" scale="80" scalefit="1"/>
-			</imageobject>
-		</mediaobject>
-	</figure>
+		<image id="ch7dualok">
+			<description>Samba Configuration to Use Two LDAP Databases - The result is additive.</description>
+			<imagefile scale="80">ch7-dual-additive-LDAP-Ok.png</imagefile>
+		</image>
 
 	<note><para>
 	When the use of ldapsam is specified twice, as shown here, it is imperative
diff --git a/docs/guide/Chap08-MigrateNT4Samba3.xml b/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml
index 29f25a7764..a6b196f365 100644
--- a/docs/guide/Chap08-MigrateNT4Samba3.xml
+++ b/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml
@@ -182,17 +182,10 @@
 		from a Windows NT4 Domain to a Samba Domain.
 		</para>
 
-		<figure id="ch8-migration">
-			<title>Schematic Explaining the <command>net rpc vampire</command> Process</title>
-			<mediaobject>
-				<imageobject role="latex">
-					<imagedata fileref="guide/images/ch8-migration.png" scale="80" scalefit="1"/>
-				</imageobject>
-				<imageobject>
-					<imagedata fileref="guide/images/ch8-migration.png" scale="80" scalefit="1"/>
-				</imageobject>
-			</mediaobject>
-		</figure>
+		<image id="ch8-migration">
+			<description>Schematic Explaining the <command>net rpc vampire</command> Process</description>
+			<imagefile scale="80">ch8-migration.png</imagefile>
+		</image>
 
 		<para>
 		In any case, the migration process involves the following steps:
@@ -303,17 +296,10 @@
 		an LDAP backend.
 		</para>
 
-	<figure id="NT4DUM">
-		<title>View of Accounts in NT4 Domain User Manager</title>
-		<mediaobject>
-			<imageobject role="latex">
-				<imagedata fileref="guide/images/UserMgrNT4.png" scale="50" scalefit="1"/>
-			</imageobject>
-			<imageobject>
-				<imagedata fileref="guide/images/UserMgrNT4.png" scale="50" scalefit="1"/>
-			</imageobject>
-		</mediaobject>
-	</figure>
+		<image id="NT4DUM">
+			<description>View of Accounts in NT4 Domain User Manager</description>
+			<imagefile scale="50">UserMgrNT4.png</imagefile>
+		</image>
 
 	</sect2>
 
diff --git a/docs/guide/Chap09-AddingUNIXClients.xml b/docs/Samba-Guide/Chap09-AddingUNIXClients.xml
index 8372094138..e46fc22396 100644
--- a/docs/guide/Chap09-AddingUNIXClients.xml
+++ b/docs/Samba-Guide/Chap09-AddingUNIXClients.xml
@@ -28,17 +28,10 @@
 	<link linkend="ch09openmag"/>.
 	</para>
 
-<figure id="ch09openmag">
-	<title>Open Magazine Samba Survey</title>
-	<mediaobject>
-		<imageobject role="latex">
-			<imagedata fileref="guide/images/openmag.png" scale="60" scalefit="1"/>
-		</imageobject>
-		<imageobject>
-			<imagedata fileref="guide/images/openmag.png" scale="60" scalefit="1"/>
-		</imageobject>
-	</mediaobject>
-</figure>
+	<image id="ch09openmag">
+		<description>Open Magazine Samba Survey</description>
+		<imagefile scale="60">openmag.png</imagefile>
+	</image>
 
 	<para>
 	While Domain Control is an exciting subject, basic file and print sharing remains the staple bread-and-butter
@@ -522,17 +515,10 @@
 	Member server within a Samba Domain Control network.
 	</para>
 
-<figure id="ch9-sambadc">
-	<title>Samba Domain: Samba Member Server</title>
-	<mediaobject>
-		<imageobject role="latex">
-			<imagedata fileref="guide/images/chap9-SambaDC.png" scale="75" scalefit="1"/>
-		</imageobject>
-		<imageobject>
-			<imagedata fileref="guide/images/chap9-SambaDC.png" scale="75" scalefit="1"/>
-		</imageobject>
-	</mediaobject>
-</figure>
+<image id="ch9-sambadc">
+	<description>Samba Domain: Samba Member Server</description>
+	<imagefile scale="75">chap9-SambaDC.png</imagefile>
+</image>
 
 	<para><indexterm>
 	    <primary>IDMAP</primary>
@@ -1111,17 +1097,10 @@ aliases:        files
 	Domain Name is <constant>LONDON</constant> and the server name is <constant>W2K3S</constant>.
 	</para>
 
-<figure id="ch9-adsdc">
-	<title>Active Directory Domain: Samba Member Server</title>
-	<mediaobject>
-		<imageobject role="latex">
-			<imagedata fileref="guide/images/chap9-ADSDC.png" scale="75" scalefit="1"/>
-		</imageobject>
-		<imageobject>
-			<imagedata fileref="guide/images/chap9-SambaDC.png" scale="75" scalefit="1"/>
-		</imageobject>
-	</mediaobject>
-</figure>
+	<image id="ch9-adsdc">
+		<description>Active Directory Domain: Samba Member Server</description>
+		<imagefile scale="75">chap9-ADSDC.png</imagefile>
+	</image>
 
 	<procedure>
 	  <step><para><indexterm>
diff --git a/docs/guide/Chap10-KerberosFastStart.xml b/docs/Samba-Guide/Chap10-KerberosFastStart.xml
index 0851421dfa..0851421dfa 100644
--- a/docs/guide/Chap10-KerberosFastStart.xml
+++ b/docs/Samba-Guide/Chap10-KerberosFastStart.xml
diff --git a/docs/guide/Chap10b-DomainAppsSupport.xml b/docs/Samba-Guide/Chap10b-DomainAppsSupport.xml
index 7188e7747d..7188e7747d 100644
--- a/docs/guide/Chap10b-DomainAppsSupport.xml
+++ b/docs/Samba-Guide/Chap10b-DomainAppsSupport.xml
diff --git a/docs/guide/Chap11-HighAvailability.xml b/docs/Samba-Guide/Chap11-HighAvailability.xml
index d81164a8ee..d81164a8ee 100644
--- a/docs/guide/Chap11-HighAvailability.xml
+++ b/docs/Samba-Guide/Chap11-HighAvailability.xml
diff --git a/docs/guide/Chap12-Appendix.xml b/docs/Samba-Guide/Chap12-Appendix.xml
index 6b6550dc2e..c3b244c405 100644
--- a/docs/guide/Chap12-Appendix.xml
+++ b/docs/Samba-Guide/Chap12-Appendix.xml
@@ -1194,17 +1194,10 @@ example:
 	An example of the LAM login screen is provided in <link linkend="lam-login"/>.
 	</para>
 
-	<figure id="lam-login">
-		<title>The LDAP Account Manager Login Screen</title>
-		<mediaobject>
-			<imageobject role="latex">
-				<imagedata fileref="guide/images/lam-login.png" scale="50" scalefit="1"/>
-			</imageobject>
-			<imageobject>
-				<imagedata fileref="guide/images/lam-login.png" scale="50" scalefit="1"/>
-			</imageobject>
-		</mediaobject>
-	</figure>
+	<image id="lam-login">
+		<description>The LDAP Account Manager Login Screen</description>
+		<imagefile scale="50">lam-login.png</imagefile>
+	</image>
 
       <para><indexterm>
 	  <primary>LAM</primary>
@@ -1220,17 +1213,10 @@ example:
 	using LAM to add additional users and groups.
 	</para>
 
-	<figure id="lam-config">
-		<title>The LDAP Account Manager Configuration Screen</title>
-		<mediaobject>
-			<imageobject role="latex">
-				<imagedata fileref="guide/images/lam-config.png" scale="50" scalefit="1"/>
-			</imageobject>
-			<imageobject>
-				<imagedata fileref="guide/images/lam-config.png" scale="50" scalefit="1"/>
-			</imageobject>
-		</mediaobject>
-	</figure>
+	<image id="lam-config">
+		<description>The LDAP Account Manager Configuration Screen</description>
+		<imagefile scale="50">lam-config.png</imagefile>
+	</image>
 
       <para><indexterm>
 	  <primary>PDF</primary>
@@ -1254,17 +1240,10 @@ example:
 	finished editing simply press the <guimenu>Final</guimenu> button.
 	</para>
 
-	<figure id="lam-user">
-		<title>The LDAP Account Manager User Edit Screen</title>
-		<mediaobject>
-			<imageobject role="latex">
-				<imagedata fileref="guide/images/lam-users.png" scale="50" scalefit="1"/>
-			</imageobject>
-			<imageobject>
-				<imagedata fileref="guide/images/lam-users.png" scale="50" scalefit="1"/>
-			</imageobject>
-		</mediaobject>
-	</figure>
+	<image id="lam-user">
+		<description>The LDAP Account Manager User Edit Screen</description>
+		<imagefile scale="50">lam-users.png</imagefile>
+	</image>
 
 	<para>
 	The edit screen for groups is shown in <link linkend="lam-group"/>. As with the edit screen
@@ -1273,29 +1252,15 @@ example:
 	memberships. 
 	</para>
 
-	<figure id="lam-group">
-		<title>The LDAP Account Manager Group Edit Screen</title>
-		<mediaobject>
-			<imageobject role="latex">
-				<imagedata fileref="guide/images/lam-groups.png" scale="50" scalefit="1"/>
-			</imageobject>
-			<imageobject>
-				<imagedata fileref="guide/images/lam-groups.png" scale="50" scalefit="1"/>
-			</imageobject>
-		</mediaobject>
-	</figure>
-
-	<figure id="lam-group-mem">
-		<title>The LDAP Account Manager Group Membership Edit Screen</title>
-		<mediaobject>
-			<imageobject role="latex">
-				<imagedata fileref="guide/images/lam-group-members.png" scale="50" scalefit="1"/>
-			</imageobject>
-			<imageobject>
-				<imagedata fileref="guide/images/lam-group-members.png" scale="50" scalefit="1"/>
-			</imageobject>
-		</mediaobject>
-	</figure>
+	<image id="lam-group">
+		<description>The LDAP Account Manager Group Edit Screen</description>
+		<imagefile scale="50">lam-groups.png</imagefile>
+	</image>
+
+	<image id="lam-group-mem">
+		<description>The LDAP Account Manager Group Membership Edit Screen</description>
+		<imagefile scale="50">lam-group-members.png</imagefile>
+	</image>
 
       <para><indexterm>
 	  <primary>smbldap-tools</primary>
@@ -1307,17 +1272,10 @@ example:
 	will, in most cases, not be used.
 	</para>
 
-	<figure id="lam-host">
-		<title>The LDAP Account Manager Host Edit Screen</title>
-		<mediaobject>
-			<imageobject role="latex">
-				<imagedata fileref="guide/images/lam-hosts.png" scale="50" scalefit="1"/>
-			</imageobject>
-			<imageobject>
-				<imagedata fileref="guide/images/lam-hosts.png" scale="50" scalefit="1"/>
-			</imageobject>
-		</mediaobject>
-	</figure>
+	<image id="lam-host">
+		<description>The LDAP Account Manager Host Edit Screen</description>
+		<imagefile scale="50">lam-hosts.png</imagefile>
+	</image>
 
 	<para>
 	One aspect of LAM that may annoy some users is the way it forces certain conventions on
diff --git a/docs/guide/acknowledgements.xml b/docs/Samba-Guide/acknowledgements.xml
index 24944fac25..24944fac25 100644
--- a/docs/guide/acknowledgements.xml
+++ b/docs/Samba-Guide/acknowledgements.xml
diff --git a/docs/guide/conventions.xml b/docs/Samba-Guide/conventions.xml
index 5b069b113a..5b069b113a 100644
--- a/docs/guide/conventions.xml
+++ b/docs/Samba-Guide/conventions.xml
diff --git a/docs/guide/foreword.xml b/docs/Samba-Guide/foreword.xml
index 402f181ac8..402f181ac8 100644
--- a/docs/guide/foreword.xml
+++ b/docs/Samba-Guide/foreword.xml
diff --git a/docs/guide/front-matter.xml b/docs/Samba-Guide/front-matter.xml
index 17cf92914a..17cf92914a 100644
--- a/docs/guide/front-matter.xml
+++ b/docs/Samba-Guide/front-matter.xml
diff --git a/docs/guide/glossary.xml b/docs/Samba-Guide/glossary.xml
index 9ee3063b13..9ee3063b13 100644
--- a/docs/guide/glossary.xml
+++ b/docs/Samba-Guide/glossary.xml
diff --git a/docs/guide/gpl.xml b/docs/Samba-Guide/gpl.xml
index 4d0b778031..4d0b778031 100644
--- a/docs/guide/gpl.xml
+++ b/docs/Samba-Guide/gpl.xml
diff --git a/docs/guide/images/AccountingNetwork.dia b/docs/Samba-Guide/images/AccountingNetwork.dia
index 3484dbad75..3484dbad75 100644
--- a/docs/guide/images/AccountingNetwork.dia
+++ b/docs/Samba-Guide/images/AccountingNetwork.dia
diff --git a/docs/guide/images/AccountingNetwork.png b/docs/Samba-Guide/images/AccountingNetwork.png
index 8b1222721d..8b1222721d 100644
--- a/docs/guide/images/AccountingNetwork.png
+++ b/docs/Samba-Guide/images/AccountingNetwork.png
diff --git a/docs/guide/images/Charity-Network.dia b/docs/Samba-Guide/images/Charity-Network.dia
index ab9c7f5834..ab9c7f5834 100644
--- a/docs/guide/images/Charity-Network.dia
+++ b/docs/Samba-Guide/images/Charity-Network.dia
diff --git a/docs/guide/images/Charity-Network.png b/docs/Samba-Guide/images/Charity-Network.png
index eeb06cc729..eeb06cc729 100644
--- a/docs/guide/images/Charity-Network.png
+++ b/docs/Samba-Guide/images/Charity-Network.png
diff --git a/docs/guide/images/Domain-WorkgroupAnnouncement.png b/docs/Samba-Guide/images/Domain-WorkgroupAnnouncement.png
index e65882b2ce..e65882b2ce 100644
--- a/docs/guide/images/Domain-WorkgroupAnnouncement.png
+++ b/docs/Samba-Guide/images/Domain-WorkgroupAnnouncement.png
diff --git a/docs/guide/images/HostAnnouncment.png b/docs/Samba-Guide/images/HostAnnouncment.png
index 56f9fb8576..56f9fb8576 100644
--- a/docs/guide/images/HostAnnouncment.png
+++ b/docs/Samba-Guide/images/HostAnnouncment.png
diff --git a/docs/guide/images/LocalMasterAnnouncement.png b/docs/Samba-Guide/images/LocalMasterAnnouncement.png
index 8b22bc35c5..8b22bc35c5 100644
--- a/docs/guide/images/LocalMasterAnnouncement.png
+++ b/docs/Samba-Guide/images/LocalMasterAnnouncement.png
diff --git a/docs/guide/images/NullConnect.png b/docs/Samba-Guide/images/NullConnect.png
index 5320fc6db1..5320fc6db1 100644
--- a/docs/guide/images/NullConnect.png
+++ b/docs/Samba-Guide/images/NullConnect.png
diff --git a/docs/guide/images/UNIX-Samba-and-LDAP.dia b/docs/Samba-Guide/images/UNIX-Samba-and-LDAP.dia
index dfd30fc022..dfd30fc022 100644
--- a/docs/guide/images/UNIX-Samba-and-LDAP.dia
+++ b/docs/Samba-Guide/images/UNIX-Samba-and-LDAP.dia
diff --git a/docs/guide/images/UNIX-Samba-and-LDAP.png b/docs/Samba-Guide/images/UNIX-Samba-and-LDAP.png
index 3dfe36a2af..3dfe36a2af 100644
--- a/docs/guide/images/UNIX-Samba-and-LDAP.png
+++ b/docs/Samba-Guide/images/UNIX-Samba-and-LDAP.png
diff --git a/docs/guide/images/UserConnect.png b/docs/Samba-Guide/images/UserConnect.png
index 0b9acce15e..0b9acce15e 100644
--- a/docs/guide/images/UserConnect.png
+++ b/docs/Samba-Guide/images/UserConnect.png
diff --git a/docs/guide/images/UserMgrNT4.png b/docs/Samba-Guide/images/UserMgrNT4.png
index a69615c1da..a69615c1da 100644
--- a/docs/guide/images/UserMgrNT4.png
+++ b/docs/Samba-Guide/images/UserMgrNT4.png
diff --git a/docs/guide/images/WINREPRESSME-Capture.png b/docs/Samba-Guide/images/WINREPRESSME-Capture.png
index 3b6dc3ae56..3b6dc3ae56 100644
--- a/docs/guide/images/WINREPRESSME-Capture.png
+++ b/docs/Samba-Guide/images/WINREPRESSME-Capture.png
diff --git a/docs/guide/images/WINREPRESSME-Capture2.png b/docs/Samba-Guide/images/WINREPRESSME-Capture2.png
index b9b82c2287..b9b82c2287 100644
--- a/docs/guide/images/WINREPRESSME-Capture2.png
+++ b/docs/Samba-Guide/images/WINREPRESSME-Capture2.png
diff --git a/docs/guide/images/Windows-ME-WINEPRESSME-Startup-30min-ProtocolStats.png b/docs/Samba-Guide/images/Windows-ME-WINEPRESSME-Startup-30min-ProtocolStats.png
index 6e23d1632a..6e23d1632a 100644
--- a/docs/guide/images/Windows-ME-WINEPRESSME-Startup-30min-ProtocolStats.png
+++ b/docs/Samba-Guide/images/Windows-ME-WINEPRESSME-Startup-30min-ProtocolStats.png
diff --git a/docs/guide/images/Windows-ME-WINEPRESSME-Startup-30min-TraceStats.png b/docs/Samba-Guide/images/Windows-ME-WINEPRESSME-Startup-30min-TraceStats.png
index f5fd738475..f5fd738475 100644
--- a/docs/guide/images/Windows-ME-WINEPRESSME-Startup-30min-TraceStats.png
+++ b/docs/Samba-Guide/images/Windows-ME-WINEPRESSME-Startup-30min-TraceStats.png
diff --git a/docs/guide/images/WindowsXP-NullConnection.png b/docs/Samba-Guide/images/WindowsXP-NullConnection.png
index 76d1ac2c9a..76d1ac2c9a 100644
--- a/docs/guide/images/WindowsXP-NullConnection.png
+++ b/docs/Samba-Guide/images/WindowsXP-NullConnection.png
diff --git a/docs/guide/images/WindowsXP-UserConnection.png b/docs/Samba-Guide/images/WindowsXP-UserConnection.png
index d60fefc659..d60fefc659 100644
--- a/docs/guide/images/WindowsXP-UserConnection.png
+++ b/docs/Samba-Guide/images/WindowsXP-UserConnection.png
diff --git a/docs/guide/images/XP-screen001.png b/docs/Samba-Guide/images/XP-screen001.png
index 6f0fe58e78..6f0fe58e78 100644
--- a/docs/guide/images/XP-screen001.png
+++ b/docs/Samba-Guide/images/XP-screen001.png
diff --git a/docs/guide/images/acct2net.dia b/docs/Samba-Guide/images/acct2net.dia
index ca1716254b..ca1716254b 100644
--- a/docs/guide/images/acct2net.dia
+++ b/docs/Samba-Guide/images/acct2net.dia
diff --git a/docs/guide/images/acct2net.png b/docs/Samba-Guide/images/acct2net.png
index 7290dfa827..7290dfa827 100644
--- a/docs/guide/images/acct2net.png
+++ b/docs/Samba-Guide/images/acct2net.png
diff --git a/docs/guide/images/ch7-dual-additive-LDAP-Ok.dia b/docs/Samba-Guide/images/ch7-dual-additive-LDAP-Ok.dia
index e6464b9a13..e6464b9a13 100644
--- a/docs/guide/images/ch7-dual-additive-LDAP-Ok.dia
+++ b/docs/Samba-Guide/images/ch7-dual-additive-LDAP-Ok.dia
diff --git a/docs/guide/images/ch7-dual-additive-LDAP-Ok.png b/docs/Samba-Guide/images/ch7-dual-additive-LDAP-Ok.png
index b8272d2b58..b8272d2b58 100644
--- a/docs/guide/images/ch7-dual-additive-LDAP-Ok.png
+++ b/docs/Samba-Guide/images/ch7-dual-additive-LDAP-Ok.png
diff --git a/docs/guide/images/ch7-dual-additive-LDAP.dia b/docs/Samba-Guide/images/ch7-dual-additive-LDAP.dia
index 6e1e4979d6..6e1e4979d6 100644
--- a/docs/guide/images/ch7-dual-additive-LDAP.dia
+++ b/docs/Samba-Guide/images/ch7-dual-additive-LDAP.dia
diff --git a/docs/guide/images/ch7-dual-additive-LDAP.png b/docs/Samba-Guide/images/ch7-dual-additive-LDAP.png
index 13a05edc94..13a05edc94 100644
--- a/docs/guide/images/ch7-dual-additive-LDAP.png
+++ b/docs/Samba-Guide/images/ch7-dual-additive-LDAP.png
diff --git a/docs/guide/images/ch7-fail-overLDAP.dia b/docs/Samba-Guide/images/ch7-fail-overLDAP.dia
index f676e2adfe..f676e2adfe 100644
--- a/docs/guide/images/ch7-fail-overLDAP.dia
+++ b/docs/Samba-Guide/images/ch7-fail-overLDAP.dia
diff --git a/docs/guide/images/ch7-fail-overLDAP.png b/docs/Samba-Guide/images/ch7-fail-overLDAP.png
index 2f24929c84..2f24929c84 100644
--- a/docs/guide/images/ch7-fail-overLDAP.png
+++ b/docs/Samba-Guide/images/ch7-fail-overLDAP.png
diff --git a/docs/guide/images/ch7-singleLDAP.dia b/docs/Samba-Guide/images/ch7-singleLDAP.dia
index b03e7d354a..b03e7d354a 100644
--- a/docs/guide/images/ch7-singleLDAP.dia
+++ b/docs/Samba-Guide/images/ch7-singleLDAP.dia
diff --git a/docs/guide/images/ch7-singleLDAP.png b/docs/Samba-Guide/images/ch7-singleLDAP.png
index 74ab7a49d9..74ab7a49d9 100644
--- a/docs/guide/images/ch7-singleLDAP.png
+++ b/docs/Samba-Guide/images/ch7-singleLDAP.png
diff --git a/docs/guide/images/ch8-migration.dia b/docs/Samba-Guide/images/ch8-migration.dia
index 04a513bcf0..04a513bcf0 100644
--- a/docs/guide/images/ch8-migration.dia
+++ b/docs/Samba-Guide/images/ch8-migration.dia
diff --git a/docs/guide/images/ch8-migration.png b/docs/Samba-Guide/images/ch8-migration.png
index 8ac2f506dd..8ac2f506dd 100644
--- a/docs/guide/images/ch8-migration.png
+++ b/docs/Samba-Guide/images/ch8-migration.png
diff --git a/docs/guide/images/chap4-net.dia b/docs/Samba-Guide/images/chap4-net.dia
index e8c56643c7..e8c56643c7 100644
--- a/docs/guide/images/chap4-net.dia
+++ b/docs/Samba-Guide/images/chap4-net.dia
diff --git a/docs/guide/images/chap4-net.png b/docs/Samba-Guide/images/chap4-net.png
index f59c25bddb..f59c25bddb 100644
--- a/docs/guide/images/chap4-net.png
+++ b/docs/Samba-Guide/images/chap4-net.png
diff --git a/docs/guide/images/chap5-net.dia b/docs/Samba-Guide/images/chap5-net.dia
index f4f77ea064..f4f77ea064 100644
--- a/docs/guide/images/chap5-net.dia
+++ b/docs/Samba-Guide/images/chap5-net.dia
diff --git a/docs/guide/images/chap5-net.png b/docs/Samba-Guide/images/chap5-net.png
index 3af0c9a639..3af0c9a639 100644
--- a/docs/guide/images/chap5-net.png
+++ b/docs/Samba-Guide/images/chap5-net.png
diff --git a/docs/guide/images/chap6-net.dia b/docs/Samba-Guide/images/chap6-net.dia
index aa079a4291..aa079a4291 100644
--- a/docs/guide/images/chap6-net.dia
+++ b/docs/Samba-Guide/images/chap6-net.dia
diff --git a/docs/guide/images/chap6-net.png b/docs/Samba-Guide/images/chap6-net.png
index 5e549e3273..5e549e3273 100644
--- a/docs/guide/images/chap6-net.png
+++ b/docs/Samba-Guide/images/chap6-net.png
diff --git a/docs/guide/images/chap7-idresol.dia b/docs/Samba-Guide/images/chap7-idresol.dia
index 349d0588a6..349d0588a6 100644
--- a/docs/guide/images/chap7-idresol.dia
+++ b/docs/Samba-Guide/images/chap7-idresol.dia
diff --git a/docs/guide/images/chap7-idresol.png b/docs/Samba-Guide/images/chap7-idresol.png
index 7071d9a09d..7071d9a09d 100644
--- a/docs/guide/images/chap7-idresol.png
+++ b/docs/Samba-Guide/images/chap7-idresol.png
diff --git a/docs/guide/images/chap7-net-A.dia b/docs/Samba-Guide/images/chap7-net-A.dia
index 5286014a83..5286014a83 100644
--- a/docs/guide/images/chap7-net-A.dia
+++ b/docs/Samba-Guide/images/chap7-net-A.dia
diff --git a/docs/guide/images/chap7-net-A.png b/docs/Samba-Guide/images/chap7-net-A.png
index 820217bbfd..820217bbfd 100644
--- a/docs/guide/images/chap7-net-A.png
+++ b/docs/Samba-Guide/images/chap7-net-A.png
diff --git a/docs/guide/images/chap7-net-Ar.png b/docs/Samba-Guide/images/chap7-net-Ar.png
index 2f4d80f47b..2f4d80f47b 100644
--- a/docs/guide/images/chap7-net-Ar.png
+++ b/docs/Samba-Guide/images/chap7-net-Ar.png
diff --git a/docs/guide/images/chap7-net.dia b/docs/Samba-Guide/images/chap7-net.dia
index a136874e74..a136874e74 100644
--- a/docs/guide/images/chap7-net.dia
+++ b/docs/Samba-Guide/images/chap7-net.dia
diff --git a/docs/guide/images/chap7-net.png b/docs/Samba-Guide/images/chap7-net.png
index ede12fbef4..ede12fbef4 100644
--- a/docs/guide/images/chap7-net.png
+++ b/docs/Samba-Guide/images/chap7-net.png
diff --git a/docs/guide/images/chap7-net2-B.dia b/docs/Samba-Guide/images/chap7-net2-B.dia
index 761e41e91a..761e41e91a 100644
--- a/docs/guide/images/chap7-net2-B.dia
+++ b/docs/Samba-Guide/images/chap7-net2-B.dia
diff --git a/docs/guide/images/chap7-net2-B.png b/docs/Samba-Guide/images/chap7-net2-B.png
index 0fd9cd4063..0fd9cd4063 100644
--- a/docs/guide/images/chap7-net2-B.png
+++ b/docs/Samba-Guide/images/chap7-net2-B.png
diff --git a/docs/guide/images/chap7-net2-Br.png b/docs/Samba-Guide/images/chap7-net2-Br.png
index a75a47dc5d..a75a47dc5d 100644
--- a/docs/guide/images/chap7-net2-Br.png
+++ b/docs/Samba-Guide/images/chap7-net2-Br.png
diff --git a/docs/guide/images/chap7-net2.dia b/docs/Samba-Guide/images/chap7-net2.dia
index 653d2b2f69..653d2b2f69 100644
--- a/docs/guide/images/chap7-net2.dia
+++ b/docs/Samba-Guide/images/chap7-net2.dia
diff --git a/docs/guide/images/chap7-net2.png b/docs/Samba-Guide/images/chap7-net2.png
index 7bb570c1b0..7bb570c1b0 100644
--- a/docs/guide/images/chap7-net2.png
+++ b/docs/Samba-Guide/images/chap7-net2.png
diff --git a/docs/guide/images/chap7-net2r.png b/docs/Samba-Guide/images/chap7-net2r.png
index 194fd3c350..194fd3c350 100644
--- a/docs/guide/images/chap7-net2r.png
+++ b/docs/Samba-Guide/images/chap7-net2r.png
diff --git a/docs/guide/images/chap7-netr.png b/docs/Samba-Guide/images/chap7-netr.png
index bbbbbf1cc7..bbbbbf1cc7 100644
--- a/docs/guide/images/chap7-netr.png
+++ b/docs/Samba-Guide/images/chap7-netr.png
diff --git a/docs/guide/images/chap9-ADSDC.dia b/docs/Samba-Guide/images/chap9-ADSDC.dia
index dd52341d54..dd52341d54 100644
--- a/docs/guide/images/chap9-ADSDC.dia
+++ b/docs/Samba-Guide/images/chap9-ADSDC.dia
diff --git a/docs/guide/images/chap9-ADSDC.png b/docs/Samba-Guide/images/chap9-ADSDC.png
index dc91c3e4c4..dc91c3e4c4 100644
--- a/docs/guide/images/chap9-ADSDC.png
+++ b/docs/Samba-Guide/images/chap9-ADSDC.png
diff --git a/docs/guide/images/chap9-SambaDC.dia b/docs/Samba-Guide/images/chap9-SambaDC.dia
index 884a4d134a..884a4d134a 100644
--- a/docs/guide/images/chap9-SambaDC.dia
+++ b/docs/Samba-Guide/images/chap9-SambaDC.dia
diff --git a/docs/guide/images/chap9-SambaDC.png b/docs/Samba-Guide/images/chap9-SambaDC.png
index f2cccdaeca..f2cccdaeca 100644
--- a/docs/guide/images/chap9-SambaDC.png
+++ b/docs/Samba-Guide/images/chap9-SambaDC.png
diff --git a/docs/guide/images/lam-config.png b/docs/Samba-Guide/images/lam-config.png
index 15f989bf37..15f989bf37 100644
--- a/docs/guide/images/lam-config.png
+++ b/docs/Samba-Guide/images/lam-config.png
diff --git a/docs/guide/images/lam-group-members.png b/docs/Samba-Guide/images/lam-group-members.png
index 139acb26ba..139acb26ba 100644
--- a/docs/guide/images/lam-group-members.png
+++ b/docs/Samba-Guide/images/lam-group-members.png
diff --git a/docs/guide/images/lam-groups.png b/docs/Samba-Guide/images/lam-groups.png
index 38757e0c4a..38757e0c4a 100644
--- a/docs/guide/images/lam-groups.png
+++ b/docs/Samba-Guide/images/lam-groups.png
diff --git a/docs/guide/images/lam-hosts.png b/docs/Samba-Guide/images/lam-hosts.png
index a3c29931d6..a3c29931d6 100644
--- a/docs/guide/images/lam-hosts.png
+++ b/docs/Samba-Guide/images/lam-hosts.png
diff --git a/docs/guide/images/lam-login.png b/docs/Samba-Guide/images/lam-login.png
index eb35a49ca6..eb35a49ca6 100644
--- a/docs/guide/images/lam-login.png
+++ b/docs/Samba-Guide/images/lam-login.png
diff --git a/docs/guide/images/lam-users.png b/docs/Samba-Guide/images/lam-users.png
index 8254e6d614..8254e6d614 100644
--- a/docs/guide/images/lam-users.png
+++ b/docs/Samba-Guide/images/lam-users.png
diff --git a/docs/guide/images/openmag.png b/docs/Samba-Guide/images/openmag.png
index 52eca30c35..52eca30c35 100644
--- a/docs/guide/images/openmag.png
+++ b/docs/Samba-Guide/images/openmag.png
diff --git a/docs/guide/images/wxpp001.png b/docs/Samba-Guide/images/wxpp001.png
index 2e689a17e2..2e689a17e2 100644
--- a/docs/guide/images/wxpp001.png
+++ b/docs/Samba-Guide/images/wxpp001.png
diff --git a/docs/guide/images/wxpp004.png b/docs/Samba-Guide/images/wxpp004.png
index 656f67942e..656f67942e 100644
--- a/docs/guide/images/wxpp004.png
+++ b/docs/Samba-Guide/images/wxpp004.png
diff --git a/docs/guide/images/wxpp006.png b/docs/Samba-Guide/images/wxpp006.png
index a20b3ed583..a20b3ed583 100644
--- a/docs/guide/images/wxpp006.png
+++ b/docs/Samba-Guide/images/wxpp006.png
diff --git a/docs/guide/images/wxpp007.png b/docs/Samba-Guide/images/wxpp007.png
index cf41352220..cf41352220 100644
--- a/docs/guide/images/wxpp007.png
+++ b/docs/Samba-Guide/images/wxpp007.png
diff --git a/docs/guide/images/wxpp008.png b/docs/Samba-Guide/images/wxpp008.png
index 9958c7c873..9958c7c873 100644
--- a/docs/guide/images/wxpp008.png
+++ b/docs/Samba-Guide/images/wxpp008.png
diff --git a/docs/guide/images/wxpp010.png b/docs/Samba-Guide/images/wxpp010.png
index 068a0dfc73..068a0dfc73 100644
--- a/docs/guide/images/wxpp010.png
+++ b/docs/Samba-Guide/images/wxpp010.png
diff --git a/docs/guide/images/wxpp011.png b/docs/Samba-Guide/images/wxpp011.png
index 0cf88c04a6..0cf88c04a6 100644
--- a/docs/guide/images/wxpp011.png
+++ b/docs/Samba-Guide/images/wxpp011.png
diff --git a/docs/guide/images/wxpp012.png b/docs/Samba-Guide/images/wxpp012.png
index d89f3b5d31..d89f3b5d31 100644
--- a/docs/guide/images/wxpp012.png
+++ b/docs/Samba-Guide/images/wxpp012.png
diff --git a/docs/guide/images/wxpp013.png b/docs/Samba-Guide/images/wxpp013.png
index 451240ee38..451240ee38 100644
--- a/docs/guide/images/wxpp013.png
+++ b/docs/Samba-Guide/images/wxpp013.png
diff --git a/docs/guide/images/wxpp015.png b/docs/Samba-Guide/images/wxpp015.png
index 12fe2f31b2..12fe2f31b2 100644
--- a/docs/guide/images/wxpp015.png
+++ b/docs/Samba-Guide/images/wxpp015.png
diff --git a/docs/guide/index.xml b/docs/Samba-Guide/index.xml
index 1288db26f1..1288db26f1 100644
--- a/docs/guide/index.xml
+++ b/docs/Samba-Guide/index.xml
diff --git a/docs/guide/inside-cover.xml b/docs/Samba-Guide/inside-cover.xml
index 934adf7081..934adf7081 100644
--- a/docs/guide/inside-cover.xml
+++ b/docs/Samba-Guide/inside-cover.xml
diff --git a/docs/guide/preface.xml b/docs/Samba-Guide/preface.xml
index 4e847b309a..4e847b309a 100644
--- a/docs/guide/preface.xml
+++ b/docs/Samba-Guide/preface.xml
diff --git a/docs/howto/AccessControls.xml b/docs/Samba-HOWTO-Collection/AccessControls.xml
index 3e933bf01b..3e933bf01b 100644
--- a/docs/howto/AccessControls.xml
+++ b/docs/Samba-HOWTO-Collection/AccessControls.xml
diff --git a/docs/howto/AdvancedNetworkAdmin.xml b/docs/Samba-HOWTO-Collection/AdvancedNetworkAdmin.xml
index a95b9f2126..a95b9f2126 100644
--- a/docs/howto/AdvancedNetworkAdmin.xml
+++ b/docs/Samba-HOWTO-Collection/AdvancedNetworkAdmin.xml
diff --git a/docs/howto/BDC.xml b/docs/Samba-HOWTO-Collection/BDC.xml
index 6f70eea867..6f70eea867 100644
--- a/docs/howto/BDC.xml
+++ b/docs/Samba-HOWTO-Collection/BDC.xml
diff --git a/docs/howto/Backup.xml b/docs/Samba-HOWTO-Collection/Backup.xml
index 5c4dceed38..5c4dceed38 100644
--- a/docs/howto/Backup.xml
+++ b/docs/Samba-HOWTO-Collection/Backup.xml
diff --git a/docs/howto/Bugs.xml b/docs/Samba-HOWTO-Collection/Bugs.xml
index 12f8055599..12f8055599 100644
--- a/docs/howto/Bugs.xml
+++ b/docs/Samba-HOWTO-Collection/Bugs.xml
diff --git a/docs/howto/CUPS-printing.xml b/docs/Samba-HOWTO-Collection/CUPS-printing.xml
index 6dd4d0418d..6dd4d0418d 100644
--- a/docs/howto/CUPS-printing.xml
+++ b/docs/Samba-HOWTO-Collection/CUPS-printing.xml
diff --git a/docs/howto/Compiling.xml b/docs/Samba-HOWTO-Collection/Compiling.xml
index 4260e7dda0..4260e7dda0 100644
--- a/docs/howto/Compiling.xml
+++ b/docs/Samba-HOWTO-Collection/Compiling.xml
diff --git a/docs/howto/DNS-DHCP-Configuration.xml b/docs/Samba-HOWTO-Collection/DNS-DHCP-Configuration.xml
index 67a3142572..67a3142572 100644
--- a/docs/howto/DNS-DHCP-Configuration.xml
+++ b/docs/Samba-HOWTO-Collection/DNS-DHCP-Configuration.xml
diff --git a/docs/howto/Diagnosis.xml b/docs/Samba-HOWTO-Collection/Diagnosis.xml
index eb7e29797d..eb7e29797d 100644
--- a/docs/howto/Diagnosis.xml
+++ b/docs/Samba-HOWTO-Collection/Diagnosis.xml
diff --git a/docs/howto/DomainMember.xml b/docs/Samba-HOWTO-Collection/DomainMember.xml
index df38cef0b6..df38cef0b6 100644
--- a/docs/howto/DomainMember.xml
+++ b/docs/Samba-HOWTO-Collection/DomainMember.xml
diff --git a/docs/howto/FastStart.xml b/docs/Samba-HOWTO-Collection/FastStart.xml
index 3a9d95fcdc..3a9d95fcdc 100644
--- a/docs/howto/FastStart.xml
+++ b/docs/Samba-HOWTO-Collection/FastStart.xml
diff --git a/docs/howto/Further-Resources.xml b/docs/Samba-HOWTO-Collection/Further-Resources.xml
index 549e0ff6a6..8ca95442be 100644
--- a/docs/howto/Further-Resources.xml
+++ b/docs/Samba-HOWTO-Collection/Further-Resources.xml
@@ -1,3 +1,10 @@
+<?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;
+]>
+
 <chapter id="Further-Resources">
 <chapterinfo>
 	&author.jelmer;
diff --git a/docs/howto/Group-Mapping.xml b/docs/Samba-HOWTO-Collection/Group-Mapping.xml
index 7197b12a21..7197b12a21 100644
--- a/docs/howto/Group-Mapping.xml
+++ b/docs/Samba-HOWTO-Collection/Group-Mapping.xml
diff --git a/docs/howto/HighAvailability.xml b/docs/Samba-HOWTO-Collection/HighAvailability.xml
index b3c94dd79d..b3c94dd79d 100644
--- a/docs/howto/HighAvailability.xml
+++ b/docs/Samba-HOWTO-Collection/HighAvailability.xml
diff --git a/docs/howto/Install.xml b/docs/Samba-HOWTO-Collection/Install.xml
index 1390fd2310..1390fd2310 100644
--- a/docs/howto/Install.xml
+++ b/docs/Samba-HOWTO-Collection/Install.xml
diff --git a/docs/howto/Integrating-with-Windows.xml b/docs/Samba-HOWTO-Collection/Integrating-with-Windows.xml
index af5859aea3..af5859aea3 100644
--- a/docs/howto/Integrating-with-Windows.xml
+++ b/docs/Samba-HOWTO-Collection/Integrating-with-Windows.xml
diff --git a/docs/howto/InterdomainTrusts.xml b/docs/Samba-HOWTO-Collection/InterdomainTrusts.xml
index 78e92db5a8..78e92db5a8 100644
--- a/docs/howto/InterdomainTrusts.xml
+++ b/docs/Samba-HOWTO-Collection/InterdomainTrusts.xml
diff --git a/docs/howto/IntroSMB.xml b/docs/Samba-HOWTO-Collection/IntroSMB.xml
index 9e91d1f70d..9e91d1f70d 100644
--- a/docs/howto/IntroSMB.xml
+++ b/docs/Samba-HOWTO-Collection/IntroSMB.xml
diff --git a/docs/howto/NT4Migration.xml b/docs/Samba-HOWTO-Collection/NT4Migration.xml
index 2b34fa8b26..2b34fa8b26 100644
--- a/docs/howto/NT4Migration.xml
+++ b/docs/Samba-HOWTO-Collection/NT4Migration.xml
diff --git a/docs/howto/NetworkBrowsing.xml b/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml
index 1855fa1809..1855fa1809 100644
--- a/docs/howto/NetworkBrowsing.xml
+++ b/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml
diff --git a/docs/howto/Other-Clients.xml b/docs/Samba-HOWTO-Collection/Other-Clients.xml
index 3cfc02b068..3cfc02b068 100644
--- a/docs/howto/Other-Clients.xml
+++ b/docs/Samba-HOWTO-Collection/Other-Clients.xml
diff --git a/docs/howto/PAM.xml b/docs/Samba-HOWTO-Collection/PAM.xml
index 49ff65f25a..49ff65f25a 100644
--- a/docs/howto/PAM.xml
+++ b/docs/Samba-HOWTO-Collection/PAM.xml
diff --git a/docs/howto/PDC.xml b/docs/Samba-HOWTO-Collection/PDC.xml
index 4504c480b8..4504c480b8 100644
--- a/docs/howto/PDC.xml
+++ b/docs/Samba-HOWTO-Collection/PDC.xml
diff --git a/docs/howto/Passdb.xml b/docs/Samba-HOWTO-Collection/Passdb.xml
index aa3b7fd3c1..aa3b7fd3c1 100644
--- a/docs/howto/Passdb.xml
+++ b/docs/Samba-HOWTO-Collection/Passdb.xml
diff --git a/docs/howto/PolicyMgmt.xml b/docs/Samba-HOWTO-Collection/PolicyMgmt.xml
index 5134684678..5134684678 100644
--- a/docs/howto/PolicyMgmt.xml
+++ b/docs/Samba-HOWTO-Collection/PolicyMgmt.xml
diff --git a/docs/howto/Portability.xml b/docs/Samba-HOWTO-Collection/Portability.xml
index a4f7107e41..a4f7107e41 100644
--- a/docs/howto/Portability.xml
+++ b/docs/Samba-HOWTO-Collection/Portability.xml
diff --git a/docs/howto/Printing.xml b/docs/Samba-HOWTO-Collection/Printing.xml
index 9266712727..9266712727 100644
--- a/docs/howto/Printing.xml
+++ b/docs/Samba-HOWTO-Collection/Printing.xml
diff --git a/docs/howto/Problems.xml b/docs/Samba-HOWTO-Collection/Problems.xml
index 3bc50968ec..3bc50968ec 100644
--- a/docs/howto/Problems.xml
+++ b/docs/Samba-HOWTO-Collection/Problems.xml
diff --git a/docs/howto/ProfileMgmt.xml b/docs/Samba-HOWTO-Collection/ProfileMgmt.xml
index e1e45538ae..e1e45538ae 100644
--- a/docs/howto/ProfileMgmt.xml
+++ b/docs/Samba-HOWTO-Collection/ProfileMgmt.xml
diff --git a/docs/howto/SWAT.xml b/docs/Samba-HOWTO-Collection/SWAT.xml
index 6a67db2418..6a67db2418 100644
--- a/docs/howto/SWAT.xml
+++ b/docs/Samba-HOWTO-Collection/SWAT.xml
diff --git a/docs/howto/Securing.xml b/docs/Samba-HOWTO-Collection/Securing.xml
index 4a21699c61..4a21699c61 100644
--- a/docs/howto/Securing.xml
+++ b/docs/Samba-HOWTO-Collection/Securing.xml
diff --git a/docs/howto/ServerType.xml b/docs/Samba-HOWTO-Collection/ServerType.xml
index 6c89a792a6..6c89a792a6 100644
--- a/docs/howto/ServerType.xml
+++ b/docs/Samba-HOWTO-Collection/ServerType.xml
diff --git a/docs/howto/Speed.xml b/docs/Samba-HOWTO-Collection/Speed.xml
index 44956f6812..44956f6812 100644
--- a/docs/howto/Speed.xml
+++ b/docs/Samba-HOWTO-Collection/Speed.xml
diff --git a/docs/howto/StandAloneServer.xml b/docs/Samba-HOWTO-Collection/StandAloneServer.xml
index 99396d5b1c..99396d5b1c 100644
--- a/docs/howto/StandAloneServer.xml
+++ b/docs/Samba-HOWTO-Collection/StandAloneServer.xml
diff --git a/docs/howto/Unicode.xml b/docs/Samba-HOWTO-Collection/Unicode.xml
index 396703a705..396703a705 100644
--- a/docs/howto/Unicode.xml
+++ b/docs/Samba-HOWTO-Collection/Unicode.xml
diff --git a/docs/howto/VFS.xml b/docs/Samba-HOWTO-Collection/VFS.xml
index d73f55380a..d73f55380a 100644
--- a/docs/howto/VFS.xml
+++ b/docs/Samba-HOWTO-Collection/VFS.xml
diff --git a/docs/howto/Winbind.xml b/docs/Samba-HOWTO-Collection/Winbind.xml
index 2f3018f894..2f3018f894 100644
--- a/docs/howto/Winbind.xml
+++ b/docs/Samba-HOWTO-Collection/Winbind.xml
diff --git a/docs/howto/WindowsClientConfig.xml b/docs/Samba-HOWTO-Collection/WindowsClientConfig.xml
index ec431d2870..ec431d2870 100644
--- a/docs/howto/WindowsClientConfig.xml
+++ b/docs/Samba-HOWTO-Collection/WindowsClientConfig.xml
diff --git a/docs/howto/foreword-tridge.xml b/docs/Samba-HOWTO-Collection/foreword-tridge.xml
index f140d6bb09..f140d6bb09 100644
--- a/docs/howto/foreword-tridge.xml
+++ b/docs/Samba-HOWTO-Collection/foreword-tridge.xml
diff --git a/docs/howto/glossary.xml b/docs/Samba-HOWTO-Collection/glossary.xml
index 72c27a5dbf..72c27a5dbf 100644
--- a/docs/howto/glossary.xml
+++ b/docs/Samba-HOWTO-Collection/glossary.xml
diff --git a/docs/howto/imagefiles/.cvsignore b/docs/Samba-HOWTO-Collection/imagefiles/.cvsignore
index f7b5423899..f7b5423899 100644
--- a/docs/howto/imagefiles/.cvsignore
+++ b/docs/Samba-HOWTO-Collection/imagefiles/.cvsignore
diff --git a/docs/howto/imagefiles/10small.png b/docs/Samba-HOWTO-Collection/imagefiles/10small.png
index 56a9b0cd67..56a9b0cd67 100644
--- a/docs/howto/imagefiles/10small.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/10small.png
diff --git a/docs/howto/imagefiles/11small.png b/docs/Samba-HOWTO-Collection/imagefiles/11small.png
index 18f5d9e4dd..18f5d9e4dd 100644
--- a/docs/howto/imagefiles/11small.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/11small.png
diff --git a/docs/howto/imagefiles/12small.png b/docs/Samba-HOWTO-Collection/imagefiles/12small.png
index 5bdf809c1b..5bdf809c1b 100644
--- a/docs/howto/imagefiles/12small.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/12small.png
diff --git a/docs/howto/imagefiles/13small.png b/docs/Samba-HOWTO-Collection/imagefiles/13small.png
index 536b2fc2c2..536b2fc2c2 100644
--- a/docs/howto/imagefiles/13small.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/13small.png
diff --git a/docs/howto/imagefiles/14small.png b/docs/Samba-HOWTO-Collection/imagefiles/14small.png
index 89054249c0..89054249c0 100644
--- a/docs/howto/imagefiles/14small.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/14small.png
diff --git a/docs/howto/imagefiles/1small.png b/docs/Samba-HOWTO-Collection/imagefiles/1small.png
index c4905163c9..c4905163c9 100644
--- a/docs/howto/imagefiles/1small.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/1small.png
diff --git a/docs/howto/imagefiles/2small.png b/docs/Samba-HOWTO-Collection/imagefiles/2small.png
index 5fd9071349..5fd9071349 100644
--- a/docs/howto/imagefiles/2small.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/2small.png
diff --git a/docs/howto/imagefiles/3small.png b/docs/Samba-HOWTO-Collection/imagefiles/3small.png
index 22a39bae52..22a39bae52 100644
--- a/docs/howto/imagefiles/3small.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/3small.png
diff --git a/docs/howto/imagefiles/4small.png b/docs/Samba-HOWTO-Collection/imagefiles/4small.png
index 6b7f1b1fd4..6b7f1b1fd4 100644
--- a/docs/howto/imagefiles/4small.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/4small.png
diff --git a/docs/howto/imagefiles/5small.png b/docs/Samba-HOWTO-Collection/imagefiles/5small.png
index b23e1fc2c7..b23e1fc2c7 100644
--- a/docs/howto/imagefiles/5small.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/5small.png
diff --git a/docs/howto/imagefiles/6small.png b/docs/Samba-HOWTO-Collection/imagefiles/6small.png
index 35a646d826..35a646d826 100644
--- a/docs/howto/imagefiles/6small.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/6small.png
diff --git a/docs/howto/imagefiles/7small.png b/docs/Samba-HOWTO-Collection/imagefiles/7small.png
index d182677510..d182677510 100644
--- a/docs/howto/imagefiles/7small.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/7small.png
diff --git a/docs/howto/imagefiles/8small.png b/docs/Samba-HOWTO-Collection/imagefiles/8small.png
index 08aca66386..08aca66386 100644
--- a/docs/howto/imagefiles/8small.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/8small.png
diff --git a/docs/howto/imagefiles/9small.png b/docs/Samba-HOWTO-Collection/imagefiles/9small.png
index 90c2cde327..90c2cde327 100644
--- a/docs/howto/imagefiles/9small.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/9small.png
diff --git a/docs/howto/imagefiles/WME001.png b/docs/Samba-HOWTO-Collection/imagefiles/WME001.png
index c5db7570bc..c5db7570bc 100644
--- a/docs/howto/imagefiles/WME001.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/WME001.png
diff --git a/docs/howto/imagefiles/WME002.png b/docs/Samba-HOWTO-Collection/imagefiles/WME002.png
index 641f2179a0..641f2179a0 100644
--- a/docs/howto/imagefiles/WME002.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/WME002.png
diff --git a/docs/howto/imagefiles/WME003.png b/docs/Samba-HOWTO-Collection/imagefiles/WME003.png
index 073c58eddd..073c58eddd 100644
--- a/docs/howto/imagefiles/WME003.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/WME003.png
diff --git a/docs/howto/imagefiles/WME004.png b/docs/Samba-HOWTO-Collection/imagefiles/WME004.png
index 5053adeeec..5053adeeec 100644
--- a/docs/howto/imagefiles/WME004.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/WME004.png
diff --git a/docs/howto/imagefiles/WME005.png b/docs/Samba-HOWTO-Collection/imagefiles/WME005.png
index 5e4e72e498..5e4e72e498 100644
--- a/docs/howto/imagefiles/WME005.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/WME005.png
diff --git a/docs/howto/imagefiles/WME006.png b/docs/Samba-HOWTO-Collection/imagefiles/WME006.png
index cbd3183696..cbd3183696 100644
--- a/docs/howto/imagefiles/WME006.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/WME006.png
diff --git a/docs/howto/imagefiles/WME007.png b/docs/Samba-HOWTO-Collection/imagefiles/WME007.png
index e0a113b080..e0a113b080 100644
--- a/docs/howto/imagefiles/WME007.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/WME007.png
diff --git a/docs/howto/imagefiles/WME008.png b/docs/Samba-HOWTO-Collection/imagefiles/WME008.png
index b03a7853b4..b03a7853b4 100644
--- a/docs/howto/imagefiles/WME008.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/WME008.png
diff --git a/docs/howto/imagefiles/WME009.png b/docs/Samba-HOWTO-Collection/imagefiles/WME009.png
index f851876cee..f851876cee 100644
--- a/docs/howto/imagefiles/WME009.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/WME009.png
diff --git a/docs/howto/imagefiles/WME010.png b/docs/Samba-HOWTO-Collection/imagefiles/WME010.png
index 589be02b22..589be02b22 100644
--- a/docs/howto/imagefiles/WME010.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/WME010.png
diff --git a/docs/howto/imagefiles/WME011.png b/docs/Samba-HOWTO-Collection/imagefiles/WME011.png
index f15399b4a2..f15399b4a2 100644
--- a/docs/howto/imagefiles/WME011.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/WME011.png
diff --git a/docs/howto/imagefiles/WME012.png b/docs/Samba-HOWTO-Collection/imagefiles/WME012.png
index d2e46212f6..d2e46212f6 100644
--- a/docs/howto/imagefiles/WME012.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/WME012.png
diff --git a/docs/howto/imagefiles/WME013.png b/docs/Samba-HOWTO-Collection/imagefiles/WME013.png
index 0f0a70d062..0f0a70d062 100644
--- a/docs/howto/imagefiles/WME013.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/WME013.png
diff --git a/docs/howto/imagefiles/WME014.png b/docs/Samba-HOWTO-Collection/imagefiles/WME014.png
index 73f1dde37c..73f1dde37c 100644
--- a/docs/howto/imagefiles/WME014.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/WME014.png
diff --git a/docs/howto/imagefiles/WXPP002.png b/docs/Samba-HOWTO-Collection/imagefiles/WXPP002.png
index b87001bca4..b87001bca4 100644
--- a/docs/howto/imagefiles/WXPP002.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/WXPP002.png
diff --git a/docs/howto/imagefiles/WXPP003.png b/docs/Samba-HOWTO-Collection/imagefiles/WXPP003.png
index a60d6c413a..a60d6c413a 100644
--- a/docs/howto/imagefiles/WXPP003.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/WXPP003.png
diff --git a/docs/howto/imagefiles/WXPP005.png b/docs/Samba-HOWTO-Collection/imagefiles/WXPP005.png
index 4aa091767b..4aa091767b 100644
--- a/docs/howto/imagefiles/WXPP005.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/WXPP005.png
diff --git a/docs/howto/imagefiles/WXPP009.png b/docs/Samba-HOWTO-Collection/imagefiles/WXPP009.png
index b540e238b8..b540e238b8 100644
--- a/docs/howto/imagefiles/WXPP009.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/WXPP009.png
diff --git a/docs/howto/imagefiles/WXPP014.png b/docs/Samba-HOWTO-Collection/imagefiles/WXPP014.png
index f1e02d3ce3..f1e02d3ce3 100644
--- a/docs/howto/imagefiles/WXPP014.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/WXPP014.png
diff --git a/docs/howto/imagefiles/a_small.png b/docs/Samba-HOWTO-Collection/imagefiles/a_small.png
index a6622ef6cf..a6622ef6cf 100644
--- a/docs/howto/imagefiles/a_small.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/a_small.png
diff --git a/docs/howto/imagefiles/access1.dia b/docs/Samba-HOWTO-Collection/imagefiles/access1.dia
index 7fd2673800..7fd2673800 100644
--- a/docs/howto/imagefiles/access1.dia
+++ b/docs/Samba-HOWTO-Collection/imagefiles/access1.dia
diff --git a/docs/howto/imagefiles/access1.png b/docs/Samba-HOWTO-Collection/imagefiles/access1.png
index 0d070a6109..0d070a6109 100644
--- a/docs/howto/imagefiles/access1.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/access1.png
diff --git a/docs/howto/imagefiles/browsing1 b/docs/Samba-HOWTO-Collection/imagefiles/browsing1
index 8235df45f6..8235df45f6 100644
--- a/docs/howto/imagefiles/browsing1
+++ b/docs/Samba-HOWTO-Collection/imagefiles/browsing1
diff --git a/docs/howto/imagefiles/browsing1.png b/docs/Samba-HOWTO-Collection/imagefiles/browsing1.png
index bfe76dcb63..bfe76dcb63 100644
--- a/docs/howto/imagefiles/browsing1.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/browsing1.png
diff --git a/docs/howto/imagefiles/cups1.dia b/docs/Samba-HOWTO-Collection/imagefiles/cups1.dia
index e4cd3b1239..e4cd3b1239 100644
--- a/docs/howto/imagefiles/cups1.dia
+++ b/docs/Samba-HOWTO-Collection/imagefiles/cups1.dia
diff --git a/docs/howto/imagefiles/cups1.png b/docs/Samba-HOWTO-Collection/imagefiles/cups1.png
index cbe646a5fa..cbe646a5fa 100644
--- a/docs/howto/imagefiles/cups1.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/cups1.png
diff --git a/docs/howto/imagefiles/cups2.dia b/docs/Samba-HOWTO-Collection/imagefiles/cups2.dia
index 9dfb60f335..9dfb60f335 100644
--- a/docs/howto/imagefiles/cups2.dia
+++ b/docs/Samba-HOWTO-Collection/imagefiles/cups2.dia
diff --git a/docs/howto/imagefiles/cups2.png b/docs/Samba-HOWTO-Collection/imagefiles/cups2.png
index d0713c07ca..d0713c07ca 100644
--- a/docs/howto/imagefiles/cups2.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/cups2.png
diff --git a/docs/howto/imagefiles/domain.dia b/docs/Samba-HOWTO-Collection/imagefiles/domain.dia
index a994d423e2..a994d423e2 100644
--- a/docs/howto/imagefiles/domain.dia
+++ b/docs/Samba-HOWTO-Collection/imagefiles/domain.dia
diff --git a/docs/howto/imagefiles/domain.png b/docs/Samba-HOWTO-Collection/imagefiles/domain.png
index 82d299b086..82d299b086 100644
--- a/docs/howto/imagefiles/domain.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/domain.png
diff --git a/docs/howto/imagefiles/ethereal1.png b/docs/Samba-HOWTO-Collection/imagefiles/ethereal1.png
index c8655389d0..c8655389d0 100644
--- a/docs/howto/imagefiles/ethereal1.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/ethereal1.png
diff --git a/docs/howto/imagefiles/ethereal2.png b/docs/Samba-HOWTO-Collection/imagefiles/ethereal2.png
index f366772d3b..f366772d3b 100644
--- a/docs/howto/imagefiles/ethereal2.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/ethereal2.png
diff --git a/docs/howto/imagefiles/idmap-gid2sid.dia b/docs/Samba-HOWTO-Collection/imagefiles/idmap-gid2sid.dia
index b3b1d88c50..b3b1d88c50 100644
--- a/docs/howto/imagefiles/idmap-gid2sid.dia
+++ b/docs/Samba-HOWTO-Collection/imagefiles/idmap-gid2sid.dia
diff --git a/docs/howto/imagefiles/idmap-gid2sid.png b/docs/Samba-HOWTO-Collection/imagefiles/idmap-gid2sid.png
index b8cf5d2257..b8cf5d2257 100644
--- a/docs/howto/imagefiles/idmap-gid2sid.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/idmap-gid2sid.png
diff --git a/docs/howto/imagefiles/idmap-groups.dia b/docs/Samba-HOWTO-Collection/imagefiles/idmap-groups.dia
index 04da158c53..04da158c53 100644
--- a/docs/howto/imagefiles/idmap-groups.dia
+++ b/docs/Samba-HOWTO-Collection/imagefiles/idmap-groups.dia
diff --git a/docs/howto/imagefiles/idmap-groups.png b/docs/Samba-HOWTO-Collection/imagefiles/idmap-groups.png
index e5c214574f..e5c214574f 100644
--- a/docs/howto/imagefiles/idmap-groups.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/idmap-groups.png
diff --git a/docs/howto/imagefiles/idmap-sid2gid.dia b/docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2gid.dia
index e6e5107698..e6e5107698 100644
--- a/docs/howto/imagefiles/idmap-sid2gid.dia
+++ b/docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2gid.dia
diff --git a/docs/howto/imagefiles/idmap-sid2gid.png b/docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2gid.png
index daadfc1f90..daadfc1f90 100644
--- a/docs/howto/imagefiles/idmap-sid2gid.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2gid.png
diff --git a/docs/howto/imagefiles/idmap-sid2uid.dia b/docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2uid.dia
index 91e00530a6..91e00530a6 100644
--- a/docs/howto/imagefiles/idmap-sid2uid.dia
+++ b/docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2uid.dia
diff --git a/docs/howto/imagefiles/idmap-sid2uid.png b/docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2uid.png
index 3acc07bd11..3acc07bd11 100644
--- a/docs/howto/imagefiles/idmap-sid2uid.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2uid.png
diff --git a/docs/howto/imagefiles/idmap-store-gid2sid.dia b/docs/Samba-HOWTO-Collection/imagefiles/idmap-store-gid2sid.dia
index 957613b6f3..957613b6f3 100644
--- a/docs/howto/imagefiles/idmap-store-gid2sid.dia
+++ b/docs/Samba-HOWTO-Collection/imagefiles/idmap-store-gid2sid.dia
diff --git a/docs/howto/imagefiles/idmap-store-gid2sid.png b/docs/Samba-HOWTO-Collection/imagefiles/idmap-store-gid2sid.png
index 911c996329..911c996329 100644
--- a/docs/howto/imagefiles/idmap-store-gid2sid.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/idmap-store-gid2sid.png
diff --git a/docs/howto/imagefiles/idmap-uid2sid.dia b/docs/Samba-HOWTO-Collection/imagefiles/idmap-uid2sid.dia
index de6ccaacb3..de6ccaacb3 100644
--- a/docs/howto/imagefiles/idmap-uid2sid.dia
+++ b/docs/Samba-HOWTO-Collection/imagefiles/idmap-uid2sid.dia
diff --git a/docs/howto/imagefiles/idmap-uid2sid.png b/docs/Samba-HOWTO-Collection/imagefiles/idmap-uid2sid.png
index f30c632500..f30c632500 100644
--- a/docs/howto/imagefiles/idmap-uid2sid.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/idmap-uid2sid.png
diff --git a/docs/howto/imagefiles/idmap.dia b/docs/Samba-HOWTO-Collection/imagefiles/idmap.dia
index 555933978b..555933978b 100644
--- a/docs/howto/imagefiles/idmap.dia
+++ b/docs/Samba-HOWTO-Collection/imagefiles/idmap.dia
diff --git a/docs/howto/imagefiles/idmap.png b/docs/Samba-HOWTO-Collection/imagefiles/idmap.png
index b090ced632..b090ced632 100644
--- a/docs/howto/imagefiles/idmap.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/idmap.png
diff --git a/docs/howto/imagefiles/idmap_winbind_no_loop.png b/docs/Samba-HOWTO-Collection/imagefiles/idmap_winbind_no_loop.png
index 5393f6a192..5393f6a192 100644
--- a/docs/howto/imagefiles/idmap_winbind_no_loop.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/idmap_winbind_no_loop.png
diff --git a/docs/howto/imagefiles/pdftoepsonusb.dia b/docs/Samba-HOWTO-Collection/imagefiles/pdftoepsonusb.dia
index 2f846ee8d4..2f846ee8d4 100644
--- a/docs/howto/imagefiles/pdftoepsonusb.dia
+++ b/docs/Samba-HOWTO-Collection/imagefiles/pdftoepsonusb.dia
diff --git a/docs/howto/imagefiles/pdftoepsonusb.png b/docs/Samba-HOWTO-Collection/imagefiles/pdftoepsonusb.png
index b80efe9f16..b80efe9f16 100644
--- a/docs/howto/imagefiles/pdftoepsonusb.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/pdftoepsonusb.png
diff --git a/docs/howto/imagefiles/pdftosocket.dia b/docs/Samba-HOWTO-Collection/imagefiles/pdftosocket.dia
index 53b6b7117c..53b6b7117c 100644
--- a/docs/howto/imagefiles/pdftosocket.dia
+++ b/docs/Samba-HOWTO-Collection/imagefiles/pdftosocket.dia
diff --git a/docs/howto/imagefiles/pdftosocket.png b/docs/Samba-HOWTO-Collection/imagefiles/pdftosocket.png
index ea4a9dae93..ea4a9dae93 100644
--- a/docs/howto/imagefiles/pdftosocket.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/pdftosocket.png
diff --git a/docs/howto/imagefiles/trusts1.dia b/docs/Samba-HOWTO-Collection/imagefiles/trusts1.dia
index 95cbbaa42f..95cbbaa42f 100644
--- a/docs/howto/imagefiles/trusts1.dia
+++ b/docs/Samba-HOWTO-Collection/imagefiles/trusts1.dia
diff --git a/docs/howto/imagefiles/trusts1.png b/docs/Samba-HOWTO-Collection/imagefiles/trusts1.png
index 72aa60d4cc..72aa60d4cc 100644
--- a/docs/howto/imagefiles/trusts1.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/trusts1.png
diff --git a/docs/howto/imagefiles/w2kp001.png b/docs/Samba-HOWTO-Collection/imagefiles/w2kp001.png
index 43adf23463..43adf23463 100644
--- a/docs/howto/imagefiles/w2kp001.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/w2kp001.png
diff --git a/docs/howto/imagefiles/w2kp002.png b/docs/Samba-HOWTO-Collection/imagefiles/w2kp002.png
index 13bb029f53..13bb029f53 100644
--- a/docs/howto/imagefiles/w2kp002.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/w2kp002.png
diff --git a/docs/howto/imagefiles/w2kp003.png b/docs/Samba-HOWTO-Collection/imagefiles/w2kp003.png
index c7b779900e..c7b779900e 100644
--- a/docs/howto/imagefiles/w2kp003.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/w2kp003.png
diff --git a/docs/howto/imagefiles/w2kp004.png b/docs/Samba-HOWTO-Collection/imagefiles/w2kp004.png
index d0e005a36e..d0e005a36e 100644
--- a/docs/howto/imagefiles/w2kp004.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/w2kp004.png
diff --git a/docs/howto/imagefiles/w2kp005.png b/docs/Samba-HOWTO-Collection/imagefiles/w2kp005.png
index a729b40cd7..a729b40cd7 100644
--- a/docs/howto/imagefiles/w2kp005.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/w2kp005.png
diff --git a/docs/howto/imagefiles/w2kp006.png b/docs/Samba-HOWTO-Collection/imagefiles/w2kp006.png
index ea96db055a..ea96db055a 100644
--- a/docs/howto/imagefiles/w2kp006.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/w2kp006.png
diff --git a/docs/howto/imagefiles/wxpp001.png b/docs/Samba-HOWTO-Collection/imagefiles/wxpp001.png
index 2e689a17e2..2e689a17e2 100644
--- a/docs/howto/imagefiles/wxpp001.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/wxpp001.png
diff --git a/docs/howto/imagefiles/wxpp004.png b/docs/Samba-HOWTO-Collection/imagefiles/wxpp004.png
index 656f67942e..656f67942e 100644
--- a/docs/howto/imagefiles/wxpp004.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/wxpp004.png
diff --git a/docs/howto/imagefiles/wxpp006.png b/docs/Samba-HOWTO-Collection/imagefiles/wxpp006.png
index a20b3ed583..a20b3ed583 100644
--- a/docs/howto/imagefiles/wxpp006.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/wxpp006.png
diff --git a/docs/howto/imagefiles/wxpp007.png b/docs/Samba-HOWTO-Collection/imagefiles/wxpp007.png
index cf41352220..cf41352220 100644
--- a/docs/howto/imagefiles/wxpp007.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/wxpp007.png
diff --git a/docs/howto/imagefiles/wxpp008.png b/docs/Samba-HOWTO-Collection/imagefiles/wxpp008.png
index 9958c7c873..9958c7c873 100644
--- a/docs/howto/imagefiles/wxpp008.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/wxpp008.png
diff --git a/docs/howto/imagefiles/wxpp010.png b/docs/Samba-HOWTO-Collection/imagefiles/wxpp010.png
index 068a0dfc73..068a0dfc73 100644
--- a/docs/howto/imagefiles/wxpp010.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/wxpp010.png
diff --git a/docs/howto/imagefiles/wxpp011.png b/docs/Samba-HOWTO-Collection/imagefiles/wxpp011.png
index 0cf88c04a6..0cf88c04a6 100644
--- a/docs/howto/imagefiles/wxpp011.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/wxpp011.png
diff --git a/docs/howto/imagefiles/wxpp012.png b/docs/Samba-HOWTO-Collection/imagefiles/wxpp012.png
index d89f3b5d31..d89f3b5d31 100644
--- a/docs/howto/imagefiles/wxpp012.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/wxpp012.png
diff --git a/docs/howto/imagefiles/wxpp013.png b/docs/Samba-HOWTO-Collection/imagefiles/wxpp013.png
index 451240ee38..451240ee38 100644
--- a/docs/howto/imagefiles/wxpp013.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/wxpp013.png
diff --git a/docs/howto/imagefiles/wxpp015.png b/docs/Samba-HOWTO-Collection/imagefiles/wxpp015.png
index 12fe2f31b2..12fe2f31b2 100644
--- a/docs/howto/imagefiles/wxpp015.png
+++ b/docs/Samba-HOWTO-Collection/imagefiles/wxpp015.png
diff --git a/docs/howto/index.xml b/docs/Samba-HOWTO-Collection/index.xml
index 5bdc64d702..a04e692ccd 100644
--- a/docs/howto/index.xml
+++ b/docs/Samba-HOWTO-Collection/index.xml
@@ -20,12 +20,7 @@
 
 <?latex \setcounter{page}{5} ?>
 
-<preface>
-	<title>Attribution</title>
-	<para>
-		<xi:include href="attributions.xml"/>
-	</para>
-</preface>
+<xi:include href="../Samba-HOWTO-Collection-attributions.xml"/>
 
 <?latex \cleardoublepage ?>
 
diff --git a/docs/howto/locking.xml b/docs/Samba-HOWTO-Collection/locking.xml
index 555efd37a8..555efd37a8 100644
--- a/docs/howto/locking.xml
+++ b/docs/Samba-HOWTO-Collection/locking.xml
diff --git a/docs/howto/msdfs.xml b/docs/Samba-HOWTO-Collection/msdfs.xml
index e4a83b787a..e4a83b787a 100644
--- a/docs/howto/msdfs.xml
+++ b/docs/Samba-HOWTO-Collection/msdfs.xml
diff --git a/docs/howto/upgrading-to-3.0.xml b/docs/Samba-HOWTO-Collection/upgrading-to-3.0.xml
index 8c8b023981..8c8b023981 100644
--- a/docs/howto/upgrading-to-3.0.xml
+++ b/docs/Samba-HOWTO-Collection/upgrading-to-3.0.xml
diff --git a/docs/htmldocs.html b/docs/htmldocs.html
index 8c15af35bc..9f6eef673b 100644
--- a/docs/htmldocs.html
+++ b/docs/htmldocs.html
@@ -11,15 +11,15 @@
 </div>
 <hr>
 <table>
- <td valign="top">SAMBA <a href="devel/index.html">Developers</a> Guide</td>
+ <td valign="top">SAMBA <a href="Samba-Developers-Guide/index.html">Developers</a> Guide</td>
  <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="guide/index.html">Examples</a></td>
+<td valign="top">Samba-3 by <a href="Samba-Guide/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="howto/index.html">HOWTO</a> and Reference Guide</td>
+ <td valign="top">The Official Samba-3 <a href="Samba-HOWTO-Collection/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/xslt/expand-sambadoc.xsl b/docs/xslt/expand-sambadoc.xsl
index dfdc240180..8d132a9935 100644
--- a/docs/xslt/expand-sambadoc.xsl
+++ b/docs/xslt/expand-sambadoc.xsl
@@ -239,7 +239,7 @@
 					<xsl:attribute name="role"><xsl:text>latex</xsl:text></xsl:attribute>
 					<xsl:element name="imagedata">
 						<xsl:attribute name="fileref">
-							<xsl:text>howto/imagefiles/</xsl:text><xsl:value-of select="imagefile"/></xsl:attribute>
+							<xsl:value-of select="$imagedir"/><xsl:value-of select="imagefile"/></xsl:attribute>
 						<xsl:attribute name="scale">
 							<xsl:choose>
 								<xsl:when test="@scale != ''">
diff --git a/docs/xslt/generate-attributions.xsl b/docs/xslt/generate-attributions.xsl
index dd9af2a2f3..fa34f3bbe2 100644
--- a/docs/xslt/generate-attributions.xsl
+++ b/docs/xslt/generate-attributions.xsl
@@ -13,6 +13,15 @@
    <xsl:apply-templates select="@*|node()"/>
 </xsl:template>
 
+<xsl:template match="/">
+	<xsl:element name="preface">
+		<xsl:element name="title"><xsl:text>Attribution</xsl:text></xsl:element>
+		<xsl:element name="para">
+			<xsl:apply-templates/>
+		</xsl:element>
+	</xsl:element>
+</xsl:template>
+
 <xsl:template match="chapter">
 	<xsl:choose>
 		<xsl:when test="chapterinfo/author != ''">
diff --git a/docs/xslt/latex.xsl b/docs/xslt/latex.xsl
index 8cc6b0d546..f969f86ae2 100644
--- a/docs/xslt/latex.xsl
+++ b/docs/xslt/latex.xsl
@@ -12,7 +12,7 @@
 <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="latex.admonition.path">xslt/figures</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>
 <xsl:variable name="latex.use.fancyhdr"></xsl:variable>