Merge branch 'release/experimental/1.0.27-1_experimental1'experimental/1.0.27-1_experimental1

author: Jörg Frings-Fürst <debian@jff-webhosting.net> 2017-07-15 11:29:05 +0200
committer: Jörg Frings-Fürst <debian@jff-webhosting.net> 2017-07-15 11:29:05 +0200
commit: 324a8a71bb7d9e4f8bc49b6bc47efaf9fb58282e (patch)
tree: bd2d48a139bfbe869f4f49359b63097931a45e7b /doc
parent: 2ca8a81bd0d99fe4d75c229d0e988d8ef710285f (diff)
parent: 1edb02101a9306fc711cd422ed507d18165b1691 (diff)
91 files changed, 1354 insertions, 1376 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a7e47af..162d01a 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -16,7 +16,7 @@ EXTRA_DIST = scanimage.man sane-config.man sane-find-scanner.man \
 # Backend man pages bypass standard automake man5_MANS because there is not
 # a man page for every supported backend.  We could get rid of
 # custom install/uninstall if we required man pages for every backend.
-BACKEND_MANS_ENABLED = @BACKEND_MANS_ENABLED@
+
 BACKEND_5MANS = sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-as6e.5 \
 	sane-dll.5 sane-dc25.5 sane-dmc.5 sane-epson.5 sane-epson2.5 sane-epsonds.5 \
 	sane-hp.5 sane-gphoto2.5 sane-leo.5 sane-lexmark.5 \
@@ -28,7 +28,7 @@ BACKEND_5MANS = sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-as6e.5 \
 	sane-mustek_pp.5 sane-dc210.5 sane-v4l.5 sane-snapscan.5 \
 	sane-canon.5 sane-coolscan.5 sane-bh.5 sane-dc240.5 \
 	sane-umax_pp.5 sane-umax1220u.5 sane-sm3600.5 sane-usb.5 \
-     	sane-mustek_usb.5 sane-sceptre.5 sane-canon_pp.5 sane-canon630u.5 \
+	sane-mustek_usb.5 sane-sceptre.5 sane-canon_pp.5 sane-canon630u.5 \
         sane-teco1.5 sane-teco2.5 sane-teco3.5 sane-test.5 sane-sp15c.5 \
 	sane-coolscan2.5 sane-hpsj5s.5 sane-gt68xx.5 sane-artec_eplus48u.5 \
 	sane-ma1509.5 sane-ibm.5 sane-hp5400.5 sane-plustek_pp.5 sane-u12.5 \
@@ -51,7 +51,7 @@ EXTRA_DIST += sane-abaton.man sane-agfafocus.man sane-apple.man sane-as6e.man \
 	sane-mustek_pp.man sane-dc210.man sane-v4l.man sane-snapscan.man \
 	sane-canon.man sane-coolscan.man sane-bh.man sane-dc240.man \
 	sane-umax_pp.man sane-umax1220u.man sane-sm3600.man sane-usb.man \
-     	sane-mustek_usb.man sane-sceptre.man sane-canon_pp.man \
+	sane-mustek_usb.man sane-sceptre.man sane-canon_pp.man \
 	sane-canon630u.man sane-teco1.man sane-teco2.man \
 	sane-teco3.man sane-test.man sane-sp15c.man sane-coolscan2.man \
 	sane-hpsj5s.man sane-gt68xx.man sane-artec_eplus48u.man \
@@ -80,25 +80,15 @@ HTML_PAGES = sane-backends.html sane-backends-external.html \
 endif
 doc_DATA = $(HTML_PAGES)
 
-if USE_LATEX
-STANDARD = sane.ps
-else
-STANDARD =
-endif
-
-all: bemans $(STANDARD) html-pages
+all: bemans $(API_SPECS) html-pages
 
 dist_doc_DATA = backend-writing.txt
 nobase_dist_doc_DATA = $(BEDOCS)
-doc_DATA += $(STANDARD)
+doc_DATA += $(API_SPECS)
 EXTRA_DIST += descriptions.txt releases.txt sane-logo2.jpg sane-logo.png \
   sane.png
 
-LATEX	= TEXINPUTS="$(srcdir):$$TEXINPUTS" @LATEX@
-DVIPS   = @DVIPS@
-MAKEINDEX = @MAKEINDEX@
-DLH	= TEXINPUTS="$(srcdir):$$TEXINPUTS" dlh
-MAN2HTML= nroff -c -man |\
+MAN2HTML = nroff -c -man |\
 	  man2html -compress -topm 6 -botm 6 -nodepage -title $${page} \
           -cgiurl '$$title.$$section.html'|\
 	  sed 's,<BODY>,<BODY BGCOLOR=\#FFFFFF TEXT=\#000000><H1 ALIGN=CENTER><IMG SRC="/images/sane.png" HEIGHT=117 WIDTH=346></H1>,'
@@ -156,8 +146,6 @@ BEDOCS += umax/negative-types.txt umax/sane-logo.jpg \
   umax/sane-umax.jpg umax/umax.BUGS umax/umax.CHANGES umax/umax.FAQ \
   umax/umax.TODO
 
-EXTRA_DIST += sane.tex net.tex html.sty
-
 DESC_FILES = descriptions/abaton.desc descriptions/agfafocus.desc \
   descriptions/apple.desc descriptions/artec.desc \
   descriptions/artec_eplus48u.desc descriptions/as6e.desc \
@@ -216,40 +204,98 @@ DESC_EXT_FILES = descriptions-external/brother2.desc \
   descriptions-external/primax.desc \
   descriptions-external/samsung.desc \
   descriptions-external/scanwit.desc \
+  descriptions-external/utsushi.desc \
   descriptions-external/v4l2.desc \
   descriptions-external/viceo.desc
 EXTRA_DIST += $(DESC_EXT_FILES) descriptions-external/template.desc.
 
-EXTRA_DIST += figs/area.eps figs/area.fig figs/flow.eps figs/flow.fig \
-  figs/hierarchy.eps figs/hierarchy.fig figs/image-data.eps \
-  figs/image-data.fig figs/xfer.eps figs/xfer.fig
-
-EXTRA_DIST += icons/contents.gif icons/index.gif icons/next.gif \
-  icons/next_gr.gif icons/previous.gif icons/previous_gr.gif \
-  icons/references.gif icons/references_gr.gif icons/up.gif icons/up_gr.gif
-
 install-data-local: install-beman5
 
 uninstall-local:
 	rm -rf $(DESTDIR)$(beman5dir)/sane-*.5
 
-sane.ind: $(srcdir)/sane.tex
-	@echo Generating index for sane.tex...
+##  SANE API specification format conversion support
+
+API_SPECS  =
+if WITH_API_PS
+API_SPECS += sane.ps
+endif
+if WITH_API_PDF
+API_SPECS += sane.pdf
+endif
+if WITH_API_HTML
+API_SPECS += sane-html
+endif
+
+API_SPEC_INPUTS  = $(srcdir)/sane.tex
+API_SPEC_INPUTS += $(srcdir)/net.tex
+EXTRA_DIST += $(API_SPEC_INPUTS)
+
+API_SPEC_TEX_FIGS  =
+API_SPEC_TEX_FIGS += figs/area.fig
+API_SPEC_TEX_FIGS += figs/flow.fig
+API_SPEC_TEX_FIGS += figs/hierarchy.fig
+API_SPEC_TEX_FIGS += figs/image-data.fig
+API_SPEC_TEX_FIGS += figs/xfer.fig
+EXTRA_DIST += $(API_SPEC_TEX_FIGS)
+
+API_SPEC_EPS_FIGS  =
+API_SPEC_EPS_FIGS += figs/area.eps
+API_SPEC_EPS_FIGS += figs/flow.eps
+API_SPEC_EPS_FIGS += figs/hierarchy.eps
+API_SPEC_EPS_FIGS += figs/image-data.eps
+API_SPEC_EPS_FIGS += figs/xfer.eps
+
+API_SPEC_PDF_FIGS  =
+API_SPEC_PDF_FIGS += figs/area.pdf
+API_SPEC_PDF_FIGS += figs/flow.pdf
+API_SPEC_PDF_FIGS += figs/hierarchy.pdf
+API_SPEC_PDF_FIGS += figs/image-data.pdf
+API_SPEC_PDF_FIGS += figs/xfer.pdf
+
+##  These icons are referred to in the generated HTML output.
+API_SPEC_HTML_ICONS  =
+API_SPEC_HTML_ICONS += icons/contents.gif
+API_SPEC_HTML_ICONS += icons/index.gif
+API_SPEC_HTML_ICONS += icons/next.gif       icons/next_gr.gif
+API_SPEC_HTML_ICONS += icons/previous.gif   icons/previous_gr.gif
+API_SPEC_HTML_ICONS += icons/references.gif icons/references_gr.gif
+API_SPEC_HTML_ICONS += icons/up.gif         icons/up_gr.gif
+EXTRA_DIST += $(API_SPEC_HTML_ICONS)
+
+am_TEXINPUTS = TEXINPUTS="$(builddir):$(srcdir):$$TEXINPUTS"
+
+sane.ind: $(API_SPEC_INPUTS)
+	@echo Generating index for $<...
 	@touch sane.ind
-	@$(LATEX) $(srcdir)/sane </dev/null >/dev/null && \
-	  $(MAKEINDEX) sane.idx 2>/dev/null && \
-	  $(LATEX) $(srcdir)/sane </dev/null >/dev/null
+	@$(am_TEXINPUTS) $(LATEX) $< </dev/null >/dev/null && \
+	  $(MAKEINDEX) -q sane.idx && \
+	  $(am_TEXINPUTS) $(LATEX) $< </dev/null >/dev/null
 
-sane.dvi: sane.ind
-	@echo Generating sane.dvi from sane.tex...
-	@$(LATEX) $(srcdir)/sane </dev/null >/dev/null
+.fig.eps:
+	@test -d $(@D) || $(MKDIR_P) $(@D)
+	$(FIG2DEV) -L eps $< $@
+
+sane.dvi: $(API_SPEC_INPUTS) $(API_SPEC_EPS_FIGS) sane.ind
+	@echo Generating $@ from $<...
+	@$(am_TEXINPUTS) $(LATEX) $< </dev/null >/dev/null
 
 sane.ps: sane.dvi
-	@echo Generating sane.ps from sane.dvi...
-	@$(DVIPS) sane.dvi -o sane.ps 2>/dev/null
+	@echo Generating $@ from $<...
+	@$(am_TEXINPUTS) $(DVIPS) -q $< -o $@
+
+.fig.pdf:
+	@test -d $(@D) || $(MKDIR_P) $(@D)
+	$(FIG2DEV) -L pdf $< $@
+
+sane.pdf: $(API_SPEC_INPUTS) $(API_SPEC_PDF_FIGS) sane.ind
+	@echo Generating $@ from $<...
+	@$(am_TEXINPUTS) $(PDFLATEX) $< >/dev/null
 
 sane-html: sane.dvi
-	$(DLH) $(srcdir)/sane.tex
+	$(am_TEXINPUTS) $(DLH) $(srcdir)/sane.tex
+
+##  ^^
 
 html-man: $(MANPAGES)
 	@for page in $(MANPAGES); do \
@@ -292,16 +338,18 @@ descriptions.db: $(DESC_FILES) ../tools/sane-desc
 	@../tools/sane-desc -m ascii -s ${srcdir}/descriptions \
 	  > descriptions.db
 
-descriptions-external.db: $(DESC_FILES) ../tools/sane-desc
+descriptions-external.db: $(DESC_EXT_FILES) ../tools/sane-desc
 	@../tools/sane-desc -m ascii -s ${srcdir}/descriptions-external \
 	  > descriptions-external.db
 
 html-pages: $(HTML_PAGES)
-html: html-pages html-man sane-html
+html-local: html-pages html-man sane-html
 
 clean-local:
 	rm -f *.toc *.aux *.log *.cp *.fn *.tp *.vr *.pg *.ky *.blg *.idx *.cb
 	rm -f *.ilg
+	rm -f $(API_SPEC_EPS_FIGS) $(API_SPEC_PDF_FIGS)
+	-rmdir figs
 
 distclean-local:
 	rm -f $(MANPAGES)
diff --git a/doc/Makefile.in b/doc/Makefile.in
index ef83201..d678cf1 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -78,17 +78,25 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@WITH_API_PS_TRUE@am__append_1 = sane.ps
+@WITH_API_PDF_TRUE@am__append_2 = sane.pdf
+@WITH_API_HTML_TRUE@am__append_3 = sane-html
 subdir = doc
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/mkinstalldirs $(srcdir)/doxygen-sanei.conf.in \
 	$(srcdir)/doxygen-genesys.conf.in $(dist_doc_DATA) \
 	$(nobase_dist_doc_DATA)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ltoptions.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/byteorder.m4 \
-	$(top_srcdir)/m4/stdint.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/acinclude.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/byteorder.m4 $(top_srcdir)/m4/stdint.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -155,7 +163,10 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
+AM_CFLAGS = @AM_CFLAGS@
+AM_CPPFLAGS = @AM_CPPFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_LDFLAGS = @AM_LDFLAGS@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
@@ -167,15 +178,6 @@ AWK = @AWK@
 BACKENDS = @BACKENDS@
 BACKEND_CONFS_ENABLED = @BACKEND_CONFS_ENABLED@
 BACKEND_LIBS_ENABLED = @BACKEND_LIBS_ENABLED@
-
-# Create a list of man pages for only backends that are compiled in so
-# that is all that gets installed.  Also, build a complete list of all
-# backend man pages.  This allows a user to optionally generate all
-# man pages in HTML form for things like posting to a web site.
-#
-# Backend man pages bypass standard automake man5_MANS because there is not
-# a man page for every supported backend.  We could get rid of
-# custom install/uninstall if we required man pages for every backend.
 BACKEND_MANS_ENABLED = @BACKEND_MANS_ENABLED@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -185,7 +187,7 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DISTCLEAN_FILES = @DISTCLEAN_FILES@
+DLH = @DLH@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
 DSYMUTIL = @DSYMUTIL@
@@ -198,34 +200,42 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+FIG2DEV = @FIG2DEV@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GPHOTO2_CPPFLAGS = @GPHOTO2_CPPFLAGS@
 GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@
 GPHOTO2_LIBS = @GPHOTO2_LIBS@
 GREP = @GREP@
+GS = @GS@
 HAVE_GPHOTO2 = @HAVE_GPHOTO2@
 IEEE1284_LIBS = @IEEE1284_LIBS@
-INCLUDES = @INCLUDES@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_LOCKPATH = @INSTALL_LOCKPATH@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 JPEG_LIBS = @JPEG_LIBS@
-LATEX = TEXINPUTS="$(srcdir):$$TEXINPUTS" @LATEX@
+LATEX = @LATEX@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
-LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
 LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
 LIBV4L_LIBS = @LIBV4L_LIBS@
-LINKER_RPATH = @LINKER_RPATH@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOCKPATH_GROUP = @LOCKPATH_GROUP@
+LTALLOCA = @LTALLOCA@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINDEX = @MAKEINDEX@
@@ -234,10 +244,10 @@ MANIFEST_TOOL = @MANIFEST_TOOL@
 MATH_LIB = @MATH_LIB@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 NM = @NM@
 NMEDIT = @NMEDIT@
-NUMBER_VERSION = @NUMBER_VERSION@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OTOOL = @OTOOL@
@@ -250,10 +260,13 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PDFLATEX = @PDFLATEX@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PNG_LIBS = @PNG_LIBS@
+POSUB = @POSUB@
+PPMTOGIF = @PPMTOGIF@
 PRELOADABLE_BACKENDS = @PRELOADABLE_BACKENDS@
 PRELOADABLE_BACKENDS_ENABLED = @PRELOADABLE_BACKENDS_ENABLED@
 PTHREAD_LIBS = @PTHREAD_LIBS@
@@ -275,12 +288,16 @@ SYSLOG_LIBS = @SYSLOG_LIBS@
 SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
 SYSTEMD_LIBS = @SYSTEMD_LIBS@
 TIFF_LIBS = @TIFF_LIBS@
+USB_CFLAGS = @USB_CFLAGS@
 USB_LIBS = @USB_LIBS@
+USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 V_MAJOR = @V_MAJOR@
 V_MINOR = @V_MINOR@
 V_REV = @V_REV@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -366,16 +383,19 @@ EXTRA_DIST = scanimage.man sane-config.man sane-find-scanner.man \
 	sane-rts8891.man sane-coolscan3.man sane-kvs1025.man \
 	sane-kvs20xx.man sane-kvs40xx.man sane-p5.man \
 	sane-magicolor.man sane.man saned.man descriptions.txt \
-	releases.txt sane-logo2.jpg sane-logo.png sane.png sane.tex \
-	net.tex html.sty $(DESC_FILES) descriptions/template.desc. \
-	$(DESC_EXT_FILES) descriptions-external/template.desc. \
-	figs/area.eps figs/area.fig figs/flow.eps figs/flow.fig \
-	figs/hierarchy.eps figs/hierarchy.fig figs/image-data.eps \
-	figs/image-data.fig figs/xfer.eps figs/xfer.fig \
-	icons/contents.gif icons/index.gif icons/next.gif \
-	icons/next_gr.gif icons/previous.gif icons/previous_gr.gif \
-	icons/references.gif icons/references_gr.gif icons/up.gif \
-	icons/up_gr.gif
+	releases.txt sane-logo2.jpg sane-logo.png sane.png \
+	$(DESC_FILES) descriptions/template.desc. $(DESC_EXT_FILES) \
+	descriptions-external/template.desc. $(API_SPEC_INPUTS) \
+	$(API_SPEC_TEX_FIGS) $(API_SPEC_HTML_ICONS)
+
+# Create a list of man pages for only backends that are compiled in so
+# that is all that gets installed.  Also, build a complete list of all
+# backend man pages.  This allows a user to optionally generate all
+# man pages in HTML form for things like posting to a web site.
+#
+# Backend man pages bypass standard automake man5_MANS because there is not
+# a man page for every supported backend.  We could get rid of
+# custom install/uninstall if we required man pages for every backend.
 BACKEND_5MANS = sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-as6e.5 \
 	sane-dll.5 sane-dc25.5 sane-dmc.5 sane-epson.5 sane-epson2.5 sane-epsonds.5 \
 	sane-hp.5 sane-gphoto2.5 sane-leo.5 sane-lexmark.5 \
@@ -387,7 +407,7 @@ BACKEND_5MANS = sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-as6e.5 \
 	sane-mustek_pp.5 sane-dc210.5 sane-v4l.5 sane-snapscan.5 \
 	sane-canon.5 sane-coolscan.5 sane-bh.5 sane-dc240.5 \
 	sane-umax_pp.5 sane-umax1220u.5 sane-sm3600.5 sane-usb.5 \
-     	sane-mustek_usb.5 sane-sceptre.5 sane-canon_pp.5 sane-canon630u.5 \
+	sane-mustek_usb.5 sane-sceptre.5 sane-canon_pp.5 sane-canon630u.5 \
         sane-teco1.5 sane-teco2.5 sane-teco3.5 sane-test.5 sane-sp15c.5 \
 	sane-coolscan2.5 sane-hpsj5s.5 sane-gt68xx.5 sane-artec_eplus48u.5 \
 	sane-ma1509.5 sane-ibm.5 sane-hp5400.5 sane-plustek_pp.5 sane-u12.5 \
@@ -405,12 +425,9 @@ MANPAGES = $(man1_MANS) $(BACKEND_5MANS) $(man7_MANS) $(man8_MANS)
 @CROSS_COMPILING_FALSE@	     sane-mfgs.html sane-mfgs-external.html
 
 @CROSS_COMPILING_TRUE@HTML_PAGES = 
-doc_DATA = $(HTML_PAGES) $(STANDARD)
-@USE_LATEX_FALSE@STANDARD = 
-@USE_LATEX_TRUE@STANDARD = sane.ps
+doc_DATA = $(HTML_PAGES) $(API_SPECS)
 dist_doc_DATA = backend-writing.txt
 nobase_dist_doc_DATA = $(BEDOCS)
-DLH = TEXINPUTS="$(srcdir):$$TEXINPUTS" dlh
 MAN2HTML = nroff -c -man |\
 	  man2html -compress -topm 6 -botm 6 -nodepage -title $${page} \
           -cgiurl '$$title.$$section.html'|\
@@ -502,12 +519,27 @@ DESC_EXT_FILES = descriptions-external/brother2.desc \
   descriptions-external/primax.desc \
   descriptions-external/samsung.desc \
   descriptions-external/scanwit.desc \
+  descriptions-external/utsushi.desc \
   descriptions-external/v4l2.desc \
   descriptions-external/viceo.desc
 
+API_SPECS = $(am__append_1) $(am__append_2) $(am__append_3)
+API_SPEC_INPUTS = $(srcdir)/sane.tex $(srcdir)/net.tex
+API_SPEC_TEX_FIGS = figs/area.fig figs/flow.fig figs/hierarchy.fig \
+	figs/image-data.fig figs/xfer.fig
+API_SPEC_EPS_FIGS = figs/area.eps figs/flow.eps figs/hierarchy.eps \
+	figs/image-data.eps figs/xfer.eps
+API_SPEC_PDF_FIGS = figs/area.pdf figs/flow.pdf figs/hierarchy.pdf \
+	figs/image-data.pdf figs/xfer.pdf
+API_SPEC_HTML_ICONS = icons/contents.gif icons/index.gif \
+	icons/next.gif icons/next_gr.gif icons/previous.gif \
+	icons/previous_gr.gif icons/references.gif \
+	icons/references_gr.gif icons/up.gif icons/up_gr.gif
+am_TEXINPUTS = TEXINPUTS="$(builddir):$(srcdir):$$TEXINPUTS"
 all: all-am
 
 .SUFFIXES:
+.SUFFIXES: .eps .fig .pdf
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -823,7 +855,9 @@ dvi: dvi-am
 
 dvi-am:
 
-html-am:
+html: html-am
+
+html-am: html-local
 
 info: info-am
 
@@ -884,14 +918,15 @@ uninstall-man: uninstall-man1 uninstall-man7 uninstall-man8
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	clean-local cscopelist-am ctags-am distclean distclean-generic \
 	distclean-libtool distclean-local distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-dist_docDATA \
-	install-docDATA install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-man1 install-man7 \
-	install-man8 install-nobase_dist_docDATA install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
+	html-am html-local info info-am install install-am \
+	install-data install-data-am install-data-local \
+	install-dist_docDATA install-docDATA install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-man1 install-man7 install-man8 \
+	install-nobase_dist_docDATA install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
 	uninstall-am uninstall-dist_docDATA uninstall-docDATA \
@@ -899,7 +934,7 @@ uninstall-man: uninstall-man1 uninstall-man7 uninstall-man8
 	uninstall-man8 uninstall-nobase_dist_docDATA
 
 
