New structure for the docs:

- Same name for a doc everywhere (howto -> Samba-HOWTO-Collection, etc)
 - Shorter and more clearly structured Makefile
 - Make it possible to change the paths for the images
(This used to be commit 96f6c05f25)

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_PLUCKER = $(patsubst $(MANPAGEDIR)/%.xml,$(PLUCKERDIR)/%.pdb,$(MANPAGES_SOURCES))
-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
 
-HOWTODIR_IMAGES_PNG = $(wildcard $(IMAGEPROJDIR)/*.png)
+Samba_HOWTO_Collection_IMAGES_PNG = $(wildcard Samba-HOWTO-Collection/imagefiles/*.png)
-GUIDEDOC_IMAGES_PNG = $(wildcard $(IMAGEGUIDEDIR)/*.png)
+Samba_Guide_IMAGES_PNG = $(wildcard Samba-Guide/images/*.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 
+Samba_HOWTO_Collection_IMAGEDIR = Samba-HOWTO-Collection/imagefiles
-DEVDOCDIR_DEPS = $(DEVDOCDIR)/*.xml $(DEVDOCDIR)/attributions.xml
+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 " release - Build the docs needed for a Samba release"
-	@echo "pdf - Build PDF version of book"
+	@echo " all - Build all docs that can be build using the utilities found by configure"
-	@echo "tex - Build Latex version of book"
+	@echo " everything - Build all of the above"
-	@echo "dvi - Build Device Independant File of book"
+	@echo " pdf,tex,dvi,ps,manpages,txt,pearson,fo,htmlhelp - Build specific output format"
-	@echo "ps - Build PostScript version of book"
+	@echo " html - Build multi-file HTML version of HOWTO Collection, Guide and Dev-Guide"
-	@echo "manpages - Build manpages"
+	@echo " html-single - Build single-file HTML version of HOWTO Collection, Guide and Dev-Guide"
-	@echo "txt - Build plain text version of HOWTO Collection and Developers Guide"
+	@echo " htmlman - Build HTML version of manpages"
-	@echo -n "html-single - Build single file HTML version of HOWTO Collection"
+	@echo " undocumented - Output list of undocumented smb.conf options"
-	@echo " and developers guide"
+	@echo " samples - Extract examples"
-	@echo "html - Build HTML version of HOWTO Collection and Developers Guide"
+	@echo " files - Extract other files"
-	@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"
 
+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 fo htmlhelp pearson verify
-everything: manpages pdf html-single html htmlman txt ps
-
 release: manpages htmlman html pdf guide
 
-# Global rules
+# 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))
 
-pdf: $(PDFDIR) $(PDFDIR)/Samba-HOWTO-Collection.pdf $(PDFDIR)/Samba-Developers-Guide.pdf
+# Intermediate docbook docs
 
-dvi: $(DVIDIR) $(DVIDIR)/Samba-HOWTO-Collection.dvi $(DVIDIR)/Samba-Developers-Guide.dvi
+$(DOCBOOKDIR):
+	mkdir $@
 
-ps: $(PSDIR) $(PSDIR)/Samba-HOWTO-Collection.ps $(PSDIR)/Samba-Developers-Guide.ps
+$(DOCBOOKDIR)/%.xml: %/index.xml $(DOCBOOKDIR) xslt/expand-sambadoc.xsl
+	$(XSLTPROC) --stringparam noreference 1 --stringparam imagedir "$($(subst -,_,$*)_IMAGEDIR)/" --xinclude --output $@ xslt/expand-sambadoc.xsl $<
 
-txt: $(TXTDIR) $(TXTDIR)/Samba-HOWTO-Collection.txt $(TXTDIR)/Samba-Developers-Guide.txt
+$(DOCBOOKDIR)/%.xml: $(MANPAGEDIR)/%.xml $(DOCBOOKDIR) xslt/expand-sambadoc.xsl
+	$(XSLTPROC) --stringparam noreference 1 --output $@ xslt/expand-sambadoc.xsl $<
 
-fo: $(FODIR) $(FODIR)/Samba-HOWTO-Collection.fo $(FODIR)/Samba-Developers-Guide.fo
+manpages.xml: $(MANPAGES_SOURCES) xslt/manpage-summary.xsl
-
-htmlman: $(HTMLDIR) $(MANPAGES_HTML) $(HTMLDIR)/samba.css
-
-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/
-
-html: $(HTMLDIR)/howto $(HTMLDIR)/guide $(HTMLDIR)/devel $(HTMLDIR)/index.html
-
-htmlhelp: $(HTMLHELPDIR)/Samba-HOWTO-Collection $(HTMLHELPDIR)/Samba-Developers-Guide $(HTMLHELPDIR)/Samba-Guide
-
-$(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
+# HTML docs
 
-plucker: html-single htmlman $(PLUCKERDIR) $(MANPAGES_PLUCKER) $(PLUCKERDIR)/Samba-Developers-Guide.pdb $(PLUCKERDIR)/Samba-HOWTO-Collection.pdb
+$(HTMLDIR)/index.html: htmldocs.html $(HTMLDIR)
+	cp $< $@
+	
+$(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
 
-Samba-HOWTO-Collection.xml: $(HOWTODIR)/index.xml $(HOWTODIR_DEPS)
+# Single large HTML files
-	$(XSLTPROC) --stringparam noreference 1 --xinclude --output $@ xslt/expand-sambadoc.xsl $<
+$(HTMLDIR):
+	mkdir $(HTMLDIR)
+	mkdir $(HTMLDIR)/images
 
-Samba-Guide.xml: $(GUIDEDOC)/guide-main.xml
+$(OUTPUTDIR)/%/samba.css: xslt/html/samba.css
-	$(XSLTPROC) --stringparam noreference 1 --xinclude --output $@ xslt/expand-sambadoc.xsl $<
+	cp $< $@
 
-Samba-Developers-Guide.xml: $(DEVDOCDIR)/index.xml $(DEVDOCDIR_DEPS)
+$(HTMLDIR)/%.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR) $(HTMLDIR)/samba.css $(patsubst %.png,$(HTMLDIR)/images/%.png,$(%_IMAGES_PNG)) xslt/html.xsl
-	$(XSLTPROC) --stringparam noreference 1 --xinclude --output $@ xslt/expand-sambadoc.xsl $<
+	echo $^
+	$(XSLTPROC) --output $@ xslt/html.xsl $<
 
-%/attributions.xml: %/index.xml
+$(patsubst $(DOCBOOKDIR)/%.xml,$(HTMLDIR)/%,$(MAIN_DOCS)): $(HTMLDIR)
-	@echo "<empty/>" > $@ # Make sure we don't get recursive dependencies, etc!
+	-mkdir $@
-	$(XSLTPROC) --output $@ xslt/generate-attributions.xsl $<
+
+%-attributions.xml: 
+	echo "<para/>" > $@
+	$(XSLTPROC) --xinclude xslt/generate-attributions.xsl $*/index.xml > $@
 
 clean: 
-	rm -rf $(OUTPUTDIR)/*
+	rm -rf $(OUTPUTDIR)/* $(DOCBOOKDIR)
-	rm -f *.xml $(MANPAGES) $(TXTDIR)/*.txt $(PSDIR)/*.ps \
+	rm -f *.xml
-	    $(PDFDIR)/*.pdf $(HTMLDIR)/*html $(HTMLDIR)/samba.css
 	rm -f xslt/figures/*pdf
-	rm -f $(SMBDOTCONFDOC)/parameters.*.xml $(DVIDIR)/*.dvi
+	rm -f $(SMBDOTCONFDOC)/parameters.*.xml
-	rm -f samba-doc.* index.* $(HOWTODIR)/changelog.xml $(HOWTODIR)/attributions.xml $(DEVDOCDIR)/attributions.xml
+	rm -f $(patsubst $(DOCBOOKDIR)/%.xml,%.*,$(MAIN_DOCS))
-	rm -f Samba-HOWTO-Collection.*
-	rm -f Samba-Developers-Guide.*
-	rm -f Samba-Guide.*
-	rm -f $(IMAGEPROJDIR)/*.eps
 
 # 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,$<) $@
+	mv $*.pdf $@
-
-epsimages: $(HOWTODIR_IMAGES_EPS)
 
 # 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: 
+$(HTMLHELPDIR)/%/images/%.png: $(%_IMAGEDIR)/%.png
-	-mkdir -p $@
+	cp $< $@
-	cp -p $(HOWTODIR_IMAGES_PNG) $@
 
-$(HTMLHELPDIR)/Samba-Guide/images:
+$(HTMLHELPDIR)/%/images: $(HTMLHELPDIR)/%
-	-mkdir -p $@
+	mkdir -p $@
-	cp -p $(GUIDEDOC_IMAGES_PNG) $@
 
-$(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 $<
+	$(XSLTPROC) --stringparam htmlhelp.chm $*.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
 
+# Plucker docs
 $(PLUCKERDIR):
 	mkdir $(PLUCKERDIR)
 
-%/samba.css: xslt/html/samba.css
+$(PLUCKERDIR)/%.pdb: $(HTMLDIR)/%.html $(PLUCKERDIR)
-	if [ ! -d `dirname $@` ]; then mkdir -p `dirname $@`; fi
+	$(PLUCKERBUILD) -v -M1 --stayonhost  --noimages --zlib-compression -H file:$< -f $* -p $(PLUCKERDIR)
-	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 $<
 
 # Manpages
 $(MANPAGEDIR)/smb.conf.5.xml: $(SMBDOTCONFDOC)/parameters.all.xml $(SMBDOTCONFDOC)/parameters.service.xml $(SMBDOTCONFDOC)/parameters.global.xml
 
-$(SMBDOTCONF)/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
-	@cd $(SMBDOTCONFDOC) && /bin/sh generate-file-list.sh >parameters.all.xml
+	$(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
+# Validation verification
-pearson-verify: $(PEARSONDIR)/Samba-HOWTO-Collection.report.html
 
 $(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
+samples: $(DOCBOOKDIR)/Samba-HOWTO-Collection.xml $(EXAMPLESDIR) xslt/extract-examples.xsl scripts/indent-smb.conf.pl
-	$(XSLTPROC) xslt/extract-examples.xsl Samba-HOWTO-Collection.xml > /dev/null 2> examples/README
+	$(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
+# Archiving
-guide: $(PDFDIR)/Samba-Guide.pdf
-
-%/changelog.xml: % $(wildcard %/CVS/*)
-	touch $@
-	# FIXME
 
 $(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:

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;
+key:     &lt;string&gt;
-value:   &lt;12-digit timeout&bt;/&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>

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>
+<xi:include href="../Samba-Developers-Guide-attributions.xml"/>
-	<title>Attributions</title>
-
-	<xi:include href="attributions.xml"/>
-</preface>
-	
 
 <!-- Contents -->
 <toc/>

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">
+		<image id="pktcap01">
-	<title>Windows Me &smbmdash; Broadcasts &smbmdash; The First 10 Minutes</title>
+			<imagefile scale="53">WINREPRESSME-Capture.png</imagefile>
-	<mediaobject>
+			<description>Windows Me &smbmdash; Broadcasts &smbmdash; The First 10 Minutes</description>
-		<imageobject role="latex">
+		</image>
-			<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">
+		<image id="pktcap02">
-	<title>Windows Me &smbmdash; Later Broadcast Sample</title>
+			<description>Windows Me &smbmdash; Later Broadcast Sample</description>
-	<mediaobject>
+			<imagefile scale="57">WINREPRESSME-Capture2.png</imagefile>
-		<imageobject role="latex">
+		</image>
-			<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>
 
 	  <para><indexterm>
 	      <primary>Local Master Browser</primary>
@@ -614,17 +600,10 @@
 
 		</sect3>
 
-<figure id="hostannounce">
+		<image id="hostannounce">
-        <title>Typical Windows 9x/Me Host Announcement</title>
+			<description>Typical Windows 9x/Me Host Announcement</description>
-        <mediaobject>
+			<imagefile scale="55">HostAnnouncment.png</imagefile>
-                <imageobject role="latex">
+		</image>
-                        <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>
 
 	</sect2>
 
@@ -745,17 +724,11 @@
 		<link linkend="nullconnect"/>.
 		</para>
 
-<figure id="nullconnect">
+		<image id="nullconnect">
-        <title>Typical Windows 9x/Me NULL SessionSetUp AndX Request</title>
+			<description>Typical Windows 9x/Me NULL SessionSetUp AndX Request</description>
-        <mediaobject>
+
-                <imageobject role="latex">
+			<imagefile scale="65">NullConnect.png</imagefile>
-                        <imagedata fileref="guide/images/NullConnect.png" scale="65" scalefit="1"/>
+		</image>
-                </imageobject>
-                <imageobject>
-                        <imagedata fileref="guide/images/NullConnect.png" scale="65" scalefit="1"/>
-                </imageobject>
-        </mediaobject>
-</figure>
 
 		<para>
 	    	<indexterm><primary>nobody</primary></indexterm>
@@ -769,17 +742,10 @@
 		is shown in <link linkend="userconnect"/>.
 		</para>
 
-<figure id="userconnect">
+		<image id="userconnect">
-        <title>Typical Windows 9x/Me User SessionSetUp AndX Request</title>
+			<description>Typical Windows 9x/Me User SessionSetUp AndX Request</description>
-        <mediaobject>
+			<imagefile scale="65">UserConnect.png</imagefile>
-                <imageobject role="latex">
+		</image>
-                        <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>
 
 	 	<para>
 		<indexterm><primary>encrypted</primary></indexterm>
@@ -931,29 +897,15 @@
 
 	</procedure>
 
-<figure id="XPCap01">
+	<image id="XPCap01">
-        <title>Typical Windows XP NULL Session Setup AndX Request</title>
+        <description>Typical Windows XP NULL Session Setup AndX Request</description>
-        <mediaobject>
+		<imagefile scale="70">WindowsXP-NullConnection.png</imagefile>
-                <imageobject role="latex">
+	</image>
-                        <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">
+	<image id="XPCap02">
-        <title>Typical Windows XP User Session Setup AndX Request</title>
+        <description>Typical Windows XP User Session Setup AndX Request</description>
-        <mediaobject>
+		<imagefile scale="70">WindowsXP-UserConnection.png</imagefile>
-                <imageobject role="latex">
+	</image>
-                        <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>
 
 		<sect3>
 		<title>Discussion</title>

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">
+		<image id="charitynet">
-	<title>Charity Administration Office Network</title>
+			<description>Charity Administration Office Network</description>
-	<mediaobject>
+			<imagefile scale="100">Charity-Network.png</imagefile>
-		<imageobject role="latex">
+		</image>
-			<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>
 
 		<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">
+		<image id="acctingnet2">
-			<title>Accounting Office Network Topology</title>
+			<description>Accounting Office Network Topology</description>
-			<mediaobject>
+			<imagefile scale="100">AccountingNetwork.png</imagefile>
-				<imageobject role="latex">
+		</image>
-					<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>
 
 		<table id="acctingnet">
 			<title>Accounting Office Network Information</title>

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">
+	<image id="acct2net">
-	<title>Abmas Accounting &smbmdash; 52 User Network Topology</title>
+		<description>Abmas Accounting &smbmdash; 52 User Network Topology</description>
-	<mediaobject>
+		<imagefile scale="100">acct2net.png</imagefile>
-		<imageobject role="latex">
+	</image>
-			<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>
 
 	<procedure>
 		<step><para>

docs/Samba-Guide/Chap04-SecureOfficeServer.xml

@@ -162,17 +162,10 @@
 			</tgroup>
 		</table>
 
-<figure id="ch04net">
+		<image id="ch04net">
-	<title>Abmas Network Topology &smbmdash; 130 Users</title>
+			<description>Abmas Network Topology &smbmdash; 130 Users</description>
-	<mediaobject>
+			<imagefile scale="90">chap4-net.png</imagefile>
-		<imageobject role="latex">
+		</image>
-			<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>
 
 		<para>
 		Christine has recommended that desktop systems should be installed from a single cloned

docs/Samba-Guide/Chap05-500UserNetwork.xml

@@ -325,17 +325,10 @@
 	selected hardware that is appropriate to the task.
 	</para>
 
-<figure id="chap05net">
+	<image id="chap05net">
-	<title>Network Topology &smbmdash; 500 User Network Using tdbsam passdb backend.</title>
+		<description>Network Topology &smbmdash; 500 User Network Using tdbsam passdb backend.</description>
-	<mediaobject>
+		<imagefile scale="80">chap5-net.png</imagefile>
-		<imageobject role="latex">
+	</image>
-			<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>
 
 	<sect2 id="ch5-dnshcp-setup">
 	<title>Installation of DHCP, DNS, and Samba Control Files</title>

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">
+	<image id="ch6-LDAPdiag">
-		<title>The Interaction of LDAP, UNIX Posix Accounts and Samba Accounts</title>
+		<description>The Interaction of LDAP, UNIX Posix Accounts and Samba Accounts</description>
-		<mediaobject>
+		<imagefile scale="70">UNIX-Samba-and-LDAP.png</imagefile>
-			<imageobject role="latex">
+	</image>
-				<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>
 
 	<para><indexterm>
 	    <primary>security</primary>
@@ -965,19 +958,10 @@
 	that you will install additional file servers, and possibly additional BDCs.
 	</para>
 
-<figure id="chap6net">
+	<image id="chap6net">
-	<title>Network Topology &smbmdash; 500 User Network Using ldapsam passdb backend.</title>
+		<description>Network Topology &smbmdash; 500 User Network Using ldapsam passdb backend.</description>
-	<mediaobject>
+		<imagefile scale="70">chap6-net.png</imagefile>
-		<imageobject role="latex">
+	</image>
-			<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>
 
       <para><indexterm>
 	  <primary>SUSE Linux</primary>
@@ -3146,19 +3130,10 @@ HKEY_LOCAL_MACHINE\Default\Software\Microsoft\Windows\
 
 	</procedure>
 
-<figure id="XP-screen001">
+	<image id="XP-screen001">
-	<title>Windows XP Professional &smbmdash; User Shared Folders</title>
+		<description>Windows XP Professional &smbmdash; User Shared Folders</description>
-	<mediaobject>
+		<imagefile scale="65">XP-screen001.png</imagefile>
-		<imageobject role="latex">
+	</image>
-			<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>
 
 <table id="proffold">
 	<title>Default Profile Redirections</title>

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">
+	<image id="chap7net">
-	<title>Network Topology &smbmdash; 2000 User Complex Design A</title>
+		<description>Network Topology &smbmdash; 2000 User Complex Design A</description>
-	<mediaobject>
+		<imagefile scale="80">chap7-net-Ar.png</imagefile>
-		<imageobject role="latex">
+	</image>
-			<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">
+	<image id="chap7net2">
-	<title>Network Topology &smbmdash; 2000 User Complex Design B</title>
+		<description>Network Topology &smbmdash; 2000 User Complex Design B</description>
-	<mediaobject>
+		<imagefile scale="80">chap7-net2-Br.png</imagefile>
-		<imageobject role="latex">
+	</image>
-			<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>
 
 	</sect3>
 
@@ -776,19 +758,10 @@
 	(obtaining a UNIX UID/GID) using the specific systems shown.
 	</para>
 
-<figure id="chap7idres">
+	<image id="chap7idres">
-	<title>Samba and Authentication Backend Search Pathways</title>
+		<description>Samba and Authentication Backend Search Pathways</description>
-	<mediaobject>
+		<imagefile scale="80">chap7-idresol.png</imagefile>
-		<imageobject role="latex">
+	</image>
-			<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>
 
       <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">
+	<image id="ch7singleLDAP">
-		<title>Samba Configuration to Use a Single LDAP Server</title>
+		<description>Samba Configuration to Use a Single LDAP Server</description>
-		<mediaobject>
+		<imagefile scale="100">ch7-singleLDAP.png</imagefile>
-			<imageobject role="latex">
+	</image>
-				<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>
 	<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">
+	<image id="ch7dualLDAP">
-		<title>Samba Configuration to Use a Dual (Fail-over) LDAP Server</title>
+		<description>Samba Configuration to Use a Dual (Fail-over) LDAP Server</description>
-		<mediaobject>
+		<imagefile scale="100">ch7-fail-overLDAP.png</imagefile>
-			<imageobject role="latex">
+	</image>
-				<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>
       </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">
+	<image id="ch7dualadd">
-		<title>Samba Configuration to Use Dual LDAP Databases - Broken - Do Not Use!</title>
+		<description>Samba Configuration to Use Dual LDAP Databases - Broken - Do Not Use!</description>
-		<mediaobject>
+		<imagefile scale="80">ch7-dual-additive-LDAP.png</imagefile>
-			<imageobject role="latex">
+	</image>
-				<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>
 
 	<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">
+		<image id="ch7dualok">
-		<title>Samba Configuration to Use Two LDAP Databases - The result is additive.</title>
+			<description>Samba Configuration to Use Two LDAP Databases - The result is additive.</description>
-		<mediaobject>
+			<imagefile scale="80">ch7-dual-additive-LDAP-Ok.png</imagefile>
-			<imageobject role="latex">
+		</image>
-				<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>
 
 	<note><para>
 	When the use of ldapsam is specified twice, as shown here, it is imperative

docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml

@@ -182,17 +182,10 @@
 		from a Windows NT4 Domain to a Samba Domain.
 		</para>
 
-		<figure id="ch8-migration">
+		<image id="ch8-migration">
-			<title>Schematic Explaining the <command>net rpc vampire</command> Process</title>
+			<description>Schematic Explaining the <command>net rpc vampire</command> Process</description>
-			<mediaobject>
+			<imagefile scale="80">ch8-migration.png</imagefile>
-				<imageobject role="latex">
+		</image>
-					<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>
 
 		<para>
 		In any case, the migration process involves the following steps:
@@ -303,17 +296,10 @@
 		an LDAP backend.
 		</para>
 
-	<figure id="NT4DUM">
+		<image id="NT4DUM">
-		<title>View of Accounts in NT4 Domain User Manager</title>
+			<description>View of Accounts in NT4 Domain User Manager</description>
-		<mediaobject>
+			<imagefile scale="50">UserMgrNT4.png</imagefile>
-			<imageobject role="latex">
+		</image>
-				<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>
 
 	</sect2>
 

docs/Samba-Guide/Chap09-AddingUNIXClients.xml

@@ -28,17 +28,10 @@
 	<link linkend="ch09openmag"/>.
 	</para>
 
-<figure id="ch09openmag">
+	<image id="ch09openmag">
-	<title>Open Magazine Samba Survey</title>
+		<description>Open Magazine Samba Survey</description>
-	<mediaobject>
+		<imagefile scale="60">openmag.png</imagefile>
-		<imageobject role="latex">
+	</image>
-			<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>
 
 	<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">
+<image id="ch9-sambadc">
-	<title>Samba Domain: Samba Member Server</title>
+	<description>Samba Domain: Samba Member Server</description>
-	<mediaobject>
+	<imagefile scale="75">chap9-SambaDC.png</imagefile>
-		<imageobject role="latex">
+</image>
-			<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>
 
 	<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">
+	<image id="ch9-adsdc">
-	<title>Active Directory Domain: Samba Member Server</title>
+		<description>Active Directory Domain: Samba Member Server</description>
-	<mediaobject>
+		<imagefile scale="75">chap9-ADSDC.png</imagefile>
-		<imageobject role="latex">
+	</image>
-			<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>
 
 	<procedure>
 	  <step><para><indexterm>

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">
+	<image id="lam-login">
-		<title>The LDAP Account Manager Login Screen</title>
+		<description>The LDAP Account Manager Login Screen</description>
-		<mediaobject>
+		<imagefile scale="50">lam-login.png</imagefile>
-			<imageobject role="latex">
+	</image>
-				<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>
 
       <para><indexterm>
 	  <primary>LAM</primary>
@@ -1220,17 +1213,10 @@ example:
 	using LAM to add additional users and groups.
 	</para>
 
-	<figure id="lam-config">
+	<image id="lam-config">
-		<title>The LDAP Account Manager Configuration Screen</title>
+		<description>The LDAP Account Manager Configuration Screen</description>
-		<mediaobject>
+		<imagefile scale="50">lam-config.png</imagefile>
-			<imageobject role="latex">
+	</image>
-				<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>
 
       <para><indexterm>
 	  <primary>PDF</primary>
@@ -1254,17 +1240,10 @@ example:
 	finished editing simply press the <guimenu>Final</guimenu> button.
 	</para>
 
-	<figure id="lam-user">
+	<image id="lam-user">
-		<title>The LDAP Account Manager User Edit Screen</title>
+		<description>The LDAP Account Manager User Edit Screen</description>
-		<mediaobject>
+		<imagefile scale="50">lam-users.png</imagefile>
-			<imageobject role="latex">
+	</image>
-				<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>
 
 	<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">
+	<image id="lam-group">
-		<title>The LDAP Account Manager Group Edit Screen</title>
+		<description>The LDAP Account Manager Group Edit Screen</description>
-		<mediaobject>
+		<imagefile scale="50">lam-groups.png</imagefile>
-			<imageobject role="latex">
+	</image>
-				<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">
+	<image id="lam-group-mem">
-		<title>The LDAP Account Manager Group Membership Edit Screen</title>
+		<description>The LDAP Account Manager Group Membership Edit Screen</description>
-		<mediaobject>
+		<imagefile scale="50">lam-group-members.png</imagefile>
-			<imageobject role="latex">
+	</image>
-				<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>
 
       <para><indexterm>
 	  <primary>smbldap-tools</primary>
@@ -1307,17 +1272,10 @@ example:
 	will, in most cases, not be used.
 	</para>
 
-	<figure id="lam-host">
+	<image id="lam-host">
-		<title>The LDAP Account Manager Host Edit Screen</title>
+		<description>The LDAP Account Manager Host Edit Screen</description>
-		<mediaobject>
+		<imagefile scale="50">lam-hosts.png</imagefile>
-			<imageobject role="latex">
+	</image>
-				<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>
 
 	<para>
 	One aspect of LAM that may annoy some users is the way it forces certain conventions on