Reorganise docs in trunk to match distribution layout, which is cleaner,

and makes Makefile work on distributions and trunk equally.

67 files changed, 52 insertions, 43 deletions

diff --git a/docs/Makefile b/docs/Makefile
index 43a4eadb..af6bb9e6 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -3,33 +3,39 @@
 # Process DocBook to HTML
 
 DBPROC=xsltproc
-BOOKXSL=bb-book.xsl
-NOCHUNKBOOKXSL=bb-nochunk-book.xsl
-MANXSL=bb-man.xsl
-HTMLPREFIX=box-html
-VPATH= adminguide
-.SUFFIXES: .html .xml .1 .5 .8
+
+DOCBOOK_DIR = docbook
+HTML_DIR = htmlguide
+MAN_DIR = man
+
+BOOKXSL = $(DOCBOOK_DIR)/bb-book.xsl
+NOCHUNKBOOKXSL = $(DOCBOOK_DIR)/bb-nochunk-book.xsl
+MANXSL = $(DOCBOOK_DIR)/bb-man.xsl
+
+# VPATH= adminguide
+# .SUFFIXES: .html .xml .1 .5 .8
 
 all: docs
 
 docs: instguide adminguide manpages
-	@mkdir -p $(HTMLPREFIX)/images
-	@cp html/images/*.png $(HTMLPREFIX)/images/.
-	@cp html/*.css $(HTMLPREFIX)/.
+	@mkdir -p $(HTML_DIR)/images
+	@cp $(DOCBOOK_DIR)/html/images/*.png $(HTML_DIR)/images/.
+	@cp $(DOCBOOK_DIR)/html/*.css $(HTML_DIR)/.
+	@cp $(DOCBOOK_DIR)/html/*.ico $(HTML_DIR)/.
 
-adminguide: $(HTMLPREFIX)/adminguide/index.html 
+adminguide: $(HTML_DIR)/adminguide/index.html 
 
-$(HTMLPREFIX)/adminguide/index.html: adminguide.xml ExceptionCodes.xml $(BOOKXSL)
+$(HTML_DIR)/adminguide/index.html: $(DOCBOOK_DIR)/adminguide.xml $(DOCBOOK_DIR)/ExceptionCodes.xml $(BOOKXSL)
 	# docname=`echo $@ | sed -e 's/\/index.html//'`
-	$(DBPROC) -o $(HTMLPREFIX)/adminguide/ $(BOOKXSL) adminguide.xml
+	$(DBPROC) -o $(HTML_DIR)/adminguide/ $(BOOKXSL) $<
 
-instguide: $(HTMLPREFIX)/instguide/index.html 
+instguide: $(HTML_DIR)/instguide/index.html 
 
-$(HTMLPREFIX)/instguide/index.html: instguide.xml $(BOOKXSL)
-	$(DBPROC) -o $(HTMLPREFIX)/instguide/ $(BOOKXSL) instguide.xml
+$(HTML_DIR)/instguide/index.html: $(DOCBOOK_DIR)/instguide.xml $(BOOKXSL)
+	$(DBPROC) -o $(HTML_DIR)/instguide/ $(BOOKXSL) $<
 
-ExceptionCodes.xml: ../ExceptionCodes.txt
-	perl ./generate_except_xml.pl
+$(DOCBOOK_DIR)/ExceptionCodes.xml: ../ExceptionCodes.txt
+	perl tools/generate_except_xml.pl $< $@
 
 manpages: $(MANXSL) man-dirs man-nroff man-html
 
@@ -45,46 +51,49 @@ $(MANXSL): $(MANXSL).tmpl
 	 fi; \
 	 sed -e "s,%%DOCBOOK%%,$${DOCBOOK}," $(MANXSL).tmpl > $(MANXSL)
 
-man-dirs: man/.there $(HTMLPREFIX)/man-html/.there
+man-dirs: man/.there $(HTML_DIR)/man-html/.there
 
-$(HTMLPREFIX)/man-html/.there:
-	if [ ! -d $(HTMLPREFIX)/man-html ]; then mkdir -p $(HTMLPREFIX)/man-html; touch $(HTMLPREFIX)/man-html/.there; fi
+$(HTML_DIR)/man-html/.there:
+	mkdir -p $(HTML_DIR)/man-html
+	touch $(HTML_DIR)/man-html/.there
 
 man/.there:
-	if [ ! -d man ]; then mkdir man; touch man/.there; fi
+	then mkdir -p man
+	touch man/.there
 
 NROFF_PAGES = bbackupd.8 bbackupd-config.8 bbackupctl.8 bbackupquery.8 \
 	bbstored.8 bbstored-config.8 bbstoreaccounts.8 bbstored-certs.8 \
 	raidfile-config.8 \
 	bbackupd.conf.5 bbstored.conf.5 raidfile.conf.5
 
-man-nroff: $(NROFF_PAGES)
+NROFF_FILES = $(NROFF_PAGES:%=$(MAN_DIR)/%.gz)
+
+man-nroff: $(NROFF_FILES)
+
+HTML_FILES_1 = $(NROFF_PAGES:%.5=%.html)
+HTML_FILES_2 = $(HTML_FILES_1:%.8=%.html)
+HTML_FILES   = $(HTML_FILES_2:%=$(HTML_DIR)/man-html/%)
 
-HTML_PAGES = bbackupd.html bbackupd-config.html bbackupctl.html \
-	bbackupquery.html bbstored.html bbstored-config.html \
-	bbstoreaccounts.html bbstored-certs.html raidfile-config.html \
-	bbackupd.conf.html bbstored.conf.html raidfile.conf.html
+man-html: $(HTML_FILES)
 
-man-html: $(HTML_PAGES)
+$(HTML_DIR)/man-html/%.html: $(DOCBOOK_DIR)/%.xml $(NOCHUNKBOOKXSL)
+	$(DBPROC) -o $@ $(NOCHUNKBOOKXSL) $<
 
-.xml.html:
-	@$(DBPROC) -o $@ $(NOCHUNKBOOKXSL) $<
-	@cp $@ $(HTMLPREFIX)/man-html/.
+$(MAN_DIR)/%.8.gz: $(DOCBOOK_DIR)/%.xml $(MANXSL)
+	$(DBPROC) -o $(@:.gz=) $(MANXSL) $<
+	gzip $(@:.gz=)
 
-.xml.8 .xml.5: $(MANXSL)
-	@$(DBPROC) -o $@ $(MANXSL) $<
-	@cp $@ man/
-	@rm -f man/$@.gz
-	@gzip -f -9 man/$@
+$(MAN_DIR)/%.5.gz: $(DOCBOOK_DIR)/%.xml $(MANXSL)
+	$(DBPROC) -o $(@:.gz=) $(MANXSL) $<
+	gzip $(@:.gz=)
 
 dockit: clean docs
-	tar zcf documentation-kit-0.10.tar.gz $(HTMLPREFIX)/
+	tar zcf documentation-kit-0.10.tar.gz $(HTML_DIR)/
 
 clean:
-	if [ -d ./$(HTMLPREFIX) ]; then rm -rf $(HTMLPREFIX) ; fi
-	if [ -d ./man ]; then  rm -rf ./man/; fi
-	if [ -f ExceptionCodes.xml ]; then rm ExceptionCodes.xml; fi
-	rm -f $(NROFF_PAGES) $(HTML_PAGES)
-	if [ -f documentation-kit-0.10.tar.gz ]; then rm documentation-kit-0.10.tar.gz; fi
+	rm -f $(HTML_FILES)
+	rm -f $(NROFF_FILES)
+	rm -f $(DOCBOOK_DIR)/ExceptionCodes.xml
+	rm -f documentation-kit-0.10.tar.gz
 
 
diff --git a/docs/api-docs/backup/INDEX.txt b/docs/api-notes/backup/INDEX.txt
index 50406cac..50406cac 100644
--- a/docs/api-docs/backup/INDEX.txt
+++ b/docs/api-notes/backup/INDEX.txt
diff --git a/docs/api-docs/backup/Win32_Clients.txt b/docs/api-notes/backup/Win32_Clients.txt
index fad6c4af..fad6c4af 100644
--- a/docs/api-docs/backup/Win32_Clients.txt
+++ b/docs/api-notes/backup/Win32_Clients.txt
diff --git a/docs/api-docs/backup/backup_encryption.txt b/docs/api-notes/backup/backup_encryption.txt
index 36580581..36580581 100644
--- a/docs/api-docs/backup/backup_encryption.txt
+++ b/docs/api-notes/backup/backup_encryption.txt
diff --git a/docs/api-docs/backup/bin_bbackupd.txt b/docs/api-notes/backup/bin_bbackupd.txt
index 67ad9267..67ad9267 100644
--- a/docs/api-docs/backup/bin_bbackupd.txt
+++ b/docs/api-notes/backup/bin_bbackupd.txt
diff --git a/docs/api-docs/backup/bin_bbstored.txt b/docs/api-notes/backup/bin_bbstored.txt
index c9c4e229..c9c4e229 100644
--- a/docs/api-docs/backup/bin_bbstored.txt
+++ b/docs/api-notes/backup/bin_bbstored.txt
diff --git a/docs/api-docs/backup/encrypt_rsync.txt b/docs/api-notes/backup/encrypt_rsync.txt
index a5db2df2..a5db2df2 100644
--- a/docs/api-docs/backup/encrypt_rsync.txt
+++ b/docs/api-notes/backup/encrypt_rsync.txt
diff --git a/docs/api-docs/backup/lib_backupclient.txt b/docs/api-notes/backup/lib_backupclient.txt
index 3e4a079b..3e4a079b 100644
--- a/docs/api-docs/backup/lib_backupclient.txt
+++ b/docs/api-notes/backup/lib_backupclient.txt
diff --git a/docs/api-docs/backup/lib_backupstore.txt b/docs/api-notes/backup/lib_backupstore.txt
index 8f24eb7b..8f24eb7b 100644
--- a/docs/api-docs/backup/lib_backupstore.txt
+++ b/docs/api-notes/backup/lib_backupstore.txt
diff --git a/docs/api-docs/backup/win32_build_on_cygwin_using_mingw.txt b/docs/api-notes/backup/win32_build_on_cygwin_using_mingw.txt
index 1caaf4ca..1caaf4ca 100644
--- a/docs/api-docs/backup/win32_build_on_cygwin_using_mingw.txt
+++ b/docs/api-notes/backup/win32_build_on_cygwin_using_mingw.txt
diff --git a/docs/api-docs/backup/win32_build_on_linux_using_mingw.txt b/docs/api-notes/backup/win32_build_on_linux_using_mingw.txt
index 2c3e4fe9..2c3e4fe9 100644
--- a/docs/api-docs/backup/win32_build_on_linux_using_mingw.txt
+++ b/docs/api-notes/backup/win32_build_on_linux_using_mingw.txt
diff --git a/docs/api-docs/backup/windows_porting.txt b/docs/api-notes/backup/windows_porting.txt
index ada3b857..ada3b857 100644
--- a/docs/api-docs/backup/windows_porting.txt
+++ b/docs/api-notes/backup/windows_porting.txt
diff --git a/docs/api-docs/common/lib_common.txt b/docs/api-notes/common/lib_common.txt
index 11d7b02d..11d7b02d 100644
--- a/docs/api-docs/common/lib_common.txt
+++ b/docs/api-notes/common/lib_common.txt
diff --git a/docs/api-docs/common/lib_common/BoxTime.txt b/docs/api-notes/common/lib_common/BoxTime.txt
index 18bef5a5..18bef5a5 100644
--- a/docs/api-docs/common/lib_common/BoxTime.txt
+++ b/docs/api-notes/common/lib_common/BoxTime.txt
diff --git a/docs/api-docs/common/lib_common/CollectInBufferStream.txt b/docs/api-notes/common/lib_common/CollectInBufferStream.txt
index 5f9556a3..5f9556a3 100644
--- a/docs/api-docs/common/lib_common/CollectInBufferStream.txt
+++ b/docs/api-notes/common/lib_common/CollectInBufferStream.txt
diff --git a/docs/api-docs/common/lib_common/Configuration.txt b/docs/api-notes/common/lib_common/Configuration.txt
index ef5f38f6..ef5f38f6 100644
--- a/docs/api-docs/common/lib_common/Configuration.txt
+++ b/docs/api-notes/common/lib_common/Configuration.txt
diff --git a/docs/api-docs/common/lib_common/Conversion.txt b/docs/api-notes/common/lib_common/Conversion.txt
index 62d1967a..62d1967a 100644
--- a/docs/api-docs/common/lib_common/Conversion.txt
+++ b/docs/api-notes/common/lib_common/Conversion.txt
diff --git a/docs/api-docs/common/lib_common/ExcludeList.txt b/docs/api-notes/common/lib_common/ExcludeList.txt
index 8a5bf36c..8a5bf36c 100644
--- a/docs/api-docs/common/lib_common/ExcludeList.txt
+++ b/docs/api-notes/common/lib_common/ExcludeList.txt
diff --git a/docs/api-docs/common/lib_common/FdGetLine.txt b/docs/api-notes/common/lib_common/FdGetLine.txt
index d92ff94d..d92ff94d 100644
--- a/docs/api-docs/common/lib_common/FdGetLine.txt
+++ b/docs/api-notes/common/lib_common/FdGetLine.txt
diff --git a/docs/api-docs/common/lib_common/Guards.txt b/docs/api-notes/common/lib_common/Guards.txt
index 6174fea6..6174fea6 100644
--- a/docs/api-docs/common/lib_common/Guards.txt
+++ b/docs/api-notes/common/lib_common/Guards.txt
diff --git a/docs/api-docs/common/lib_common/IOStream.txt b/docs/api-notes/common/lib_common/IOStream.txt
index 09460656..09460656 100644
--- a/docs/api-docs/common/lib_common/IOStream.txt
+++ b/docs/api-notes/common/lib_common/IOStream.txt
diff --git a/docs/api-docs/common/lib_common/IOStreamGetLine.txt b/docs/api-notes/common/lib_common/IOStreamGetLine.txt
index 04c56b57..04c56b57 100644
--- a/docs/api-docs/common/lib_common/IOStreamGetLine.txt
+++ b/docs/api-notes/common/lib_common/IOStreamGetLine.txt
diff --git a/docs/api-docs/common/lib_common/MainHelper.txt b/docs/api-notes/common/lib_common/MainHelper.txt
index eb5b07f0..eb5b07f0 100644
--- a/docs/api-docs/common/lib_common/MainHelper.txt
+++ b/docs/api-notes/common/lib_common/MainHelper.txt
diff --git a/docs/api-docs/common/lib_common/WaitForEvent.txt b/docs/api-notes/common/lib_common/WaitForEvent.txt
index 0bc55726..0bc55726 100644
--- a/docs/api-docs/common/lib_common/WaitForEvent.txt
+++ b/docs/api-notes/common/lib_common/WaitForEvent.txt
diff --git a/docs/api-docs/common/lib_common/xStream.txt b/docs/api-notes/common/lib_common/xStream.txt
index 91e9c0ea..91e9c0ea 100644
--- a/docs/api-docs/common/lib_common/xStream.txt
+++ b/docs/api-notes/common/lib_common/xStream.txt
diff --git a/docs/api-docs/common/lib_compress.txt b/docs/api-notes/common/lib_compress.txt
index f3e26f20..f3e26f20 100644
--- a/docs/api-docs/common/lib_compress.txt
+++ b/docs/api-notes/common/lib_compress.txt
diff --git a/docs/api-docs/common/lib_compress/CompressStream.txt b/docs/api-notes/common/lib_compress/CompressStream.txt
index eca43eb6..eca43eb6 100644
--- a/docs/api-docs/common/lib_compress/CompressStream.txt
+++ b/docs/api-notes/common/lib_compress/CompressStream.txt
diff --git a/docs/api-docs/common/lib_crypto.txt b/docs/api-notes/common/lib_crypto.txt
index 9ddafe69..9ddafe69 100644
--- a/docs/api-docs/common/lib_crypto.txt
+++ b/docs/api-notes/common/lib_crypto.txt
diff --git a/docs/api-docs/common/lib_crypto/CipherContext.txt b/docs/api-notes/common/lib_crypto/CipherContext.txt
index 30fb4608..30fb4608 100644
--- a/docs/api-docs/common/lib_crypto/CipherContext.txt
+++ b/docs/api-notes/common/lib_crypto/CipherContext.txt
diff --git a/docs/api-docs/common/lib_crypto/RollingChecksum.txt b/docs/api-notes/common/lib_crypto/RollingChecksum.txt
index d871b3f2..d871b3f2 100644
--- a/docs/api-docs/common/lib_crypto/RollingChecksum.txt
+++ b/docs/api-notes/common/lib_crypto/RollingChecksum.txt
diff --git a/docs/api-docs/common/lib_server.txt b/docs/api-notes/common/lib_server.txt
index 392f331d..392f331d 100644
--- a/docs/api-docs/common/lib_server.txt
+++ b/docs/api-notes/common/lib_server.txt
diff --git a/docs/api-docs/common/lib_server/Daemon.txt b/docs/api-notes/common/lib_server/Daemon.txt
index 6956ec2b..6956ec2b 100644
--- a/docs/api-docs/common/lib_server/Daemon.txt
+++ b/docs/api-notes/common/lib_server/Daemon.txt
diff --git a/docs/api-docs/common/lib_server/Protocol.txt b/docs/api-notes/common/lib_server/Protocol.txt
index 09d3c1f1..09d3c1f1 100644
--- a/docs/api-docs/common/lib_server/Protocol.txt
+++ b/docs/api-notes/common/lib_server/Protocol.txt
diff --git a/docs/api-docs/common/lib_server/ServerStream.txt b/docs/api-notes/common/lib_server/ServerStream.txt
index 6c5932a0..6c5932a0 100644
--- a/docs/api-docs/common/lib_server/ServerStream.txt
+++ b/docs/api-notes/common/lib_server/ServerStream.txt
diff --git a/docs/api-docs/common/lib_server/ServerTLS.txt b/docs/api-notes/common/lib_server/ServerTLS.txt
index dbde500f..dbde500f 100644
--- a/docs/api-docs/common/lib_server/ServerTLS.txt
+++ b/docs/api-notes/common/lib_server/ServerTLS.txt
diff --git a/docs/api-docs/common/lib_server/SocketStream.txt b/docs/api-notes/common/lib_server/SocketStream.txt
index 82813279..82813279 100644
--- a/docs/api-docs/common/lib_server/SocketStream.txt
+++ b/docs/api-notes/common/lib_server/SocketStream.txt
diff --git a/docs/api-docs/common/lib_server/SocketStreamTLS.txt b/docs/api-notes/common/lib_server/SocketStreamTLS.txt
index ebb3f233..ebb3f233 100644
--- a/docs/api-docs/common/lib_server/SocketStreamTLS.txt
+++ b/docs/api-notes/common/lib_server/SocketStreamTLS.txt
diff --git a/docs/api-docs/common/lib_server/TLSContext.txt b/docs/api-notes/common/lib_server/TLSContext.txt
index ff50d3e6..ff50d3e6 100644
--- a/docs/api-docs/common/lib_server/TLSContext.txt
+++ b/docs/api-notes/common/lib_server/TLSContext.txt
diff --git a/docs/api-docs/common/memory_leaks.txt b/docs/api-notes/common/memory_leaks.txt
index 9a9764ea..9a9764ea 100644
--- a/docs/api-docs/common/memory_leaks.txt
+++ b/docs/api-notes/common/memory_leaks.txt
diff --git a/docs/api-docs/raidfile/lib_raidfile.txt b/docs/api-notes/raidfile/lib_raidfile.txt
index 0c4244ce..0c4244ce 100644
--- a/docs/api-docs/raidfile/lib_raidfile.txt
+++ b/docs/api-notes/raidfile/lib_raidfile.txt
diff --git a/docs/api-docs/raidfile/lib_raidfile/RaidFileRead.txt b/docs/api-notes/raidfile/lib_raidfile/RaidFileRead.txt
index 0a5efbf7..0a5efbf7 100644
--- a/docs/api-docs/raidfile/lib_raidfile/RaidFileRead.txt
+++ b/docs/api-notes/raidfile/lib_raidfile/RaidFileRead.txt
diff --git a/docs/api-docs/raidfile/lib_raidfile/RaidFileWrite.txt b/docs/api-notes/raidfile/lib_raidfile/RaidFileWrite.txt
index 89500c37..89500c37 100644
--- a/docs/api-docs/raidfile/lib_raidfile/RaidFileWrite.txt
+++ b/docs/api-notes/raidfile/lib_raidfile/RaidFileWrite.txt
diff --git a/docs/adminguide.xml b/docs/docbook/adminguide.xml
index edb0a58c..edb0a58c 100644
--- a/docs/adminguide.xml
+++ b/docs/docbook/adminguide.xml
diff --git a/docs/bb-book.xsl b/docs/docbook/bb-book.xsl
index a4f05fdb..a4f05fdb 100644
--- a/docs/bb-book.xsl
+++ b/docs/docbook/bb-book.xsl
diff --git a/docs/bb-man.xsl.tmpl b/docs/docbook/bb-man.xsl.tmpl
index e20eedd5..e20eedd5 100644
--- a/docs/bb-man.xsl.tmpl
+++ b/docs/docbook/bb-man.xsl.tmpl
diff --git a/docs/bb-nochunk-book.xsl b/docs/docbook/bb-nochunk-book.xsl
index 86574122..86574122 100644
--- a/docs/bb-nochunk-book.xsl
+++ b/docs/docbook/bb-nochunk-book.xsl
diff --git a/docs/bbackupctl.xml b/docs/docbook/bbackupctl.xml
index b4880bfd..b4880bfd 100644
--- a/docs/bbackupctl.xml
+++ b/docs/docbook/bbackupctl.xml
diff --git a/docs/bbackupd-config.xml b/docs/docbook/bbackupd-config.xml
index 41bb6587..41bb6587 100644
--- a/docs/bbackupd-config.xml
+++ b/docs/docbook/bbackupd-config.xml
diff --git a/docs/bbackupd.conf.xml b/docs/docbook/bbackupd.conf.xml
index 43ae2bed..43ae2bed 100644
--- a/docs/bbackupd.conf.xml
+++ b/docs/docbook/bbackupd.conf.xml
diff --git a/docs/bbackupd.xml b/docs/docbook/bbackupd.xml
index 11de0f3f..11de0f3f 100644
--- a/docs/bbackupd.xml
+++ b/docs/docbook/bbackupd.xml
diff --git a/docs/bbackupquery.xml b/docs/docbook/bbackupquery.xml
index 016d5c7d..016d5c7d 100644
--- a/docs/bbackupquery.xml
+++ b/docs/docbook/bbackupquery.xml
diff --git a/docs/bbstoreaccounts.xml b/docs/docbook/bbstoreaccounts.xml
index 08092acf..08092acf 100644
--- a/docs/bbstoreaccounts.xml
+++ b/docs/docbook/bbstoreaccounts.xml
diff --git a/docs/bbstored-certs.xml b/docs/docbook/bbstored-certs.xml
index 79308089..79308089 100644
--- a/docs/bbstored-certs.xml
+++ b/docs/docbook/bbstored-certs.xml
diff --git a/docs/bbstored-config.xml b/docs/docbook/bbstored-config.xml
index 6d0113c1..6d0113c1 100644
--- a/docs/bbstored-config.xml
+++ b/docs/docbook/bbstored-config.xml
diff --git a/docs/bbstored.conf.xml b/docs/docbook/bbstored.conf.xml
index 136b1bd0..136b1bd0 100644
--- a/docs/bbstored.conf.xml
+++ b/docs/docbook/bbstored.conf.xml
diff --git a/docs/bbstored.xml b/docs/docbook/bbstored.xml
index 81891a8d..81891a8d 100644
--- a/docs/bbstored.xml
+++ b/docs/docbook/bbstored.xml
diff --git a/docs/html/bbdoc-man.css b/docs/docbook/html/bbdoc-man.css
index 0345560e..0345560e 100644
--- a/docs/html/bbdoc-man.css
+++ b/docs/docbook/html/bbdoc-man.css
diff --git a/docs/html/bbdoc.css b/docs/docbook/html/bbdoc.css
index d3b4a1c2..d3b4a1c2 100644
--- a/docs/html/bbdoc.css
+++ b/docs/docbook/html/bbdoc.css
diff --git a/docs/favicon.ico b/docs/docbook/html/favicon.ico
index f8cbb3b3..f8cbb3b3 100644
--- a/docs/favicon.ico
+++ b/docs/docbook/html/favicon.ico
diff --git a/docs/html/images/arrow.png b/docs/docbook/html/images/arrow.png
index 4c60805d..4c60805d 100644
--- a/docs/html/images/arrow.png
+++ b/docs/docbook/html/images/arrow.png
diff --git a/docs/html/images/bblogo.png b/docs/docbook/html/images/bblogo.png
index b33230b4..b33230b4 100644
--- a/docs/html/images/bblogo.png
+++ b/docs/docbook/html/images/bblogo.png
diff --git a/docs/html/images/stepahead.png b/docs/docbook/html/images/stepahead.png
index 9ac05b8c..9ac05b8c 100644
--- a/docs/html/images/stepahead.png
+++ b/docs/docbook/html/images/stepahead.png
diff --git a/docs/instguide.xml b/docs/docbook/instguide.xml
index addef297..addef297 100644
--- a/docs/instguide.xml
+++ b/docs/docbook/instguide.xml
diff --git a/docs/raidfile-config.xml b/docs/docbook/raidfile-config.xml
index 78a3e94c..78a3e94c 100644
--- a/docs/raidfile-config.xml
+++ b/docs/docbook/raidfile-config.xml
diff --git a/docs/raidfile.conf.xml b/docs/docbook/raidfile.conf.xml
index 7a8b6410..7a8b6410 100644
--- a/docs/raidfile.conf.xml
+++ b/docs/docbook/raidfile.conf.xml
diff --git a/docs/bblogo-alpha.xcf b/docs/images/bblogo-alpha.xcf
index 18f494f9..18f494f9 100644
--- a/docs/bblogo-alpha.xcf
+++ b/docs/images/bblogo-alpha.xcf
diff --git a/docs/generate_except_xml.pl b/docs/tools/generate_except_xml.pl
index 914ef456..38ee9074 100644
--- a/docs/generate_except_xml.pl
+++ b/docs/tools/generate_except_xml.pl
@@ -1,8 +1,8 @@
 #!/usr/bin/perl -w
 use strict;
 
-open (EXCEPT, "<../ExceptionCodes.txt") or die "Can't open ../ExceptionCodes.txt: $!\n";
-open (DOCBOOK, ">ExceptionCodes.xml") or die "Can't open Exceptioncodes.xml for writing: $!\n";
+open (EXCEPT,  "< $ARGV[0]") or die "Can't open $ARGV[0]: $!\n";
+open (DOCBOOK, "> $ARGV[1]") or die "Can't open $ARGV[1] for writing: $!\n";
 
 print DOCBOOK <<EOD;
 <?xml version="1.0" encoding="UTF-8"?>