-all: bemans $(STANDARD) html-pages
+all: bemans $(API_SPECS) html-pages
 
 %.1 %.5 %.7 %.8: %.man
 	@echo "Generating manpage $@...";
@@ -926,23 +961,35 @@ install-data-local: install-beman5
 uninstall-local:
 	rm -rf $(DESTDIR)$(beman5dir)/sane-*.5
 
-sane.ind: $(srcdir)/sane.tex
-	@echo Generating index for sane.tex...
+sane.ind: $(API_SPEC_INPUTS)
+	@echo Generating index for $<...
 	@touch sane.ind
-	@$(LATEX) $(srcdir)/sane </dev/null >/dev/null && \
-	  $(MAKEINDEX) sane.idx 2>/dev/null && \
-	  $(LATEX) $(srcdir)/sane </dev/null >/dev/null
+	@$(am_TEXINPUTS) $(LATEX) $< </dev/null >/dev/null && \
+	  $(MAKEINDEX) -q sane.idx && \
+	  $(am_TEXINPUTS) $(LATEX) $< </dev/null >/dev/null
+
+.fig.eps:
+	@test -d $(@D) || $(MKDIR_P) $(@D)
+	$(FIG2DEV) -L eps $< $@
 
-sane.dvi: sane.ind
-	@echo Generating sane.dvi from sane.tex...
-	@$(LATEX) $(srcdir)/sane </dev/null >/dev/null
+sane.dvi: $(API_SPEC_INPUTS) $(API_SPEC_EPS_FIGS) sane.ind
+	@echo Generating $@ from $<...
+	@$(am_TEXINPUTS) $(LATEX) $< </dev/null >/dev/null
 
 sane.ps: sane.dvi
-	@echo Generating sane.ps from sane.dvi...
-	@$(DVIPS) sane.dvi -o sane.ps 2>/dev/null
+	@echo Generating $@ from $<...
+	@$(am_TEXINPUTS) $(DVIPS) -q $< -o $@
+
+.fig.pdf:
+	@test -d $(@D) || $(MKDIR_P) $(@D)
+	$(FIG2DEV) -L pdf $< $@
+
+sane.pdf: $(API_SPEC_INPUTS) $(API_SPEC_PDF_FIGS) sane.ind
+	@echo Generating $@ from $<...
+	@$(am_TEXINPUTS) $(PDFLATEX) $< >/dev/null
 
 sane-html: sane.dvi
-	$(DLH) $(srcdir)/sane.tex
+	$(am_TEXINPUTS) $(DLH) $(srcdir)/sane.tex
 
 html-man: $(MANPAGES)
 	@for page in $(MANPAGES); do \
@@ -985,16 +1032,18 @@ descriptions.db: $(DESC_FILES) ../tools/sane-desc
 	@../tools/sane-desc -m ascii -s ${srcdir}/descriptions \
 	  > descriptions.db
 
-descriptions-external.db: $(DESC_FILES) ../tools/sane-desc
+descriptions-external.db: $(DESC_EXT_FILES) ../tools/sane-desc
 	@../tools/sane-desc -m ascii -s ${srcdir}/descriptions-external \
 	  > descriptions-external.db
 
 html-pages: $(HTML_PAGES)
-html: html-pages html-man sane-html
+html-local: html-pages html-man sane-html
 
 clean-local:
 	rm -f *.toc *.aux *.log *.cp *.fn *.tp *.vr *.pg *.ky *.blg *.idx *.cb
 	rm -f *.ilg
+	rm -f $(API_SPEC_EPS_FIGS) $(API_SPEC_PDF_FIGS)
+	-rmdir figs
 
 distclean-local:
 	rm -f $(MANPAGES)
diff --git a/doc/backend-writing.txt b/doc/backend-writing.txt
index 7b49041..7e34d6a 100644
--- a/doc/backend-writing.txt
+++ b/doc/backend-writing.txt
@@ -43,8 +43,8 @@ CONFIGURATION AND BUILD SYSTEM
 ------------------------------
 
 Sane-backends uses the autoconf and automake tools. The configure script is
-generated from configure.in and aclocal.m4 by running "autoreconf". 
-Simple checks (e.g. for headers) should be placed into configure.in while 
+generated from configure.ac and aclocal.m4 by running "autoreconf".
+Simple checks (e.g. for headers) should be placed into configure.ac while
 for more complex stuff acinclude.m4 is the right file. After changes in one 
 of these files, "autoreconf" should be called.  This will then call a
 chain of autotools, such as autoconf to generate configure, autoheader
@@ -77,14 +77,15 @@ sane-backends distribution.
 
 sane-backends/
   * acinclude.m4 aclocal.m4 compile config.guess config.sub configure 
-    configure.in depcomp install-sh ltmain.sh Makefile.am Makefile.in missing 
+    configure.ac depcomp install-sh ltmain.sh Makefile.am Makefile.in missing
     mkinstalldirs: Part of the build system as explained above.
   * ChangeLog:
-    The ChangeLog contains all the changes made since the last stable release. 
-    If anything is changed in git, it must be also mentioned in ChangeLog. 
-    It's not enough to write just a git commit message, as users won't have 
-    access to these messages. For more details on the format, see the SANE 
-    git page on the website.
+    The ChangeLog contains all the changes made since the last stable release.
+    If anything is changed in git, write a decent commit message documenting
+    your work.  This commit message will be included as is in the ChangeLog
+    file for the next stable release.  Users of development code should refer
+    to the `git log` output or the on-line log.
+    For more details on the format, see the SANE git page on the website.
   * ChangeLog-1.0.0, ChangeLog-1.0.1 (...):
     These files contain the ChangeLogs of older releases. Once a new release has
     been made, the current ChangeLog renamed to ChangeLog-1.something.something
@@ -153,7 +154,7 @@ sane-backends/doc/
      Contains additional information about newbackend, e.g. READMEs or TODO
      files. 
    General files:
-   * Makefile.in:
+   * Makefile.am:
      "sane-newbackend.5" must be added to variable BACKEND_5MANS and
       "sane-newbackend.man" to EXTRA_DIST. A backend documentation directory 
       (if used) must be added to the BEDOCS variable.
@@ -228,7 +229,7 @@ PROGRAMMING
 
 * To add the backend to the existing SANE code, the following must be done at
   least:
-    - add the backend name to ALL_BACKENDS in configure.in (and run autoreconf)
+    - add the backend name to ALL_BACKENDS in configure.ac (and run autoreconf)
     - Add new backend to BACKEND_CONFS, be_convenience_libs, be_dlopen_libs,
       and define _lib${backend}_la_SOURCES and 
       nodist_libsane_${backend}_la_SOURCES; using an existing backend as
@@ -254,20 +255,18 @@ PROGRAMMING
 
 * Please be courteous to programmer's with terminals that are 80
   characters wide.  It's not difficult to avoid long lines, so please
-  do so.  Note that in ANSI C you can split long strings into pieces
+  do so.  Note that in standard C you can split long strings into pieces
   separated by white space.  For example,
   "this is an awfully long string" can be written as "this is an "
   "awfully long string".
 
-* Use only ANSI C for your backend. C99 is not supported by the compilers of
-  some older platforms so please avoid using its features.
+* Use only standard C for your backend.  ISO C99 support will be enabled
+  if supported by the compiler detected by configure.
 
 * Please do not depend on compiler specific features or, if you do, make
   the dependency conditional so other compilers will still be able to
   compile the files.  In particular:
 
-    - do not use C++ style comments (//-line comments)
-
     - do not declare dynamically sized automatic arrays; instead,
       use alloca() after including "../include/lalloca.h".  For example:
 
@@ -295,7 +294,7 @@ PROGRAMMING
       compiler-dependent.
 
 * If you use headers or libraries that may not be available on all systems,
-  write a check for configure.in and include it conditionally. If your backend
+  write a check for configure.ac and include it conditionally. If your backend
   depends on these libraries or headers, compile the backend only if they are 
   available (see pint for an example).
 
@@ -476,7 +475,7 @@ In sane-backends/backend/
 
 In sane-backends/doc/
 * Add an entry for the man page in sane.man
-* Add the man page file in doc/Makefile.in
+* Add the man page file in doc/Makefile.am
 * Move the description file from descriptions-external/ to doc/descriptions/
 * Check that the description file is correct: "cd doc; make html-pages" and
   check the html pages result with a browser.
diff --git a/doc/descriptions-external/brother.desc b/doc/descriptions-external/brother.desc
index e875a4c..a261712 100644
--- a/doc/descriptions-external/brother.desc
+++ b/doc/descriptions-external/brother.desc
@@ -202,12 +202,6 @@
 :usbid "0x04f9" "0x0157"
 :comment "No report yet."
 
-:model "MFC-3820CN"
-:status :untested
-:interface "USB network"
-:usbid "0x04f9" "0x014b"
-:comment "No report yet."
-
 :model "MFC-3820J"
 :status :untested
 :interface "USB"
@@ -217,7 +211,7 @@
 :model "MFC-3820CN"
 :status :good
 :interface "USB network"
-;:usbid "0x04f9" "0x014b"
+:usbid "0x04f9" "0x014b"
 :comment "Network connection is reported to work."
 
 :model "MFC-4420C"
diff --git a/doc/descriptions-external/brother2.desc b/doc/descriptions-external/brother2.desc
index adda1e3..92b5450 100644
--- a/doc/descriptions-external/brother2.desc
+++ b/doc/descriptions-external/brother2.desc
@@ -43,7 +43,7 @@
 :model "DCP-116C"
 :status :untested
 :interface "USB"
-;:usbid "0x04f9" "0x018c"
+:usbid "0x04f9" "0x018d"
 :comment "No report yet."
 
 :model "DCP-117C"
@@ -65,7 +65,7 @@
 :model "DCP-315CN"
 :status :untested
 :interface "USB network"
-;:usbid "0x04f9" ""
+:usbid "0x04f9" "0x0191"
 :comment "No report yet."
 
 :model "DCP-330C"
@@ -77,7 +77,7 @@
 :model "DCP-340CW"
 :status :untested
 :interface "USB"
-;:usbid "0x04f9" ""
+:usbid "0x04f9" "0x0192"
 :comment "No report yet."
 
 :model "DCP-7010"
@@ -140,7 +140,7 @@
 :model "MFC-425CN"
 :status :untested
 :interface "USB network"
-;:usbid "0x04f9" ""
+:usbid "0x04f9" "0x0194"
 :comment "No report yet."
 
 :model "MFC-5440CN"
@@ -177,7 +177,7 @@
 :model "MFC-640CW"
 :status :untested
 :interface "USB"
-;:usbid "0x04f9" ""
+:usbid "0x04f9" "0x0197"
 :comment "No report yet."
 
 :model "MFC-7220"
@@ -213,23 +213,23 @@
 :model "MFC-820CW"
 :status :untested
 :interface "USB"
-;:usbid "0x04f9" "0x0180"
+:usbid "0x04f9" "0x0195"
 :comment "No report yet."
 
 :model "MFC-8460N"
 :status :untested
 :interface "USB"
-;:usbid "0x04f9" "0x0180"
+:usbid "0x04f9" "0x01a5"
 :comment "No report yet."
 
 :model "MFC-8860DN"
 :status :untested
 :interface "USB"
-;:usbid "0x04f9" "0x0180"
+:usbid "0x04f9" "0x01a6"
 :comment "No report yet."
 
 :model "MFC-9420CN"
 :status :untested
 :interface "USB network"
-;:usbid "0x04f9" ""
+:usbid "0x04f9" "0x018a"
 :comment "No report yet."
diff --git a/doc/descriptions-external/hpaio.desc b/doc/descriptions-external/hpaio.desc
index 5b4cc5c..5b4cc5c 100755..100644
--- a/doc/descriptions-external/hpaio.desc
+++ b/doc/descriptions-external/hpaio.desc
diff --git a/doc/descriptions-external/mustek_a3p1.desc b/doc/descriptions-external/mustek_a3p1.desc
index e38b87a..e38b87a 100755..100644
--- a/doc/descriptions-external/mustek_a3p1.desc
+++ b/doc/descriptions-external/mustek_a3p1.desc
diff --git a/doc/descriptions-external/samsung.desc b/doc/descriptions-external/samsung.desc
index 6bb2d0f..d784159 100644
--- a/doc/descriptions-external/samsung.desc
+++ b/doc/descriptions-external/samsung.desc
@@ -22,7 +22,7 @@
 
 :mfg "Samsung"                     ; name a manufacturer
 :url "http://www.samsung.com/"
-:comment "Multi Function Peripheral. External backend made by Samsung."
+:comment "Multi Function Peripheral. External backend made by Samsung.  Please check the Samsung website and/or contact us if you have a Samsung device not mentioned here."
 
 ; name models for above-specified mfg.
 :model "SCX-4016"
@@ -78,11 +78,3 @@
 :interface "Parport USB"
 :status :untested
 :comment "Please contact us if you use this device."
-
-:model "For models not mentioned here, check Samsung website"
-:interface "USB"
-:status :untested
-:comment "Please contact us if you have a Samsung device not mentioned here.""
-
-; :comment and :url specifiers are optional after :mfg, :model, :desc,
-;  and at the top-level.
diff --git a/doc/descriptions-external/utsushi.desc b/doc/descriptions-external/utsushi.desc
new file mode 100644
index 0000000..d82ed18
--- /dev/null
+++ b/doc/descriptions-external/utsushi.desc
@@ -0,0 +1,458 @@
+;;;  utsushi.desc                               -*- emacs-lisp -*- (sort of)
+;;;  Copyright (C) 2015, 2016 Meeuwissen
+;;;
+;;;  License: GPL-3.0+
+;;;  Author : Olaf Meeuwissen
+;;;
+;;;  This file is part of the 'Utsushi' package.
+;;;  This package is free software: you can redistribute it and/or modify
+;;;  it under the terms of the GNU General Public License as published by
+;;;  the Free Software Foundation, either version 3 of the License or, at
+;;;  your option, any later version.
+;;;
+;;;    This program is distributed in the hope that it will be useful,
+;;;    but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;    GNU General Public License for more details.
+;;;
+;;;  You ought to have received a copy of the GNU General Public License
+;;;  along with this package.  If not, see <http://www.gnu.org/licenses/>.
+
+;;  Backend data
+;;
+:backend "utsushi"
+:url     "https://github.com/utsushi/utsushi"
+
+;;  Device and manufacturer information.
+;;
+:devicetype :scanner
+:mfg        "EPSON"
+:url        "http://www.epson.com/"
+
+;;  List of EPSON scanners and all-in-ones.
+
+:model     "DS-40"
+:interface "USB"
+:usbid     "0x04b8" "0x0152"
+:status    :good
+
+:model     "DS-510"
+:interface "USB"
+:usbid     "0x04b8" "0x014c"
+:status    :good
+
+:model     "DS-520"
+:interface "USB"
+:usbid     "0x04b8" "0x0154"
+:status    :good
+
+:model     "DS-560"
+:interface "USB"
+:usbid     "0x04b8" "0x0150"
+:status    :good
+
+:model     "DS-760"
+:interface "USB"
+:usbid     "0x04b8" "0x014d"
+:status    :good
+
+:model     "DS-780N"
+:interface "USB"
+:usbid     "0x04b8" "0x0164"
+:status    :good
+
+:model     "DS-860"
+:interface "USB"
+:usbid     "0x04b8" "0x014d"
+:status    :good
+
+:model     "DS-5500"
+:interface "USB"
+:usbid     "0x04b8" "0x0145"
+:status    :good
+
+:model     "DS-6500"
+:interface "USB"
+:usbid     "0x04b8" "0x0145"
+:status    :good
+
+:model     "DS-7500"
+:interface "USB"
+:usbid     "0x04b8" "0x0145"
+:status    :good
+
+:model     "DS-50000"
+:interface "USB"
+:usbid     "0x04b8" "0x0146"
+:status    :good
+
+:model     "DS-60000"
+:interface "USB"
+:usbid     "0x04b8" "0x0146"
+:status    :good
+
+:model     "DS-70000"
+:interface "USB"
+:usbid     "0x04b8" "0x0146"
+:status    :good
+
+:model     "EP-10VA"
+:interface "USB"
+:usbid     "0x04b8" "0x1108"
+:status    :good
+
+:model     "EP-808A"
+:interface "USB"
+:usbid     "0x04b8" "0x110a"
+:status    :good
+
+:model     "EP-978A3"
+:interface "USB"
+:usbid     "0x04b8" "0x1109"
+:status    :good
+
+:model     "ES-400"
+:interface "USB"
+:usbid     "0x04b8" "0x0156"
+:status    :good
+
+:model     "ET-2500"
+:interface "USB"
+:usbid     "0x04b8" "0x1105"
+:status    :good
+
+:model     "ET-2550"
+:interface "USB"
+:usbid     "0x04b8" "0x1106"
+:status    :good
+
+:model     "ET-4500"
+:interface "USB"
+:usbid     "0x04b8" "0x1107"
+:status    :good
+
+:model     "ET-4550"
+:interface "USB"
+:usbid     "0x04b8" "0x1101"
+:status    :good
+
+:model     "L220"
+:interface "USB"
+:usbid     "0x04b8" "0x08d1"
+:status    :good
+
+:model     "L360"
+:interface "USB"
+:usbid     "0x04b8" "0x08d1"
+:status    :good
+
+:model     "L365"
+:interface "USB"
+:usbid     "0x04b8" "0x08d2"
+:status    :good
+
+:model     "L366"
+:interface "USB"
+:usbid     "0x04b8" "0x08d2"
+:status    :good
+
+:model     "L455"
+:interface "USB"
+:usbid     "0x04b8" "0x08c2"
+:status    :good
+
+:model     "L565"
+:interface "USB"
+:usbid     "0x04b8" "0x08d3"
+:status    :good
+
+:model     "L566"
+:interface "USB"
+:usbid     "0x04b8" "0x08d3"
+:status    :good
+
+:model     "L655"
+:interface "USB"
+:usbid     "0x04b8" "0x1101"
+:status    :good
+
+:model     "PX-M7050"
+:interface "USB"
+:usbid     "0x04b8" "0x08bc"
+:status    :good
+
+:model     "PX-M7050FX"
+:interface "USB"
+:usbid     "0x04b8" "0x08cc"
+:status    :good
+
+:model     "PX-M840FX"
+:interface "USB"
+:usbid     "0x04b8" "0x08cd"
+:status    :good
+
+:model     "PX-M860F"
+:interface "USB"
+:usbid     "0x04b8" "0x08ce"
+:status    :good
+
+:model     "WF-6530"
+:interface "USB"
+:usbid     "0x04b8" "0x08cd"
+:status    :good
+
+:model     "WF-6590"
+:interface "USB"
+:usbid     "0x04b8" "0x08cf"
+:status    :good
+
+:model     "WF-8510"
+:interface "USB"
+:usbid     "0x04b8" "0x08bc"
+:status    :good
+
+:model     "WF-8590"
+:interface "USB"
+:usbid     "0x04b8" "0x08bc"
+:status    :good
+
+:model     "WF-R8590"
+:interface "USB"
+:usbid     "0x04b8" "0x08cc"
+:status    :good
+
+:model     "XP-220"
+:interface "USB"
+:usbid     "0x04b8" "0x08c0"
+:status    :good
+
+:model     "XP-230"
+:interface "USB"
+:usbid     "0x04b8" "0x1102"
+:status    :good
+
+:model     "XP-235"
+:interface "USB"
+:usbid     "0x04b8" "0x1102"
+:status    :good
+
+:model     "XP-322"
+:interface "USB"
+:usbid     "0x04b8" "0x1103"
+:status    :good
+
+:model     "XP-335"
+:interface "USB"
+:usbid     "0x04b8" "0x1103"
+:status    :good
+
+:model     "XP-430"
+:interface "USB"
+:usbid     "0x04b8" "0x1104"
+:status    :good
+
+:model     "XP-432"
+:interface "USB"
+:usbid     "0x04b8" "0x1104"
+:status    :good
+
+:model     "XP-435"
+:interface "USB"
+:usbid     "0x04b8" "0x1104"
+:status    :good
+
+:model     "XP-530"
+:interface "USB"
+:usbid     "0x04b8" "0x110c"
+:status    :good
+
+:model     "XP-830"
+:interface "USB"
+:usbid     "0x04b8" "0x110b"
+:status    :good
+
+:model     "XP-960"
+:interface "USB"
+:usbid     "0x04b8" "0x1109"
+:status    :good
+
+; These are models for which we don't know the model name yet.
+; Upstream releases have stopped providing the information we
+; need to fill out the :model fields :-(
+
+:model     "PID 0155"
+:interface "USB"
+:usbid     "0x04b8" "0x0155"
+:status    :good
+
+:model     "PID 0157"
+:interface "USB"
+:usbid     "0x04b8" "0x0157"
+:status    :good
+
+:model     "PID 0159"
+:interface "USB"
+:usbid     "0x04b8" "0x0159"
+:status    :good
+
+:model     "PID 015A"
+:interface "USB"
+:usbid     "0x04b8" "0x015a"
+:status    :good
+
+:model     "PID 015C"
+:interface "USB"
+:usbid     "0x04b8" "0x015c"
+:status    :good
+
+:model     "PID 015D"
+:interface "USB"
+:usbid     "0x04b8" "0x015d"
+:status    :good
+
+:model     "PID 015E"
+:interface "USB"
+:usbid     "0x04b8" "0x015e"
+:status    :good
+
+:model     "PID 015F"
+:interface "USB"
+:usbid     "0x04b8" "0x015f"
+:status    :good
+
+:model     "PID 0162"
+:interface "USB"
+:usbid     "0x04b8" "0x0162"
+:status    :good
+
+:model     "PID 0163"
+:interface "USB"
+:usbid     "0x04b8" "0x0163"
+:status    :good
+
+:model     "PID 110D"
+:interface "USB"
+:usbid     "0x04b8" "0x110d"
+:status    :good
+
+:model     "PID 110F"
+:interface "USB"
+:usbid     "0x04b8" "0x110f"
+:status    :good
+
+:model     "PID 1112"
+:interface "USB"
+:usbid     "0x04b8" "0x1112"
+:status    :good
+
+:model     "PID 1113"
+:interface "USB"
+:usbid     "0x04b8" "0x1113"
+:status    :good
+
+:model     "PID 1114"
+:interface "USB"
+:usbid     "0x04b8" "0x1114"
+:status    :good
+
+:model     "PID 1115"
+:interface "USB"
+:usbid     "0x04b8" "0x1115"
+:status    :good
+
+:model     "PID 1116"
+:interface "USB"
+:usbid     "0x04b8" "0x1116"
+:status    :good
+
+:model     "PID 1117"
+:interface "USB"
+:usbid     "0x04b8" "0x1117"
+:status    :good
+
+:model     "PID 1118"
+:interface "USB"
+:usbid     "0x04b8" "0x1118"
+:status    :good
+
+:model     "PID 1119"
+:interface "USB"
+:usbid     "0x04b8" "0x1119"
+:status    :good
+
+:model     "PID 111A"
+:interface "USB"
+:usbid     "0x04b8" "0x111a"
+:status    :good
+
+:model     "PID 111B"
+:interface "USB"
+:usbid     "0x04b8" "0x111b"
+:status    :good
+:comment   "EP-879A?"
+
+:model     "PID 111C"
+:interface "USB"
+:usbid     "0x04b8" "0x111c"
+:status    :good
+
+:model     "PID 111D"
+:interface "USB"
+:usbid     "0x04b8" "0x111d"
+:status    :good
+
+:model     "PID 111E"
+:interface "USB"
+:usbid     "0x04b8" "0x111e"
+:status    :good
+
+:model     "PID 111F"
+:interface "USB"
+:usbid     "0x04b8" "0x111f"
+:status    :good
+
+:model     "PID 1120"
+:interface "USB"
+:usbid     "0x04b8" "0x1120"
+:status    :good
+
+:model     "PID 1121"
+:interface "USB"
+:usbid     "0x04b8" "0x1121"
+:status    :good
+
+:model     "PID 1122"
+:interface "USB"
+:usbid     "0x04b8" "0x1122"
+:status    :good
+
+:model     "PID 1123"
+:interface "USB"
+:usbid     "0x04b8" "0x1123"
+:status    :good
+:comment   "EP-30VA?"
+
+:model     "PID 1125"
+:interface "USB"
+:usbid     "0x04b8" "0x1125"
+:status    :good
+
+:model     "PID 1126"
+:interface "USB"
+:usbid     "0x04b8" "0x1126"
+:status    :good
+
+:model     "PID 1127"
+:interface "USB"
+:usbid     "0x04b8" "0x1127"
+:status    :good
+
+:model     "PID 1128"
+:interface "USB"
+:usbid     "0x04b8" "0x1128"
+:status    :good
+
+:model     "PID 112B"
+:interface "USB"
+:usbid     "0x04b8" "0x112b"
+:status    :good
diff --git a/doc/descriptions/as6e.desc b/doc/descriptions/as6e.desc
index 5270a80..e269807 100644
--- a/doc/descriptions/as6e.desc
+++ b/doc/descriptions/as6e.desc
@@ -9,7 +9,7 @@
 ;
 
 :backend "as6e"			; name of backend
-:version "0.5"			; version of backend
+:version "0.5 (unmaintained)"	; version of backend
 :manpage "sane-as6e"		; name of manpage (if it exists)
 :url "http://as6edriver.sourceforge.net/"
 
diff --git a/doc/descriptions/bh.desc b/doc/descriptions/bh.desc
index d20715e..cea51d7 100644
--- a/doc/descriptions/bh.desc
+++ b/doc/descriptions/bh.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "bh"                     ; name of backend
-:version "1.0-4"                    ; version of backend
+:version "1.0-4 (unmaintained)"   ; version of backend
 :manpage "sane-bh"                ; name of manpage (if it exists)
 :url "http://www.martoneconsulting.com/sane-bh.html" ; backend's web page
 :comment "Supports Copiscan II scanners with Remote SCSI Controller (RSC) interface"
diff --git a/doc/descriptions/canon630u.desc b/doc/descriptions/canon630u.desc
index b4fa418..c4c3026 100644
--- a/doc/descriptions/canon630u.desc
+++ b/doc/descriptions/canon630u.desc
@@ -11,7 +11,7 @@
 
 :backend "canon630u"                ; name of backend
 :manpage "sane-canon630u"
-:version "0.1"                  ; version of backend
+:version "0.1 (unmaintained)"       ; version of backend
 ;:status :beta
 :url "http://canon-fb630u.sourceforge.net/" ; backend home page
 
diff --git a/doc/descriptions/canon_dr.desc b/doc/descriptions/canon_dr.desc
index 86a8507..8bf6964 100644
--- a/doc/descriptions/canon_dr.desc
+++ b/doc/descriptions/canon_dr.desc
@@ -90,8 +90,8 @@
 
 :model "DR-2010M"
 :interface "USB"
-:status :untested
-:comment "Mac version of DR-2010C? Please test!"
+:status :complete
+:comment "DR-2010C with a different label, same USB IDs"
 
 :model "DR-2050C"
 :interface "USB"
@@ -181,8 +181,8 @@
 :model "DR-5010C"
 :interface "USB"
 :usbid "0x04a9" "0x1606"
-:status :untested
-:comment "Please test!"
+:status :basic
+:comment "ADF and Duplex work, needs more testing"
 
 :model "DR-5020"
 :interface "SCSI"
@@ -289,7 +289,8 @@
 :model "DR-F120"
 :interface "USB"
 :usbid "0x1083" "0x1654"
-:status :untested
+:status :basic
+:comment "Flatbed not working. ADF working. Simplex+duplex, all resolutions <= 600, gray/color, calibration poor."
 
 :model "DR-G1100"
 :interface "USB"
@@ -323,13 +324,14 @@
 
 :model "P-150"
 :interface "USB"
-;:usbid "0x1083" "0x"
+;:usbid "0x1083" "0x162c"
 :status :untested
+:comment "Same as P-150M?"
 
 :model "P-150M"
 :interface "USB"
-;:usbid "0x1083" "0x"
-:status :untested
+:usbid "0x1083" "0x162c"
+:status :good
 
 :model "P-201"
 :interface "USB"
@@ -348,6 +350,12 @@
 :status :basic
 :comment "All modes and resolutions working, but calibration is poor."
 
+:model "P-208"
+:interface "USB"
+:usbid "0x1083" "0x164e"
+:status :basic
+:comment "This is the same device as the 0x164c P-208, but the mode switch on the scanner is in the wrong position, you must move the switch."
+
 :model "DR-P208II"
 :interface "USB"
 :usbid "0x1083" "0x165d"
diff --git a/doc/descriptions/canon_pp.desc b/doc/descriptions/canon_pp.desc
index ddd7a46..6a3613a 100644
--- a/doc/descriptions/canon_pp.desc
+++ b/doc/descriptions/canon_pp.desc
@@ -10,7 +10,7 @@
 
 :backend "canon_pp"		; name of backend
 :manpage "sane-canon_pp"
-:version "0.33"			; version of backend
+:version "0.33 (unmaintained)"	; version of backend
 
 :url "http://canon-fb330p.sourceforge.net" ; backend home page
 
diff --git a/doc/descriptions/cardscan.desc b/doc/descriptions/cardscan.desc
index a0a87db..df106de 100644
--- a/doc/descriptions/cardscan.desc
+++ b/doc/descriptions/cardscan.desc
@@ -11,14 +11,14 @@
 
 :backend "cardscan"              ; name of backend
 :url "http://www.thebility.com/cardscan/" 
-:version "2"                 ; version of backend
+:version "3"                 ; version of backend
 :manpage "sane-cardscan"         ; name of manpage (if it exists)
 :comment "Backend updated for SANE release 1.0.21, see sane-cardscan manpage"
 :devicetype :scanner             ; start of a list of devices....
                                  ; other types:  :stillcam, :vidcam,
                                  ;               :meta, :api
 
-:mfg "Corex"                   ; name a manufacturer
+:mfg "Corex/Dymo"                   ; name a manufacturer
 :url "http://www.cardscan.com/"
 
 :model "800c"
@@ -33,3 +33,11 @@
 :status :basic
 :comment "4 inch wide 8bit Gray or 24bit Color simplex card/receipt scanner"
 
+:mfg "Sanford"                   ; name a manufacturer
+
+:model "800c"
+:interface "USB"
+:usbid "0x0451" "0x6250"
+:status :good
+:comment "4 inch wide 8bit Gray or 24bit Color simplex card/receipt scanner"
+
diff --git a/doc/descriptions/coolscan.desc b/doc/descriptions/coolscan.desc
index 8d7b060..6ccb496 100644
--- a/doc/descriptions/coolscan.desc
+++ b/doc/descriptions/coolscan.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "coolscan"               ; name of backend
-:version "0.4.3"                  ; version of backend
+:version "0.4.3 (unmaintained)"   ; version of backend
 :url "http://andreas.rick.free.fr/sane/" ; backend's web page
 :manpage "sane-coolscan"
 :devicetype :scanner              ; start of a list of devices....
diff --git a/doc/descriptions/coolscan2.desc b/doc/descriptions/coolscan2.desc
index e6c7359..7e34b33 100644
--- a/doc/descriptions/coolscan2.desc
+++ b/doc/descriptions/coolscan2.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "coolscan2"
-:version "0.1.8"
+:version "0.1.8 (unmaintained)"
 :manpage "sane-coolscan2"
 :url "http://coolscan2.sourceforge.net/"
 
diff --git a/doc/descriptions/coolscan3.desc b/doc/descriptions/coolscan3.desc
index d8359bd..136d75f 100644
--- a/doc/descriptions/coolscan3.desc
+++ b/doc/descriptions/coolscan3.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "coolscan3"
-:version "1.0.0"
+:version "1.0.0 (unmaintained)"
 :manpage "sane-coolscan3"
 
 :devicetype :scanner
diff --git a/doc/descriptions/dc210.desc b/doc/descriptions/dc210.desc
index e7dbced..1f6191e 100644
--- a/doc/descriptions/dc210.desc
+++ b/doc/descriptions/dc210.desc
@@ -1,7 +1,7 @@
 ;Kodak DC210 backend .desc file by Brian J. Murrell
 
 :backend "dc210"		; name of backend
-:version "0.0"                  ; version of backend
+:version "0.0 (unmaintained)"	; version of backend
 :manpage "sane-dc210"		; name of manpage (if it exists)
 :url "mailto:peter@fales-lorenz.net"   ; backend's web page
 
diff --git a/doc/descriptions/dc240.desc b/doc/descriptions/dc240.desc
index 5a0b52c..6250ce5 100644
--- a/doc/descriptions/dc240.desc
+++ b/doc/descriptions/dc240.desc
@@ -1,7 +1,7 @@
 ;Kodak DC240 backend .desc file by Peter S. Fales
 
 :backend "dc240"		; name of backend
-:version "0.0"                  ; version of backend
+:version "0.0 (unmaintained)"	; version of backend
 :manpage "sane-dc240"		; name of manpage (if it exists)
 :url "mailto:peter@fales-lorenz.net"   ; backend's web page
 
diff --git a/doc/descriptions/dc25.desc b/doc/descriptions/dc25.desc
index c6996ad..e270521 100644
--- a/doc/descriptions/dc25.desc
+++ b/doc/descriptions/dc25.desc
@@ -1,7 +1,7 @@
 ;Kodak DC25 backend .desc file by Peter Fales
 
 :backend "dc25"				; name of backend
-:version "1.2"  			; version of backend
+:version "1.2 (unmaintained)"		; version of backend
 :manpage "sane-dc25"			; name of manpage (if it exists)
 :url "mailto:peter@fales-lorenz.net";
 :devicetype :stillcam			; start of a list of devices....
diff --git a/doc/descriptions/dell1600n_net.desc b/doc/descriptions/dell1600n_net.desc
index 6aacf18..6759564 100644
--- a/doc/descriptions/dell1600n_net.desc
+++ b/doc/descriptions/dell1600n_net.desc
@@ -3,7 +3,7 @@
 ; Jon Chambers <jon@jon.demon.co.uk>, 2006-05-29
 ;
 :backend "dell1600n_net"
-
+:version "unmaintained"
 :devicetype :scanner
 
 :mfg "Dell"
diff --git a/doc/descriptions/dll.desc b/doc/descriptions/dll.desc
index 4995873..721b7d4 100644
--- a/doc/descriptions/dll.desc
+++ b/doc/descriptions/dll.desc
@@ -1,5 +1,5 @@
 :backend "dll"               ; name of backend
-:version "1.0.13"
+:version "1.0.13 (unmaintained)"
 :manpage "sane-dll"
 :url "mailto:henning@meier-geinitz.de"
 
diff --git a/doc/descriptions/epjitsu.desc b/doc/descriptions/epjitsu.desc
index b11ee96..03bc8fb 100644
--- a/doc/descriptions/epjitsu.desc
+++ b/doc/descriptions/epjitsu.desc
@@ -10,8 +10,7 @@
 ;
 
 :backend "epjitsu"               ; name of backend
-:url "http://www.thebility.com/epjitsu/" 
-:version "27"                    ; version of backend
+:version "31"                    ; version of backend
 :manpage "sane-epjitsu"          ; name of manpage (if it exists)
 :comment "Backend updated for SANE release 1.0.26, see sane-epjitsu manpage"
 :devicetype :scanner             ; start of a list of devices....
@@ -24,15 +23,15 @@
 ;==================================================
 :model "fi-60F"
 :interface "USB"
-:status :basic
+:status :good
 :usbid "0x04c5" "0x10c7"
-:comment "A6-size flatbed, 300/600 dpi, color/gray/binary"
+:comment "A6-size flatbed. Hardware provides 150/200/300/400/600 dpi in color. Software creates other resolutions, plus grayscale and binary modes. Hardware grayscale mode is not used due to poor calibration."
 
 :model "ScanSnap S300"
 :interface "USB"
 :status :good
 :usbid "0x04c5" "0x1156"
-:comment "Duplex, 150/225/300/600 dpi, color/gray/binary, AC/USB power, buttons/sensors all supported. Scanner always scans in _triplex_ color, fast USB required."
+:comment "Letter-size ADF. Hardware provides duplex, 150/225/300/600 dpi in color on AC or USB power. Software creates other resolutions, plus grayscale and binary modes. All buttons and sensors are exposed. Scanner always scans in _triplex_ color, fast USB required."
 
 :model "ScanSnap S300M"
 :interface "USB"
@@ -40,11 +39,11 @@
 :usbid "0x04c5" "0x117f"
 :comment "Same as S300, with different usb id"
 
-:model "ScanSnap S1100"
+:model "fi-65F"
 :interface "USB"
 :status :good
-:usbid "0x04c5" "0x1200"
-:comment "Hardware only supports 300 and 600 dpi simplex color. Backend manufactures gray and binary modes."
+:usbid "0x04c5" "0x11bd"
+:comment "Same as fi-60f, with different usb id. Button support untested."
 
 :model "ScanSnap S1300"
 :interface "USB"
@@ -52,14 +51,20 @@
 :usbid "0x04c5" "0x11ed"
 :comment "Same as S300, with different usb id"
 
+:model "ScanSnap S1100"
+:interface "USB"
+:status :good
+:usbid "0x04c5" "0x1200"
+:comment "Letter-size ADF. Hardware provides simplex, 300/600 dpi in color on USB power. Software creates other resolutions, plus grayscale and binary modes. All buttons and sensors are exposed. Scanner always scans in _triplex_ color, fast USB required."
+
 :model "ScanSnap S1300i"
 :interface "USB"
 :status :good
 :usbid "0x04c5" "0x128d"
-:comment "Similar to S1300."
+:comment "Same as S300, with different usb id"
 
-:model "fi-65F"
+:model "ScanSnap S1100i"
 :interface "USB"
-:status :basic
-;:usbid "0x04c5" "0x10c7"
-:comment "A6-size flatbed, 300/600 dpi, color/gray/binary."
+:status :good
+:usbid "0x04c5" "0x1447"
+:comment "Same as S1100, with different usb id"
diff --git a/doc/descriptions/epson.desc b/doc/descriptions/epson.desc
index 1c9d8a2..65f466f 100644
--- a/doc/descriptions/epson.desc
+++ b/doc/descriptions/epson.desc
@@ -10,8 +10,7 @@
 ;
 
 :backend "epson"                  ; name of backend
-;:version "0.2.42"                ; version of backend
-:version "unmaintained"           ; version of backend
+:version "0.2.42 (unmaintained)"  ; version of backend
 :new :no
 :manpage "sane-epson"             ; name of manpage (if it exists)
 :url "http://www.khk.net/sane"    ; backend's web page
diff --git a/doc/descriptions/epson2.desc b/doc/descriptions/epson2.desc
index de61b76..772a77f 100644
--- a/doc/descriptions/epson2.desc
+++ b/doc/descriptions/epson2.desc
@@ -10,7 +10,7 @@
 ; DO NOT EDIT - It's automatically generated.
 
 :backend "epson2"
-:version "1.0.124"
+:version "1.0.124 (unmaintained)"
 :new :no
 :manpage "sane-epson2"
 
diff --git a/doc/descriptions/epsonds.desc b/doc/descriptions/epsonds.desc
index 0b7c6c6..99121d1 100644
--- a/doc/descriptions/epsonds.desc
+++ b/doc/descriptions/epsonds.desc
@@ -6,8 +6,8 @@
 ;
 
 :backend "epsonds"
-:version "1.0.18"
-:new :yes
+:version "1.0.18 (unmaintained)"
+:new :no
 :manpage "sane-epsonds"
 
 :devicetype :scanner
diff --git a/doc/descriptions/fujitsu.desc b/doc/descriptions/fujitsu.desc
index d4e232b..60f8c5b 100644
--- a/doc/descriptions/fujitsu.desc
+++ b/doc/descriptions/fujitsu.desc
@@ -12,9 +12,9 @@
 
 :backend "fujitsu"               ; name of backend
 :url "http://www.thebility.com/fujitsu/" 
-:version "127"                   ; version of backend
+:version "133"                   ; version of backend
 :manpage "sane-fujitsu"          ; name of manpage (if it exists)
-:comment "Backend updated for SANE release 1.0.25, see sane-fujitsu manpage"
+:comment "Backend updated for SANE release 1.0.26, see sane-fujitsu manpage"
 :devicetype :scanner             ; start of a list of devices....
                                  ; other types:  :stillcam, :vidcam,
                                  ;               :meta, :api
@@ -131,6 +131,12 @@
 :usbid "0x04c5" "0x116f"
 :comment "small, recent, discontinued"
 
+:model "fi-6125"
+:interface "USB"
+:status :complete
+:usbid "0x04c5" "0x11ee"
+:comment "small, recent, discontinued"
+
 :model "fi-6130"
 :interface "USB"
 :status :complete
@@ -155,6 +161,42 @@
 :usbid "0x04c5" "0x11f4"
 :comment "small, recent, discontinued"
 
+:model "fi-6120ZLA"
+:interface "SCSI USB"
+:status :untested
+:usbid "0x04c5" "0x146d"
+:comment "small, recent, discontinued, expected to work"
+
+:model "fi-6220ZLA"
+:interface "SCSI USB"
+:status :untested
+:usbid "0x04c5" "0x146e"
+:comment "small, recent, discontinued, expected to work"
+
+:model "fi-6125ZLA"
+:interface "SCSI USB"
+:status :untested
+:usbid "0x04c5" "0x1463"
+:comment "small, recent, discontinued, expected to work"
+
+:model "fi-6225ZLA"
+:interface "SCSI USB"
+:status :untested
+:usbid "0x04c5" "0x1464"
+:comment "small, recent, discontinued, expected to work"
+
+:model "fi-6130ZLA"
+:interface "SCSI USB"
+:status :complete
+:usbid "0x04c5" "0x1461"
+:comment "small, recent, discontinued"
+
+:model "fi-6230ZLA"
+:interface "SCSI USB"
+:status :untested
+:usbid "0x04c5" "0x1462"
+:comment "small, recent, discontinued, expected to work"
+
 :model "ScanSnap S1500"
 :interface "USB"
 :status :complete
@@ -319,7 +361,7 @@
 :usbid "0x04c5" "0x114e"
 :comment "medium, recent, discontinued"
 
-:model "fi-6140Z"
+:model "fi-6140Z/fi-6140ZLA"
 :interface "SCSI USB"
 :status :complete
 :usbid "0x04c5" "0x11f1"
@@ -331,6 +373,30 @@
 :usbid "0x04c5" "0x11f2"
 :comment "medium, recent, discontinued"
 
+:model "fi-6135ZLA"
+:interface "SCSI USB"
+:status :untested
+:usbid "0x04c5" "0x146b"
+:comment "medium, recent, discontinued, expected to work"
+
+:model "fi-6235ZLA"
+:interface "SCSI USB"
+:status :untested
+:usbid "0x04c5" "0x146c"
+:comment "medium, recent, discontinued, expected to work"
+
+:model "fi-6140ZLA"
+:interface "SCSI USB"
+:status :untested
+:usbid "0x04c5" "0x145f"
+:comment "medium, recent, discontinued, expected to work"
+
+:model "fi-6240ZLA"
+:interface "SCSI USB"
+:status :untested
+:usbid "0x04c5" "0x1460"
+:comment "medium, recent, discontinued, expected to work"
+
 ;==================================================
 ; CURRENT MODELS, MEDIUM
 
@@ -486,5 +552,131 @@
 
 :model "fi-6400"
 :interface "SCSI USB"
+:status :good
+:usbid "0x04c5" "0x14ac"
+
+;==================================================
+; 2015/2016/2017 NEW MODELS, UNORDERED
+
+:model "fi-6420"
+:interface "SCSI USB"
+:status :untested
+:usbid "0x04c5" "0x14bd"
+
+:model "fi-6225"
+:interface "USB"
+:status :untested
+:usbid "0x04c5" "0x11ef"
+
+:model "ScanSnap iX500EE"
+:interface "USB"
+:status :untested
+:usbid "0x04c5" "0x13f3"
+
+:model "ScanPartner SP25"
+:interface "USB"
+:status :unsupported
+:usbid "0x04c5" "0x1409"
+:comment "Possibly Genesys protocol?"
+
+:model "ScanPartner SP30"
+:interface "USB"
+:status :unsupported
+:usbid "0x04c5" "0x140a"
+:comment "Possibly Genesys protocol?"
+
+:model "ScanPartner SP30F"
+:interface "USB"
+:status :unsupported
+:usbid "0x04c5" "0x140c"
+:comment "Possibly Genesys protocol?"
+
+:model "N7100"
+:interface "USB Ethernet"
+:status :untested
+:usbid "0x04c5" "0x146f"
+
+:model "fi-7480"
+:interface "USB"
+:status :good
+:usbid "0x04c5" "0x14b8"
+
+:model "fi-7460"
+:interface "USB"
+:status :good
+:usbid "0x04c5" "0x14be"
+
+:model "fi-7140"
+:interface "USB"
+:status :untested
+:usbid "0x04c5" "0x14df"
+
+:model "fi-7240"
+:interface "USB"
+:status :untested
+:usbid "0x04c5" "0x14e0"
+
+:model "fi-7135"
+:interface "USB"
+:status :untested
+:usbid "0x04c5" "0x14e1"
+
+:model "fi-7235"
+:interface "USB"
+:status :untested
+:usbid "0x04c5" "0x14e2"
+
+:model "fi-7130"
+:interface "USB"
+:status :untested
+:usbid "0x04c5" "0x14e3"
+
+:model "fi-7230"
+:interface "USB"
+:status :untested
+:usbid "0x04c5" "0x14e4"
+
+:model "fi-7125"
+:interface "USB"
+:status :untested
+:usbid "0x04c5" "0x14e5"
+
+:model "fi-7225"
+:interface "USB"
+:status :untested
+:usbid "0x04c5" "0x14e6"
+
+:model "fi-7120"
+:interface "USB"
+:status :untested
+:usbid "0x04c5" "0x14e7"
+
+:model "fi-7220"
+:interface "USB"
+:status :untested
+:usbid "0x04c5" "0x14e8"
+
+:model "fi-400F"
+:interface "USB"
+:status :untested
+:usbid "0x04c5" "0x151e"
+
+:model "fi-7030"
+:interface "USB"
+:status :good
+:usbid "0x04c5" "0x151f"
+
+:model "fi-7700"
+:interface "USB"
+:status :good
+:usbid "0x04c5" "0x1520"
+
+:model "fi-7600"
+:interface "USB"
+:status :good
+:usbid "0x04c5" "0x1521"
+
+:model "fi-7700S"
+:interface "USB"
 :status :untested
-;:usbid "0x04c5" "0x"
+:usbid "0x04c5" "0x1522"
diff --git a/doc/descriptions/genesys.desc b/doc/descriptions/genesys.desc
index 6d400f2..f6fb8a3 100644
--- a/doc/descriptions/genesys.desc
+++ b/doc/descriptions/genesys.desc
@@ -148,7 +148,7 @@
 :model "CanoScan LiDE 120"
 :interface "USB"
 :usbid "0x04a9" "0x190e"
-:status :unsupported
+:status :complete
 :comment "GL124+ based, resolution from 75 to 2400 dpi"
 
 :model "CanoScan LiDE 200"
diff --git a/doc/descriptions/gphoto2.desc b/doc/descriptions/gphoto2.desc
index 48dd8ee..f341649 100644
--- a/doc/descriptions/gphoto2.desc
+++ b/doc/descriptions/gphoto2.desc
@@ -1,7 +1,7 @@
 ;gphoto2 backend .desc file by Peter S. Fales
 
 :backend "gphoto2"		; name of backend
-:version "0.0"                  ; version of backend
+:version "0.0 (unmaintained)"	; version of backend
 :manpage "sane-gphoto2"		; name of manpage (if it exists)
 :url "mailto:peter@fales-lorenz.net"   ; backend's web page
 
diff --git a/doc/descriptions/gt68xx.desc b/doc/descriptions/gt68xx.desc
index 5bc8f0e..16e4af9 100644
--- a/doc/descriptions/gt68xx.desc
+++ b/doc/descriptions/gt68xx.desc
@@ -1,5 +1,5 @@
 :backend "gt68xx"
-:version "1.0-84"
+:version "1.0-84 (unmaintained)"
 :manpage "sane-gt68xx"
 :url "http://www.meier-geinitz.de/sane/gt68xx-backend/"
 :comment "Only the USB scanners mentioned below are supported. For other Mustek BearPaws, look at the Plustek and the MA-1509 backend."
diff --git a/doc/descriptions/hp3900.desc b/doc/descriptions/hp3900.desc
index f2abaad..d1aa9a1 100644
--- a/doc/descriptions/hp3900.desc
+++ b/doc/descriptions/hp3900.desc
@@ -10,7 +10,7 @@
 ; See doc/descriptions.txt for details.
 
 :backend "hp3900"
-:version "0.12"
+:version "0.12 (unmaintained)"
 :manpage "sane-hp3900"
 :url "http://sourceforge.net/projects/hp3900-series/"
 :comment "Still Beta"
diff --git a/doc/descriptions/hp4200.desc b/doc/descriptions/hp4200.desc
index 69f7e1d..6c25882 100644
--- a/doc/descriptions/hp4200.desc
+++ b/doc/descriptions/hp4200.desc
@@ -10,7 +10,7 @@
 
 
 :backend "hp4200"               ; name of backend
-:version "1.0-2"                    ; version of backend
+:version "1.0-2 (unmaintained)" ; version of backend
 :manpage "sane-hp4200"           ; name of manpage (if it exists)
 :url "http://hp4200-backend.sourceforge.net" ; backend's web page
 
diff --git a/doc/descriptions/hp5400.desc b/doc/descriptions/hp5400.desc
index c4cb528..49d386f 100644
--- a/doc/descriptions/hp5400.desc
+++ b/doc/descriptions/hp5400.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "hp5400"		; name of backend
-:version "1.0-2"		; version of backend
+:version "1.0-2 (unmaintained)"	; version of backend
 :manpage "sane-hp5400"		; name of manpage (if it exists)
 :url "http://sourceforge.net/projects/hp5400backend"  ; backend's web page
 :comment "HP5400 and HP5470 scanners. Prototype backend available"
@@ -37,6 +37,7 @@
 
 :model "ScanJet 5490c"		; name models for above-specified mfg.
 :interface "USB"		; interface type of the device:
+:usbid "0x03f0" "0x1105"
 :status :basic
 
 
diff --git a/doc/descriptions/hpljm1005.desc b/doc/descriptions/hpljm1005.desc
index 12876e4..d60142b 100644
--- a/doc/descriptions/hpljm1005.desc
+++ b/doc/descriptions/hpljm1005.desc
@@ -9,7 +9,7 @@
 ; All other information is optional (but what good is the file without it?).
 
 :backend "hpljm1005"
-:version "0"
+:version "0 (unmaintained)"
 :manpage "sane-hpljm1005"
 
 :devicetype :scanner
diff --git a/doc/descriptions/hpsj5s.desc b/doc/descriptions/hpsj5s.desc
index 87057e6..c4bc100 100644
--- a/doc/descriptions/hpsj5s.desc
+++ b/doc/descriptions/hpsj5s.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "hpsj5s"                 ; name of backend
-:version "0.03"                   ; version of backend
+:version "0.03 (unmaintained)"    ; version of backend
 ;:status :alpha                     ; :alpha, :beta, :stable, :new
 :manpage "sane-hpsj5s"                ; name of manpage (if it exists)
 :url "http://hpsj5s.sourceforge.net/" ; backend's web page
diff --git a/doc/descriptions/ibm.desc b/doc/descriptions/ibm.desc
index d3d5b06..c04fa31 100644
--- a/doc/descriptions/ibm.desc
+++ b/doc/descriptions/ibm.desc
@@ -10,7 +10,7 @@
 
 :backend "ibm"                 ; name of backend
 :url "http://www.meier-geinitz.de/sane/ibm-backend/"
-:version "1.0-4"          ; version of backend
+:version "1.0-4 (unmaintained)" ; version of backend
 ;
 :manpage "sane-ibm"            ; name of manpage (if it exists)
 :comment "This backend has had only limited testing. It needs more work especially for the Ricoh scanners. Patches are welcome."
diff --git a/doc/descriptions/leo.desc b/doc/descriptions/leo.desc
index 279300c..cf0cec3 100644
--- a/doc/descriptions/leo.desc
+++ b/doc/descriptions/leo.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "leo"                    ; name of backend
-:version "1.0-10"                  ; version of backend
+:version "1.0-10 (unmaintained)"  ; version of backend
 :manpage "sane-leo"               ; name of manpage (if it exists)
 :url "http://www.zago.net/sane/#leo" ; backend's web page
 
diff --git a/doc/descriptions/lexmark.desc b/doc/descriptions/lexmark.desc
index 2cc4de1..ac0b97c 100644
--- a/doc/descriptions/lexmark.desc
+++ b/doc/descriptions/lexmark.desc
@@ -10,7 +10,7 @@
 
 
 :backend "lexmark"                ; name of backend
-:version "1.0-0"                  ; version of backend (or "unmaintained")
+:version "1.0-0 (unmaintained)"   ; version of backend (or "unmaintained")
 :manpage "sane-lexmark"           ; name of manpage (if it exists)
 :url "http://stef.dev.free.fr/sane/lexmark"
 				  ; backend's web page
diff --git a/doc/descriptions/ma1509.desc b/doc/descriptions/ma1509.desc
index db78a55..d28aeed 100644
--- a/doc/descriptions/ma1509.desc
+++ b/doc/descriptions/ma1509.desc
@@ -9,7 +9,7 @@
 ;
 
 :backend "ma1509"		; name of backend
-:version "1.0-3"			; version of backend
+:version "1.0-3 (unmaintained)"	; version of backend
 :manpage "sane-ma1509"		; name of manpage (if it exists)
 :url "http://www.meier-geinitz.de/sane/ma1509-backend/"  ; backend's web page
 
diff --git a/doc/descriptions/magicolor.desc b/doc/descriptions/magicolor.desc
index be785e9..7f0c341 100644
--- a/doc/descriptions/magicolor.desc
+++ b/doc/descriptions/magicolor.desc
@@ -6,7 +6,7 @@
 ;
 
 :backend "magicolor"
-:version "1.0.0"
+:version "1.0.0 (unmaintained)"
 :manpage "sane-magicolor"
 :url "http://wiki.kainhofer.com/hardware/magicolor_scan"
 
diff --git a/doc/descriptions/matsushita.desc b/doc/descriptions/matsushita.desc
index e7822f8..51f330f 100644
--- a/doc/descriptions/matsushita.desc
+++ b/doc/descriptions/matsushita.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "matsushita"             ; name of backend
-:version "1.0-7"                  ; version of backend
+:version "1.0-7 (unmaintained)"   ; version of backend
 :manpage "sane-matsushita"        ; name of manpage
 :url "http://www.zago.net/sane"    ; backend's web page
 
diff --git a/doc/descriptions/microtek.desc b/doc/descriptions/microtek.desc
index 214bb9a..09203f5 100644
--- a/doc/descriptions/microtek.desc
+++ b/doc/descriptions/microtek.desc
@@ -1,5 +1,5 @@
 :backend "microtek"
-:version "0.13.1"
+:version "0.13.1 (unmaintained)"
 :manpage "sane-microtek" 
 :url "http://www.mir.com/mtek/"
 
diff --git a/doc/descriptions/mustek.desc b/doc/descriptions/mustek.desc
index cefea83..2ba44f1 100644
--- a/doc/descriptions/mustek.desc
+++ b/doc/descriptions/mustek.desc
@@ -9,7 +9,7 @@
 ;
 
 :backend "mustek"		; name of backend
-:version "1.0-138"		; version of backend
+:version "1.0-138 (unmaintained)"	; version of backend
 :manpage "sane-mustek"		; name of manpage (if it exists)
 :url "http://www.meier-geinitz.de/sane/mustek-backend/"
 :comment "Most Mustek SCSI scanners are supported by this backend. For USB scanners, look at the mustek_usb backend."
diff --git a/doc/descriptions/mustek_pp.desc b/doc/descriptions/mustek_pp.desc
index 4a32988..1586b8b 100644
--- a/doc/descriptions/mustek_pp.desc
+++ b/doc/descriptions/mustek_pp.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "mustek_pp"              ; name of backend
-:version "13"                     ; version of backend
+:version "13 (unmaintained)"      ; version of backend
 :manpage "sane-mustek_pp"         ; name of manpage (if it exists)
                                   ; backend's web page
 :url "http://penguin-breeder.org/sane/mustek_pp/"
diff --git a/doc/descriptions/mustek_usb.desc b/doc/descriptions/mustek_usb.desc
index 5cee3d2..b03edbd 100644
--- a/doc/descriptions/mustek_usb.desc
+++ b/doc/descriptions/mustek_usb.desc
@@ -1,5 +1,5 @@
 :backend "mustek_usb"
-:version "1.0-18"
+:version "1.0-18 (unmaintained)"
 :manpage "sane-mustek_usb"
 :url "http://www.meier-geinitz.de/sane/mustek_usb-backend/"
 :comment "Only the USB scanners mentioned below are supported. For BearPaws, look at the Plustek, MA-1509, and gt68xx backends."
diff --git a/doc/descriptions/mustek_usb2.desc b/doc/descriptions/mustek_usb2.desc
index 011cef9..ec5b967 100644
--- a/doc/descriptions/mustek_usb2.desc
+++ b/doc/descriptions/mustek_usb2.desc
@@ -1,5 +1,5 @@
 :backend "mustek_usb2"
-:version "1.0-10"
+:version "1.0-10 (unmaintained)"
 :manpage "sane-mustek_usb2"
 :url "http://www.meier-geinitz.de/sane/mustek_usb2-backend/"
 :comment "Only BearPaw 2448TA Pro is supported at the moment"
diff --git a/doc/descriptions/nec.desc b/doc/descriptions/nec.desc
index e8ce961..3817089 100644
--- a/doc/descriptions/nec.desc
+++ b/doc/descriptions/nec.desc
@@ -1,5 +1,5 @@
 :backend "nec"                  ; name of backend
-:version "0.12"                 ; version of backend
+:version "0.12 (unmaintained)"  ; version of backend
 :url "http://www5a.biglobe.ne.jp/~saetaka/"
 				; backend's homepage
 :manpage "sane-nec"
diff --git a/doc/descriptions/net.desc b/doc/descriptions/net.desc
index 1807c49..cece232 100644
--- a/doc/descriptions/net.desc
+++ b/doc/descriptions/net.desc
@@ -1,5 +1,5 @@
 :backend "net"               ; name of backend
-:version "1.0.14"
+:version "1.0.14 (unmaintained)"
 :manpage "sane-net"
 :url "http://www.penguin-breeder.org/?page=sane-net"
 
diff --git a/doc/descriptions/niash.desc b/doc/descriptions/niash.desc
index 960468c..9be55f2 100644
--- a/doc/descriptions/niash.desc
+++ b/doc/descriptions/niash.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "niash"
-:version "0.3"
+:version "0.3 (unmaintained)"
 :manpage "sane-niash"
 :url "http://sourceforge.net/projects/hp3300backend"
 
diff --git a/doc/descriptions/p5.desc b/doc/descriptions/p5.desc
index 70adf16..7548902 100644
--- a/doc/descriptions/p5.desc
+++ b/doc/descriptions/p5.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "p5"              ; name of backend
-:version "1"               ; version of backend
+:version "1 (unmaintained)"; version of backend
 :manpage "sane-p5"         ; name of manpage (if it exists)
 :comment "New backend for SANE release 1.0.21, see sane-p5 manpage"
 :url "http://www.sane-project.org/" ; backend's web page
diff --git a/doc/descriptions/pie.desc b/doc/descriptions/pie.desc
index 45abb8e..9d9177e 100644
--- a/doc/descriptions/pie.desc
+++ b/doc/descriptions/pie.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "pie"                    ; name of backend
-:version "1.0"                    ; version of backend
+:version "1.0 (unmaintained)"     ; version of backend
 :manpage "sane-pie"               ; name of manpage (if it exists)
 :url "http://www.munton.demon.co.uk/sane"  ; backend's web page
 
diff --git a/doc/descriptions/pieusb.desc b/doc/descriptions/pieusb.desc
index 102cd45..c0d17a9 100644
--- a/doc/descriptions/pieusb.desc
+++ b/doc/descriptions/pieusb.desc
@@ -10,8 +10,8 @@
 ;
 
 :backend "pieusb"                 ; name of backend
-:version "1.0"                    ; version of backend
-:new :yes
+:version "1.0 (unmaintained)"     ; version of backend
+:new :no
 :manpage "sane-pieusb"            ; name of manpage (if it exists)
 :url "https://github.com/kkaempf/sane-backends"  ; backend's web page
 
@@ -24,33 +24,47 @@
 
 :model "PowerSlide 3600"
 :interface "USB"
+:usbid "0x05e3" "0x0142"
 :status :untested
 :comment "Identical to Reflecta DigitDia 3600"
 
 :model "PowerSlide 3650"
 :interface "USB"
-:status :untested
+:usbid "0x05e3" "0x0142"
+:status :basic
 :comment "Identical to Reflecta DigitDia 4000"
 
 :model "PowerSlide 4000"
 :interface "USB"
-:status :untested
+:usbid "0x05e3" "0x0142"
+:status :basic
 :comment "Identical to Reflecta DigitDia 5000"
 
 :model "PowerSlide 5000"
 :interface "USB"
-:status :untested
+:usbid "0x05e3" "0x0142"
+:status :basic
 :comment "Identical to Reflecta DigitDia 6000"
 
 :mfg "Reflecta"
 :url "https://reflecta.de"
 
-:model "Reflecta ProScan 7200"
+:model "Reflecta ProScan 10T"
 :interface "USB"
 :usbid "0x05e3" "0x0145"
 :status :basic
+
+:model "Reflecta ProScan 7200"
+:interface "USB"
+:usbid "0x05e3" "0x0145"
+:status :good
 :comment "Similar to PrimeFilm 7250 scanner from Pacific Image Electronics"
 
+:model "CrystalScan 3600"
+:interface "USB"
+:usbid 0x05e3 0x0145
+:status :basic
+
 :model "CrystalScan 7200"
 :interface "USB"
 :status :untested
@@ -63,16 +77,19 @@
 
 :model "DigitDia 3600"
 :interface "USB"
+:usbid "0x05e3" "0x0142"
 :status :untested
 :comment "Identical to Pacific Image Electronics PowerSlide 3600 scanner"
 
 :model "DigitDia 4000"
 :interface "USB"
-:status :untested
+:usbid "0x05e3" "0x0142"
+:status :basic
 :comment "Identical to Pacific Image Electronics PowerSlide 3650 scanner"
 
 :model "DigitDia 5000"
 :interface "USB"
+:usbid "0x05e3" "0x0142"
 :status :untested
 :comment "Identical to Pacific Image Electronics PowerSlide 4000 scanner"
 
diff --git a/doc/descriptions/pixma.desc b/doc/descriptions/pixma.desc
index 84ddcd4..ad33faa 100644
--- a/doc/descriptions/pixma.desc
+++ b/doc/descriptions/pixma.desc
@@ -11,7 +11,7 @@
 ; See doc/descriptions.txt for details.
 
 :backend "pixma"                  ; name of backend
-:version "0.17.23"                ; version of backend (or "unmaintained")
+:version "0.17.37"                ; version of backend (or "unmaintained")
 :manpage "sane-pixma"             ; name of manpage (if it exists)
 ;:comment "Devices marked as experimantal are disabled by default. See the manual page for how to enable them."
 
@@ -34,6 +34,12 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA E470 Series"
+:interface "USB"
+:usbid "0x04a9" "0x180c"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA E480 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1789"
@@ -70,6 +76,12 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA G3000"
+:interface "USB WIFI"
+:usbid "0x04a9" "0x181d"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA MG2100 Series"
 :interface "USB"
 :usbid "0x04a9" "0x1751"
@@ -100,6 +112,12 @@
 :status :complete
 :comment "All resolutions supported (up to 600DPI)."
 
+:model "PIXMA MG3000 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x180b"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA MG3100 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1752"
@@ -121,8 +139,8 @@
 :model "PIXMA MG3600 Series"
 :interface "USB Ethernet WiFi"
 :usbid "0x04a9" "0x178a"
-:status :untested
-:comment "Testers needed!"
+:status :complete
+:comment "All resolutions supported (up to 1200DPI)."
 
 :model "PIXMA MG4100 Series"
 :interface "USB"
@@ -155,10 +173,10 @@
 :comment "All resolutions supported (up to 2400DPI)."
 
 :model "PIXMA MG5400 Series"
-:interface "USB"
+:interface "USB WiFi"
 :usbid "0x04a9" "0x1764"
-:status :untested
-:comment "Testers needed!"
+:status :complete
+:comment "All resolutions supported (up to 2400DPI)."
 
 :model "PIXMA MG5500 Series"
 :interface "USB WiFi"
@@ -172,6 +190,12 @@
 :status :complete
 :comment "All resolutions supported (up to 1200DPI)."
 
+:model "PIXMA MG5700 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x178e"
+:status :complete
+:comment "All resolutions supported (up to 1200 DPI)."
+
 :model "PIXMA MG6100 Series"
 :interface "USB"
 :usbid "0x04a9" "0x174a"
@@ -208,6 +232,18 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA MG6800 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x178d"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA MG6900 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x178c"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA MG7100 Series"
 :interface "USB"
 :usbid "0x04a9" "0x1772"
@@ -220,6 +256,12 @@
 :status :complete
 :comment "All resolutions supported (up to 2400DPI)."
 
+:model "PIXMA MG7700 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x178b"
+:status :complete
+:comment "All resolutions supported (up to 2400DPI)."
+
 :model "PIXMA MG8100 Series"
 :interface "USB"
 :usbid "0x04a9" "0x174b"
@@ -232,6 +274,18 @@
 :status :complete
 :comment "All resolutions supported (up to 4800DPI)."
 
+:model "PIXUS MP5"
+:interface "USB"
+:usbid "0x04a9" "0x2635"
+:status :untested
+:comment "Testers needed! Identical with imageCLASS MPC190."
+
+:model "PIXUS MP10"
+:interface "USB"
+:usbid "0x04a9" "0x261f"
+:status :complete
+:comment "All resolutions supported (up to 600DPI). Identical with imageCLASS MPC200."
+
 :model "PIXMA MP140"
 :interface "USB"
 :usbid "0x04a9" "0x172b"
@@ -737,6 +791,30 @@
 :status :complete
 :comment "Flatbed and ADF scan. All resolutions supported (up to 4800DPI)"
 
+:model "PIXMA TS9000 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x179f"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS8000 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1800"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS6000 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1801"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS5000 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1802"
+:status :untested
+:comment "Testers needed!"
+
 :model "imageCLASS D420"
 :interface "USB"
 :usbid "0x04a9" "0x26ef"
@@ -767,6 +845,18 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "i-SENSYS MF230 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x27d1"
+:status :complete
+:comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI). WiFi only for w Types."
+
+:model "i-SENSYS MF240 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x27d2"
+:status :complete
+:comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI). ADF only 300DPI."
+
 :model "i-SENSYS MF810/820"
 :interface "USB Ethernet"
 :usbid "0x04a9" "0x27a6"
@@ -956,10 +1046,10 @@
 :model "i-SENSYS MF6100 Series"
 :interface "USB Ethernet"
 :usbid "0x04a9" "0x278e"
-:status :untested
-:comment "Testers needed!"
+:status :complete
+:comment "Flatbed and ADF scan.  All resolutions supported (up to 600DPI). Note: document feeder does not have 600DPI capability."
 
-:model "imageCLASS MF6500 series"
+:model "imageCLASS MF6500 Series"
 :interface "USB"
 :usbid "0x04a9" "0x2686"
 :status :complete
@@ -1007,6 +1097,18 @@
 :status :untested
 :comment "Same protocol as MF8200C Series? Testers needed!"
 
+:model "imageCLASS MPC190"
+:interface "USB"
+:usbid "0x04a9" "0x2635"
+:status :untested
+:comment "Testers needed! Identical with SmartBase MPC190 and PIXUS MP5."
+
+:model "imageCLASS MPC200"
+:interface "USB"
+:usbid "0x04a9" "0x261f"
+:status :complete
+:comment "All resolutions supported (up to 600DPI). Identical with SmartBase MPC200 and PIXUS MP10."
+
 :model "imageRUNNER 1020/1024/1025"
 :interface "USB"
 :usbid "0x04a9" "0x26e6"
@@ -1034,8 +1136,8 @@
 :model "MAXIFY MB5000 Series"
 :interface "USB"
 :usbid "0x04a9" "0x1776"
-:status :untested
-:comment "Testers needed!"
+:status :complete
+:comment "Flatbed works, All resolutions supported (up to 1200DPI), ADF does not work"
 
 :model "MAXIFY MB5300 Series"
 :interface "USB"
diff --git a/doc/descriptions/pnm.desc b/doc/descriptions/pnm.desc
index 7daeee1..9920b78 100644
--- a/doc/descriptions/pnm.desc
+++ b/doc/descriptions/pnm.desc
@@ -1,5 +1,5 @@
 :backend "pnm"
-:version "1.0.8"
+:version "1.0.8 (unmaintained)"
 :manpage "sane-pnm"
 :url "mailto:henning@meier-geinitz.de"
 
diff --git a/doc/descriptions/rts8891.desc b/doc/descriptions/rts8891.desc
index 7e30ea4..e37f158 100644
--- a/doc/descriptions/rts8891.desc
+++ b/doc/descriptions/rts8891.desc
@@ -10,7 +10,7 @@
 
 
 :backend "rts8891"               ; name of backend
-:version "1.0-0"                    ; version of backend (or "unmaintained")
+:version "1.0-0 (unmaintained)"  ; version of backend (or "unmaintained")
 :manpage "sane-rts8891"        ; name of manpage (if it exists)
 :url "http://stef.dev.free.fr/sane/rts8891/index.html" 
 				  ; backend's web page
diff --git a/doc/descriptions/sceptre.desc b/doc/descriptions/sceptre.desc
index e39559c..aa4f515 100644
--- a/doc/descriptions/sceptre.desc
+++ b/doc/descriptions/sceptre.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "sceptre"
-:version "1.0-10"                  ; version of backend
+:version "1.0-10 (unmaintained)"   ; version of backend
 :manpage "sane-sceptre"           ; name of manpage
 :url "http://www.zago.net/sane/"   ; backend's web page
 
diff --git a/doc/descriptions/sharp.desc b/doc/descriptions/sharp.desc
index 85fde0c..63000af 100644
--- a/doc/descriptions/sharp.desc
+++ b/doc/descriptions/sharp.desc
@@ -1,5 +1,5 @@
 :backend "sharp"                ; name of backend
-:version "0.32"                 ; version of backend
+:version "0.32 (unmaintained)"  ; version of backend
 ;:status :beta                   ; :alpha, :beta, :stable, :new
 :url "http://www.satzbau-gmbh.de/staff/abel/sane-sharp.html" 
 				; backend's homepage
diff --git a/doc/descriptions/sm3600.desc b/doc/descriptions/sm3600.desc
index 760b4cf..56e31e1 100644
--- a/doc/descriptions/sm3600.desc
+++ b/doc/descriptions/sm3600.desc
@@ -7,7 +7,7 @@
 ;
 
 :backend "sm3600"                 ; name of backend
-:version "0.1"                    ; version of backend
+:version "0.1 (unmaintained)"     ; version of backend
 :manpage "sane-sm3600"            ; name of manpage (if it exists)
 :url "http://sm3600.sourceforge.net/" ; backend's web page
 
diff --git a/doc/descriptions/sm3840.desc b/doc/descriptions/sm3840.desc
index 6d60ace..e40193f 100644
--- a/doc/descriptions/sm3840.desc
+++ b/doc/descriptions/sm3840.desc
@@ -11,7 +11,7 @@
 ; See doc/descriptions.txt for details.
 
 :backend "sm3840"                 ; name of backend
-:version "1.1"                    ; version of backend (or "unmaintained")
+:version "1.1 (unmaintained)"     ; version of backend (or "unmaintained")
 :manpage "sane-sm3840"          ; name of manpage (if it exists)
 :url "http://www.ziplabel.com/sm3840/" ; backend's web page
 :comment "This reverse-engineered backend supports the USB ScanMaker 3840 model" 
diff --git a/doc/descriptions/st400.desc b/doc/descriptions/st400.desc
index ca3de68..6cd3a08 100644
--- a/doc/descriptions/st400.desc
+++ b/doc/descriptions/st400.desc
@@ -1,7 +1,7 @@
 ; ST400 backend .desc by Ingo Wilken
 
 :backend "st400"			; name of backend
-:version "1.6"                        ; version number
+:version "1.6 (unmaintained)"		; version number
 :manpage "sane-st400"		; name of manpage (if it exists)
 :url "http://www.informatik.uni-oldenburg.de/~ingo/sane/" ; backend's web page
 
diff --git a/doc/descriptions/stv680.desc b/doc/descriptions/stv680.desc
index fee96d7..d54e6be 100644
--- a/doc/descriptions/stv680.desc
+++ b/doc/descriptions/stv680.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "stv680"                  ; name of backend
-:version "1.0-1"                   ; version of backend
+:version "1.0-1 (unmaintained)"    ; version of backend
 :manpage "sane-stv680"
 :url "http://gkall.hobby.nl/stv680-aiptek.html" ; backend's web page
 :comment "This vidcam backend is for the stv0680 chipset, See the website for more info."
diff --git a/doc/descriptions/teco1.desc b/doc/descriptions/teco1.desc
index 89ac03f..e5b4132 100644
--- a/doc/descriptions/teco1.desc
+++ b/doc/descriptions/teco1.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "teco1"                  ; name of backend
-:version "1.0-10"                 ; version of backend
+:version "1.0-10 (unmaintained)"  ; version of backend
 :manpage "sane-teco1"             ; name of manpage (if it exists)
 :url "http://www.zago.net/sane/#teco"    ; backend's web page
 
diff --git a/doc/descriptions/teco2.desc b/doc/descriptions/teco2.desc
index 23479ab..ec0e686 100644
--- a/doc/descriptions/teco2.desc
+++ b/doc/descriptions/teco2.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "teco2"                  ; name of backend
-:version "1.0-9"                  ; version of backend
+:version "1.0-9 (unmaintained)"   ; version of backend
 :manpage "sane-teco2"
 :url "http://gkall.hobby.nl/teco2.html"   ; backend's web page
 
diff --git a/doc/descriptions/teco3.desc b/doc/descriptions/teco3.desc
index f551309..a2f3e92 100644
--- a/doc/descriptions/teco3.desc
+++ b/doc/descriptions/teco3.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "teco3"                  ; name of backend
-:version "1.0-1"                  ; version of backend
+:version "1.0-1 (unmaintained)"   ; version of backend
 :manpage "sane-teco3"             ; name of manpage (if it exists)
 :url "http://www.zago.net/sane/#teco3"    ; backend's web page
 
diff --git a/doc/descriptions/test.desc b/doc/descriptions/test.desc
index cf27e87..657c2ea 100644
--- a/doc/descriptions/test.desc
+++ b/doc/descriptions/test.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "test"               ; name of backend
-:version "1.0-28"                    ; version of backend
+:version "1.0-28 (unmaintained)"     ; version of backend
 :manpage "sane-test"           ; name of manpage (if it exists)
 :url "http://www.meier-geinitz.de/sane/test-backend/" ; backend's web page
 
diff --git a/doc/descriptions/umax.desc b/doc/descriptions/umax.desc
index 73525a5..8f5a22b 100644
--- a/doc/descriptions/umax.desc
+++ b/doc/descriptions/umax.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "umax"                   ; name of backend
-:version "1.0-41"                 ; version of backend
+:version "1.0-41 (unmaintained)"  ; version of backend
 :manpage "sane-umax"              ; name of manpage (if it exists)
 :url "http://www.rauch-domain.de/sane-umax/index.html" ; backend's web page
 
diff --git a/doc/descriptions/umax_pp.desc b/doc/descriptions/umax_pp.desc
index fb3bf3f..e07a4a0 100644
--- a/doc/descriptions/umax_pp.desc
+++ b/doc/descriptions/umax_pp.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "umax_pp"              ; name of backend
-:version "1"                      ; version of backend
+:version "1 (unmaintained)"     ; version of backend
 :manpage "sane-umax_pp"         ; name of manpage (if it exists)
                                   ; backend's web page
 :url "http://umax1220p.sourceforge.net/"
diff --git a/doc/descriptions/unsupported.desc b/doc/descriptions/unsupported.desc
index d7e4128..2217594 100644
--- a/doc/descriptions/unsupported.desc
+++ b/doc/descriptions/unsupported.desc
@@ -668,6 +668,28 @@
 :comment "Probably unsupported. "
 
 ;********************************************************************************************
+:mfg "Fujitsu"
+:url "http://www.fujitsu.com/"
+
+:model "SP1120"
+:interface "USB"
+:usbid "0x04c5" "0x1473"
+:status :unsupported
+:comment "Genesys GL310 chipset, not supported by sane-genesys backend."
+
+:model "SP1125"
+:interface "USB"
+:usbid "0x04c5" "0x1475"
+:status :unsupported
+:comment "Genesys GL310 chipset, not supported by sane-genesys backend."
+
+:model "SP1130"
+:interface "USB"
+:usbid "0x04c5" "0x1476"
+:status :unsupported
+:comment "Genesys GL310 chipset, not supported by sane-genesys backend."
+
+;********************************************************************************************
 
 :mfg "Genius"
 :url "http://www.geniusnet.com.tw/"
@@ -1939,6 +1961,7 @@
 
 :model "DocuPen RC800"
 :interface "USB"
+:usbid "0x18dd" "0x1000"
 :status :unsupported
 :comment "Probably not supported. No details known."
 
@@ -2411,6 +2434,7 @@
 
 :model "Astra 6700"
 :interface "USB"
+:usbid "0x0638" "0x0a30"
 :status :unsupported
 :comment "Not supported. No chipset information available. Same as Avision iVina FB2400."
 
diff --git a/doc/descriptions/v4l.desc b/doc/descriptions/v4l.desc
index d585a94..711f453 100644
--- a/doc/descriptions/v4l.desc
+++ b/doc/descriptions/v4l.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "v4l"                    ; name of backend
-:version "1.0-3"                  ; version of backend
+:version "1.0-3 (unmaintained)"   ; version of backend
 :manpage "sane-v4l"               ; name of manpage (if it exists)
 :url "mailto:henning@meier-geinitz.de" ; backend's web page
 
diff --git a/doc/descriptions/xerox_mfp.desc b/doc/descriptions/xerox_mfp.desc
index 59b56dd..dd9d283 100644
--- a/doc/descriptions/xerox_mfp.desc
+++ b/doc/descriptions/xerox_mfp.desc
@@ -53,6 +53,36 @@
 :mfg "Samsung"
 :url "http://www.samsung.com"
 
+:model "X4300 Series"
+:interface "USB"
+:usbid "0x04e8" "0x3324"
+:status :untested
+
+:model "K4350 Series"
+:interface "USB"
+:usbid "0x04e8" "0x3325"
+:status :untested
+
+:model "X7600 Series"
+:interface "USB"
+:usbid "0x04e8" "0x3326"
+:status :untested
+
+:model "K7600 Series"
+:interface "USB"
+:usbid "0x04e8" "0x3327"
+:status :untested
+
+:model "K703 Series"
+:interface "USB"
+:usbid "0x04e8" "0x3331"
+:status :untested
+
+:model "X703 Series"
+:interface "USB"
+:usbid "0x04e8" "0x3332"
+:status :untested
+
 :model "SCX-4x16"
 :interface "USB"
 :usbid "0x04e8" "0x3409"
@@ -290,7 +320,7 @@
 
 :model "SCX-3405W"
 :interface "Ethernet"
-:status :basic
+:status :good
 
 :model "SCX-3400"
 :interface "USB"
@@ -305,17 +335,17 @@
 :model "SCX-4729FD"
 :interface "USB"
 :usbid "0x04e8" "0x3453"
-:status :basic
+:status :good
 
 :model "CLX-6260"
 :interface "USB"
 :usbid "0x04e8" "0x3455"
-:status :minimal
+:status :good
 
 :model "CLX-3300 Series"
 :interface "USB"
 :usbid "0x04e8" "0x3456"
-:status :basic
+:status :good
 
 :model "SCX-470x"
 :interface "USB"
@@ -325,7 +355,7 @@
 :model "CLX-4190"
 :interface "USB"
 :usbid "0x04e8" "0x345a"
-:status :minimal
+:status :good
 
 :model "SCX-4650 4x21S Series"
 :interface "USB"
@@ -352,3 +382,33 @@
 :usbid "0x04e8" "0x3468"
 :status :untested
 
+:model "M458x Series"
+:interface "USB"
+:usbid "0x04e8" "0x346f"
+:status :untested
+
+:model "M4370 5370 Series"
+:interface "USB"
+:usbid "0x04e8" "0x3471"
+:status :untested
+
+:model "X401 Series"
+:interface "USB"
+:usbid "0x04e8" "0x3477"
+:status :untested
+
+:model "K401 Series"
+:interface "USB"
+:usbid "0x04e8" "0x3478"
+:status :untested
+
+:model "K3250 Series"
+:interface "USB"
+:usbid "0x04e8" "0x3481"
+:status :untested
+
+:model "X3220 Series"
+:interface "USB"
+:usbid "0x04e8" "0x3482"
+:status :untested
+
diff --git a/doc/figs/area.eps b/doc/figs/area.eps
deleted file mode 100644
index 3613fa3..0000000
--- a/doc/figs/area.eps
+++ /dev/null
@@ -1,126 +0,0 @@
-%!PS-Adobe-2.0 EPSF-2.0
-%%Title: area.fig
-%%Creator: fig2dev Version 3.1 Patchlevel 1
-%%CreationDate: Wed Dec  4 19:19:37 1996
-%%For: davidm@panda.mosberger (David Mosberger-Tang)
-%%Orientation: Portrait
-%%BoundingBox: 0 0 221 205
-%%Pages: 0
-%%BeginSetup
-%%IncludeFeature: *PageSize Letter
-%%EndSetup
-%%EndComments
-/$F2psDict 200 dict def
-$F2psDict begin
-$F2psDict /mtrx matrix put
-/col-1 {} def
-/col0 {0.000 0.000 0.000 srgb} bind def
-/col1 {0.000 0.000 1.000 srgb} bind def
-/col2 {0.000 1.000 0.000 srgb} bind def
-/col3 {0.000 1.000 1.000 srgb} bind def
-/col4 {1.000 0.000 0.000 srgb} bind def
-/col5 {1.000 0.000 1.000 srgb} bind def
-/col6 {1.000 1.000 0.000 srgb} bind def
-/col7 {1.000 1.000 1.000 srgb} bind def
-/col8 {0.000 0.000 0.560 srgb} bind def
-/col9 {0.000 0.000 0.690 srgb} bind def
-/col10 {0.000 0.000 0.820 srgb} bind def
-/col11 {0.530 0.810 1.000 srgb} bind def
-/col12 {0.000 0.560 0.000 srgb} bind def
-/col13 {0.000 0.690 0.000 srgb} bind def
-/col14 {0.000 0.820 0.000 srgb} bind def
-/col15 {0.000 0.560 0.560 srgb} bind def
-/col16 {0.000 0.690 0.690 srgb} bind def
-/col17 {0.000 0.820 0.820 srgb} bind def
-/col18 {0.560 0.000 0.000 srgb} bind def
-/col19 {0.690 0.000 0.000 srgb} bind def
-/col20 {0.820 0.000 0.000 srgb} bind def
-/col21 {0.560 0.000 0.560 srgb} bind def
-/col22 {0.690 0.000 0.690 srgb} bind def
-/col23 {0.820 0.000 0.820 srgb} bind def
-/col24 {0.500 0.190 0.000 srgb} bind def
-/col25 {0.630 0.250 0.000 srgb} bind def
-/col26 {0.750 0.380 0.000 srgb} bind def
-/col27 {1.000 0.500 0.500 srgb} bind def
-/col28 {1.000 0.630 0.630 srgb} bind def
-/col29 {1.000 0.750 0.750 srgb} bind def
-/col30 {1.000 0.880 0.880 srgb} bind def
-/col31 {1.000 0.840 0.000 srgb} bind def
-
-end
-save
--59.0 231.0 translate
-1 -1 scale
-
-/clp {closepath} bind def
-/ef {eofill} bind def
-/gr {grestore} bind def
-/gs {gsave} bind def
-/l {lineto} bind def
-/m {moveto} bind def
-/n {newpath} bind def
-/s {stroke} bind def
-/slc {setlinecap} bind def
-/slj {setlinejoin} bind def
-/slw {setlinewidth} bind def
-/srgb {setrgbcolor} bind def
-/rot {rotate} bind def
-/sc {scale} bind def
-/tr {translate} bind def
-/tnt {dup dup currentrgbcolor
-  4 -2 roll dup 1 exch sub 3 -1 roll mul add
-  4 -2 roll dup 1 exch sub 3 -1 roll mul add
-  4 -2 roll dup 1 exch sub 3 -1 roll mul add srgb}
-  bind def
-/shd {dup dup currentrgbcolor 4 -2 roll mul 4 -2 roll mul
-  4 -2 roll mul srgb} bind def
-/$F2psBegin {$F2psDict begin /$F2psEnteredState save def} def
-/$F2psEnd {$F2psEnteredState restore end} def
-%%EndProlog
-
-$F2psBegin
-10 setmiterlimit
- 0.06000 0.06000 sc
-% Polyline
-n 1725 1725 m 3375 1725 l  3375 2775 l  1725 2775 l  clp gs col7 0.90 shd ef gr 
-/Helvetica findfont 180.00 scalefont setfont
-2550 2302 m
-gs 1 -1 sc (scan area) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-7.500 slw
-% Polyline
-n 1200 525 m 1200 3825 l gs col7 0.80 shd ef gr  gs col-1 s gr 
-n 1230.00 3681.00 m 1200.00 3825.00 l 1170.00 3681.00 l  1200.50 3705.50 l 1230.00 3681.00 l clp gs 0.00 setgray ef gr gs col-1 s gr
-% Polyline
-n 1050 675 m 4650 675 l gs col7 0.80 shd ef gr  gs col-1 s gr 
-n 4506.00 645.00 m 4650.00 675.00 l 4506.00 705.00 l  4530.50 675.50 l 4506.00 645.00 l clp gs 0.00 setgray ef gr gs col-1 s gr
-/Helvetica findfont 180.00 scalefont setfont
-3375 3150 m
-gs 1 -1 sc (bottom-right) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-/Helvetica findfont 180.00 scalefont setfont
-1725 1500 m
-gs 1 -1 sc (top-left) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-/Helvetica findfont 180.00 scalefont setfont
-2700 1050 m
-gs 1 -1 sc (scan surface) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-/Helvetica findfont 180.00 scalefont setfont
-1050 3600 m
-gs 1 -1 sc (y) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-/Helvetica findfont 180.00 scalefont setfont
-4425 525 m
-gs 1 -1 sc (x) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-/Helvetica findfont 180.00 scalefont setfont
-1080 585 m
-gs 1 -1 sc (0) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-% Polyline
-n 1725 1650 m 1725 1800 l  gs col-1 s gr 
-% Polyline
-n 1650 1725 m 1800 1725 l  gs col-1 s gr 
-% Polyline
-n 3375 2700 m 3375 2850 l  gs col-1 s gr 
-% Polyline
-n 3300 2775 m 3450 2775 l  gs col-1 s gr 
-15.000 slw
-% Polyline
-n 1200 675 m 4275 675 l  4275 3375 l  1200 3375 l  clp  gs col-1 s gr 
-$F2psEnd
-restore
diff --git a/doc/figs/flow.eps b/doc/figs/flow.eps
deleted file mode 100644
index 55fd7d1..0000000
--- a/doc/figs/flow.eps
+++ /dev/null
@@ -1,161 +0,0 @@
-%!PS-Adobe-2.0 EPSF-2.0
-%%Title: flow.fig
-%%Creator: fig2dev Version 3.1 Patchlevel 1
-%%CreationDate: Tue Dec  3 22:09:10 1996
-%%For: davidm@panda.mosberger (David Mosberger-Tang)
-%%Orientation: Portrait
-%%BoundingBox: 0 0 601 542
-%%Pages: 0
-%%BeginSetup
-%%IncludeFeature: *PageSize Letter
-%%EndSetup
-%%EndComments
-/$F2psDict 200 dict def
-$F2psDict begin
-$F2psDict /mtrx matrix put
-/col-1 {} def
-/col0 {0.000 0.000 0.000 srgb} bind def
-/col1 {0.000 0.000 1.000 srgb} bind def
-/col2 {0.000 1.000 0.000 srgb} bind def
-/col3 {0.000 1.000 1.000 srgb} bind def
-/col4 {1.000 0.000 0.000 srgb} bind def
-/col5 {1.000 0.000 1.000 srgb} bind def
-/col6 {1.000 1.000 0.000 srgb} bind def
-/col7 {1.000 1.000 1.000 srgb} bind def
-/col8 {0.000 0.000 0.560 srgb} bind def
-/col9 {0.000 0.000 0.690 srgb} bind def
-/col10 {0.000 0.000 0.820 srgb} bind def
-/col11 {0.530 0.810 1.000 srgb} bind def
-/col12 {0.000 0.560 0.000 srgb} bind def
-/col13 {0.000 0.690 0.000 srgb} bind def
-/col14 {0.000 0.820 0.000 srgb} bind def
-/col15 {0.000 0.560 0.560 srgb} bind def
-/col16 {0.000 0.690 0.690 srgb} bind def
-/col17 {0.000 0.820 0.820 srgb} bind def
-/col18 {0.560 0.000 0.000 srgb} bind def
-/col19 {0.690 0.000 0.000 srgb} bind def
-/col20 {0.820 0.000 0.000 srgb} bind def
-/col21 {0.560 0.000 0.560 srgb} bind def
-/col22 {0.690 0.000 0.690 srgb} bind def
-/col23 {0.820 0.000 0.820 srgb} bind def
-/col24 {0.500 0.190 0.000 srgb} bind def
-/col25 {0.630 0.250 0.000 srgb} bind def
-/col26 {0.750 0.380 0.000 srgb} bind def
-/col27 {1.000 0.500 0.500 srgb} bind def
-/col28 {1.000 0.630 0.630 srgb} bind def
-/col29 {1.000 0.750 0.750 srgb} bind def
-/col30 {1.000 0.880 0.880 srgb} bind def
-/col31 {1.000 0.840 0.000 srgb} bind def
-
-end
-save
--161.0 577.0 translate
-1 -1 scale
-
-/clp {closepath} bind def
-/ef {eofill} bind def
-/gr {grestore} bind def
-/gs {gsave} bind def
-/l {lineto} bind def
-/m {moveto} bind def
-/n {newpath} bind def
-/s {stroke} bind def
-/slc {setlinecap} bind def
-/slj {setlinejoin} bind def
-/slw {setlinewidth} bind def
-/srgb {setrgbcolor} bind def
-/rot {rotate} bind def
-/sc {scale} bind def
-/tr {translate} bind def
-/tnt {dup dup currentrgbcolor
-  4 -2 roll dup 1 exch sub 3 -1 roll mul add
-  4 -2 roll dup 1 exch sub 3 -1 roll mul add
-  4 -2 roll dup 1 exch sub 3 -1 roll mul add srgb}
-  bind def
-/shd {dup dup currentrgbcolor 4 -2 roll mul 4 -2 roll mul
-  4 -2 roll mul srgb} bind def
-/$F2psBegin {$F2psDict begin /$F2psEnteredState save def} def
-/$F2psEnd {$F2psEnteredState restore end} def
-%%EndProlog
-
-$F2psBegin
-10 setmiterlimit
- 0.06000 0.06000 sc
-7.500 slw
-% Polyline
-n 2700 600 m 10200 600 l  10200 9600 l  2700 9600 l  clp gs col7 0.95 shd ef gr  gs col-1 s gr 
-% Polyline
-n 3300 2400 m 10200 2400 l  10200 8925 l  3300 8925 l  clp gs col7 0.90 shd ef gr  gs col-1 s gr 
-% Polyline
-n 3900 2925 m 10200 2925 l  10200 4650 l  3900 4650 l  clp gs col7 0.85 shd ef gr  gs col-1 s gr 
-% Polyline
-n 3900 4800 m 10200 4800 l  10200 8250 l  3900 8250 l  clp gs col7 0.85 shd ef gr  gs col-1 s gr 
-% Polyline
-n 10350 3000 m 10425 3075 l  10425 4500 l  10350 4575 l  gs col-1 s gr 
-% Polyline
-n 10350 4875 m 10425 4950 l  10425 8100 l  10350 8175 l  gs col-1 s gr 
-/Helvetica-Oblique findfont 270.00 scalefont setfont
-10575 6600 m
-gs 1 -1 sc (image acquisition) col-1 show gr
-/Helvetica-Oblique findfont 270.00 scalefont setfont
-10575 3825 m
-gs 1 -1 sc (device setup) col-1 show gr
-/Helvetica-Oblique findfont 270.00 scalefont setfont
-4200 7515 m
-gs 1 -1 sc (- go back to) col-1 show gr
-/Helvetica findfont 270.00 scalefont setfont
-5775 7515 m
-gs 1 -1 sc (sane_start\(\)) col-1 show gr
-/Helvetica-Oblique findfont 270.00 scalefont setfont
-7275 7515 m
-gs 1 -1 sc (if more frames desired) col-1 show gr
-/Helvetica-Oblique findfont 270.00 scalefont setfont
-4200 3300 m
-gs 1 -1 sc (- use:) col-1 show gr
-/Helvetica findfont 270.00 scalefont setfont
-4200 5100 m
-gs 1 -1 sc (- sane_start\(\)) col-1 show gr
-/Helvetica-Oblique findfont 270.00 scalefont setfont
-4500 4500 m
-gs 1 -1 sc (repeatedly to configure device as desired) col-1 show gr
-/Helvetica findfont 270.00 scalefont setfont
-5400 4080 m
-gs 1 -1 sc (sane_control_option\(\)) col-1 show gr
-/Helvetica findfont 270.00 scalefont setfont
-5400 3600 m
-gs 1 -1 sc (sane_get_option_descriptor\(\)) col-1 show gr
-/Helvetica-Oblique findfont 270.00 scalefont setfont
-4200 5700 m
-gs 1 -1 sc (- use:) col-1 show gr
-/Helvetica-Oblique findfont 270.00 scalefont setfont
-4500 6900 m
-gs 1 -1 sc (repeatedly until read returns EOF) col-1 show gr
-/Helvetica findfont 270.00 scalefont setfont
-5400 6000 m
-gs 1 -1 sc (sane_get_parameters\(\)) col-1 show gr
-/Helvetica findfont 270.00 scalefont setfont
-5400 6450 m
-gs 1 -1 sc (sane_read\(\)) col-1 show gr
-/Helvetica findfont 270.00 scalefont setfont
-4200 8100 m
-gs 1 -1 sc (- sane_cancel\(\)) col-1 show gr
-/Helvetica findfont 270.00 scalefont setfont
-3000 1200 m
-gs 1 -1 sc (- sane_init\(\)) col-1 show gr
-/Helvetica findfont 270.00 scalefont setfont
-3000 9300 m
-gs 1 -1 sc (- sane_exit\(\)) col-1 show gr
-/Helvetica-Oblique findfont 270.00 scalefont setfont
-3600 1800 m
-gs 1 -1 sc (- pick desired device, possibly by using) col-1 show gr
-/Helvetica findfont 270.00 scalefont setfont
-3600 2700 m
-gs 1 -1 sc (- sane_open\(\)) col-1 show gr
-/Helvetica findfont 270.00 scalefont setfont
-3600 8700 m
-gs 1 -1 sc (- sane_close\(\)) col-1 show gr
-/Helvetica findfont 270.00 scalefont setfont
-4800 2175 m
-gs 1 -1 sc (sane_get_devices\(\)) col-1 show gr
-$F2psEnd
-restore
diff --git a/doc/figs/hierarchy.eps b/doc/figs/hierarchy.eps
deleted file mode 100644
index 978b3ab..0000000
--- a/doc/figs/hierarchy.eps
+++ /dev/null
@@ -1,209 +0,0 @@
-%!PS-Adobe-2.0 EPSF-2.0
-%%Title: hierarchy.fig
-%%Creator: fig2dev Version 3.1 Patchlevel 2
-%%CreationDate: Thu Jan 30 22:02:12 1997
-%%For: davidm@panda.mosberger (David Mosberger-Tang)
-%Magnification: 1.00
-%%Orientation: Landscape
-%%BoundingBox: 0 0 355 722
-%%Pages: 0
-%%BeginSetup
-%%IncludeFeature: *PageSize Letter
-%%EndSetup
-%%EndComments
-/$F2psDict 200 dict def
-$F2psDict begin
-$F2psDict /mtrx matrix put
-/col-1 {0 setgray} bind def
-/col0 {0.000 0.000 0.000 srgb} bind def
-/col1 {0.000 0.000 1.000 srgb} bind def
-/col2 {0.000 1.000 0.000 srgb} bind def
-/col3 {0.000 1.000 1.000 srgb} bind def
-/col4 {1.000 0.000 0.000 srgb} bind def
-/col5 {1.000 0.000 1.000 srgb} bind def
-/col6 {1.000 1.000 0.000 srgb} bind def
-/col7 {1.000 1.000 1.000 srgb} bind def
-/col8 {0.000 0.000 0.560 srgb} bind def
-/col9 {0.000 0.000 0.690 srgb} bind def
-/col10 {0.000 0.000 0.820 srgb} bind def
-/col11 {0.530 0.810 1.000 srgb} bind def
-/col12 {0.000 0.560 0.000 srgb} bind def
-/col13 {0.000 0.690 0.000 srgb} bind def
-/col14 {0.000 0.820 0.000 srgb} bind def
-/col15 {0.000 0.560 0.560 srgb} bind def
-/col16 {0.000 0.690 0.690 srgb} bind def
-/col17 {0.000 0.820 0.820 srgb} bind def
-/col18 {0.560 0.000 0.000 srgb} bind def
-/col19 {0.690 0.000 0.000 srgb} bind def
-/col20 {0.820 0.000 0.000 srgb} bind def
-/col21 {0.560 0.000 0.560 srgb} bind def
-/col22 {0.690 0.000 0.690 srgb} bind def
-/col23 {0.820 0.000 0.820 srgb} bind def
-/col24 {0.500 0.190 0.000 srgb} bind def
-/col25 {0.630 0.250 0.000 srgb} bind def
-/col26 {0.750 0.380 0.000 srgb} bind def
-/col27 {1.000 0.500 0.500 srgb} bind def
-/col28 {1.000 0.630 0.630 srgb} bind def
-/col29 {1.000 0.750 0.750 srgb} bind def
-/col30 {1.000 0.880 0.880 srgb} bind def
-/col31 {1.000 0.840 0.000 srgb} bind def
-
-end
-save
--17.0 -17.0 translate
- 90 rotate
-1 -1 scale
-
-/cp {closepath} bind def
-/ef {eofill} bind def
-/gr {grestore} bind def
-/gs {gsave} bind def
-/sa {save} bind def
-/rs {restore} bind def
-/l {lineto} bind def
-/m {moveto} bind def
-/rm {rmoveto} bind def
-/n {newpath} bind def
-/s {stroke} bind def
-/sh {show} bind def
-/slc {setlinecap} bind def
-/slj {setlinejoin} bind def
-/slw {setlinewidth} bind def
-/srgb {setrgbcolor} bind def
-/rot {rotate} bind def
-/sc {scale} bind def
-/sd {setdash} bind def
-/ff {findfont} bind def
-/sf {setfont} bind def
-/scf {scalefont} bind def
-/sw {stringwidth} bind def
-/tr {translate} bind def
-/tnt {dup dup currentrgbcolor
-  4 -2 roll dup 1 exch sub 3 -1 roll mul add
-  4 -2 roll dup 1 exch sub 3 -1 roll mul add
-  4 -2 roll dup 1 exch sub 3 -1 roll mul add srgb}
-  bind def
-/shd {dup dup currentrgbcolor 4 -2 roll mul 4 -2 roll mul
-  4 -2 roll mul srgb} bind def
-/$F2psBegin {$F2psDict begin /$F2psEnteredState save def} def
-/$F2psEnd {$F2psEnteredState restore end} def
-%%EndProlog
-
-$F2psBegin
-10 setmiterlimit
-n 0 612 m 0 0 l 792 0 l 792 612 l cp clip
- 0.06000 0.06000 sc
-% Polyline
-n 5700 3825 m 300 3825 l 300 300 l 5700 300 l cp gs 0.90 setgray ef gr 
-% Polyline
-n 12300 5550 m 7200 5550 l 7200 300 l 12300 300 l cp gs 0.90 setgray ef gr 
-15.000 slw
-% Polyline
-n 10650 4785 m 12150 4785 l 12150 5385 l 10650 5385 l cp gs col-1 s gr 
-/Helvetica ff 270.00 scf sf
-11399 5182 m
-gs 1 -1 sc (qcam) dup sw pop 2 div neg 0 rm  col-1 sh gr
-% Polyline
-n 7350 4785 m 8850 4785 l 8850 5385 l 7350 5385 l cp gs col-1 s gr 
-/Helvetica ff 270.00 scf sf
-8099 5182 m
-gs 1 -1 sc (hp) dup sw pop 2 div neg 0 rm  col-1 sh gr
-% Polyline
-n 2250 1185 m 3750 1185 l 3750 1785 l 2250 1785 l cp gs col-1 s gr 
-% Polyline
-n 450 2985 m 1950 2985 l 1950 3585 l 450 3585 l cp gs col-1 s gr 
-% Polyline
-n 2250 2985 m 3750 2985 l 3750 3585 l 2250 3585 l cp gs col-1 s gr 
-% Polyline
-n 4050 2985 m 5550 2985 l 5550 3585 l 4050 3585 l cp gs col-1 s gr 
-% Polyline
-n 8850 1185 m 10350 1185 l 10350 1785 l 8850 1785 l cp gs col-1 s gr 
-7.500 slw
-% Polyline
-n 2700 1800 m 1200 3000 l gs col-1 s gr 
-% Polyline
-n 3000 1800 m 3000 3000 l gs col-1 s gr 
-% Polyline
-n 3300 1800 m 4800 3000 l gs col-1 s gr 
-% Polyline
-n 9600 1800 m 9600 2100 l gs col-1 s gr 
-% Polyline
-n 9450 2700 m 8100 4800 l gs col-1 s gr 
-% Polyline
-n 11400 4200 m 11400 4800 l gs col-1 s gr 
-% Polyline
-n 1200 3600 m 1200 4200 l gs col-1 s gr 
-% Polyline
-n 3000 3600 m 3000 4125 l gs col-1 s gr 
-% Polyline
-n 7875 5400 m 7350 5850 l gs col-1 s gr 
-% Polyline
-n 8250 5400 m 8775 5850 l gs col-1 s gr 
-% Polyline
-n 11475 5400 m 11475 5850 l gs col-1 s gr 
-15.000 slw
-% Polyline
-n 8850 2100 m 10350 2100 l 10350 2700 l 8850 2700 l cp gs col-1 s gr 
-% Polyline
-n 10650 3600 m 12150 3600 l 12150 4200 l 10650 4200 l cp gs col-1 s gr 
-7.500 slw
-% Polyline
-n 9750 2700 m 11400 3600 l gs col-1 s gr 
-% Interp Spline
-gs n 4800 3600 m
-	4390.2 4024.4 4259.0 4249.4 4275 4500 curveto
-	4300.2 4894.5 4554.6 5418.2 5025 5475 curveto
-	5575.9 5541.5 5962.1 4914.2 6150 4575 curveto
-	6573.5 3810.6 5758.1 2145.7 6525 1350 curveto
-	7224.0 624.7 8573.7 446.9 9450 900 curveto
-	9524.5 938.5 9562.0 1013.5 9600 1200 curveto
- gs col-1 s gr
- gr
-
-/Helvetica ff 270.00 scf sf
-1199 3382 m
-gs 1 -1 sc (pnm) dup sw pop 2 div neg 0 rm  col-1 sh gr
-/Helvetica ff 270.00 scf sf
-2999 3382 m
-gs 1 -1 sc (mustek) dup sw pop 2 div neg 0 rm  col-1 sh gr
-/Helvetica-Oblique ff 210.00 scf sf
-1200 4425 m
-gs 1 -1 sc (pnm files) dup sw pop 2 div neg 0 rm  col-1 sh gr
-/Helvetica-Oblique ff 210.00 scf sf
-3000 4380 m
-gs 1 -1 sc (scanner) dup sw pop 2 div neg 0 rm  col-1 sh gr
-/Helvetica-Oblique ff 210.00 scf sf
-7350 6165 m
-gs 1 -1 sc (scanner 1) dup sw pop 2 div neg 0 rm  col-1 sh gr
-/Helvetica-Oblique ff 210.00 scf sf
-8925 6165 m
-gs 1 -1 sc (scanner 2) dup sw pop 2 div neg 0 rm  col-1 sh gr
-/Helvetica-Oblique ff 210.00 scf sf
-11475 6135 m
-gs 1 -1 sc (video camera) dup sw pop 2 div neg 0 rm  col-1 sh gr
-/Helvetica-Oblique ff 210.00 scf sf
-3000 600 m
-gs 1 -1 sc (machine A) dup sw pop 2 div neg 0 rm  col-1 sh gr
-/Helvetica-Oblique ff 210.00 scf sf
-9600 630 m
-gs 1 -1 sc (machine B) dup sw pop 2 div neg 0 rm  col-1 sh gr
-/Helvetica-Oblique ff 210.00 scf sf
-4725 5850 m
-gs 1 -1 sc (network connection) dup sw pop 2 div neg 0 rm  col-1 sh gr
-/Helvetica ff 270.00 scf sf
-2999 1582 m
-gs 1 -1 sc (dll) dup sw pop 2 div neg 0 rm  col-1 sh gr
-/Helvetica ff 270.00 scf sf
-4799 3382 m
-gs 1 -1 sc (net) dup sw pop 2 div neg 0 rm  col-1 sh gr
-/Helvetica ff 270.00 scf sf
-9599 1582 m
-gs 1 -1 sc (saned) dup sw pop 2 div neg 0 rm  col-1 sh gr
-/Helvetica ff 270.00 scf sf
-9599 2482 m
-gs 1 -1 sc (dll) dup sw pop 2 div neg 0 rm  col-1 sh gr
-/Helvetica ff 270.00 scf sf
-11399 3982 m
-gs 1 -1 sc (autolum) dup sw pop 2 div neg 0 rm  col-1 sh gr
-$F2psEnd
-rs
diff --git a/doc/figs/image-data.eps b/doc/figs/image-data.eps
deleted file mode 100644
index 13e6b8a..0000000
--- a/doc/figs/image-data.eps
+++ /dev/null
@@ -1,178 +0,0 @@
-%!PS-Adobe-2.0 EPSF-2.0
-%%Title: image-data.fig
-%%Creator: fig2dev Version 3.1 Patchlevel 1
-%%CreationDate: Fri Nov 22 08:53:36 1996
-%%For: davidm@panda.mosberger (David Mosberger-Tang)
-%%Orientation: Portrait
-%%BoundingBox: 0 0 521 93
-%%Pages: 0
-%%BeginSetup
-%%IncludeFeature: *PageSize Letter
-%%EndSetup
-%%EndComments
-/$F2psDict 200 dict def
-$F2psDict begin
-$F2psDict /mtrx matrix put
-/col-1 {} def
-/col0 {0.000 0.000 0.000 srgb} bind def
-/col1 {0.000 0.000 1.000 srgb} bind def
-/col2 {0.000 1.000 0.000 srgb} bind def
-/col3 {0.000 1.000 1.000 srgb} bind def
-/col4 {1.000 0.000 0.000 srgb} bind def
-/col5 {1.000 0.000 1.000 srgb} bind def
-/col6 {1.000 1.000 0.000 srgb} bind def
-/col7 {1.000 1.000 1.000 srgb} bind def
-/col8 {0.000 0.000 0.560 srgb} bind def
-/col9 {0.000 0.000 0.690 srgb} bind def
-/col10 {0.000 0.000 0.820 srgb} bind def
-/col11 {0.530 0.810 1.000 srgb} bind def
-/col12 {0.000 0.560 0.000 srgb} bind def
-/col13 {0.000 0.690 0.000 srgb} bind def
-/col14 {0.000 0.820 0.000 srgb} bind def
-/col15 {0.000 0.560 0.560 srgb} bind def
-/col16 {0.000 0.690 0.690 srgb} bind def
-/col17 {0.000 0.820 0.820 srgb} bind def
-/col18 {0.560 0.000 0.000 srgb} bind def
-/col19 {0.690 0.000 0.000 srgb} bind def
-/col20 {0.820 0.000 0.000 srgb} bind def
-/col21 {0.560 0.000 0.560 srgb} bind def
-/col22 {0.690 0.000 0.690 srgb} bind def
-/col23 {0.820 0.000 0.820 srgb} bind def
-/col24 {0.500 0.190 0.000 srgb} bind def
-/col25 {0.630 0.250 0.000 srgb} bind def
-/col26 {0.750 0.380 0.000 srgb} bind def
-/col27 {1.000 0.500 0.500 srgb} bind def
-/col28 {1.000 0.630 0.630 srgb} bind def
-/col29 {1.000 0.750 0.750 srgb} bind def
-/col30 {1.000 0.880 0.880 srgb} bind def
-/col31 {1.000 0.840 0.000 srgb} bind def
-
-end
-save
--88.0 120.0 translate
-1 -1 scale
-
-/clp {closepath} bind def
-/ef {eofill} bind def
-/gr {grestore} bind def
-/gs {gsave} bind def
-/l {lineto} bind def
-/m {moveto} bind def
-/n {newpath} bind def
-/s {stroke} bind def
-/slc {setlinecap} bind def
-/slj {setlinejoin} bind def
-/slw {setlinewidth} bind def
-/srgb {setrgbcolor} bind def
-/rot {rotate} bind def
-/sc {scale} bind def
-/tr {translate} bind def
-/tnt {dup dup currentrgbcolor
-  4 -2 roll dup 1 exch sub 3 -1 roll mul add
-  4 -2 roll dup 1 exch sub 3 -1 roll mul add
-  4 -2 roll dup 1 exch sub 3 -1 roll mul add srgb}
-  bind def
-/shd {dup dup currentrgbcolor 4 -2 roll mul 4 -2 roll mul
-  4 -2 roll mul srgb} bind def
-/$F2psBegin {$F2psDict begin /$F2psEnteredState save def} def
-/$F2psEnd {$F2psEnteredState restore end} def
-%%EndProlog
-
-$F2psBegin
-10 setmiterlimit
- 0.06000 0.06000 sc
-7.500 slw
-% Polyline
-n 1800 1200 m 3150 1200 l  3150 1350 l  1800 1350 l  clp  gs col-1 s gr 
-/Helvetica findfont 180.00 scalefont setfont
-1875 1125 m
-gs 1 -1 sc (7 6 5 4 3 2 1 0) col-1 show gr
-% Polyline
-n 3150 1200 m 4500 1200 l  4500 1350 l  3150 1350 l  clp  gs col-1 s gr 
-/Helvetica findfont 180.00 scalefont setfont
-3225 1125 m
-gs 1 -1 sc (7 6 5 4 3 2 1 0) col-1 show gr
-% Polyline
-n 4500 1200 m 5850 1200 l  5850 1350 l  4500 1350 l  clp  gs col-1 s gr 
-/Helvetica findfont 180.00 scalefont setfont
-4575 1125 m
-gs 1 -1 sc (7 6 5 4 3 2 1 0) col-1 show gr
-15.000 slw
-% Polyline
-n 1800 1200 m 5850 1200 l  5850 1350 l  1800 1350 l  clp  gs col-1 s gr 
-7.500 slw
-% Polyline
-n 1800 900 m 1950 825 l  3750 825 l  3825 750 l  3900 825 l  5700 825 l 
- 5850 900 l  gs col-1 s gr 
-/Helvetica findfont 180.00 scalefont setfont
-2475 1575 m
-gs 1 -1 sc (r) col-1 show gr
-/Helvetica findfont 180.00 scalefont setfont
-3825 1575 m
-gs 1 -1 sc (g) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-/Helvetica findfont 180.00 scalefont setfont
-5175 1575 m
-gs 1 -1 sc (b) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-/Helvetica findfont 180.00 scalefont setfont
-3825 600 m
-gs 1 -1 sc (pixel 0) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-% Polyline
-n 5850 1200 m 7200 1200 l  7200 1350 l  5850 1350 l  clp  gs col-1 s gr 
-/Helvetica findfont 180.00 scalefont setfont
-5925 1125 m
-gs 1 -1 sc (7 6 5 4 3 2 1 0) col-1 show gr
-% Polyline
-n 7200 1200 m 8550 1200 l  8550 1350 l  7200 1350 l  clp  gs col-1 s gr 
-/Helvetica findfont 180.00 scalefont setfont
-7275 1125 m
-gs 1 -1 sc (7 6 5 4 3 2 1 0) col-1 show gr
-% Polyline
-n 8550 1200 m 9900 1200 l  9900 1350 l  8550 1350 l  clp  gs col-1 s gr 
-/Helvetica findfont 180.00 scalefont setfont
-8625 1125 m
-gs 1 -1 sc (7 6 5 4 3 2 1 0) col-1 show gr
-15.000 slw
-% Polyline
-n 5850 1200 m 9900 1200 l  9900 1350 l  5850 1350 l  clp  gs col-1 s gr 
-7.500 slw
-% Polyline
-n 5850 900 m 6000 825 l  7800 825 l  7875 750 l  7950 825 l  9750 825 l 
- 9900 900 l  gs col-1 s gr 
-/Helvetica findfont 180.00 scalefont setfont
-6525 1575 m
-gs 1 -1 sc (r) col-1 show gr
-/Helvetica findfont 180.00 scalefont setfont
-7875 1575 m
-gs 1 -1 sc (g) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-/Helvetica findfont 180.00 scalefont setfont
-9225 1575 m
-gs 1 -1 sc (b) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-/Helvetica findfont 180.00 scalefont setfont
-7875 600 m
-gs 1 -1 sc (pixel 1) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-/Helvetica findfont 180.00 scalefont setfont
-9225 1950 m
-gs 1 -1 sc (byte 5) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-/Helvetica findfont 180.00 scalefont setfont
-7875 1950 m
-gs 1 -1 sc (byte 4) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-/Helvetica findfont 180.00 scalefont setfont
-6525 1950 m
-gs 1 -1 sc (byte 3) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-/Helvetica findfont 180.00 scalefont setfont
-5175 1950 m
-gs 1 -1 sc (byte 2) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-/Helvetica findfont 180.00 scalefont setfont
-3825 1950 m
-gs 1 -1 sc (byte1) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-/Helvetica findfont 180.00 scalefont setfont
-2475 1950 m
-gs 1 -1 sc (byte0) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-/Helvetica findfont 180.00 scalefont setfont
-10050 1275 m
-gs 1 -1 sc (....) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-/Helvetica findfont 180.00 scalefont setfont
-1725 1125 m
-gs 1 -1 sc (bit:) dup stringwidth pop neg 0 rmoveto  col-1 show gr
-$F2psEnd
-restore
diff --git a/doc/figs/xfer.eps b/doc/figs/xfer.eps
deleted file mode 100644
index 04abf91..0000000
--- a/doc/figs/xfer.eps
+++ /dev/null
@@ -1,117 +0,0 @@
-%!PS-Adobe-2.0 EPSF-2.0
-%%Title: xfer.fig
-%%Creator: fig2dev Version 3.1 Patchlevel 1
-%%CreationDate: Fri Nov 22 08:53:30 1996
-%%For: davidm@panda.mosberger (David Mosberger-Tang)
-%%Orientation: Portrait
-%%BoundingBox: 0 0 362 182
-%%Pages: 0
-%%BeginSetup
-%%IncludeFeature: *PageSize Letter
-%%EndSetup
-%%EndComments
-/$F2psDict 200 dict def
-$F2psDict begin
-$F2psDict /mtrx matrix put
-/col-1 {} def
-/col0 {0.000 0.000 0.000 srgb} bind def
-/col1 {0.000 0.000 1.000 srgb} bind def
-/col2 {0.000 1.000 0.000 srgb} bind def
-/col3 {0.000 1.000 1.000 srgb} bind def
-/col4 {1.000 0.000 0.000 srgb} bind def
-/col5 {1.000 0.000 1.000 srgb} bind def
-/col6 {1.000 1.000 0.000 srgb} bind def
-/col7 {1.000 1.000 1.000 srgb} bind def
-/col8 {0.000 0.000 0.560 srgb} bind def
-/col9 {0.000 0.000 0.690 srgb} bind def
-/col10 {0.000 0.000 0.820 srgb} bind def
-/col11 {0.530 0.810 1.000 srgb} bind def
-/col12 {0.000 0.560 0.000 srgb} bind def
-/col13 {0.000 0.690 0.000 srgb} bind def
-/col14 {0.000 0.820 0.000 srgb} bind def
-/col15 {0.000 0.560 0.560 srgb} bind def
-/col16 {0.000 0.690 0.690 srgb} bind def
-/col17 {0.000 0.820 0.820 srgb} bind def
-/col18 {0.560 0.000 0.000 srgb} bind def
-/col19 {0.690 0.000 0.000 srgb} bind def
-/col20 {0.820 0.000 0.000 srgb} bind def
-/col21 {0.560 0.000 0.560 srgb} bind def
-/col22 {0.690 0.000 0.690 srgb} bind def
-/col23 {0.820 0.000 0.820 srgb} bind def
-/col24 {0.500 0.190 0.000 srgb} bind def
-/col25 {0.630 0.250 0.000 srgb} bind def
-/col26 {0.750 0.380 0.000 srgb} bind def
-/col27 {1.000 0.500 0.500 srgb} bind def
-/col28 {1.000 0.630 0.630 srgb} bind def
-/col29 {1.000 0.750 0.750 srgb} bind def
-/col30 {1.000 0.880 0.880 srgb} bind def
-/col31 {1.000 0.840 0.000 srgb} bind def
-
-end
-save
--134.0 370.0 translate
-1 -1 scale
-
-/clp {closepath} bind def
-/ef {eofill} bind def
-/gr {grestore} bind def
-/gs {gsave} bind def
-/l {lineto} bind def
-/m {moveto} bind def
-/n {newpath} bind def
-/s {stroke} bind def
-/slc {setlinecap} bind def
-/slj {setlinejoin} bind def
-/slw {setlinewidth} bind def
-/srgb {setrgbcolor} bind def
-/rot {rotate} bind def
-/sc {scale} bind def
-/tr {translate} bind def
-/tnt {dup dup currentrgbcolor
-  4 -2 roll dup 1 exch sub 3 -1 roll mul add
-  4 -2 roll dup 1 exch sub 3 -1 roll mul add
-  4 -2 roll dup 1 exch sub 3 -1 roll mul add srgb}
-  bind def
-/shd {dup dup currentrgbcolor 4 -2 roll mul 4 -2 roll mul
-  4 -2 roll mul srgb} bind def
-/$F2psBegin {$F2psDict begin /$F2psEnteredState save def} def
-/$F2psEnd {$F2psEnteredState restore end} def
-%%EndProlog
-
-$F2psBegin
-10 setmiterlimit
- 0.06000 0.06000 sc
-15.000 slw
-% Polyline
-n 2400 3300 m 8100 3300 l  gs col-1 s gr 
-n 7812.00 3240.00 m 8100.00 3300.00 l 7812.00 3360.00 l  7860.50 3300.50 l 7812.00 3240.00 l clp gs 0.00 setgray ef gr gs col-1 s gr
-7.500 slw
-% Polyline
-n 8100 3375 m 2400 3675 l  gs col-1 s gr 
-15.000 slw
-n 2690.76 3719.78 m 2400.00 3675.00 l 2684.45 3599.95 l  2640.17 3662.89 l 2690.76 3719.78 l clp gs 0.00 setgray ef gr gs col-1 s gr
-% Polyline
-n 2400 3750 m 8100 3750 l  gs col-1 s gr 
-n 7812.00 3690.00 m 8100.00 3750.00 l 7812.00 3810.00 l  7860.50 3750.50 l 7812.00 3690.00 l clp gs 0.00 setgray ef gr gs col-1 s gr
-7.500 slw
-% Polyline
-n 8100 3825 m 2400 4125 l  gs col-1 s gr 
-15.000 slw
-n 2690.76 4169.78 m 2400.00 4125.00 l 2684.45 4049.95 l  2640.17 4112.89 l 2690.76 4169.78 l clp gs 0.00 setgray ef gr gs col-1 s gr
-7.500 slw
-% Polyline
-n 2250 3150 m 8250 3150 l  8250 6150 l  2250 6150 l  clp  gs col-1 s gr 
-15.000 slw
-% Polyline
-n 2400 4200 m 8100 4200 l  gs col-1 s gr 
-n 7812.00 4140.00 m 8100.00 4200.00 l 7812.00 4260.00 l  7860.50 4200.50 l 7812.00 4140.00 l clp gs 0.00 setgray ef gr gs col-1 s gr
-7.500 slw
-% Polyline
-n 8100 4275 m 2400 4575 l  gs col-1 s gr 
-15.000 slw
-n 2690.76 4619.78 m 2400.00 4575.00 l 2684.45 4499.95 l  2640.17 4562.89 l 2690.76 4619.78 l clp gs 0.00 setgray ef gr gs col-1 s gr
-% Polyline
-n 2400 4650 m 8100 4650 l  gs col-1 s gr 
-n 7812.00 4590.00 m 8100.00 4650.00 l 7812.00 4710.00 l  7860.50 4650.50 l 7812.00 4590.00 l clp gs 0.00 setgray ef gr gs col-1 s gr
-$F2psEnd
-restore
diff --git a/doc/html.sty b/doc/html.sty
deleted file mode 100644
index 5b55985..0000000
--- a/doc/html.sty
+++ /dev/null
@@ -1,232 +0,0 @@
-% LaTeX2HTML Version 95.1 : html.sty
-%
-% This file contains definitions of LaTeX commands which are
-% processed in a special way by the translator. 
-% For example, there are commands for embedding external hypertext links,
-% for cross-references between documents or for including
-% raw HTML.
-% This file includes the comments.sty file v2.0 by Victor Eijkhout
-% In most cases these commands do nothing when processed by LaTeX.
-
-% Modifications:
-%
-%  nd = Nikos Drakos <nikos@cbl.leeds.ac.uk>
-%  jz = Jelle van Zeijl <jvzeijl@isou17.estec.esa.nl>
-
-% jz 22-APR-94 - Added support for htmlref
-% nd  - Created
-
-
-
-% Exit if the style file is already loaded
-% (suggested by Lee Shombert <las@potomac.wash.inmet.com>
-\ifx \htmlstyloaded\relax \endinput\else\let\htmlstyloaded\relax\fi
-
-%%% LINKS TO EXTERNAL DOCUMENTS
-%
-% This can be used to provide links to arbitrary documents.
-% The first argumment should be the text that is going to be
-% highlighted and the second argument a URL.
-% The hyperlink will appear as a hyperlink in the HTML 
-% document and as a footnote in the dvi or ps files.
-%
-\newcommand{\htmladdnormallinkfoot}[2]{#1\footnote{#2}} 
-
-% This is an alternative definition of the command above which
-% will ignore the URL in the dvi or ps files.
-\newcommand{\htmladdnormallink}[2]{#1}
-
-% This command takes as argument a URL pointing to an image.
-% The image will be embedded in the HTML document but will
-% be ignored in the dvi and ps files.
-%
-\newcommand{\htmladdimg}[1]{}
-
-%%% CROSS-REFERENCES BETWEEN (LOCAL OR REMOTE) DOCUMENTS
-%
-% This can be used to refer to symbolic labels in other Latex 
-% documents that have already been processed by the translator.
-% The arguments should be:
-% #1 : the URL to the directory containing the external document
-% #2 : the path to the labels.pl file of the external document.
-% If the external document lives on a remote machine then labels.pl 
-% must be copied on the local machine.
-%
-%e.g. \externallabels{http://cbl.leeds.ac.uk/nikos/WWW/doc/tex2html/latex2html}
-%                    {/usr/cblelca/nikos/tmp/labels.pl}
-% The arguments are ignored in the dvi and ps files.
-%
-\newcommand{\externallabels}[2]{}
-
-% This complements the \externallabels command above. The argument
-% should be a label defined in another latex document and will be
-% ignored in the dvi and ps files.
-%
-\newcommand{\externalref}[1]{}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Comment.sty   version 2.0, 19 June 1992
-% selectively in/exclude pieces of text: the user can define new
-% comment versions, and each is controlled separately.
-% This style can be used with plain TeX or LaTeX, and probably
-% most other packages too.
-%
-% Examples of use in LaTeX and TeX follow \endinput
-%
-% Author
-%    Victor Eijkhout
-%    Department of Computer Science
-%    University Tennessee at Knoxville
-%    104 Ayres Hall
-%    Knoxville, TN 37996
-%    USA
-%
-%    eijkhout@cs.utk.edu
-%
-% Usage: all text included in between
-%    \comment ... \endcomment
-% or \begin{comment} ... \end{comment}
-% is discarded. The closing command should appear on a line
-% of its own. No starting spaces, nothing after it.
-% This environment should work with arbitrary amounts
-% of comment.
-%
-% Other 'comment' environments are defined by
-% and are selected/deselected with
-% \includecomment{versiona}
-% \excludecoment{versionb}
-%
-% These environments are used as
-% \versiona ... \endversiona
-% or \begin{versiona} ... \end{versiona}
-% with the closing command again on a line of its own.
-%
-% Basic approach:
-% to comment something out, scoop up  every line in verbatim mode
-% as macro argument, then throw it away.
-% For inclusions, both the opening and closing comands
-% are defined as noop
-%
-% Changed \next to \html@next to prevent clashes with other sty files
-% (mike@emn.fr)
-% Changed \html@next to \htmlnext so the \makeatletter and
-% \makeatother commands could be removed (they were causing other
-% style files - changebar.sty - to crash) (nikos@cbl.leeds.ac.uk)
-% Changed \htmlnext back to \html@next...
-
-\makeatletter
-\def\makeinnocent#1{\catcode`#1=12 }
-\def\csarg#1#2{\expandafter#1\csname#2\endcsname}
-
-\def\ThrowAwayComment#1{\begingroup
-    \def\CurrentComment{#1}%
-    \let\do\makeinnocent \dospecials
-    \makeinnocent\^^L% and whatever other special cases
-    \endlinechar`\^^M \catcode`\^^M=12 \xComment}
-{\catcode`\^^M=12 \endlinechar=-1 %
- \gdef\xComment#1^^M{\def\test{#1}
-      \csarg\ifx{PlainEnd\CurrentComment Test}\test
-          \let\html@next\endgroup
-      \else \csarg\ifx{LaLaEnd\CurrentComment Test}\test
-            \edef\html@next{\endgroup\noexpand\end{\CurrentComment}}
-      \else \let\html@next\xComment
-      \fi \fi \html@next}
-}
-\makeatother
-
-\def\includecomment
- #1{\expandafter\def\csname#1\endcsname{}%
-    \expandafter\def\csname end#1\endcsname{}}
-\def\excludecomment
- #1{\expandafter\def\csname#1\endcsname{\ThrowAwayComment{#1}}%
-    {\escapechar=-1\relax
-     \csarg\xdef{PlainEnd#1Test}{\string\\end#1}%
-     \csarg\xdef{LaLaEnd#1Test}{\string\\end\string\{#1\string\}}%
-    }}
-
-\excludecomment{comment}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%% RAW HTML 
-% 
-% Enclose raw HTML between a \begin{rawhtml} and \end{rawhtml}.
-% The html environment ignores its body
-%
-\excludecomment{rawhtml}
-
-%%% HTML ONLY
-%
-% Enclose LaTeX constructs which will only appear in the 
-% HTML output and will be ignored by LaTeX with 
-% \begin{htmlonly} and \end{htmlonly}
-%
-\excludecomment{htmlonly}
-% Shorter version
-\newcommand{\html}[1]{}
-
-
-%%% LaTeX ONLY
-% Enclose LaTeX constructs which will only appear in the 
-% DVI output and will be ignored by latex2html with 
-%\begin{latexonly} and \end{latexonly}
-%
-\newenvironment{latexonly}{}{}
-% Shorter version
-\newcommand{\latex}[1]{#1}
-
-%%% HYPERREF 
-% Suggested by Eric M. Carol <eric@ca.utoronto.utcc.enfm>
-% Similar to \ref but accepts conditional text. 
-% The first argument is HTML text which will become ``hyperized''
-% (underlined).
-% The second and third arguments are text which will appear only in the paper
-% version (DVI file), enclosing the fourth argument which is a reference to a label.
-%
-%e.g. \hyperref{using the tracer}{using the tracer (see Section}{)}{trace}
-% where there is a corresponding \label{trace}
-%
-\newcommand{\hyperref}[4]{#2\ref{#4}#3}
-
-%%% HTMLREF
-% Reference in HTML version only.
-% Mix between \htmladdnormallink and \hyperref.
-% First arg is text for in both versions, second is label for use in HTML
-% version.
-\newcommand{\htmlref}[2]{#1}
-
-%%% HTMLIMAGE
-% This command can be used inside any environment that is converted
-% into an inlined image (eg a "figure" environment) in order to change
-% the way the image will be translated. The argument of \htmlimage
-% is really a string of options separated by commas ie 
-% [scale=<scale factor>],[external],[thumbnail=<reduction factor>
-% The scale option allows control over the size of the final image.
-% The ``external'' option will cause the image not to be inlined 
-% (images are inlined by default). External images will be accessible
-% via a hypertext link. 
-% The ``thumbnail'' option will cause a small inlined image to be 
-% placed in the caption. The size of the thumbnail depends on the
-% reduction factor. The use of the ``thumbnail'' option implies
-% the ``external'' option.
-%
-% Example:
-% \htmlimage{scale=1.5,external,thumbnail=0.2}
-% will cause a small thumbnail image 1/5th of the original size to be
-% placed in the final document, pointing to an external image 1.5
-% times bigger than the original.
-% 
-\newcommand{\htmlimage}[1]{}
-
-%%% HTMLADDTONAVIGATION
-% This command appends its argument to the buttons in the navigation
-% panel. It is ignored by LaTeX.
-%
-% Example:
-% \htmladdtonavigation{\htmladdnormallink
-%              {\htmladdimg{http://server/path/to/gif}}
-%              {http://server/path}}
-\newcommand{\htmladdtonavigation}[1]{}
-
-% typeset a url:
-\newcommand{\url}[1]{\texttt{#1}}
diff --git a/doc/releases.txt b/doc/releases.txt
index a1b5478..1579b15 100644
--- a/doc/releases.txt
+++ b/doc/releases.txt
@@ -14,22 +14,26 @@ Day 35: Release
 
 Before the release:
 
-* set :new :yes on any new backend .desc files
+* set :new :yes on any new backend .desc files, by looking for added files:
+
+  cd backend
+  ls | while read aa; do git log --follow --diff-filter=A --find-renames=40% --format="%ai  $aa" "$aa"; done > foo.log
+
+  Then inspect foo.log for any files added since the last release.
 * Make sure that config.guess and config.sub are up-to-date (get them from
-  savannah.gnu.org/projects/config)
-* configure.in: increase version number
-* configure.in: remove 'git' from textual version number
-* configure.in: set is_release=yes
-* OPTIONAL: aclocal.m4: recreate by running aclocal
-* OPTIONAL: include/sane/config.h.in: recreate (autoheader in root of checkout)
-* DONT run autoreconf, it will overwrite our custom ltmain.sh
-* configure: recreate by running autoconf
-* NEWS: update and enter date of release
+  savannah.gnu.org/projects/config) (git clone is easiest)
+* configure.ac: remove 'git' from textual version number, and increment it
+* run autoreconf --force but do *NOT* use the --install option as it will
+  overwrite our custom ltmain.sh
+* ChangeLog: generate from git log, something like:
+  git log RELEASE_1_0_25..HEAD > ChangeLog
+* NEWS: update and enter date of release, etc
+  Get list of heavily change backends via: git diff --stat RELEASE_1_0_25
+  Get other things by reading ChangeLog
 * sane-backends.lsm: update
-* ChangeLog: set release marker
 * git commit -a
 * tag git with release tag; e.g.: 'git tag -a RELEASE_1_0_15'
-* probably DONT want to git push here, cause alioth will rebuild it's local
+* probably DONT want to git push here, because alioth will rebuild it's local
   checkout needlessly
 
 Making the release:
@@ -74,13 +78,17 @@ Announcing the release:
 
 After the release:
 
-* move ChangeLog to ChangeLog-"version"
-* start a new ChangeLog
-* add ChangeLog-"version" to EXTRA_DIST in Makefile.in and Makefile.am
-* configure.in: bump textual version & add 'git' suffix
-* configure.in: bump V_REV
-* configure.in: set is_release=no
+#### consider not adding old changelogs to release package
+* move ChangeLog to ChangeLogs/ChangeLog-"version"
+* start a new ChangeLog, with the following message:
+
+This file is automatically generated at release time using git commit messages.
+
+For the latest changes please refer to the output of `git log` or see:
+https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi?p=sane/sane-backends.git;a=log
+
+* configure.ac: bump textual version & add 'git' suffix
 * configure: regenerate with autoconf
 * remove the ':new' tag from any new backends .desc files
 * git add new files and commit
-* git push --tags
+* git push && git push --tags (one of these might give an error 'remote: fatal: bad object 0000000000000000000000000000000000000000', try the other one)
diff --git a/doc/sane-avision.man b/doc/sane-avision.man
index 299bb72..6a991b6 100644
--- a/doc/sane-avision.man
+++ b/doc/sane-avision.man
@@ -36,6 +36,7 @@ a hash mark (#) are ignored. A sample configuration file is shown below:
 \ 
  option force\-a4
  option force\-a3
+ option skip\-adf
  option disable\-gamma\-table
  option disable\-calibration
 \ 
@@ -61,6 +62,15 @@ known to return bogus data are marked in the backend
 so if you need this option please report this to the
 backend maintainer. USE WITH CARE!
 .TP
+skip\-adf:
+Forces the backend to ignore an inconsistent ADF
+status returned by the scanner (ADF not present, but
+ADF model number non-zero).  Without this option, the
+backend will make several attempts to reset the ADF
+and retry the query in this situation, and will fail
+with a "not supported" error if the ADF still doesn't
+respond.
+.TP
 disable\-gamma\-table:
 Disables the usage of the scanner's gamma-table. You
 might try this if your scans hang or only produces
diff --git a/doc/sane-epjitsu.man b/doc/sane-epjitsu.man
index 5d2a8ca..3552691 100644
--- a/doc/sane-epjitsu.man
+++ b/doc/sane-epjitsu.man
@@ -1,4 +1,4 @@
-.TH sane\-epjitsu 5 "12 Jun 2014" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH sane\-epjitsu 5 "11 Apr 2017" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane\-epjitsu
 
 .SH NAME
@@ -7,7 +7,7 @@ sane\-epjitsu \- SANE backend for Epson-based Fujitsu USB scanners.
 .SH DESCRIPTION
 The 
 .B sane\-epjitsu
-library implements a SANE (Scanner Access Now Easy) backend which provides basic access the Fujitsu fi\-60F/fi\-65F and ScanSnap S300/S1300/S1100 scanners.
+library implements a SANE (Scanner Access Now Easy) backend which provides basic access the Fujitsu fi\-60F/fi\-65F and ScanSnap S300/S1300(i)/S1100(i) scanners.
 
 .SH HARDWARE SUPPORT
 These scanners are fairly limited, only supporting a couple of modes and resolutions, and always scanning full width. The backend supports missing modes (binary, grayscale) and intermediate resolutions in software, but provides only minimal scan area controls. See 
@@ -87,7 +87,7 @@ The backend uses a single environment variable, SANE_DEBUG_EPJITSU, which enable
 Only limited scan area options are exposed.
 .br
 .br
-fi\-60F and fi\-65F hardware grayscale mode is not used.
+fi\-60F and fi\-65F hardware grayscale mode is not used, because the calibration code is not finished.
 .RE
 
 .SH CREDITS
diff --git a/doc/sane-epson.man b/doc/sane-epson.man
index d474bb7..af2b3cf 100644
--- a/doc/sane-epson.man
+++ b/doc/sane-epson.man
@@ -77,7 +77,7 @@ The
 option selects the bit depth the scanner is using. This option is only
 available for scanners that support more than one bit depth. Older
 scanners will always transfer the image in 8bit mode. Newer scanners
-allow to select either 8 bits, 12 or 14 bits per color channel. For a
+allow one to select either 8 bits, 12 or 14 bits per color channel. For a
 color scan this means an effective color depth of 36 or 42 bits over
 all three channels. The valid choices depend on the scanner model.
 
diff --git a/doc/sane-epson2.man b/doc/sane-epson2.man
index 896b340..6d47eea 100644
--- a/doc/sane-epson2.man
+++ b/doc/sane-epson2.man
@@ -123,7 +123,7 @@ The
 option selects the bit depth the scanner is using. This option is only
 available for scanners that support more than one bit depth. Older
 scanners will always transfer the image in 8bit mode. Newer scanners
-allow to select either 8 bits, 12 or 14 bits per color channel. For a
+allow one to select either 8 bits, 12 or 14 bits per color channel. For a
 color scan this means an effective color depth of 36 or 42 bits over
 all three channels. The valid choices depend on the scanner model.
 
diff --git a/doc/sane-epsonds.man b/doc/sane-epsonds.man
index ea9bcbb..3324804 100644
--- a/doc/sane-epsonds.man
+++ b/doc/sane-epsonds.man
@@ -29,7 +29,7 @@ The
 option selects the bit depth the scanner is using. This option is only
 available for scanners that support more than one bit depth. Older
 scanners will always transfer the image in 8bit mode. Newer scanners
-allow to select either 8 bits, 12 or 14 bits per color channel. For a
+allow one to select either 8 bits, 12 or 14 bits per color channel. For a
 color scan this means an effective color depth of 36 or 42 bits over
 all three channels. The valid choices depend on the scanner model.
 
diff --git a/doc/sane-fujitsu.man b/doc/sane-fujitsu.man
index 29004d9..6bd5f73 100644
--- a/doc/sane-fujitsu.man
+++ b/doc/sane-fujitsu.man
@@ -1,4 +1,4 @@
-.TH sane\-fujitsu 5 "31 Aug 2015" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH sane\-fujitsu 5 "08 Apr 2017" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane\-fujitsu
 
 .SH NAME
@@ -10,7 +10,7 @@ The
 library implements a SANE (Scanner Access Now Easy) backend which
 provides access to most Fujitsu flatbed and ADF scanners.
 
-This document describes backend version 127, which shipped with SANE 1.0.25.
+This document describes backend version 133, which shipped with SANE 1.0.26.
 
 .SH SUPPORTED HARDWARE
 This version supports every known model which speaks the Fujitsu SCSI and 
@@ -42,6 +42,7 @@ SP\-Jr        M3097E+/DE   S300/S300M
 SP\-10/10C    M3099A/EH/EX S1300/S1100
 SP\-15C/300C               fi\-60F
 SP\-600C/620C              fi\-5015C
+                          SP\-2x/3x
 .fi
 .ft R
 .RE
diff --git a/doc/sane-genesys.man b/doc/sane-genesys.man
index ee3e0af..cd00cc3 100644
--- a/doc/sane-genesys.man
+++ b/doc/sane-genesys.man
@@ -10,7 +10,7 @@ access to USB flatbed scanners based on the Genesys GL646, GL841, GL843, GL847 a
 At present, the following scanners are known to work with this backend:
 .PP 
 .RS
-Canon LiDE 35/40/50/60/100/110/200/210/220/700
+Canon LiDE 35/40/50/60/100/110/120/200/210/220/700
 .br
 Hewlett-Packard HP2300C/HP2400/HP3670/HP3690/G4010/G4050
 .br
@@ -52,7 +52,7 @@ in the feeder then start calibration either by passing the \-\-calibrate option
 or by clicking on the available 'calibrate' button in the 'advanced options' in a graphical
 frontend. The result of the calibration is stored in a file in the home directory of the user doing it.
 If you plug the scanner in another machine or use it with another account, calibration
-will have to be redone, unles you use the \-\-calibration\-file option.
+will have to be redone, unless you use the \-\-calibration\-file option.
 If no home directory is defined,
 USERAPPPROFILE will be used, then TMPDIR or TMP. If none of these directories exist, the backend will try
 to write in the current working directory. Flatbed scanners also make use of the calibration file as a cache
@@ -71,7 +71,7 @@ A value of -1 means forever, 0 means no cache.
 .B \-\-threshold percent
 .RS
 	0..100% (in steps of 1). Select minimum brightness to get a white point. Pixels
-whith brightness below that value will be scanned as black.
+with brightness below that value will be scanned as black.
 .RE
 
 .B \-\-brightness value
@@ -285,6 +285,9 @@ Brian Paavo from Benthic Science Limited for donating a Canoscan LiDE 700F.
 .TP
 Dany Qumsiyeh for donating a Canoscan LiDE 210 and a LiDE 220.
 .br
+.TP
+Luc Verhaegen for donating a Canoscan LiDE 120.
+.br
 
 .SH "SEE ALSO"
 .BR sane (7),
diff --git a/doc/sane-mustek_usb.man b/doc/sane-mustek_usb.man
index dfcb8eb..a934e8a 100644
--- a/doc/sane-mustek_usb.man
+++ b/doc/sane-mustek_usb.man
@@ -180,6 +180,7 @@ export SANE_DEBUG_MUSTEK_USB=4
 .BR sane\-ma1509 (5)
 .br
 .IR @DOCDIR@/mustek_usb/mustek_usb.CHANGES ,
+.br
 .I @DOCDIR@/mustek_usb/mustek_usb.TODO
 .br
 .I http://www.meier\-geinitz.de/sane/mustek_usb\-backend/
diff --git a/doc/sane-pixma.man b/doc/sane-pixma.man
index ca692cb..1058e92 100644
--- a/doc/sane-pixma.man
+++ b/doc/sane-pixma.man
@@ -1,4 +1,4 @@
-.TH "sane\-pixma" "5" "30 Sep 2015" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH "sane\-pixma" "5" "20 May 2017" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane\-pixma
 .SH NAME
 sane\-pixma \- SANE backend for Canon Multi-Function Printers and CanoScan Scanners
@@ -17,9 +17,11 @@ Currently, the following models work with this backend:
 .RS
 PIXMA MG2100, MG2200, MG2400, MG2500, MG2900, MG3100, MG3200
 .br
-PIXMA MG3500, MG4200, MG5100, MG5200, MG5300, MG5500, MG5600
+PIXMA MG3500, MG3600, MG4200, MG5100, MG5200, MG5300, MG5400
 .br
-PIXMA MG6100, MG6200, MG6300, MG6400, MG7100, MG7500, MG8200
+PIXMA MG5500, MG5600, MG5700, MG6100, MG6200, MG6300, MG6400
+.br
+PIXMA MG7100, MG7500, MG7700, MG8200
 .br
 PIXMA MP140, MP150, MP160, MP170, MP180, MP190
 .br
@@ -45,6 +47,8 @@ PIXMA MX410, MX420, MX470, MX510, MX520, MX530, MX700, MX720
 .br
 PIXMA MX850, MX860, MX870, MX882, MX885, MX890, MX920, MX7600
 .br
+PIXUS MP10
+.br
 imageCLASS MF3110, MF3240, MF4010, MF4018
 .br
 imageCLASS MF4120, MF4122, MF4140, MF4150
@@ -53,17 +57,17 @@ imageCLASS MF4270, MF4350d, MF4370dn, MF4380dn
 .br
 imageCLASS MF4410, MF4430, MF4570dw, MF4660, MF4690
 .br
-imageCLASS MF5730, MF5770, MF6550, D420, D480, D530
-.br
-i-SENSYS MF3010, MF4320d, MF4330d, MF4500 Series
+imageCLASS MF5730, MF5770, MF6550, MPC200, D420, D480, D530
 .br
-i-SENSYS MF4700 Series, MF4800 Series, MF8200C Series
+i-SENSYS MF230, MF240, MF3010, MF4320d, MF4330d, MF4500, MF4700
 .br
-i-SENSYS MF8300 Series
+i-SENSYS MF4800, MF6100, MF8200C, MF8300
 .br
 imageRUNNER 1020/1024/1025
 .br
 CanoScan 8800F, 9000F, 9000F Mark II
+.br
+MAXIFY MB5000 (ADF is not working)
 .RE
 .PP
 The following models are not well tested and/or the scanner sometimes hangs
@@ -79,23 +83,29 @@ in the backend so that they get recognized and activated.
 Feedback in the sane\-devel mailing list welcome.
 .PP
 .RS
-PIXMA E400, E460, E480, E500, E510, E560, E600, E610
+PIXMA E400, E460, E470, E480, E500, E510, E560, E600, E610
 .br
-PIXMA MG3600, MG4100, MG5400, MG6500, MG6600, MG8100
+PIXMA MG3000, MG4100, MG6500, MG6600, MG6800, MG6900, MG8100
 .br
 PIXMA MP375R, MP493, MP495, MP740
 .br
 PIXMA MX320, MX390, MX430, MX450, MX490, MX710
 .br
+PIXMA G3000
+.br
+PIXMA TS9000, TS800, TS6000, TS5000
+.br
+PIXUS MP5
+.br
 imageCLASS MF810/820, MF5630, MF5650, MF5750, MF8030, MF8170c
 .br
-imageRUNNER 1133
+imageCLASS MPC190
 .br
-i-SENSYS MF210 Series, MF220 Series, MF5880dn, MF5900 Series
+imageRUNNER 1133
 .br
-i-SENSYS MF6100 Series, MF6680dn, MF8500C Series
+i-SENSYS MF210, MF220, MF5880dn, MF5900, MF6680dn, MF8500C
 .br
-MAXIFY MB2000, MB2300, MB5000, MB5300
+MAXIFY MB2000, MB2300, MB5300
 .RE
 .PP
 \#The following models may use partly the same Pixma protocol as other devices
@@ -139,15 +149,21 @@ an up-to-date status at the project homepage. (See below).
 Users feedback is essential to help improve features and performances. 
 .SH OPTIONS
 Besides "well-known" options (e.g. resolution, mode etc.) pixma backend also
-provides the following
-\#.B experimental
-options for button handling, i.e. the options might change in the future.
+provides the following options, i.e. the options might change in the future.
 .br
 The button status can be polled i.e. with 'scanimage \-A'.
 .br
 Button scan is disabled on MAC OS X due to darwin libusb not handling
 timeouts in usb interrupt reads, but may work when using the network protocol.
 .TP
+.I adf\-wait
+This option enables and sets the time in seconds waiting for a document
+inserted into the
+.BR Automatic
+.BR Document
+.BR Feeder .
+The maximum allowed waiting time is 3600 sec (= 1 hour).
+.TP
 .I button\-controlled
 This option can be used by applications (like
 .BR scanadf (1)
@@ -209,21 +225,21 @@ support dynamic loading).
 .I @CONFIGDIR@/pixma.conf
 The backend configuration file (see also description of
 .B SANE_CONFIG_DIR
-below). The files contains an optional list of networked scanners. Normally 
-only scanners that can not be auto-detected because they are on a different 
+below). The file contains an optional list of networked scanners. Normally 
+only scanners that cannot be auto-detected because they are on a different 
 subnet shall be listed here. If your OS does not allow enumeration of 
-interfaces (i.e. it does not support the getifaddrs() function) you may need 
+interfaces (i.e. it does not support the getifaddrs() function) you also may need 
 to add your scanner here as well.
+.RS
 .PP
-Scanners shall be listed as:
+.I Scanners shall be listed in the configuraton file as follows:
 .PP
 .RS
-.I <method>://<host>[:port] 
+.I <method>://<host>[:port][/timeout=<value>]
 .RE
-.RS
 .PP
 where method indicates the protocol used (bjnp is used for inkjet multi-functionals
-and mfnp is used for laser multi-functionals).
+and mfnp is used for laser multi-functionals). 
 .PP
 host is the hostname or IP address of the scanner, e.g. bjnp://10.0.1.4 
 for IPv4, bjnp://[2001:888:118e:18e2:21e:8fff:fe36:b64a] for a literal 
@@ -232,7 +248,25 @@ IPv6-address or bjnp://myscanner.mydomain.org for a hostname.
 The port number is optional and in normally implied by the method.
 Port 8610 is the standard port for mfnp, 8612 for bjnp.
 .PP
-Define each scanner on a new line.
+A scanner specific timeout value for the network protocol can be set using the 
+bjnp-timeout parameter. The value is in ms.
+.PP
+Define scanners each on a new line.
+.PP
+More globally applicable tinmeouts can be set using the bjnp-timeout parameter as folllows:
+.PP
+.RS
+.I bjnp-timeout=<value>
+.RE
+.PP
+A timeout defined using bjnp-timeout will apply to the following scanner definitions
+in the file. If required the bjnp-timeout setting 
+can be defined multiple times, where each settng will apply only to the scanners that
+follow the setting. The last setting is used for the auto discovered scanners.
+If not explicitely set,  the default 1000ms setting will apply. 
+.PP
+Setting timeouts should only be required in exceptional cases.
+.PP
 .SH USB SUPPORT
 USB scanners will be auto-detected and require no configuration.
 .SH NETWORKING SUPPORT
diff --git a/doc/sane-xerox_mfp.man b/doc/sane-xerox_mfp.man
index 0f896ce..0ffa3e8 100644
--- a/doc/sane-xerox_mfp.man
+++ b/doc/sane-xerox_mfp.man
@@ -1,47 +1,20 @@
 .TH sane\-xerox_mfp 5 "15 Dec 2008" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane\-xerox_mfp
 .SH NAME
-sane\-xerox_mfp \- SANE backend for Xerox Phaser 3200MFP device
+sane\-xerox_mfp \- SANE backend for Xerox Phaser 3200MFP device et al.
 .SH DESCRIPTION
 The
 .B sane\-xerox_mfp
 library implements a SANE (Scanner Access Now Easy) backend that provides
-access to the following USB and network multifunction-peripheral:
-.PP
-.RS
-Phaser 3200MFP
-.br
-Dell MFP Laser Printer 1815dn
-.br
-Xerox Phaser 6110MFP
-.br
-Samsung CLX-3170fn & CLX-3175FW
-.br
-Samsung SCX-4200
-.br
-Samsung SCX-4300
-.br
-Samsung SCX-4500
-.br
-Samsung SCX-4500W
-.br
-Samsung SCX4725-FN
-.br
-Xerox WorkCentre 3119 Series
-.RE
-.PP
-If you own a scanner other than the ones listed above that works with this
-backend, please let us know this by sending the scanner's exact model name and
-the USB vendor and device ids (e.g. from
-.IR /proc/bus/usb/devices ,
-.I sane\-find\-scanner
-or syslog) to us. Even if the scanner's name is only slightly different from
-the models mentioned above, please let us know.
+access to several Samsung-based Samsung, Xerox, and Dell scanners.
+Please see full list of supported devices at
+http://www.sane\-project.org/sane\-supported\-devices.html
+
 .SH CONFIGURATION
 .I @CONFIGDIR@/xerox_mfp.conf
 USB scanners do not need any configuration.
 
-For SCX-4500W in network mode you need to specify
+For SCX\-4500W in network mode you need to specify
 .PP
 .RS
 .B tcp host_address [port]
@@ -70,14 +43,24 @@ debug levels increase the verbosity of the output.
 
 Example: 
 export SANE_DEBUG_XEROX_MFP=4
-.SH AUTHOR
-Alex Belkin <abc@telekom.ru>
 
-Samsung SCX-4500W scan over network support
-Alexander Kuznetsov <acca(at)cpan.org>
-.SH BUGS:
+.SH LIMITATIONS
 Multicast autoconfiguration for LAN scanners is not implemented yet. IPv6 addressing never been tested.
 
+.SH BUGS AND SUPPORT
+If you have found a bug or need support please follow open\-source way of acquiring support via
+mail\-lists http://www.sane\-project.org/mailing\-lists.html or SANE bug tracker 
+http://www.sane\-project.org/bugs.html
+
+.SH AUTHORS
+Alex Belkin <abc@telekom.ru>
+.br
+Samsung SCX\-4500W scan over network support by
+Alexander Kuznetsov <acca(at)cpan.org>
+.br
+Color scanning on Samsung M2870 model and Xerox Cognac 3215 & 3225 models by
+Laxmeesh Onkar Markod <m.laxmeesh@samsung.com>
+
 .SH "SEE ALSO"
 .BR sane (7),
 .BR sane\-usb (5)
diff --git a/doc/sane.man b/doc/sane.man
index 4fad9a9..3eadf42 100644
--- a/doc/sane.man
+++ b/doc/sane.man
@@ -524,6 +524,12 @@ The sane\-umax1220u backend supports the UMAX Astra 1220U (USB) flatbed scanner
 (and also the UMAX Astra 2000U, sort of). See
 .BR sane\-umax1220u (5)
 for details.
+.TP
+.B xerox_mfp
+The sane\-xerox_mfp backend supports multiple Samsung-based Samsung, Xerox, and Dell
+scanners. See
+.BR sane\-xerox_mfp (5)
+for details.
 .PP
 Also, have a look at the backend information page at
 .I http://www.sane\-project.org/sane\-supported\-devices.html
@@ -917,7 +923,8 @@ for details).
 .BR sane\-umax (5),
 .BR sane\-umax_pp (5),
 .BR sane\-usb (5),
-.BR sane\-v4l (5)
+.BR sane\-v4l (5),
+.BR sane\-xerox_mfp (5)
 
 .SH AUTHOR
 David Mosberger-Tang and many many more (see
diff --git a/doc/sane.tex b/doc/sane.tex
index 1132576..4611797 100644
--- a/doc/sane.tex
+++ b/doc/sane.tex
@@ -1,6 +1,6 @@
-\documentclass[11pt,DVIps]{report}
+\documentclass[11pt]{report}
 
-\usepackage{times,epsfig,html}
+\usepackage{times,graphicx,url}
 % Not Currently using changebar package so comment out to reduce
 % external dependencies.
 %\usepackage{changebar}
@@ -15,9 +15,9 @@
 \setlength{\marginparsep}{0pt}
 \addtolength{\topmargin}{-0.75in}
 
-\title{\huge SANE Standard Version 1.05}
+\title{\huge SANE Standard Version 1.06}
 \author{}
-\date{2006-04-02} 
+\date{2008-05-03}
 
 \makeindex
 
@@ -196,7 +196,7 @@ platform dependent.  Several possibilities exist:
 \begin{figure}[htbp]
   \begin{center}
     \leavevmode
-    \psfig{file=figs/hierarchy.eps,angle=270,width=\textwidth}
+    \includegraphics[width=\textwidth]{figs/hierarchy}
     \caption{Example SANE Hiearchy}
     \label{fig:hierarchy}
   \end{center}
@@ -280,7 +280,7 @@ significant bit, and the rightmost pixel in the least significant bit.
 \begin{figure}[htbp]
   \begin{center}
     \leavevmode
-    \psfig{file=figs/xfer.eps,width=0.5\textwidth}
+    \includegraphics[width=0.5\textwidth]{figs/xfer}
     \caption{Transfer order of image data bytes}
     \label{fig:xfer}
   \end{center}
@@ -304,7 +304,7 @@ fashion.
 \begin{figure}[htbp]
   \begin{center}
     \leavevmode
-    \psfig{file=figs/image-data.eps,width=0.8\textwidth}
+    \includegraphics[width=0.8\textwidth]{figs/image-data}
     \caption{Bit and byte order or image data}
     \label{fig:pixels}
   \end{center}
@@ -1683,7 +1683,7 @@ exiting the backend.
 \begin{figure}[htb]
   \begin{center}
     \leavevmode
-    \psfig{file=figs/flow.eps,height=0.5\textheight}
+    \includegraphics[height=0.5\textheight]{figs/flow}
     \caption{Code flow}
     \label{fig:flow}
   \end{center}
@@ -1826,7 +1826,7 @@ conversions.
 \begin{figure}[tbp]
   \begin{center}
     \leavevmode
-    \psfig{file=figs/area.eps,height=0.3\textheight}
+    \includegraphics[height=0.3\textheight]{figs/area}
     \caption{Scan area options}
     \label{fig:area}
   \end{center}
@@ -1873,9 +1873,7 @@ The SANE standard is discussed and evolved via a mailing list.
 Anybody with email access to the Internet can automatically join and
 leave the discussion group by sending mail to the following address.
 \begin{quote}\index{mailing list}
-\begin{verbatim}
-sane-devel-request@lists.alioth.debian.org
-\end{verbatim}
+\url{sane-devel-request@lists.alioth.debian.org}
 \end{quote}
 To subscribe, send a mail with the body ``\verb|subscribe sane-devel|'' to the
 above address.
diff --git a/doc/saned.man b/doc/saned.man
index 5f7bc20..7b0fa4a 100644
--- a/doc/saned.man
+++ b/doc/saned.man
@@ -226,7 +226,7 @@ compiled in, but then logging of debug information is not supported.
 The systemd configuration is different for the 2 options, so
 both are described below.
 .SH Systemd configuration for saned with systemd support compiled in
-for the systemd configuration we need to add 2 configuation files in 
+for the systemd configuration we need to add 2 configuration files in
 .I /etc/systemd/system.
 .PP
 The first file we need to add here is called 
@@ -301,7 +301,7 @@ forwarded to the system log.
 This configuration will also work when Saned is compiled WITH systemd integration
 support, but it does not allow debugging information to be logged.
 .PP
-for systemd configuration for saned, we need to add 2 configuation files in
+for systemd configuration for saned, we need to add 2 configuration files in
 .I /etc/systemd/system.
 .PP
 The first file we need to add here is called
author	Jörg Frings-Fürst <debian@jff-webhosting.net>	2017-07-15 11:29:05 +0200
committer	Jörg Frings-Fürst <debian@jff-webhosting.net>	2017-07-15 11:29:05 +0200
commit	324a8a71bb7d9e4f8bc49b6bc47efaf9fb58282e (patch)
tree	bd2d48a139bfbe869f4f49359b63097931a45e7b /doc
parent	2ca8a81bd0d99fe4d75c229d0e988d8ef710285f (diff)
parent	1edb02101a9306fc711cd422ed507d18165b1691 (diff)