Update upstream source from tag 'upstream/1.0.28'

Update to upstream version '1.0.28' with Debian dir ec5bb298266630fc3801ff6dc0c258f6df7ba979
author: Jörg Frings-Fürst <debian@jff-webhosting.net> 2019-07-31 17:00:20 +0200
committer: Jörg Frings-Fürst <debian@jff-webhosting.net> 2019-07-31 17:00:20 +0200
commit: 3759ce55ba79b8d3b9d8ed247a252273ee7dade3 (patch)
tree: d69692a274dd1c7d0672e6bb7155a0fc106f9d49 /doc
parent: c8bd2513ecba169cff44c09c8058c36987357b18 (diff)
parent: 1687222e1b9e74c89cafbb5910e72d8ec7bfd40f (diff)
204 files changed, 3586 insertions, 6165 deletions
diff --git a/doc/.gitignore b/doc/.gitignore
new file mode 100644
index 0000000..076d975
--- /dev/null
+++ b/doc/.gitignore
@@ -0,0 +1,25 @@
+*.1
+*.5
+*.7
+*.8
+*.eps
+*.html
+*.pdf
+descriptions-external.db
+descriptions.db
+doxygen-genesys.conf
+doxygen-sanei.conf
+doxygen_sqlite3.db
+genesys-html
+sane.aux
+sane.cb
+sane.dvi
+sane.idx
+sane.ilg
+sane.ind
+sane.lof
+sane.log
+sane.lot
+sane.ps
+sane.toc
+sanei-html
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 162d01a..1651ed9 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -24,7 +24,7 @@ BACKEND_5MANS = sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-as6e.5 \
 	sane-nec.5 sane-net.5 sane-pie.5 sane-pieusb.5 sane-pint.5 sane-pnm.5 \
 	sane-umax.5 sane-qcam.5 sane-scsi.5 sane-artec.5 sane-kodak.5 sane-kodakaio.5 \
 	sane-fujitsu.5 sane-sharp.5 sane-s9036.5 sane-tamarack.5 \
-	sane-ricoh.5 sane-avision.5 sane-plustek.5 sane-st400.5 \
+	sane-ricoh.5 sane-ricoh.5 sane-avision.5 sane-plustek.5 sane-st400.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 \
@@ -47,7 +47,7 @@ EXTRA_DIST += sane-abaton.man sane-agfafocus.man sane-apple.man sane-as6e.man \
 	sane-pie.man sane-pieusb.man sane-pint.man sane-pnm.man sane-umax.man \
 	sane-qcam.man sane-scsi.man sane-artec.man sane-fujitsu.man \
 	sane-sharp.man sane-s9036.man sane-tamarack.man sane-kodak.man sane-kodakaio.man\
-	sane-ricoh.man sane-avision.man sane-plustek.man sane-st400.man \
+	sane-ricoh.man sane-ricoh2.man sane-avision.man sane-plustek.man sane-st400.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 \
@@ -174,7 +174,8 @@ DESC_FILES = descriptions/abaton.desc descriptions/agfafocus.desc \
   descriptions/niash.desc descriptions/pie.desc descriptions/pieusb.desc descriptions/pint.desc \
   descriptions/p5.desc descriptions/pixma.desc descriptions/plustek.desc \
   descriptions/plustek_pp.desc descriptions/pnm.desc descriptions/qcam.desc \
-  descriptions/ricoh.desc descriptions/rts8891.desc descriptions/s9036.desc \
+  descriptions/ricoh.desc descriptions/ricoh2.desc \
+  descriptions/rts8891.desc descriptions/s9036.desc \
   descriptions/sceptre.desc descriptions/sharp.desc descriptions/sm3600.desc \
   descriptions/sm3840.desc descriptions/snapscan.desc descriptions/sp15c.desc \
   descriptions/st400.desc descriptions/stv680.desc descriptions/tamarack.desc \
@@ -183,12 +184,11 @@ DESC_FILES = descriptions/abaton.desc descriptions/agfafocus.desc \
   descriptions/umax1220u.desc descriptions/umax.desc \
   descriptions/umax_pp.desc  descriptions/unsupported.desc \
   descriptions/v4l.desc descriptions/xerox_mfp.desc
-EXTRA_DIST += $(DESC_FILES) descriptions/template.desc. 
+EXTRA_DIST += $(DESC_FILES) descriptions/template.desc.
 
 DESC_EXT_FILES = descriptions-external/brother2.desc \
   descriptions-external/brother.desc \
   descriptions-external/brother-mfc4600.desc \
-  descriptions-external/canon_mfp.desc \
   descriptions-external/cs3200f.desc \
   descriptions-external/epkowa.desc \
   descriptions-external/geniusvp2.desc \
diff --git a/doc/Makefile.in b/doc/Makefile.in
deleted file mode 100644
index d678cf1..0000000
--- a/doc/Makefile.in
+++ /dev/null
@@ -1,1062 +0,0 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-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/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)/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
-CONFIG_HEADER = $(top_builddir)/include/sane/config.h
-CONFIG_CLEAN_FILES = doxygen-sanei.conf doxygen-genesys.conf
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-man1dir = $(mandir)/man1
-am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man7dir)" \
-	"$(DESTDIR)$(man8dir)" "$(DESTDIR)$(docdir)" \
-	"$(DESTDIR)$(docdir)" "$(DESTDIR)$(docdir)"
-man7dir = $(mandir)/man7
-man8dir = $(mandir)/man8
-NROFF = nroff
-MANS = $(man1_MANS) $(man7_MANS) $(man8_MANS)
-DATA = $(dist_doc_DATA) $(doc_DATA) $(nobase_dist_doc_DATA)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-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@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AVAHI_CFLAGS = @AVAHI_CFLAGS@
-AVAHI_LIBS = @AVAHI_LIBS@
-AWK = @AWK@
-BACKENDS = @BACKENDS@
-BACKEND_CONFS_ENABLED = @BACKEND_CONFS_ENABLED@
-BACKEND_LIBS_ENABLED = @BACKEND_LIBS_ENABLED@
-BACKEND_MANS_ENABLED = @BACKEND_MANS_ENABLED@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLH = @DLH@
-DLLTOOL = @DLLTOOL@
-DL_LIBS = @DL_LIBS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-DVIPS = @DVIPS@
-DYNAMIC_FLAG = @DYNAMIC_FLAG@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-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@
-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 = @LATEX@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
-LIBV4L_LIBS = @LIBV4L_LIBS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOCKPATH_GROUP = @LOCKPATH_GROUP@
-LTALLOCA = @LTALLOCA@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINDEX = @MAKEINDEX@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MATH_LIB = @MATH_LIB@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-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@
-RANLIB = @RANLIB@
-RESMGR_LIBS = @RESMGR_LIBS@
-SANEI_SANEI_JPEG_LO = @SANEI_SANEI_JPEG_LO@
-SANE_CONFIG_PATH = @SANE_CONFIG_PATH@
-SCSI_LIBS = @SCSI_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SNMP_CFLAGS = @SNMP_CFLAGS@
-SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@
-SNMP_LIBS = @SNMP_LIBS@
-SOCKET_LIBS = @SOCKET_LIBS@
-STRICT_LDFLAGS = @STRICT_LDFLAGS@
-STRIP = @STRIP@
-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@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-configdir = @configdir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-effective_target = @effective_target@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-locksanedir = @locksanedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-man1_MANS = scanimage.1 sane-config.1 sane-find-scanner.1 gamma4scanimage.1
-EXTRA_DIST = scanimage.man sane-config.man sane-find-scanner.man \
-	gamma4scanimage.man sane-abaton.man sane-agfafocus.man \
-	sane-apple.man sane-as6e.man sane-dll.man sane-dc25.man \
-	sane-dmc.man sane-epson.man sane-epson2.man sane-epsonds.man \
-	sane-hp.man sane-gphoto2.man sane-leo.man sane-lexmark.man \
-	sane-matsushita.man sane-microtek.man sane-microtek2.man \
-	sane-mustek.man sane-nec.man sane-net.man sane-pie.man \
-	sane-pieusb.man sane-pint.man sane-pnm.man sane-umax.man \
-	sane-qcam.man sane-scsi.man sane-artec.man sane-fujitsu.man \
-	sane-sharp.man sane-s9036.man sane-tamarack.man sane-kodak.man \
-	sane-kodakaio.man sane-ricoh.man sane-avision.man \
-	sane-plustek.man sane-st400.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-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 \
-	sane-ma1509.man sane-ibm.man sane-hp5400.man \
-	sane-plustek_pp.man sane-u12.man sane-niash.man \
-	sane-sm3840.man sane-genesys.man sane-hp4200.man \
-	sane-mustek_usb2.man sane-hp3500.man sane-pixma.man \
-	sane-stv680.man sane-hp5590.man sane-hpljm1005.man \
-	sane-cardscan.man sane-hp3900.man sane-epjitsu.man \
-	sane-hs2p.man sane-canon_dr.man sane-xerox_mfp.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 \
-	$(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 \
-	sane-matsushita.5 sane-microtek.5 sane-microtek2.5 sane-mustek.5 \
-	sane-nec.5 sane-net.5 sane-pie.5 sane-pieusb.5 sane-pint.5 sane-pnm.5 \
-	sane-umax.5 sane-qcam.5 sane-scsi.5 sane-artec.5 sane-kodak.5 sane-kodakaio.5 \
-	sane-fujitsu.5 sane-sharp.5 sane-s9036.5 sane-tamarack.5 \
-	sane-ricoh.5 sane-avision.5 sane-plustek.5 sane-st400.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-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 \
-	sane-niash.5 sane-sm3840.5 sane-genesys.5 sane-hp4200.5 \
-	sane-mustek_usb2.5 sane-hp3500.5 sane-pixma.5 sane-stv680.5 \
-	sane-hp5590.5 sane-hpljm1005.5 sane-cardscan.5 sane-hp3900.5 \
-	sane-epjitsu.5 sane-hs2p.5 sane-canon_dr.5 sane-xerox_mfp.5 \
-	sane-rts8891.5 sane-coolscan3.5 sane-kvs1025.5 sane-kvs20xx.5 \
-	sane-kvs40xx.5 sane-p5.5 sane-magicolor.5
-
-man7_MANS = sane.7
-man8_MANS = saned.8
-MANPAGES = $(man1_MANS) $(BACKEND_5MANS) $(man7_MANS) $(man8_MANS)
-@CROSS_COMPILING_FALSE@HTML_PAGES = sane-backends.html sane-backends-external.html \
-@CROSS_COMPILING_FALSE@	     sane-mfgs.html sane-mfgs-external.html
-
-@CROSS_COMPILING_TRUE@HTML_PAGES = 
-doc_DATA = $(HTML_PAGES) $(API_SPECS)
-dist_doc_DATA = backend-writing.txt
-nobase_dist_doc_DATA = $(BEDOCS)
-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>,'
-
-beman5dir = $(mandir)/man5
-BEDOCS = canon/canon.changes canon/canon.install2700F.txt \
-	gt68xx/gt68xx.CHANGES gt68xx/gt68xx.TODO leo/leo.txt \
-	matsushita/matsushita.txt mustek/mustek.CHANGES \
-	mustek_usb/mustek_usb.CHANGES mustek_usb/mustek_usb.TODO \
-	mustek_usb2/mustek_usb2.CHANGES mustek_usb2/mustek_usb2.TODO \
-	niash/niash.TODO plustek/FAQ plustek/MakeModule.sh \
-	plustek/Makefile.kernel24 plustek/Makefile.kernel26 \
-	plustek/Plustek-PARPORT-TODO.txt \
-	plustek/Plustek-PARPORT.changes plustek/Plustek-PARPORT.txt \
-	plustek/Plustek-USB-TODO.txt plustek/Plustek-USB.changes \
-	plustek/Plustek-USB.txt sceptre/s1200.txt teco/teco1.txt \
-	teco/teco2.txt teco/teco3.txt u12/U12.changes u12/U12.todo \
-	umax/negative-types.txt umax/sane-logo.jpg \
-	umax/sane-umax-advanced-options-doc.html \
-	umax/sane-umax-advanced.jpg umax/sane-umax-astra-doc.html \
-	umax/sane-umax-config-doc.html umax/sane-umax-doc.html \
-	umax/sane-umax-histogram.jpg umax/sane-umax-mirage-doc.html \
-	umax/sane-umax-not-listed-doc.html \
-	umax/sane-umax-others-doc.html umax/sane-umax-parport-doc.html \
-	umax/sane-umax-powerlook-doc.html \
-	umax/sane-umax-scanner-clones-doc.html \
-	umax/sane-umax-speed-doc.html \
-	umax/sane-umax-standard-options-doc.html \
-	umax/sane-umax-standard.jpg umax/sane-umax-text.jpg \
-	umax/sane-umax-text2.jpg umax/sane-umax-text4.jpg \
-	umax/sane-umax-uc-doc.html umax/sane-umax-vista-doc.html \
-	umax/sane-umax.jpg umax/umax.BUGS umax/umax.CHANGES \
-	umax/umax.FAQ umax/umax.TODO
-DESC_FILES = descriptions/abaton.desc descriptions/agfafocus.desc \
-  descriptions/apple.desc descriptions/artec.desc \
-  descriptions/artec_eplus48u.desc descriptions/as6e.desc \
-  descriptions/avision.desc descriptions/bh.desc descriptions/canon630u.desc \
-  descriptions/canon.desc descriptions/canon_dr.desc \
-  descriptions/canon_pp.desc descriptions/cardscan.desc \
-  descriptions/coolscan2.desc descriptions/coolscan.desc \
-  descriptions/coolscan3.desc \
-  descriptions/dc210.desc descriptions/dc240.desc descriptions/dc25.desc \
-  descriptions/dell1600n_net.desc descriptions/dll.desc descriptions/dmc.desc \
-  descriptions/epjitsu.desc descriptions/epson2.desc descriptions/epson.desc \
-  descriptions/epsonds.desc \
-  descriptions/fujitsu.desc descriptions/genesys.desc \
-  descriptions/gphoto2.desc descriptions/gt68xx.desc descriptions/hp3500.desc \
-  descriptions/hp3900.desc descriptions/hp4200.desc descriptions/hp5400.desc \
-  descriptions/hp5590.desc descriptions/hp.desc descriptions/hpljm1005.desc \
-  descriptions/hpsj5s.desc descriptions/hs2p.desc descriptions/ibm.desc \
-  descriptions/kodak.desc descriptions/kodakaio.desc descriptions/kvs1025.desc \
-  descriptions/kvs20xx.desc descriptions/kvs40xx.desc \
-  descriptions/leo.desc descriptions/lexmark.desc descriptions/ma1509.desc \
-  descriptions/magicolor.desc \
-  descriptions/matsushita.desc descriptions/microtek2.desc \
-  descriptions/microtek.desc descriptions/mustek.desc \
-  descriptions/mustek_pp.desc descriptions/mustek_usb2.desc \
-  descriptions/mustek_usb.desc descriptions/nec.desc descriptions/net.desc \
-  descriptions/niash.desc descriptions/pie.desc descriptions/pieusb.desc descriptions/pint.desc \
-  descriptions/p5.desc descriptions/pixma.desc descriptions/plustek.desc \
-  descriptions/plustek_pp.desc descriptions/pnm.desc descriptions/qcam.desc \
-  descriptions/ricoh.desc descriptions/rts8891.desc descriptions/s9036.desc \
-  descriptions/sceptre.desc descriptions/sharp.desc descriptions/sm3600.desc \
-  descriptions/sm3840.desc descriptions/snapscan.desc descriptions/sp15c.desc \
-  descriptions/st400.desc descriptions/stv680.desc descriptions/tamarack.desc \
-  descriptions/teco1.desc descriptions/teco2.desc descriptions/teco3.desc \
-  descriptions/test.desc descriptions/u12.desc \
-  descriptions/umax1220u.desc descriptions/umax.desc \
-  descriptions/umax_pp.desc  descriptions/unsupported.desc \
-  descriptions/v4l.desc descriptions/xerox_mfp.desc
-
-DESC_EXT_FILES = descriptions-external/brother2.desc \
-  descriptions-external/brother.desc \
-  descriptions-external/brother-mfc4600.desc \
-  descriptions-external/canon_mfp.desc \
-  descriptions-external/cs3200f.desc \
-  descriptions-external/epkowa.desc \
-  descriptions-external/geniusvp2.desc \
-  descriptions-external/hp3770.desc \
-  descriptions-external/hp8200.desc \
-  descriptions-external/hpaio.desc \
-  descriptions-external/hpoj.desc \
-  descriptions-external/kodak-twain.desc \
-  descriptions-external/lhii.desc \
-  descriptions-external/mustek_a3p1.desc \
-  descriptions-external/panamfs.desc \
-  descriptions-external/primascan.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 \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu doc/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-doxygen-sanei.conf: $(top_builddir)/config.status $(srcdir)/doxygen-sanei.conf.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-doxygen-genesys.conf: $(top_builddir)/config.status $(srcdir)/doxygen-genesys.conf.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-man1: $(man1_MANS)
-	@$(NORMAL_INSTALL)
-	@list1='$(man1_MANS)'; \
-	list2=''; \
-	test -n "$(man1dir)" \
-	  && test -n "`echo $$list1$$list2`" \
-	  || exit 0; \
-	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
-	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
-	{ for i in $$list1; do echo "$$i"; done;  \
-	if test -n "$$list2"; then \
-	  for i in $$list2; do echo "$$i"; done \
-	    | sed -n '/\.1[a-z]*$$/p'; \
-	fi; \
-	} | while read p; do \
-	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; echo "$$p"; \
-	done | \
-	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-	sed 'N;N;s,\n, ,g' | { \
-	list=; while read file base inst; do \
-	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
-	  fi; \
-	done; \
-	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-	while read files; do \
-	  test -z "$$files" || { \
-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
-	done; }
-
-uninstall-man1:
-	@$(NORMAL_UNINSTALL)
-	@list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \
-	files=`{ for i in $$list; do echo "$$i"; done; \
-	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
-install-man7: $(man7_MANS)
-	@$(NORMAL_INSTALL)
-	@list1='$(man7_MANS)'; \
-	list2=''; \
-	test -n "$(man7dir)" \
-	  && test -n "`echo $$list1$$list2`" \
-	  || exit 0; \
-	echo " $(MKDIR_P) '$(DESTDIR)$(man7dir)'"; \
-	$(MKDIR_P) "$(DESTDIR)$(man7dir)" || exit 1; \
-	{ for i in $$list1; do echo "$$i"; done;  \
-	if test -n "$$list2"; then \
-	  for i in $$list2; do echo "$$i"; done \
-	    | sed -n '/\.7[a-z]*$$/p'; \
-	fi; \
-	} | while read p; do \
-	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; echo "$$p"; \
-	done | \
-	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^7][0-9a-z]*$$,7,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-	sed 'N;N;s,\n, ,g' | { \
-	list=; while read file base inst; do \
-	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man7dir)/$$inst'"; \
-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man7dir)/$$inst" || exit $$?; \
-	  fi; \
-	done; \
-	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-	while read files; do \
-	  test -z "$$files" || { \
-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man7dir)'"; \
-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man7dir)" || exit $$?; }; \
-	done; }
-
-uninstall-man7:
-	@$(NORMAL_UNINSTALL)
-	@list='$(man7_MANS)'; test -n "$(man7dir)" || exit 0; \
-	files=`{ for i in $$list; do echo "$$i"; done; \
-	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^7][0-9a-z]*$$,7,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	dir='$(DESTDIR)$(man7dir)'; $(am__uninstall_files_from_dir)
-install-man8: $(man8_MANS)
-	@$(NORMAL_INSTALL)
-	@list1='$(man8_MANS)'; \
-	list2=''; \
-	test -n "$(man8dir)" \
-	  && test -n "`echo $$list1$$list2`" \
-	  || exit 0; \
-	echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \
-	$(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \
-	{ for i in $$list1; do echo "$$i"; done;  \
-	if test -n "$$list2"; then \
-	  for i in $$list2; do echo "$$i"; done \
-	    | sed -n '/\.8[a-z]*$$/p'; \
-	fi; \
-	} | while read p; do \
-	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; echo "$$p"; \
-	done | \
-	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-	sed 'N;N;s,\n, ,g' | { \
-	list=; while read file base inst; do \
-	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-	  fi; \
-	done; \
-	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-	while read files; do \
-	  test -z "$$files" || { \
-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-	done; }
-
-uninstall-man8:
-	@$(NORMAL_UNINSTALL)
-	@list='$(man8_MANS)'; test -n "$(man8dir)" || exit 0; \
-	files=`{ for i in $$list; do echo "$$i"; done; \
-	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
-install-dist_docDATA: $(dist_doc_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
-	done
-
-uninstall-dist_docDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
-install-docDATA: $(doc_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
-	done
-
-uninstall-docDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
-install-nobase_dist_docDATA: $(nobase_dist_doc_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(nobase_dist_doc_DATA)'; test -n "$(docdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \
-	fi; \
-	$(am__nobase_list) | while read dir files; do \
-	  xfiles=; for file in $$files; do \
-	    if test -f "$$file"; then xfiles="$$xfiles $$file"; \
-	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
-	  test -z "$$xfiles" || { \
-	    test "x$$dir" = x. || { \
-	      echo " $(MKDIR_P) '$(DESTDIR)$(docdir)/$$dir'"; \
-	      $(MKDIR_P) "$(DESTDIR)$(docdir)/$$dir"; }; \
-	    echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(docdir)/$$dir'"; \
-	    $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(docdir)/$$dir" || exit $$?; }; \
-	done
-
-uninstall-nobase_dist_docDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(nobase_dist_doc_DATA)'; test -n "$(docdir)" || list=; \
-	$(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
-	dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(MANS) $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(docdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-local mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-local
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am: html-local
-
-info: info-am
-
-info-am:
-
-install-data-am: install-data-local install-dist_docDATA \
-	install-docDATA install-man install-nobase_dist_docDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man: install-man1 install-man7 install-man8
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-dist_docDATA uninstall-docDATA uninstall-local \
-	uninstall-man uninstall-nobase_dist_docDATA
-
-uninstall-man: uninstall-man1 uninstall-man7 uninstall-man8
-
-.MAKE: install-am install-strip
-
-.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 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 \
-	uninstall-local uninstall-man uninstall-man1 uninstall-man7 \
-	uninstall-man8 uninstall-nobase_dist_docDATA
-
-
-all: bemans $(API_SPECS) html-pages
-
-%.1 %.5 %.7 %.8: %.man
-	@echo "Generating manpage $@...";
-	@sed -e 's|@DATADIR@|$(datadir)|g' \
-	  -e 's|@CONFIGDIR@|$(configdir)|g' \
-	  -e 's|@DOCDIR@|$(docdir)|g' \
-	  -e 's|@LIBDIR@|$(libdir)/sane|g' \
-	  -e 's|@BINDIR@|$(bindir)|g' \
-	  -e 's|@SBINDIR@|$(sbindir)|g' \
-	  -e 's|@PACKAGEVERSION@|$(package_version)|g' $^ >$@
-
-bemans: $(BACKEND_5MANS)
-install-beman5: $(BACKEND_5MANS)
-	test -z "$(beman5dir)" || $(MKDIR_P) "$(DESTDIR)$(beman5dir)"
-	@list="$(BACKEND_MANS_ENABLED) sane-dll.5 sane-scsi.5 sane-usb.5"; for man in $$list; do \
-	  if test ! -r $${man}; then continue; fi; \
-	  echo "installing $${man} in $(beman5dir)/$${man}..."; \
-	  $(INSTALL_DATA) $${man} $(DESTDIR)$(beman5dir)/$${man} \
-	  || exit 1; \
-	done
-
-install-data-local: install-beman5
-
-uninstall-local:
-	rm -rf $(DESTDIR)$(beman5dir)/sane-*.5
-
-sane.ind: $(API_SPEC_INPUTS)
-	@echo Generating index for $<...
-	@touch sane.ind
-	@$(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: $(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 $@ 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
-	$(am_TEXINPUTS) $(DLH) $(srcdir)/sane.tex
-
-html-man: $(MANPAGES)
-	@for page in $(MANPAGES); do \
-	  echo "translating $${page} to $${page}.html..."; \
-	  cat $${page} | $(MAN2HTML) > $${page}.html; \
-	done
-
-../tools/sane-desc:
-	cd ../tools ; $(MAKE) sane-desc
-
-sane-backends.html: $(DESC_FILES) ../tools/sane-desc
-	@../tools/sane-desc -m html-backends-split -s ${srcdir}/descriptions \
-	  -i "The following table summarizes the backends/drivers distributed \
-	  with $(PACKAGE)-$(VERSION), and the hardware or software they \
-	  support." -d 0 > sane-backends.html
-
-sane-backends-external.html: $(DESC_EXT_FILES) ../tools/sane-desc
-	@../tools/sane-desc -m html-backends-split \
-	  -s ${srcdir}/descriptions-external \
-	  -i "The following table summarizes the backends/drivers that \
-	  have not yet been included in the SANE distribution, and the \
-	  hardware or software they support." \
-	  -t "SANE: External Backends (Drivers)" -d 0 \
-	  > sane-backends-external.html
-
-sane-mfgs.html: $(DESC_FILES) ../tools/sane-desc
-	@../tools/sane-desc -m html-mfgs -s ${srcdir}/descriptions \
-	  -i "The following table summarizes the devices supported \
-	  by $(PACKAGE)-$(VERSION)." \
-	  -d 0 > sane-mfgs.html
-
-sane-mfgs-external.html: $(DESC_EXT_FILES) ../tools/sane-desc
-	@../tools/sane-desc -m html-mfgs -s ${srcdir}/descriptions-external \
-	  -i "The following table summarizes the devices that \
-	  are supported by external backends." \
-	  -t "SANE: Devices Supported by External Backends" -d 0 \
-	  > sane-mfgs-external.html
-
-descriptions.db: $(DESC_FILES) ../tools/sane-desc
-	@../tools/sane-desc -m ascii -s ${srcdir}/descriptions \
-	  > descriptions.db
-
-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-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)
-	rm -f *.lot *.lof *.ind
-	rm -f sane.dvi sane.ps sane-backends.html sane-backends-external.html
-	rm -f sane-mfgs.html sane-mfgs-external.html
-	rm -f sane/*.html sane/*.gif
-	rm -f doxygen-sanei.conf doxygen-genesys.conf
-	-rm -rf sane sanei-html
-	for manpage in $(MANPAGES) ; do \
-	  rm -f $${manpage}.html ; \
-	done
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/doc/backend-writing.txt b/doc/backend-writing.txt
index 7e34d6a..576e8e4 100644
--- a/doc/backend-writing.txt
+++ b/doc/backend-writing.txt
@@ -45,12 +45,11 @@ CONFIGURATION AND BUILD SYSTEM
 Sane-backends uses the autoconf and automake tools. The configure script is
 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 
+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
 to generate include/sane/config.h.in, and automake to generate various
-Makefile.in's from Makefile.am's.  All changes made by "autoreconf" must
-be commited together.
+Makefile.in's from Makefile.am's.
 
 When running configure, the Makefiles in the main and sub-directories are
 created from their respective Makefile.in files. Also include/sane/config.h
@@ -60,13 +59,13 @@ Running "make" runs the respective targets in the sub directories recursively.
 
 The Makefile.am in each directory contains lists of files which are part of the
 distribution and which are therefore copied to the tar.gz archive, when a
-release is made. It's important that newly added files are also added to 
+release is made. It's important that newly added files are also added to
 a variable that will cause them to be distributed (EXTRA_DIST at a minimum).
 
 For creating binaries and libraries libtool is used. The ltmain.sh script
-contains special modifications for SANE. These modifications ensure that 
-the soname of each SANE backend library is "libsane.so". Without this 
-change, backend libraries (like "libsane-epson.so") could not used as 
+contains special modifications for SANE. These modifications ensure that
+the soname of each SANE backend library is "libsane.so". Without this
+change, backend libraries (like "libsane-epson.so") could not used as
 on-the-fly replacement for the dll backend.
 
 DIRECTORY OVERVIEW
@@ -76,7 +75,7 @@ This chapter explains some details about the files and directories used in the
 sane-backends distribution.
 
 sane-backends/
-  * acinclude.m4 aclocal.m4 compile config.guess config.sub configure 
+  * acinclude.m4 aclocal.m4 compile config.guess config.sub configure
     configure.ac depcomp install-sh ltmain.sh Makefile.am Makefile.in missing
     mkinstalldirs: Part of the build system as explained above.
   * ChangeLog:
@@ -94,19 +93,17 @@ sane-backends/
     General documentation + license.
   * NEWS:
     This is some kind of executive summary of the ChangeLog. It will be created
-    before a release. 
+    before a release.
   * PROBLEMS:
     General (severe) problems that all SANE users should be
-    aware. Backend-specific trouble should normally not mentioned there. 
+    aware. Backend-specific trouble should normally not mentioned there.
   * PROJECTS:
     Planned SANE-related development (e.g. ports, frontends). New backends won't
     be listed here but a new .desc file will be created for them (see below).
   * README:
     General building instructions.
   * README.aix README.beos (...):
-    Platform-dependent building and usage instructions. 
-  * sane-backends.lsm:
-    The .lsm file as used for the ibiblio archive.
+    Platform-dependent building and usage instructions.
 
 sane-backends/backend/
   This is where the actual backend code is placed. As an example the file
@@ -117,13 +114,13 @@ sane-backends/backend/
   directory. Code which is useful for more than one backend should be placed in
   sanei/ instead.
   * newbackend.c:
-    The main backend file, usually contains the SANE API code. Mandatory. 
+    The main backend file, usually contains the SANE API code. Mandatory.
   * newbackend.h:
     Header file, containing includes and so on.
   * newbackend.conf.in:
-    Configuration file for the backend, newbackend.conf will be created by 
-    running "make" from this file. Some variables are substituted, e.g. for 
-    installation directories. This is especially useful for firmware 
+    Configuration file for the backend, newbackend.conf will be created by
+    running "make" from this file. Some variables are substituted, e.g. for
+    installation directories. This is especially useful for firmware
     directories. See Makefile.am for a list.
   * newbackend-low.c:
     Contains low level code for the "newbackend" backend. Depending on the
@@ -147,16 +144,16 @@ sane-backends/backend/
 sane-backends/doc/
    Documentation for SANE. For some more details, see chapter DOCUMENTATION
    below. Again an example for "newbackend":
-   * sane-newbackend.man: 
+   * sane-newbackend.man:
      The manual page of the backend. From this file, "sane-newbackend.5" is
-     generated by running "make". 
+     generated by running "make".
    * newbackend/ (directory)
      Contains additional information about newbackend, e.g. READMEs or TODO
-     files. 
+     files.
    General files:
    * Makefile.am:
      "sane-newbackend.5" must be added to variable BACKEND_5MANS and
-      "sane-newbackend.man" to EXTRA_DIST. A backend documentation directory 
+      "sane-newbackend.man" to EXTRA_DIST. A backend documentation directory
       (if used) must be added to the BEDOCS variable.
    * backend-writing.txt:
      This file.
@@ -169,13 +166,13 @@ sane-backends/doc/
    * sane.tex, net.tex:
      Contains the LaTeX source of the SANE standard.
    * descriptions/ (directory)
-     Contains the .desc files for every backend that is included into 
+     Contains the .desc files for every backend that is included into
      sane-backends.
    * descriptions-external/ (directory)
      Contains the .desc files for backend that are not included into
      sane-backends yet (external backends). These files should only be created
      if the code it points to is really a SANE backend (and not just a command
-     line program). 
+     line program).
 
 sane-backends/frontend/
      Contains the frontends scanimage, saned, and tstbackend.
@@ -186,8 +183,8 @@ sane-backends/include/
      SANE-specific headers are located in include/sane/:
      * config.h.in:
        Main header file needed for portablility. config.h is created from this
-       file and must be included by every backend. 
-     * sane.h: 
+       file and must be included by every backend.
+     * sane.h:
        Official SANE API header file. Don't change this without discussion on
        the sane-devel mailing list.
      * saneopts.h:
@@ -202,14 +199,14 @@ sane-backends/japi/
 
 sane-backends/lib/
      Contains various library functions that may miss in the standard C library
-     of some platforms. 
+     of some platforms.
 
 sane-backends/po/
      Translations of SANEbackend options. See README for details.
 
 sane-backends/sanei/
      Sanei (SANE internal) code. Needed for code used in several backends
-     like USB access. For more details, see the documentaion on the SANE 
+     like USB access. For more details, see the documentaion on the SANE
      website.
 
 sane-backends/testsuite/
@@ -231,14 +228,14 @@ PROGRAMMING
   least:
     - 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 
+      and define _lib${backend}_la_SOURCES and
       nodist_libsane_${backend}_la_SOURCES; using an existing backend as
       a template.  Any sanei reference code should be listed in
       libsane_${backend}_la_LIBADD as well as any external libraries
       required to resolve all symbols.
-    - Add the source code files to the backend/ directories. All file names 
+    - Add the source code files to the backend/ directories. All file names
       must start with the backend name (e.g. newbackend.c, newbackend.h and
-      newbackend-usb.c). 
+      newbackend-usb.c).
 
 * Please follow the GNU coding standards.  It's clear that the style
   outlined there is nobody's favorite, but it's much easier to
@@ -295,7 +292,7 @@ PROGRAMMING
 
 * If you use headers or libraries that may not be available on all systems,
   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 
+  depends on these libraries or headers, compile the backend only if they are
   available (see pint for an example).
 
 * Use #include ".../include/sane/..." to include the sane header files
@@ -311,9 +308,9 @@ PROGRAMMING
 * It's no longer necessary to #define PATH_MAX (now in sanei_backend.h).
   If you define it, do so *after* the system includes.
 
-* Please use sanei functions whenever possible (e.g. 
+* Please use sanei functions whenever possible (e.g.
   sanei_config_read()). This makes porting to other os/platforms much
-  easier. Most of these functions are documented in their respective 
+  easier. Most of these functions are documented in their respective
   header files in include/sane/sanei_*.h. For most of them there is also
   documentation in doxygen format: http://www.sane-project.org/sanei/. These
   HTML pages can be generated by calling "doxygen sanei-doxygen.conf" in
@@ -389,7 +386,7 @@ TESTING
   compiled nor installed by default. To do that, cd into frontend and
   run "make tstbackend".
 
-* Please test a backend not just with scanimage and xscanimage 
+* Please test a backend not just with scanimage and xscanimage
   (+ other frontends), but also with saned.  Based on past experience,
   it is often the case that remote scanning can uncover subtle bugs.
   Note that you don't  have to use two different machines to test "remote"
@@ -402,7 +399,7 @@ TESTING
   access to other platforms, ask sane-devel.
 
 * Please make sure that all global symbols exported from a SANE backend start
-  with the prefix "sane" or "sanei" to avoid clashes with exported symbols 
+  with the prefix "sane" or "sanei" to avoid clashes with exported symbols
   of other backends. Only symbols mentioned in the SANE standard should start
   with "sane_*". Make sure, the sanei_* symbols are unique, e.g. by using
   sanei_backendname_*.  Only export symbols that are absolutely necessary.
@@ -410,7 +407,7 @@ TESTING
 
 	nm -g  backend/.libs/libsane-hp.a
 
-  would list all global symbols in the HP backend. 
+  would list all global symbols in the HP backend.
 
   "./configure; make; make libcheck" in the sane-backends root directory
   will name all backend libraries, that contain "illegal" symbols.
@@ -433,14 +430,14 @@ DOCUMENTATION
   also a template for new .desc files: "template.desc.". The format of the
   files in the two directories is very similar.  If you'd like to try parsing
   your creation to recreate the sane-backends webpages, cd into "tools/" and
-  enter "make sane-desc". You can either use sane-desc directly (try 
-  "./sane-desc -h") or use "make html-pages" in "doc/". 
+  enter "make sane-desc". You can either use sane-desc directly (try
+  "./sane-desc -h") or use "make html-pages" in "doc/".
 
 * For external backends, you don't need to supply :manpage and :version. The
   manpage link won't work anyway and version will be outdated soon.
 
 * When your backend is included in the SANE distribution, add an entry to
-  doc/sane.man, AUTHORS and sane-backends.lsm. The sane.man entry should point
+  doc/sane.man and AUTHORS. The sane.man entry should point
   to your documentation (man-page, website, readme).  Also move your .desc
   file from "doc/descriptions-external" to "doc/descriptions" and update
   them.
@@ -458,7 +455,7 @@ DOCUMENTATION
   version numbers.
 
 
-CHECKLIST: SUBMITTING A NEW BACKEND 
+CHECKLIST: SUBMITTING A NEW BACKEND
 -----------------------------------
 
 In sane-backends/
@@ -481,7 +478,7 @@ In sane-backends/doc/
   check the html pages result with a browser.
 * Check that the backend version is the same in the source and in the
   description file.
-  
+
 In sane-backends/po/
 * Add all files using SANE_I18N() to po/POTFILES
 
diff --git a/doc/canon/canon.changes b/doc/canon/canon.changes
index 30eb6e9..f07c225 100644
--- a/doc/canon/canon.changes
+++ b/doc/canon/canon.changes
@@ -37,6 +37,3 @@ Version 990201:
   because it sets the resolution down first.
 
 * I have included a new directory containing scripts I find useful.
-
-
-
diff --git a/doc/canon/canon.install2700F.txt b/doc/canon/canon.install2700F.txt
index 923a6d4..b80e8d9 100644
--- a/doc/canon/canon.install2700F.txt
+++ b/doc/canon/canon.install2700F.txt
@@ -1,6 +1,6 @@
 
 -----------------------------------------------------------------------
-How to install a CanoScan 2700F on a Linux box ? 
+How to install a CanoScan 2700F on a Linux box ?
 by Stephan Hegel <ea273@fen.baynet.de>.
 Date:   Fri Jan 15 16:13:15 MEZ 1999
 -----------------------------------------------------------------------
@@ -17,13 +17,13 @@ Corrections and suggestions are welcome, of course. Thank you.
 -----------------------------------------
 
    The AVA-1502AP is is a small ISA Adaptec SCSI controller which is
-   shipped with the CanoScan slide scanner. Per default is has the 
+   shipped with the CanoScan slide scanner. Per default is has the
    address 0x140, the IRQ 10 and the SCSI host id 7. Check first for
    conflicts with your already existing hardware.
 
    Install the controller into the computer.
 
-   After starting the BIOS should detect the board as a PNP board. 
+   After starting the BIOS should detect the board as a PNP board.
    Boot the computer with the "SCSISelect" disk which is shipped with
    the scanner to check that the controller is detected. Don't change
    any settings except address, IRQ or SCSI id if necessary.
@@ -32,13 +32,13 @@ Corrections and suggestions are welcome, of course. Thank you.
       SCSI Support (yes)
       SCSI Generic support (yes)
       Low level driver for aha152x (yes)
-   Note: here you can try to compile the SCSI support as modules as 
+   Note: here you can try to compile the SCSI support as modules as
          long as you don't boot the computer from a SCSI disk. But this
          is not tested.
 
    Compile and install the new Linux kernel.
 
-   Add "aha152x=0x140,10,7" to the "append" line to the already existing 
+   Add "aha152x=0x140,10,7" to the "append" line to the already existing
    kernel parameters in lilo.conf, e.g:
    -------------------
    # Linux bootable partition config begins
@@ -46,7 +46,7 @@ Corrections and suggestions are welcome, of course. Thank you.
    root = /dev/hdc1
    label = linux
    append = "sbpcd=0x230,SoundBlaster aha152x=0x140,10,7"
-   # Linux bootable partition config ends 
+   # Linux bootable partition config ends
    -------------------
 
    Invoke lilo to activate the changes.
@@ -64,12 +64,12 @@ Corrections and suggestions are welcome, of course. Thank you.
    on" since the scanner is the one and only device connected to my host
    adapter.
 
-   Turn on the scanner first and wait for a few second. The scanner 
+   Turn on the scanner first and wait for a few second. The scanner
    performs a short self test.
 
    Turn on the computer.
 
-   Watch the boot messages, there should be a message indicating that 
+   Watch the boot messages, there should be a message indicating that
    the SCSI host adapter and the scanner are there.
 
    Now you can check again that the scanner device is there:
@@ -85,18 +85,18 @@ Corrections and suggestions are welcome, of course. Thank you.
 
    Fetch the latest SANE distribution from the SANE homepage at:
        http://www.sane-project.org/
-   
+
    Unpack and configure it.
-   
+
    Get the latest canon backend from Manuel's homepage:
       http://www.rzg.mpg.de/~mpd/sane
 
    Put the files in the sane/backend directory as described in the
    README of the package. This overwrites the existing canon.* files
    with the latest version of these files.
-   
+
    Compile and install SANE.
-   
+
    Add the "canon" scanner to the /usr/local/etc/sane.d/dll.conf file:
       -------- cut here ------------
       # enable the next line if you want to allow access through the network:
@@ -108,12 +108,12 @@ Corrections and suggestions are welcome, of course. Thank you.
       #umax
       canon
       -------- cut here ------------
-   
+
    Add a "canon.conf" file to the /usr/local/etc/sane.d directory:
       -------- cut here ------------
-      scsi CANON 
+      scsi CANON
       -------- cut here ------------
-   
+
    Check the available scanners:
       scanimage -L
    This should give something like this:
@@ -122,14 +122,14 @@ Corrections and suggestions are welcome, of course. Thank you.
       device `pnm:1' is a Noname PNM file reader virtual device
 
    Invoke the frontend:
-      xscanimage & 
-   NOTE: The "xscanimage" frontend is in the SANE distribution. There 
-   is also another SANE frontend available which is called "xsane" by 
-   Oliver Rauch. It is still under heavy development and can be grabbed 
+      xscanimage &
+   NOTE: The "xscanimage" frontend is in the SANE distribution. There
+   is also another SANE frontend available which is called "xsane" by
+   Oliver Rauch. It is still under heavy development and can be grabbed
    from:
       http://www.wolfsburg.de/~rauch
 
-   A dialog box appears, select the canon scanner and here we go ... 
+   A dialog box appears, select the canon scanner and here we go ...
    Happy scanning !!!
-   
+
 -----------------------------------------------------------------------
diff --git a/doc/descriptions-external/brother-mfc4600.desc b/doc/descriptions-external/brother-mfc4600.desc
index 1d57e47..18bd3cb 100644
--- a/doc/descriptions-external/brother-mfc4600.desc
+++ b/doc/descriptions-external/brother-mfc4600.desc
@@ -16,7 +16,7 @@
                                   ; :yes or :no
 ;:manpage "sane-template"          ; name of manpage (if it exists)
 :url "http://sourceforge.net/projects/brother-mfc"
-;:comment "" 
+;:comment ""
                                   ; comment about the backend
 
 :devicetype :scanner              ; start of a list of devices....
@@ -32,6 +32,3 @@
 :interface "USB"
 :usbid "0x04f9" "0x0111"
 :comment "Only USB version of this scanner is supported. Please report how well it works. See link."
-
-
-
diff --git a/doc/descriptions-external/brother.desc b/doc/descriptions-external/brother.desc
index a261712..39c54da 100644
--- a/doc/descriptions-external/brother.desc
+++ b/doc/descriptions-external/brother.desc
@@ -16,7 +16,7 @@
                                   ; :yes or :no
 ;:manpage "sane-template"          ; name of manpage (if it exists)
 :url "http://solutions.brother.com/linux/sol/printer/linux/sane_drivers.html" ; backend's web page
-:comment "External backend made by brother. As this software contains non-free parts, it can't be included into SANE. If you can't find your model here, please have a look at the brother website which contains the latest list." 
+:comment "External backend made by brother. As this software contains non-free parts, it can't be included into SANE. If you can't find your model here, please have a look at the brother website which contains the latest list."
                                   ; comment about the backend
 
 :devicetype :scanner              ; start of a list of devices....
@@ -400,4 +400,3 @@
 :interface "USB"
 :usbid "0x04f9" "0x011b"
 :comment "There is a report that this scanner does not work with the brother backend (I/O errors)"
-
diff --git a/doc/descriptions-external/brother2.desc b/doc/descriptions-external/brother2.desc
index 92b5450..afdb1a6 100644
--- a/doc/descriptions-external/brother2.desc
+++ b/doc/descriptions-external/brother2.desc
@@ -16,7 +16,7 @@
                                   ; :yes or :no
 ;:manpage "sane-template"          ; name of manpage (if it exists)
 :url "http://solutions.brother.com/linux/sol/printer/linux/sane_drivers.html" ; backend's web page
-:comment "External backend made by brother. As this software contains non-free parts, it can't be included into SANE. If you can't find your model here, please have a look at the brother website which contains the latest list."  
+:comment "External backend made by brother. As this software contains non-free parts, it can't be included into SANE. If you can't find your model here, please have a look at the brother website which contains the latest list."
                                   ; comment about the backend
 
 :devicetype :scanner              ; start of a list of devices....
diff --git a/doc/descriptions-external/canon_mfp.desc b/doc/descriptions-external/canon_mfp.desc
deleted file mode 100644
index e181d53..0000000
--- a/doc/descriptions-external/canon_mfp.desc
+++ /dev/null
@@ -1,73 +0,0 @@
-;
-; SANE Backend specification file
-;
-; It's basically emacs-lisp --- so ";" indicates comment to end of line.
-; All syntactic elements are keyword tokens, followed by a string or
-;  keyword argument, as specified.
-;
-; ":backend" *must* be specified.
-; All other information is optional (but what good is the file without it?).
-;
-; See doc/descriptions.txt for details.
-
-:backend "canon_mfp"               ; name of backend
-;:version "1.0.0"                   ; version of backend (or "unmaintained")
-;:new :yes                         ; Is the backend new to this SANE release?
-                                  ; :yes or :no
-;:manpage "sane-template"          ; name of manpage (if it exists)
-:url "http://cweb.canon.jp/drv-upd/bj/other.html#linux";
-:url "http://support-asia.canon-asia.com/";
-:comment "External backend made by canon. As this software contains non-free parts, it can't be included into SANE. If you can't find your model here, please have a look at the canon website which contains the latest list." 
-:comment "Note: these backend are designed by Canon and are part of their proprietary scanning software. They may not work at all with SANE, or with SANE frontends." 
-                                  ; comment about the backend
-
-:devicetype :scanner              ; start of a list of devices....
-                                  ; other types:  :stillcam, :vidcam,
-                                  ;               :meta, :api
-
-:mfg "Canon"                   ; name a manufacturer
-:url "http://www.canon.com/"   ; manufacturer's URL
-;:comment ""
-                                  ; comment about the manufacturer
-
-:model "MP140"
-:status :untested
-:interface "USB"
-:usbid "0x04a9" "0x172b"
-:comment "No report yet."
-
-:model "MP160"
-:status :untested
-:interface "USB"
-:usbid "0x04a9" "0x1714"
-:comment "No report yet."
-
-:model "MP210"
-:status :untested
-:interface "USB"
-:usbid "0x04a9" "0x1721"
-:comment "No report yet."
-
-:model "MP510"
-:status :untested
-:interface "USB"
-:usbid "0x04a9" "0x1717"
-:comment "No report yet."
-
-:model "MP520"
-:status :untested
-:interface "USB"
-:usbid "0x04a9" "0x1724"
-:comment "No report yet."
-
-:model "MP600"
-:status :untested
-:interface "USB"
-:usbid "0x04a9" "0x1718"
-:comment "No report yet."
-
-:model "MP610"
-:status :untested
-:interface "USB"
-:usbid "0x04a9" "0x1725"
-:comment "Could not have it working with SANE."
diff --git a/doc/descriptions-external/cs3200f.desc b/doc/descriptions-external/cs3200f.desc
index b734d02..15c8c33 100644
--- a/doc/descriptions-external/cs3200f.desc
+++ b/doc/descriptions-external/cs3200f.desc
@@ -16,7 +16,7 @@
                                   ; :yes or :no
 ;:manpage "sane-cs3200f"          ; name of manpage (if it exists)
 ;:url "http://www.luser.com/temp/" ; backend's web page
-:comment "Backend is in experimental CVS" 
+:comment "Backend is in experimental CVS"
                                   ; comment about the backend
 
 :devicetype :scanner              ; start of a list of devices....
diff --git a/doc/descriptions-external/hp3770.desc b/doc/descriptions-external/hp3770.desc
index 7c2c60e..c6e8b9f 100644
--- a/doc/descriptions-external/hp3770.desc
+++ b/doc/descriptions-external/hp3770.desc
@@ -16,7 +16,7 @@
                                   ; :yes or :no
 ;:manpage "sane-template"          ; name of manpage (if it exists)
 :url "http://www.cyberbaladeur.fr/telechargement.html" ; backend's web page
-:comment "This backend can't be added to the SANE distribution because it consists of binary-only code." 
+:comment "This backend can't be added to the SANE distribution because it consists of binary-only code."
                                   ; comment about the backend
 
 :devicetype :scanner              ; start of a list of devices....
diff --git a/doc/descriptions-external/hp8200.desc b/doc/descriptions-external/hp8200.desc
index 7dcf663..0a259be 100644
--- a/doc/descriptions-external/hp8200.desc
+++ b/doc/descriptions-external/hp8200.desc
@@ -16,7 +16,7 @@
                                   ; :yes or :no
 ;:manpage "sane-template"          ; name of manpage (if it exists)
 :url "http://www.cyberbaladeur.fr/telechargement.html" ; backend's web page
-:comment "This backend can't be added to the SANE distribution because it consists of binary-only code." 
+:comment "This backend can't be added to the SANE distribution because it consists of binary-only code."
                                   ; comment about the backend
 
 :devicetype :scanner              ; start of a list of devices....
@@ -37,4 +37,3 @@
 :usbid "0x03f0" "0x0b01"
 :url "http://ftp.cyberbaladeur.fr/82xxc%20Linux%20drivers.tar.gz"  ; model's URL
 :comment "External backend. Binary-only Linux i386 code. Not supported by the SANE developers."
-
diff --git a/doc/descriptions-external/hpaio.desc b/doc/descriptions-external/hpaio.desc
index 5b4cc5c..dab5a8c 100644
--- a/doc/descriptions-external/hpaio.desc
+++ b/doc/descriptions-external/hpaio.desc
@@ -2238,4 +2238,3 @@
 
 :model "HP Color LaserJet 9500 Multifunction Printer"
 :status :good
-
diff --git a/doc/descriptions-external/kodak-twain.desc b/doc/descriptions-external/kodak-twain.desc
index 2d75cd1..97455b2 100644
--- a/doc/descriptions-external/kodak-twain.desc
+++ b/doc/descriptions-external/kodak-twain.desc
@@ -84,4 +84,3 @@
 :interface "USB"
 :usbid "0x040a" "0x6011"
 :comment "Flatbed attachment for use with Kodak ADF scanner. Requires 12V power over usb cable. No report yet."
-
diff --git a/doc/descriptions-external/lhii.desc b/doc/descriptions-external/lhii.desc
index a755709..1877e0c 100644
--- a/doc/descriptions-external/lhii.desc
+++ b/doc/descriptions-external/lhii.desc
@@ -16,7 +16,7 @@
                                   ; :yes or :no
 ;:manpage "sane-template"          ; name of manpage (if it exists)
 :url "http://www.sane-project.org/backends/lhii/lhii-v0.2.tgz" ; backend's web page
-:comment "This backend is for old handscanners with proprietary adapter cards. You also need a kernel driver. You may find such drivers at that page: http://www.willamowius.de/scanner.html ." 
+:comment "This backend is for old handscanners with proprietary adapter cards. You also need a kernel driver. You may find such drivers at that page: http://www.willamowius.de/scanner.html ."
                                   ; comment about the backend
 
 :devicetype :scanner              ; start of a list of devices....
@@ -42,5 +42,3 @@
 ;  and at the top-level.
 
 ; :status specifier is optional after :model and at the top-level
-
-
diff --git a/doc/descriptions-external/mustek_a3p1.desc b/doc/descriptions-external/mustek_a3p1.desc
index e38b87a..3808cae 100644
--- a/doc/descriptions-external/mustek_a3p1.desc
+++ b/doc/descriptions-external/mustek_a3p1.desc
@@ -15,7 +15,3 @@
 :status :minimal
 :usbid "0x055f" "0x0401"
 :comment "Reports about scanning problems. 1800 dpi seems to work if only small scan areas are selected."
-
-
-
-
diff --git a/doc/descriptions-external/panamfs.desc b/doc/descriptions-external/panamfs.desc
index fd49925..5a34cea 100644
--- a/doc/descriptions-external/panamfs.desc
+++ b/doc/descriptions-external/panamfs.desc
@@ -16,7 +16,7 @@
                                   ; :yes or :no
 ;:manpage "sane-template"          ; name of manpage (if it exists)
 :url "http://panasonic.net/pcc/support/fax/common/table/linuxdriver.html" ; backend's web page
-:comment "External backend made by panasonic." 
+:comment "External backend made by panasonic."
                                   ; comment about the backend
 
 :devicetype :scanner              ; start of a list of devices....
@@ -54,4 +54,3 @@
 :model "KX-MC6000 series"
 :status :untested
 :comment "No report yet."
-
diff --git a/doc/descriptions-external/primascan.desc b/doc/descriptions-external/primascan.desc
index 1f02202..6815bcd 100644
--- a/doc/descriptions-external/primascan.desc
+++ b/doc/descriptions-external/primascan.desc
@@ -16,7 +16,7 @@
                                   ; :yes or :no
 ;:manpage "sane-template"          ; name of manpage (if it exists)
 :url "http://www.geocities.com/trsh0101/index.html" ; backend's web page
-:comment "SANE backend and stand-alone program" 
+:comment "SANE backend and stand-alone program"
                                   ; comment about the backend
 
 :devicetype :scanner              ; start of a list of devices....
diff --git a/doc/descriptions-external/primax.desc b/doc/descriptions-external/primax.desc
index 30633b0..db245d4 100644
--- a/doc/descriptions-external/primax.desc
+++ b/doc/descriptions-external/primax.desc
@@ -40,7 +40,3 @@
 :model "Colorpage-Vivid+"
 :interface "Parport"
 :status :untested
-
-
-
-
diff --git a/doc/descriptions-external/template.desc. b/doc/descriptions-external/template.desc.
index 25b9b5a..a6b6bab 100644
--- a/doc/descriptions-external/template.desc.
+++ b/doc/descriptions-external/template.desc.
@@ -17,7 +17,7 @@
 :manpage "sane-template"          ; name of manpage (if it exists)
 :url "http://www.luser.com/temp/" ; backend's web page
 :url "http://www.luser.com/b/"    ; another backend webpage
-:comment "This backend supports only the USB and SCSI models" 
+:comment "This backend supports only the USB and SCSI models"
                                   ; comment about the backend
 
 :devicetype :scanner              ; start of a list of devices....
@@ -77,5 +77,3 @@
 ;  and at the top-level.
 
 ; :status specifier is optional after :model and at the top-level
-
-
diff --git a/doc/descriptions-external/utsushi.desc b/doc/descriptions-external/utsushi.desc
index d82ed18..08ad17f 100644
--- a/doc/descriptions-external/utsushi.desc
+++ b/doc/descriptions-external/utsushi.desc
@@ -1,5 +1,5 @@
 ;;;  utsushi.desc                               -*- emacs-lisp -*- (sort of)
-;;;  Copyright (C) 2015, 2016 Meeuwissen
+;;;  Copyright (C) 2015-2019  Olaf Meeuwissen
 ;;;
 ;;;  License: GPL-3.0+
 ;;;  Author : Olaf Meeuwissen
@@ -21,7 +21,7 @@
 ;;  Backend data
 ;;
 :backend "utsushi"
-:url     "https://github.com/utsushi/utsushi"
+:url     "https://gitlab.com/utsushi/utsushi"
 
 ;;  Device and manufacturer information.
 ;;
@@ -36,6 +36,20 @@
 :usbid     "0x04b8" "0x0152"
 :status    :good
 
+:model     "DS-70"
+:interface "USB"
+:status    :good
+:comment   "USB product ID one of 0x0160, 0x0166, 0x016c or 0x016e"
+
+:model     "DS-80W"
+:interface "USB"
+:status    :good
+:comment   "USB product ID one of 0x0160, 0x0166, 0x016c or 0x016e"
+
+:model     "DS-410"
+:interface "USB"
+:status    :good
+
 :model     "DS-510"
 :interface "USB"
 :usbid     "0x04b8" "0x014c"
@@ -46,16 +60,38 @@
 :usbid     "0x04b8" "0x0154"
 :status    :good
 
+:model     "DS-530"
+:interface "USB"
+:usbid     "0x04b8" "0x0155"
+:status    :good
+
+:model     "DS-535"
+:interface "USB"
+:status    :good
+
+:model     "DS-535"
+:interface "USB"
+:usbid     "0x04b8" "0x017a"
+:status    :good
+
 :model     "DS-560"
 :interface "USB"
 :usbid     "0x04b8" "0x0150"
 :status    :good
 
+:model     "DS-575W"
+:interface "USB"
+:status    :good
+
 :model     "DS-760"
 :interface "USB"
 :usbid     "0x04b8" "0x014d"
 :status    :good
 
+:model     "DS-775"
+:interface "USB"
+:status    :good
+
 :model     "DS-780N"
 :interface "USB"
 :usbid     "0x04b8" "0x0164"
@@ -66,6 +102,11 @@
 :usbid     "0x04b8" "0x014d"
 :status    :good
 
+:model     "DS-1630"
+:interface "USB"
+:usbid     "0x04b8" "0x015c"
+:status    :good
+
 :model     "DS-5500"
 :interface "USB"
 :usbid     "0x04b8" "0x0145"
@@ -111,11 +152,36 @@
 :usbid     "0x04b8" "0x1109"
 :status    :good
 
+:model     "ES-50"
+:interface "USB"
+:status    :good
+:comment   "USB product ID one of 0x0160, 0x0166, 0x016c or 0x016e"
+
+:model     "ES-55R"
+:interface "USB"
+:status    :good
+:comment   "USB product ID one of 0x016d or 0x016f"
+
+:model     "ES-60W"
+:interface "USB"
+:status    :good
+:comment   "USB product ID one of 0x0160, 0x0166, 0x016c or 0x016e"
+
+:model     "ES-65WR"
+:interface "USB"
+:status    :good
+:comment   "USB product ID one of 0x016d or 0x016f"
+
 :model     "ES-400"
 :interface "USB"
 :usbid     "0x04b8" "0x0156"
 :status    :good
 
+:model     "ES-8500"
+:interface "USB"
+:usbid     "0x04b8" "0x0109"
+:status    :basic
+
 :model     "ET-2500"
 :interface "USB"
 :usbid     "0x04b8" "0x1105"
@@ -136,6 +202,11 @@
 :usbid     "0x04b8" "0x1101"
 :status    :good
 
+:model     "Expression 1640XL"
+:interface "USB"
+:usbid     "0x04b8" "0x0109"
+:status    :basic
+
 :model     "L220"
 :interface "USB"
 :usbid     "0x04b8" "0x08d1"
@@ -156,6 +227,11 @@
 :usbid     "0x04b8" "0x08d2"
 :status    :good
 
+:model     "L380 Series"
+:interface "USB"
+:usbid     "0x04b8" "0x1120"
+:status    :good
+
 :model     "L455"
 :interface "USB"
 :usbid     "0x04b8" "0x08c2"
@@ -196,6 +272,16 @@
 :usbid     "0x04b8" "0x08ce"
 :status    :good
 
+:model     "PX-M884F"
+:interface "USB"
+:usbid     "0x04b8" "0x112e"
+:status    :good
+
+:model     "WF-4720"
+:interface "USB"
+:usbid     "0x04b8" "0x1125"
+:status    :good
+
 :model     "WF-6530"
 :interface "USB"
 :usbid     "0x04b8" "0x08cd"
@@ -266,6 +352,21 @@
 :usbid     "0x04b8" "0x110c"
 :status    :good
 
+:model     "XP-540"
+:interface "USB"
+:usbid     "0x04b8" "0x1117"
+:status    :good
+
+:model     "XP-630"
+:interface "USB"
+:usbid     "0x04b8" "0x110c"
+:status    :good
+
+:model     "XP-640"
+:interface "USB"
+:usbid     "0x04b8" "0x1117"
+:status    :good
+
 :model     "XP-830"
 :interface "USB"
 :usbid     "0x04b8" "0x110b"
@@ -280,11 +381,6 @@
 ; 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"
@@ -330,6 +426,60 @@
 :usbid     "0x04b8" "0x0163"
 :status    :good
 
+:model     "PID 0165"
+:interface "USB"
+:usbid     "0x04b8" "0x0165"
+:status    :good
+:comment   "propably one of DS-410, DS-535, DS-575W, DS-775"
+
+:model     "PID 0167"
+:interface "USB"
+:usbid     "0x04b8" "0x0167"
+:status    :good
+:comment   "propably one of DS-410, DS-535, DS-575W, DS-775"
+
+:model     "PID 0168"
+:interface "USB"
+:usbid     "0x04b8" "0x0168"
+:status    :good
+:comment   "propably one of DS-410, DS-535, DS-575W, DS-775"
+
+:model     "PID 0169"
+:interface "USB"
+:usbid     "0x04b8" "0x0169"
+:status    :good
+:comment   "propably one of DS-410, DS-535, DS-575W, DS-775"
+
+:model     "PID 016B"
+:interface "USB"
+:usbid     "0x04b8" "0x016b"
+:status    :good
+:comment   "probably a FastFoto 680W, could be a WorkForce ES-300WR or ES-500WR"
+
+:model     "PID 016D"
+:interface "USB"
+:usbid     "0x04b8" "0x016d"
+:status    :good
+:comment   "propably one of ES-55R, ES-65WR"
+
+:model     "PID 016F"
+:interface "USB"
+:usbid     "0x04b8" "0x016f"
+:status    :good
+:comment   "propably one of ES-55R, ES-65WR"
+
+:model     "PID 0176"
+:interface "USB"
+:usbid     "0x04b8" "0x0176"
+:status    :good
+:comment   "probably a WorkForce ES-300WR or ES-500WR, could be a FastFoto 680W"
+
+:model     "PID 0177"
+:interface "USB"
+:usbid     "0x04b8" "0x0177"
+:status    :good
+:comment   "probably a WorkForce ES-500WR or ES-300WR, could be a FastFoto 680W"
+
 :model     "PID 110D"
 :interface "USB"
 :usbid     "0x04b8" "0x110d"
@@ -411,11 +561,6 @@
 :usbid     "0x04b8" "0x111f"
 :status    :good
 
-:model     "PID 1120"
-:interface "USB"
-:usbid     "0x04b8" "0x1120"
-:status    :good
-
 :model     "PID 1121"
 :interface "USB"
 :usbid     "0x04b8" "0x1121"
@@ -451,8 +596,363 @@
 :interface "USB"
 :usbid     "0x04b8" "0x1128"
 :status    :good
+:comment   "PX-Mxxxx?"
+
+:model     "PID 1129"
+:interface "USB"
+:usbid     "0x04b8" "0x1129"
+:status    :good
+:comment   "L61x0?"
+
+:model     "PID 112A"
+:interface "USB"
+:usbid     "0x04b8" "0x112a"
+:status    :good
+:comment   "L61x0?"
 
 :model     "PID 112B"
 :interface "USB"
 :usbid     "0x04b8" "0x112b"
 :status    :good
+:comment   "ET-77xx?"
+
+:model     "PID 112C"
+:interface "USB"
+:usbid     "0x04b8" "0x112c"
+:status    :good
+:comment   "ET-77xx?"
+
+:model     "PID 112D"
+:interface "USB"
+:usbid     "0x04b8" "0x112d"
+:status    :good
+
+:model     "PID 112F"
+:interface "USB"
+:usbid     "0x04b8" "0x112f"
+:status    :good
+
+:model     "PID 1130"
+:interface "USB"
+:usbid     "0x04b8" "0x1130"
+:status    :good
+:comment   "L61x0?"
+
+:model     "PID 1131"
+:interface "USB"
+:usbid     "0x04b8" "0x1131"
+:status    :good
+:comment   "EP-8xxA?"
+
+:model     "PID 1132"
+:interface "USB"
+:usbid     "0x04b8" "0x1132"
+:status    :good
+
+:model     "PID 1133"
+:interface "USB"
+:usbid     "0x04b8" "0x1133"
+:status    :good
+:comment   "EP-810A?"
+
+:model     "PID 1134"
+:interface "USB"
+:usbid     "0x04b8" "0x1134"
+:status    :good
+:comment   "EP-710A?"
+
+:model     "PID 1135"
+:interface "USB"
+:usbid     "0x04b8" "0x1135"
+:status    :good
+:comment   "L61x0?"
+
+:model     "PID 1136"
+:interface "USB"
+:usbid     "0x04b8" "0x1136"
+:status    :good
+:comment   "L61x0?"
+
+:model     "PID 1137"
+:interface "USB"
+:usbid     "0x04b8" "0x1137"
+:status    :good
+:comment   "L61x0?"
+
+:model     "PID 1138"
+:interface "USB"
+:usbid     "0x04b8" "0x1138"
+:status    :good
+:comment   "L61x0?"
+
+:model     "PID 1139"
+:interface "USB"
+:usbid     "0x04b8" "0x1139"
+:status    :good
+
+:model     "PID 113A"
+:interface "USB"
+:usbid     "0x04b8" "0x113a"
+:status    :good
+
+:model     "PID 113B"
+:interface "USB"
+:usbid     "0x04b8" "0x113b"
+:status    :good
+:comment   "PX-Mxxxx?"
+
+:model     "PID 113C"
+:interface "USB"
+:usbid     "0x04b8" "0x113c"
+:status    :good
+:comment   "PX-Mxxxx?"
+
+:model     "PID 113D"
+:interface "USB"
+:usbid     "0x04b8" "0x113d"
+:status    :good
+
+:model     "PID 113E"
+:interface "USB"
+:usbid     "0x04b8" "0x113e"
+:status    :good
+
+:model     "PID 113F"
+:interface "USB"
+:usbid     "0x04b8" "0x113f"
+:status    :good
+
+:model     "PID 1140"
+:interface "USB"
+:usbid     "0x04b8" "0x1140"
+:status    :good
+
+:model     "PID 1141"
+:interface "USB"
+:usbid     "0x04b8" "0x1141"
+:status    :good
+
+:model     "PID 1142"
+:interface "USB"
+:usbid     "0x04b8" "0x1142"
+:status    :good
+
+:model     "PID 1143"
+:interface "USB"
+:usbid     "0x04b8" "0x1143"
+:status    :good
+:comment   "L3xxx?"
+
+:model     "PID 1145"
+:interface "USB"
+:usbid     "0x04b8" "0x1145"
+:status    :good
+:comment   "EP-81xA?"
+
+:model     "PID 1146"
+:interface "USB"
+:usbid     "0x04b8" "0x1146"
+:status    :good
+:comment   "EP-71xA?"
+
+:model     "PID 1147"
+:interface "USB"
+:usbid     "0x04b8" "0x1147"
+:status    :good
+:comment   "XP-7xxx?"
+
+:model     "PID 1148"
+:interface "USB"
+:usbid     "0x04b8" "0x1148"
+:status    :good
+:comment   "PX-M8xxFX?"
+
+:model     "PID 1149"
+:interface "USB"
+:usbid     "0x04b8" "0x1149"
+:status    :good
+:comment   "WF-37xx?"
+
+:model     "PID 114A"
+:interface "USB"
+:usbid     "0x04b8" "0x114a"
+:status    :good
+:comment   "L61x0?"
+
+:model     "PID 114B"
+:interface "USB"
+:usbid     "0x04b8" "0x114b"
+:status    :good
+:comment   "EP-8xxA?"
+
+:model     "PID 114C"
+:interface "USB"
+:usbid     "0x04b8" "0x114c"
+:status    :good
+:comment   "EP-8xxA?"
+
+:model     "PID 114D"
+:interface "USB"
+:usbid     "0x04b8" "0x114d"
+:status    :good
+:comment   "L5xxx"
+
+:model     "PID 114E"
+:interface "USB"
+:usbid     "0x04b8" "0x114e"
+:status    :good
+:comment   "XP21xx"
+
+:model     "PID 114F"
+:interface "USB"
+:usbid     "0x04b8" "0x114f"
+:status    :good
+:comment   "L5xxx"
+
+:model     "PID 1150"
+:interface "USB"
+:usbid     "0x04b8" "0x1150"
+:status    :good
+:comment   "L5xxx"
+
+:model     "PID 1151"
+:interface "USB"
+:usbid     "0x04b8" "0x1151"
+:status    :good
+:comment   "L5xxx"
+
+:model     "PID 1152"
+:interface "USB"
+:usbid     "0x04b8" "0x1152"
+:status    :good
+:comment   "PX-Mxxxx"
+
+:model     "PID 1153"
+:interface "USB"
+:usbid     "0x04b8" "0x1153"
+:status    :good
+:comment   "PX-Mxxxx"
+
+:model     "PID 1154"
+:interface "USB"
+:usbid     "0x04b8" "0x1154"
+:status    :good
+:comment   "L61x0"
+
+:model     "PID 1155"
+:interface "USB"
+:usbid     "0x04b8" "0x1155"
+:status    :good
+:comment   "L61x0"
+
+:model     "PID 1156"
+:interface "USB"
+:usbid     "0x04b8" "0x1156"
+:status    :good
+:comment   "L61x0"
+
+:model     "PID 1157"
+:interface "USB"
+:usbid     "0x04b8" "0x1157"
+:status    :good
+:comment   "L3xxx"
+
+:model     "PID 1158"
+:interface "USB"
+:usbid     "0x04b8" "0x1158"
+:status    :good
+:comment   "L3xxx"
+
+:model     "PID 1159"
+:interface "USB"
+:usbid     "0x04b8" "0x1159"
+:status    :good
+
+:model     "PID 115A"
+:interface "USB"
+:usbid     "0x04b8" "0x115a"
+:status    :good
+:comment   "EP8xxA"
+
+:model     "PID 115B"
+:interface "USB"
+:usbid     "0x04b8" "0x115b"
+:status    :good
+:comment   "EP9xxA3"
+
+:model     "PID 115C"
+:interface "USB"
+:usbid     "0x04b8" "0x115c"
+:status    :good
+:comment   "EP7xxA"
+
+:model     "PID 115D"
+:interface "USB"
+:usbid     "0x04b8" "0x115c"
+:status    :good
+:comment   "EP9xxA3"
+
+:model     "PID 1160"
+:interface "USB"
+:usbid     "0x04b8" "0x1160"
+:status    :good
+:comment   "L5xxx"
+
+:model     "PID 1161"
+:interface "USB"
+:usbid     "0x04b8" "0x1161"
+:status    :good
+:comment   "LX-10xxx"
+
+:model     "PID 1162"
+:interface "USB"
+:usbid     "0x04b8" "0x1162"
+:status    :good
+:comment   "EWM7xxTR"
+
+:model     "PID 1163"
+:interface "USB"
+:usbid     "0x04b8" "0x1163"
+:status    :good
+:comment   "EPM5xxT"
+
+:model     "PID 1164"
+:interface "USB"
+:usbid     "0x04b8" "0x1164"
+:status    :good
+:comment   "L61x0"
+
+:model     "PID 1165"
+:interface "USB"
+:usbid     "0x04b8" "0x1165"
+:status    :good
+:comment   "L61x0"
+
+:model     "PID 1166"
+:interface "USB"
+:usbid     "0x04b8" "0x1166"
+:status    :good
+:comment   "L61x0"
+
+:model     "PID 1169"
+:interface "USB"
+:usbid     "0x04b8" "0x1169"
+:status    :good
+:comment   "EWM7xxTR"
+
+:model     "PID 116A"
+:interface "USB"
+:usbid     "0x04b8" "0x116a"
+:status    :good
+:comment   "EWM7xxTR"
+
+:model     "PID 116B"
+:interface "USB"
+:usbid     "0x04b8" "0x116b"
+:status    :good
+
+:model     "PID 116E"
+:interface "USB"
+:usbid     "0x04b8" "0x116e"
+:status    :good
+:comment   "EWM7xxTR"
diff --git a/doc/descriptions.txt b/doc/descriptions.txt
index d4cab94..13bd991 100644
--- a/doc/descriptions.txt
+++ b/doc/descriptions.txt
@@ -44,7 +44,7 @@ should be `unmaintained' or contain this tag together with the version number.
 
 `:new' indicates that the backend is brand-new in the latest SANE release if
 the keyword argument is `:yes'.  Otherwise, `:no' should be used or `:new'
-should be omitted at all.  
+should be omitted at all.
 Example: `:new :yes'
 
 The `:manpage' keyword token has one string argument that names the manual
@@ -117,7 +117,7 @@ Multi-level keyword tokens
 --------------------------
 
 The following keyword tokens can be used after `:backend', `:mfg', `:model',
-and `:desc'. 
+and `:desc'.
 
 One or more `:url' keyword tokens can be used to point to more information
 about the entry the keyword refers to.  The string argument contains a URL to
diff --git a/doc/descriptions/agfafocus.desc b/doc/descriptions/agfafocus.desc
index bcb482f..950dd58 100644
--- a/doc/descriptions/agfafocus.desc
+++ b/doc/descriptions/agfafocus.desc
@@ -1,6 +1,6 @@
 :backend "agfafocus"
 :version "unmaintained"
-:manpage "sane-agfafocus" 
+:manpage "sane-agfafocus"
 
 :devicetype :scanner
 
diff --git a/doc/descriptions/apple.desc b/doc/descriptions/apple.desc
index 046bb4e..462c745 100644
--- a/doc/descriptions/apple.desc
+++ b/doc/descriptions/apple.desc
@@ -6,9 +6,9 @@
 ;:url "http://no.www.page.yet/" ; backend's web page
 
 :devicetype :scanner              ; start of a list of devices....
- 
+
 :mfg "Apple"
-:url "http://developer.apple.com/"	
+:url "http://developer.apple.com/"
 :model "Apple Scanner"
 :interface "SCSI"
 :status :good                  ; :alpha, :beta, :stable, :new
diff --git a/doc/descriptions/avision.desc b/doc/descriptions/avision.desc
index bff25f5..f428fe8 100644
--- a/doc/descriptions/avision.desc
+++ b/doc/descriptions/avision.desc
@@ -14,7 +14,7 @@
 :backend "avision"
 
 ; version of backend
-:version "Build: 296"
+:version "Build: 296 (unmaintained)"
 ;status: alpha, beta, stable, new
 ;:status :stable
 
@@ -854,4 +854,3 @@
 :usbid "0x0482" "0x0335"
 :comment "1 pass, ??? dpi, A4"
 :status :untested
-
diff --git a/doc/descriptions/bh.desc b/doc/descriptions/bh.desc
index cea51d7..08bf565 100644
--- a/doc/descriptions/bh.desc
+++ b/doc/descriptions/bh.desc
@@ -53,4 +53,3 @@
 :comment "Simplex Scanner (with ACE)"
 ; :comment and :url specifiers are optional after :mfg, :model, :desc,
 ;  and at the top-level.
-
diff --git a/doc/descriptions/canon.desc b/doc/descriptions/canon.desc
index c6db616..78a20c4 100644
--- a/doc/descriptions/canon.desc
+++ b/doc/descriptions/canon.desc
@@ -10,7 +10,7 @@
 
 :backend "canon"		; name of backend
 :manpage "sane-canon"
-:version "1.12"			; version of backend
+:version "1.12 (unmaintained)"	; version of backend
 ;:status :good			; :alpha, :beta, :stable, :new
 
 :url "http://www.rzg.mpg.de/~mpd/sane/" ; backend home page
@@ -62,4 +62,3 @@
 :interface "SCSI"
 :comment "Rebadged CanoScan 300"
 :status :good
-
diff --git a/doc/descriptions/canon_dr.desc b/doc/descriptions/canon_dr.desc
index 8bf6964..7a45d25 100644
--- a/doc/descriptions/canon_dr.desc
+++ b/doc/descriptions/canon_dr.desc
@@ -10,10 +10,10 @@
 ;
 
 :backend "canon_dr"              ; name of backend
-:url "http://www.thebility.com/canon/" 
-:version "51"                    ; version of backend
+:url "http://www.thebility.com/canon/"
+:version "57"                    ; version of backend
 :manpage "sane-canon_dr"         ; name of manpage (if it exists)
-:comment "Backend updated for SANE release 1.0.25, see sane-canon_dr manpage"
+:comment "Backend updated for SANE release 1.0.28, see sane-canon_dr manpage"
 :devicetype :scanner             ; start of a list of devices....
                                  ; other types:  :stillcam, :vidcam,
                                  ;               :meta, :api
@@ -262,8 +262,8 @@
 :model "DR-X10C"
 :interface "USB SCSI"
 :usbid "0x1083" "0x1618"
-:status :untested
-:comment "Please test!"
+:status :good
+:comment "Simplex, duplex, all resolutions, binary/ht/gray/color, async mode, dropout-color, multifeed/staple detection, deskew, autocrop working. Imprinter, barcode, custom gamma and multistream unsupported"
 
 :model "DR-C120"
 :interface "USB"
@@ -398,4 +398,3 @@
 :interface "USB"
 :usbid "0x1083" "0x1648"
 :status :untested
-
diff --git a/doc/descriptions/canon_pp.desc b/doc/descriptions/canon_pp.desc
index 6a3613a..37e08f8 100644
--- a/doc/descriptions/canon_pp.desc
+++ b/doc/descriptions/canon_pp.desc
@@ -59,4 +59,3 @@
 :interface "Parport (ECP)"
 :status :good
 :comment "Just an N640P in a different box?"
-
diff --git a/doc/descriptions/cardscan.desc b/doc/descriptions/cardscan.desc
index df106de..bfa61e6 100644
--- a/doc/descriptions/cardscan.desc
+++ b/doc/descriptions/cardscan.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "cardscan"              ; name of backend
-:url "http://www.thebility.com/cardscan/" 
+:url "http://www.thebility.com/cardscan/"
 :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"
@@ -40,4 +40,3 @@
 :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 6ccb496..ea33f5c 100644
--- a/doc/descriptions/coolscan.desc
+++ b/doc/descriptions/coolscan.desc
@@ -26,7 +26,7 @@
 
 :model "LS-30"                 ; name models for above-specified mfg.
 :interface "SCSI"
-:comment "alpha: only 24/30 bit RGB + 32/40 bit RGBI" 
+:comment "alpha: only 24/30 bit RGB + 32/40 bit RGBI"
 :status :basic
 
 :model "LS-2000"               ; name models for above-specified mfg.
@@ -36,7 +36,7 @@
 
 :model "LS-1000"
 :interface "SCSI"
-:comment "Doesn't support gamma correction" 
+:comment "Doesn't support gamma correction"
 :status :basic
 
 ; :comment and :url specifiers are optional after :mfg, :model, :desc,
diff --git a/doc/descriptions/coolscan2.desc b/doc/descriptions/coolscan2.desc
index 7e34b33..377bc99 100644
--- a/doc/descriptions/coolscan2.desc
+++ b/doc/descriptions/coolscan2.desc
@@ -38,19 +38,19 @@
 :comment "needs linux kernel 2.4.19 or later"
 
 :model "LS 50 ED"
-;:url "/unsupported/nikon-ls50-ed.html"
+;:url "unsupported/nikon-ls50-ed.html"
 :interface "USB"
 :usbid "0x04b0" "0x4001"
 :status :minimal
 
 :model "Coolscan V ED"
-:url "/unsupported/nikon-ls50-ed.html"
+:url "unsupported/nikon-ls50-ed.html"
 :interface "USB"
 :usbid "0x04b0" "0x4001"
 :status :minimal
 
 :model "Super Coolscan LS-5000 ED"
-:url "/unsupported/nikon-ls5000-ed.html"
+:url "unsupported/nikon-ls5000-ed.html"
 :interface "USB"
 :usbid "0x04b0" "0x4002"
 :status :untested
diff --git a/doc/descriptions/coolscan3.desc b/doc/descriptions/coolscan3.desc
index 136d75f..f11e10d 100644
--- a/doc/descriptions/coolscan3.desc
+++ b/doc/descriptions/coolscan3.desc
@@ -38,13 +38,13 @@
 :comment "Rebadged LS 40?"
 
 :model "LS 50 ED"
-:url "/unsupported/nikon-ls50-ed.html"
+:url "unsupported/nikon-ls50-ed.html"
 :interface "USB"
 :usbid "0x04b0" "0x4001"
 :status :minimal
 
 :model "Coolscan V ED"
-:url "/unsupported/nikon-ls50-ed.html"
+:url "unsupported/nikon-ls50-ed.html"
 :interface "USB"
 :usbid "0x04b0" "0x4001"
 :status :minimal
@@ -60,7 +60,7 @@
 :comment "needs linux kernel 2.4.19 or later"
 
 :model "Super Coolscan LS-5000 ED"
-:url "/unsupported/nikon-ls5000-ed.html"
+:url "unsupported/nikon-ls5000-ed.html"
 :interface "USB"
 :usbid "0x04b0" "0x4002"
 :status :untested
diff --git a/doc/descriptions/dc210.desc b/doc/descriptions/dc210.desc
index 1f6191e..3012fdd 100644
--- a/doc/descriptions/dc210.desc
+++ b/doc/descriptions/dc210.desc
@@ -6,7 +6,7 @@
 :url "mailto:peter@fales-lorenz.net"   ; backend's web page
 
 :devicetype :stillcam           ; start of a list of devices....
- 
+
 :mfg "Kodak"
 :url "http://www.kodak.com/global/en/service/digCam/dc210/dc210.shtml"
 :model "DC210"
diff --git a/doc/descriptions/dc240.desc b/doc/descriptions/dc240.desc
index 6250ce5..cfc6ab2 100644
--- a/doc/descriptions/dc240.desc
+++ b/doc/descriptions/dc240.desc
@@ -6,7 +6,7 @@
 :url "mailto:peter@fales-lorenz.net"   ; backend's web page
 
 :devicetype :stillcam           ; start of a list of devices....
- 
+
 :mfg "Kodak"
 :url "http://www.kodak.com/global/en/service/products/ekn006568.jhtml"
 :model "DC240"
diff --git a/doc/descriptions/dell1600n_net.desc b/doc/descriptions/dell1600n_net.desc
index 6759564..0c31ea1 100644
--- a/doc/descriptions/dell1600n_net.desc
+++ b/doc/descriptions/dell1600n_net.desc
@@ -14,4 +14,3 @@
 :usbid "0x413c" "0x5250"
 :status :basic
 :comment "Supports colour and monochrome scans over ethernet (USB not supported)"
-
diff --git a/doc/descriptions/dmc.desc b/doc/descriptions/dmc.desc
index 348d737..08a01bb 100644
--- a/doc/descriptions/dmc.desc
+++ b/doc/descriptions/dmc.desc
@@ -26,4 +26,3 @@
 :status :good
 ; :comment and :url specifiers are optional after :mfg, :model, :desc,
 ;  and at the top-level.
-
diff --git a/doc/descriptions/epson.desc b/doc/descriptions/epson.desc
index 65f466f..fc901a7 100644
--- a/doc/descriptions/epson.desc
+++ b/doc/descriptions/epson.desc
@@ -316,10 +316,10 @@
 :usbid "0x04b8" "0x082b"
 :status :good
 
-:model "DX-6000" 
-:interface "USB" 
-:usbid "0x04b8" "0x082e" 
-:status :good 
+:model "DX-6000"
+:interface "USB"
+:usbid "0x04b8" "0x082e"
+:status :good
 
 :model "DX-7400"
 :interface "USB"
@@ -350,4 +350,3 @@
 :interface "USB IEEE-1394"
 :usbid "0x04b8" "0x012c"
 :status :good
-
diff --git a/doc/descriptions/epson2.desc b/doc/descriptions/epson2.desc
index 772a77f..d1f3bed 100644
--- a/doc/descriptions/epson2.desc
+++ b/doc/descriptions/epson2.desc
@@ -6,8 +6,6 @@
 ;
 ; This file is derived from epkowa.desc, Copyright (C) Olaf Meeuwissen,
 ; distributed with "Image Scan!" and released under GPL.
-;
-; DO NOT EDIT - It's automatically generated.
 
 :backend "epson2"
 :version "1.0.124 (unmaintained)"
@@ -163,6 +161,11 @@
 :status     :unsupported
 :comment    "supported by the epkowa backend plus non-free interpreter"
 
+:model      "DS-G20000"
+:interface  "USB"
+:usbid      "0x04b8" "0x015b"
+:status     :good
+
 :model      "EP-702A"
 :interface  "USB"
 :usbid      "0x04b8" "0x0850"
@@ -525,6 +528,11 @@
 :status     :good
 :comment    "network interface supported via DFSG non-free iscan-network-nt package"
 
+:model      "ET-2650"
+:interface  "USB Ethernet"
+:usbid      "0x04b8" "0x1121"
+:status     :good
+
 :model      "Expression 636"
 :interface  "SCSI"
 :status     :complete
@@ -590,6 +598,12 @@
 :status     :good
 :comment    "overseas version of the ES-G11000"
 
+:model      "Expression 12000XL"
+:interface  "USB"
+:usbid      "0x04b8" "0x015b"
+:status     :good
+:comment    "overseas version of the DS-G20000"
+
 :model      "F-3200"			; product spec (JP)
 :interface  "USB IEEE1394"
 :usbid      "0x04b8" "0x080a"
@@ -1040,6 +1054,16 @@
 :status     :complete
 :comment    "network interface supported via DFSG non-free iscan-network-nt package<br>all-in-one"
 
+:model      "L380"
+:interface  "USB"
+:usbid      "0x04b8" "0x1120"
+:status     :good
+
+:model      "L495"
+:interface  "USB Ethernet"
+:usbid      "0x04b8" "0x1121"
+:status     :good
+
 :model      "L550 Series"
 :interface  "USB"
 :usbid      "0x04b8" "0x08a9"
@@ -3346,6 +3370,17 @@
 :status     :complete
 :comment    "network interface supported via DFSG non-free iscan-network-nt package<br>all-in-one<br>overseas version of the PX-047A"
 
+:model      "XP-243 245 247 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1116"
+:status     :good
+:comment    "network interface supported via DFSG non-free iscan-network-nt package<br>all-in-one"
+
+:model      "XP-255"
+:interface  "USB"
+:usbid      "0x04b8" "0x113d"
+:status     :good
+
 :model      "XP-300 Series"
 :interface  "USB"
 :usbid      "0x04b8" "0x0898"
@@ -3382,6 +3417,12 @@
 :status     :complete
 :comment    "network interface supported via DFSG non-free iscan-network-nt package<br>all-in-one"
 
+:model      "XP-427"
+:interface  "USB"
+:usbid      "0x04b8" "0x1116"
+:status     :good
+:comment    "network interface supported via DFSG non-free iscan-network-nt package<br>all-in-one"
+
 :model      "XP-600 Series"
 :interface  "USB"
 :usbid      "0x04b8" "0x089e"
@@ -3487,4 +3528,3 @@
 :interface  "USB"
 :usbid      "0x04b8" "0x08a7"
 :status     :good
-
diff --git a/doc/descriptions/epsonds.desc b/doc/descriptions/epsonds.desc
index 99121d1..690dd25 100644
--- a/doc/descriptions/epsonds.desc
+++ b/doc/descriptions/epsonds.desc
@@ -94,4 +94,3 @@
 :interface  "USB"
 :usbid      "0x04b8" "0x08cc"
 :status     :untested
-
diff --git a/doc/descriptions/fujitsu.desc b/doc/descriptions/fujitsu.desc
index 60f8c5b..99e5d7a 100644
--- a/doc/descriptions/fujitsu.desc
+++ b/doc/descriptions/fujitsu.desc
@@ -11,10 +11,10 @@
 
 
 :backend "fujitsu"               ; name of backend
-:url "http://www.thebility.com/fujitsu/" 
-:version "133"                   ; version of backend
+:url "http://www.thebility.com/fujitsu/"
+:version "134"                   ; version of backend
 :manpage "sane-fujitsu"          ; name of manpage (if it exists)
-:comment "Backend updated for SANE release 1.0.26, see sane-fujitsu manpage"
+:comment "Backend updated for SANE release 1.0.28, see sane-fujitsu manpage"
 :devicetype :scanner             ; start of a list of devices....
                                  ; other types:  :stillcam, :vidcam,
                                  ;               :meta, :api
@@ -26,7 +26,7 @@
 ; DISCONTINUED OLDER MODELS, SMALL
 :model "M3091DC"
 :interface "SCSI"
-:url "http://www.remote.org/frederik/projects/software/sane/" 
+:url "http://www.remote.org/frederik/projects/software/sane/"
 :status :complete
 :comment "small, old, discontinued"
 
@@ -131,12 +131,6 @@
 :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
@@ -563,34 +557,11 @@
 :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
diff --git a/doc/descriptions/genesys.desc b/doc/descriptions/genesys.desc
index f6fb8a3..77c1fd8 100644
--- a/doc/descriptions/genesys.desc
+++ b/doc/descriptions/genesys.desc
@@ -181,6 +181,13 @@
 :status :unsupported
 :comment "GL847 based, to be added to the genesys backend"
 
+:model "CanoScan 8600F"
+:url "unsupported/canon-8600.html"
+:interface "USB"
+:usbid "0x04a9" "0x2229"
+:status :basic
+:comment "normal and transparency scans work up to 1200 dpi resolution"
+
 :model "CanoScan 700F"
 :interface "USB"
 :usbid "0x04a9" "0x1907"
diff --git a/doc/descriptions/gphoto2.desc b/doc/descriptions/gphoto2.desc
index f341649..dacc15d 100644
--- a/doc/descriptions/gphoto2.desc
+++ b/doc/descriptions/gphoto2.desc
@@ -6,7 +6,7 @@
 :url "mailto:peter@fales-lorenz.net"   ; backend's web page
 
 :devicetype :api	           ; start of a list of devices....
- 
+
 :desc "Multiple cameras supported by the gphoto2 libraries"
 :url "http://www.gphoto.org"
 ;:interface "USB, serial port"
diff --git a/doc/descriptions/gt68xx.desc b/doc/descriptions/gt68xx.desc
index 16e4af9..f101cd1 100644
--- a/doc/descriptions/gt68xx.desc
+++ b/doc/descriptions/gt68xx.desc
@@ -48,7 +48,7 @@
 :url "http://www.genius-kye.com/"
 
 :model "ColorPage Slim 1200"
-;:url "/unsupported/genius-colorpage-slim-1200.html"
+;:url "unsupported/genius-colorpage-slim-1200.html"
 :interface "USB"
 :usbid "0x0458" "0x201e"
 :status :untested
@@ -130,7 +130,7 @@
 :mfg "Medion/Lifetec/Tevion/Cytron"
 :url "http://www.medion.com"
 :comment "Sold by Aldi and Tchibo."
-	  
+
 :model "MD 4394"
 :interface "USB"
 :usbid "0x05d8" "0x4002"
@@ -406,6 +406,12 @@
 :status :good
 :comment "Same as OpticSlim 2400."
 
+:model "OpticSlim 500 plus"
+:interface "USB"
+:usbid "0x07b3" "0x046e"
+:status :good
+:comment "Need firmware from windows driver. Image is upside down because hardware in this model is upside down. Buttons not tested."
+
 :model "Iriscan Express 2"
 :interface "USB"
 :usbid "0x07b3" "0x045f"
diff --git a/doc/descriptions/hp.desc b/doc/descriptions/hp.desc
index 24f4f4a..8cf94af 100644
--- a/doc/descriptions/hp.desc
+++ b/doc/descriptions/hp.desc
@@ -124,4 +124,3 @@
 
 ; :comment and :url specifiers are optional after :mfg, :model, :desc,
 ;  and at the top-level.
-
diff --git a/doc/descriptions/hp3500.desc b/doc/descriptions/hp3500.desc
index b67c01f..a8be5ef 100644
--- a/doc/descriptions/hp3500.desc
+++ b/doc/descriptions/hp3500.desc
@@ -9,7 +9,7 @@
 ;
 
 :backend "hp3500"		; name of backend
-:version "1.1"			; version of backend
+:version "1.1 (unmaintained)"	; version of backend
 :manpage "sane-hp3500"		; name of manpage (if it exists)
 :url "http://projects.troy.rollo.name/rt-scanners/" ; backend's web page
 :comment "HP3500 series scanners."
@@ -42,6 +42,3 @@
 
 ; :comment and :url specifiers are optional after :mfg, :model, :desc,
 ; and at the top-level.
-
-
-
diff --git a/doc/descriptions/hp3900.desc b/doc/descriptions/hp3900.desc
index d1aa9a1..6c26b11 100644
--- a/doc/descriptions/hp3900.desc
+++ b/doc/descriptions/hp3900.desc
@@ -79,4 +79,3 @@
 :usbid "0x04a5" "0x2211"
 :status :minimal
 :comment "developing yet"
-
diff --git a/doc/descriptions/hp4200.desc b/doc/descriptions/hp4200.desc
index 6c25882..8fe9b0f 100644
--- a/doc/descriptions/hp4200.desc
+++ b/doc/descriptions/hp4200.desc
@@ -40,4 +40,4 @@
 :comment "8bpp color, 75/150/300/600 dpi only"
 
 ; :comment and :url specifiers are optional after :mfg, :model, :desc,
-;  and at the top-level.                                                       
+;  and at the top-level.
diff --git a/doc/descriptions/hp5400.desc b/doc/descriptions/hp5400.desc
index 49d386f..1b6cb20 100644
--- a/doc/descriptions/hp5400.desc
+++ b/doc/descriptions/hp5400.desc
@@ -43,6 +43,3 @@
 
 ; :comment and :url specifiers are optional after :mfg, :model, :desc,
 ; and at the top-level.
-
-
-
diff --git a/doc/descriptions/hp5590.desc b/doc/descriptions/hp5590.desc
index 6bb9ff5..5062f75 100644
--- a/doc/descriptions/hp5590.desc
+++ b/doc/descriptions/hp5590.desc
@@ -52,4 +52,3 @@
 :usbid "0x03f0" "0x1805"
 :status :complete
 :comment "Lineart/grayscale/color (24 bit), 100/200/300/600/1200/2400 DPI, flatbed/ADF/ADF duplex/TMA slides/TMA negatives"
-
diff --git a/doc/descriptions/hpsj5s.desc b/doc/descriptions/hpsj5s.desc
index c4bc100..4aa4de9 100644
--- a/doc/descriptions/hpsj5s.desc
+++ b/doc/descriptions/hpsj5s.desc
@@ -29,4 +29,3 @@
 
 ; :comment and :url specifiers are optional after :mfg, :model, :desc,
 ;  and at the top-level.
-
diff --git a/doc/descriptions/hs2p.desc b/doc/descriptions/hs2p.desc
index d02df83..4e2c2b4 100644
--- a/doc/descriptions/hs2p.desc
+++ b/doc/descriptions/hs2p.desc
@@ -10,7 +10,7 @@
 
 :backend "hs2p"                 ; name of backend
 :url "http://www.acjlaw.net:8080/~jeremy/Ricoh/"
-:version "1.00"          ; version of backend
+:version "1.00 (unmaintained)"  ; version of backend
 ;
 :manpage "sane-hs2p"            ; name of manpage (if it exists)
 :comment "This backend has been tested with the IS450DE (Duplex/Endorser). All major functions necessary for scanning are supported. This backend should work with all Ricoh scanners in the IS450 family as well as the IS420 series, but the IS420 has not yet been tested. Features provided by the optional Image Processing Unit (IPU) are not yet integrated into the backend, as my scanner lacks the IPU."
diff --git a/doc/descriptions/kodak.desc b/doc/descriptions/kodak.desc
index 7f0108a..7fd2167 100644
--- a/doc/descriptions/kodak.desc
+++ b/doc/descriptions/kodak.desc
@@ -1,5 +1,5 @@
 :backend "kodak"
-:url "http://www.thebility.com/kodak/" 
+:url "http://www.thebility.com/kodak/"
 :version "7"
 :manpage "sane-kodak"
 :comment "New backend for SANE release 1.0.21, see sane-kodak manpage"
@@ -187,4 +187,3 @@
 :interface "SCSI"
 :status :untested
 :comment "Please test!"
-
diff --git a/doc/descriptions/kodakaio.desc b/doc/descriptions/kodakaio.desc
index 8c9c4ce..c2e12c4 100644
--- a/doc/descriptions/kodakaio.desc
+++ b/doc/descriptions/kodakaio.desc
@@ -1,5 +1,5 @@
 :backend "kodakaio"
-:url "http://sourceforge.net/projects/cupsdriverkodak/" 
+:url "http://sourceforge.net/projects/cupsdriverkodak/"
 :version "2.7.2"
 :manpage "sane-kodakaio"
 :comment "Backend for Kodak AiO ESP and Hero printers. Also possibly Advent AWL10"
@@ -180,6 +180,3 @@
 :usbid "0x040a" "0x4060"
 :status :untested
 :comment "Please test!"
-
-
-
diff --git a/doc/descriptions/kvs20xx.desc b/doc/descriptions/kvs20xx.desc
index 35178e1..4463b8e 100644
--- a/doc/descriptions/kvs20xx.desc
+++ b/doc/descriptions/kvs20xx.desc
@@ -45,4 +45,3 @@
 :interface "USB"
 :usbid "0x04da" "0x1009"
 :status :untested
-
diff --git a/doc/descriptions/kvs40xx.desc b/doc/descriptions/kvs40xx.desc
index 8cc054f..24684be 100644
--- a/doc/descriptions/kvs40xx.desc
+++ b/doc/descriptions/kvs40xx.desc
@@ -32,4 +32,3 @@
 :interface "USB"
 :usbid "0x04da" "0x100e"
 :status :untested
-
diff --git a/doc/descriptions/leo.desc b/doc/descriptions/leo.desc
index cf0cec3..02a1156 100644
--- a/doc/descriptions/leo.desc
+++ b/doc/descriptions/leo.desc
@@ -17,7 +17,7 @@
 :devicetype :scanner              ; start of a list of devices....
 
 :mfg "LEO"
-:model "LEOScan S3" 
+:model "LEOScan S3"
 :interface "SCSI"
 :comment "FCC ID LUZFS1130"
 :status :good
@@ -32,5 +32,3 @@
 :model "FS-1130 Colorpage Scanner"
 :interface "SCSI"
 :status :good
-
-
diff --git a/doc/descriptions/lexmark.desc b/doc/descriptions/lexmark.desc
index ac0b97c..a97dd69 100644
--- a/doc/descriptions/lexmark.desc
+++ b/doc/descriptions/lexmark.desc
@@ -15,7 +15,7 @@
 :url "http://stef.dev.free.fr/sane/lexmark"
 				  ; backend's web page
 
-:comment "This backend supports lexmark x1100 series scanners." 
+:comment "This backend supports lexmark x1100 series scanners."
                                   ; comment about the backend
 
 :devicetype :scanner              ; start of a list of devices....
diff --git a/doc/descriptions/ma1509.desc b/doc/descriptions/ma1509.desc
index d28aeed..99456b2 100644
--- a/doc/descriptions/ma1509.desc
+++ b/doc/descriptions/ma1509.desc
@@ -26,7 +26,7 @@
 :interface "USB"
 :usbid "0x055f" "0x0010"
 :status :good
-:comment "Works upto 600 dpi. No support for TA and ADF yet."				
+:comment "Works upto 600 dpi. No support for TA and ADF yet."
 :mfg "Fujitsu"		; name a manufacturer
 :url "http://www.fujitsu.com/"
 
@@ -35,4 +35,3 @@
 :usbid "0x04c5" "0x1040"
 :status :unsupported
 :comment "Uses ma1509 chip, but very different from other scanners supported by the ma1509 backend"
-
diff --git a/doc/descriptions/magicolor.desc b/doc/descriptions/magicolor.desc
index 7f0c341..f650c90 100644
--- a/doc/descriptions/magicolor.desc
+++ b/doc/descriptions/magicolor.desc
@@ -39,4 +39,3 @@
 :usbid      "ignore"
 :status     :unsupported
 :comment    "Uses a similar protocol as the magicolor 1690MF, according to Ilia Sotnikov."
-
diff --git a/doc/descriptions/matsushita.desc b/doc/descriptions/matsushita.desc
index 51f330f..e671feb 100644
--- a/doc/descriptions/matsushita.desc
+++ b/doc/descriptions/matsushita.desc
@@ -69,6 +69,3 @@
 
 ; :comment and :url specifiers are optional after :mfg, :model, :desc,
 ;  and at the top-level.
-
-
-
diff --git a/doc/descriptions/microtek.desc b/doc/descriptions/microtek.desc
index 09203f5..e573cba 100644
--- a/doc/descriptions/microtek.desc
+++ b/doc/descriptions/microtek.desc
@@ -1,6 +1,6 @@
 :backend "microtek"
 :version "0.13.1 (unmaintained)"
-:manpage "sane-microtek" 
+:manpage "sane-microtek"
 :url "http://www.mir.com/mtek/"
 
 :devicetype :scanner
diff --git a/doc/descriptions/microtek2.desc b/doc/descriptions/microtek2.desc
index ae2b78d..8380d17 100644
--- a/doc/descriptions/microtek2.desc
+++ b/doc/descriptions/microtek2.desc
@@ -86,7 +86,7 @@
 :status :good
 
 :model "ScanMaker 9800XL"
-:url "/unsupported/microtek-scanmaker-9800.html"
+:url "unsupported/microtek-scanmaker-9800.html"
 :interface "IEEE-1394"
 :status :minimal
 :comment "IEEE-1394 seems to work. See link. More reports welcome."
@@ -164,4 +164,3 @@
 :model "ColorPage-EP"
 :interface "Parport"
 :status :good
-
diff --git a/doc/descriptions/niash.desc b/doc/descriptions/niash.desc
index 9be55f2..e4b66d9 100644
--- a/doc/descriptions/niash.desc
+++ b/doc/descriptions/niash.desc
@@ -57,7 +57,3 @@
 :interface "USB"
 :usbid "0x047b" "0x1000"
 :status :complete
-
-
-
-
diff --git a/doc/descriptions/p5.desc b/doc/descriptions/p5.desc
index 7548902..b62a95a 100644
--- a/doc/descriptions/p5.desc
+++ b/doc/descriptions/p5.desc
@@ -24,7 +24,7 @@
 
 :model "PagePartner"
 :interface "Parport (EPP/ECP)"
-:status :basic      
+:status :basic
 :comment "Sheetfed scanner, work in gray and color, but uncalibrated scans"
 
 ; :comment and :url specifiers are optional after :mfg, :model, :desc,
diff --git a/doc/descriptions/pixma.desc b/doc/descriptions/pixma.desc
index ad33faa..be2ec1d 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.37"                ; version of backend (or "unmaintained")
+:version "0.23.0"                 ; 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."
 
@@ -28,8 +28,14 @@
 :status :untested
 :comment "Testers needed!"
 
-:model "PIXMA E460 Series"
+:model "PIXMA E410 Series"
 :interface "USB"
+:usbid "0x04a9" "0x181e"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA E460 Series"
+:interface "USB Ethernet"
 :usbid "0x04a9" "0x1788"
 :status :untested
 :comment "Testers needed!"
@@ -55,8 +61,8 @@
 :model "PIXMA E510"
 :interface "USB"
 :usbid "0x04a9" "0x1761"
-:status :untested
-:comment "Testers needed!"
+:status :complete
+:comment "All resolutions supported (up to 1200DPI)."
 
 :model "PIXMA E560"
 :interface "USB"
@@ -76,12 +82,54 @@
 :status :untested
 :comment "Testers needed!"
 
-:model "PIXMA G3000"
-:interface "USB WIFI"
+:model "PIXMA E3100 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1828"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA E4200 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1855"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA G2000"
+:interface "USB"
+:usbid "0x04a9" "0x1795"
+:status :complete
+:comment "All resolutions supported (up to 600DPI)."
+
+:model "PIXMA G2100"
+:interface "USB"
+:usbid "0x04a9" "0x1795"
+:status :complete
+:comment "All resolutions supported (up to 600DPI)."
+
+:model "PIXMA G3000 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1794"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA G3010 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x183b"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA G4000 Series"
+:interface "USB WiFi"
 :usbid "0x04a9" "0x181d"
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA G4010 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x183d"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA MG2100 Series"
 :interface "USB"
 :usbid "0x04a9" "0x1751"
@@ -245,7 +293,7 @@
 :comment "Testers needed!"
 
 :model "PIXMA MG7100 Series"
-:interface "USB"
+:interface "USB Ethernet WiFi"
 :usbid "0x04a9" "0x1772"
 :status :complete
 :comment "All resolutions supported (up to 2400DPI)."
@@ -274,18 +322,6 @@
 :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"
@@ -791,27 +827,207 @@
 :status :complete
 :comment "Flatbed and ADF scan. All resolutions supported (up to 4800DPI)"
 
-:model "PIXMA TS9000 Series"
+:model "PIXMA TR4500 Series"
 :interface "USB WiFi"
-:usbid "0x04a9" "0x179f"
+:usbid "0x04a9" "0x1854"
 :status :untested
 :comment "Testers needed!"
 
-:model "PIXMA TS8000 Series"
+:model "PIXMA TR7500 Series"
 :interface "USB WiFi"
-:usbid "0x04a9" "0x1800"
+:usbid "0x04a9" "0x1824"
 :status :untested
 :comment "Testers needed!"
 
-:model "PIXMA TS6000 Series"
+:model "PIXMA TR7530 Series"
 :interface "USB WiFi"
-:usbid "0x04a9" "0x1801"
+:usbid "0x04a9" "0x1845"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TR8500 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x1823"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TR8530 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x1844"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TR8580 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x1841"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TR9530 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x185e"
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA TS3100 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1827"
+:status :good
+:comment "All resolutions supported (up to 600DPI). WiFi not working."
+
 :model "PIXMA TS5000 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1802"
+:status :good
+:comment "All resolutions supported (up to 1200DPI). WiFi not working."
+
+:model "PIXMA TS5100 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1825"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS6000 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1801"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS6100 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1822"
+:status :good
+:comment "All resolutions supported (up to 2400DPI). WiFi not working."
+
+:model "PIXMA TS6130 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1843"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS6180 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1840"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS6200 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1856"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS6230 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1858"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS6280 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1857"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS8000 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1800"
+:status :good
+:comment "All resolutions supported (up to 2400DPI). WiFi not working."
+
+:model "PIXMA TS8100 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1821"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS8130 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1842"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS8180 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x183f"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS8200 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1859"
+:status :good
+:comment "All resolutions supported (up to 1200DPI). WiFi not working."
+
+:model "PIXMA TS8230 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x185b"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS8280 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x185a"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS9000 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x179f"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS9100 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x1820"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS9180 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x183e"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS9500 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x185c"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS9580 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x185d"
+:status :untested
+:comment "Testers needed!"
+
+: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 "PIXUS XK50 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1846"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXUS XK70 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1847"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXUS XK80 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1873"
 :status :untested
 :comment "Testers needed!"
 
@@ -833,11 +1049,29 @@
 :status :complete
 :comment "All resolutions supported (up to 600DPI)"
 
+:model "imageCLASS D550"
+:interface "USB"
+:usbid "0x04a9" "0x2738"
+:status :untested
+:comment "Testers needed!"
+
+:model "imageCLASS D570"
+:interface "USB"
+:usbid "0x04a9" "0x27e8"
+:status :untested
+:comment "Testers needed!"
+
+:model "i-SENSYS MF110 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x27ed"
+:status :untested
+:comment "Testers needed! WiFi only for w Types."
+
 :model "i-SENSYS MF210 Series"
 :interface "USB Ethernet WiFi"
 :usbid "0x04a9" "0x27a9"
-:status :untested
-:comment "Testers needed!"
+:status :complete
+:comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI). WiFi only for w Types."
 
 :model "i-SENSYS MF220 Series"
 :interface "USB Ethernet WiFi"
@@ -854,8 +1088,88 @@
 :model "i-SENSYS MF240 Series"
 :interface "USB Ethernet WiFi"
 :usbid "0x04a9" "0x27d2"
+:status :good
+:comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI, ADF up to 300DPI). 216mm image width buggy, restricted to 215mm."
+
+:model "i-SENSYS MF260 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x27f4"
+:status :untested
+:comment "Testers needed! Duplex only for MF269."
+
+:model "i-SENSYS MF410 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x27c0"
+:status :untested
+:comment "Testers needed!"
+
+:model "i-SENSYS MF420 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x27f1"
+:status :untested
+:comment "Testers needed!"
+
+:model "i-SENSYS MF510 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x27c2"
+:status :untested
+:comment "Testers needed!"
+
+:model "i-SENSYS MF520 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x27f0"
+:status :untested
+:comment "Testers needed!"
+
+:model "i-SENSYS MF620 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x27b4"
 :status :complete
-:comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI). ADF only 300DPI."
+:comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI)."
+
+:model "i-SENSYS MF630 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x27e1"
+:status :untested
+:comment "Testers needed!"
+
+:model "i-SENSYS MF640 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x27fe"
+:status :untested
+:comment "Testers needed!"
+
+:model "i-SENSYS MF730 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x27e4"
+:status :good
+:comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI). Ethernet and WiFi not tested yet"
+
+
+:model "imageCLASS MF634C"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x27e2"
+:status :complete
+:comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI)."
+
+
+:model "imageCLASS MF733Cdw"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x27e5"
+:status :complete
+:comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI)."
+
+:model "i-SENSYS MF731/733"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x27e5"
+:status :complete
+:comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI)."
+
+:model "i-SENSYS MF740 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x27fb"
+:status :untested
+:comment "Testers needed!"
 
 :model "i-SENSYS MF810/820"
 :interface "USB Ethernet"
@@ -1070,8 +1384,8 @@
 :model "imageCLASS MF8030"
 :interface "USB"
 :usbid "0x04a9" "0x2707"
-:status :untested
-:comment "Testers needed!"
+:status :complete
+:comment "Flatbed and ADF scan.  All resolutions supported (up to 600DPI)"
 
 :model "imageCLASS MF8170c"
 :interface "USB"
@@ -1118,30 +1432,54 @@
 :model "imageRUNNER 1133"
 :interface "USB"
 :usbid "0x04a9" "0x2742"
-:status :untested
-:comment "Testers needed!"
+:status :complete
+:comment "Flatbed and ADF scan.  All resolutions supported (up to 600DPI)"
 
 :model "MAXIFY MB2000 Series"
-:interface "USB"
+:interface "USB WiFi"
 :usbid "0x04a9" "0x1778"
-:status :untested
-:comment "Testers needed!"
+:status :good
+:comment "Flatbed works, All resolutions supported (up to 1200DPI), ADF does not work"
+
+:model "MAXIFY MB2100 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1793"
+:status :complete
+:comment "Flatbed and ADF scan. All resolutions supported (up to 1200DPI)."
 
 :model "MAXIFY MB2300 Series"
-:interface "USB"
+:interface "USB Ethernet WiFi"
 :usbid "0x04a9" "0x1779"
-:status :untested
-:comment "Testers needed!"
+:status :good
+:comment "Flatbed and ADF scan.  All resolutions supported (up to 1200DPI), ADF does not work"
+
+:model "MAXIFY MB2700 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1792"
+:status :complete
+:comment "Flatbed and ADF scan. All resolutions supported (up to 1200DPI)."
 
 :model "MAXIFY MB5000 Series"
 :interface "USB"
 :usbid "0x04a9" "0x1776"
-:status :complete
+:status :good
 :comment "Flatbed works, All resolutions supported (up to 1200DPI), ADF does not work"
 
+:model "MAXIFY MB5100 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x1790"
+:status :untested
+:comment "Testers needed!"
+
 :model "MAXIFY MB5300 Series"
-:interface "USB"
+:interface "USB Ethernet"
 :usbid "0x04a9" "0x1777"
+:status :good
+:comment "1200dpi scans do not work"
+
+:model "MAXIFY MB5400 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x178f"
 :status :untested
 :comment "Testers needed!"
 
@@ -1162,3 +1500,15 @@
 :usbid "0x04a9" "0x190d"
 :status :complete
 :comment "Full flatbed support up to 4800DPI (Note: flatbed does not have 9600DPI capability). Full TPU support (negatives, slides and infrared) up to 9600DPI."
+
+:model "CanoScan LiDE 300"
+:interface "USB"
+:usbid "0x04a9" "0x1913"
+:status :complete
+:comment "Support up to 4800DPI (Note: does not have less than 300DPI support)"
+
+:model "CanoScan LiDE 400"
+:interface "USB"
+:usbid "0x04a9" "0x1912"
+:status :complete
+:comment "Support up to 4800DPI (Note: does not have less than 300DPI support)"
diff --git a/doc/descriptions/plustek.desc b/doc/descriptions/plustek.desc
index ba69b47..a8204aa 100644
--- a/doc/descriptions/plustek.desc
+++ b/doc/descriptions/plustek.desc
@@ -5,8 +5,6 @@
 :backend "plustek"
 :version "0.52"
 :manpage "sane-plustek"
-; backend's web page
-:url "http://www.gjaeger.de/scanner/plustek/"
 
 :devicetype :scanner
 
@@ -202,27 +200,51 @@
 :mfg "Canon"
 :url "http://www.canon.com/"
 
-:model "CanoScan N650U/N656U"
+:model "CanoScan N650U"
 :interface "USB"
 :usbid "0x04a9" "0x2206"
 :status :complete
 
+:model "CanoScan N656U"
+:interface "USB"
+:usbid "0x04a9" "0x2206"
+:status :complete
+:comment "Identical to CanoScan N650U"
+
 :model "CanoScan N1220U"
 :interface "USB"
 :usbid "0x04a9" "0x2207"
 :status :complete
 
-:model "CanoScan N670U/N676U/LiDE20"
+:model "CanoScan N670U"
+:interface "USB"
+:usbid "0x04a9" "0x220d"
+:status :complete
+
+:model "CanoScan N676U"
 :interface "USB"
 :usbid "0x04a9" "0x220d"
 :status :complete
+:comment "Identical to CanoScan N670U"
+
+:model "CanoScan LiDE 20"
+:interface "USB"
+:usbid "0x04a9" "0x220d"
+:status :complete
+:comment "Identical to CanoScan N670U"
+
+:model "CanoScan N1240U"
+:interface "USB"
+:usbid "0x04a9" "0x220e"
+:status :complete
 
-:model "CanoScan N1240U/LiDE30"
+:model "CanoScan LiDE 30"
 :interface "USB"
 :usbid "0x04a9" "0x220e"
 :status :complete
+:comment "Identical to CanoScan N1240U"
 
-:model "CanoScan LiDE25"
+:model "CanoScan LiDE 25"
 :interface "USB"
 :usbid "0x04a9" "0x2220"
 :status :good
diff --git a/doc/descriptions/plustek_pp.desc b/doc/descriptions/plustek_pp.desc
index 5b1cec5..fd19262 100644
--- a/doc/descriptions/plustek_pp.desc
+++ b/doc/descriptions/plustek_pp.desc
@@ -5,8 +5,6 @@
 :backend "plustek_pp"
 :version "0.43"
 :manpage "sane-plustek_pp"
-; backend's web page
-:url "http://www.gjaeger.de/scanner/plustek_pp/"
 
 :devicetype :scanner
 
@@ -153,4 +151,3 @@
 :interface "Parport (SPP, EPP)"
 :status :complete
 :comment "Reported as P12"
-
diff --git a/doc/descriptions/ricoh.desc b/doc/descriptions/ricoh.desc
index b4928f2..bdaea31 100644
--- a/doc/descriptions/ricoh.desc
+++ b/doc/descriptions/ricoh.desc
@@ -26,4 +26,3 @@
 :interface "SCSI"
 :status :basic
 ;:comment "?"
-
diff --git a/doc/descriptions/ricoh2.desc b/doc/descriptions/ricoh2.desc
new file mode 100644
index 0000000..55ee372
--- /dev/null
+++ b/doc/descriptions/ricoh2.desc
@@ -0,0 +1,40 @@
+;
+; SANE Backend specification file
+;
+; It's basically emacs-lisp --- so ";" indicates comment to end of line.
+; All syntactic elements are keyword tokens, followed by a string or
+;  keyword argument, as specified.
+;
+; ":backend" *must* be specified.
+; All other information is optional (but what good is the file without it?).
+;
+; See doc/descriptions.txt for details.
+
+:backend "ricoh2"                 ; name of backend
+:version "1.0"                    ; version of backend (or "unmaintained")
+:new :yes                         ; Is the backend new to this SANE release?
+                                  ; :yes or :no
+:manpage "sane-ricoh2"            ; name of manpage (if it exists)
+:url "http://www.ricoh.com/"      ; backend's web page
+
+:devicetype :scanner              ; start of a list of devices....
+                                  ; other types:  :stillcam, :vidcam,
+                                  ;               :meta, :api
+
+:mfg "Ricoh"                      ; name a manufacturer
+:url "http://www.ricoh.com/"      ; manufacturer's URL
+
+:model "SG-3100SNw"
+:status :basic
+:interface "USB"
+:usbid "0x05ca" "0x0438"
+
+:model "SP-100SU"
+:status :untested
+:interface "USB"
+:usbid "0x05ca" "0x042c"
+
+:model "SP-111SU"
+:status :basic
+:interface "USB"
+:usbid "0x05ca" "0x0448"
diff --git a/doc/descriptions/rts8891.desc b/doc/descriptions/rts8891.desc
index e37f158..7d5a63c 100644
--- a/doc/descriptions/rts8891.desc
+++ b/doc/descriptions/rts8891.desc
@@ -12,10 +12,10 @@
 :backend "rts8891"               ; name of backend
 :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" 
+:url "http://stef.dev.free.fr/sane/rts8891/index.html"
 				  ; backend's web page
 
-:comment "This backend supports Realtek RTS8891 ASIC bases scanners." 
+:comment "This backend supports Realtek RTS8891 ASIC bases scanners."
                                   ; comment about the backend
 
 :devicetype :scanner              ; start of a list of devices....
diff --git a/doc/descriptions/sceptre.desc b/doc/descriptions/sceptre.desc
index aa4f515..e636bdb 100644
--- a/doc/descriptions/sceptre.desc
+++ b/doc/descriptions/sceptre.desc
@@ -18,13 +18,13 @@
 
 :mfg "Sceptre"
 :url "http://www.sceptre.com/"
-:model "Vividscan S1200" 
+:model "Vividscan S1200"
 :interface "SCSI"
 :status :basic
 
 :mfg "Komodo"
 :url "http://www.komodo.com/"
-:model "S1200" 
+:model "S1200"
 :interface "SCSI"
 :status :untested
 :comment "rebadged Sceptre S1200"
diff --git a/doc/descriptions/sharp.desc b/doc/descriptions/sharp.desc
index 63000af..10349ba 100644
--- a/doc/descriptions/sharp.desc
+++ b/doc/descriptions/sharp.desc
@@ -1,7 +1,7 @@
 :backend "sharp"                ; name 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" 
+:url "http://www.satzbau-gmbh.de/staff/abel/sane-sharp.html"
 				; backend's homepage
 :manpage "sane-sharp"
 :devicetype :scanner
diff --git a/doc/descriptions/sm3840.desc b/doc/descriptions/sm3840.desc
index e40193f..75c499c 100644
--- a/doc/descriptions/sm3840.desc
+++ b/doc/descriptions/sm3840.desc
@@ -14,7 +14,7 @@
 :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" 
+:comment "This reverse-engineered backend supports the USB ScanMaker 3840 model"
                                   ; comment about the backend
 
 :devicetype :scanner              ; start of a list of devices....
@@ -52,5 +52,3 @@
 ;  and at the top-level.
 
 ; :status specifier is optional after :model and at the top-level
-
-
diff --git a/doc/descriptions/tamarack.desc b/doc/descriptions/tamarack.desc
index 731e6b8..7b52fd5 100644
--- a/doc/descriptions/tamarack.desc
+++ b/doc/descriptions/tamarack.desc
@@ -32,4 +32,3 @@
 :interface "SCSI"
 :status :good
 :comment "3 pass, 600 DPI"
-
diff --git a/doc/descriptions/teco1.desc b/doc/descriptions/teco1.desc
index e5b4132..1b37918 100644
--- a/doc/descriptions/teco1.desc
+++ b/doc/descriptions/teco1.desc
@@ -122,6 +122,3 @@
 
 ; :comment and :url specifiers are optional after :mfg, :model, :desc,
 ;  and at the top-level.
-
-
-
diff --git a/doc/descriptions/teco3.desc b/doc/descriptions/teco3.desc
index a2f3e92..0a84ab2 100644
--- a/doc/descriptions/teco3.desc
+++ b/doc/descriptions/teco3.desc
@@ -57,6 +57,3 @@
 
 ; :comment and :url specifiers are optional after :mfg, :model, :desc,
 ;  and at the top-level.
-
-
-
diff --git a/doc/descriptions/template.desc. b/doc/descriptions/template.desc.
index 25b9b5a..a6b6bab 100644
--- a/doc/descriptions/template.desc.
+++ b/doc/descriptions/template.desc.
@@ -17,7 +17,7 @@
 :manpage "sane-template"          ; name of manpage (if it exists)
 :url "http://www.luser.com/temp/" ; backend's web page
 :url "http://www.luser.com/b/"    ; another backend webpage
-:comment "This backend supports only the USB and SCSI models" 
+:comment "This backend supports only the USB and SCSI models"
                                   ; comment about the backend
 
 :devicetype :scanner              ; start of a list of devices....
@@ -77,5 +77,3 @@
 ;  and at the top-level.
 
 ; :status specifier is optional after :model and at the top-level
-
-
diff --git a/doc/descriptions/test.desc b/doc/descriptions/test.desc
index 657c2ea..e0989f4 100644
--- a/doc/descriptions/test.desc
+++ b/doc/descriptions/test.desc
@@ -20,4 +20,3 @@
 
 :desc "Frontend-tester"
 :comment "Backend for testing frontends. Also serves as example for SANE backend options."
-
diff --git a/doc/descriptions/u12.desc b/doc/descriptions/u12.desc
index ccf37f0..81bed1c 100644
--- a/doc/descriptions/u12.desc
+++ b/doc/descriptions/u12.desc
@@ -5,8 +5,6 @@
 :backend "u12"
 :version "0.02"
 :manpage "sane-u12"
-; backend's web page
-:url "http://www.gjaeger.de/scanner/u12/"
 
 :devicetype :scanner
 
diff --git a/doc/descriptions/umax_pp.desc b/doc/descriptions/umax_pp.desc
index e07a4a0..f95e82f 100644
--- a/doc/descriptions/umax_pp.desc
+++ b/doc/descriptions/umax_pp.desc
@@ -22,41 +22,41 @@
 :mfg "UMAX"                     ; name a manufacturer
 :url "http://www.umax.com.tw/"
 
-; These scanners are known to have the same ASIC family. 
+; These scanners are known to have the same ASIC family.
 
 :model "Astra 1220P"
 :interface "Parport (EPP/ECP)"
-:status :good      
+:status :good
 
 :model "Astra 2000P"
 :interface "Parport (EPP/ECP)"
-:status :good      
+:status :good
 
 :model "Astra 1600P"
 :interface "Parport (EPP/ECP)"
-:status :good      
+:status :good
 
 :model "Astra 600P"
 :interface "Parport (SPP/ECP)"
-:status :unsupported      
+:status :unsupported
 :comment "untested, but should be close to 610P"
 
 :model "Astra 610P"
 :interface "Parport (SPP/ECP)"
-:status :good      
+:status :good
 
 :mfg "Hewlett-Packard"
 
 :model "Scanjet 3200C"
 :interface "Parport (EPP/ECP)"
-:status :good      
+:status :good
 :comment "works (relabelled 1220P and 2000P)"
 
 :mfg "Genius"
 
 :model "ColorPage-Life Pro"
 :interface "Parport (EPP/ECP)"
-:status :good      
+:status :good
 :comment "works (relabelled 1220P and 2000P)"
 
 ; :comment and :url specifiers are optional after :mfg, :model, :desc,
diff --git a/doc/descriptions/unsupported.desc b/doc/descriptions/unsupported.desc
index 2217594..496ebea 100644
--- a/doc/descriptions/unsupported.desc
+++ b/doc/descriptions/unsupported.desc
@@ -10,7 +10,7 @@
 
 :backend "unsupported"		; name of backend
 :version "2010-06-09"		; version of backend
-:url "/contrib.html"
+:url "contrib.html"
 ;:manpage "sane-mustek"		; name of manpage (if it exists)
 :comment "The devices mentioned here are not supported by any SANE backend. However, there may be links to information about them or stand-alone programs."
 
@@ -21,14 +21,14 @@
 :mfg "Agfa"
 
 :model "DuoScan f40"
-:url "/unsupported/agfa-duoscan-f40.html"
+:url "unsupported/agfa-duoscan-f40.html"
 :interface "USB IEEE-1394"
 :usbid "0x06bd" "0x02bf"
 :status :unsupported
 :comment "Unsupported. See link for details."
 
 :model "DuoScan T2000XL"
-:url "/unsupported/agfa-duoscan-t2000xl.html"
+:url "unsupported/agfa-duoscan-t2000xl.html"
 :interface "SCSI"
 :status :unsupported
 :comment "Unsupported. Same as Microtek ArtixScan 2020?"
@@ -39,25 +39,25 @@
 :comment "Unsupported. Same as Microtek Artixscan 2500f"
 
 :model "SnapScan 310P"
-:url "/unsupported/acer-parport.html"
+:url "unsupported/acer-parport.html"
 :interface "Parport"
 :status :unsupported
 :comment "Unsupported, see link for details."
 
 :model "SnapScan EZ"
-:url "/unsupported/acer-parport.html"
+:url "unsupported/acer-parport.html"
 :interface "Parport"
 :status :unsupported
 :comment "Unsupported, see link for details."
 
 :model "SnapScan 1200P"
-:url "/unsupported/acer-parport.html"
+:url "unsupported/acer-parport.html"
 :interface "Parport"
 :status :unsupported
 :comment "Unsupported, see link for details."
 
 :model "SnapScan 1212P"
-:url "/unsupported/acer-parport.html"
+:url "unsupported/acer-parport.html"
 :interface "Parport"
 :status :unsupported
 :comment "Unsupported, see link for details."
@@ -68,7 +68,7 @@
 :url "http://www.artecusa.com/"
 
 :model "1236 USB"
-:url "/unsupported/artec_1236usb.html"
+:url "unsupported/artec_1236usb.html"
 :interface "USB"
 :usbid "0x05d8" "0x4001"
 :status :unsupported
@@ -80,7 +80,7 @@
 :comment "Unsupported. Chips found inside: AT015, AD9816JS. Maybe similar to SCSI version or as6e?"
 
 :model "Ultima 2000 (0x4001)"
-:url "/unsupported/artec-ultima-2000-2.html"
+:url "unsupported/artec-ultima-2000-2.html"
 :interface "USB"
 :usbid "0x05d8" "0x4001"
 :status :unsupported
@@ -91,7 +91,7 @@
 :mfg "Avigramm"
 
 :model "Minidoc"
-:url "/unsupported/trust-combiscan-19200.html"
+:url "unsupported/trust-combiscan-19200.html"
 :interface "USB Parport"
 :usbid "0x05cb" "0x1483"
 :status :unsupported
@@ -113,14 +113,14 @@
 :comment "Not supported. No chipset information available. Same as UMAX Astra 6700."
 
 :model "iVina 1600"
-:url "/unsupported/umax-astra-4500.html"
+:url "unsupported/umax-astra-4500.html"
 :interface "USB"
 :usbid "0x0638" "0x0a10"
 :status :unsupported
 :comment "GL646 based, to be added to genesys backend. Same as UMAX Astra 4500."
 
 :model "iVina FB1800"
-:url "/unsupported/umax-astra-4700.html"
+:url "unsupported/umax-astra-4700.html"
 :interface "USB"
 :usbid "0x0638" "0x0a20"
 :status :unsupported
@@ -134,49 +134,49 @@
 :comment "Formerly Acer Peripherals"
 
 :model "310P"
-:url "/unsupported/acer-parport.html"
+:url "unsupported/acer-parport.html"
 :status :unsupported
 :interface "Parport"
 :comment "Unsupported, see link for details."
 
 :model "320P"
-:url "/unsupported/acer-parport.html"
+:url "unsupported/acer-parport.html"
 :status :unsupported
 :interface "Parport"
 :comment "Unsupported, see link for details."
 
 :model "340P"
-:url "/unsupported/acer-parport.html"
+:url "unsupported/acer-parport.html"
 :status :unsupported
 :interface "Parport"
 :comment "Unsupported, see link for details."
 
 :model "610P"
-:url "/unsupported/acer-parport.html"
+:url "unsupported/acer-parport.html"
 :status :unsupported
 :interface "Parport"
 :comment "Unsupported, see link for details."
 
 :model "610PT"
-:url "/unsupported/acer-parport.html"
+:url "unsupported/acer-parport.html"
 :status :unsupported
 :interface "Parport"
 :comment "Unsupported, see link for details."
 
 :model "620P"
-:url "/unsupported/acer-parport.html"
+:url "unsupported/acer-parport.html"
 :status :unsupported
 :interface "Parport"
 :comment "Unsupported, see link for details."
 
 :model "620PT"
-:url "/unsupported/acer-parport.html"
+:url "unsupported/acer-parport.html"
 :status :unsupported
 :interface "Parport"
 :comment "Unsupported, see link for details."
 
 :model "640P"
-:url "/unsupported/acer-parport.html"
+:url "unsupported/acer-parport.html"
 :status :unsupported
 :interface "Parport"
 :comment "Unsupported, see link for details."
@@ -188,7 +188,7 @@
 :comment "Unsupported."
 
 :model "5550"
-:url "/unsupported/benq-5550.html"
+:url "unsupported/benq-5550.html"
 :interface "USB"
 :usbid "0x04a5" "0x2211"
 :status :unsupported
@@ -198,10 +198,10 @@
 :interface "USB"
 :usbid "0x04a5" "0x2311"
 :status :unsupported
-:url "http://lists.alioth.debian.org/pipermail/sane-devel/2009-January/023447.html"
+:url "http://alioth-lists.debian.net/pipermail/sane-devel/2009-January/023447.html"
 
 :model "7400UT"
-:url "/unsupported/benq-7400ut.html"
+:url "unsupported/benq-7400ut.html"
 :interface "USB"
 :usbid "0x04a5" "0x2202"
 :status :unsupported
@@ -211,7 +211,7 @@
 :mfg "Boeder"
 
 :model "Sm@rtScan Office"
-:url "/unsupported/trust-combiscan-19200.html"
+:url "unsupported/trust-combiscan-19200.html"
 :interface "Parport USB"
 :usbid "0x05cb" "0x1483"
 :status :unsupported
@@ -223,7 +223,7 @@
 :url "http://www.brother.com/"
 
 :model "MFC 2500"
-:url "/unsupported/brother-mfc-2500.html"
+:url "unsupported/brother-mfc-2500.html"
 :interface "USB"
 :usbid "0x04f9" "0x000a"
 :status :unsupported
@@ -236,13 +236,13 @@
 :comment "The parport 200x400dpi grayscale version of this scanner is unsupported. Dmitri Katchalov did some investigations on this scanner. If you want to write a backend, contact him (see link)."
 
 :model "MFC 7300c"
-:url "/unsupported/brother-mfc-7300.html"
+:url "unsupported/brother-mfc-7300.html"
 :interface "Parport USB"
 :usbid "0x04f9" "0x0106"
 :status :unsupported
 
 :model "MFC 9600"
-:url "/unsupported/brother-mfc-9600.html"
+:url "unsupported/brother-mfc-9600.html"
 :interface "USB"
 :usbid "0x04f9" "0x0101"
 :status :unsupported
@@ -253,7 +253,7 @@
 :url "http://www.c-channel.ch/"
 
 :model "MyPen Pro"
-:url "/unsupported/c-channel-mypen-pro.html"
+:url "unsupported/c-channel-mypen-pro.html"
 :interface "USB"
 ;:usbid "" ""
 :status :unsupported
@@ -266,7 +266,7 @@
 :comment "See bug #306792 for details."
 
 :model "MoneyPen II"
-;:url "/unsupported/c-channel-mypen-pro.html"
+;:url "unsupported/c-channel-mypen-pro.html"
 :interface "USB"
 ;:usbid "" ""
 :status :unsupported
@@ -278,120 +278,112 @@
 :url "http://www.canon.com/"
 
 :model "CanoScan 3000"
-:url "/unsupported/canon-3000.html"
+:url "unsupported/canon-3000.html"
 :interface "USB"
 :usbid "0x04a9" "0x2215"
 :status :unsupported
 :comment "GL660+GL646 based."
 
 :model "CanoScan 3000ex"
-:url "/unsupported/canon-3000.html"
+:url "unsupported/canon-3000.html"
 :interface "USB"
 :usbid "0x04a9" "0x2215"
 :status :unsupported
 :comment "GL660+GL646 based."
 
 :model "CanoScan 3000F"
-:url "/unsupported/canon-3000.html"
+:url "unsupported/canon-3000.html"
 :interface "USB"
 :usbid "0x04a9" "0x2215"
 :status :unsupported
 :comment "GL660+GL646 based, to be added to genesys backend"
 
 :model "CanoScan 4200F"
-:url "/unsupported/canon-4200f.html"
+:url "unsupported/canon-4200f.html"
 :interface "USB"
 :usbid "0x04a9" "0x221b"
 :status :unsupported
 :comment "Probably unsupported. See link."
 
 :model "CanoScan 4400F"
-:url "/unsupported/canon-4400.html"
+:url "unsupported/canon-4400.html"
 :interface "USB"
 :usbid "0x04a9" "0x2228"
 :status :unsupported
 :comment "GL843 based, to be added to genesys backend"
 
 :model "CanoScan 5000F"
-:url "/unsupported/canon-5000f.html"
+:url "unsupported/canon-5000f.html"
 :interface "USB"
 :usbid "0x04a9" "0x2212"
 :status :unsupported
 :comment "Unsupported. See link for details."
 
 :model "CanoScan 5200F"
-:url "/unsupported/canon-5200f.html"
+:url "unsupported/canon-5200f.html"
 :interface "USB"
 :usbid "0x04a9" "0x2217"
 :status :unsupported
 :comment "Probably unsupported. See link for details."
 
 :model "CanoScan 8000F"
-:url "/unsupported/canon-8000f.html"
+:url "unsupported/canon-8000f.html"
 :interface "USB"
 :usbid "0x04a9" "0x220f"
 :status :unsupported
 :comment "Not supported. See link for more information. With transparency adapter."
 
 :model "CanoScan 8400F"
-:url "/unsupported/canon-8400f.html"
+:url "unsupported/canon-8400f.html"
 :interface "USB"
 :usbid "0x04a9" "0x221e"
 :status :unsupported
 :comment "GL841 based, to be added to genesys backend"
 
-:model "CanoScan 8600F"
-:url "/unsupported/canon-8600.html"
-:interface "USB"
-:usbid "0x04a9" "0x2229"
-:status :unsupported
-:comment "GL841 based, to be added to genesys backend"
-
-
 :model "CanoScan 9900F"
-:url "/unsupported/canon-9900f.html"
+:url "unsupported/canon-9900f.html"
 :interface "USB"
 :usbid "0x04a9" "0x2210"
 :status :unsupported
 :comment "Probably unsupported, similar to 8000F. 3200x6400 dpi USB2. With transparency adapter."
 
 :model "CanoScan 9950F"
-:url "/unsupported/canon-9950f.html"
+:url "unsupported/canon-9950f.html"
 :interface "USB"
 :usbid "0x04a9" "0x2219"
 :status :unsupported
 :comment "Probably unsupported."
 
 :model "CanoScan D646U"
-:url "/unsupported/canon-d646u.html"
+:url "unsupported/canon-d646u.html"
 :interface "USB"
 :usbid "0x04a9" "0x220b"
 :status :unsupported
 :comment "Probably not supported. See link for more information and test program."
 
 :model "CanoScan D646U ex"
-:url "/unsupported/canon-d646u.html"
+:url "unsupported/canon-d646u.html"
 :interface "USB"
 :usbid "0x04a9" "0x220b"
 :status :unsupported
 :comment "Probably not supported. See D646."
 
 :model "CanoScan D1230U"
-:url "/unsupported/canon-d1230u.html"
+:url "unsupported/canon-d1230u.html"
 :interface "USB"
 :usbid "0x04a9" "0x2209"
 :status :unsupported
 :comment "Probably not supported. "
 
 :model "CanoScan D1250U2"
-:url "/unsupported/canon-d1250u2.html"
+:url "unsupported/canon-d1250u2.html"
 :interface "USB"
 :usbid "0x04a9" "0x220c"
 :status :unsupported
 :comment "Not supported. However, someone started working on this scanner and some information is available (see link)."
 
 :model "CanoScan D2400UF"
-:url "/unsupported/canon-d2400uf.html"
+:url "unsupported/canon-d2400uf.html"
 :interface "USB"
 :usbid "0x04a9" "0x220a"
 :status :unsupported
@@ -404,7 +396,7 @@
 :comment "Probably not supported. No details known."
 
 :model "CanoScan FB620U"
-:url "/unsupported/canon-fb620u.html"
+:url "unsupported/canon-fb620u.html"
 :interface "USB"
 :usbid "0x04a9" "0x2202"
 :status :unsupported
@@ -425,14 +417,14 @@
 :comment "Philips chip. Backend started, see link"
 
 :model "CanoScan LiDE 90"
-:url "/unsupported/canon-lide-90.html"
+:url "unsupported/canon-lide-90.html"
 :interface "USB"
 :usbid "0x04a9" "0x1900"
 :status :unsupported
 :comment "Unsupported. See link for details."
 
 :model "CanoScan LiDE 500F"
-:url "/unsupported/canon-canoscan-lide-500f.html"
+:url "unsupported/canon-canoscan-lide-500f.html"
 :interface "USB"
 :usbid "0x04a9" "0x221f"
 :status :unsupported
@@ -453,67 +445,67 @@
 :comment "Philips chip. Backend started, see link"
 
 :model "FS4000"
-:url "/unsupported/canon-fs4000.html"
+:url "unsupported/canon-fs4000.html"
 :interface "USB SCSI"
 :usbid "0x04a9" "0x3042"
 :status :unsupported
 :comment "Not supported. See link for more details."
 
 :model "IS 12"
-:url "/unsupported/canon-is-12.html"
+:url "unsupported/canon-is-12.html"
 :interface "USB"
 :status :unsupported
 :comment "Probably not supported. Scanner cardridge for Canon inkjet printers."
 
 :model "IS 22"
-:url "/unsupported/canon-is-22.html"
+:url "unsupported/canon-is-22.html"
 :interface "Parport"
 :status :unsupported
 :comment "Probably not supported. Scanner cardridge for Canon inkjet printers."
 
 :model "IS 32"
-:url "/unsupported/canon-is-32.html"
+:url "unsupported/canon-is-32.html"
 :interface "USB"
 :usbid "0x04a9" "0x105d"
 :status :unsupported
 :comment "Probably not supported. Scanner cardridge for Canon inkjet printers."
 
 :model "IS 52"
-:url "/unsupported/canon-is-52.html"
+:url "unsupported/canon-is-52.html"
 :interface "USB"
 :status :unsupported
 :comment "Probably not supported. Scanner cardridge for Canon inkjet printers."
 
 :model "ImageRunner iR1018"
-:url "/unsupported/canon-imagerunner.html"
+:url "unsupported/canon-imagerunner.html"
 :interface "USB"
 :usbid "0x04a9" "0x269d"
 :status :unsupported
 :comment "Probably not supported. See link for details."
 
 :model "ImageRunner iR1022"
-:url "/unsupported/canon-imagerunner.html"
+:url "unsupported/canon-imagerunner.html"
 :interface "USB"
 :usbid "0x04a9" "0x269d"
 :status :unsupported
 :comment "Probably not supported. See link for details."
 
 :model "ImageRunner iR1023"
-:url "/unsupported/canon-imagerunner.html"
+:url "unsupported/canon-imagerunner.html"
 :interface "USB"
 :usbid "0x04a9" "0x269d"
 :status :unsupported
 :comment "Probably not supported. See link for details."
 
 :model "PIXMA MP110"
-:url "/unsupported/canon-pixma-mp110.html"
+:url "unsupported/canon-pixma-mp110.html"
 :interface "USB"
 :usbid "0x04a9" "0x1700"
 :status :unsupported
 :comment "Probably not supported. See link for details."
 
 :model "PIXMA MP130"
-:url "/unsupported/canon-pixma-mp130.html"
+:url "unsupported/canon-pixma-mp130.html"
 :interface "USB"
 :usbid "0x04a9" "0x1701"
 :status :unsupported
@@ -528,7 +520,7 @@
 :mfg "Chinon"
 
 :model "DS-3000"
-:url "/unsupported/chinon-ds3000.html"
+:url "unsupported/chinon-ds3000.html"
 :interface "Parport Serial Port"
 :status :unsupported
 :comment "Unsupported at the moment, but a backend is in preparation. See link."
@@ -549,7 +541,7 @@
 :mfg "Compeye"
 
 :model "Simplex 1236C"
-:url "/unsupported/trust-combiscan-19200.html"
+:url "unsupported/trust-combiscan-19200.html"
 :interface "Parport USB"
 :usbid "0x05cb" "0x1483"
 :status :unsupported
@@ -561,14 +553,14 @@
 :url "http://www.cardscan.com/"
 
 :model "Cardscan 500"
-:url "/unsupported/corex-cardscan-500.html"
+:url "unsupported/corex-cardscan-500.html"
 :interface "USB"
 :usbid "0x08f0" "0x0001"
 :status :unsupported
 :comment "Probably not supported. Businesscard reader."
 
 :model "Cardscan 700 C"
-:url "/unsupported/corex-cardscan-700.html"
+:url "unsupported/corex-cardscan-700.html"
 :interface "USB"
 :usbid "0x08f0" "0x0004"
 :status :unsupported
@@ -586,14 +578,14 @@
 :comment "Probably rebadged Lexmark X5150. May work with sane-lexmark? See bug #312130"
 
 :model "A960"
-:url "/unsupported/dell-a960.html"
+:url "unsupported/dell-a960.html"
 :interface "USB"
 :usbid "0x413c" "0x5107"
 :status :unsupported
 :comment "Probably not supported. See link for details."
 
 :model "922"
-:url "/unsupported/dell-922.html"
+:url "unsupported/dell-922.html"
 :interface "USB"
 :usbid "0x413c" "0x5109"
 :status :unsupported
@@ -617,7 +609,7 @@
 :comment "Probably unsupported. No details known."
 
 :model "Stylus DX4450"
-:url "/unsupported/epson-stylus-dx4450.html"
+:url "unsupported/epson-stylus-dx4450.html"
 :interface "USB"
 :usbid "0x04b8" "0x083f"
 :status :unsupported
@@ -634,7 +626,7 @@
 :url "http://www.bizcardreader.com/"
 
 :model "BizCardReader 900C"
-:url "/unsupported/edt-900c.html"
+:url "unsupported/edt-900c.html"
 :interface "USB"
 :usbid "0x0a53" "0x5001"
 :status :unsupported
@@ -689,6 +681,24 @@
 :status :unsupported
 :comment "Genesys GL310 chipset, not supported by sane-genesys backend."
 
+: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?"
+
 ;********************************************************************************************
 
 :mfg "Genius"
@@ -696,41 +706,41 @@
 :url "http://www.genius-kye.com/"
 
 :model "ColorPage CS"
-:url "/unsupported/genius-colorpage-cs.html"
+:url "unsupported/genius-colorpage-cs.html"
 :interface "SCSI"
 :status :unsupported
 :comment "Probably unsupported, see link for details."
 
 :model "ColorPage-Slim 1200 USB2"
-:url "/unsupported/genius-colorpage-slim-1200-usb2.html"
+:url "unsupported/genius-colorpage-slim-1200-usb2.html"
 :interface "USB"
 :usbid "0x0458" "0x2020"
 :status :unsupported
 :comment "GL841 based, to be added to genesys backend."
 
 :model "ColorPage HR6X Slim"
-:url "/unsupported/genius-colorpage-hr6x.html"
+:url "unsupported/genius-colorpage-hr6x.html"
 :interface "USB"
 :usbid "0x0458" "0x2019"
 :status :unsupported
 :comment "GL646 based, to be added to genesys backend"
 
 :model "ColorPage HR7X"
-:url "/unsupported/genius-colorpage-hr7x.html"
+:url "unsupported/genius-colorpage-hr7x.html"
 :interface "USB"
 :usbid "0x0458" "0x2018"
 :status :unsupported
 :comment "GL646 based, to be added to genesys backend"
 
 :model "ColorPage HR7XE"
-:url "/unsupported/genius-colorpage-hr7xe.html"
+:url "unsupported/genius-colorpage-hr7xe.html"
 :interface "USB"
 :usbid "0x06dc" "0x0012"
 :status :unsupported
 :comment "Unsuported. See link for details."
 
 :model "ColorPage HR8"
-:url "/unsupported/genius-colorpage-hr8.html"
+:url "unsupported/genius-colorpage-hr8.html"
 :interface "USB"
 :usbid "0x0458" "0x201c"
 :status :unsupported
@@ -741,7 +751,7 @@
 :mfg "Guillemot"			; name a manufacturer
 
 :model "SCAN@HOME 48 USB"
-:url "/unsupported/teco-vm6509.html"
+:url "unsupported/teco-vm6509.html"
 :interface "USB"
 :usbid "0x080d" "0x0102"
 :status :unsupported
@@ -758,7 +768,7 @@
 :mfg "Hercules"			; name a manufacturer
 
 :model "SCAN@HOME 48 USB"
-:url "/unsupported/teco-vm6509.html"
+:url "unsupported/teco-vm6509.html"
 :interface "USB"
 :usbid "0x080d" "0x0102"
 :status :unsupported
@@ -771,7 +781,7 @@
 :url "http://www.hp.com/"
 
 :model "Photo Scanner 1000"
-:url "/unsupported/hp-photo-1000.html"
+:url "unsupported/hp-photo-1000.html"
 :interface "USB"
 :usbid "0x03f0" "0x1001"
 :status :unsupported
@@ -783,28 +793,28 @@
 :comment "Probably not supported by SANE. No details known. 10x15 cm. Maybe similar to Photo Scanner 1000?"
 
 :model "Photosmart S20 (C5101A)"
-:url "/unsupported/hp-photosmart-s20xi.html"
+:url "unsupported/hp-photosmart-s20xi.html"
 :interface "USB"
 :usbid "0x03f0" "0x0102"
 :status :unsupported
 :comment "Not supported yet by SANE. See link for details."
 
 :model "Photosmart S20xi (C7150A)"
-:url "/unsupported/hp-photosmart-s20xi.html"
+:url "unsupported/hp-photosmart-s20xi.html"
 :interface "USB"
 :usbid "0x03f0" "0x0102"
 :status :unsupported
 :comment "Not supported yet by SANE. See link for details."
 
 :model "Photosmart C5100 series"
-:url "/unsupported/hp-photosmart-5100.html"
+:url "unsupported/hp-photosmart-5100.html"
 :interface "USB"
 :usbid "0x03f0" "0x5811"
 :status :unsupported
 :comment "Not supported yet by SANE. See link for details."
 
 :model "Photosmart C3180"
-:url "/unsupported/hp-photosmart-3180.html"
+:url "unsupported/hp-photosmart-3180.html"
 :interface "USB"
 :usbid "0x03f0" "0x5611"
 :status :unsupported
@@ -817,7 +827,7 @@
 :comment "While an external binary-only backend exists, it works only on Linux i386. Therefore the scanner is unsupported on other platforms."
 
 :model "ScanJet 4600"
-:url "/unsupported/hp-scanjet-4600.html"
+:url "unsupported/hp-scanjet-4600.html"
 :interface "USB"
 :usbid "0x03f0" "0x3005"
 :comment "Not supported. See link for details, or http://www.chmil.org/hp4600linux/ for code"
@@ -830,28 +840,28 @@
 :status :unsupported
 
 :model "ScanJet 4890C"
-:url "/unsupported/hp-scanjet-4850.html"
+:url "unsupported/hp-scanjet-4850.html"
 :interface "USB"
 :usbid "0x03f0" "0x1b05"
 :comment "GL843, maybe can be added to genesys backend "
 :status :unsupported
 
 :model "ScanJet 5530C Photosmart"
-:url "/unsupported/hp-scanjet-5530.html"
+:url "unsupported/hp-scanjet-5530.html"
 :interface "USB"
 :usbid "0x03f0" "0x1605"
 :comment "Maybe GL841_HP, but not confirmed, maybe can be added to genesys backend"
 :status :unsupported
 
 :model "ScanJet 8390"
-:url "/unsupported/hp-scanjet-8390.html"
+:url "unsupported/hp-scanjet-8390.html"
 :interface "USB"
 :usbid "0x03f0" "0x3805"
 :comment "Probably not supported. See link for details."
 :status :unsupported
 
 :model "ScanJet G4000"
-:url "/unsupported/hp-g4000.html"
+:url "unsupported/hp-g4000.html"
 :interface "USB"
 :usbid "0x03f0" "0x4505"
 :comment "Probably not supported. See link for details."
@@ -873,7 +883,7 @@
 :url "http://www.iomagic.com/"
 
 :model "MobileScan USB"
-:url "/unsupported/trust-combiscan-19200.html"
+:url "unsupported/trust-combiscan-19200.html"
 :interface "USB Parport"
 :usbid "0x05cb" "0x1483"
 :status :unsupported
@@ -885,21 +895,21 @@
 :url "http://irislink.com/"
 
 :model "IriScan"
-:url "/unsupported/iris-iriscan.html"
+:url "unsupported/iris-iriscan.html"
 :interface "USB"
 :usbid "0x0a53" "0x1000"
 :status :unsupported
 :comment "Unsupported. LM9832/3. See link for details."
 
 :model "IRISPen Translator Executive"
-:url "/unsupported/iris-irispen-translator.html"
+:url "unsupported/iris-irispen-translator.html"
 :interface "USB"
 :usbid "0x0f43" "0x015a"
 :status :unsupported
 :comment "Unsupported. See link for details."
 
 :model "IRISCard Pro (IBCR II)"
-:url "/unsupported/iris-business.html"
+:url "unsupported/iris-business.html"
 :interface "USB"
 :usbid "0x0a38" "0x0301"
 :status :unsupported
@@ -921,84 +931,84 @@
 :url "http://www.lexmark.com/"
 
 :model "P6250"
-:url "/unsupported/lexmark-p6250.html"
+:url "unsupported/lexmark-p6250.html"
 :interface "USB"
 :usbid "0x043d" "0x0097"
 :status :unsupported
 :comment "Unsupported. See link for details."
 
 :model "Photo 3150"
-:url "/unsupported/lexmark-3150.html"
+:url "unsupported/lexmark-3150.html"
 :interface "USB"
 :usbid "0x043d" "0x007d"
 :status :unsupported
 :comment "Unsupported. See link for details."
 
 :model "X74"
-:url "/unsupported/lexmark-x75.html"
+:url "unsupported/lexmark-x75.html"
 :interface "USB"
 :usbid "0x043d" "0x0060"
 :status :unsupported
 :comment "Unsupported. See link for details."
 
 :model "X75"
-:url "/unsupported/lexmark-x75.html"
+:url "unsupported/lexmark-x75.html"
 :interface "USB"
 :usbid "0x043d" "0x0060"
 :status :unsupported
 :comment "Unsupported. See link for details."
 
 :model "X75 PrinTrio"
-:url "/unsupported/lexmark-x75.html"
+:url "unsupported/lexmark-x75.html"
 :interface "USB"
 :usbid "0x043d" "0x0060"
 :status :unsupported
 :comment "Unsupported. See link for details."
 
 :model "X83"
-:url "/unsupported/lexmark-x83.html"
+:url "unsupported/lexmark-x83.html"
 :interface "USB"
 :usbid "0x043d" "0x003d"
 :status :unsupported
 :comment "Unsupported. GL640."
 
 :model "X2330"
-:url "/unsupported/lexmark-x2330.html"
+:url "unsupported/lexmark-x2330.html"
 :interface "USB"
 :usbid "0x043d" "0x00bb"
 :status :unsupported
 :comment "Unsupported. See link for details."
- 
+
 :model "X3450"
-:url "/unsupported/lexmark-x3450.html"
+:url "unsupported/lexmark-x3450.html"
 :interface "USB"
 :usbid "0x043d" "0x00f6"
 :status :unsupported
 :comment "Unsupported. See link for details."
- 
+
 :model "X5130"
-:url "/unsupported/lexmark-x5130.html"
+:url "unsupported/lexmark-x5130.html"
 :interface "USB"
 :usbid "0x043d" "0x0065"
 :status :unsupported
 :comment "Unsupported."
 
 :model "X5150"
-:url "/unsupported/lexmark-x5130.html"
+:url "unsupported/lexmark-x5130.html"
 :interface "USB"
 :usbid "0x043d" "0x0065"
 :status :unsupported
 :comment "Probably unsupported. See link for details."
 
 :model "X5250"
-:url "/unsupported/lexmark-x5250.html"
+:url "unsupported/lexmark-x5250.html"
 :interface "USB"
 :usbid "0x043d" "0x0093"
 :status :unsupported
 :comment "Unsupported."
 
 :model "X6170"
-:url "/unsupported/lexmark-x6170.html"
+:url "unsupported/lexmark-x6170.html"
 :interface "USB"
 :usbid "0x043d" "0x0072"
 :status :unsupported
@@ -1011,14 +1021,14 @@
 :comment "Unsupported. See bug #310889 for details."
 
 :model "X7350"
-:url "/unsupported/lexmark-x7350.html"
+:url "unsupported/lexmark-x7350.html"
 :interface "USB"
 :usbid "0x043d" "0x00b8"
 :status :unsupported
 :comment "Unsupported. See link for details."
 
 :model "X8350"
-:url "/unsupported/lexmark-x8350.html"
+:url "unsupported/lexmark-x8350.html"
 :interface "USB"
 :usbid "0x043d" "0x00b9"
 :status :unsupported
@@ -1035,7 +1045,7 @@
 :comment "Most probably unsupported."
 
 :model "PageScan USB"
-:url "/unsupported/logitech-pagescan-usb.html"
+:url "unsupported/logitech-pagescan-usb.html"
 :interface "USB"
 :usbid "0x046d" "0x040f"
 :status :unsupported
@@ -1048,42 +1058,42 @@
 :url "http://www.medion.de/"
 
 :model "MD 6190"
-:url "/unsupported/medion-md6190.html"
+:url "unsupported/medion-md6190.html"
 :interface "USB"
 :usbid "0x0461" "0x0392"
 :status :unsupported
 :comment "Probably unsupported. There seem to exist two different scanners with that name. See link for details."
 
 :model "MD 6190"
-:url "/unsupported/medion-md6190.html"
+:url "unsupported/medion-md6190.html"
 :interface "USB"
 :usbid "0x0461" "0x037b"
 :status :unsupported
 :comment "Probably unsupported. There seem to exist two different scanners with that name. See link for details."
 
 :model "MD 40420"
-:url "/unsupported/tevion-md40420.html"
+:url "unsupported/tevion-md40420.html"
 :interface "USB"
 :usbid "0x05da" "0x3008"
 :status :unsupported
 :comment "Probably unsupported. See link for details."
 
 :model "MD 41260"
-:url "/unsupported/medion-md6190.html"
+:url "unsupported/medion-md6190.html"
 :interface "USB"
 :usbid "0x0461" "0x037b"
 :status :unsupported
 :comment "Probably unsupported. See link for details."
 
 :model "MD 41985"
-:url "/unsupported/medion-md6190.html"
+:url "unsupported/medion-md6190.html"
 :interface "USB"
 :usbid "0x0461" "0x037b"
 :status :unsupported
 :comment "Probably unsupported. See link for details."
 
 :model "MD 42666"
-:url "/unsupported/tevion-md40420.html"
+:url "unsupported/tevion-md40420.html"
 :interface "USB"
 :usbid "0x05da" "0x3008"
 :status :unsupported
@@ -1097,21 +1107,21 @@
 :comment "Fingerprint sensor. See link for details."
 
 :model "MD 90009"
-:url "/unsupported/tevion-md90009.html"
+:url "unsupported/tevion-md90009.html"
 :interface "USB"
 :usbid "0x05da" "0x30e5"
 :status :unsupported
 :comment "Probably unsupported. See link for details."
 
 :model "MD 90070"
-:url "/unsupported/tevion-md90070.html"
+:url "unsupported/tevion-md90070.html"
 :interface "USB"
 :usbid "0x05da" "0x3022"
 :status :unsupported
 :comment "Unsupported. See link for details."
 
 :model "MD 90090"
-:url "/unsupported/tevion-md90070.html"
+:url "unsupported/tevion-md90070.html"
 :interface "USB"
 :usbid "0x05da" "0x3022"
 :status :unsupported
@@ -1123,28 +1133,28 @@
 :url "http://www.memorex.com/"
 
 :model "6136u"
-:url "/unsupported/memorex-maxx-6136u.html"
+:url "unsupported/memorex-maxx-6136u.html"
 :interface "USB"
 :usbid "0x0461" "0x0346"
 :status :unsupported
 :comment "Probably unsupported."
 
 :model "6142u"
-:url "/unsupported/visioneer-onetouch4400.html"
+:url "unsupported/visioneer-onetouch4400.html"
 :interface "USB"
 :usbid "0x0461" "0x0347"
 :status :unsupported
 :comment "Probably unsupported. Same as Visioneer Onetouch 4400. See link for details."
 
 :model "MaxxScan 6122"
-:url "/unsupported/trust-combiscan-19200.html"
+:url "unsupported/trust-combiscan-19200.html"
 :interface "USB Parport"
 :usbid "0x05cb" "0x1483"
 :status :unsupported
 :comment "Unsupported. See link for details."
 
 :model "SCF 9612P"
-:url "/unsupported/memorex-scf-9612p.html"
+:url "unsupported/memorex-scf-9612p.html"
 :interface "Parport"
 :status :unsupported
 :comment "Probably unsupported. See link for details."
@@ -1159,7 +1169,7 @@
 :comment "Unsupported. Same as Agfa DuoScan T2000XL?"
 
 :model "ArtixScanDI 2020"
-:url "/unsupported/microtek-artixscan-2020.html"
+:url "unsupported/microtek-artixscan-2020.html"
 :interface "USB"
 :usbid "0x05da" "0x202e"
 :status :unsupported
@@ -1176,7 +1186,7 @@
 :comment "Unsupported. Uses ALI M5611B."
 
 :model "FilmScan 35"
-:url "/unsupported/microtek-filmscan-35.html"
+:url "unsupported/microtek-filmscan-35.html"
 :interface "USB"
 :usbid "0x05e3" "0x0120"
 :status :unsupported
@@ -1188,89 +1198,89 @@
 :comment "Probably unsupported. Seems to be similar to the Microtek 330 CX and is detected by the microtek2 backend. Scanning doesn't seem to work however."
 
 :model "Scanmaker 1850S"
-:url "/unsupported/microtek-scanmaker-1850s.html"
+:url "unsupported/microtek-scanmaker-1850s.html"
 :interface "SCSI"
 :status :unsupported
 :comment "Unsupported. See link for details."
 
 :model "ScanMaker 3630"
-:url "/unsupported/microtek-scanmaker-3630.html"
+:url "unsupported/microtek-scanmaker-3630.html"
 :interface "USB"
 :usbid "0x0461" "0x0347"
 :status :unsupported
 :comment "Unsupported. Doesn't seem to be compatible to 3600 series, see link."
 
 :model "ScanMaker 3800"
-:url "/unsupported/microtek-scanmaker-3800.html"
+:url "unsupported/microtek-scanmaker-3800.html"
 :interface "USB"
 :usbid "0x05da" "0x30ce"
 :status :unsupported
 :comment "Unsupported. See link for more details."
 
 :model "ScanMaker 3830"
-:url "/unsupported/microtek-scanmaker-3830.html"
+:url "unsupported/microtek-scanmaker-3830.html"
 :interface "USB"
 :usbid "0x05da" "0x30ce"
 :status :unsupported
 :comment "Unsupported. See link for more details."
 
 :model "ScanMaker 3860"
-:url "/unsupported/microtek-scanmaker-3880.html"
+:url "unsupported/microtek-scanmaker-3880.html"
 :interface "USB"
 :usbid "0x05da" "0x3023"
 :status :unsupported
 :comment "Unsupported. See link for more details. Appears to be similar to ScanMaker 3880."
 
 :model "ScanMaker 3880"
-:url "/unsupported/microtek-scanmaker-3880.html"
+:url "unsupported/microtek-scanmaker-3880.html"
 :interface "USB"
 :usbid "0x05da" "0x3021"
 :status :unsupported
 :comment "Unsupported. SQ113 chip. See link for more details."
 
 :model "ScanMaker 4600"
-:url "/unsupported/microtek-scanmaker-4600.html"
+:url "unsupported/microtek-scanmaker-4600.html"
 :interface "USB"
 :usbid "0x05da" "0x40c7"
 :status :unsupported
 :comment "Unsupported. See link for more details."
 
 :model "ScanMaker 4700"
-:url "/unsupported/microtek-scanmaker-4700.html"
+:url "unsupported/microtek-scanmaker-4700.html"
 :interface "USB"
 :usbid "0x05da" "0x20b4"
 :status :unsupported
 :comment "Unsupported. See link for more details."
 
 :model "ScanMaker 4850"
-:url "/unsupported/microtek-scanmaker-4900.html"
+:url "unsupported/microtek-scanmaker-4900.html"
 :interface "USB"
 :usbid "0x05da" "0x30d9"
 :status :unsupported
 :comment "Probably unsupported. See link for details."
 
 :model "ScanMaker 4850 II"
-:url "/unsupported/microtek-scanmaker-4850-2.html"
+:url "unsupported/microtek-scanmaker-4850-2.html"
 :interface "USB"
 :usbid "0x05da" "0x3008"
 :status :unsupported
 :comment "Probably unsupported. See link for details."
 
 :model "ScanMaker 4900"
-:url "/unsupported/microtek-scanmaker-4900.html"
+:url "unsupported/microtek-scanmaker-4900.html"
 :interface "USB"
 :usbid "0x05da" "0x30b9"
 :status :unsupported
 :comment "Unsupported. See link for more details."
 
 :model "ScanMaker 5"
-:url "/unsupported/microtek-scanmaker-5600.html"
+:url "unsupported/microtek-scanmaker-5600.html"
 :interface "SCSI"
 :status :unsupported
 :comment "Probably unsupported. See link for more details."
 
 :model "ScanMaker 5600"
-:url "/unsupported/microtek-scanmaker-5600.html"
+:url "unsupported/microtek-scanmaker-5600.html"
 :interface "USB"
 :usbid "0x05da" "0x20a7"
 :status :unsupported
@@ -1283,49 +1293,49 @@
 :comment "Unsupported. Uses ALI M5615 like the ScanMaker 4700."
 
 :model "ScanMaker 5800"
-:url "/unsupported/microtek-scanmaker-5800.html"
+:url "unsupported/microtek-scanmaker-5800.html"
 :interface "USB"
 :usbid "0x05da" "0x3008"
 :status :unsupported
 :comment "Unsupported. See link for details."
 
 :model "ScanMaker 5800"
-:url "/unsupported/microtek-scanmaker-5800.html"
+:url "unsupported/microtek-scanmaker-5800.html"
 :interface "USB"
 :usbid "0x05da" "0x30d8"
 :status :unsupported
 :comment "Unsupported. See link for details."
 
 :model "ScanMaker 5900"
-:url "/unsupported/microtek-scanmaker-5900.html"
+:url "unsupported/microtek-scanmaker-5900.html"
 :interface "USB"
 :usbid "0x05da" "0x30d8"
 :status :unsupported
 :comment "Unsupported. See link for more details."
 
 :model "ScanMaker 5950"
-:url "/unsupported/microtek-scanmaker-5950.html"
+:url "unsupported/microtek-scanmaker-5950.html"
 :interface "USB"
 :usbid "0x05da" "0x30d8"
 :status :unsupported
 :comment "Unsupported. See link for more details."
 
 :model "ScanMaker 6000"
-:url "/unsupported/microtek-scanmaker-6000.html"
+:url "unsupported/microtek-scanmaker-6000.html"
 :interface "USB"
 :usbid "0x05da" "0x30e5"
 :status :unsupported
 :comment "Unsupported. See link for more details."
 
 :model "ScanMaker 6100"
-:url "/unsupported/microtek-scanmaker-6100.html"
+:url "unsupported/microtek-scanmaker-6100.html"
 :interface "USB"
 :usbid "0x05da" "0x30e5"
 :status :unsupported
 :comment "Unsupported. See link for more details."
 
 :model "ScanMaker 6700"
-:url "/unsupported/microtek-scanmaker-6700.html"
+:url "unsupported/microtek-scanmaker-6700.html"
 :interface "USB IEEE-1394"
 :usbid "0x05da" "0x20c9"
 :status :unsupported
@@ -1333,7 +1343,7 @@
 
 :model "ScanMaker 8700"
 :status :unsupported
-:url "/unsupported/microtek-scanmaker-8700.html"
+:url "unsupported/microtek-scanmaker-8700.html"
 :interface "USB IEEE-1394"
 :usbid "0x05da" "0x20b1"
 :comment "Unsupported. See link for details. USB vendor and product ids to be checked."
@@ -1345,35 +1355,35 @@
 :comment "Probably unsupported. SCSI seems to work with microtek2 backend."
 
 :model "ScanMaker 9800XL"
-:url "/unsupported/microtek-scanmaker-9800.html"
+:url "unsupported/microtek-scanmaker-9800.html"
 :interface "USB SCSI"
 :usbid "0x05da" "0x20de"
 :status :unsupported
 :comment "Partly unsupported. IEEE-1394 works with microtek2 backend. See link."
 
 :model "ScanMaker i320"
-:url "/unsupported/microtek-scanmaker-i320.html"
+:url "unsupported/microtek-scanmaker-i320.html"
 :interface "USB"
 :usbid "0x05da" "0x30e6"
 :status :unsupported
 :comment "Unsupported. See link."
 
 :model "ScanMaker s400"
-:url "/unsupported/microtek-scanmaker-s400.html"
+:url "unsupported/microtek-scanmaker-s400.html"
 :interface "USB"
 :usbid "0x05da" "0x201c"
 :status :unsupported
 :comment "Unsupported. See link."
 
 :model "ScanMaker S400"
-:url "/unsupported/microtek-scanmaker-s400.html"
+:url "unsupported/microtek-scanmaker-s400.html"
 :interface "USB"
 :usbid "0x05da" "0x300b"
 :status :unsupported
 :comment "Unsupported. See link."
 
 :model "ScanPort 3000"
-:url "/unsupported/microtek-scanport-3000.html"
+:url "unsupported/microtek-scanport-3000.html"
 :interface "USB"
 :usbid "0x04a7" "0x0224"
 :status :unsupported
@@ -1386,35 +1396,35 @@
 :url "http://www.konicaminolta.com/"
 
 :model "Dual Scan III"
-:url "/unsupported/minolta-dual-scan-III.html"
+:url "unsupported/minolta-dual-scan-III.html"
 :interface "USB"
 :usbid "0x0686" "0x400d"
 :status :unsupported
 :comment "Unsupported. May work with vuescan. See link for details."
 
 :model "Dual Scan IV"
-:url "/unsupported/minolta-dual-scan-IV.html"
+:url "unsupported/minolta-dual-scan-IV.html"
 :interface "USB"
 :usbid "0x132b" "0x000a"
 :status :unsupported
 :comment "Unsupported. Works with vuescan. See link for details."
 
 :model "DiMAGE Scan Elite 5400"
-:url "/unsupported/minolta-dse-5400.html"
+:url "unsupported/minolta-dse-5400.html"
 :interface "USB IEEE-1394"
 :usbid "0x0686" "0x400e"
 :status :unsupported
 :comment "Probably unsupported. May work with vuescan. See link for details."
 
 :model "DiMAGE Scan Elite 5400 2"
-:url "/unsupported/minolta-dse-5400-2.html"
+:url "unsupported/minolta-dse-5400-2.html"
 :interface "USB"
 :usbid "0x132b" "0x0012"
 :status :unsupported
 :comment "Probably unsupported. See link for details."
 
 :model "DiMAGE Scan Multi Pro"
-:url "/unsupported/minolta-dimage-scan-multi-pro.html"
+:url "unsupported/minolta-dimage-scan-multi-pro.html"
 :interface "IEEE-1394"
 :status :unsupported
 :comment "Probably unsupported. See link for details."
@@ -1450,21 +1460,21 @@
 :status :unsupported
 
 :model "BearPaw 2448 CU Pro"
-:url "/unsupported/mustek-bearpaw-2448-cu-pro.html"
+:url "unsupported/mustek-bearpaw-2448-cu-pro.html"
 :usbid "0x055f" "0x0408"
 :interface "USB"
 :comment "Not supported. May be supported by mustek_usb2 backend later. See link for some information."
 :status :unsupported
 
 :model "BearPaw 4800 TA Pro"
-:url "/unsupported/mustek-bearpaw-4800ta-pro.html"
+:url "unsupported/mustek-bearpaw-4800ta-pro.html"
 :interface "USB"
 :usbid "0x055f" "0x1000"
 :comment "Not supported. See link for some information."
 :status :unsupported
 
 :model "BearPaw 4800 TA Pro II"
-:url "/unsupported/mustek-bearpaw-4800ta-pro-ii.html"
+:url "unsupported/mustek-bearpaw-4800ta-pro-ii.html"
 :interface "USB"
 :usbid "0x055f" "0x040a"
 :comment "Not supported.  May be supported by mustek_usb2 backend later. See link for some information."
@@ -1521,7 +1531,7 @@
 :comment "Probably unsupported. USB business card scanner. Maybe works as USB storage device?"
 
 :model "ScanMagic 9636P"
-:url "http://lists.alioth.debian.org/pipermail/sane-devel/2003-May/007682.html"
+:url "http://alioth-lists.debian.net/pipermail/sane-devel/2003-May/007682.html"
 :interface "Parport"
 :status :unsupported
 :comment "Probably not supported. Same as Mustek 12000 P?. ASIC 1505."
@@ -1532,7 +1542,7 @@
 :url "http://www.nevt.co.jp/"
 
 :model "Petiscan"
-:url "/unsupported/nec-petiscan.html"
+:url "unsupported/nec-petiscan.html"
 :interface "USB"
 :usbid "0x0475" "0x0100"
 :status :unsupported
@@ -1544,7 +1554,7 @@
 :url "http://www.nikon.com/"
 
 :model "LS-9000 ED"
-:url "/unsupported/nikon-ls9000-ed.html"
+:url "unsupported/nikon-ls9000-ed.html"
 :interface "IEEE-1394"
 :status :unsupported
 :comment "Probably not supported. See link for details. Possibly similar to LS-8000 ED."
@@ -1555,7 +1565,7 @@
 :url "http://www.olivetti.com"
 
 :model "Job-Jet M400"
-:url "/unsupported/olivetti-job-jet-m400.html"
+:url "unsupported/olivetti-job-jet-m400.html"
 :interface "USB"
 :usbid "0x0b3c" "0xa880"
 :status :unsupported
@@ -1566,12 +1576,12 @@
 :url "http://www.olympus.com"
 
 :model "ES-10P"
-:url "http://lists.alioth.debian.org/pipermail/sane-devel/2008-December/023326.html"
+:url "http://alioth-lists.debian.net/pipermail/sane-devel/2008-December/023326.html"
 :interface "Parport"
 :status :unsupported
 
 :model "ES-10S"
-:url "/unsupported/olympus-es10s.html"
+:url "unsupported/olympus-es10s.html"
 :interface "SCSI"
 :status :unsupported
 :comment "Probably not supported. See link for details."
@@ -1696,7 +1706,7 @@
 :mfg "Pentax"
 
 :model "DSmobile USB"
-:url "/unsupported/syscan-travelscan-pro.html"
+:url "unsupported/syscan-travelscan-pro.html"
 :interface "USB"
 :usbid "0x0a82" "0x2000"
 :status :unsupported
@@ -1709,7 +1719,7 @@
 :comment "Pacific Image Electronics"
 
 :model "Primefilm 1800u"
-:url "/unsupported/pie-1800u.html"
+:url "unsupported/pie-1800u.html"
 :interface "USB"
 :usbid "0x05e3" "0x0120"
 :status :unsupported
@@ -1718,7 +1728,7 @@
 :model "Primefilm 2700"
 :interface "USB"
 :status :unsupported
-:url "http://lists.alioth.debian.org/pipermail/sane-devel/2009-January/023442.html"
+:url "http://alioth-lists.debian.net/pipermail/sane-devel/2009-January/023442.html"
 
 :model "Primefilm 3600PRO"
 :interface "USB IEEE-1394"
@@ -1726,14 +1736,14 @@
 :comment "Probably not supported. "
 
 :model "Powerslide 3600"
-:url "/unsupported/reflecta-digitdia-3600.html"
+:url "unsupported/reflecta-digitdia-3600.html"
 :interface "USB IEEE-1394"
 :usbid "0x05e3" "0x0142"
 :status :unsupported
 :comment "Probably unsupported. Film scanner that can scan directly from the magazine."
 
 :model "PF3650 Pro3 Film Scanner"
-:url "/unsupported/pie-pf3650.html"
+:url "unsupported/pie-pf3650.html"
 :interface "USB IEEE-1394"
 :usbid "0x05e3" "0x0143"
 :status :unsupported
@@ -1750,7 +1760,7 @@
 :url "http://www.plustek.com/"
 
 :model "OpticFilm 7200"
-:url "/unsupported/plustek-opticfilm-7200.html"
+:url "unsupported/plustek-opticfilm-7200.html"
 :interface "USB"
 :usbid "0x07b3" "0x0807"
 :status :unsupported
@@ -1773,21 +1783,21 @@
 :comment "Uses RealTek chipset (RTL8801D)"
 
 :model "OpticPro S12"
-:url "/unsupported/plustek-opticpro-st12.html"
+:url "unsupported/plustek-opticpro-st12.html"
 :interface "USB"
 :usbid "0x07b3" "0x0600"
 :status :unsupported
 :comment "Product id 0x0600 is unsupported but may be supported by the genesys backend in future. Product id 0x040b is supported by the gt68xx backend."
 
 :model "OpticPro ST12"
-:url "/unsupported/plustek-opticpro-st12.html"
+:url "unsupported/plustek-opticpro-st12.html"
 :interface "USB"
 :usbid "0x07b3" "0x0600"
 :status :unsupported
 :comment "Product id 0x0600 is unsupported but may be supported by the genesys backend in future. Product id 0x040b is supported by the gt68xx backend."
 
 :model "OpticPro ST16"
-:url "/unsupported/plustek-opticpro-st16.html"
+:url "unsupported/plustek-opticpro-st16.html"
 :interface "USB"
 :usbid "0x07b3" "0x0600"
 :status :unsupported
@@ -1799,14 +1809,14 @@
 :comment "Probably LM983x based."
 
 :model "OpticPro S24"
-:url "/unsupported/plustek-opticpro-st24.html"
+:url "unsupported/plustek-opticpro-st24.html"
 :interface "USB"
 :usbid "0x07b3" "0x0601"
 :status :unsupported
 :comment "Product id 0x0601 is unsupported but may be supported by the genesys backend in future /GL646). Product id 0x040e is supported by the gt68xx backend."
 
 :model "OpticPro ST24"
-:url "/unsupported/plustek-opticpro-st24.html"
+:url "unsupported/plustek-opticpro-st24.html"
 :interface "USB"
 :usbid "0x07b3" "0x0601"
 :status :unsupported
@@ -1814,83 +1824,83 @@
 
 :model "OpticPro S28"
 :interface "USB"
-:url "/unsupported/plustek-opticpro-s28.html"
+:url "unsupported/plustek-opticpro-s28.html"
 :usbid "0x07b3" "0x0801"
 :status :unsupported
 :comment "GL841 based, to be added to genesys backend"
 
 :model "OpticPro ST28"
-:url "/unsupported/plustek-opticpro-s28.html"
+:url "unsupported/plustek-opticpro-s28.html"
 :interface "USB"
 :usbid "0x07b3" "0x0801"
 :status :unsupported
 :comment "GL841 based, to be added to genesys backend"
 
 :model "OpticPro ST28"
-:url "/unsupported/plustek-opticpro-st28.html"
+:url "unsupported/plustek-opticpro-st28.html"
 :interface "USB"
 :usbid "0x07b3" "0x0802"
 :status :unsupported
 :comment "GL841 based, to be added to genesys backend"
 
 :model "Umax AstraScan 4750"
-:url "/unsupported/umax-astrscan-4750.html"
+:url "unsupported/umax-astrscan-4750.html"
 :interface "USB"
 :usbid "0x07b3" "0x0802"
 :status :unsupported
 :comment "GL841 based, to be added to genesys backend, rebadged Plustek ST28"
 
 :model "OpticPro ST48"
-:url "/unsupported/plustek-opticpro-st48.html"
+:url "unsupported/plustek-opticpro-st48.html"
 :interface "USB"
 :usbid "0x07b3" "0x0800"
 :status :unsupported
 :comment "GL841 based, to be added to genesys backend"
 
 :model "OpticPro ST64"
-:url "/unsupported/plustek-opticpro-st64.html"
+:url "unsupported/plustek-opticpro-st64.html"
 :interface "USB"
 :usbid "0x07b3" "0x0c00"
 :status :unsupported
 :comment "GL843 based, maybe to be added to genesys backend"
 
 :model "OpticPro ST64+"
-:url "/unsupported/plustek-opticpro-st64plus.html"
+:url "unsupported/plustek-opticpro-st64plus.html"
 :interface "USB"
 :usbid "0x07b3" "0x0c03"
 :status :unsupported
 :comment "GL843 based. See link for more details."
 
 :model "PL 806"
-:url "/unsupported/plustek-pl806.html"
+:url "unsupported/plustek-pl806.html"
 :interface "USB"
 :usbid "0x07b3" "0x0c0c"
 :status :unsupported
 :comment "Unsupported. See link for more details."
 
 :model "SmartOffice PL 812"
-:url "/unsupported/plustek-pl812.html"
+:url "unsupported/plustek-pl812.html"
 :interface "USB"
 :usbid "0x07b3" "0x0c0d"
 :status :unsupported
 :comment "Unsupported. See link for more details."
 
 :model "OpticSlim 500"
-:url "/unsupported/plustek-opticslim-500.html"
+:url "unsupported/plustek-opticslim-500.html"
 :interface "USB"
 :usbid "0x07b3" "0x0458"
 :status :unsupported
 :comment "Unsupported. See link for more details."
 
 :model "OpticSlim 2420"
-:url "/unsupported/plustek-opticslim-2420.html"
+:url "unsupported/plustek-opticslim-2420.html"
 :interface "USB"
 :usbid "0x07b3" "0x0806"
 :status :unsupported
 :comment "GL841 based, to be added to genesys backend"
 
 :model "OpticSlim 2420+"
-:url "/unsupported/plustek-opticslim-2420plus.html"
+:url "unsupported/plustek-opticslim-2420plus.html"
 :interface "USB"
 :usbid "0x07b3" "0x0914"
 :status :unsupported
@@ -1907,7 +1917,7 @@
 :comment "Business card reader. No further information available."
 
 :model "ScanCopy 115"
-:url "/unsupported/plustek-scancopy-115.html"
+:url "unsupported/plustek-scancopy-115.html"
 :interface "USB"
 :usbid "0x07b3" "0x081c"
 :status :unsupported
@@ -1966,7 +1976,7 @@
 :comment "Probably not supported. No details known."
 
 :model "DocuPen R700"
-:url "/unsupported/planon-docupen-r700.html"
+:url "unsupported/planon-docupen-r700.html"
 :interface "USB"
 :usbid "0x10c4" "0xea60"
 :status :unsupported
@@ -1983,7 +1993,7 @@
 :url "http://www.primax.nl/"
 
 :model "Colorado 600U"
-:url "/unsupported/primax-colorado-600u.html"
+:url "unsupported/primax-colorado-600u.html"
 :interface "USB"
 :usbid "0x0461" "0x0341"
 :status :unsupported
@@ -2002,7 +2012,7 @@
 :comment "Probably unsupported. No details known."
 
 :model "Primascan Colorado 2600u"
-:url "/unsupported/visioneer-onetouch4400.html"
+:url "unsupported/visioneer-onetouch4400.html"
 :interface "USB"
 :usbid "0x0461" "0x0347"
 :status :unsupported
@@ -2021,7 +2031,7 @@
 :comment "Not supported. However, a stand-alone program is available."
 
 :model "Colorado USB 9600"
-:url "/unsupported/primax-colorado-usb-9600.html"
+:url "unsupported/primax-colorado-usb-9600.html"
 :interface "USB"
 :usbid "0x0461" "0x0340"
 :status :unsupported
@@ -2086,7 +2096,7 @@
 :comment "Maybe GL646. Maybe similar to Medion MD 6228?"
 
 :model "Onetouch 8920"
-:url "/unsupported/visioneer-onetouch8920.html"
+:url "unsupported/visioneer-onetouch8920.html"
 :interface "USB"
 :usbid "0x0461" "0x0371"
 :status :unsupported
@@ -2098,7 +2108,7 @@
 :url "http://www.fida.com/"
 
 :model "Winscan Pro 2448U"
-:url "/unsupported/prolink-2448u.html"
+:url "unsupported/prolink-2448u.html"
 :interface "USB"
 :usbid "0x06dc" "0x0014"
 :status :unsupported
@@ -2129,21 +2139,21 @@
 :mfg "Reflecta"
 
 :model "DigitDia 3600"
-:url "/unsupported/reflecta-digitdia-3600.html"
+:url "unsupported/reflecta-digitdia-3600.html"
 :interface "USB IEEE-1394"
 :usbid "0x05e3" "0x0142"
 :status :unsupported
 :comment "Film scanner that can scan directly from the magazine."
 
 :model "iScan 1800"
-:url "/unsupported/reflecta-iscan-1800.html"
+:url "unsupported/reflecta-iscan-1800.html"
 :interface "USB"
 :usbid "0x05e3" "0x0120"
 :status :unsupported
 :comment "Probably unsupported. See link for details."
 
 :model "ProScan 4000"
-:url "/unsupported/reflecta-proscan-4000.html"
+:url "unsupported/reflecta-proscan-4000.html"
 :interface "USB IEEE-1394"
 :usbid "0x05e3" "0x0143"
 :status :unsupported
@@ -2154,21 +2164,21 @@
 :mfg "Relisys"
 
 :model "Eclipse 1200U"
-:url "/unsupported/relisys-eclipse-1200u.html"
+:url "unsupported/relisys-eclipse-1200u.html"
 :interface "USB"
 :usbid "0x0475" "0x0103"
 :status :unsupported
 :comment "Probably unsupported. See link for details."
 
 :model "Scorpio Ultra 3"
-:url "/unsupported/relisys-scorpio-ultra3.html"
+:url "unsupported/relisys-scorpio-ultra3.html"
 :interface "USB"
 :usbid "0x0475" "0x0210"
 :status :unsupported
 :comment "Probably unsupported. See link for details."
 
 :model "Episode"
-:url "/unsupported/relisys-episode.html"
+:url "unsupported/relisys-episode.html"
 :interface "USB"
 :usbid "0x0475" "0x0103"
 :status :unsupported
@@ -2184,7 +2194,7 @@
 :mfg "Samsung"
 
 :model "SCX-4725FN"
-:url "/unsupported/samsung-scx-4725.html"
+:url "unsupported/samsung-scx-4725.html"
 :interface "USB"
 :usbid "0x04e8" "0x341f"
 :status :unsupported
@@ -2195,7 +2205,7 @@
 :mfg "Scanshell"
 
 :model "800N"
-:url "/unsupported/scanshell-800n.html"
+:url "unsupported/scanshell-800n.html"
 :interface "USB"
 :usbid "0x0a82" "0x6605"
 :status :unsupported
@@ -2265,14 +2275,14 @@
 :mfg "Syscan"
 
 :model "TravelScan FS-531"
-:url "/unsupported/syscan-travelscan-fs531.html"
+:url "unsupported/syscan-travelscan-fs531.html"
 :interface "USB"
 :usbid "0x0a82" "0x0530"
 :status :unsupported
 :comment "Not supported. May work with the Plustek backend in future. See link for details."
 
 :model "TravelScan Pro"
-:url "/unsupported/syscan-travelscan-pro.html"
+:url "unsupported/syscan-travelscan-pro.html"
 :interface "USB"
 :usbid "0x0a82" "0x2000"
 :status :unsupported
@@ -2295,7 +2305,7 @@
 :comment "Unsupported at the moment. See link for a project for that scanner."
 
 :model "Artiscan 2400FS"
-:url "/unsupported/tamarack-artiscan-2400.html"
+:url "unsupported/tamarack-artiscan-2400.html"
 :interface "USB"
 :usbid "0x05e3" "0x0100"
 :status :unsupported
@@ -2308,7 +2318,7 @@
 :url "http://www.tce.com.br/"
 
 :model "MK600U"
-:url "/unsupported/memorex-maxx-6136u.html"
+:url "unsupported/memorex-maxx-6136u.html"
 :interface "USB"
 :usbid "0x0461" "0x0346"
 :status :unsupported
@@ -2326,7 +2336,7 @@
 :url "http://www.tecoimage.com.tw/"
 
 :model "VM6509F"
-:url "/unsupported/teco-vm6509.html"
+:url "unsupported/teco-vm6509.html"
 :interface "USB"
 :usbid "0x080d" "0x0102"
 :status :unsupported
@@ -2337,7 +2347,7 @@
 :mfg "Tiny"
 
 :model "FU661E"
-:url "/unsupported/visioneer-onetouch4400.html"
+:url "unsupported/visioneer-onetouch4400.html"
 :interface "USB"
 :usbid "0x0461" "0x0347"
 :status :unsupported
@@ -2349,19 +2359,19 @@
 :url "http://www.trust-site.com"
 
 :model "CombiScan 19200"
-:url "/unsupported/trust-combiscan-19200.html"
+:url "unsupported/trust-combiscan-19200.html"
 :interface "Parport USB"
 :usbid "0x05cb" "0x1483"
 :status :unsupported
 :comment "Unsupported. See link for details."
 
 :model "EasyScan 19200"
-:url "http://lists.alioth.debian.org/pipermail/sane-devel/2008-October/022955.html"
+:url "http://alioth-lists.debian.net/pipermail/sane-devel/2008-October/022955.html"
 :interface "Parport"
 :status :unsupported
 
 :model "SCSI Scan 19200 -Excellence Series-"
-:url "/unsupported/trust-scsi-scan-19200.html"
+:url "unsupported/trust-scsi-scan-19200.html"
 :interface "SCSI"
 :status :unsupported
 :comment "Unsupported. See link for details."
@@ -2372,49 +2382,49 @@
 :url "http://www.umax.com/"
 
 :model "Astra 2500"
-:url "/unsupported/umax-astra-2500.html"
+:url "unsupported/umax-astra-2500.html"
 :interface "USB"
 :usbid "0x0461" "0x0374"
 :status :unsupported
 :comment "Probably not supported. See link for details."
 
 :model "Astra 2850"
-:url "/unsupported/plustek-opticpro-st24.html"
+:url "unsupported/plustek-opticpro-st24.html"
 :interface "USB"
 :usbid "0x07b3" "0x0601"
 :status :unsupported
 :comment "Probably not supported. Same IDs as Plustek OpticPro ST24. See link for details."
 
 :model "Astra 3000"
-:url "/unsupported/umax-astra-3000.html"
+:url "unsupported/umax-astra-3000.html"
 :interface "USB"
 :usbid "0x0461" "0x038a"
 :status :unsupported
 :comment "Probably not supported. See link for details."
 
 :model "Astra 3600"
-:url "/unsupported/umax-astra-3600.html"
+:url "unsupported/umax-astra-3600.html"
 :interface "USB"
 :usbid "0x0461" "0x038a"
 :status :unsupported
 :comment "Probably not supported. See link for details."
 
 :model "Astra 4000"
-:url "/unsupported/umax-astra-4000.html"
+:url "unsupported/umax-astra-4000.html"
 :interface "USB"
 :usbid "0x1606" "0x1030"
 :status :unsupported
 :comment "Not supported. See link for details."
 
 :model "Astra 4100"
-:url "/unsupported/umax-astra-4100.html"
+:url "unsupported/umax-astra-4100.html"
 :interface "USB"
 :usbid "0x0461" "0x038c"
 :status :unsupported
 :comment "Not supported, to be added to genesys backend."
 
 :model "Astra 4500"
-:url "/unsupported/umax-astra-4500.html"
+:url "unsupported/umax-astra-4500.html"
 :interface "USB"
 :usbid "0x0638" "0x0a10"
 :status :unsupported
@@ -2426,7 +2436,7 @@
 :comment "Probably not supported, no details known."
 
 :model "Astra 4700"
-:url "/unsupported/umax-astra-4700.html"
+:url "unsupported/umax-astra-4700.html"
 :interface "USB"
 :usbid "0x0638" "0x0a20"
 :status :unsupported
@@ -2439,21 +2449,21 @@
 :comment "Not supported. No chipset information available. Same as Avision iVina FB2400."
 
 :model "AstraSlim"
-:url "/unsupported/umax-astraslim.html"
+:url "unsupported/umax-astraslim.html"
 :usbid "0x080d" "0x0104"
 :interface "USB"
 :status :unsupported
 :comment "Probably not supported currently. See link for more details."
 
 :model "AstraSlim 1200"
-:url "/unsupported/umax-astraslim-1200.html"
+:url "unsupported/umax-astraslim-1200.html"
 :interface "USB"
 :usbid "0x080d" "0x0110"
 :status :unsupported
 :comment "See link for more details."
 
 :model "AstraSlim 6000"
-:url "/unsupported/umax-astraslim-6000.html"
+:url "unsupported/umax-astraslim-6000.html"
 :interface "USB"
 :usbid "0x080d" "0x0104"
 :status :unsupported
@@ -2465,7 +2475,7 @@
 :comment "Probably not supported. No details known.."
 
 :model "Powerlook 180"
-:url "/unsupported/umax-powerlook-180.html"
+:url "unsupported/umax-powerlook-180.html"
 :interface "USB"
 ;:usbid "0x3902" "0xc470" #correct?
 :status :unsupported
@@ -2481,7 +2491,7 @@
 :mfg "Vantas"
 
 :model "3000"
-:url "/unsupported/visioneer-onetouch4800.html"
+:url "unsupported/visioneer-onetouch4800.html"
 :interface "USB"
 :usbid "0x04a7" "0x0224"
 :status :unsupported
@@ -2505,35 +2515,35 @@
 :comment "Not supported. Id is from Primax? Yet another scanner with the same name?"
 
 :model "9420"
-:url "/unsupported/visioneer-9420.html"
+:url "unsupported/visioneer-9420.html"
 :interface "USB"
 :usbid "0x0461" "0x03a8"
 :status :unsupported
 :comment "Unsupported. See link for details."
 
 :model "9450 USB"
-:url "/unsupported/visioneer-9450-usb.html"
+:url "unsupported/visioneer-9450-usb.html"
 :interface "USB"
 :usbid "0x04a7" "0x0421"
 :status :unsupported
 :comment "Unsupported. See link for details."
 
 :model "Onetouch 4400"
-:url "/unsupported/visioneer-onetouch4400.html"
+:url "unsupported/visioneer-onetouch4400.html"
 :interface "USB"
 :usbid "0x0461" "0x0347"
 :status :unsupported
 :comment "Not supported. E5 chipset? See link for more details."
 
 :model "OneTouch 4800 USB"
-:url "/unsupported/visioneer-onetouch4800.html"
+:url "unsupported/visioneer-onetouch4800.html"
 :interface "USB"
 :usbid "0x04a7" "0x0224"
 :status :unsupported
 :comment "Unsupported. Seems to use Realtek RTS8801B. Same as Microtek Scanport 3000. See link for details."
 
 :model "OneTouch 5300 USB"
-:url "/unsupported/visioneer-onetouch5300.html"
+:url "unsupported/visioneer-onetouch5300.html"
 :interface "USB"
 :usbid "0x04a7" "0x0226"
 :status :unsupported
@@ -2546,98 +2556,98 @@
 :comment "Not supported. Yet another scanner with this name?"
 
 :model "OneTouch 5800 USB"
-:url "/unsupported/visioneer-onetouch5800.html"
+:url "unsupported/visioneer-onetouch5800.html"
 :interface "USB"
 :usbid  "0x04a7" "0x0226"
 :status :unsupported
 :comment "Unsupported. 48 bit scanner, doesn't work with viceo backend. RTS8801C."
 
 :model "OneTouch 6600"
-:url "/unsupported/visioneer-onetouch6600.html"
+:url "unsupported/visioneer-onetouch6600.html"
 :interface "USB"
 :usbid  "0x04a7" "0x022a"
 :status :unsupported
 :comment "Unsupported. See link for details."
 
 :model "Onetouch 7100"
-:url "/unsupported/visioneer-onetouch7100.html"
+:url "unsupported/visioneer-onetouch7100.html"
 :interface "USB"
 :usbid  "0x04a7" "0x0229"
 :status :unsupported
 :comment "GL646 based, to be added to genesys backend"
 
 :model "Onetouch 7700"
-:url "/unsupported/visioneer-onetouch7700.html"
+:url "unsupported/visioneer-onetouch7700.html"
 :interface "USB"
 :usbid  "0x04a7" "0x0380"
 :status :unsupported
 :comment "LM9832/3 based, to be added to plustek backend"
 
 :model "OneTouch 8100"
-:url "/unsupported/visioneer-onetouch8100.html"
+:url "unsupported/visioneer-onetouch8100.html"
 :interface "USB"
 :usbid  "0x04a7" "0x0321"
 :status :unsupported
 :comment "Unsupported. See link for details."
 
 :model "Onetouch 8700"
-:url "/unsupported/visioneer-onetouch8920.html"
+:url "unsupported/visioneer-onetouch8920.html"
 :interface "USB"
 :usbid  "0x04a7" "0x0371"
 :status :unsupported
 :comment "Not supported. See link for details."
 
 :model "Onetouch 8900"
-:url "/unsupported/visioneer-onetouch8920.html"
+:url "unsupported/visioneer-onetouch8920.html"
 :interface "USB"
 :usbid  "0x04a7" "0x0371"
 :status :unsupported
 :comment "Not supported. Same as 8920 but without TA?"
 
 :model "Onetouch 8920"
-:url "/unsupported/visioneer-onetouch8920.html"
+:url "unsupported/visioneer-onetouch8920.html"
 :interface "USB"
 :usbid  "0x04a7" "0x0371"
 :status :unsupported
 :comment "Not supported. Same as 8700 and 8900 but includes a TA. Uses a Primax ID. Chipset is RTS8801C. See link for output of /proc/bus/usb/devices."
 
 :model "Onetouch 9000"
-:url "/unsupported/visioneer-onetouch9020.html"
+:url "unsupported/visioneer-onetouch9020.html"
 :interface "USB"
 :usbid  "0x04a7" "0x022c"
 :status :unsupported
 :comment "Not supported. See link for details."
 
 :model "Onetouch 9020"
-:url "/unsupported/visioneer-onetouch9020.html"
+:url "unsupported/visioneer-onetouch9020.html"
 :interface "USB"
 :usbid  "0x04a7" "0x022c"
 :status :unsupported
 :comment "Not supported. See link for details."
 
 :model "Onetouch 9320"
-:url "/unsupported/visioneer-onetouch9320.html"
+:url "unsupported/visioneer-onetouch9320.html"
 :interface "USB"
 :usbid  "0x04a7" "0x0362"
 :status :unsupported
 :comment "Probably not supported. See link for details."
 
 :model "Onetouch Pro 8800"
-:url "/unsupported/visioneer-onetouch8820.html"
+:url "unsupported/visioneer-onetouch8820.html"
 :interface "USB"
 :usbid  "0x04a7" "0x0410"
 :status :unsupported
 :comment "Probably not supported. See link for details."
 
 :model "Onetouch Pro 8820"
-:url "/unsupported/visioneer-onetouch8820.html"
+:url "unsupported/visioneer-onetouch8820.html"
 :interface "USB"
 :usbid  "0x04a7" "0x0410"
 :status :unsupported
 :comment "Probably not supported. See link for details."
 
 :model "PaperPort 3100b"
-:url "/unsupported/visioneer-paperport-3100b.html"
+:url "unsupported/visioneer-paperport-3100b.html"
 :interface "Parport"
 :status :unsupported
 :comment "Most probably not supported. See link for details."
@@ -2648,13 +2658,13 @@
 :comment "Most probably not supported. More details would be appreciated."
 
 :model "PaperPort OneTouch"
-:url "/unsupported/visioneer-paperport-onetouch.html"
+:url "unsupported/visioneer-paperport-onetouch.html"
 :interface "Parport"
 :status :unsupported
 :comment "Most probably not supported. See link for details."
 
 :model "Strobe Pro USB"
-:url "/unsupported/visioneer-strobe-pro-usb.html"
+:url "unsupported/visioneer-strobe-pro-usb.html"
 :interface "USB"
 :usbid  "0x04a7" "0x0102"
 :status :unsupported
@@ -2663,82 +2673,82 @@
 ;********************************************************************************************
 
 :model "4800 One Touch"
-:url "/unsupported/xerox-4800-onetouch.html"
+:url "unsupported/xerox-4800-onetouch.html"
 :interface "USB"
 :usbid "0x04a7" "0x03a0"
 :status :unsupported
 :comment "Unsupported. See link for details. Different id compared to One Touch 4800?"
 
 :model "DocuImage 620S"
-:url "/unsupported/xerox-docuimage-620s.html"
+:url "unsupported/xerox-docuimage-620s.html"
 :interface "SCSI"
 :status :unsupported
 :comment "Not supported. See link for more details."
 
 :model "DocuMate 510"
-:url "/unsupported/xerox-documate-510.html"
+:url "unsupported/xerox-documate-510.html"
 :interface "USB"
 :status :unsupported
 :usbid "0x04a7" "0x0446"
 :comment "Not supported. See link for more details."
 
 :model "DocuMate 510"
-:url "/unsupported/xerox-documate-510.html"
+:url "unsupported/xerox-documate-510.html"
 :interface "USB"
 :status :unsupported
 :usbid "0x04a7" "0x047c"
 :comment "Not supported. See link for more details. Yet another USB id."
 
 :model "One Touch 4800"
-:url "/unsupported/visioneer-onetouch4800.html"
+:url "unsupported/visioneer-onetouch4800.html"
 :interface "USB"
 :usbid "0x04a7" "0x0224"
 :status :unsupported
 :comment "Unsupported. See link for details. Different id compared to 4800 One Touch?"
 
 :model "WorkCentre 470cx"
-:url "/unsupported/xerox-workcentre-470cx.html"
+:url "unsupported/xerox-workcentre-470cx.html"
 :interface "Parport"
 :status :unsupported
 :comment "Not supported. See link for more details."
 
 :model "WorkCentre M15i"
-:url "/unsupported/xerox-workcentre-m15i.html"
+:url "unsupported/xerox-workcentre-m15i.html"
 :interface "USB"
 :usbid "0x0924" "0xffef"
 :status :unsupported
 :comment "Not supported. See link for more details."
 
 :model "WorkCentre XK35c"
-:url "/unsupported/xerox-workcentre-xk35c.html"
+:url "unsupported/xerox-workcentre-xk35c.html"
 :interface "USB Parport"
 :usbid "0x043d" "0x0020"
 :status :unsupported
 :comment "Not supported. See link for more details."
 
 :model "WorkCentre XK50cx"
-:url "/unsupported/xerox-workcentre-xk50cx.html"
+:url "unsupported/xerox-workcentre-xk50cx.html"
 :interface "USB"
 :usbid "0x04e8" "0x3903"
 :status :unsupported
 :comment "Not supported. See link for more details."
 
 :model "WorkCentre Pro 412"
-:url "/unsupported/xerox-workcentre-pro412.html"
+:url "unsupported/xerox-workcentre-pro412.html"
 :interface "USB Parport"
 :usbid "0x043d" "0x4303"
 :status :unsupported
 :comment "Not supported. See link for more details."
 
 :model "WorkCentre PE16"
-:url "/unsupported/xerox-workcentre-pe16.html"
+:url "unsupported/xerox-workcentre-pe16.html"
 :interface "USB Parport"
 :usbid "0x0924" "0x4220"
 :status :unsupported
 :comment "Not supported. See link for more details."
 
 :model "WorkCentre PE120i"
-:url "/unsupported/xerox-workcentre-pe120i.html"
+:url "unsupported/xerox-workcentre-pe120i.html"
 :interface "USB"
 :usbid "0x0924" "0x4237"
 :status :unsupported
@@ -2754,7 +2764,7 @@
 :mfg "Biolux"
 
 :model "654 (micrOcular)"
-:url "/unsupported/biolux-654.html"
+:url "unsupported/biolux-654.html"
 :interface "USB"
 :usbid "0x0923" "0x010f"
 :status :unsupported
@@ -2766,7 +2776,7 @@
 :mfg "Grandtek Scopecam"
 
 :model "8x30 Binocular & Digital Camera"
-:url "/unsupported/grandtech-scopecam.html"
+:url "unsupported/grandtech-scopecam.html"
 :interface "USB"
 :usbid "0x0797" "0x801c"
 :status :unsupported
@@ -2778,4 +2788,3 @@
 
 ; :comment and :url specifiers are optional after :mfg, :model, :desc,
 ;  and at the top-level.
- 
diff --git a/doc/descriptions/xerox_mfp.desc b/doc/descriptions/xerox_mfp.desc
index dd9d283..46c2867 100644
--- a/doc/descriptions/xerox_mfp.desc
+++ b/doc/descriptions/xerox_mfp.desc
@@ -6,17 +6,18 @@
 :mfg "Xerox"
 :url "http://www.office.xerox.com/"
 
-:model "Phaser 6110MFP"
-:interface "USB"
-:usbid "0x0924" "0x3d5d"
-:status :good
-
 :model "Phaser 3200MFP"
 :interface "USB"
 :usbid "0x0924" "0x3da4"
+:comment "All these models are turned out to be rebranded Samsungs."
 :status :complete
 :url "http://www.office.xerox.com/multifunction-printer/multifunction-under-30ppm/phaser-3200mfp/spec-enus.html"
 
+:model "Phaser 6110MFP"
+:interface "USB"
+:usbid "0x0924" "0x3d5d"
+:status :good
+
 :model "WorkCentre 3119 Series"
 :interface "USB"
 :usbid "0x0924" "0x4265"
@@ -86,7 +87,7 @@
 :model "SCX-4x16"
 :interface "USB"
 :usbid "0x04e8" "0x3409"
-:status :untested
+:status :unsupported
 
 :model "SCX-6x20"
 :interface "USB"
@@ -279,7 +280,7 @@
 :status :untested
 
 :model "SCX-4623FW"
-:interface "USB"
+:interface "USB Ethernet"
 :usbid "0x04e8" "0x3440"
 :status :good
 
@@ -382,6 +383,16 @@
 :usbid "0x04e8" "0x3468"
 :status :untested
 
+:model "M2070"
+:interface "USB"
+:usbid "0x04e8" "0x3469"
+:status :good
+
+:model "C1860FW"
+:interface "USB"
+:usbid "0x04e8" "0x346b"
+:status :untested
+
 :model "M458x Series"
 :interface "USB"
 :usbid "0x04e8" "0x346f"
@@ -402,6 +413,11 @@
 :usbid "0x04e8" "0x3478"
 :status :untested
 
+:model "C480W"
+:interface "USB"
+:usbid "0x04e8" "0x347e"
+:status :untested
+
 :model "K3250 Series"
 :interface "USB"
 :usbid "0x04e8" "0x3481"
@@ -411,4 +427,3 @@
 :interface "USB"
 :usbid "0x04e8" "0x3482"
 :status :untested
-
diff --git a/doc/doxygen-genesys.conf.in b/doc/doxygen-genesys.conf.in
index af9309f..213d2bb 100644
--- a/doc/doxygen-genesys.conf.in
+++ b/doc/doxygen-genesys.conf.in
@@ -1,1793 +1,313 @@
-# Doxyfile 1.8.1.1
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project.
-#
-# All text after a hash (#) is considered a comment and will be ignored.
-# The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ").
+# Doxyfile 1.8.8
 
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the
-# iconv built into libc) for the transcoding. See
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
-
 DOXYFILE_ENCODING      = UTF-8
-
-# The PROJECT_NAME tag is a single word (or sequence of words) that should
-# identify the project. Note that if you do not use Doxywizard you need
-# to put quotes around the project name if it contains spaces.
-
 PROJECT_NAME           = GENESYS
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
-# if some version control system is used.
-
 PROJECT_NUMBER         = @VERSION@
-
-# Using the PROJECT_BRIEF tag one can provide an optional one line description
-# for a project that appears at the top of each page and should give viewer
-# a quick idea about the purpose of the project. Keep the description short.
-
 PROJECT_BRIEF          = GENESYS backend documentation
-
-# With the PROJECT_LOGO tag one can specify an logo or icon that is
-# included in the documentation. The maximum height of the logo should not
-# exceed 55 pixels and the maximum width should not exceed 200 pixels.
-# Doxygen will copy the logo to the output directory.
-
 PROJECT_LOGO           =
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
-# where doxygen was started. If left blank the current directory will be used.
-
 OUTPUT_DIRECTORY       = ./
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of
-# source files, where putting all generated files in the same directory would
-# otherwise cause performance problems for the file system.
-
 CREATE_SUBDIRS         = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
-# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
-# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
-# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
-# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
-# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
-
+ALLOW_UNICODE_NAMES    = NO
 OUTPUT_LANGUAGE        = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
-# Set to NO to disable this.
-
 BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-
 REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is
-# used as the annotated text. Otherwise, the brief description is used as-is.
-# If left blank, the following values are used ("$name" is automatically
-# replaced with the name of the entity): "The $name class" "The $name widget"
-# "The $name file" "is" "provides" "specifies" "contains"
-# "represents" "a" "an" "the"
-
 ABBREVIATE_BRIEF       =
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
-# description.
-
 ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-
 INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
-# to NO the shortest path that makes the file name unique will be used.
-
 FULL_PATH_NAMES        = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user-defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the
-# path to strip.
-
 STRIP_FROM_PATH        =
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-# the path mentioned in the documentation of a class, which tells
-# the reader which header file to include in order to use a class.
-# If left blank only the name of the header file containing the class
-# definition is used. Otherwise one should specify the include paths that
-# are normally passed to the compiler using the -I flag.
-
 STRIP_FROM_INC_PATH    =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful if your file system
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
 SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like regular Qt-style comments
-# (thus requiring an explicit @brief command for a brief description.)
-
 JAVADOC_AUTOBRIEF      = YES
-
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
-# interpret the first line (until the first dot) of a Qt-style
-# comment as the brief description. If set to NO, the comments
-# will behave just like regular Qt-style comments (thus requiring
-# an explicit \brief command for a brief description.)
-
 QT_AUTOBRIEF           = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
-# description. Set this tag to YES if you prefer the old behaviour instead.
-
 MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
-# re-implements.
-
 INHERIT_DOCS           = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
-# a new page for each member. If set to NO, the documentation of a member will
-# be part of the file/class/namespace that contains it.
-
 SEPARATE_MEMBER_PAGES  = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
-# Doxygen uses this value to replace tabs by spaces in code fragments.
-
 TAB_SIZE               = 8
-
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
-# You can put \n's in the value part of an alias to insert newlines.
-
 ALIASES                =
-
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding
-# "class=itcl::class" will allow you to use the command class in the
-# itcl::class meaning.
-
 TCL_SUBST              =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
-# sources only. Doxygen will then generate output that is more tailored for C.
-# For instance, some of the names that are used will be different. The list
-# of all members will be omitted, etc.
-
 OPTIMIZE_OUTPUT_FOR_C  = YES
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
-# sources only. Doxygen will then generate output that is more tailored for
-# Java. For instance, namespaces will be presented as packages, qualified
-# scopes will look different, etc.
-
 OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources only. Doxygen will then generate output that is more tailored for
-# Fortran.
-
 OPTIMIZE_FOR_FORTRAN   = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for
-# VHDL.
-
 OPTIMIZE_OUTPUT_VHDL   = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it
-# parses. With this tag you can assign which parser to use for a given extension.
-# Doxygen has a built-in mapping, but you can override or extend it using this
-# tag. The format is ext=language, where ext is a file extension, and language
-# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C,
-# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make
-# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
-# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions
-# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
-
 EXTENSION_MAPPING      =
-
-# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all
-# comments according to the Markdown format, which allows for more readable
-# documentation. See http://daringfireball.net/projects/markdown/ for details.
-# The output of markdown processing is further processed by doxygen, so you
-# can mix doxygen, HTML, and XML commands with Markdown formatting.
-# Disable only in case of backward compatibilities issues.
-
 MARKDOWN_SUPPORT       = YES
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should
-# set this tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
-# func(std::string) {}). This also makes the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-
+AUTOLINK_SUPPORT       = YES
 BUILTIN_STL_SUPPORT    = NO
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-
 CPP_CLI_SUPPORT        = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
-# Doxygen will parse them like normal C++ but will assume all classes use public
-# instead of private inheritance when no explicit protection keyword is present.
-
 SIP_SUPPORT            = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate getter
-# and setter methods for a property. Setting this option to YES (the default)
-# will make doxygen replace the get and set methods by a property in the
-# documentation. This will only work if the methods are indeed getting or
-# setting a simple type. If this is not the case, or you want to show the
-# methods anyway, you should set this option to NO.
-
 IDL_PROPERTY_SUPPORT   = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-
 DISTRIBUTE_GROUP_DOC   = YES
-
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a
-# subgroup of that type (e.g. under the Public Functions section). Set it to
-# NO to prevent subgrouping. Alternatively, this can be done per class using
-# the \nosubgrouping command.
-
 SUBGROUPING            = YES
-
-# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and
-# unions are shown inside the group in which they are included (e.g. using
-# @ingroup) instead of on a separate page (for HTML and Man pages) or
-# section (for LaTeX and RTF).
-
 INLINE_GROUPED_CLASSES = NO
-
-# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and
-# unions with only public data fields will be shown inline in the documentation
-# of the scope in which they are defined (i.e. file, namespace, or group
-# documentation), provided this scope is documented. If set to NO (the default),
-# structs, classes, and unions are shown on a separate page (for HTML and Man
-# pages) or section (for LaTeX and RTF).
-
 INLINE_SIMPLE_STRUCTS  = NO
-
-# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
-# is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically
-# be useful for C code in case the coding convention dictates that all compound
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-
 TYPEDEF_HIDES_STRUCT   = NO
-
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
-# determine which symbols to keep in memory and which to flush to disk.
-# When the cache is full, less often used symbols will be written to disk.
-# For small to medium size projects (<1000 input files) the default value is
-# probably good enough. For larger projects a too small cache size can cause
-# doxygen to be busy swapping symbols to and from disk most of the time
-# causing a significant performance penalty.
-# If the system has enough physical memory increasing the cache will improve the
-# performance by keeping more symbols in memory. Note that the value works on
-# a logarithmic scale so increasing the size by one will roughly double the
-# memory usage. The cache size is given by this formula:
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols.
-
-SYMBOL_CACHE_SIZE      = 0
-
-# Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be
-# set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given
-# their name and scope. Since this can be an expensive process and often the
-# same symbol appear multiple times in the code, doxygen keeps a cache of
-# pre-resolved symbols. If the cache is too small doxygen will become slower.
-# If the cache is too large, memory is wasted. The cache size is given by this
-# formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols.
-
 LOOKUP_CACHE_SIZE      = 0
-
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
 EXTRACT_ALL            = YES
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
-# will be included in the documentation.
-
 EXTRACT_PRIVATE        = NO
-
-# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal scope will be included in the documentation.
-
 EXTRACT_PACKAGE        = NO
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
-# will be included in the documentation.
-
 EXTRACT_STATIC         = YES
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
-# If set to NO only classes defined in header files are included.
-
 EXTRACT_LOCAL_CLASSES  = YES
-
-# This flag is only useful for Objective-C code. When set to YES local
-# methods, which are defined in the implementation section but not in
-# the interface are included in the documentation.
-# If set to NO (the default) only methods in the interface are included.
-
 EXTRACT_LOCAL_METHODS  = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base
-# name of the file that contains the anonymous namespace. By default
-# anonymous namespaces are hidden.
-
 EXTRACT_ANON_NSPACES   = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members of documented classes, files or namespaces.
-# If set to NO (the default) these members will be included in the
-# various overviews, but no documentation section is generated.
-# This option has no effect if EXTRACT_ALL is enabled.
-
 HIDE_UNDOC_MEMBERS     = YES
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy.
-# If set to NO (the default) these classes will be included in the various
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
-
 HIDE_UNDOC_CLASSES     = YES
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
-# friend (class|struct|union) declarations.
-# If set to NO (the default) these declarations will be included in the
-# documentation.
-
 HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
-# documentation blocks found inside the body of a function.
-# If set to NO (the default) these blocks will be appended to the
-# function's detailed documentation block.
-
 HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation
-# that is typed after a \internal command is included. If the tag is set
-# to NO (the default) then the documentation will be excluded.
-# Set it to YES to include the internal documentation.
-
 INTERNAL_DOCS          = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
-# file names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-
 CASE_SENSE_NAMES       = YES
-
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
-# will show members with their full class and namespace scopes in the
-# documentation. If set to YES the scope will be hidden.
-
 HIDE_SCOPE_NAMES       = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
-# will put a list of the files that are included by a file in the documentation
-# of that file.
-
 SHOW_INCLUDE_FILES     = NO
-
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
-# will list include files with double quotes in the documentation
-# rather than with sharp brackets.
-
+SHOW_GROUPED_MEMB_INC  = NO
 FORCE_LOCAL_INCLUDES   = NO
-
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
-# is inserted in the documentation for inline members.
-
 INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
-# will sort the (detailed) documentation of file and class members
-# alphabetically by member name. If set to NO the members will appear in
-# declaration order.
-
 SORT_MEMBER_DOCS       = NO
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
-# brief documentation of file, namespace and class members alphabetically
-# by member name. If set to NO (the default) the members will appear in
-# declaration order.
-
 SORT_BRIEF_DOCS        = NO
-
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
-# will sort the (brief and detailed) documentation of class members so that
-# constructors and destructors are listed first. If set to NO (the default)
-# the constructors will appear in the respective orders defined by
-# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
-# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
-# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
-
 SORT_MEMBERS_CTORS_1ST = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
-# hierarchy of group names into alphabetical order. If set to NO (the default)
-# the group names will appear in their defined order.
-
 SORT_GROUP_NAMES       = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
-# sorted by fully-qualified names, including namespaces. If set to
-# NO (the default), the class list will be sorted only by class name,
-# not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the
-# alphabetical list.
-
 SORT_BY_SCOPE_NAME     = NO
-
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
-# do proper type resolution of all parameters of a function it will reject a
-# match between the prototype and the implementation of a member function even
-# if there is only one candidate or it is obvious which candidate to choose
-# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
-# will still accept a match between prototype and implementation in such cases.
-
 STRICT_PROTO_MATCHING  = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or
-# disable (NO) the todo list. This list is created by putting \todo
-# commands in the documentation.
-
 GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or
-# disable (NO) the test list. This list is created by putting \test
-# commands in the documentation.
-
 GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or
-# disable (NO) the bug list. This list is created by putting \bug
-# commands in the documentation.
-
 GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
-# disable (NO) the deprecated list. This list is created by putting
-# \deprecated commands in the documentation.
-
 GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional
-# documentation sections, marked by \if sectionname ... \endif.
-
 ENABLED_SECTIONS       =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or macro consists of for it to appear in
-# the documentation. If the initializer consists of more lines than specified
-# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and macros in the
-# documentation can be controlled using \showinitializer or \hideinitializer
-# command in the documentation regardless of this setting.
-
 MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
-# at the bottom of the documentation of classes and structs. If set to YES the
-# list will mention the files that were used to generate the documentation.
-
 SHOW_USED_FILES        = YES
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
-# This will remove the Files entry from the Quick Index and from the
-# Folder Tree View (if specified). The default is YES.
-
 SHOW_FILES             = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
-# Namespaces page.
-# This will remove the Namespaces entry from the Quick Index
-# and from the Folder Tree View (if specified). The default is YES.
-
 SHOW_NAMESPACES        = YES
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
-# the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command <command> <input-file>, where <command> is the value of
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
-# provided by doxygen. Whatever the program writes to standard output
-# is used as the file version. See the manual for examples.
-
 FILE_VERSION_FILTER    =
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
-# by doxygen. The layout file controls the global structure of the generated
-# output files in an output format independent way. To create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option.
-# You can optionally specify a file name after the option, if omitted
-# DoxygenLayout.xml will be used as the name of the layout file.
-
 LAYOUT_FILE            =
-
-# The CITE_BIB_FILES tag can be used to specify one or more bib files
-# containing the references data. This must be a list of .bib files. The
-# .bib extension is automatically appended if omitted. Using this command
-# requires the bibtex tool to be installed. See also
-# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style
-# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this
-# feature you need bibtex and perl available in the search path.
-
 CITE_BIB_FILES         =
-
 #---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
+# Configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
-
 QUIET                  = YES
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated by doxygen. Possible values are YES and NO. If left blank
-# NO is used.
-
 WARNINGS               = YES
-
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
-# automatically be disabled.
-
 WARN_IF_UNDOCUMENTED   = YES
-
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some
-# parameters in a documented function, or documenting parameters that
-# don't exist or using markup commands wrongly.
-
 WARN_IF_DOC_ERROR      = YES
-
-# The WARN_NO_PARAMDOC option can be enabled to get warnings for
-# functions that are documented, but have no documentation for their parameters
-# or return value. If set to NO (the default) doxygen will only warn about
-# wrong or incomplete parameter documentation, but not about the absence of
-# documentation.
-
 WARN_NO_PARAMDOC       = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that
-# doxygen can produce. The string should contain the $file, $line, and $text
-# tags, which will be replaced by the file and line number from which the
-# warning originated and the warning text. Optionally the format may contain
-# $version, which will be replaced by the version of the file (if it could
-# be obtained via FILE_VERSION_FILTER)
-
 WARN_FORMAT            = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning
-# and error messages should be written. If left blank the output is written
-# to stderr.
-
 WARN_LOGFILE           =
-
 #---------------------------------------------------------------------------
-# configuration options related to the input files
+# Configuration options related to the input files
 #---------------------------------------------------------------------------
-
-# The INPUT tag can be used to specify the files and/or directories that contain
-# documented source files. You may enter file names like "myfile.cpp" or
-# directories like "/usr/src/myproject". Separate the files or directories
-# with spaces.
-
 INPUT                  = ../include/sane/ \
                          ../backend
-
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
-# also the default input encoding. Doxygen uses libiconv (or the iconv built
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
-# the list of possible encodings.
-
 INPUT_ENCODING         = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
-# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
-# *.f90 *.f *.for *.vhd *.vhdl
-
 FILE_PATTERNS          = genesys*.[ch]
-
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# should be searched for input files as well. Possible values are YES and NO.
-# If left blank NO is used.
-
 RECURSIVE              = NO
-
-# The EXCLUDE tag can be used to specify files and/or directories that should be
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-# Note that relative paths are relative to the directory from which doxygen is
-# run.
-
 EXCLUDE                =
-
-# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
-# directories that are symbolic links (a Unix file system feature) are excluded
-# from the input.
-
 EXCLUDE_SYMLINKS       = YES
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories. Note that the wildcards are matched
-# against the file with absolute path, so to exclude all test directories
-# for example use the pattern */test/*
-
 EXCLUDE_PATTERNS       =
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-
 EXCLUDE_SYMBOLS        =
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
-# the \include command).
-
 EXAMPLE_PATH           =
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank all files are included.
-
 EXAMPLE_PATTERNS       =
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude
-# commands irrespective of the value of the RECURSIVE tag.
-# Possible values are YES and NO. If left blank NO is used.
-
 EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or
-# directories that contain image that are included in the documentation (see
-# the \image command).
-
 IMAGE_PATH             = ./
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command <filter> <input-file>, where <filter>
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
-# input file. Doxygen will then use the output that the filter program writes
-# to standard output.
-# If FILTER_PATTERNS is specified, this tag will be
-# ignored.
-
 INPUT_FILTER           =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis.
-# Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match.
-# The filters are a list of the form:
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty or if
-# non of the patterns match the file name, INPUT_FILTER is applied.
-
 FILTER_PATTERNS        =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will be used to filter the input files when producing source
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
-
 FILTER_SOURCE_FILES    = NO
-
-# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
-# pattern. A pattern will override the setting for FILTER_PATTERN (if any)
-# and it is also possible to disable source filtering for a specific pattern
-# using *.ext= (so without naming a filter). This option only has effect when
-# FILTER_SOURCE_FILES is enabled.
-
 FILTER_SOURCE_PATTERNS =
-
+USE_MDFILE_AS_MAINPAGE =
 #---------------------------------------------------------------------------
-# configuration options related to source browsing
+# Configuration options related to source browsing
 #---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-# be generated. Documented entities will be cross-referenced with these sources.
-# Note: To get rid of all source code in the generated output, make sure also
-# VERBATIM_HEADERS is set to NO.
-
 SOURCE_BROWSER         = NO
-
-# Setting the INLINE_SOURCES tag to YES will include the body
-# of functions and classes directly in the documentation.
-
 INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-# doxygen to hide any special comment blocks from generated source code
-# fragments. Normal C, C++ and Fortran comments will always remain visible.
-
 STRIP_CODE_COMMENTS    = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES
-# then for each documented function all documented
-# functions referencing it will be listed.
-
 REFERENCED_BY_RELATION = YES
-
-# If the REFERENCES_RELATION tag is set to YES
-# then for each documented function all documented entities
-# called/used by that function will be listed.
-
 REFERENCES_RELATION    = YES
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
-# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
-# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
-# link to the source code.
-# Otherwise they will link to the documentation.
-
 REFERENCES_LINK_SOURCE = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code
-# will point to the HTML generated by the htags(1) tool instead of doxygen
-# built-in source browser. The htags tool is part of GNU's global source
-# tagging system (see http://www.gnu.org/software/global/global.html). You
-# will need version 4.8.6 or higher.
-
+SOURCE_TOOLTIPS        = YES
 USE_HTAGS              = NO
-
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-# will generate a verbatim copy of the header file for each class for
-# which an include is specified. Set to NO to disable this.
-
 VERBATIM_HEADERS       = YES
-
+CLANG_ASSISTED_PARSING = NO
+CLANG_OPTIONS          =
 #---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
+# Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-# of all compounds will be generated. Enable this if the project
-# contains a lot of classes, structs, unions or interfaces.
-
 ALPHABETICAL_INDEX     = YES
-
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
-# in which this list will be split (can be a number in the range [1..20])
-
 COLS_IN_ALPHA_INDEX    = 5
-
-# In case all classes in a project start with a common prefix, all
-# classes will be put under the same header in the alphabetical index.
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
-# should be ignored while generating the index headers.
-
 IGNORE_PREFIX          =
-
 #---------------------------------------------------------------------------
-# configuration options related to the HTML output
+# Configuration options related to the HTML output
 #---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
-# generate HTML output.
-
 GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `html' will be used as the default path.
-
 HTML_OUTPUT            = ./genesys-html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
-# doxygen will generate files with .html extension.
-
 HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a personal HTML header for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard header. Note that when using a custom header you are responsible
-#  for the proper inclusion of any scripts and style sheets that doxygen
-# needs, which is dependent on the configuration options used.
-# It is advised to generate a default header using "doxygen -w html
-# header.html footer.html stylesheet.css YourConfigFile" and then modify
-# that header. Note that the header is subject to change so you typically
-# have to redo this when upgrading to a newer version of doxygen or when
-# changing the value of configuration settings such as GENERATE_TREEVIEW!
-
 HTML_HEADER            =
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard footer.
-
 HTML_FOOTER            =
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
-# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If the tag is left blank doxygen
-# will generate a default style sheet. Note that doxygen will try to copy
-# the style sheet file to the HTML output directory, so don't put your own
-# style sheet in the HTML output directory as well, or it will be erased!
-
 HTML_STYLESHEET        =
-
-# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the HTML output directory. Note
-# that these files will be copied to the base HTML output directory. Use the
-# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
-# files. In the HTML_STYLESHEET file, use the file name only. Also note that
-# the files will be copied as-is; there are no commands or markers available.
-
+HTML_EXTRA_STYLESHEET  =
 HTML_EXTRA_FILES       =
-
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
-# Doxygen will adjust the colors in the style sheet and background images
-# according to this color. Hue is specified as an angle on a colorwheel,
-# see http://en.wikipedia.org/wiki/Hue for more information.
-# For instance the value 0 represents red, 60 is yellow, 120 is green,
-# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
-# The allowed range is 0 to 359.
-
 HTML_COLORSTYLE_HUE    = 220
-
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
-# the colors in the HTML output. For a value of 0 the output will use
-# grayscales only. A value of 255 will produce the most vivid colors.
-
 HTML_COLORSTYLE_SAT    = 100
-
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
-# the luminance component of the colors in the HTML output. Values below
-# 100 gradually make the output lighter, whereas values above 100 make
-# the output darker. The value divided by 100 is the actual gamma applied,
-# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
-# and 100 does not change the gamma.
-
 HTML_COLORSTYLE_GAMMA  = 80
-
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting
-# this to NO can help when comparing the output of multiple runs.
-
 HTML_TIMESTAMP         = YES
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded.
-
 HTML_DYNAMIC_SECTIONS  = NO
-
-# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of
-# entries shown in the various tree structured indices initially; the user
-# can expand and collapse entries dynamically later on. Doxygen will expand
-# the tree to such a level that at most the specified number of entries are
-# visible (unless a fully collapsed tree already exceeds this amount).
-# So setting the number of entries 1 will produce a full collapsed tree by
-# default. 0 is a special value representing an infinite number of entries
-# and will result in a full expanded tree by default.
-
 HTML_INDEX_NUM_ENTRIES = 100
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files
-# will be generated that can be used as input for Apple's Xcode 3
-# integrated development environment, introduced with OSX 10.5 (Leopard).
-# To create a documentation set, doxygen will generate a Makefile in the
-# HTML output directory. Running make will produce the docset in that
-# directory and running "make install" will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
-# it at startup.
-# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
-# for more information.
-
 GENERATE_DOCSET        = NO
-
-# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
-# feed. A documentation feed provides an umbrella under which multiple
-# documentation sets from a single provider (such as a company or product suite)
-# can be grouped.
-
 DOCSET_FEEDNAME        = "Doxygen generated docs"
-
-# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
-# should uniquely identify the documentation set bundle. This should be a
-# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
-# will append .docset to the name.
-
 DOCSET_BUNDLE_ID       = org.doxygen.Project
-
-# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify
-# the documentation publisher. This should be a reverse domain-name style
-# string, e.g. com.mycompany.MyDocSet.documentation.
-
 DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
-
-# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
-
 DOCSET_PUBLISHER_NAME  = Publisher
-
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-# will be generated that can be used as input for tools like the
-# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
-# of the generated HTML documentation.
-
 GENERATE_HTMLHELP      = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
-# be used to specify the file name of the resulting .chm file. You
-# can add a path in front of the file if the result should not be
-# written to the html output directory.
-
 CHM_FILE               =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
-# be used to specify the location (absolute path including file name) of
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
-# the HTML help compiler on the generated index.hhp.
-
 HHC_LOCATION           =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
-# controls if a separate .chi index file is generated (YES) or that
-# it should be included in the master .chm file (NO).
-
 GENERATE_CHI           = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
-# is used to encode HtmlHelp index (hhk), content (hhc) and project file
-# content.
-
 CHM_INDEX_ENCODING     =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
-# controls whether a binary table of contents is generated (YES) or a
-# normal table of contents (NO) in the .chm file.
-
 BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members
-# to the contents of the HTML help documentation and to the tree view.
-
 TOC_EXPAND             = NO
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
-# that can be used as input for Qt's qhelpgenerator to generate a
-# Qt Compressed Help (.qch) of the generated HTML documentation.
-
 GENERATE_QHP           = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
-# be used to specify the file name of the resulting .qch file.
-# The path specified is relative to the HTML output folder.
-
 QCH_FILE               =
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#namespace
-
 QHP_NAMESPACE          = org.doxygen.Project
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#virtual-folders
-
 QHP_VIRTUAL_FOLDER     = doc
-
-# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
-# add. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#custom-filters
-
 QHP_CUST_FILTER_NAME   =
-
-# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
-# custom filter to add. For more information please see
-# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
-# Qt Help Project / Custom Filters</a>.
-
 QHP_CUST_FILTER_ATTRS  =
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-# project's
-# filter section matches.
-# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
-# Qt Help Project / Filter Attributes</a>.
-
 QHP_SECT_FILTER_ATTRS  =
-
-# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
-# be used to specify the location of Qt's qhelpgenerator.
-# If non-empty doxygen will try to run qhelpgenerator on the generated
-# .qhp file.
-
 QHG_LOCATION           =
-
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
-#  will be generated, which together with the HTML files, form an Eclipse help
-# plugin. To install this plugin and make it available under the help contents
-# menu in Eclipse, the contents of the directory containing the HTML and XML
-# files needs to be copied into the plugins directory of eclipse. The name of
-# the directory within the plugins directory should be the same as
-# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
-# the help appears.
-
 GENERATE_ECLIPSEHELP   = NO
-
-# A unique identifier for the eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have
-# this name.
-
 ECLIPSE_DOC_ID         = org.doxygen.Project
-
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs)
-# at top of each HTML page. The value NO (the default) enables the index and
-# the value YES disables it. Since the tabs have the same information as the
-# navigation tree you can set this option to NO if you already set
-# GENERATE_TREEVIEW to YES.
-
 DISABLE_INDEX          = NO
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information.
-# If the tag value is set to YES, a side panel will be generated
-# containing a tree-like index structure (just like the one that
-# is generated for HTML Help). For this to work a browser that supports
-# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
-# Windows users are probably better off using the HTML help feature.
-# Since the tree basically has the same information as the tab index you
-# could consider to set DISABLE_INDEX to NO when enabling this option.
-
 GENERATE_TREEVIEW      = NO
-
-# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
-# (range [0,1..20]) that doxygen will group on one line in the generated HTML
-# documentation. Note that a value of 0 will completely suppress the enum
-# values from appearing in the overview section.
-
 ENUM_VALUES_PER_LINE   = 4
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
-# used to set the initial width (in pixels) of the frame in which the tree
-# is shown.
-
 TREEVIEW_WIDTH         = 250
-
-# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
-# links to external symbols imported via tag files in a separate window.
-
 EXT_LINKS_IN_WINDOW    = NO
-
-# Use this tag to change the font size of Latex formulas included
-# as images in the HTML documentation. The default is 10. Note that
-# when you change the font size after a successful doxygen run you need
-# to manually remove any form_*.png images from the HTML output directory
-# to force them to be regenerated.
-
 FORMULA_FONTSIZE       = 10
-
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are
-# not supported properly for IE 6.0, but are supported on all modern browsers.
-# Note that when changing this option you need to delete any form_*.png files
-# in the HTML output before the changes have effect.
-
 FORMULA_TRANSPARENT    = YES
-
-# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
-# (see http://www.mathjax.org) which uses client side Javascript for the
-# rendering instead of using prerendered bitmaps. Use this if you do not
-# have LaTeX installed or if you want to formulas look prettier in the HTML
-# output. When enabled you may also need to install MathJax separately and
-# configure the path to it using the MATHJAX_RELPATH option.
-
 USE_MATHJAX            = NO
-
-# When MathJax is enabled you need to specify the location relative to the
-# HTML output directory using the MATHJAX_RELPATH option. The destination
-# directory should contain the MathJax.js script. For instance, if the mathjax
-# directory is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to
-# the MathJax Content Delivery Network so you can quickly see the result without
-# installing MathJax.
-# However, it is strongly recommended to install a local
-# copy of MathJax from http://www.mathjax.org before deployment.
-
+MATHJAX_FORMAT         = HTML-CSS
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
-
-# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
-# names that should be enabled during MathJax rendering.
-
 MATHJAX_EXTENSIONS     =
-
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box
-# for the HTML output. The underlying search engine uses javascript
-# and DHTML and should work on any modern browser. Note that when using
-# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
-# (GENERATE_DOCSET) there is already a search function so this one should
-# typically be disabled. For large projects the javascript based search engine
-# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
-
+MATHJAX_CODEFILE       =
 SEARCHENGINE           = NO
-
-# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a PHP enabled web server instead of at the web client
-# using Javascript. Doxygen will generate the search PHP script and index
-# file to put on the web server. The advantage of the server
-# based approach is that it scales better to large projects and allows
-# full text search. The disadvantages are that it is more difficult to setup
-# and does not have live searching capabilities.
-
 SERVER_BASED_SEARCH    = NO
-
+EXTERNAL_SEARCH        = NO
+SEARCHENGINE_URL       =
+SEARCHDATA_FILE        = searchdata.xml
+EXTERNAL_SEARCH_ID     =
+EXTRA_SEARCH_MAPPINGS  =
 #---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
+# Configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
-# generate Latex output.
-
 GENERATE_LATEX         = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `latex' will be used as the default path.
-
 LATEX_OUTPUT           =
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked. If left blank `latex' will be used as the default command name.
-# Note that when enabling USE_PDFLATEX this option is only used for
-# generating bitmaps for formulas in the HTML output, but not in the
-# Makefile that is written to the output directory.
-
 LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
-# generate index for LaTeX. If left blank `makeindex' will be used as the
-# default command name.
-
 MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
-# LaTeX documents. This may be useful for small projects and may help to
-# save some trees in general.
-
 COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, letter, legal and
-# executive. If left blank a4wide will be used.
-
 PAPER_TYPE             = a4wide
-
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
-# packages that should be included in the LaTeX output.
-
 EXTRA_PACKAGES         =
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
-# the generated latex document. The header should contain everything until
-# the first chapter. If it is left blank doxygen will generate a
-# standard header. Notice: only use this tag if you know what you are doing!
-
 LATEX_HEADER           =
-
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for
-# the generated latex document. The footer should contain everything after
-# the last chapter. If it is left blank doxygen will generate a
-# standard footer. Notice: only use this tag if you know what you are doing!
-
 LATEX_FOOTER           =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will
-# contain links (just like the HTML output) instead of page references
-# This makes the output suitable for online browsing using a pdf viewer.
-
+LATEX_EXTRA_FILES      =
 PDF_HYPERLINKS         = NO
-
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
-# plain latex in the generated Makefile. Set this option to YES to get a
-# higher quality PDF documentation.
-
 USE_PDFLATEX           = NO
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
-# command to the generated LaTeX files. This will instruct LaTeX to keep
-# running if errors occur, instead of asking the user for help.
-# This option is also used when generating formulas in HTML.
-
 LATEX_BATCHMODE        = NO
-
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not
-# include the index chapters (such as File Index, Compound Index, etc.)
-# in the output.
-
 LATEX_HIDE_INDICES     = NO
-
-# If LATEX_SOURCE_CODE is set to YES then doxygen will include
-# source code with syntax highlighting in the LaTeX output.
-# Note that which sources are shown also depends on other settings
-# such as SOURCE_BROWSER.
-
 LATEX_SOURCE_CODE      = NO
-
-# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
-# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See
-# http://en.wikipedia.org/wiki/BibTeX for more info.
-
 LATEX_BIB_STYLE        = plain
-
 #---------------------------------------------------------------------------
-# configuration options related to the RTF output
+# Configuration options related to the RTF output
 #---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
-# The RTF output is optimized for Word 97 and may not look very pretty with
-# other RTF readers or editors.
-
 GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `rtf' will be used as the default path.
-
 RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
-# RTF documents. This may be useful for small projects and may help to
-# save some trees in general.
-
 COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
-# will contain hyperlink fields. The RTF file will
-# contain links (just like the HTML output) instead of page references.
-# This makes the output suitable for online browsing using WORD or other
-# programs which support those fields.
-# Note: wordpad (write) and others do not support links.
-
 RTF_HYPERLINKS         = NO
-
-# Load style sheet definitions from file. Syntax is similar to doxygen's
-# config file, i.e. a series of assignments. You only have to provide
-# replacements, missing definitions are set to their default value.
-
 RTF_STYLESHEET_FILE    =
-
-# Set optional variables used in the generation of an rtf document.
-# Syntax is similar to doxygen's config file.
-
 RTF_EXTENSIONS_FILE    =
-
 #---------------------------------------------------------------------------
-# configuration options related to the man page output
+# Configuration options related to the man page output
 #---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
-# generate man pages
-
 GENERATE_MAN           = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `man' will be used as the default path.
-
 MAN_OUTPUT             = man
-
-# The MAN_EXTENSION tag determines the extension that is added to
-# the generated man pages (default is the subroutine's section .3)
-
 MAN_EXTENSION          = .3
-
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
-# then it will generate one additional man file for each entity
-# documented in the real man page(s). These additional files
-# only source the real man page, but without them the man command
-# would be unable to find the correct page. The default is NO.
-
+MAN_SUBDIR             =
 MAN_LINKS              = NO
-
 #---------------------------------------------------------------------------
-# configuration options related to the XML output
+# Configuration options related to the XML output
 #---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES Doxygen will
-# generate an XML file that captures the structure of
-# the code including all documentation.
-
 GENERATE_XML           = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `xml' will be used as the default path.
-
 XML_OUTPUT             = xml
-
-# The XML_SCHEMA tag can be used to specify an XML schema,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_SCHEMA             =
-
-# The XML_DTD tag can be used to specify an XML DTD,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_DTD                =
-
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
-# dump the program listings (including syntax highlighting
-# and cross-referencing information) to the XML output. Note that
-# enabling this will significantly increase the size of the XML output.
-
 XML_PROGRAMLISTING     = YES
-
 #---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+GENERATE_DOCBOOK       = NO
+DOCBOOK_OUTPUT         = docbook
+DOCBOOK_PROGRAMLISTING = NO
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
-# generate an AutoGen Definitions (see autogen.sf.net) file
-# that captures the structure of the code including all
-# documentation. Note that this feature is still experimental
-# and incomplete at the moment.
-
 GENERATE_AUTOGEN_DEF   = NO
-
 #---------------------------------------------------------------------------
-# configuration options related to the Perl module output
+# Configuration options related to the Perl module output
 #---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will
-# generate a Perl module file that captures the structure of
-# the code including all documentation. Note that this
-# feature is still experimental and incomplete at the
-# moment.
-
 GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able
-# to generate PDF and DVI output from the Perl module output.
-
 PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-# nicely formatted so it can be parsed by a human reader.
-# This is useful
-# if you want to understand what is going on.
-# On the other hand, if this
-# tag is set to NO the size of the Perl module output will be much smaller
-# and Perl will parse it just the same.
-
 PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
-# This is useful so different doxyrules.make files included by the same
-# Makefile don't overwrite each other's variables.
-
 PERLMOD_MAKEVAR_PREFIX =
-
 #---------------------------------------------------------------------------
 # Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
-# evaluate all C-preprocessor directives found in the sources and include
-# files.
-
 ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
-# names in the source code. If set to NO (the default) only conditional
-# compilation will be performed. Macro expansion can be done in a controlled
-# way by setting EXPAND_ONLY_PREDEF to YES.
-
 MACRO_EXPANSION        = NO
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
-# then the macro expansion is limited to the macros specified with the
-# PREDEFINED and EXPAND_AS_DEFINED tags.
-
 EXPAND_ONLY_PREDEF     = NO
-
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
-# pointed to by INCLUDE_PATH will be searched when a #include is found.
-
 SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by
-# the preprocessor.
-
 INCLUDE_PATH           = ../backend
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will
-# be used.
-
 INCLUDE_FILE_PATTERNS  =
-
-# The PREDEFINED tag can be used to specify one or more macro names that
-# are defined before the preprocessor is started (similar to the -D option of
-# gcc). The argument of the tag is a list of macros of the form: name
-# or name=definition (no spaces). If the definition and the = are
-# omitted =1 is assumed. To prevent a macro definition from being
-# undefined via #undef or recursively expanded use the := operator
-# instead of the = operator.
-
 PREDEFINED             =
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
-# this tag can be used to specify a list of macro names that should be expanded.
-# The macro definition that is found in the sources will be used.
-# Use the PREDEFINED tag if you want to use a different macro definition that
-# overrules the definition found in the source code.
-
 EXPAND_AS_DEFINED      =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# doxygen's preprocessor will remove all references to function-like macros
-# that are alone on a line, have an all uppercase name, and do not end with a
-# semicolon, because these will confuse the parser if not removed.
-
 SKIP_FUNCTION_MACROS   = YES
-
 #---------------------------------------------------------------------------
-# Configuration::additions related to external references
+# Configuration options related to external references
 #---------------------------------------------------------------------------
-
-# The TAGFILES option can be used to specify one or more tagfiles. For each
-# tag file the location of the external documentation should be added. The
-# format of a tag file without this location is as follows:
-#
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-#
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths
-# or URLs. Note that each tag file must have a unique name (where the name does
-# NOT include the path). If a tag file is not located in the directory in which
-# doxygen is run, you must also specify the path to the tagfile here.
-
 TAGFILES               =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create
-# a tag file that is based on the input files it reads.
-
 GENERATE_TAGFILE       =
-
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed
-# in the class index. If set to NO only the inherited external classes
-# will be listed.
-
 ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will
-# be listed.
-
 EXTERNAL_GROUPS        = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of `which perl').
-
+EXTERNAL_PAGES         = YES
 PERL_PATH              = /usr/bin/perl
-
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
-# or super classes. Setting the tag to NO turns the diagrams off. Note that
-# this option also works with HAVE_DOT disabled, but it is recommended to
-# install and use dot, since it yields more powerful graphs.
-
 CLASS_DIAGRAMS         = NO
-
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see
-# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-
 MSCGEN_PATH            =
-
-# If set to YES, the inheritance and collaboration graphs will hide
-# inheritance and usage relations if the target is undocumented
-# or is not a class.
-
+DIA_PATH               =
 HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz, a graph visualization
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section
-# have no effect if this option is set to NO (the default)
-
 HAVE_DOT               = NO
-
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
-# allowed to run in parallel. When set to 0 (the default) doxygen will
-# base this on the number of processors available in the system. You can set it
-# explicitly to a value larger than 0 to get control over the balance
-# between CPU load and processing speed.
-
 DOT_NUM_THREADS        = 0
-
-# By default doxygen will use the Helvetica font for all dot files that
-# doxygen generates. When you want a differently looking font you can specify
-# the font name using DOT_FONTNAME. You need to make sure dot is able to find
-# the font, which can be done by putting it in a standard location or by setting
-# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
-# directory containing the font.
-
-DOT_FONTNAME           = FreeSans
-
-# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
-# The default size is 10pt.
-
+DOT_FONTNAME           =
 DOT_FONTSIZE           = 10
-
-# By default doxygen will tell dot to use the Helvetica font.
-# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to
-# set the path where dot can find it.
-
 DOT_FONTPATH           =
-
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect inheritance relations. Setting this tag to YES will force the
-# CLASS_DIAGRAMS tag to NO.
-
 CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect implementation dependencies (inheritance, containment, and
-# class references variables) of the class with other documented classes.
-
 COLLABORATION_GRAPH    = YES
-
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for groups, showing the direct groups dependencies
-
 GROUP_GRAPHS           = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-
 UML_LOOK               = NO
-
-# If the UML_LOOK tag is enabled, the fields and methods are shown inside
-# the class node. If there are many fields or methods and many nodes the
-# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS
-# threshold limits the number of items for each type to make the size more
-# managable. Set this to 0 for no limit. Note that the threshold may be
-# exceeded by 50% before the limit is enforced.
-
 UML_LIMIT_NUM_FIELDS   = 10
-
-# If set to YES, the inheritance and collaboration graphs will show the
-# relations between templates and their instances.
-
 TEMPLATE_RELATIONS     = NO
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
-# tags are set to YES then doxygen will generate a graph for each documented
-# file showing the direct and indirect include dependencies of the file with
-# other documented files.
-
 INCLUDE_GRAPH          = YES
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
-# documented header file showing the documented files that directly or
-# indirectly include this file.
-
 INCLUDED_BY_GRAPH      = YES
-
-# If the CALL_GRAPH and HAVE_DOT options are set to YES then
-# doxygen will generate a call dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable call graphs
-# for selected functions only using the \callgraph command.
-
 CALL_GRAPH             = NO
-
-# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
-# doxygen will generate a caller dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable caller
-# graphs for selected functions only using the \callergraph command.
-
 CALLER_GRAPH           = NO
-
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
-# will generate a graphical hierarchy of all classes instead of a textual one.
-
 GRAPHICAL_HIERARCHY    = YES
-
-# If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES
-# then doxygen will show the dependencies a directory has on other directories
-# in a graphical way. The dependency relations are determined by the #include
-# relations between the files in the directories.
-
 DIRECTORY_GRAPH        = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. Possible values are svg, png, jpg, or gif.
-# If left blank png will be used. If you choose svg you need to set
-# HTML_FILE_EXTENSION to xhtml in order to make the SVG files
-# visible in IE 9+ (other browsers do not have this requirement).
-
 DOT_IMAGE_FORMAT       = png
-
-# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
-# enable generation of interactive SVG images that allow zooming and panning.
-# Note that this requires a modern browser other than Internet Explorer.
-# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you
-# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files
-# visible. Older versions of IE do not have SVG support.
-
 INTERACTIVE_SVG        = NO
-
-# The tag DOT_PATH can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found in the path.
-
 DOT_PATH               =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the
-# \dotfile command).
-
 DOTFILE_DIRS           =
-
-# The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the
-# \mscfile command).
-
 MSCFILE_DIRS           =
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
-# nodes that will be shown in the graph. If the number of nodes in a graph
-# becomes larger than this value, doxygen will truncate the graph, which is
-# visualized by representing a node as a red box. Note that doxygen if the
-# number of direct children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
-# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-
+DIAFILE_DIRS           =
+PLANTUML_JAR_PATH      =
 DOT_GRAPH_MAX_NODES    = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
-# graphs generated by dot. A depth value of 3 means that only nodes reachable
-# from the root by following a path via at most 3 edges will be shown. Nodes
-# that lay further from the root node will be omitted. Note that setting this
-# option to 1 or 2 may greatly reduce the computation time needed for large
-# code bases. Also note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-
 MAX_DOT_GRAPH_DEPTH    = 0
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not
-# seem to support this out of the box. Warning: Depending on the platform used,
-# enabling this option may lead to badly anti-aliased labels on the edges of
-# a graph (i.e. they become hard to read).
-
 DOT_TRANSPARENT        = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10)
-# support this, this feature is disabled by default.
-
 DOT_MULTI_TARGETS      = NO
-
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
-# generate a legend page explaining the meaning of the various boxes and
-# arrows in the dot generated graphs.
-
 GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
-# remove the intermediate dot files that are used to generate
-# the various graphs.
-
 DOT_CLEANUP            = YES
diff --git a/doc/doxygen-sanei.conf.in b/doc/doxygen-sanei.conf.in
index 0b28011..68e0a85 100644
--- a/doc/doxygen-sanei.conf.in
+++ b/doc/doxygen-sanei.conf.in
@@ -1,1473 +1,312 @@
-# Doxyfile 1.5.7.1
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
-#
-# All text after a hash (#) is considered a comment and will be ignored
-# The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
+# Doxyfile 1.8.8
 
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file 
-# that follow. The default is UTF-8 which is also the encoding used for all 
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the 
-# iconv built into libc) for the transcoding. See 
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
-
 DOXYFILE_ENCODING      = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
-# by quotes) that should identify the project.
-
 PROJECT_NAME           = SANEI
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
-# This could be handy for archiving the generated documentation or 
-# if some version control system is used.
-
 PROJECT_NUMBER         = @VERSION@
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
-# base path where the generated documentation will be put. 
-# If a relative path is entered, it will be relative to the location 
-# where doxygen was started. If left blank the current directory will be used.
-
+PROJECT_BRIEF          =
+PROJECT_LOGO           =
 OUTPUT_DIRECTORY       = ./
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
-# 4096 sub-directories (in 2 levels) under the output directory of each output 
-# format and will distribute the generated files over these directories. 
-# Enabling this option can be useful when feeding doxygen a huge amount of 
-# source files, where putting all generated files in the same directory would 
-# otherwise cause performance problems for the file system.
-
 CREATE_SUBDIRS         = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
-# documentation generated by doxygen is written. Doxygen will use this 
-# information to generate all constant output in the proper language. 
-# The default language is English, other supported languages are: 
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
-# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek, 
-# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages), 
-# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish, 
-# Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, Slovene, 
-# Spanish, Swedish, and Ukrainian.
-
+ALLOW_UNICODE_NAMES    = NO
 OUTPUT_LANGUAGE        = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
-# include brief member descriptions after the members that are listed in 
-# the file and class documentation (similar to JavaDoc). 
-# Set to NO to disable this.
-
 BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
-# the brief description of a member or function before the detailed description. 
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
-# brief descriptions will be completely suppressed.
-
 REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator 
-# that is used to form the text in various listings. Each string 
-# in this list, if found as the leading text of the brief description, will be 
-# stripped from the text and the result after processing the whole list, is 
-# used as the annotated text. Otherwise, the brief description is used as-is. 
-# If left blank, the following values are used ("$name" is automatically 
-# replaced with the name of the entity): "The $name class" "The $name widget" 
-# "The $name file" "is" "provides" "specifies" "contains" 
-# "represents" "a" "an" "the"
-
-ABBREVIATE_BRIEF       = 
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
-# Doxygen will generate a detailed section even if there is only a brief 
-# description.
-
+ABBREVIATE_BRIEF       =
 ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
-# inherited members of a class in the documentation of that class as if those 
-# members were ordinary class members. Constructors, destructors and assignment 
-# operators of the base classes will not be shown.
-
 INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
-# path before files name in the file list and in the header files. If set 
-# to NO the shortest path that makes the file name unique will be used.
-
 FULL_PATH_NAMES        = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
-# can be used to strip a user-defined part of the path. Stripping is 
-# only done if one of the specified strings matches the left-hand part of 
-# the path. The tag can be used to show relative paths in the file list. 
-# If left blank the directory from which doxygen is run is used as the 
-# path to strip.
-
-STRIP_FROM_PATH        = 
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
-# the path mentioned in the documentation of a class, which tells 
-# the reader which header file to include in order to use a class. 
-# If left blank only the name of the header file containing the class 
-# definition is used. Otherwise one should specify the include paths that 
-# are normally passed to the compiler using the -I flag.
-
-STRIP_FROM_INC_PATH    = 
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
-# (but less readable) file names. This can be useful is your file systems 
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
+STRIP_FROM_PATH        =
+STRIP_FROM_INC_PATH    =
 SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
-# will interpret the first line (until the first dot) of a JavaDoc-style 
-# comment as the brief description. If set to NO, the JavaDoc 
-# comments will behave just like regular Qt-style comments 
-# (thus requiring an explicit @brief command for a brief description.)
-
 JAVADOC_AUTOBRIEF      = YES
-
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will 
-# interpret the first line (until the first dot) of a Qt-style 
-# comment as the brief description. If set to NO, the comments 
-# will behave just like regular Qt-style comments (thus requiring 
-# an explicit \brief command for a brief description.)
-
 QT_AUTOBRIEF           = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
-# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
-# comments) as a brief description. This used to be the default behaviour. 
-# The new default is to treat a multi-line C++ comment block as a detailed 
-# description. Set this tag to YES if you prefer the old behaviour instead.
-
 MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
-# member inherits the documentation from any documented member that it 
-# re-implements.
-
 INHERIT_DOCS           = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
-# a new page for each member. If set to NO, the documentation of a member will 
-# be part of the file/class/namespace that contains it.
-
 SEPARATE_MEMBER_PAGES  = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
-# Doxygen uses this value to replace tabs by spaces in code fragments.
-
 TAB_SIZE               = 8
-
-# This tag can be used to specify a number of aliases that acts 
-# as commands in the documentation. An alias has the form "name=value". 
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
-# put the command \sideeffect (or @sideeffect) in the documentation, which 
-# will result in a user-defined paragraph with heading "Side Effects:". 
-# You can put \n's in the value part of an alias to insert newlines.
-
-ALIASES                = 
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
-# sources only. Doxygen will then generate output that is more tailored for C. 
-# For instance, some of the names that are used will be different. The list 
-# of all members will be omitted, etc.
-
+ALIASES                =
+TCL_SUBST              =
 OPTIMIZE_OUTPUT_FOR_C  = YES
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
-# sources only. Doxygen will then generate output that is more tailored for 
-# Java. For instance, namespaces will be presented as packages, qualified 
-# scopes will look different, etc.
-
 OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran 
-# sources only. Doxygen will then generate output that is more tailored for 
-# Fortran.
-
 OPTIMIZE_FOR_FORTRAN   = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL 
-# sources. Doxygen will then generate output that is tailored for 
-# VHDL.
-
 OPTIMIZE_OUTPUT_VHDL   = NO
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want 
-# to include (a tag file for) the STL sources as input, then you should 
-# set this tag to YES in order to let doxygen match functions declarations and 
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 
-# func(std::string) {}). This also make the inheritance and collaboration 
-# diagrams that involve STL classes more complete and accurate.
-
+EXTENSION_MAPPING      =
+MARKDOWN_SUPPORT       = YES
+AUTOLINK_SUPPORT       = YES
 BUILTIN_STL_SUPPORT    = NO
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-
 CPP_CLI_SUPPORT        = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. 
-# Doxygen will parse them like normal C++ but will assume all classes use public 
-# instead of private inheritance when no explicit protection keyword is present.
-
 SIP_SUPPORT            = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate getter 
-# and setter methods for a property. Setting this option to YES (the default) 
-# will make doxygen to replace the get and set methods by a property in the 
-# documentation. This will only work if the methods are indeed getting or 
-# setting a simple type. If this is not the case, or you want to show the 
-# methods anyway, you should set this option to NO.
-
 IDL_PROPERTY_SUPPORT   = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
-# tag is set to YES, then doxygen will reuse the documentation of the first 
-# member in the group (if any) for the other members of the group. By default 
-# all members of a group must be documented explicitly.
-
 DISTRIBUTE_GROUP_DOC   = YES
-
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
-# the same type (for instance a group of public functions) to be put as a 
-# subgroup of that type (e.g. under the Public Functions section). Set it to 
-# NO to prevent subgrouping. Alternatively, this can be done per class using 
-# the \nosubgrouping command.
-
 SUBGROUPING            = YES
-
-# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum 
-# is documented as struct, union, or enum with the name of the typedef. So 
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct 
-# with name TypeT. When disabled the typedef will appear as a member of a file, 
-# namespace, or class. And the struct will be named TypeS. This can typically 
-# be useful for C code in case the coding convention dictates that all compound 
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-
+INLINE_GROUPED_CLASSES = NO
+INLINE_SIMPLE_STRUCTS  = NO
 TYPEDEF_HIDES_STRUCT   = NO
-
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to 
-# determine which symbols to keep in memory and which to flush to disk.
-# When the cache is full, less often used symbols will be written to disk.
-# For small to medium size projects (<1000 input files) the default value is 
-# probably good enough. For larger projects a too small cache size can cause 
-# doxygen to be busy swapping symbols to and from disk most of the time 
-# causing a significant performance penality. 
-# If the system has enough physical memory increasing the cache will improve the 
-# performance by keeping more symbols in memory. Note that the value works on 
-# a logarithmic scale so increasing the size by one will rougly double the 
-# memory usage. The cache size is given by this formula: 
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, 
-# corresponding to a cache size of 2^16 = 65536 symbols
-
-SYMBOL_CACHE_SIZE      = 0
-
+LOOKUP_CACHE_SIZE      = 0
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
-# documentation are documented, even if no documentation was available. 
-# Private class members and static file members will be hidden unless 
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
 EXTRACT_ALL            = NO
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
-# will be included in the documentation.
-
 EXTRACT_PRIVATE        = NO
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file 
-# will be included in the documentation.
-
+EXTRACT_PACKAGE        = NO
 EXTRACT_STATIC         = NO
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
-# defined locally in source files will be included in the documentation. 
-# If set to NO only classes defined in header files are included.
-
 EXTRACT_LOCAL_CLASSES  = YES
-
-# This flag is only useful for Objective-C code. When set to YES local 
-# methods, which are defined in the implementation section but not in 
-# the interface are included in the documentation. 
-# If set to NO (the default) only methods in the interface are included.
-
 EXTRACT_LOCAL_METHODS  = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be 
-# extracted and appear in the documentation as a namespace called 
-# 'anonymous_namespace{file}', where file will be replaced with the base 
-# name of the file that contains the anonymous namespace. By default 
-# anonymous namespace are hidden.
-
 EXTRACT_ANON_NSPACES   = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
-# undocumented members of documented classes, files or namespaces. 
-# If set to NO (the default) these members will be included in the 
-# various overviews, but no documentation section is generated. 
-# This option has no effect if EXTRACT_ALL is enabled.
-
 HIDE_UNDOC_MEMBERS     = YES
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
-# undocumented classes that are normally visible in the class hierarchy. 
-# If set to NO (the default) these classes will be included in the various 
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
-
 HIDE_UNDOC_CLASSES     = YES
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
-# friend (class|struct|union) declarations. 
-# If set to NO (the default) these declarations will be included in the 
-# documentation.
-
 HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
-# documentation blocks found inside the body of a function. 
-# If set to NO (the default) these blocks will be appended to the 
-# function's detailed documentation block.
-
 HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation 
-# that is typed after a \internal command is included. If the tag is set 
-# to NO (the default) then the documentation will be excluded. 
-# Set it to YES to include the internal documentation.
-
 INTERNAL_DOCS          = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
-# file names in lower-case letters. If set to YES upper-case letters are also 
-# allowed. This is useful if you have classes or files whose names only differ 
-# in case and if your file system supports case sensitive file names. Windows 
-# and Mac users are advised to set this option to NO.
-
 CASE_SENSE_NAMES       = YES
-
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
-# will show members with their full class and namespace scopes in the 
-# documentation. If set to YES the scope will be hidden.
-
 HIDE_SCOPE_NAMES       = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
-# will put a list of the files that are included by a file in the documentation 
-# of that file.
-
 SHOW_INCLUDE_FILES     = NO
-
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
-# is inserted in the documentation for inline members.
-
+SHOW_GROUPED_MEMB_INC  = NO
+FORCE_LOCAL_INCLUDES   = NO
 INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
-# will sort the (detailed) documentation of file and class members 
-# alphabetically by member name. If set to NO the members will appear in 
-# declaration order.
-
 SORT_MEMBER_DOCS       = NO
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
-# brief documentation of file, namespace and class members alphabetically 
-# by member name. If set to NO (the default) the members will appear in 
-# declaration order.
-
 SORT_BRIEF_DOCS        = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the 
-# hierarchy of group names into alphabetical order. If set to NO (the default) 
-# the group names will appear in their defined order.
-
+SORT_MEMBERS_CTORS_1ST = NO
 SORT_GROUP_NAMES       = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
-# sorted by fully-qualified names, including namespaces. If set to 
-# NO (the default), the class list will be sorted only by class name, 
-# not including the namespace part. 
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the 
-# alphabetical list.
-
 SORT_BY_SCOPE_NAME     = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or 
-# disable (NO) the todo list. This list is created by putting \todo 
-# commands in the documentation.
-
+STRICT_PROTO_MATCHING  = NO
 GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or 
-# disable (NO) the test list. This list is created by putting \test 
-# commands in the documentation.
-
 GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or 
-# disable (NO) the bug list. This list is created by putting \bug 
-# commands in the documentation.
-
 GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
-# disable (NO) the deprecated list. This list is created by putting 
-# \deprecated commands in the documentation.
-
 GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional 
-# documentation sections, marked by \if sectionname ... \endif.
-
-ENABLED_SECTIONS       = 
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
-# the initial value of a variable or define consists of for it to appear in 
-# the documentation. If the initializer consists of more lines than specified 
-# here it will be hidden. Use a value of 0 to hide initializers completely. 
-# The appearance of the initializer of individual variables and defines in the 
-# documentation can be controlled using \showinitializer or \hideinitializer 
-# command in the documentation regardless of this setting.
-
+ENABLED_SECTIONS       =
 MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
-# at the bottom of the documentation of classes and structs. If set to YES the 
-# list will mention the files that were used to generate the documentation.
-
 SHOW_USED_FILES        = YES
-
-# If the sources in your project are distributed over multiple directories 
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
-# in the documentation. The default is NO.
-
-SHOW_DIRECTORIES       = NO
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
-# This will remove the Files entry from the Quick Index and from the 
-# Folder Tree View (if specified). The default is YES.
-
 SHOW_FILES             = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the 
-# Namespaces page.  This will remove the Namespaces entry from the Quick Index
-# and from the Folder Tree View (if specified). The default is YES.
-
 SHOW_NAMESPACES        = YES
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that 
-# doxygen should invoke to get the current version for each file (typically from 
-# the version control system). Doxygen will invoke the program by executing (via 
-# popen()) the command <command> <input-file>, where <command> is the value of 
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
-# provided by doxygen. Whatever the program writes to standard output 
-# is used as the file version. See the manual for examples.
-
-FILE_VERSION_FILTER    = 
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by 
-# doxygen. The layout file controls the global structure of the generated output files 
-# in an output format independent way. The create the layout file that represents 
-# doxygen's defaults, run doxygen with the -l option. You can optionally specify a 
-# file name after the option, if omitted DoxygenLayout.xml will be used as the name 
-# of the layout file.
-
-LAYOUT_FILE            = 
-
+FILE_VERSION_FILTER    =
+LAYOUT_FILE            =
+CITE_BIB_FILES         =
 #---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
+# Configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated 
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
-
 QUIET                  = YES
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are 
-# generated by doxygen. Possible values are YES and NO. If left blank 
-# NO is used.
-
 WARNINGS               = YES
-
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
-# automatically be disabled.
-
 WARN_IF_UNDOCUMENTED   = YES
-
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
-# potential errors in the documentation, such as not documenting some 
-# parameters in a documented function, or documenting parameters that 
-# don't exist or using markup commands wrongly.
-
 WARN_IF_DOC_ERROR      = YES
-
-# This WARN_NO_PARAMDOC option can be abled to get warnings for 
-# functions that are documented, but have no documentation for their parameters 
-# or return value. If set to NO (the default) doxygen will only warn about 
-# wrong or incomplete parameter documentation, but not about the absence of 
-# documentation.
-
 WARN_NO_PARAMDOC       = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that 
-# doxygen can produce. The string should contain the $file, $line, and $text 
-# tags, which will be replaced by the file and line number from which the 
-# warning originated and the warning text. Optionally the format may contain 
-# $version, which will be replaced by the version of the file (if it could 
-# be obtained via FILE_VERSION_FILTER)
-
 WARN_FORMAT            = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning 
-# and error messages should be written. If left blank the output is written 
-# to stderr.
-
-WARN_LOGFILE           = 
-
+WARN_LOGFILE           =
 #---------------------------------------------------------------------------
-# configuration options related to the input files
+# Configuration options related to the input files
 #---------------------------------------------------------------------------
-
-# The INPUT tag can be used to specify the files and/or directories that contain 
-# documented source files. You may enter file names like "myfile.cpp" or 
-# directories like "/usr/src/myproject". Separate the files or directories 
-# with spaces.
-
 INPUT                  = ../include/sane/
-
-# This tag can be used to specify the character encoding of the source files 
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
-# also the default input encoding. Doxygen uses libiconv (or the iconv built 
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for 
-# the list of possible encodings.
-
 INPUT_ENCODING         = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the 
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank the following patterns are tested: 
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
-# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
-
 FILE_PATTERNS          = sanei*.h
-
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
-# should be searched for input files as well. Possible values are YES and NO. 
-# If left blank NO is used.
-
 RECURSIVE              = NO
-
-# The EXCLUDE tag can be used to specify files and/or directories that should 
-# excluded from the INPUT source files. This way you can easily exclude a 
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-
-EXCLUDE                = 
-
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
-# directories that are symbolic links (a Unix filesystem feature) are excluded 
-# from the input.
-
+EXCLUDE                =
 EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the 
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
-# certain files from those directories. Note that the wildcards are matched 
-# against the file with absolute path, so to exclude all test directories 
-# for example use the pattern */test/*
-
-EXCLUDE_PATTERNS       = 
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
-# (namespaces, classes, functions, etc.) that should be excluded from the 
-# output. The symbol name can be a fully qualified name, a word, or if the 
-# wildcard * is used, a substring. Examples: ANamespace, AClass, 
-# AClass::ANamespace, ANamespace::*Test
-
-EXCLUDE_SYMBOLS        = 
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or 
-# directories that contain example code fragments that are included (see 
-# the \include command).
-
-EXAMPLE_PATH           = 
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank all files are included.
-
-EXAMPLE_PATTERNS       = 
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
-# searched for input files to be used with the \include or \dontinclude 
-# commands irrespective of the value of the RECURSIVE tag. 
-# Possible values are YES and NO. If left blank NO is used.
-
+EXCLUDE_PATTERNS       =
+EXCLUDE_SYMBOLS        =
+EXAMPLE_PATH           =
+EXAMPLE_PATTERNS       =
 EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or 
-# directories that contain image that are included in the documentation (see 
-# the \image command).
-
 IMAGE_PATH             = ./
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should 
-# invoke to filter for each input file. Doxygen will invoke the filter program 
-# by executing (via popen()) the command <filter> <input-file>, where <filter> 
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
-# input file. Doxygen will then use the output that the filter program writes 
-# to standard output.  If FILTER_PATTERNS is specified, this tag will be 
-# ignored.
-
-INPUT_FILTER           = 
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
-# basis.  Doxygen will compare the file name with each pattern and apply the 
-# filter if there is a match.  The filters are a list of the form: 
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER 
-# is applied to all files.
-
-FILTER_PATTERNS        = 
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
-# INPUT_FILTER) will be used to filter the input files when producing source 
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
-
+INPUT_FILTER           =
+FILTER_PATTERNS        =
 FILTER_SOURCE_FILES    = NO
-
+FILTER_SOURCE_PATTERNS =
+USE_MDFILE_AS_MAINPAGE =
 #---------------------------------------------------------------------------
-# configuration options related to source browsing
+# Configuration options related to source browsing
 #---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
-# be generated. Documented entities will be cross-referenced with these sources. 
-# Note: To get rid of all source code in the generated output, make sure also 
-# VERBATIM_HEADERS is set to NO.
-
 SOURCE_BROWSER         = NO
-
-# Setting the INLINE_SOURCES tag to YES will include the body 
-# of functions and classes directly in the documentation.
-
 INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
-# doxygen to hide any special comment blocks from generated source code 
-# fragments. Normal C and C++ comments will always remain visible.
-
 STRIP_CODE_COMMENTS    = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES 
-# then for each documented function all documented 
-# functions referencing it will be listed.
-
 REFERENCED_BY_RELATION = YES
-
-# If the REFERENCES_RELATION tag is set to YES 
-# then for each documented function all documented entities 
-# called/used by that function will be listed.
-
 REFERENCES_RELATION    = YES
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
-# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
-# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
-# link to the source code.  Otherwise they will link to the documentstion.
-
 REFERENCES_LINK_SOURCE = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code 
-# will point to the HTML generated by the htags(1) tool instead of doxygen 
-# built-in source browser. The htags tool is part of GNU's global source 
-# tagging system (see http://www.gnu.org/software/global/global.html). You 
-# will need version 4.8.6 or higher.
-
+SOURCE_TOOLTIPS        = YES
 USE_HTAGS              = NO
-
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
-# will generate a verbatim copy of the header file for each class for 
-# which an include is specified. Set to NO to disable this.
-
 VERBATIM_HEADERS       = YES
-
+CLANG_ASSISTED_PARSING = NO
+CLANG_OPTIONS          =
 #---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
+# Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
-# of all compounds will be generated. Enable this if the project 
-# contains a lot of classes, structs, unions or interfaces.
-
 ALPHABETICAL_INDEX     = NO
-
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
-# in which this list will be split (can be a number in the range [1..20])
-
 COLS_IN_ALPHA_INDEX    = 5
-
-# In case all classes in a project start with a common prefix, all 
-# classes will be put under the same header in the alphabetical index. 
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
-# should be ignored while generating the index headers.
-
-IGNORE_PREFIX          = 
-
+IGNORE_PREFIX          =
 #---------------------------------------------------------------------------
-# configuration options related to the HTML output
+# Configuration options related to the HTML output
 #---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
-# generate HTML output.
-
 GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `html' will be used as the default path.
-
 HTML_OUTPUT            = ./sanei-html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
-# doxygen will generate files with .html extension.
-
 HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a personal HTML header for 
-# each generated HTML page. If it is left blank doxygen will generate a 
-# standard header.
-
-HTML_HEADER            = 
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
-# each generated HTML page. If it is left blank doxygen will generate a 
-# standard footer.
-
-HTML_FOOTER            = 
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
-# style sheet that is used by each HTML page. It can be used to 
-# fine-tune the look of the HTML output. If the tag is left blank doxygen 
-# will generate a default style sheet. Note that doxygen will try to copy 
-# the style sheet file to the HTML output directory, so don't put your own 
-# stylesheet in the HTML output directory as well, or it will be erased!
-
-HTML_STYLESHEET        = 
-
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
-# files or namespaces will be aligned in HTML using tables. If set to 
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS     = YES
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
-# documentation will contain sections that can be hidden and shown after the 
-# page has loaded. For this to work a browser that supports 
-# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox 
-# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
-
+HTML_HEADER            =
+HTML_FOOTER            =
+HTML_STYLESHEET        =
+HTML_EXTRA_STYLESHEET  =
+HTML_EXTRA_FILES       =
+HTML_COLORSTYLE_HUE    = 220
+HTML_COLORSTYLE_SAT    = 100
+HTML_COLORSTYLE_GAMMA  = 80
+HTML_TIMESTAMP         = YES
 HTML_DYNAMIC_SECTIONS  = NO
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files 
-# will be generated that can be used as input for Apple's Xcode 3 
-# integrated development environment, introduced with OSX 10.5 (Leopard). 
-# To create a documentation set, doxygen will generate a Makefile in the 
-# HTML output directory. Running make will produce the docset in that 
-# directory and running "make install" will install the docset in 
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find 
-# it at startup. 
-# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
-
+HTML_INDEX_NUM_ENTRIES = 100
 GENERATE_DOCSET        = NO
-
-# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the 
-# feed. A documentation feed provides an umbrella under which multiple 
-# documentation sets from a single provider (such as a company or product suite) 
-# can be grouped.
-
 DOCSET_FEEDNAME        = "Doxygen generated docs"
-
-# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that 
-# should uniquely identify the documentation set bundle. This should be a 
-# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen 
-# will append .docset to the name.
-
 DOCSET_BUNDLE_ID       = org.doxygen.Project
-
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
-# will be generated that can be used as input for tools like the 
-# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) 
-# of the generated HTML documentation.
-
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+DOCSET_PUBLISHER_NAME  = Publisher
 GENERATE_HTMLHELP      = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
-# be used to specify the file name of the resulting .chm file. You 
-# can add a path in front of the file if the result should not be 
-# written to the html output directory.
-
-CHM_FILE               = 
-
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
-# be used to specify the location (absolute path including file name) of 
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
-# the HTML help compiler on the generated index.hhp.
-
-HHC_LOCATION           = 
-
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
-# controls if a separate .chi index file is generated (YES) or that 
-# it should be included in the master .chm file (NO).
-
+CHM_FILE               =
+HHC_LOCATION           =
 GENERATE_CHI           = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
-# is used to encode HtmlHelp index (hhk), content (hhc) and project file
-# content.
-
-CHM_INDEX_ENCODING     = 
-
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
-# controls whether a binary table of contents is generated (YES) or a 
-# normal table of contents (NO) in the .chm file.
-
+CHM_INDEX_ENCODING     =
 BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members 
-# to the contents of the HTML help documentation and to the tree view.
-
 TOC_EXPAND             = NO
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER 
-# are set, an additional index file will be generated that can be used as input for 
-# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated 
-# HTML documentation.
-
 GENERATE_QHP           = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can 
-# be used to specify the file name of the resulting .qch file. 
-# The path specified is relative to the HTML output folder.
-
-QCH_FILE               = 
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating 
-# Qt Help Project output. For more information please see 
-# <a href="http://doc.trolltech.com/qthelpproject.html#namespace">Qt Help Project / Namespace</a>.
-
+QCH_FILE               =
 QHP_NAMESPACE          = org.doxygen.Project
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating 
-# Qt Help Project output. For more information please see 
-# <a href="http://doc.trolltech.com/qthelpproject.html#virtual-folders">Qt Help Project / Virtual Folders</a>.
-
 QHP_VIRTUAL_FOLDER     = doc
-
-# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can 
-# be used to specify the location of Qt's qhelpgenerator. 
-# If non-empty doxygen will try to run qhelpgenerator on the generated 
-# .qhp file .
-
-QHG_LOCATION           = 
-
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
-# top of each HTML page. The value NO (the default) enables the index and 
-# the value YES disables it.
-
+QHP_CUST_FILTER_NAME   =
+QHP_CUST_FILTER_ATTRS  =
+QHP_SECT_FILTER_ATTRS  =
+QHG_LOCATION           =
+GENERATE_ECLIPSEHELP   = NO
+ECLIPSE_DOC_ID         = org.doxygen.Project
 DISABLE_INDEX          = NO
-
-# This tag can be used to set the number of enum values (range [1..20]) 
-# that doxygen will group on one line in the generated HTML documentation.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information.
-# If the tag value is set to FRAME, a side panel will be generated
-# containing a tree-like index structure (just like the one that 
-# is generated for HTML Help). For this to work a browser that supports 
-# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
-# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
-# probably better off using the HTML help feature. Other possible values 
-# for this tag are: HIERARCHIES, which will generate the Groups, Directories,
-# and Class Hierarchy pages using a tree view instead of an ordered list;
-# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which
-# disables this behavior completely. For backwards compatibility with previous
-# releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE
-# respectively.
-
 GENERATE_TREEVIEW      = NO
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
-# used to set the initial width (in pixels) of the frame in which the tree 
-# is shown.
-
+ENUM_VALUES_PER_LINE   = 4
 TREEVIEW_WIDTH         = 250
-
-# Use this tag to change the font size of Latex formulas included 
-# as images in the HTML documentation. The default is 10. Note that 
-# when you change the font size after a successful doxygen run you need 
-# to manually remove any form_*.png images from the HTML output directory 
-# to force them to be regenerated.
-
+EXT_LINKS_IN_WINDOW    = NO
 FORMULA_FONTSIZE       = 10
-
+FORMULA_TRANSPARENT    = YES
+USE_MATHJAX            = NO
+MATHJAX_FORMAT         = HTML-CSS
+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+MATHJAX_EXTENSIONS     =
+MATHJAX_CODEFILE       =
+SEARCHENGINE           = NO
+SERVER_BASED_SEARCH    = NO
+EXTERNAL_SEARCH        = NO
+SEARCHENGINE_URL       =
+SEARCHDATA_FILE        = searchdata.xml
+EXTERNAL_SEARCH_ID     =
+EXTRA_SEARCH_MAPPINGS  =
 #---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
+# Configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
-# generate Latex output.
-
 GENERATE_LATEX         = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `latex' will be used as the default path.
-
-LATEX_OUTPUT           = 
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
-# invoked. If left blank `latex' will be used as the default command name.
-
+LATEX_OUTPUT           =
 LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
-# generate index for LaTeX. If left blank `makeindex' will be used as the 
-# default command name.
-
 MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
-# LaTeX documents. This may be useful for small projects and may help to 
-# save some trees in general.
-
 COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used 
-# by the printer. Possible values are: a4, a4wide, letter, legal and 
-# executive. If left blank a4wide will be used.
-
 PAPER_TYPE             = a4wide
-
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
-# packages that should be included in the LaTeX output.
-
-EXTRA_PACKAGES         = 
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
-# the generated latex document. The header should contain everything until 
-# the first chapter. If it is left blank doxygen will generate a 
-# standard header. Notice: only use this tag if you know what you are doing!
-
-LATEX_HEADER           = 
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
-# contain links (just like the HTML output) instead of page references 
-# This makes the output suitable for online browsing using a pdf viewer.
-
+EXTRA_PACKAGES         =
+LATEX_HEADER           =
+LATEX_FOOTER           =
+LATEX_EXTRA_FILES      =
 PDF_HYPERLINKS         = NO
-
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
-# plain latex in the generated Makefile. Set this option to YES to get a 
-# higher quality PDF documentation.
-
 USE_PDFLATEX           = NO
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
-# command to the generated LaTeX files. This will instruct LaTeX to keep 
-# running if errors occur, instead of asking the user for help. 
-# This option is also used when generating formulas in HTML.
-
 LATEX_BATCHMODE        = NO
-
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
-# include the index chapters (such as File Index, Compound Index, etc.) 
-# in the output.
-
 LATEX_HIDE_INDICES     = NO
-
+LATEX_SOURCE_CODE      = NO
+LATEX_BIB_STYLE        = plain
 #---------------------------------------------------------------------------
-# configuration options related to the RTF output
+# Configuration options related to the RTF output
 #---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
-# The RTF output is optimized for Word 97 and may not look very pretty with 
-# other RTF readers or editors.
-
 GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `rtf' will be used as the default path.
-
 RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
-# RTF documents. This may be useful for small projects and may help to 
-# save some trees in general.
-
 COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
-# will contain hyperlink fields. The RTF file will 
-# contain links (just like the HTML output) instead of page references. 
-# This makes the output suitable for online browsing using WORD or other 
-# programs which support those fields. 
-# Note: wordpad (write) and others do not support links.
-
 RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's 
-# config file, i.e. a series of assignments. You only have to provide 
-# replacements, missing definitions are set to their default value.
-
-RTF_STYLESHEET_FILE    = 
-
-# Set optional variables used in the generation of an rtf document. 
-# Syntax is similar to doxygen's config file.
-
-RTF_EXTENSIONS_FILE    = 
-
+RTF_STYLESHEET_FILE    =
+RTF_EXTENSIONS_FILE    =
 #---------------------------------------------------------------------------
-# configuration options related to the man page output
+# Configuration options related to the man page output
 #---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
-# generate man pages
-
 GENERATE_MAN           = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `man' will be used as the default path.
-
 MAN_OUTPUT             = man
-
-# The MAN_EXTENSION tag determines the extension that is added to 
-# the generated man pages (default is the subroutine's section .3)
-
 MAN_EXTENSION          = .3
-
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
-# then it will generate one additional man file for each entity 
-# documented in the real man page(s). These additional files 
-# only source the real man page, but without them the man command 
-# would be unable to find the correct page. The default is NO.
-
+MAN_SUBDIR             =
 MAN_LINKS              = NO
-
 #---------------------------------------------------------------------------
-# configuration options related to the XML output
+# Configuration options related to the XML output
 #---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES Doxygen will 
-# generate an XML file that captures the structure of 
-# the code including all documentation.
-
 GENERATE_XML           = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `xml' will be used as the default path.
-
 XML_OUTPUT             = xml
-
-# The XML_SCHEMA tag can be used to specify an XML schema, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
-
-XML_SCHEMA             = 
-
-# The XML_DTD tag can be used to specify an XML DTD, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
-
-XML_DTD                = 
-
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
-# dump the program listings (including syntax highlighting 
-# and cross-referencing information) to the XML output. Note that 
-# enabling this will significantly increase the size of the XML output.
-
 XML_PROGRAMLISTING     = YES
-
 #---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+GENERATE_DOCBOOK       = NO
+DOCBOOK_OUTPUT         = docbook
+DOCBOOK_PROGRAMLISTING = NO
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
-# generate an AutoGen Definitions (see autogen.sf.net) file 
-# that captures the structure of the code including all 
-# documentation. Note that this feature is still experimental 
-# and incomplete at the moment.
-
 GENERATE_AUTOGEN_DEF   = NO
-
 #---------------------------------------------------------------------------
-# configuration options related to the Perl module output
+# Configuration options related to the Perl module output
 #---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
-# generate a Perl module file that captures the structure of 
-# the code including all documentation. Note that this 
-# feature is still experimental and incomplete at the 
-# moment.
-
 GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
-# to generate PDF and DVI output from the Perl module output.
-
 PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
-# nicely formatted so it can be parsed by a human reader.  This is useful 
-# if you want to understand what is going on.  On the other hand, if this 
-# tag is set to NO the size of the Perl module output will be much smaller 
-# and Perl will parse it just the same.
-
 PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file 
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
-# This is useful so different doxyrules.make files included by the same 
-# Makefile don't overwrite each other's variables.
-
-PERLMOD_MAKEVAR_PREFIX = 
-
+PERLMOD_MAKEVAR_PREFIX =
 #---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
+# Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
-# evaluate all C-preprocessor directives found in the sources and include 
-# files.
-
 ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
-# names in the source code. If set to NO (the default) only conditional 
-# compilation will be performed. Macro expansion can be done in a controlled 
-# way by setting EXPAND_ONLY_PREDEF to YES.
-
 MACRO_EXPANSION        = NO
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
-# then the macro expansion is limited to the macros specified with the 
-# PREDEFINED and EXPAND_AS_DEFINED tags.
-
 EXPAND_ONLY_PREDEF     = NO
-
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
-
 SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that 
-# contain include files that are not input files but should be processed by 
-# the preprocessor.
-
-INCLUDE_PATH           = 
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
-# patterns (like *.h and *.hpp) to filter out the header-files in the 
-# directories. If left blank, the patterns specified with FILE_PATTERNS will 
-# be used.
-
-INCLUDE_FILE_PATTERNS  = 
-
-# The PREDEFINED tag can be used to specify one or more macro names that 
-# are defined before the preprocessor is started (similar to the -D option of 
-# gcc). The argument of the tag is a list of macros of the form: name 
-# or name=definition (no spaces). If the definition and the = are 
-# omitted =1 is assumed. To prevent a macro definition from being 
-# undefined via #undef or recursively expanded use the := operator 
-# instead of the = operator.
-
-PREDEFINED             = 
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
-# this tag can be used to specify a list of macro names that should be expanded. 
-# The macro definition that is found in the sources will be used. 
-# Use the PREDEFINED tag if you want to use a different macro definition.
-
-EXPAND_AS_DEFINED      = 
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
-# doxygen's preprocessor will remove all function-like macros that are alone 
-# on a line, have an all uppercase name, and do not end with a semicolon. Such 
-# function macros are typically used for boiler-plate code, and will confuse 
-# the parser if not removed.
-
+INCLUDE_PATH           =
+INCLUDE_FILE_PATTERNS  =
+PREDEFINED             =
+EXPAND_AS_DEFINED      =
 SKIP_FUNCTION_MACROS   = YES
-
 #---------------------------------------------------------------------------
-# Configuration::additions related to external references   
+# Configuration options related to external references
 #---------------------------------------------------------------------------
-
-# The TAGFILES option can be used to specify one or more tagfiles. 
-# Optionally an initial location of the external documentation 
-# can be added for each tagfile. The format of a tag file without 
-# this location is as follows: 
-#   TAGFILES = file1 file2 ... 
-# Adding location for the tag files is done as follows: 
-#   TAGFILES = file1=loc1 "file2 = loc2" ... 
-# where "loc1" and "loc2" can be relative or absolute paths or 
-# URLs. If a location is present for each tag, the installdox tool 
-# does not have to be run to correct the links.
-# Note that each tag file must have a unique name
-# (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen 
-# is run, you must also specify the path to the tagfile here.
-
-TAGFILES               = 
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
-# a tag file that is based on the input files it reads.
-
-GENERATE_TAGFILE       = 
-
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
-# in the class index. If set to NO only the inherited external classes 
-# will be listed.
-
+TAGFILES               =
+GENERATE_TAGFILE       =
 ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
-# in the modules index. If set to NO, only the current project's groups will 
-# be listed.
-
 EXTERNAL_GROUPS        = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script 
-# interpreter (i.e. the result of `which perl').
-
+EXTERNAL_PAGES         = YES
 PERL_PATH              = /usr/bin/perl
-
 #---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
+# Configuration options related to the dot tool
 #---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
-# or super classes. Setting the tag to NO turns the diagrams off. Note that 
-# this option is superseded by the HAVE_DOT option below. This is only a 
-# fallback. It is recommended to install and use dot, since it yields more 
-# powerful graphs.
-
 CLASS_DIAGRAMS         = NO
-
-# You can define message sequence charts within doxygen comments using the \msc 
-# command. Doxygen will then run the mscgen tool (see 
-# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the 
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where 
-# the mscgen tool resides. If left empty the tool is assumed to be found in the 
-# default search path.
-
-MSCGEN_PATH            = 
-
-# If set to YES, the inheritance and collaboration graphs will hide 
-# inheritance and usage relations if the target is undocumented 
-# or is not a class.
-
+MSCGEN_PATH            =
+DIA_PATH               =
 HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
-# available from the path. This tool is part of Graphviz, a graph visualization 
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
-# have no effect if this option is set to NO (the default)
-
 HAVE_DOT               = NO
-
-# By default doxygen will write a font called FreeSans.ttf to the output 
-# directory and reference it in all dot files that doxygen generates. This 
-# font does not include all possible unicode characters however, so when you need 
-# these (or just want a differently looking font) you can specify the font name 
-# using DOT_FONTNAME. You need need to make sure dot is able to find the font, 
-# which can be done by putting it in a standard location or by setting the 
-# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory 
-# containing the font.
-
-DOT_FONTNAME           = FreeSans
-
-# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. 
-# The default size is 10pt.
-
+DOT_NUM_THREADS        = 0
+DOT_FONTNAME           =
 DOT_FONTSIZE           = 10
-
-# By default doxygen will tell dot to use the output directory to look for the 
-# FreeSans.ttf font (which doxygen will put there itself). If you specify a 
-# different font using DOT_FONTNAME you can set the path where dot 
-# can find it using this tag.
-
-DOT_FONTPATH           = 
-
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect inheritance relations. Setting this tag to YES will force the 
-# the CLASS_DIAGRAMS tag to NO.
-
+DOT_FONTPATH           =
 CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect implementation dependencies (inheritance, containment, and 
-# class references variables) of the class with other documented classes.
-
 COLLABORATION_GRAPH    = YES
-
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for groups, showing the direct groups dependencies
-
 GROUP_GRAPHS           = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
-# collaboration diagrams in a style similar to the OMG's Unified Modeling 
-# Language.
-
 UML_LOOK               = NO
-
-# If set to YES, the inheritance and collaboration graphs will show the 
-# relations between templates and their instances.
-
+UML_LIMIT_NUM_FIELDS   = 10
 TEMPLATE_RELATIONS     = NO
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
-# tags are set to YES then doxygen will generate a graph for each documented 
-# file showing the direct and indirect include dependencies of the file with 
-# other documented files.
-
 INCLUDE_GRAPH          = YES
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
-# documented header file showing the documented files that directly or 
-# indirectly include this file.
-
 INCLUDED_BY_GRAPH      = YES
-
-# If the CALL_GRAPH and HAVE_DOT options are set to YES then 
-# doxygen will generate a call dependency graph for every global function 
-# or class method. Note that enabling this option will significantly increase 
-# the time of a run. So in most cases it will be better to enable call graphs 
-# for selected functions only using the \callgraph command.
-
 CALL_GRAPH             = NO
-
-# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then 
-# doxygen will generate a caller dependency graph for every global function 
-# or class method. Note that enabling this option will significantly increase 
-# the time of a run. So in most cases it will be better to enable caller 
-# graphs for selected functions only using the \callergraph command.
-
 CALLER_GRAPH           = NO
-
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
-# will graphical hierarchy of all classes instead of a textual one.
-
 GRAPHICAL_HIERARCHY    = YES
-
-# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
-# then doxygen will show the dependencies a directory has on other directories 
-# in a graphical way. The dependency relations are determined by the #include
-# relations between the files in the directories.
-
 DIRECTORY_GRAPH        = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
-# generated by dot. Possible values are png, jpg, or gif
-# If left blank png will be used.
-
 DOT_IMAGE_FORMAT       = png
-
-# The tag DOT_PATH can be used to specify the path where the dot tool can be 
-# found. If left blank, it is assumed the dot tool can be found in the path.
-
-DOT_PATH               = 
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that 
-# contain dot files that are included in the documentation (see the 
-# \dotfile command).
-
-DOTFILE_DIRS           = 
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
-# nodes that will be shown in the graph. If the number of nodes in a graph 
-# becomes larger than this value, doxygen will truncate the graph, which is 
-# visualized by representing a node as a red box. Note that doxygen if the 
-# number of direct children of the root node in a graph is already larger than 
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note 
-# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-
+INTERACTIVE_SVG        = NO
+DOT_PATH               =
+DOTFILE_DIRS           =
+MSCFILE_DIRS           =
+DIAFILE_DIRS           =
+PLANTUML_JAR_PATH      =
 DOT_GRAPH_MAX_NODES    = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
-# graphs generated by dot. A depth value of 3 means that only nodes reachable 
-# from the root by following a path via at most 3 edges will be shown. Nodes 
-# that lay further from the root node will be omitted. Note that setting this 
-# option to 1 or 2 may greatly reduce the computation time needed for large 
-# code bases. Also note that the size of a graph can be further restricted by 
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-
 MAX_DOT_GRAPH_DEPTH    = 0
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
-# background. This is disabled by default, because dot on Windows does not 
-# seem to support this out of the box. Warning: Depending on the platform used, 
-# enabling this option may lead to badly anti-aliased labels on the edges of 
-# a graph (i.e. they become hard to read).
-
 DOT_TRANSPARENT        = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
-# files in one run (i.e. multiple -o and -T options on the command line). This 
-# makes dot run faster, but since only newer versions of dot (>1.8.10) 
-# support this, this feature is disabled by default.
-
 DOT_MULTI_TARGETS      = NO
-
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
-# generate a legend page explaining the meaning of the various boxes and 
-# arrows in the dot generated graphs.
-
 GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
-# remove the intermediate dot files that are used to generate 
-# the various graphs.
-
 DOT_CLEANUP            = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine   
-#---------------------------------------------------------------------------
-
-# The SEARCHENGINE tag specifies whether or not a search engine should be 
-# used. If set to NO the values of all tags below this one will be ignored.
-
-SEARCHENGINE           = NO
diff --git a/doc/gamma4scanimage.man b/doc/gamma4scanimage.man
index fe81b15..576d148 100644
--- a/doc/gamma4scanimage.man
+++ b/doc/gamma4scanimage.man
@@ -3,9 +3,9 @@
 .SH NAME
 gamma4scanimage \- create a gamma table for scanimage
 .SH SYNOPSIS
-.B gamma4scanimage 
+.B gamma4scanimage
 .I gamma
-.RI [ shadow 
+.RI [ shadow
 .RI [ highlight
 .RI [ maxin
 .RI [ maxout ]]]]
@@ -52,7 +52,7 @@ defines the maximum output value. Take a look at the output of scanimage \-h to
 find out what maxout has to be. The default value is 255.
 .PP
 .SH EXAMPLE
-.B scanimage \-\-custom\-gamma=yes \-\-gamma\-table 
+.B scanimage \-\-custom\-gamma=yes \-\-gamma\-table
 .I `gamma4scanimage 1.8 0 11500 16383 255`
 >image.pnm
 
diff --git a/doc/gt68xx/gt68xx.CHANGES b/doc/gt68xx/gt68xx.CHANGES
index 43f2e85..aa87504 100644
--- a/doc/gt68xx/gt68xx.CHANGES
+++ b/doc/gt68xx/gt68xx.CHANGES
@@ -17,7 +17,7 @@ V 1.0.82 (2006-10-03)
 V 1.0.81 (2006-05-21)
 
 * Added support for Plustek OpticPro S24 (some models). Added .conf entry for
-  Plustek OpticPro S12. 
+  Plustek OpticPro S12.
 
 V 1.0.80 (2006-01-02)
 
@@ -34,7 +34,7 @@ V 1.0.79 (2005-12-09) sane-backends 1.0.17
   scanners are not detected anymore after closing the device.
 * Fixed wait_lamp_stable. Wait for a maximum time of 60 seconds. Print
   warming up message after 5 seconds. Print how long warming up took.
-* For Mustek ScanExpress A3 USB, use more intelligent warm-up mechanism. The 
+* For Mustek ScanExpress A3 USB, use more intelligent warm-up mechanism. The
   brightness for this scanner first decreases and then increases again. With the
   previous logic the scanner always warmed up for at least 10 seconds even if it
   wasn't necessary.
@@ -50,7 +50,7 @@ V 1.0.78 (2005-10-16)
 V 1.0.77 (2005-09-29)
 
 * Added support for Plustek OpticSlim M12 (untested). Based on patch from
-  Gerhard Jaeger <gerhard@gjaeger.de>. 
+  Gerhard Jaeger <gerhard@gjaeger.de>.
 * Fixed gt68xx homepage links in man page. Changed minimum version of libusb
   to 0.1.8.
 
@@ -290,7 +290,7 @@ V 1.0-55 (2004-03-06)
 * Added detection for Genius Vivid 1200 EX.
 * Fixed product id of Mustek BearPaw 2448 TA Plus.
 * Other minor updates.
- 
+
 V 1.0-54 (2004-02-10)
 
 * Added basic support for Plustek OpticSlim 2400. Thanks to Radoslaw Grzanka and
@@ -335,7 +335,7 @@ V 1.0-49 (2003-09-30)
 * Added ScanMagic 1200 UB Plus to man page and .desc.
 * Added Settings for Plustek OpticSlim 1200
 * Added detection of Genius Vivid 4x. It won't work out-of-the-box, however.
-* CCD coarse calib shouldn't run into an endless loop anymore. Plustek 1248U 
+* CCD coarse calib shouldn't run into an endless loop anymore. Plustek 1248U
   is much faster now.
 
 V 1.0-48 (2003-07-25)
@@ -376,7 +376,7 @@ V 1.0-43 (2003-03-06)
 - Small requests are done with a response buffer of 8 bytes (instead of 64)
   now. Looks like GT-6816 based scanners return 8 bytes if the firmware is
   loaded and 64 bytes if it's not loaded.
-- Changed GT-6816 firmware check to ignore errors from above change. 
+- Changed GT-6816 firmware check to ignore errors from above change.
   GT-6816 scanners work with the BSDs now (at least once).
 - Updated manpage concerning the BSDs.
 
@@ -527,8 +527,8 @@ V 1.0-27 (2002-10-25)
 - Removed override for Trust Copmact Scan and Medion/Tevion/Lifetec LT 9452
   (Mustek ScanExpress 1200 UB Plus clones).
 - Removed override for Tevion MD 9458 (seems to be an Artec Ultima 2000 (e +?)
-  clone). 
-  
+  clone).
+
 V 1.0-26 (2002-10-22)
 
 - Several fixes for Medion MD-9385 and Artec Ultima 2000 based scanners. The
diff --git a/doc/leo/leo.txt b/doc/leo/leo.txt
index 4f4eb61..26dbe21 100644
--- a/doc/leo/leo.txt
+++ b/doc/leo/leo.txt
@@ -3,8 +3,8 @@
 
 Across Technologies FS-1130
 (A rebadged LEO Technologies)
- 000: 06 31 14 01 1f 00 00 00 41 43 52 4f 53 53 20 20    .1......ACROSS  
- 016: 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20                    
+ 000: 06 31 14 01 1f 00 00 00 41 43 52 4f 53 53 20 20    .1......ACROSS
+ 016: 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20
  032: 31 2e 31 36 09 f6 0d b6 01 2c 01 2c 39 36 30 30    1.16.....,.,9600
 
 
@@ -16,12 +16,12 @@ LEO LEOScan S3:
 or
  000: 06 00 02 02 1f 00 00 00 4c 45 4f 00 00 00 00 00    ........LEO.....
  016: 4c 45 4f 53 63 61 6e 2d 53 33 00 00 00 00 00 00    LEOScan-S3......
- 032: 31 2e 31 30                                        1.10 
+ 032: 31 2e 31 30                                        1.10
 
 Genius FS1130
  000: 06 31 14 01 1f 00 00 00 4b 59 45 20 43 4f 52 50    .1......KYE CORP
  016: 43 6f 6c 6f 72 50 61 67 65 2d 43 53 20 20 20 20    ColorPage-CS
- 032: 31 2e 31 34                                        1.14 
+ 032: 31 2e 31 34                                        1.14
 
 /*--------------------------------------------------------------------------*/
 
@@ -52,7 +52,7 @@ Start a scan
 SET WINDOW
 24 00 00 00 00 00 30 00 00 00
 Total length is 48 bytes
-  01 = 0x2E (may be 0x30 - 2, ie total length -2)  
+  01 = 0x2E (may be 0x30 - 2, ie total length -2)
   07 = length (48-8 = 40 = 0x28)
   10-11 = X Resolution
   12-13 = Y resolution
@@ -66,7 +66,7 @@ Total length is 48 bytes
 		0x01 = halftone
         0x02 = grayscale
         0x05 = color
-  34 = bit depth  
+  34 = bit depth
         1 or 8
   37 = ? RIF + other
   43 = ? 0x01
@@ -77,7 +77,7 @@ READ
 
 
 SEND
-2A 00 03 00 00 01 00 03 00 00 
+2A 00 03 00 00 01 00 03 00 00
 2A 00 02 00 00 0F 00 01 00 00
   2 = data type code
     0x02 = halftone pattern
@@ -89,13 +89,13 @@ GET DATA BUFFER STATUS
   7-8 allocation length
 
   returned buffer is 0x10 bytes long.
-  00 00 0D 00 00 00 03 D3 60 00 00 00 01 48 00 EE 
-  
+  00 00 0D 00 00 00 03 D3 60 00 00 00 01 48 00 EE
+
     0-2 = additional length (0x10-3 = 0x0D)
     6-8 = (?) total scan length
    9-11 = filled data buffer
   12-13 = number of lines left (decrease during a scan)
-  14-15 = bytes per line (constant during a scan)  
+  14-15 = bytes per line (constant during a scan)
 
 
 /*--------------------------------------------------------------------------*/
@@ -119,7 +119,7 @@ park the CCD:
   SET WINDOWS
   TUR
   SCAN
-  
+
 /*--------------------------------------------------------------------------*/
 
 Command sequence for the S3
diff --git a/doc/matsushita/matsushita.txt b/doc/matsushita/matsushita.txt
index 72b8fcd..0de6d94 100644
--- a/doc/matsushita/matsushita.txt
+++ b/doc/matsushita/matsushita.txt
@@ -38,12 +38,12 @@ REQUEST SENSE:
 INQUIRY:
 12 00 00 00 60 00
   result:
-    06 00 02 02 5B 00 00 10 4B 2E 4D 2E 45 2E 20 20 
-    4B 56 2D 53 53 32 35 41 20 20 20 20 20 20 20 20 
-    31 2E 30 35 00 00 00 00 00 00 00 00 00 00 00 00 
-    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
-    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
-    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
+    06 00 02 02 5B 00 00 10 4B 2E 4D 2E 45 2E 20 20
+    4B 56 2D 53 53 32 35 41 20 20 20 20 20 20 20 20
+    31 2E 30 35 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 
 SET WINDOWS:
 24 00 00 00 00 00 00 00 00 00
@@ -51,9 +51,9 @@ SET WINDOWS:
 24 00 00 00 00 00 00 00 48 00
    72 bytes.
    6-7 = 0x40 = window descriptor length
-   
+
    Window Descriptor Block:
-   0 = page side 
+   0 = page side
 	 0x00 = front
 	 0x80 = back
    2-3 = X resolution
@@ -80,7 +80,7 @@ SET WINDOWS:
 	  0x80 = User downloaded pattern
    29 = reverse image
       0x00 = no reverse
-      0x80 = reverse 
+      0x80 = reverse
    43 = image emphasis
 	  0x80 smooth
 	  0x00 none
@@ -111,7 +111,7 @@ SET WINDOWS:
 	  0x82 = mode 3
    59 = automatic separation
 	  0x00 = no (twain default)
-	  0x80 = yes 
+	  0x80 = yes
    60 = white level
       0x00 = from white stick (twain default)
 	  0x80 = from paper
@@ -136,7 +136,7 @@ READ:
         5: page side
 		   0x00 = front
 		   0x80 = back
-  
+
       0x80 image size in dots
          3(?)-4: number of the page to read. Multipage mode.
 
@@ -147,7 +147,7 @@ READ:
 SEND(10):
   2A 00 03 00 00 01 00 01 0A 00
   2 = data type code
-    0x02 = halftone pattern 
+    0x02 = halftone pattern
        data is 10 bytes of header + 64 bytes for the matrix
     0x03 = gamma table
        data is 10 bytes of header + 256 bytes for the table
diff --git a/doc/mustek/mustek.CHANGES b/doc/mustek/mustek.CHANGES
index b7c7e2b..c5de63c 100644
--- a/doc/mustek/mustek.CHANGES
+++ b/doc/mustek/mustek.CHANGES
@@ -212,7 +212,7 @@ CHANGES for the SANE Mustek backend
   * Added OS/2 compatibility fixes from "Franz Bakan" <fbakan@gmx.net>.
 
 2001-11-18
-  * The Primax Compact 4800 seems to bes also supported. Added .desc and 
+  * The Primax Compact 4800 seems to bes also supported. Added .desc and
     manpage entries.
 
 2001-09-10
@@ -290,7 +290,7 @@ CHANGES for the SANE Mustek backend
 
 2001-04-19
   * Don't check for macro VERSION any longer in sane_init. Print out
-    PACKAGE_VERSION instead. 
+    PACKAGE_VERSION instead.
   * Update email address and homepage.
 
 2001-08-08
@@ -348,7 +348,7 @@ CHANGES for the SANE Mustek backend
 
 2000-12-31
   * Released Mustek backend 1.0-103
-  
+
 2000-12-30
   * Implemented calibration (color and gray mode) for the Paragon 1200 Pro.
     It's not perfect and needs lots of tests. It may work for the Paragon
@@ -360,14 +360,14 @@ CHANGES for the SANE Mustek backend
   * Increased scan width to 8.6" for 1200 Pro.
 
 2000-12-26
-  * Added calibration for the SE 12000 SP Plus. Doesn't fully work until now 
+  * Added calibration for the SE 12000 SP Plus. Doesn't fully work until now
     (images are too dark and colored).
 
 2000-12-23
   * Added option for Legal format (because the ScanExpress 12000 SP A4 size
     scanner can't be distinguished from the Paragon 1200 LS Legal size scanner
     by software).
-  
+
 2000-12-21
   * Added a few checks for Null-Pointers.
   * Removed old code for SE calibration.
@@ -378,7 +378,7 @@ CHANGES for the SANE Mustek backend
 
 2000-12-10
   * Released Mustek backend 1.0-102
-  
+
 2000-12-09
   * Fixed wrong comment in encode_resolution
   * Added missing test for return status in sane_start
@@ -386,7 +386,7 @@ CHANGES for the SANE Mustek backend
 
 2000-12-05
   * Released Mustek backend 1.0-101
- 
+
 2000-12-05
   * Fixed lamp setting (avoid problems with some SE scanners).
 
@@ -443,18 +443,18 @@ CHANGES for the SANE Mustek backend
     scanning (seems to work for firmware >= 2.00)
   * Adjusted transparency adapter support for all ScanExpress scanners.
     The 12000 A3 SP can only do A4 beacuse I don't have the right TA.
-  * don't use u_int* types in mustek.h because the definitions for these 
+  * don't use u_int* types in mustek.h because the definitions for these
     types are not included
 
 2000-11-04
   * SE scanners can now scan 75, 100, 150, 200, 250, 300, 400, 500, 600,
-    900 and 1200 dpi in color mode (the 1200 dpi models). These are fixed 
+    900 and 1200 dpi in color mode (the 1200 dpi models). These are fixed
     resolutions, a resolution >= the wanted resolution is selected. This
     makes preview and some resolutions faster than before (at least for
     some scanners), because lower resolutions can be used.
-  * Minimum scan resolution is 60 dpi in gray and lineart and 75 dpi in 
+  * Minimum scan resolution is 60 dpi in gray and lineart and 75 dpi in
     color mode for the SE scanners now.
-  
+
 2000-10-29
   * Fixed a bug concerning block LD. Paragon 1 and 2 were exchanged.
   * Paragon 12000SP color mode works now without garbage at the end
@@ -479,9 +479,9 @@ CHANGES for the SANE Mustek backend
 
 2000-10-03
   * Released backend version 1.0-98.
-  
+
 2000-10-03
-  * Fixed segmentation fault in sane_init (else statement was missing). 
+  * Fixed segmentation fault in sane_init (else statement was missing).
     Thanks to Oliver Rauch who spotted this problem.
   * Re-enabled double buffering.
 
@@ -518,7 +518,7 @@ CHANGES for the SANE Mustek backend
 
 2000-09-24
   * Released backend version 1.0-97.
-  
+
 2000-09-24
   * Added RGB brightness and contrast for 3pass scanners
   * Brightness and contrast is +-100% for 3pass scanners now
@@ -635,7 +635,7 @@ CHANGES for the SANE Mustek backend
 2000-07-26
   * fixed possible segfault pointer info was not checked for 0 (found by
     Petter Reinholdtsen)
-  * Updated comment about Paragon 600 II N linedistance correction in man 
+  * Updated comment about Paragon 600 II N linedistance correction in man
     page
 
 2000-07-25
@@ -643,7 +643,7 @@ CHANGES for the SANE Mustek backend
 
 2000-07-25
   * Released backend version 1.0-92
-  
+
 2000-07-24
   * Fixed ADF handling (output was mirrored in x direction). Gray and lineart
     seems to work now. Color and halftone modes look somewhat crazy.
@@ -682,7 +682,7 @@ CHANGES for the SANE Mustek backend
   * Released backend version 1.0-89
 
 2000-06-30
-  * Fixed bug in do_stop. The scan slider didn't return after the scan 
+  * Fixed bug in do_stop. The scan slider didn't return after the scan
     in some situations.
 
 2000-06-28
@@ -703,7 +703,7 @@ CHANGES for the SANE Mustek backend
 
 2000-06-25
   * updated manpage concerning parport and USB scanners
-  * added example for 600 II N to mustek.conf 
+  * added example for 600 II N to mustek.conf
 
 2000-06-22
   * fixed debug output bug in fix_linedistance_se (found by Jan-Erik Karlsson)
@@ -750,7 +750,7 @@ CHANGES for the SANE Mustek backend
   * Code cleanup and reorganization for inclusion of the Paragon 1200 A3 Pro.
 
 2000-06-07
-  * Fixed bug in sane_close where the chain of handles got destroyed by 
+  * Fixed bug in sane_close where the chain of handles got destroyed by
     closing the first device. This bug is in the backend since 3 1/2 years.
     Thanks to Jochen Eisinger for spotting this.
 
@@ -762,7 +762,7 @@ CHANGES for the SANE Mustek backend
 
 2000-06-04
   * changed (again) Paragon 12000 SP linedistance handling, now 1.02 uses
-    normal LD corrections, all other use none. We'll see, if this works. 
+    normal LD corrections, all other use none. We'll see, if this works.
     Thanks to Reinhard Günzel who helped to debug this.
   * fixed some long lines (>80 chars)
 
@@ -805,7 +805,7 @@ CHANGES for the SANE Mustek backend
 
 2000-05-08
   * fixed remaining sane_cancel problems (in non_blocking mode)
-  * fixed color stripes and segmentation fault for Paragon MFS-12000SP 
+  * fixed color stripes and segmentation fault for Paragon MFS-12000SP
     1.00 (at least for me)
   * added more debug output to inquiry
   * added possibility to distinguish old and new firmware formats
@@ -816,14 +816,14 @@ CHANGES for the SANE Mustek backend
   * released backend version 1.0-81
 
 2000-05-06
-  * added transparency adapter support for the Paragon 600 II CD, 600S, 
+  * added transparency adapter support for the Paragon 600 II CD, 600S,
     800 II SP, 600 II N, ScannExpress 6000SP and 12000SP
   * removed "color lineart" and "color halftone" for all scanners.
     These modes didn't work for any of my scanners.
   * added more debug output for ADF and TA
   * fixed bug when ADF is out of documents
   * Scan source option is only available if TA or ADF is present. For
-    SE and N models TA is always available because it can't be detected 
+    SE and N models TA is always available because it can't be detected
     by hardware
   * removed "backtrack", "speed" and "grain" from 600 II N options,
     the scanner doesn't support them
@@ -839,12 +839,12 @@ CHANGES for the SANE Mustek backend
   * Added Warning for scanners that are not (fully) tested
 
 2000-04-26
-  * changed sane_init to use sanei_config_read () and 
+  * changed sane_init to use sanei_config_read () and
     sanei_config_get_string ()
 
 2000-04-24
   * released backend version 1.0-80
-  
+
 2000-04-23
   * fixed lineart and color scanning >600 dpi for the SE 12000SP
   * added variable debug_level to be faster without debugging in attach ()
@@ -863,13 +863,13 @@ CHANGES for the SANE Mustek backend
 
 2000-04-20
   * Output of scanning time now works with scanimage, too.
-  * Adjusted scan area to the Windows driver defaults for Paragon 
+  * Adjusted scan area to the Windows driver defaults for Paragon
     MFS-6000CX
   * Added transparency adapter support for the Paragon MFS-6000CX and
     MFS-12000SP
 
 2000-04-19
-  * Adjusted scan area to the Windows driver defaults for Paragon 
+  * Adjusted scan area to the Windows driver defaults for Paragon
     MFS-12000SP
 
 2000-04-17
@@ -883,14 +883,14 @@ CHANGES for the SANE Mustek backend
     These modes didn't work for any of my scanners.
   * fixed problems in color mode for the MFS-8000SP (gamma table is now
     uploaded even if not selected)
-  * Output "cover open" only for ScanExpress scanners (Paragon scanners 
+  * Output "cover open" only for ScanExpress scanners (Paragon scanners
     don't have a cover sensor)
   * Added transparency adapter support for the Paragon MFS-6000SP and
     MFS-12000CX
   * Added output of transfer speed (kb/s)
   * maximum allocated memory for read request can be set by a #define
   * buffer size can be set on a per scanner basis
-  * Adjusted scan area to the Windows driver defaults for Paragon 
+  * Adjusted scan area to the Windows driver defaults for Paragon
     800 II SP
   * Added quotation marks to inquiry output
 
@@ -899,7 +899,7 @@ CHANGES for the SANE Mustek backend
     ScanExpress 12000SP
   * Fixed scan area settings (TL-X and TL-Y) for transparency adapter (TA)
   * Added TA support for Paragon 8000SP
-  
+
 2000-04-13
   * Added more debug output in sane_read and some other functions
   * removed warnings
@@ -913,7 +913,7 @@ CHANGES for the SANE Mustek backend
 
 2000-04-09
   * released backend version 1.0-79
-  
+
 2000-04-08
   * added output of scanning time (debuglevel 2 and higher)
   * removed old code from sane_cancel
@@ -931,16 +931,16 @@ CHANGES for the SANE Mustek backend
 2000-04-03
   * output backend and version information
   * fixed resolution encoding for MFS12000cx
-  * Changed version system to be compatible to the SANE standard 
+  * Changed version system to be compatible to the SANE standard
     (major, minor, build); 0.78 --> 1.0-78
-  
+
 2000-04-02
   * released backend version 0.78
   * added MUSTEK_FLAG_DOUBLE_RES for the MFS-12000CX 3-pass scanner,
     resolutions > 600 dpi should work now
-    
+
 2000-04-01
-  * reduced scan area for Paragon 800 S / II SP 
+  * reduced scan area for Paragon 800 S / II SP
 
 2000-03-29
   * released backend version 0.77
@@ -948,17 +948,17 @@ CHANGES for the SANE Mustek backend
   * more debug level tweaking
   * man page update
   * model name update
-  
+
 2000-03-25
   * corrected some spelling errors
-  
+
 2000-03-24
   * reduced scanarea for the MSF-6000SP
   * restructured scanner recognition
 
 2000-03-18
   * released backend version 0.76
-  
+
 2000-03-17
   * removed some compiler warnings
   * changed the sane.model names (e.g. ScanExpress 12000SP instead of
@@ -978,12 +978,12 @@ CHANGES for the SANE Mustek backend
     possibly never happen)
   * fixed firmware version identification for newer ScanExpress models
     (patch from Marco G. Salvagno)
-  * probably fixed linedistance correction at high resolutions for 
+  * probably fixed linedistance correction at high resolutions for
     MFS-1200SP firmware 1.00 and possibly others (patch from Andreas Beck)
   * added check for ADF ready in sane_start (patch from Joerg Anders)
   * Bug fix in the STORE makros (patch from Norbert Mueller)
- 
-  
+
+
 2000-03-06
   * created mustek.CHANGES file
   * released backend version 0.74
diff --git a/doc/mustek_usb/mustek_usb.CHANGES b/doc/mustek_usb/mustek_usb.CHANGES
index 7b01c4a..b31f248 100644
--- a/doc/mustek_usb/mustek_usb.CHANGES
+++ b/doc/mustek_usb/mustek_usb.CHANGES
@@ -17,7 +17,7 @@ CHANGES for the SANE Mustek USB backend
   * Fixed check for single quotation marks.
 
 2003-02-22:
-  * Release of version 1.0-16. 
+  * Release of version 1.0-16.
 
 2003-02-22:
   * Iniatialize global variables explicitely.
@@ -34,7 +34,7 @@ CHANGES for the SANE Mustek USB backend
     to other backends for Mustek scanners.
 
 2002-07-17:
-  * Release of version 1.0-15. 
+  * Release of version 1.0-15.
 
 2002-07-17:
   * Added manufacturer comment in mustek_usb.desc.
@@ -43,7 +43,7 @@ CHANGES for the SANE Mustek USB backend
   * Really check the status in usb_low_open.
 
 2002-04-24:
-  * Release of version 1.0-14. 
+  * Release of version 1.0-14.
 
 2002-04-24:
   * Undef MIN and MAX if they are defined in mustek_usb_low.h to avoid
@@ -53,7 +53,7 @@ CHANGES for the SANE Mustek USB backend
   * Free devlist in sane_exit.
 
 2002-04-10:
-  * Release of version 1.0-13. 
+  * Release of version 1.0-13.
 
 2002-04-10:
   * sane_set_io_mode must return SANE_STAUS_GOOD if non_blocking is false.
@@ -63,7 +63,7 @@ CHANGES for the SANE Mustek USB backend
   * sane_exit: set freed variable to 0.
 
 2002-03-20:
-  * Release of version 1.0-12. 
+  * Release of version 1.0-12.
 
 2002-03-19:
   * Option 0 has an empty name now.
@@ -73,7 +73,7 @@ CHANGES for the SANE Mustek USB backend
   * Added more debug output in sane_control_option.
 
 2002-03-17:
-  * Release of version 1.0-11. 
+  * Release of version 1.0-11.
 
 2002-03-16:
   * mustek_usb.c: Fixed segfault when opening device again after closing.
@@ -90,7 +90,7 @@ CHANGES for the SANE Mustek USB backend
   * Fixed undefined operation warnings.
 
 2002-01-11
-  * Release of version 1.0-10. 
+  * Release of version 1.0-10.
 
 2002-01-11
   * mustek_usb_high.(c|h), mustek_usb_mid.(c|h): commented out unused CCD code.
@@ -106,7 +106,7 @@ CHANGES for the SANE Mustek USB backend
   * Added link to plustek to manual page.
 
 2001-12-08
-  * Release of version 1.0-9. 
+  * Release of version 1.0-9.
 
 2001-12-08
 
@@ -118,7 +118,7 @@ CHANGES for the SANE Mustek USB backend
     size of data acquired in one turn.
 
 2001-11-15
-  * Release of version 1.0-8. 
+  * Release of version 1.0-8.
 
 2001-11-15
   * Updated manual page concerning FreeBSD and kernel configuration.
@@ -140,7 +140,7 @@ CHANGES for the SANE Mustek USB backend
   * Removed load_private_profile (now in usb_high_scan_init).
 
 2001-10-07
-  * Release of version 1.0-7. 
+  * Release of version 1.0-7.
 
 2001-10-07
 
@@ -312,7 +312,7 @@ CHANGES for the SANE Mustek USB backend
   * mustek_usb_low:
     - fixed compilation warnings
     - fixed compilation problems
-    - fixed C++ to C transition issues (e.g. "initializer element is not 
+    - fixed C++ to C transition issues (e.g. "initializer element is not
       computable at load time")
     - fixed debug output
     - adjusted some names
@@ -355,7 +355,7 @@ CHANGES for the SANE Mustek USB backend
 
 2001-07-22
   * mustek_usb_low: Only one data structure: ma1017.
-  * mustek_usb_mid:  
+  * mustek_usb_mid:
     - removed //
     - remove SANE disclaimers
     - use SANE types
@@ -404,7 +404,7 @@ CHANGES for the SANE Mustek USB backend
   * Used "../include/sane" in #include statements
   * Used /dev/usbscanner in mustek_usb.conf
   * Fixed mustek_usb.desc
-  * Fixed mustek_usb.*: 
+  * Fixed mustek_usb.*:
     - use correct names
     - no leading "_"
     - use only C-style comments
@@ -418,4 +418,4 @@ CHANGES for the SANE Mustek USB backend
     - commented out all references to c_scanner
     - removed references to WORD and other non-standard types
     - moved read_rows from global to Mustek_Usb_Scanner
-    --> mustek_usb.* compiles
-\ No newline at end of file
+    --> mustek_usb.* compiles
diff --git a/doc/mustek_usb2/mustek_usb2.CHANGES b/doc/mustek_usb2/mustek_usb2.CHANGES
index 38886e8..6e37236 100644
--- a/doc/mustek_usb2/mustek_usb2.CHANGES
+++ b/doc/mustek_usb2/mustek_usb2.CHANGES
@@ -7,7 +7,7 @@ V 1.0-10 (2005-10-16)
 
 V 1.0-9 (2005-10-02)
 
-- Removed global variables in mustek_usb2.c: 
+- Removed global variables in mustek_usb2.c:
   Deleted the following variables (not necessary):
     m_bIsOpen
   Moved the following varaiables to Mustek_Scanner structure:
@@ -81,7 +81,7 @@ V 1.0-4 (2005-09-27)
   a2nu2/spicall/spicall.c		--> included in mustek_usb2.c
   a2nu2/spicall/spicall_ex.h
   a2nu2/spicall/spicall_g.h		--> included in mustek_usb2_high.c
-  a2nu2/include/asic.h			--> included in mustek_usb2_asic_low.h  
+  a2nu2/include/asic.h			--> included in mustek_usb2_asic_low.h
   a2nu2/include/debug.h			--> removed
   a2nu2/include/ini.h
   a2nu2/include/msam.ini		--> removed
@@ -94,11 +94,11 @@ V 1.0-4 (2005-09-27)
   a2nu2/asic/asic_libusb.h		--> removed
   a2nu2/asic/asic_mid.c			--> mustek_usb2_asic_mid.c
   a2nu2/asic/asic_mid.h			--> included in mustek_usb2_asic_mid.c
-  a2nu2/asic/asic_motor.c		--> mustek_usb2_asic_motor.c  
+  a2nu2/asic/asic_motor.c		--> mustek_usb2_asic_motor.c
   a2nu2/asic/asic_motor.h		--> mustek_usb2_asic_motor.h
-  a2nu2/asic/asic_usb.c			--> mustek_usb2_asic_low.c  
+  a2nu2/asic/asic_usb.c			--> mustek_usb2_asic_low.c
   a2nu2/asic/asic_usb.h			--> included in mustek_usb2_asic_low.h
-  a2nu2/asic/DefineScanner.h		--> mustek_usb2_asic_low.h  
+  a2nu2/asic/DefineScanner.h		--> mustek_usb2_asic_low.h
   a2nu2/asic/ScanRegDef.h		--> included in mustek_usb2_asic_low.h
 
 - Changed backend name to mustek_usb2.
diff --git a/doc/net.tex b/doc/net.tex
index a29fb75..d6bc110 100644
--- a/doc/net.tex
+++ b/doc/net.tex
@@ -86,7 +86,7 @@ The four primitive types of the SANE standard are encoded as follows:
   \code{SANE\_Char} array.  The trailing NUL byte is considered part
   of the array and a \code{NULL} pointer is encoded as a zero-length
   array.
-  
+
 \item[\code{\defn{SANE\_Handle}}:] A handle is encoded like a word.
   The network backend needs to take care of converting these integer
   values to the opaque pointer values that are presented to the user
@@ -473,7 +473,7 @@ are no request or reply arguments in this call.  As a result of this
 call, the connection between the client and the server that was
 established by the \code{SANE\_NET\_INIT} call will be closed.
 
-% Local Variables: 
+% Local Variables:
 % mode: latex
 % TeX-master: "sane.tex"
-% End: 
+% End:
diff --git a/doc/plustek/FAQ b/doc/plustek/FAQ
index 7d65f41..a3a224f 100644
--- a/doc/plustek/FAQ
+++ b/doc/plustek/FAQ
@@ -51,7 +51,7 @@ SOLUTION:
 ---------
 Set the link /usr/src/linux
 to your current kernel-source tree before recompiling
-kernel-modules like pt_drv, then your version mismatch 
+kernel-modules like pt_drv, then your version mismatch
 problem should be solved.
 
 
@@ -303,7 +303,7 @@ A:  Normally, there is no need to do so, because once you
     have to worry about loading the driver. It happens automagically. ;-)
     The driver will be loaded when needed (and eventually
     removed after a specific time of not using it).
-	
+
     Nevertheless, another possibility is to do a modprobe pt_drv in the
     /etc/rc.d/boot.local (using SuSE) or
     /etc/rc.d/rc.local (using RedHat or Mandrake) file
@@ -382,4 +382,3 @@ A:  In general you can install it over. BUT this has caused
 
     This should cover all the directories where maybe some
     sane files are installed...
-
diff --git a/doc/plustek/Makefile.kernel24 b/doc/plustek/Makefile.kernel24
index 207ef39..28677c1 100644
--- a/doc/plustek/Makefile.kernel24
+++ b/doc/plustek/Makefile.kernel24
@@ -43,7 +43,7 @@ REFOPT = -xref-all -index-all -html32
 
 #
 # add the following to get assembly listing
-# -Wa,-alh,-L -g 
+# -Wa,-alh,-L -g
 
 #
 # get some version numbers
@@ -248,4 +248,3 @@ depend .depend dep:
 ifeq (.depend,$(wildcard .depend))
 #include .depend
 endif
-
diff --git a/doc/plustek/Plustek-PARPORT-TODO.txt b/doc/plustek/Plustek-PARPORT-TODO.txt
index 94ef5f7..6eb8667 100644
--- a/doc/plustek/Plustek-PARPORT-TODO.txt
+++ b/doc/plustek/Plustek-PARPORT-TODO.txt
@@ -28,7 +28,7 @@ Genius HR6               negative scanning not okay            none
 
 ********************************* DONE ***************************************
 
-- PS/2 bidi does not work (libieee1284)                          
+- PS/2 bidi does not work (libieee1284)
 - Update the IOCTL interface and remove some old structs (CmdBlk)
 
 ******************************** SKIPPED *************************************
diff --git a/doc/plustek/Plustek-PARPORT.changes b/doc/plustek/Plustek-PARPORT.changes
index 0e7d73b..6aa878b 100644
--- a/doc/plustek/Plustek-PARPORT.changes
+++ b/doc/plustek/Plustek-PARPORT.changes
@@ -149,11 +149,11 @@ Version 0.43-7 05/11/2005
     1.0 Fixed timer issues in user-space (Thanx to Rod Roark)
 
 Version 0.43-8 08/10/2005
-    1.0 Fixed problem on ASIC96003/1 based devices, when scanning 
+    1.0 Fixed problem on ASIC96003/1 based devices, when scanning
         lineart at 200 and 300 dpi
 
 Version 0.43-9 11/14/2005
-    1.0 Fixed sizeof(long) issue for 64bit platforms, see 
+    1.0 Fixed sizeof(long) issue for 64bit platforms, see
         bug #302195
 
 Version 0.43-10 02/16/2006
@@ -177,4 +177,4 @@ Version 0.43-13 06/18/2007
 Version 0.44-1 02/13/2013
     1.0 Fixed issues for Kernels > 2.6.35
     2.0 Define ULong and friends to uint32_t to make the driver
-        work in a 64 bit environment
-\ No newline at end of file
+        work in a 64 bit environment
diff --git a/doc/plustek/Plustek-PARPORT.txt b/doc/plustek/Plustek-PARPORT.txt
index e5b6097..a181b9c 100644
--- a/doc/plustek/Plustek-PARPORT.txt
+++ b/doc/plustek/Plustek-PARPORT.txt
@@ -22,7 +22,7 @@ in sane-backends/backend. Simply do (as root user)
 
 Then the module should be compiled, installed and loaded.
 
-Add the following three lines to file /etc/modules.conf 
+Add the following three lines to file /etc/modules.conf
 
 alias char-major-40	pt_drv
 pre-install pt_drv modprobe -k parport
@@ -44,6 +44,3 @@ protocol will be changed and newer drivers won't work with older backends
 and vice versa.
 In this case (error -9019 in the SANE debug output!!) you have to recompile SANE
 AND the driver (have a look at the installation procedure above).
-
-
-
diff --git a/doc/plustek/Plustek-USB-TODO.txt b/doc/plustek/Plustek-USB-TODO.txt
index 0ea7e8b..7d03e9b 100644
--- a/doc/plustek/Plustek-USB-TODO.txt
+++ b/doc/plustek/Plustek-USB-TODO.txt
@@ -50,4 +50,3 @@ make mono/gray modes work on Canon scanners                     done
 copy picture line by line to backend                            done
 cancel function does not work correctly in large resolutions    fixed
 Move documents to its correct SANE place                        done
-
diff --git a/doc/plustek/Plustek-USB.changes b/doc/plustek/Plustek-USB.changes
index 8ed5cc8..ae6e69e 100644
--- a/doc/plustek/Plustek-USB.changes
+++ b/doc/plustek/Plustek-USB.changes
@@ -148,7 +148,7 @@ optical one (sensor stops too early)
 V 0.50-2 (2005-08-19)
 ---------------------
 More cleanup.
-Removed obsolete _WAF_BLACKFINE. 
+Removed obsolete _WAF_BLACKFINE.
 LiDE20 does not seem to have a reliable black calibration area,
 so the devices now will switch off the lamp for dark calibration.
 Fixed line statistics and added  calibration data output.
@@ -283,7 +283,7 @@ V 0.47-1 - 0.47-4
 
 V 0.46-9 (2003-11-03)
 ---------------------
-- Added alternate calibration for CIS devices 
+- Added alternate calibration for CIS devices
 - Added coarse calibration data-cache
 - Moved parallelport code to extra backend file plustek_pp
 - Fixed some minor bugs
diff --git a/doc/plustek/Plustek-USB.txt b/doc/plustek/Plustek-USB.txt
index e1ee793..939d4d7 100644
--- a/doc/plustek/Plustek-USB.txt
+++ b/doc/plustek/Plustek-USB.txt
@@ -20,7 +20,7 @@ PLUSTEK
 =======
 Vendor ID: 0x07B3
 
-Product ID       Device-description and status	
+Product ID       Device-description and status
 0x0005           not identified yet
 0x0007           not identified yet
 0x000F           not identified yet
@@ -32,21 +32,21 @@ Product ID       Device-description and status
 0x0015           U24 (LM9832) - working
 0x0016           not identified yet
 0x0017           UT12 - working, UT16 - working, UT24 - working
-	
+
 MUSTEK
 ======
 BearPaw vendor ID: 0x0400 (They use the NationalSemiconductors ID!!!)
 
-Product ID       Device-description and status	
+Product ID       Device-description and status
 0x1000           BearPaw 1200 (LM9831) - working
 0x1001           BearPaw 1200 (LM9832) - not tested
 0x1001           BearPaw 2400 (LM9832) - mostly working
-    	
+
 KYE (Genius)
 ============
 Vendor ID: 0x0458
-	
-Product ID       Device-description and status	
+
+Product ID       Device-description and status
 0x2007           ColorPage-HR6 V2 - working
 0x2008           ColorPage-HR6 V2 - not tested
 0x2009           ColorPage-HR6A   - not tested
@@ -58,7 +58,7 @@ Hewlett Packard
 ===============
 Vendor ID: 0x03F0
 
-Product ID       Device-description and status	
+Product ID       Device-description and status
 0x0505           HP Scanjet 2100c - working
 0x0605           HP Scanjet 2200c - working
 
@@ -66,7 +66,7 @@ EPSON
 =====
 Vendor ID: 0x04b8
 
-Product ID       Device-description and status	
+Product ID       Device-description and status
 0x010F           EPSON Perfection 1250/Photo - working
 0x011D           EPSON Perfection 1260/Photo - working
 
@@ -74,9 +74,9 @@ UMAX
 ====
 Vendor ID: 0x1606
 
-Product ID       Device-description and status	
-0x0050           UMAX 3400 - working 
-0x0060           UMAX 3400/3450 - working 
+Product ID       Device-description and status
+0x0050           UMAX 3400 - working
+0x0060           UMAX 3400/3450 - working
 0x0160           UMAX 5400 - working
 
 COMPAQ
@@ -90,7 +90,7 @@ CANON
 =====
 Vendor ID: 0x04A9
 
-Product ID       Device-description and status	
+Product ID       Device-description and status
 0x????           FB620U        - not integrated
 0x2206           N650U         - working
 0x2207           N1220U        - working
@@ -216,7 +216,7 @@ usbscanner 0x0003 0x1606 0x0160 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00
 The example line shows the vendor ID of UMAX 0x1606 and the product ID of the 5400
 0x0160 - these values must match the ones of your scanner.
 
-Last step is adding a script in 
+Last step is adding a script in
 /etc/hotplug/usb/
 It is called "usbscanner" (don't forget the executable rights)
 
@@ -232,7 +232,7 @@ fi
 
 This script will correct the access right to your scanner device when the device
 is plugged in.
-              
+
 
 Debugging your USB scanner (written by Kev Green)
 -------------------------------------------------
@@ -454,4 +454,3 @@ CM - Color Mode (unitless), 3 for channel pixel rate color, else 1
 
 
 -------------------------
-
diff --git a/doc/releases.txt b/doc/releases.txt
index 1579b15..abd007e 100644
--- a/doc/releases.txt
+++ b/doc/releases.txt
@@ -1,4 +1,4 @@
-2009-05-05
+2019-07-30
 
 This text summarizes some points to pay attention to when a new release
 of sane-backends is planned.
@@ -6,8 +6,9 @@ of sane-backends is planned.
 Timetable (approximate periods):
 
 Day  0: Announcement of upcoming release on sane-devel including timetable
+        and pointer to the GitLab milestone
 Day 14: Feature freeze (only bugfixes + documentation updates)
-Day 28: Code freeze (only fixes for bugs that can destroy hardware, can cause 
+Day 28: Code freeze (only fixes for bugs that can destroy hardware, can cause
         compilation problems or render a backend completely unusable, and
         documentation updates are allowed)
 Day 35: Release
@@ -16,79 +17,49 @@ Before the release:
 
 * 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
+  version=1.0.27
+  git ls-files -- backend | while read f; do
+    git log --follow --diff-filter=A --find-renames=40% \
+            --format="%ai  $f" $version..HEAD -- "$f"
+  done | cat
 
-  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) (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
+  Get list of heavily change backends via: git diff --stat $version..HEAD
+  Get list of details from: git log $version..HEAD
 * git commit -a
-* tag git with release tag; e.g.: 'git tag -a RELEASE_1_0_15'
-* probably DONT want to git push here, because alioth will rebuild it's local
-  checkout needlessly
+* git push origin master
 
 Making the release:
 
-* make tar.gz, sane-backends-x.y.z.lsm, and .md5sum with "make sane-backends"
-* unpack tar.gz in temporary directory
-* make diff from last release by unpacking it also in temporary directory
-  and running e.g. 
-  diff -uNr sane-backends-1.0.23 sane-backends-1.0.24  > sane-backends-1.0.23-1.0.24.diff
-* check that the diff applies cleanly to the old version
-* gzip the diff
-* install devel headers required to build optional backends (1284,gphoto,etc)
-* check that the new version .tar.gz can be compiled
-* upload the .tar.gz, tar.gz.md5 and .diff.gz to the FTP/HTTP servers
-  (at the moment: alioth.debian.org, ftp files are in
-  /srv/alioth.debian.org/chroot/ftproot/pub/sane/ )
-  In the alioth web interface, you should upload the smallest file first,
-  since you don't get error messages until after an upload completes,
-  and you might need to change something.
-  You can add the larger files afterwards. You may have to split larger
-  files.
+* temporarily set a PRIVATE_TOKEN variable in the GitLab CI/CD
+  variables You have to create one in your own Settings > Access
+  Tokens.  Set it to expire in a few hours to avoid abuse.
+* git tag -a -s 1.0.28 -m Release
+* git push --tags origin master
+* trigger the manual 'release' stage of the build via the web UI when
+  this becomes possible.  This requires a valid PRIVATE_TOKEN.
 
 Announcing the release:
 
-* checkout the sane/website.git module and:
-* copy sane-backends.html to sane-backends-"old-version".html
-* update sane-supported-devices.html with link to above "old" file
-* rebuild sane-backends.html and sane-mfgs.html (make -C doc html-pages)
-* use man2html from http://hydra.nac.uci.edu/indiv/ehood/man2html.html
+* [TBD] checkout the sane/website.git module and:
+* [TBD] copy sane-backends.html to sane-backends-"old-version".html
+* [TBD] update sane-supported-devices.html with link to above "old" file
+* [TBD] rebuild sane-backends.html and sane-mfgs.html (make -C doc html-pages)
+* [TBD] use man2html from http://hydra.nac.uci.edu/indiv/ehood/man2html.html
   to rebuild html man pages (make -C doc html-man) (no other version works)
-* add md5 sum to sane-md5sums.txt
-* check and update platforms page (sane-support.html)
+* [TBD] add md5 sum to sane-md5sums.txt
+* [TBD] check and update platforms page (sane-support.html)
 * add announcement to index.html
 * git commit -a && git push
-* check that website was updated automatically. if not, see:
-  /home/groups/sane/bin/update-htdocs.sh
-* rebuild descriptions.db (make -C doc descriptions.db)
-* scp doc/descriptions.db to alioth:
-  /home/groups/sane/search/release
-* write announcements sane-devel, maybe others (e.g. freshmeat),
-  include the md5 hash
+* check that website was updated automatically
+* [TBD] rebuild descriptions.db (make -C doc descriptions.db)
+* announce release on sane-devel and sane-announce mailing lists
 
 After the release:
 
-#### 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 && git push --tags (one of these might give an error 'remote: fatal: bad object 0000000000000000000000000000000000000000', try the other one)
+* [TBD] copy ChangeLog to ChangeLogs/ChangeLog-$version
+* [TBD] start a new ChangeLog via git checkout ChangeLog
+* [TBD] bump version number in tools/create-changelog.sh
+* remove the ':new' tag from all doc/descriptions*/*.desc files
+* git add new and changed files and commit
+* git push
diff --git a/doc/sane-abaton.man b/doc/sane-abaton.man
index 84d8997..f1f33cb 100644
--- a/doc/sane-abaton.man
+++ b/doc/sane-abaton.man
@@ -14,7 +14,7 @@ is recognized, but support for it is untested.
 If you own a Abaton scanner other than the ones listed above that
 works with this backend, or if you own an Abaton scanner that does not
 work with this backend, please contact
-.IR sane\-devel@lists.alioth.debian.org
+.IR sane\-devel@alioth-lists.debian.net
 with the model number, so that arrangements can be made to include
 support for it. Have a look at http://www.sane\-project.org/mailing\-lists.html
 concerning subscription to sane\-devel.
@@ -107,7 +107,7 @@ former is more likely than the latter.
 If you have found something that you think is a bug, please attempt to
 recreate it with the SANE_DEBUG_ABATON environment variable set to
 255, and send a report detailing the conditions surrounding the bug to
-.IR sane\-devel@lists.alioth.debian.org .
+.IR sane\-devel@alioth-lists.debian.net .
 
 .SH TODO
 .TP
diff --git a/doc/sane-agfafocus.man b/doc/sane-agfafocus.man
index f4c1852..34ec463 100644
--- a/doc/sane-agfafocus.man
+++ b/doc/sane-agfafocus.man
@@ -31,7 +31,7 @@ color scans.
 If you own a scanner other than the ones listed above that works with
 this backend, please let us know by sending the scanner's model name,
 SCSI id, and firmware revision to
-.IR sane\-devel@lists.alioth.debian.org .
+.IR sane\-devel@alioth-lists.debian.net .
 Have a look at http://www.sane\-project.org/mailing\-lists.html
 concerning subscription to sane\-devel.
 .PP
@@ -107,11 +107,11 @@ variable controls the debug level for this backend. E.g., a value of 128
 requests all debug output to be printed. Smaller levels reduce verbosity.
 SANE_DEBUG_AGFAFOCUS values:
 
-.sp 
+.sp
 .ft CR
 .nf
 Number  Remark
-\ 
+\
  0       print important errors (printed each time)
  1       print errors
  2       print sense
@@ -151,7 +151,7 @@ SANE_DEBUG_AGFAFOCUS to 128 and try to regenerate the problem. Then
 send me a report with the log attached.
 .PP
 If you encounter a SCSI bus error or trimmed and/or displaced images please
-also set the environment variable SANE_DEBUG_SANEI_SCSI to 128 before sending 
+also set the environment variable SANE_DEBUG_SANEI_SCSI to 128 before sending
 me the report.
 
 .SH TODO
@@ -172,4 +172,3 @@ sane(7), sane\-scsi(5)
 .SH AUTHOR
 
 Ingo Schneider and Karl Anders \[/O]ygard.
-
diff --git a/doc/sane-apple.man b/doc/sane-apple.man
index 7c55a5a..3418fd0 100644
--- a/doc/sane-apple.man
+++ b/doc/sane-apple.man
@@ -23,7 +23,7 @@ ColorOneScanner 24bit RGB color          3-pass
 If you own a Apple scanner other than the ones listed above that
 works with this backend, please let us know by sending the scanner's
 model name, SCSI id, and firmware revision to
-.IR sane\-devel@lists.alioth.debian.org .
+.IR sane\-devel@alioth-lists.debian.net .
 See http://www.sane\-project.org/mailing\-lists.html for details on how to subscribe to
 sane\-devel.
 
@@ -216,7 +216,7 @@ SANE_DEBUG_APPLE to 255 and rerun the exact sequence of keystrokes
 and menu selections to reproduce it. Then send me a report with the
 log attached.
 .PP
-If you have an Apple Macintosh with the AppleScanners driver installed, 
+If you have an Apple Macintosh with the AppleScanners driver installed,
 reporting to me which options are grayed out (inactive) in what modes
 would be very helpful.
 .PP
diff --git a/doc/sane-artec.man b/doc/sane-artec.man
index 5f700a8..9dd4f44 100644
--- a/doc/sane-artec.man
+++ b/doc/sane-artec.man
@@ -132,7 +132,7 @@ SANE_DEBUG_ARTEC values
 .ft CR
 .nf
 Number  Remark
-\ 
+\
  0       print important errors
  1       print errors
  2       print sense
@@ -147,12 +147,12 @@ Number  Remark
  11      print called sane\-procedures
  12      print sane infos
  13      print sane option-control messages
-\ 
+\
  50      print verbose data/debug messages
-\ 
+\
  == 100  print software RGB calibration data
  == 101  print raw data from scanner to artec.data.raw file
-\ 
+\
  == 128  print out all messages
 .fi
 .ft R
diff --git a/doc/sane-artec_eplus48u.man b/doc/sane-artec_eplus48u.man
index 19f461c..7e7ec37 100644
--- a/doc/sane-artec_eplus48u.man
+++ b/doc/sane-artec_eplus48u.man
@@ -139,6 +139,5 @@ Interpolation with 1200 dpi is weak.
 .PP
 Support for buttons is missing due to missing support in SANE.
 .PP
-Please contact us if you find a bug: 
+Please contact us if you find a bug:
 .IR http://www.sane\-project.org/bugs.html .
-
diff --git a/doc/sane-as6e.man b/doc/sane-as6e.man
index efaf0d5..2e7dbf6 100644
--- a/doc/sane-as6e.man
+++ b/doc/sane-as6e.man
@@ -7,20 +7,20 @@ sane\-as6e \- SANE backend for using the Artec AS6E parallel port interface scan
 The
 .B sane\-as6e
 library implements a SANE (Scanner Access Now Easy) backend
-that provides access to Artec AS6E flatbed scanner.  
-.B It requires the as6edriver program in order to operate. 
+that provides access to Artec AS6E flatbed scanner.
+.B It requires the as6edriver program in order to operate.
 The as6edriver program is
 .B not
-included with the SANE package.  
-It can be found at 
+included with the SANE package.
+It can be found at
 .BR http://as6edriver.sourceforge.net.
 See the as6edriver documentation for technical information.
 .PP
 The
-.I as6edriver 
+.I as6edriver
 program must be in the path for executables ($PATH). Especially if you run
 .I saned
-(the SANE network scanning daemon), take care to setup the path for 
+(the SANE network scanning daemon), take care to setup the path for
 .I inetd
 or
 .I xinetd
@@ -29,7 +29,7 @@ correctly or place the program in a directory that is in the path.
 .PP
 
 .SH FILES
-.B as6edriver 
+.B as6edriver
 \- driver program that controls the scanner.
 
 .SH SEE ALSO
diff --git a/doc/sane-avision.man b/doc/sane-avision.man
index 6a991b6..f0a5091 100644
--- a/doc/sane-avision.man
+++ b/doc/sane-avision.man
@@ -24,23 +24,23 @@ you try the first scans \- especially with film-scanners!
 
 .SH CONFIGURATION
 
-The configuration file for this backend resides in 
+The configuration file for this backend resides in
 .IR @CONFIGDIR@/avision.conf .
 
 Its contents is a list of device names that correspond to Avision and Avision
 compatible scanners and backend-options. Empty lines and lines starting with
-a hash mark (#) are ignored. A sample configuration file is shown below: 
+a hash mark (#) are ignored. A sample configuration file is shown below:
 
 .nf
  # this is a comment
-\ 
+\
  option force\-a4
  option force\-a3
  option skip\-adf
  option disable\-gamma\-table
  option disable\-calibration
-\ 
- #scsi Vendor Model Type Bus Channel ID LUN 
+\
+ #scsi Vendor Model Type Bus Channel ID LUN
  scsi AVISION
  scsi HP
  scsi /dev/scanner
@@ -119,7 +119,7 @@ libusb corresponding to the USB scanner. For example "0x03f0 0x0701" or
 "libusb:002:003". See sane\-usb(5) for details.
 
 The program
-.IR sane\-find\-scanner 
+.IR sane\-find\-scanner
 helps to find out the correct scsi or usb device name.
 
 A list with supported devices is built into the avision backend so
@@ -161,7 +161,7 @@ environment variable controls the debug level for this backend.
 Higher debug levels increase the verbosity of the output. The debug
 level 7 is the author's preferred value to debug backend problems.
 
-Example: 
+Example:
 export SANE_DEBUG_AVISION=7
 
 .SH "SEE ALSO"
diff --git a/doc/sane-bh.man b/doc/sane-bh.man
index 8306976..2c0fadc 100644
--- a/doc/sane-bh.man
+++ b/doc/sane-bh.man
@@ -30,7 +30,7 @@ COPISCAN II 3338(A) Simplex Scanner (with ACE)
 .PP
 If you have a Bell+Howell scanner and are able to test it with this
 backend, please contact
-.IR sane\-devel@lists.alioth.debian.org
+.IR sane\-devel@alioth-lists.debian.net
 with the model number and testing results. Have a look at
 http://www.sane\-project.org/mailing\-lists.html concerning subscription to
 sane\-devel. Additionally, the author is curious as to the likelihood of using
@@ -38,17 +38,17 @@ this backend with the newer 4000 and 8000 series scanners.  If you have such a
 beast, please let me know.
 .PP
 The Bell+Howell Copiscan II series document scanners are high
-volume, high throughput scanners designed for document scanning 
+volume, high throughput scanners designed for document scanning
 applications.  As such, they are lineart/grayscale scanners supporting
-a fixed number of fairly low resolutions (e.g. 200/240/300dpi).  
-However, they do have a number of interesting and useful features 
-suited to needs of document imaging applications.  
+a fixed number of fairly low resolutions (e.g. 200/240/300dpi).
+However, they do have a number of interesting and useful features
+suited to needs of document imaging applications.
 This backend attempts to support as many of these features as possible.
 .PP
 The main technical reference used in writing this backend is the
-.B Bell and Howell Copiscan II Remote SCSI Controller (RSC) OEM 
-.B Technical Manual Version 1.5.  
-The Linux SCSI programming HOWTO, the SANE API documentation, and 
+.B Bell and Howell Copiscan II Remote SCSI Controller (RSC) OEM
+.B Technical Manual Version 1.5.
+The Linux SCSI programming HOWTO, the SANE API documentation, and
 SANE source code were also extremely valuable resources.
 
 .PP
@@ -80,9 +80,9 @@ The contents of the
 .I bh.conf
 file is a list of device names that correspond to Bell+Howell
 scanners.  See sane\-scsi(5) on details of what constitutes a valid device name.
-Additionally, options can be specified; these lines begin with the word "option".  
-Each option is described in detail below.  Empty lines and lines starting 
-with a hash mark (#) are ignored.  
+Additionally, options can be specified; these lines begin with the word "option".
+Each option is described in detail below.  Empty lines and lines starting
+with a hash mark (#) are ignored.
 
 .SH OPTIONS
 The following options can be specified in the
@@ -99,9 +99,9 @@ These frames are generated based on the compression and barcode options.
 These frames are never sent in preview mode.
 .TP
 .B fake\-inquiry
-This option is used for debugging purposes and its use is not encouraged.  
+This option is used for debugging purposes and its use is not encouraged.
 Essentially, it allows the backend to initialize in the absence of
-a scanner.  This is useful for development and not much else.  
+a scanner.  This is useful for development and not much else.
 This option must be specified earlier in the configuration file than
 the devices which are to be "faked".
 
@@ -144,8 +144,8 @@ levels reduce verbosity.
 .TP
 .B ADF support
 With document scanners, automatic document feeder (ADF) support is a key
-feature.  The backend supports the ADF by default and returns 
-.B SANE_STATUS_NO_DOCS 
+feature.  The backend supports the ADF by default and returns
+.B SANE_STATUS_NO_DOCS
 when the out-of-paper condition is detected.  The SANE frontend
 .B scanadf
 is a command line frontend that supports multi-page scans.  It has been
@@ -158,8 +158,8 @@ scans is included in xsane version 0.35 and above.
 .B Duplex scanning
 Some models, such as the COPISCAN II 6338, support duplex scanning.  That
 is, they scan both sides of the document during a single pass through the
-scanner (the scanner has two cameras).  This backend supports duplex 
-scanning (with the 
+scanner (the scanner has two cameras).  This backend supports duplex
+scanning (with the
 .B \-\-duplex
 option).  The front and back page images are delivered consecutively
 as if they were separately scanned pages.
@@ -167,16 +167,16 @@ as if they were separately scanned pages.
 .TP
 .B Hardware compression
 The scanner is capable of compressing the data into several industry
-standard formats (CCITT G3, CCITT G3-2D, CCITT G4).  This results in 
+standard formats (CCITT G3, CCITT G3-2D, CCITT G4).  This results in
 increased performance as less data is passed from the scanner to the
 host over the SCSI bus.  The backend supports these compression formats
-via the 
+via the
 .B \-\-g31d, \-\-g32d, \-\-g42d
 options, respectively.  Many SANE frontends are not equipped to deal with
 these formats, however.  The SANE frontend
 .B scanadf
-supports these optional frame formats.  The compressed image data 
-is written directly to a file and can then be processed by a scan-script 
+supports these optional frame formats.  The compressed image data
+is written directly to a file and can then be processed by a scan-script
 using the
 .B \-\-scan\-script
 option.  Examples of this are given on the scanadf homepage.
@@ -197,18 +197,18 @@ parameters must remain constant during the entire batch.
 .TP
 .B Icon Generation
 The Icon function generates a thumbnail of the full page image, that can be
-transferred as if it were a separate page.  This allows the host to 
+transferred as if it were a separate page.  This allows the host to
 quickly display a thumbnail representation during the scanning operation.
-Perhaps this would be a great way of implementing a preview scan, but 
+Perhaps this would be a great way of implementing a preview scan, but
 since a normal scan is so quick, it might not be worth the trouble.
 
 .TP
 .B Multiple Sections
 Multiple sections (scanning sub-windows) can be defined for the front and
-back pages.  Each section can have different characteristics (e.g. geometry, 
+back pages.  Each section can have different characteristics (e.g. geometry,
 compression).  The sections are returned as if they were separately
 scanned images.  Additionally sections can be used to greatly enhance the
-accuracy and efficiency of the barcode/patchcode decoding process by 
+accuracy and efficiency of the barcode/patchcode decoding process by
 limiting the search area to a small subset of the page.  Most Copiscan II
 series scanners support up to 8 user-defined sections.
 
@@ -218,18 +218,18 @@ The RSC unit can recognize Bar and Patch Codes of various types embedded
 in the scanned image.  The codes are decoded and the data is returned to
 the frontend as a text frame.  The text is encoded in xml and contains
 a great deal of information about the decoded data such as the location
-where it was found, its orientation, and the time it took to find.  
-Further information on the content of this text frame as well as some 
+where it was found, its orientation, and the time it took to find.
+Further information on the content of this text frame as well as some
 barcode decoding examples can be found on the backend homepage.
 
 .SH LIMITATIONS
 .TP
 .B Decoding a single barcode type per scan
 The RSC unit can search for up to six different barcode types at a time.
-While the code generally supports this as well, the 
+While the code generally supports this as well, the
 .B \-\-barcode\-search\-bar
-option only allows the user to specify a single barcode type.  
-Perhaps another option which allows a comma separated list of barcode 
+option only allows the user to specify a single barcode type.
+Perhaps another option which allows a comma separated list of barcode
 type codes could be added to address this.
 .TP
 .B Scanning a fixed number of pages in batch mode
@@ -241,12 +241,12 @@ prior to initiating the last scan command.  Currently, there is no mechanism
 available for the frontend to pass this knowledge to the backend.
 If batch mode is enabled and the \-\-end\-count terminates a scanadf session,
 an extra page will be pulled through the scanner, but is neither read
-nor delivered to the frontend.  The issue can be avoided by specifying 
+nor delivered to the frontend.  The issue can be avoided by specifying
 \-\-batch=no when scanning a fixed number of pages.
 .TP
 .B Revision 1.2 Patch detector
 There is an enhanced patchcode detection algorithm available in the RSC
-with revision 1.2 or higher that is faster and more reliable than the 
+with revision 1.2 or higher that is faster and more reliable than the
 standard Bar/Patch code decoder.  This is not currently supported.
 
 .SH OPTIONS
@@ -255,14 +255,14 @@ standard Bar/Patch code decoder.  This is not currently supported.
 .TP
 .B \-\-preview[=(yes|no)] [no]
 Request a preview-quality scan.  When preview is set to yes image
-compression is disabled and the image is delivered in a 
+compression is disabled and the image is delivered in a
 SANE_FRAME_GRAY frame.
 .TP
 .B \-\-mode lineart|halftone [lineart]
 Selects the scan mode (e.g., lineart,monochrome, or color).
 .TP
 .B \-\-resolution 200|240|300dpi [200]
-Sets the resolution of the scanned image.  Each scanner model supports 
+Sets the resolution of the scanned image.  Each scanner model supports
 a list of standard resolutions; only these resolutions can be used.
 .TP
 .B \-\-compression none|g31d|g32d|g42d [none]
@@ -313,7 +313,7 @@ Bottom-right y position of scan area.
 .B  Feeder Options:
 .TP
 .B \-\-source Automatic Document Feeder|Manual Feed Tray [Automatic Document Feeder]
-Selects the scan source (such as a document feeder).  This option is provided 
+Selects the scan source (such as a document feeder).  This option is provided
 to allow multiple image scans with xsane; it has no other purpose.
 .TP
 .B \-\-batch[=(yes|no)] [no]
@@ -329,7 +329,7 @@ affect both the front and back pages.
 .TP
 .B \-\-timeout\-adf 0..255 [0]
 Sets the timeout in seconds for the automatic document feeder (ADF).
-The value 0 specifies the hardware default value which varies based 
+The value 0 specifies the hardware default value which varies based
 on the scanner model.
 .TP
 .B \-\-timeout\-manual 0..255 [0]
@@ -388,40 +388,40 @@ feature is completely disabled.  The valid barcode type are:
 .RS
 .br
 .B none
-.br 
+.br
 .B ean\-8
 .br
 .B ean\-13
-.br 
+.br
 .B reserved\-ean\-add
-.br 
+.br
 .B code39
-.br 
+.br
 .B code2\-5\-interleaved
-.br 
+.br
 .B code2\-5\-3lines\-matrix
-.br 
+.br
 .B code2\-5\-3lines\-datalogic
-.br 
+.br
 .B code2\-5\-5lines\-industrial
-.br 
+.br
 .B patchcode
-.br 
+.br
 .B codabar
-.br 
+.br
 .B codabar\-with\-start\-stop
-.br 
+.br
 .B code39ascii
-.br 
+.br
 .B code128
-.br 
+.br
 .B code2\-5\-5lines\-iata
 .br
 .RE
 .TP
 .B \-\-barcode\-search\-count 1..7 [3]
 Number of times that the RSC performs the decoding algorithm.  Specify
-the smallest number possible to increase performance.  If you are having 
+the smallest number possible to increase performance.  If you are having
 trouble recognizing barcodes, it is suggested that you increase this option
 to its maximum value (7).
 .TP
@@ -440,7 +440,7 @@ are:
 .RE
 .TP
 .B \-\-barcode\-hmin 0..1660mm [5]
-Sets the barcode minimum height in millimeters (larger values increase 
+Sets the barcode minimum height in millimeters (larger values increase
 recognition speed).  Of course the actual barcodes in the document must be
 of sufficient size.
 .TP
@@ -450,67 +450,67 @@ expires, the decoder will stop trying to decode barcodes.
 .TP
 .B \-\-section <string> []
 Specifies a series of image sections.  A section can be used to gather
-a subset image or to provide a small area for barcode decoding.    
+a subset image or to provide a small area for barcode decoding.
 Each section is specified in the following format (units are in millimeters):
 .PP
 .B <width>x<height>+<top-left-x>+<top-left-y>[:functioncode...]
-.PP 
+.PP
 Multiple sections can be specified by separating them with commas.
 .PP
 For example
 .B 76.2x25.4+50.8+0:frontbar
-identifies an area 3 inches wide and 1 inch high with a top left corner 
+identifies an area 3 inches wide and 1 inch high with a top left corner
 at the top of the page two inches from the left hand edge of the page.
-This section will be used for barcode decoding on the front page only.  
+This section will be used for barcode decoding on the front page only.
 .PP
 For example
-.B 50.8x25.4+25.4+0:frontbar:front:g42d 
-identifies an area 2 inches wide and 1 inch high with a top left corner 
-at the top of the page one inch from the left hand edge of the page.  
-This section will be used for barcode decoding on the front page as well 
-as generating an image compressed in g42d format.  
+.B 50.8x25.4+25.4+0:frontbar:front:g42d
+identifies an area 2 inches wide and 1 inch high with a top left corner
+at the top of the page one inch from the left hand edge of the page.
+This section will be used for barcode decoding on the front page as well
+as generating an image compressed in g42d format.
 .PP
 Ordinarily barcodes are searched in the entire image.  However, when you
 specify sections all barcode searching is done within the specific sections
-identified.  This can significantly speed up the decoding process.  
+identified.  This can significantly speed up the decoding process.
 
 The following functioncodes are available:
 .RS
 .br
 .B front
 \- generate an image for the front page section
-.br 
+.br
 .B back
 \- generate an image for the back page section
 .br
 .B frontbar
 \- perform barcode search in front page section
-.br 
+.br
 .B backbar
 \- perform barcode search in back page section
 .br
 .B frontpatch
 \- perform patchcode search in front page section
-.br 
+.br
 .B backpatch
 \- perform patchcode search in back page section
 .br
 .B none
 \- use no image compression
-.br 
+.br
 .B g31d
 \- use Group 3 1 dimension image compression
-.br 
+.br
 .B g32d
 \- use Group 3 2 dimensions image compression
-.br 
+.br
 .B g42d
 \- use Group 4 2 dimensions image compression
 .br
 .RE
 .PP
 If you omit a compression functioncode, the full page compression setting
-is used.  If you specify multiple compression functioncodes, only the 
+is used.  If you specify multiple compression functioncodes, only the
 last one is used.
 
 .TP
@@ -536,7 +536,7 @@ This is a new backend; detailed bug reports are welcome -- and expected ;)
 If you have found something that you think is a bug, please attempt to
 recreate it with the SANE_DEBUG_BH environment variable set to
 255, and send a report detailing the conditions surrounding the bug to
-.IR sane\-devel@lists.alioth.debian.org .
+.IR sane\-devel@alioth-lists.debian.net .
 
 .SH "SEE ALSO"
 sane(7), sane\-scsi(5), scanimage(1), scanadf(1)
diff --git a/doc/sane-canon.man b/doc/sane-canon.man
index be7693c..6085b16 100644
--- a/doc/sane-canon.man
+++ b/doc/sane-canon.man
@@ -17,9 +17,9 @@ CanoScan FB620S
 .br
 CanoScan FB1200S
 .br
-CanoScan FS2700F                                                          
+CanoScan FS2700F
 .br
-CanoScan FS2710S                                                          
+CanoScan FS2710S
 .br
 .RE
 .PP
@@ -44,7 +44,7 @@ FS2710S Ulrich Deiters <ukd@xenon.pc.uni\-koeln.de>.
 .SH TIPS (FS2700F)
 .PP
 Scanning either slides or negatives has been found to require rather
-large gamma corrections of about 2.2 to 2.4 (same value for red, green, 
+large gamma corrections of about 2.2 to 2.4 (same value for red, green,
 and blue). It is recommended to use the automatic exposure controls
 of the frontend xsane for best results.
 .PP
@@ -82,9 +82,9 @@ support dynamic loading).
 .B SANE_DEBUG_CANON
 If the library was compiled with debug support enabled, this
 environment variable controls the debug level for this backend. Higher
-debug levels increase the verbosity of the output. 
+debug levels increase the verbosity of the output.
 
-Example: 
+Example:
 export SANE_DEBUG_CANON=4
 
 .SH "SEE ALSO"
diff --git a/doc/sane-canon630u.man b/doc/sane-canon630u.man
index bdfb874..e9ec3cd 100644
--- a/doc/sane-canon630u.man
+++ b/doc/sane-canon630u.man
@@ -26,10 +26,10 @@ The contents of the
 .I canon630u.conf
 file is a list of device names that correspond to Canon
 USB scanners.  Empty lines and lines starting with a hash mark (#) are
-ignored.  Only one device name can be listed in 
+ignored.  Only one device name can be listed in
 .IR canon630u.conf .
 The program
-.IR sane\-find\-scanner 
+.IR sane\-find\-scanner
 helps to find out the correct device. Under Linux, such a device name
 could be
 .I /dev/usb/scanner0
@@ -46,7 +46,7 @@ software was developed by analyzing the USB traffic of the Windows
 it seems to work for my scanner.  If you have complaints, let me know.
 .PP
 This driver requires the ability to send USB Control Messages, available in
-kernel 2.4.12 or later. 
+kernel 2.4.12 or later.
 .PP
 Some users have reported that this driver doesn't work at all.  This seems
 to be a hardware specific issue, although I don't know what exactly the
@@ -71,7 +71,7 @@ support dynamic loading).
 .I /tmp/canon.cal
 The calibration file used to normalize pixel brightness.  This is
 calculated every time the scanner is first used after it has lost power.
-Deleting this file will force recalibration. 
+Deleting this file will force recalibration.
 .SH ENVIRONMENT
 .TP
 .B SANE_CONFIG_DIR
@@ -91,10 +91,10 @@ to "/tmp/config:" would result in directories "tmp/config", ".", and
 .B SANE_DEBUG_CANON630U
 If the library was compiled with debug support enabled, this
 environment variable controls the debug level for this backend.  Higher
-debug levels increase the verbosity of the output. 
+debug levels increase the verbosity of the output.
 
 Example:
-.br 
+.br
 SANE_DEBUG_CANON630U=12 scanimage > /dev/null
 .SH "SEE ALSO"
 sane(7), sane\-usb(5), sane\-find\-scanner(1)
@@ -103,4 +103,3 @@ http://canon-fb630u.sourceforge.net/
 .br
 .SH AUTHOR
 Nathan Rutman
-
diff --git a/doc/sane-canon_dr.man b/doc/sane-canon_dr.man
index 3e8ac06..4fbc635 100644
--- a/doc/sane-canon_dr.man
+++ b/doc/sane-canon_dr.man
@@ -5,16 +5,16 @@
 sane\-canon_dr \- SANE backend for Canon DR-series scanners
 
 .SH DESCRIPTION
-The 
+The
 .B sane\-canon_dr
 library implements a SANE (Scanner Access Now Easy) backend which
 provides access to some Canon DR-series scanners.
 
-This document describes backend version 51, which shipped with SANE 1.0.25.
+This document describes backend version 57, which shipped with SANE 1.0.28.
 
 .SH SUPPORTED HARDWARE
-This version has only been tested with a few scanner models. Please see 
-http://www.sane\-project.org/sane\-supported\-devices.html for the most recent 
+This version has only been tested with a few scanner models. Please see
+http://www.sane\-project.org/sane\-supported\-devices.html for the most recent
 list.
 
 This backend may support other Canon scanners. The best
@@ -23,8 +23,8 @@ or to collect a trace of the windows driver in action.
 Please contact the author for help or with test results.
 
 In general, the larger machines (DR-4000 and up) which have been tested use
-a fairly complete protocol, with hardware support for many modes, resolutions 
-and features. The smaller machines have many limitations, like missing 
+a fairly complete protocol, with hardware support for many modes, resolutions
+and features. The smaller machines have many limitations, like missing
 horizontal resolutions, missing binary mode, always scanning full-width, etc.
 There is code in the backend to address these problems, but there seems to be
 no way to detect if they are required, so they must be hard-coded.
@@ -32,26 +32,26 @@ no way to detect if they are required, so they must be hard-coded.
 .SH OPTIONS
 Effort has been made to expose most hardware options, including:
 .PP
-source s 
+source s
 .RS
 Selects the source for the scan. Options
 may include "Flatbed", "ADF Front", "ADF Back", "ADF Duplex".
 .RE
 .PP
-mode m 
+mode m
 .RS
 Selects the mode for the scan. Options
 may include "Lineart", "Halftone", "Gray", and "Color".
 .RE
 .PP
-resolution 
+resolution
 .RS
 Controls scan resolution.
 .RE
 .PP
 tl\-x, tl\-y, br\-x, br\-y
 .RS
-Sets scan area upper left and lower right coordinates. These are renamed 
+Sets scan area upper left and lower right coordinates. These are renamed
 t, l, x, y by some frontends.
 .RE
 .PP
@@ -67,37 +67,37 @@ enhancement, compression, buttons and sensors, etc.
 Additionally, several 'software' options are exposed by the backend. These
 are reimplementations of features provided natively by larger scanners, but
 running on the host computer. This enables smaller machines to have similar
-capabilities. Please note that these features are somewhat simplistic, and 
-may not perform as well as the native implementations. Note also that these 
-features all require that the driver cache the entire image in memory. This 
+capabilities. Please note that these features are somewhat simplistic, and
+may not perform as well as the native implementations. Note also that these
+features all require that the driver cache the entire image in memory. This
 will almost certainly result in a reduction of scanning speed.
 .PP
-swcrop 
+swcrop
 .RS
-Requests the driver to detect the extremities of the paper within the larger 
-image, and crop the empty edges. 
+Requests the driver to detect the extremities of the paper within the larger
+image, and crop the empty edges.
 .RE
 .PP
-swdeskew 
+swdeskew
 .RS
-Requests the driver to detect the rotation of the paper within the larger 
+Requests the driver to detect the rotation of the paper within the larger
 image, and counter the rotation.
 .RE
 .PP
-swdespeck X 
+swdespeck X
 .RS
-Requests the driver to find and remove dots of X diameter or smaller from the 
+Requests the driver to find and remove dots of X diameter or smaller from the
 image, and fill the space with the average surrounding color.
 .RE
 
-Use 'scanimage \-\-help' to get a list, but be aware that some options may 
-be settable only when another option has been set, and that advanced options 
+Use 'scanimage \-\-help' to get a list, but be aware that some options may
+be settable only when another option has been set, and that advanced options
 may be hidden by some frontend programs.
 .PP
 .SH CONFIGURATION FILE
 The configuration file "canon_dr.conf" is used to tell the backend how to look
 for scanners, and provide options controlling the operation of the backend.
-This file is read each time the frontend asks the backend for a list 
+This file is read each time the frontend asks the backend for a list
 of scanners, generally only when the frontend starts. If the configuration
 file is missing, the backend will fail to run.
 .PP
@@ -105,9 +105,9 @@ Scanners can be specified in the configuration file in 4 ways:
 .PP
 "scsi CANON DR"
 .RS
-Requests backend to search all scsi busses in the system for a device 
+Requests backend to search all scsi busses in the system for a device
 which reports itself to be a scanner made by 'CANON', with a model name
-starting with 'DR'. 
+starting with 'DR'.
 .RE
 .PP
 "scsi /dev/sg0" (or other scsi device file)
@@ -119,7 +119,7 @@ specify one. Probably should not be used with the other "scsi" line above.
 .PP
 "usb 0x04a9 0x1603" (or other vendor/product ids)
 .RS
-Requests backend to search all usb busses in the system for a device 
+Requests backend to search all usb busses in the system for a device
 which uses that vendor and product id. The device will then be queried
 to determine if it is a Canon scanner.
 .RE
@@ -129,12 +129,12 @@ to determine if it is a Canon scanner.
 Some systems use a kernel driver to access usb scanners. This method is untested.
 .RE
 .PP
-Besides the 'scsi' and 'usb' lines, the configuration file supports the 
+Besides the 'scsi' and 'usb' lines, the configuration file supports the
 following 'option' lines:
 .PP
 "option buffer-size [number of bytes]"
 .RS
-Set the number of bytes in the data buffer to something other than the 
+Set the number of bytes in the data buffer to something other than the
 compiled\-in default of 4MB. Large values may cause timeouts or hangs, small
 values may cause slow scans.
 .PP
@@ -150,7 +150,7 @@ warned.
 .br
 "option version-name [string of text]"
 .RS
-These options can be used collectively to override the values provided by the 
+These options can be used collectively to override the values provided by the
 scanner, or to provide the values when the scanner cannot.
 .RE
 .PP
@@ -189,12 +189,12 @@ enables debugging output to stderr. Valid values are:
 .RE
 
 .SH KNOWN ISSUES
-This backend was entirely reverse engineered from usb traces of the proprietary 
+This backend was entirely reverse engineered from usb traces of the proprietary
 driver. Various advanced features of the machines may not be enabled. Many
 machines have not been tested. Their protocol is unknown.
 
 .SH CREDITS
-  
+
 The various authors of the sane\-fujitsu backend provided useful code
 .br
 Yabarana Corp. www.yabarana.com provided significant funding
@@ -218,4 +218,3 @@ sane\-usb(5)
 
 .SH AUTHOR
 m. allan noah: <kitno455 a t gmail d o t com>
-
diff --git a/doc/sane-canon_pp.man b/doc/sane-canon_pp.man
index ae307cb..46bb823 100644
--- a/doc/sane-canon_pp.man
+++ b/doc/sane-canon_pp.man
@@ -5,7 +5,7 @@ sane\-canon_pp \- SANE backend for Canon CanoScan Parallel Port flatbed scanners
 .SH DESCRIPTION
 The
 .B sane\-canon_pp
-library implements a SANE (Scanner Access Now Easy) backend that provides 
+library implements a SANE (Scanner Access Now Easy) backend that provides
 access to the following Canon flatbed scanners:
 .PP
 .RS
@@ -25,11 +25,11 @@ CanoScan N640P ex
 .br
 .RE
 .PP
-No USB scanners are supported and there are no plans to support them in the 
-future.  Other projects are working on support for USB scanners. See the 
-.B PROJECTS 
+No USB scanners are supported and there are no plans to support them in the
+future.  Other projects are working on support for USB scanners. See the
+.B PROJECTS
 file for more detail.  The FB310P and FB610P are re-badged Avision scanners
-which use a different command set, so are unlikely to be supported by this 
+which use a different command set, so are unlikely to be supported by this
 backend in the future.
 .PP
 IMPORTANT: this is alpha code. While we have made every effort to make it as
@@ -42,77 +42,77 @@ below).
 .
 .PP
 .SH "DEVICE NAMES"
-This backend expects device names of the form presented by libieee1284.  These 
+This backend expects device names of the form presented by libieee1284.  These
 names are highly dependent on operating system and version.
 
-On Linux 2.4 kernels this will be of the form 
+On Linux 2.4 kernels this will be of the form
 .I "parport0"
-or older (2.2 and before) kernels may produce names like 
+or older (2.2 and before) kernels may produce names like
 .IR "0x378"
-(the base address of your port) or simply 
+(the base address of your port) or simply
 .IR "0"
-depending on your module configuration.  Check the contents of 
+depending on your module configuration.  Check the contents of
 .I /proc/parport
-if it exists.  If you don't want to specify a default port (or don't know its 
+if it exists.  If you don't want to specify a default port (or don't know its
 name), the backend should be able to detect which port your scanner is on.
 
 .SH CONFIGURATION
 The contents of the
 .I canon_pp.conf
-file is a list of options for the driver to use.  Empty lines and lines 
+file is a list of options for the driver to use.  Empty lines and lines
 starting with a hash mark (#) are ignored.
 .PP
 The supported options are currently
 .BR ieee1284 ,
 .BR calibrate ,
 .BR init_mode ,
-and 
+and
 .BR force_nibble
 
 Option
-.B ieee1284 
+.B ieee1284
 .IR port-name
-defines which port to use.  The format of port-name is OS dependent, based on 
+defines which port to use.  The format of port-name is OS dependent, based on
 the names presented by libieee1284.  Please only have one of these lines, or
 all but one will be ignored.
 
-Option 
-.B calibrate 
-.IR cal-file 
+Option
+.B calibrate
+.IR cal-file
 .IR [port-name]
-defines which calibration file to use on a per-port basis.  If you only have 
-one parport, the port-name argument may be omitted \- but be careful as this 
+defines which calibration file to use on a per-port basis.  If you only have
+one parport, the port-name argument may be omitted \- but be careful as this
 will cause problems on multi-scanner systems.  You may have as many of these
-lines as you like, as long as each has a unique port name.  The tilde (`~') 
-character is acceptable and will be expanded to the value of the HOME 
+lines as you like, as long as each has a unique port name.  The tilde (`~')
+character is acceptable and will be expanded to the value of the HOME
 environment.
 
-Option 
+Option
 .B init_mode
 .IR <AUTO|FB620P|FB630P>
 .IR [portname]
-defines which initialisation (wake-up) mode to use on a per-port basis.  
-If you only have one parport, the portname argument may be omitted \- but 
-be careful as this may cause problems on multi-scanner systems.  
-You may have as many of these lines as you like, as long as each has a unique 
-port name.  The valid initialisation modes are FB620P (which strobes 10101010 
-and 01010101 on the data pins), FB630P (which strobes 11001100 and 00110011 
+defines which initialisation (wake-up) mode to use on a per-port basis.
+If you only have one parport, the portname argument may be omitted \- but
+be careful as this may cause problems on multi-scanner systems.
+You may have as many of these lines as you like, as long as each has a unique
+port name.  The valid initialisation modes are FB620P (which strobes 10101010
+and 01010101 on the data pins), FB630P (which strobes 11001100 and 00110011
 on the data pins) and AUTO, which will try FB630P mode first then FB620P mode
 second.  The FB620P mode is also used by the FB320P.  The FB630P mode is used
 by the FB330P, N340P, and N640P.
 
 Option
 .B force_nibble
-forces the driver to use nibble mode even if ECP mode is reported to work by 
-libieee1284.  This works-around the rare issue of ECP mode being reported to 
+forces the driver to use nibble mode even if ECP mode is reported to work by
+libieee1284.  This works-around the rare issue of ECP mode being reported to
 work by the library, then not working.
 
 .SH TIPS
 .PP
-Hit the "Calibrate" button before scanning.  It vastly improves the quality of 
+Hit the "Calibrate" button before scanning.  It vastly improves the quality of
 scans.
 .PP
-To enable automatic detection of your scanner, uncomment the "canon_pp" line 
+To enable automatic detection of your scanner, uncomment the "canon_pp" line
 from
 .I @CONFIGDIR@/dll.conf
 .PP
@@ -127,40 +127,40 @@ below).
 The static library implementing this backend.
 .TP
 .I @LIBDIR@/libsane\-canon_pp.so
-The shared library implementing this backend (present on systems that support 
+The shared library implementing this backend (present on systems that support
 dynamic loading).
 .SH ENVIRONMENT
 .TP
 .B SANE_CONFIG_DIR
-This environment variable specifies the list of directories that may contain 
-the configuration file.  Under UNIX, the directories are separated by a colon 
+This environment variable specifies the list of directories that may contain
+the configuration file.  Under UNIX, the directories are separated by a colon
 (`:'), under OS/2, they are separated by a semi-colon (`;').  If this variable
-is not set, the configuration file is searched in two default directories: 
-first, the current working directory (".") and then in @CONFIGDIR@.  If the 
+is not set, the configuration file is searched in two default directories:
+first, the current working directory (".") and then in @CONFIGDIR@.  If the
 value of the environment variable ends with the directory separator character,
-then the default directories are searched after the explicitly specified 
+then the default directories are searched after the explicitly specified
 directories.  For example, setting
 .B SANE_CONFIG_DIR
 to "/tmp/config:" would result in directories "tmp/config", ".", and
 "@CONFIGDIR@" being searched (in this order).
 .TP
 .B SANE_DEBUG_CANON_PP
-If the library was compiled with debug support enabled, this environment 
-variable controls the debug level for this backend.  Higher debug levels 
+If the library was compiled with debug support enabled, this environment
+variable controls the debug level for this backend.  Higher debug levels
 increase the verbosity of the output.
 
-Example: 
+Example:
 export SANE_DEBUG_CANON_PP=4
 .SH NOTES
 .B Features available in the Windows interface
 .TP
-.B Brightness and Contrast 
-These are not implemented, and probably never will be.  These appear to be 
-implemented entirely in software.  Use GIMP or a similar program if you need 
+.B Brightness and Contrast
+These are not implemented, and probably never will be.  These appear to be
+implemented entirely in software.  Use GIMP or a similar program if you need
 these features.
 .TP
 .B Descreen Mode
-This appears on our first analysis to be just oversampling with an 
+This appears on our first analysis to be just oversampling with an
 anti-aliasing filter.  Again, it seems to be implemented entirely in software,
 so GIMP is your best bet for now.
 .TP
@@ -170,51 +170,51 @@ one returned during calibration) will be loaded.
 .PP
 .B Communication Problems
 .PP
-ECP mode in libieee1284 doesn't always work properly, even with new hardware.  
+ECP mode in libieee1284 doesn't always work properly, even with new hardware.
 We believe that this is a ppdev problem.  If you change the configuration file
-to include 
+to include
 .B force_nibble
 , the problem will go away, but you will only be able to scan in nibble mode.
 .PP
 Sometimes the scanner can be left in a state where our code cannot revive it.
-If the backend reports no scanner present, try unplugging the power and 
+If the backend reports no scanner present, try unplugging the power and
 plugging it back in.  Also try unplugging printers from the pass-through port.
 .PP
-The scanner will not respond correctly to our commands when you first plug in 
-the power.  You may find if you try a scan very soon after plugging in the 
+The scanner will not respond correctly to our commands when you first plug in
+the power.  You may find if you try a scan very soon after plugging in the
 power that the backend will incorrectly report that you have no scanner present.
-To avoid this, give it about 10 seconds to reset itself before attempting any 
+To avoid this, give it about 10 seconds to reset itself before attempting any
 scans.
 .PP
 .B Repeated Lines
 .PP
 Sometimes at high resolutions (ie. 600dpi) you will notice lines which appear
 twice.  These lines correspond to points where the scanner head has stopped
-during the scan (it stops every time the internal 64kb buffer is full).  
+during the scan (it stops every time the internal 64kb buffer is full).
 Basically it's a mechanical problem inside the scanner, that the tolerance of
 movement for a start/stop event is greater than 1/600 inches.  I've never tried
-the windows driver so I'm not sure how (or if) it works around this problem, 
-but as we don't know how to rewind the scanner head to do these bits again, 
+the windows driver so I'm not sure how (or if) it works around this problem,
+but as we don't know how to rewind the scanner head to do these bits again,
 there's currently no nice way to deal with the problem.
 .PP
 .B Grey-scale Scans
 .PP
-Be aware that the scanner uses the green LEDs to read grey-scale scans, meaning 
-green coloured things will appear lighter than normal, and red and blue 
-coloured items will appear darker than normal.  For high-accuracy grey-scale 
-scans of colour items, it's best just to scan in colour and convert to 
+Be aware that the scanner uses the green LEDs to read grey-scale scans, meaning
+green coloured things will appear lighter than normal, and red and blue
+coloured items will appear darker than normal.  For high-accuracy grey-scale
+scans of colour items, it's best just to scan in colour and convert to
 grey-scale in graphics software such as the GIMP.
 .PP
 .B FB620P/FB320P Caveats
 .PP
 These models can not be reset in the same way as the others.  The windows driver
-doesn't know how to reset them either \- when left with an inconsistent scanner, 
+doesn't know how to reset them either \- when left with an inconsistent scanner,
 it will start scanning half way down the page!
 .PP
 Aborting is known to work correctly on the FB*30P models, and is known to be
-broken on the FB*20P models.  The FB620P which I tested on simply returns 
-garbage after a scan has been aborted using the method we know.  
-Aborting is able to leave the scanner in a state where it can be shut down, 
+broken on the FB*20P models.  The FB620P which I tested on simply returns
+garbage after a scan has been aborted using the method we know.
+Aborting is able to leave the scanner in a state where it can be shut down,
 but not where another scan can be made.
 
 
@@ -224,9 +224,8 @@ sane(7), sane\-dll(5)
 http://canon\-fb330p.sourceforge.net/
 
 .SH AUTHOR
-This backend is primarily the work of Simon Krix (Reverse Engineering), and 
-Matthew Duggan (SANE interface).  
+This backend is primarily the work of Simon Krix (Reverse Engineering), and
+Matthew Duggan (SANE interface).
 .PP
-Many thanks to Kevin Easton for his comments and help, and Kent A. Signorini 
+Many thanks to Kevin Easton for his comments and help, and Kent A. Signorini
 for his help with the N340P.
-
diff --git a/doc/sane-cardscan.man b/doc/sane-cardscan.man
index 7c081af..e5872a8 100644
--- a/doc/sane-cardscan.man
+++ b/doc/sane-cardscan.man
@@ -5,16 +5,16 @@
 sane\-cardscan \- SANE backend for Corex CardScan usb scanners
 
 .SH DESCRIPTION
-The 
+The
 .B sane\-cardscan
 library implements a SANE (Scanner Access Now Easy) backend which
 provides access to the Corex CardScan 800c & 600c small-format scanners.
 
-The backend supports only grayscale and color modes and media of 
+The backend supports only grayscale and color modes and media of
 (theoretically) infinite length.
 
 This backend may support other scanners. The best
-way to determine level of support is to get a trace of the windows 
+way to determine level of support is to get a trace of the windows
 driver in action, and send it to the author.
 
 .SH OPTIONS
@@ -28,7 +28,7 @@ Selects the mode for the scan. Options are "Gray" and "Color".
 .SH CONFIGURATION FILE
 The configuration file "cardscan.conf" is used to tell the backend how to look
 for scanners, and provide options controlling the operation of the backend.
-This file is read each time the frontend asks the backend for a list 
+This file is read each time the frontend asks the backend for a list
 of scanners, generally only when the frontend starts. If the configuration
 file is missing, the backend will use a set of compiled defaults, which
 are identical to the default configuration file shipped with SANE.
@@ -37,7 +37,7 @@ Scanners can be specified in the configuration file in 2 ways:
 .PP
 "usb 0x04c5 0x1042" (or other vendor/product ids)
 .RS
-Requests backend to search all usb busses in the system for a device 
+Requests backend to search all usb busses in the system for a device
 which uses that vendor and product id. The device will then be queried
 to determine if it is a cardscan scanner.
 .RE
@@ -91,11 +91,11 @@ cannot set x/y coordinate values, resolutions, etc. These things could
 be simulated in the backend, but there are plenty of command line tools.
 .br
 .br
-The backend also does not send all the commands that the windows driver 
+The backend also does not send all the commands that the windows driver
 does, so it may not function the same.
 .br
 .br
-The backend does not have the calibration or ejection options of the 
+The backend does not have the calibration or ejection options of the
 windows driver.
 .br
 .br
@@ -111,4 +111,3 @@ sane\-usb(5)
 
 .SH AUTHOR
 m. allan noah: <kitno455 a t gmail d o t com>
-
diff --git a/doc/sane-config.man b/doc/sane-config.man
index 42c6f9a..997a342 100644
--- a/doc/sane-config.man
+++ b/doc/sane-config.man
@@ -37,7 +37,7 @@ frontend to libsane.
 .B  \-\-cflags
 Print the compiler flags that are necessary to compile a
 .B SANE
-frontend. 
+frontend.
 .TP 8
 .B  \-\-prefix
 Print the prefix used during compilation of libsane.
diff --git a/doc/sane-coolscan.man b/doc/sane-coolscan.man
index 5952039..65c8d53 100644
--- a/doc/sane-coolscan.man
+++ b/doc/sane-coolscan.man
@@ -6,7 +6,7 @@ sane\-coolscan \- SANE backend for Nikon film-scanners
 
 .SH ABOUT THIS FILE
 
-This file is a short description of the coolscan-backend for sane! 
+This file is a short description of the coolscan-backend for sane!
 
 .SH DESCRIPTION
 
@@ -18,22 +18,22 @@ library implements a SANE backend that provides the interface to the following N
 
 .SH CONFIGURATION
 
-The configuration file for this backend resides in 
+The configuration file for this backend resides in
 .IR @CONFIGDIR@/coolscan.conf .
 
 Its contents is a list of device names that correspond to Nikon Coolscan scanners. Empty lines
 and lines starting with a hash mark (#) are ignored. A sample configuration file is
-shown below: 
+shown below:
 
 .nf
- #scsi Vendor Model Type 
- scsi Nikon * Scanner 
- /dev/scanner 
+ #scsi Vendor Model Type
+ scsi Nikon * Scanner
+ /dev/scanner
 .fi
 
 The special device name must be a generic SCSI device or a symlink to such a device.
 To find out to which device your scanner is assigned and how you have to set the
-permissions of that device, have a look at sane\-scsi. 
+permissions of that device, have a look at sane\-scsi.
 
 .SH SCSI ADAPTER TIPS
 
diff --git a/doc/sane-coolscan2.man b/doc/sane-coolscan2.man
index af27f1a..71f589a 100644
--- a/doc/sane-coolscan2.man
+++ b/doc/sane-coolscan2.man
@@ -6,12 +6,12 @@ sane\-coolscan2 \- SANE backend for Nikon Coolscan film scanners
 The
 .B sane\-coolscan2
 library implements a SANE (Scanner Access Now Easy) backend that
-provides access to Nikon Coolscan film scanners.  Some functions of this 
+provides access to Nikon Coolscan film scanners.  Some functions of this
 backend should be considered
 .B beta-quality
-software. Most functions have been stable for a long time, but of 
+software. Most functions have been stable for a long time, but of
 course new development can not and will not function properly from
-the very first day. Please report any strange behaviour to the 
+the very first day. Please report any strange behaviour to the
 maintainer of the backend.
 
 .PP
@@ -38,7 +38,7 @@ report successes or failures.
 The options the backend supports can either be selected through command line
 options to programs like scanimage or through GUI elements in xscanimage or xsane.
 
-Valid command line options and their syntax can be listed by using 
+Valid command line options and their syntax can be listed by using
 .RS
 scanimage \-\-help \-d coolscan2:<interface>:<device>
 .RE
@@ -69,7 +69,7 @@ unit is mm).
 .I \-\-infrared=yes/no
 If set to "yes", the scanner will read the infrared channel, thus allowing
 defect removal in software. The infrared image is read during a second scan,
-with no options altered. The backend must not be restarted between the scans. 
+with no options altered. The backend must not be restarted between the scans.
 If you use scanimage, perform a batch scan with batch\-count=2 to obtain the
 IR information.
 .TP
diff --git a/doc/sane-coolscan3.man b/doc/sane-coolscan3.man
index 364d5ef..238f127 100644
--- a/doc/sane-coolscan3.man
+++ b/doc/sane-coolscan3.man
@@ -6,11 +6,11 @@ sane\-coolscan3 \- SANE backend for Nikon Coolscan film scanners
 The
 .B sane\-coolscan3
 library implements a SANE (Scanner Access Now Easy) backend that
-provides access to Nikon Coolscan film scanners.  Some functions of this 
-backend should be considered 
+provides access to Nikon Coolscan film scanners.  Some functions of this
+backend should be considered
 .B beta-quality
-software. Most functions have been stable for a long time, but of 
-course new development can not and will not function properly from 
+software. Most functions have been stable for a long time, but of
+course new development can not and will not function properly from
 the very first day.
 
 .PP
@@ -31,27 +31,27 @@ LS-8000 ED                   IEEE 1394
 .ft R
 .RE
 
-Please send mail to sane-devel@lists.alioth.debian.org to report successes 
+Please send mail to sane-devel@alioth-lists.debian.net to report successes
 or failures.
 
 .SH OPTIONS
-The options the backend supports can either be selected through command line 
+The options the backend supports can either be selected through command line
 options to programs like scanimage or through GUI elements in xscanimage or xsane.
 
-Valid command line options and their syntax can be listed by using 
+Valid command line options and their syntax can be listed by using
 .RS
 scanimage \-\-help \-d coolscan3:<interface>:<device>
 .RE
 where <interface> and <device> specify the device in question, as in the
 configuration file (see next section). The \-d parameter and its argument
 can be omitted to obtain information on the first scanner identified. Use
-the command 
+the command
 .RS
 scanimage \-L
 .RE
 to list all devices recognized by your SANE installation.
 
-The options should be fully described by the description or tooltips given by 
+The options should be fully described by the description or tooltips given by
 frontend. Here is a description of some of the most important options, in the
 syntax with which they must be supplied to scanimage:
 .TP
@@ -69,7 +69,7 @@ unit is mm).
 .I \-\-infrared=yes/no
 If set to "yes", the scanner will read the infrared channel, thus allowing
 defect removal in software. The infrared image is read during a second scan,
-with no options altered. The backend must not be restarted between the scans. 
+with no options altered. The backend must not be restarted between the scans.
 If you use scanimage, perform a batch scan with batch\-count=2 to obtain the
 IR information.
 .TP
@@ -109,7 +109,7 @@ Eject the film strip or mounted slide when using the slide loader.
 Reset scanner. The scanner will perform the same action as when power is
 turned on: it will eject the film strip and calibrate itself. Use this
 whenever the scanner refuses to load a film strip properly, as a result of
-which 
+which
 .I \-\-eject
 does not work.
 
@@ -126,7 +126,7 @@ entries are case-sensitive:
 These lines are ignored, thus '#' can be used to include comments.
 .TP
 .I containing only the word """auto"""
-This instructs the backend to probe for a scanner by scanning the buses for 
+This instructs the backend to probe for a scanner by scanning the buses for
 devices with know identifiers. This is the action taken when no
 configuration file is present.
 .TP
@@ -178,5 +178,4 @@ No real bugs currently known, please report any to the SANE developers' list.
 
 .SH AUTHORS
 coolscan3 written by A. Zummo (a.zummo@towertech.it), based heavily on
-coolscan2 written by Andr\['a]s Major (andras@users.sourceforge.net). 
-
+coolscan2 written by Andr\['a]s Major (andras@users.sourceforge.net).
diff --git a/doc/sane-dc210.man b/doc/sane-dc210.man
index bc0db75..7d3ad65 100644
--- a/doc/sane-dc210.man
+++ b/doc/sane-dc210.man
@@ -14,15 +14,15 @@ connected.  The device name is always "0".
 .SH CONFIGURATION
 The contents of the
 .I dc210.conf
-specify the serial port and baud rate to use.  The baud rate 
+specify the serial port and baud rate to use.  The baud rate
 specifies the maximum rate to use while downloading pictures.  (The
 camera is always initialized using 9600 baud, then switches to the
 higher rate).  On my 90MHz Pentium, I usually have no problems downloading
-at 115200 baud as long as the system is not excessively busy and 
+at 115200 baud as long as the system is not excessively busy and
 the "interrupt-unmask flag" is set in the IDE driver (hdparm \-u1).
 Supported baud rates are: 9600, 19200, 38400, 57600, and 115200.
 .PP
-The dumpinquiry line causes some information about the camera to 
+The dumpinquiry line causes some information about the camera to
 be printed.
 .PP
 cmdrespause specifies how many usec (1,000,000ths of a) between
@@ -30,7 +30,7 @@ writing the command and reading the result should be used. 125000
 seems to be the lowest I could go reliably.
 .PP
 breakpause is the time in 1,000,000ths of a usec between sending the
-"back to default" break sending commands.      
+"back to default" break sending commands.
 .PP
 Empty lines and lines starting with a hash mark (#) are
 ignored.  A sample configuration file is shown below:
@@ -81,7 +81,7 @@ to "/tmp/config:" would result in directories "tmp/config", ".", and
 .TP
 .B SANE_DEBUG_DC210
 If the library was compiled with debugging support enabled, this
-environment variable controls the debug level for this backend. 
+environment variable controls the debug level for this backend.
 A value of 128 requests maximally copious debug output; smaller
 levels reduce verbosity.
 
@@ -101,7 +101,7 @@ Henning Meier-Geinitz.
 Known bugs/limitations are: ?
 .PP
 More general comments, suggestions, and inquiries about frontends
-or SANE should go to the SANE Developers mailing list 
-(see http://www.sane\-project.org/mailing\-lists.html for details). 
+or SANE should go to the SANE Developers mailing list
+(see http://www.sane\-project.org/mailing\-lists.html for details).
 You must be subscribed to the list, otherwise your mail won't be
 sent to the subscribers.
diff --git a/doc/sane-dc240.man b/doc/sane-dc240.man
index ba7fd63..70629ab 100644
--- a/doc/sane-dc240.man
+++ b/doc/sane-dc240.man
@@ -14,16 +14,16 @@ connected.  The device name is always "0".
 .SH CONFIGURATION
 The contents of the
 .I dc240.conf
-specify the serial port and baud rate to use.  The baud rate 
+specify the serial port and baud rate to use.  The baud rate
 specifies the maximum rate to use while downloading pictures.  (The
 camera is always initialized using 9600 baud, then switches to the
 higher rate).  On a 450MHz Pentium, I usually have no problems downloading
 at 115200 baud, though the camera sometimes has to resend packets due
-to lost characters.  Results are better when 
+to lost characters.  Results are better when
 the "interrupt-unmask flag" is set in the IDE driver (hdparm \-u1).
 Supported baud rates are: 9600, 19200, 38400, 57600, and 115200.
 .PP
-The dumpinquiry line causes some information about the camera to 
+The dumpinquiry line causes some information about the camera to
 be printed.
 .PP
 cmdrespause specifies how many usec (1,000,000ths of a) between
@@ -31,7 +31,7 @@ writing the command and reading the result should be used. 125000
 seems to be the lowest I could go reliably.
 .PP
 breakpause is the time in 1,000,000ths of a usec between sending the
-"back to default" break sending commands.      
+"back to default" break sending commands.
 .PP
 Empty lines and lines starting with a hash mark (#) are
 ignored.  A sample configuration file is shown below:
@@ -82,7 +82,7 @@ to "/tmp/config:" would result in directories "tmp/config", ".", and
 .TP
 .B SANE_DEBUG_DC240
 If the library was compiled with debugging support enabled, this
-environment variable controls the debug level for this backend. 
+environment variable controls the debug level for this backend.
 A value of 128 requests maximally copious debug output; smaller
 levels reduce verbosity.
 
@@ -101,13 +101,12 @@ The manpage was largely copied from the dc210 manpage.
 .SH BUGS
 The major limitation that I know of is that the backend assumes
 the directory in the camera is 100dc240.  Once the camera has
-taken more than 9999 pictures, the directory will increment to 101dc240. 
+taken more than 9999 pictures, the directory will increment to 101dc240.
 Not only should we check for the additional directory, but pictures may
 actually be found in multiple directories.
 .PP
 More general comments, suggestions, and inquiries about frontends
-or SANE should go to the SANE Developers mailing list 
-(see http://www.sane\-project.org/mailing\-lists.html for details). 
+or SANE should go to the SANE Developers mailing list
+(see http://www.sane\-project.org/mailing\-lists.html for details).
 You must be subscribed to the list, otherwise your mail won't be
 sent to the subscribers.
-
diff --git a/doc/sane-dc25.man b/doc/sane-dc25.man
index eabe765..889fd2d 100644
--- a/doc/sane-dc25.man
+++ b/doc/sane-dc25.man
@@ -15,15 +15,15 @@ connected.  The device name is always "0".
 .SH CONFIGURATION
 The contents of the
 .I dc25.conf
-specify the serial port and baud rate to use.  The baud rate 
+specify the serial port and baud rate to use.  The baud rate
 specifies the maximum rate to use while downloading pictures.  (The
 camera is always initialized using 9600 baud, then switches to the
 higher rate).  On my 90MHz Pentium, I usually have no problems downloading
-at 115200 baud as long as the system is not excessively busy and 
+at 115200 baud as long as the system is not excessively busy and
 the "interrupt-unmask flag" is set in the IDE driver (hdparm \-u1).
 Supported baud rates are: 9600, 19200, 38400, 57600, and 115200.
 .PP
-The dumpinquiry line causes some information about the camera to 
+The dumpinquiry line causes some information about the camera to
 be printed to stderr during startup.  Note:  This is not compatible
 with saned, so make sure you don't have any dumpinquiry lines if you are
 using saned (i.e. scanning on a remote machine using a
@@ -74,7 +74,7 @@ to "/tmp/config:" would result in directories "tmp/config", ".", and
 .TP
 .B SANE_DEBUG_DC25
 If the library was compiled with debugging support enabled, this
-environment variable controls the debug level for this backend. 
+environment variable controls the debug level for this backend.
 A value of 128 requests maximally copious debug output; smaller
 levels reduce verbosity.
 
@@ -93,7 +93,7 @@ slider that is used to select the picture from the camera may not be
 updated immediately.
 .PP
 More general comments, suggestions, and inquiries about frontends
-or SANE should go to the SANE Developers mailing list 
-(see http://www.sane\-project.org/mailing\-lists.html for details). 
+or SANE should go to the SANE Developers mailing list
+(see http://www.sane\-project.org/mailing\-lists.html for details).
 You must be subscribed to the list, otherwise your mail won't be
 sent to the subscribers.
diff --git a/doc/sane-dll.man b/doc/sane-dll.man
index 54f9686..e93f897 100644
--- a/doc/sane-dll.man
+++ b/doc/sane-dll.man
@@ -55,11 +55,11 @@ mustek
 .PP
 It is also possible to add a file in
 .I @CONFIGDIR@/dll.d
-that contains the list of backends to be added. Backends mentioned in a 
-file included in this directory will be added before any backends listed 
-in 
+that contains the list of backends to be added. Backends mentioned in a
+file included in this directory will be added before any backends listed
+in
 .I dll.conf.
-Files in 
+Files in
 .I @CONFIGDIR@/dll.d
 can be freely named. They shall follow the format conventions as apply for
 .I dll.conf.
@@ -76,7 +76,7 @@ in file backend/Makefile.in of the SANE source code distribution.  After
 changing the value of this macro, it is necessary to reconfigure, rebuild,
 and reinstall SANE for the change to take effect.
 
-Aliases are defined in the config file 
+Aliases are defined in the config file
 .IR dll.aliases .
 It can contain entries of the form
 .PP
@@ -152,7 +152,7 @@ to "/tmp/config:" would result in directories "tmp/config", ".", and
 If the library was compiled with debug support enabled, this
 environment variable controls the debug level for this backend.  E.g.,
 a value of 128 requests all debug output to be printed.  Smaller
-levels reduce verbosity. 
+levels reduce verbosity.
 
 .ft CR
 .nf
@@ -165,7 +165,7 @@ Value  Description
 .fi
 .ft R
 
-Example: 
+Example:
 export SANE_DEBUG_DLL=3
 
 
diff --git a/doc/sane-epjitsu.man b/doc/sane-epjitsu.man
index 3552691..9a31da2 100644
--- a/doc/sane-epjitsu.man
+++ b/doc/sane-epjitsu.man
@@ -5,12 +5,12 @@
 sane\-epjitsu \- SANE backend for Epson-based Fujitsu USB scanners.
 
 .SH DESCRIPTION
-The 
+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(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 
+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
 .B KNOWN ISSUES.
 
 This backend may support other scanners. If physical inspection reveals an Epson chipset, please contact the author for instructions on collecting a USB trace under Windows to verify.
@@ -18,12 +18,12 @@ This backend may support other scanners. If physical inspection reveals an Epson
 .SH OPTIONS
 A limited effort has been made to expose the standard options to the API.  This allows a frontend to set resolution, color mode, and choose the ADF setting. The epjitsu backend supports the following basic options for most scanners:
 .PP
-source s 
+source s
 .RS
 Selects the source for the scan. Options may include "Flatbed", "ADF Front", "ADF Back", "ADF Duplex".
 .RE
 .PP
-mode m 
+mode m
 .RS
 Selects the mode for the scan. Options may include "Lineart", "Gray", "Color".
 .RE
@@ -52,13 +52,13 @@ Some systems use a kernel driver to access usb scanners. This method is untested
 .PP
 The only configuration option supported is "firmware /PATH/TO/FILE", allowing you to set the location of the firmware file you have extracted from the Windows driver.
 .PP
-.B Note: 
+.B Note:
 This firmware is a copyrighted work of Fujitsu, so cannot be provided by the backend or the author. Please do not ask.
 .PP
-.B Note: 
+.B Note:
 These scanners REQUIRE a firmware file to function. See the supplied configuration file for more detail.
 .PP
-.B Note: 
+.B Note:
 This option may appear multiple times in the configuration file. It only applies to scanners discovered by 'usb' lines that follow this option.
 .PP
 
@@ -103,4 +103,3 @@ sane\-usb(5)
 
 .SH AUTHOR
 m. allan noah: <kitno455 a t gmail d o t com>
-
diff --git a/doc/sane-epson.man b/doc/sane-epson.man
index af2b3cf..f09f075 100644
--- a/doc/sane-epson.man
+++ b/doc/sane-epson.man
@@ -6,12 +6,12 @@ sane\-epson \- SANE backend for EPSON scanners
 The
 .B sane\-epson
 library implements a SANE (Scanner Access Now Easy) backend that
-provides access to Epson flatbed scanners.  Some functions of this 
+provides access to Epson flatbed scanners.  Some functions of this
 backend should be considered
 .B beta-quality
-software! Most functions have been stable for a long time, but of 
+software! Most functions have been stable for a long time, but of
 course new development can not and often times will not function properly from
-the very first day. Please report any strange behavior to the 
+the very first day. Please report any strange behavior to the
 maintainer of the backend.
 .PP
 At present, the following scanners are known to work with this backend:
@@ -48,23 +48,23 @@ CX-5200                      USB
 and many more. The official list is on the Sane web site.
 .RE
 
-For other scanners the software  may or may not work.  Please send mail to 
+For other scanners the software  may or may not work.  Please send mail to
 the backend author (khk@khk.net) to report success with scanners not on
-the list or problems with scanners that are listed. 
+the list or problems with scanners that are listed.
 .SH OPTIONS
 The options the backend supports can either be selected through command line
 options to programs like scanimage or through GUI elements in programs like
 xscanimage or xsane.
 
-Valid command line options and their syntax can be listed by using 
+Valid command line options and their syntax can be listed by using
 .RS
 scanimage \-\-help \-d epson
 .RE
 Not all devices support all options.
 .TP
 .I Scan Mode
-The 
-.I \-\-mode 
+The
+.I \-\-mode
 switch selects the basic mode of operation of the scanner. Valid choices
 are Binary, Gray and Color.  The Binary mode is black and white only,
 Gray will produce 256 levels of gray or more depending on the scanner
@@ -89,7 +89,7 @@ are "None", "Halftone A (Hard Tone)", "Halftone B (Soft Tone)", "Halftone C
 (4x4 Net Screen)", "Dither D (8x4 Net Screen)", "Text Enhanced Technology",
 "Download pattern A", and "Download pattern B".
 
-The 
+The
 .I \-\-dropout
 switch selects the so called dropout color. Valid options are None,
 Red, Green and Blue. The default is None. The dropout color is used for
@@ -109,62 +109,62 @@ switch sets the sharpness of the image data. Valid options are integer
 values from \-2 to 2, with \-2 meaning "Defocus", \-1 "Defocus slightly",
 0 "Normal", 1 "Sharpen slightly" and 2 "Sharpen".
 
-The 
+The
 .I \-\-gamma\-correction
 switch controls the scanner's internal gamma correction. Valid options are
 "Default", "User defined", "High density printing" "Low density printing"
 and "High contrast printing".
 
-The 
+The
 .I \-\-color\-correction
 switch controls the scanner's internal color correction function. Valid
 options are "No Correction", "Impact\-dot printers", "Thermal printers",
 "Ink\-jet printers" and "CRT monitors". The default is "CRT monitors".
 
-The 
+The
 .I \-\-resolution
 switch selects the resolution for a scan. Some EPSON scanners will scan in
 any resolution between the lowest and highest possible value. The list
 reported by the scanner can be displayed using the "\-\-help \-d epson"
 parameters to scanimage.
 
-The 
+The
 .I \-\-mirror
 option controls the way the image is scanned. By reading the image data
 from right to left the image is mirrored. Valid options are "yes" and
 "no". The default is "no".
 
-The 
+The
 .I \-\-speed
 option can improve the scan speed in monochrome mode. Valid options are
 "yes" or "no", the "yes" option will speed up the scan if this option
 is supported.
 
-The 
-.I \-\-auto\-area\-segmentation 
+The
+.I \-\-auto\-area\-segmentation
 switch activates the automatic area segmentation for monochrome scans. The
 scanner will try to determine which areas are text and which contain
 images. The image areas will be halftoned, and the text will be
 improved. Valid options are "yes" and "no". The default is "yes".
 
-The 
+The
 .I \-\-gamma\-table
 parameter can be used to download a user defined gamma table. The option
 takes 256 values from the range 0-255. In color mode this option equally
 affects the red, green, and blue channel.
 
-The 
-.I \-\-red\-gamma\-table 
+The
+.I \-\-red\-gamma\-table
 parameter can be used to download a user defined gamma table for the
 red channel. The valid options are the same as for \-\-gamma\-table.
 
-The 
-.I \-\-green\-gamma\-table 
+The
+.I \-\-green\-gamma\-table
 parameter can be used to download a user defined gamma table for the
 green channel. The valid options are the same as for \-\-gamma\-table.
 
-The 
-.I \-\-blue\-gamma\-table 
+The
+.I \-\-blue\-gamma\-table
 parameter can be used to download a user defined gamma table for the
 blue channel. The valid options are the same as for \-\-gamma\-table.
 
@@ -173,19 +173,19 @@ The color correction coefficients
 will install color correction coefficients for the user defined color
 correction. Values are specified as integers in the range \-127..127.
 
-The 
+The
 .I \-\-preview
-option requests a preview scan. The frontend software automatically selects a low 
+option requests a preview scan. The frontend software automatically selects a low
 resolution. Valid options are "yes" and "no". The default is "no".
 
-The 
+The
 .I \-\-preview\-speed
 options will increase the scan speed if this is supported by the
 scanner. Valid options are "yes" and "no", the default is "no".
 
 
 The geometry options
-.I \-l \-t \-x \-y 
+.I \-l \-t \-x \-y
 control the scan area: \-l sets the top left x coordinate, \-t the top
 left y coordinate, \-x selects the width and \-y the height of the scan
 area. All parameters are specified in millimeters.
@@ -201,9 +201,9 @@ The
 option selects the scan source. Valid options depend on the installed
 options. The default is "Flatbed".
 
-The 
+The
 .I \-\-auto\-eject
-option will eject a page after scanning from the document feeder. 
+option will eject a page after scanning from the document feeder.
 
 The
 .I \-\-film\-type
@@ -222,7 +222,7 @@ will ignore this option.
 
 
 .SH CONFIGURATION FILE
-The configuration file @CONFIGDIR@/epson.conf specifies the device(s) that the 
+The configuration file @CONFIGDIR@/epson.conf specifies the device(s) that the
 backend will use. Possible connection types are:
 .TP
 .I SCSI
@@ -230,22 +230,22 @@ This is the default, and if nothing else is specified the backend software will
 open a given path as SCSI device. More information about valid syntax for SCSI
 devices can be found in sane\-scsi(5).
 .br
-Usually SCSI scanners are configured with a line "scsi EPSON" in this file. In 
+Usually SCSI scanners are configured with a line "scsi EPSON" in this file. In
 some cases it may be necessary to only use the string "scsi" (e.g. for the GT-6500).
 .TP
 .I PIO \- Parallel Interface
 The parallel interface can be configured in two ways: An integer value starting
 at the beginning of a line will be interpreted as the IO address of the parallel
-port. To make it clearer that a configured IO address is a parallel port the 
+port. To make it clearer that a configured IO address is a parallel port the
 port address can be preceded by the string "PIO". The PIO connection does not
 use a special device file in the /dev directory. The IO address can be specified
 in hex mode (prefixed with "0x").
 .TP
 .I USB
-A device file that is preceded by the string "USB" is treated as a scanner 
+A device file that is preceded by the string "USB" is treated as a scanner
 connected via the Universal Serial Bus. The correct special device file has
-to be created prior to using it with Sane. See the USB documentation for 
-more information about how to set up the USB subsystem and the required 
+to be created prior to using it with Sane. See the USB documentation for
+more information about how to set up the USB subsystem and the required
 device files.
 .SH FILES
 .TP
@@ -265,14 +265,14 @@ levels reduce verbosity.
 .TP
 .B SANE_DEBUG_EPSON_SCSI
 If the library was compiled with debug support enabled, this
-environment variable controls the SCSI related debug level for this backend.  
+environment variable controls the SCSI related debug level for this backend.
 Only a value of 2 is supported.
 .TP
 .B SANE_EPSON_CMD_LVL
 This allows one to override the function or command level that the backend
 uses to communicate with the scanner. The function level a scanner
 supports is determined during the initialization of the device. If
-the backend does not recognize the function level reported by the 
+the backend does not recognize the function level reported by the
 scanner it will default to function level B3. Valid function levels
 are A1, A2, B1, B2, B3, B4, B5, B6, B7, B8, D1 and F5. Use this feature
 only if you know what you are doing!
@@ -286,18 +286,18 @@ sane\-scsi(5), scanimage(1), xscanimage(1), xsane(1)
 None :-) At least none are currently known.
 
 .SH UNSUPPORTED DEVICES
-The backend may be used with Epson scanners that are not yet listed 
+The backend may be used with Epson scanners that are not yet listed
 under the list of supported devices. A scanner that is not recognized
-may default to the function level B3, which means that not all 
-functions that the scanner may be capable of are accessible. 
+may default to the function level B3, which means that not all
+functions that the scanner may be capable of are accessible.
 
 If the scanner is not even recognized as an Epson scanner this is
 probably because the device name reported by the scanner is not in the
 correct format. Please send this information to the backend maintainer
 (email address is in the AUTHOR section of this man page or in the
-AUTHORS file of the SANE distribution). 
+AUTHORS file of the SANE distribution).
 
-The Perfection 600, Perfection 650, Perfection 660, Perfection 1250 and 
+The Perfection 600, Perfection 650, Perfection 660, Perfection 1250 and
 Perfection 1260 are not supported by this backend.
 
 .SH AUTHOR
diff --git a/doc/sane-epson2.man b/doc/sane-epson2.man
index 6d47eea..33acd78 100644
--- a/doc/sane-epson2.man
+++ b/doc/sane-epson2.man
@@ -13,11 +13,11 @@ include network access.
 .PP
 Because
 .B sane\-epson
-and 
-.B sane\-epson2 
+and
+.B sane\-epson2
 drivers support many of the same devices, if one
 driver gives you problems you may try disabling it to try the other.
-This can be done by removing the driver name from the 
+This can be done by removing the driver name from the
 .I dll.conf
 or perhaps by commenting out the options in
 .I epson.conf
@@ -94,23 +94,23 @@ V750                         USB, IEEE-1394
 and many more. The official list is on the Sane web site.
 .RE
 
-For other scanners the software  may or may not work.  Please send mail to 
+For other scanners the software  may or may not work.  Please send mail to
 the sane-backend mailing list to report success with scanners not on
-the list or problems with scanners that are listed. 
+the list or problems with scanners that are listed.
 .SH OPTIONS
 The options the backend supports can either be selected through command line
 options to programs like scanimage or through GUI elements in programs like
 xscanimage or xsane.
 
-Valid command line options and their syntax can be listed by using 
+Valid command line options and their syntax can be listed by using
 .RS
 scanimage \-\-help \-d epson2
 .RE
 Not all devices support all options.
 .TP
 .I Scan Mode
-The 
-.I \-\-mode 
+The
+.I \-\-mode
 switch selects the basic mode of operation of the scanner. Valid choices
 are Binary, Gray and Color.  The Binary mode is black and white only,
 Gray will produce 256 levels of gray or more depending on the scanner
@@ -135,7 +135,7 @@ are "None", "Halftone A (Hard Tone)", "Halftone B (Soft Tone)", "Halftone C
 (4x4 Net Screen)", "Dither D (8x4 Net Screen)", "Text Enhanced Technology",
 "Download pattern A", and "Download pattern B".
 
-The 
+The
 .I \-\-dropout
 switch selects the so called dropout color. Valid options are None,
 Red, Green and Blue. The default is None. The dropout color is used for
@@ -155,54 +155,54 @@ switch sets the sharpness of the image data. Valid options are integer
 values from \-2 to 2, with \-2 meaning "Defocus", \-1 "Defocus slightly",
 0 "Normal", 1 "Sharpen slightly" and 2 "Sharpen".
 
-The 
+The
 .I \-\-gamma\-correction
 switch controls the scanner's internal gamma correction. Valid options are
 "Default", "User defined", "High density printing" "Low density printing"
 and "High contrast printing".
 
-The 
+The
 .I \-\-color\-correction
 switch controls the scanner's internal color correction function. Valid
 options are "No Correction", "Impact\-dot printers", "Thermal printers",
 "Ink\-jet printers" and "CRT monitors". The default is "CRT monitors".
 
-The 
+The
 .I \-\-resolution
 switch selects the resolution for a scan. Some EPSON scanners will scan in
 any resolution between the lowest and highest possible value. The list
 reported by the scanner can be displayed using the "\-\-help \-d epson"
 parameters to scanimage.
 
-The 
+The
 .I \-\-threshold
 switch selects the minimum brightness to get a white point.
 
-The 
+The
 .I \-\-mirror
 option controls the way the image is scanned. By reading the image data
 from right to left the image is mirrored. Valid options are "yes" and
 "no". The default is "no".
 
-The 
-.I \-\-auto\-area\-segmentation 
+The
+.I \-\-auto\-area\-segmentation
 switch activates the automatic area segmentation for monochrome scans. The
 scanner will try to determine which areas are text and which contain
 images. The image areas will be halftoned, and the text will be
 improved. Valid options are "yes" and "no". The default is "yes".
 
-The 
-.I \-\-red\-gamma\-table 
+The
+.I \-\-red\-gamma\-table
 parameter can be used to download a user defined gamma table for the
 red channel. The valid options are the same as for \-\-gamma\-table.
 
-The 
-.I \-\-green\-gamma\-table 
+The
+.I \-\-green\-gamma\-table
 parameter can be used to download a user defined gamma table for the
 green channel. The valid options are the same as for \-\-gamma\-table.
 
-The 
-.I \-\-blue\-gamma\-table 
+The
+.I \-\-blue\-gamma\-table
 parameter can be used to download a user defined gamma table for the
 blue channel. The valid options are the same as for \-\-gamma\-table.
 
@@ -216,13 +216,13 @@ The color correction coefficients
 will install color correction coefficients for the user defined color
 correction. Values are specified as integers in the range \-127..127.
 
-The 
+The
 .I \-\-preview
-option requests a preview scan. The frontend software automatically selects a low 
+option requests a preview scan. The frontend software automatically selects a low
 resolution. Valid options are "yes" and "no". The default is "no".
 
 The geometry options
-.I \-l \-t \-x \-y 
+.I \-l \-t \-x \-y
 control the scan area: \-l sets the top left x coordinate, \-t the top
 left y coordinate, \-x selects the width and \-y the height of the scan
 area. All parameters are specified in millimeters.
@@ -232,9 +232,9 @@ The
 option selects the scan source. Valid options depend on the installed
 options. The default is "Flatbed".
 
-The 
+The
 .I \-\-auto\-eject
-option will eject a page after scanning from the document feeder. 
+option will eject a page after scanning from the document feeder.
 
 The
 .I \-\-film\-type
@@ -264,7 +264,7 @@ The
 option select the ADF mode (simplex/duplex).
 
 .SH CONFIGURATION FILE
-The configuration file @CONFIGDIR@/epson2.conf specifies the device(s) that the 
+The configuration file @CONFIGDIR@/epson2.conf specifies the device(s) that the
 backend will use. Possible connection types are:
 .TP
 .I SCSI
@@ -272,28 +272,28 @@ This is the default, and if nothing else is specified the backend software will
 open a given path as SCSI device. More information about valid syntax for SCSI
 devices can be found in sane\-scsi(5).
 .br
-Usually SCSI scanners are configured with a line "scsi EPSON" in this file. In 
+Usually SCSI scanners are configured with a line "scsi EPSON" in this file. In
 some cases it may be necessary to only use the string "scsi" (e.g. for the GT-6500).
 .TP
 .I PIO \- Parallel Interface
 The parallel interface can be configured in two ways: An integer value starting
 at the beginning of a line will be interpreted as the IO address of the parallel
-port. To make it clearer that a configured IO address is a parallel port the 
+port. To make it clearer that a configured IO address is a parallel port the
 port address can be preceded by the string "PIO". The PIO connection does not
 use a special device file in the /dev directory. The IO address can be specified
 in hex mode (prefixed with "0x").
 .TP
 .I USB
 For USB scanners not automatically detect, their VENDOR and PRODUCT ID can
-be specified manually in the config file.  
+be specified manually in the config file.
 More information about valid syntax for USB devices can be found in sane\-usb(5).
 .TP
 .I Network
 Network scanners can be auto-discovered if
 .I autodiscovery
-is specified after 
+is specified after
 .I
-net 
+net
 keyword.  An IP address to connect to can also be used.
 .SH FILES
 .TP
@@ -313,20 +313,20 @@ levels reduce verbosity.
 .TP
 .B SANE_DEBUG_EPSON2_SCSI
 If the library was compiled with debug support enabled, this
-environment variable controls the SCSI related debug level for this backend.  
+environment variable controls the SCSI related debug level for this backend.
 Only a value of 2 is supported.
 .TP
 .B SANE_DEBUG_EPSON2_NET
 If the library was compiled with debug support enabled, this
-environment variable controls the network related debug level for this 
-backend.  E.g., a value of 128 requests all debug output to be printed.  
+environment variable controls the network related debug level for this
+backend.  E.g., a value of 128 requests all debug output to be printed.
 Smaller levels reduce verbosity.
 .TP
 .B SANE_EPSON2_CMD_LVL
 This allows one to override the function or command level that the backend
 uses to communicate with the scanner. The function level a scanner
 supports is determined during the initialization of the device. If
-the backend does not recognize the function level reported by the 
+the backend does not recognize the function level reported by the
 scanner it will default to function level B3. Valid function levels
 are A1, A2, B1, B2, B3, B4, B5, B6, B7, B8, D1 and F5. Use this feature
 only if you know what you are doing!
@@ -340,16 +340,16 @@ sane\-scsi(5), sane\-usb(5), scanimage(1), xscanimage(1), xsane(1)
 None :-) At least none are currently known.
 
 .SH UNSUPPORTED DEVICES
-The backend may be used with Epson scanners that are not yet listed 
+The backend may be used with Epson scanners that are not yet listed
 under the list of supported devices. A scanner that is not recognized
-may default to the function level B3, which means that not all 
-functions that the scanner may be capable of are accessible. 
+may default to the function level B3, which means that not all
+functions that the scanner may be capable of are accessible.
 
 If the scanner is not even recognized as an Epson scanner this is
 probably because the device name reported by the scanner is not in the
 correct format. Please send this information to the backend maintainer
 (email address is in the AUTHOR section of this man page or in the
-AUTHORS file of the SANE distribution). 
+AUTHORS file of the SANE distribution).
 
 .SH AUTHOR
 
diff --git a/doc/sane-epsonds.man b/doc/sane-epsonds.man
index 3324804..03bbbd2 100644
--- a/doc/sane-epsonds.man
+++ b/doc/sane-epsonds.man
@@ -8,15 +8,15 @@ The
 library implements a SANE (Scanner Access Now Easy) backend that
 provides access to Epson ESC/I-2 scanners.
 .PP
-Valid command line options and their syntax can be listed by using 
+Valid command line options and their syntax can be listed by using
 .RS
 scanimage \-\-help \-d epsonds
 .RE
 Not all devices support all options.
 .TP
 .I Scan Mode
-The 
-.I \-\-mode 
+The
+.I \-\-mode
 switch selects the basic mode of operation of the scanner. Valid choices
 are Lineart, Gray and Color. The Lineart mode is black and white only,
 Gray will produce 256 levels of gray or more depending on the scanner
@@ -33,7 +33,7 @@ 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.
 
-The 
+The
 .I \-\-resolution
 switch selects the resolution for a scan. Some EPSON scanners will scan in
 any resolution between the lowest and highest possible value. The list
@@ -41,7 +41,7 @@ reported by the scanner can be displayed using the "\-\-help \-d epson"
 parameters to scanimage.
 
 The geometry options
-.I \-l \-t \-x \-y 
+.I \-l \-t \-x \-y
 control the scan area: \-l sets the top left x coordinate, \-t the top
 left y coordinate, \-x selects the width and \-y the height of the scan
 area. All parameters are specified in millimeters.
@@ -60,20 +60,20 @@ The
 option select the ADF mode (simplex/duplex).
 
 .SH CONFIGURATION FILE
-The configuration file @CONFIGDIR@/epsonds.conf specifies the device(s) that the 
+The configuration file @CONFIGDIR@/epsonds.conf specifies the device(s) that the
 backend will use. Possible connection types are:
 .TP
 .I USB
 For not automatically detected USB scanners, their VENDOR and PRODUCT ID can
-be specified manually in the config file.  
+be specified manually in the config file.
 More information about valid syntax for USB devices can be found in sane\-usb(5).
 .TP
 .I Network (not yet supported)
 Network scanners can be auto-discovered if
 .I autodiscovery
-is specified after 
+is specified after
 .I
-net 
+net
 keyword.  An IP address to connect to can also be used.
 .SH FILES
 .TP
diff --git a/doc/sane-find-scanner.man b/doc/sane-find-scanner.man
index da2d377..26c5258 100644
--- a/doc/sane-find-scanner.man
+++ b/doc/sane-find-scanner.man
@@ -4,12 +4,12 @@
 sane\-find\-scanner \- find SCSI and USB scanners and their device files
 .SH SYNOPSIS
 .B sane\-find\-scanner
-.RB [ \-h | \-? ]
+.RB [ \-? | \-h | \-\-help ]
 .RB [ \-v ]
 .RB [ \-q ]
 .RB [ \-p ]
 .RB [ \-f ]
-.RB [ \-F 
+.RB [ \-F
 .IR filename ]
 .RI [ devname ]
 
@@ -19,15 +19,15 @@ is a command-line tool to find SCSI and USB scanners and determine their Unix
 device files. Its primary aim is to make sure that scanners can be detected by
 SANE backends.
 .PP
-For 
+For
 .B SCSI
-scanners, it checks the default generic SCSI device files (e.g., 
+scanners, it checks the default generic SCSI device files (e.g.,
 .IR /dev/sg0 )
-and 
+and
 .IR /dev/scanner .
 The test is done by sending a SCSI inquiry command and looking for a device
 type of "scanner" or "processor" (some old HP scanners seem to send
-"processor"). So 
+"processor"). So
 .B sane\-find\-scanner
 will find any SCSI scanner connected to those default device files even if it
 isn't supported by any SANE backend.
@@ -42,12 +42,12 @@ and
 are tested. The files are opened and the vendor and device ids are determined,
 if the operating system supports this feature. Currently USB scanners are only
 found this way if they are supported by the Linux scanner module or the
-FreeBSD or OpenBSD uscanner driver. After that test, 
+FreeBSD or OpenBSD uscanner driver. After that test,
 .B sane\-find\-scanner
 tries to scan for USB devices found by the USB library libusb (if
 available). There is no special USB class for scanners, so the heuristics used
 to distinguish scanners from other USB devices is not
-perfect. 
+perfect.
 .B sane\-find\-scanner
 also tries to find out the type of USB chip used in the scanner. If detected,
 it will be printed after the vendor and product ids.
@@ -55,20 +55,20 @@ it will be printed after the vendor and product ids.
 will even find USB scanners, that are not supported by any SANE backend.
 .PP
 .B sane\-find\-scanner
-won't find most 
+won't find most
 parallel port scanners, or scanners connected to proprietary ports. Some
 .B parallel port
 scanners may be detected by
-.B sane\-find\-scanner -p. 
+.B sane\-find\-scanner -p.
 At the time of writing this will only detect Mustek parallel port scanners.
 
 .SH OPTIONS
 .TP 8
-.B \-h, \-?
+.B \-?, \-h, \-\-help
 Prints a short usage message.
 .TP 8
 .B \-v
-Verbose output. If used once, 
+Verbose output. If used once,
 .B sane\-find\-scanner
 shows every device name and the test result.  If used twice, SCSI inquiry
 information and the USB device descriptors are also printed.
@@ -81,7 +81,7 @@ Probe parallel port scanners.
 .TP 8
 .B \-f
 Force opening all explicitly given devices as SCSI and USB devices. That's
-useful if 
+useful if
 .B sane\-find\-scanner
 is wrong in determining the device type.
 .TP 8
@@ -128,7 +128,6 @@ SCSI support is available on Irix, EMX, Linux, Next, AIX, Solaris, FreeBSD,
 NetBSD, OpenBSD, and HP-UX.
 
 .SH BUGS
-No support for most parallel port scanners yet. 
+No support for most parallel port scanners yet.
 .br
 Detection of USB chipsets is limited to a few chipsets.
-
diff --git a/doc/sane-fujitsu.man b/doc/sane-fujitsu.man
index 6bd5f73..ccc3d89 100644
--- a/doc/sane-fujitsu.man
+++ b/doc/sane-fujitsu.man
@@ -5,18 +5,18 @@
 sane\-fujitsu \- SANE backend for Fujitsu flatbed and ADF scanners
 
 .SH DESCRIPTION
-The 
+The
 .B sane\-fujitsu
 library implements a SANE (Scanner Access Now Easy) backend which
 provides access to most Fujitsu flatbed and ADF scanners.
 
-This document describes backend version 133, which shipped with SANE 1.0.26.
+This document describes backend version 134, which shipped with SANE 1.0.28.
 
 .SH SUPPORTED HARDWARE
-This version supports every known model which speaks the Fujitsu SCSI and 
-SCSI\-over\-USB protocols. Specifically, the SCSI M309x and M409x series, the 
+This version supports every known model which speaks the Fujitsu SCSI and
+SCSI\-over\-USB protocols. Specifically, the SCSI M309x and M409x series, the
 SCSI fi\-series, most of the USB fi\-series, the USB ScanSnap S5xx/S15xx, and
-the USB iX1xx/5xx series scanners are supported. Please see the list at 
+the USB iX1xx/5xx series scanners are supported. Please see the list at
 http://www.sane\-project.org/sane\-supported\-devices.html for details.
 
 This backend may support other Fujitsu scanners. The best
@@ -40,7 +40,7 @@ ScanStation  M3093E/DE/EX fi\-4110EOX/2
 ScanPartner  M3096EX      fi\-4010CU
 SP\-Jr        M3097E+/DE   S300/S300M
 SP\-10/10C    M3099A/EH/EX S1300/S1100
-SP\-15C/300C               fi\-60F
+SP\-15C/300C               fi\-60F/65F
 SP\-600C/620C              fi\-5015C
                           SP\-2x/3x
 .fi
@@ -51,13 +51,13 @@ SP\-600C/620C              fi\-5015C
 .SH OPTIONS
 Effort has been made to expose all hardware options, including:
 .PP
-source s 
+source s
 .RS
 Selects the source for the scan. Options
 may include "Flatbed", "ADF Front", "ADF Back", "ADF Duplex".
 .RE
 .PP
-mode m 
+mode m
 .RS
 Selects the mode for the scan. Options
 may include "Lineart", "Halftone", "Gray", and "Color".
@@ -65,13 +65,13 @@ may include "Lineart", "Halftone", "Gray", and "Color".
 .PP
 resolution, y\-resolution
 .RS
-Controls scan resolution. Setting \-\-resolution also sets \-\-y\-resolution, 
+Controls scan resolution. Setting \-\-resolution also sets \-\-y\-resolution,
 though this behavior is overridden by some frontends.
 .RE
 .PP
 tl\-x, tl\-y, br\-x, br\-y
 .RS
-Sets scan area upper left and lower right coordinates. These are renamed 
+Sets scan area upper left and lower right coordinates. These are renamed
 t, l, x, y by some frontends.
 .RE
 .PP
@@ -89,19 +89,19 @@ group of endorser options.
 Additionally, several 'software' options are exposed by the backend. These
 are reimplementations of features provided natively by larger scanners, but
 running on the host computer. This enables smaller machines to have similar
-capabilities. Please note that these features are somewhat simplistic, and 
-may not perform as well as the native implementations. Note also that these 
-features all require that the driver cache the entire image in memory. This 
+capabilities. Please note that these features are somewhat simplistic, and
+may not perform as well as the native implementations. Note also that these
+features all require that the driver cache the entire image in memory. This
 will almost certainly result in a reduction of scanning speed.
 
-Use 'scanimage \-\-help' to get a list, but be aware that some options may 
-be settable only when another option has been set, and that advanced options 
+Use 'scanimage \-\-help' to get a list, but be aware that some options may
+be settable only when another option has been set, and that advanced options
 may be hidden by some frontend programs.
 .PP
 .SH CONFIGURATION FILE
 The configuration file "fujitsu.conf" is used to tell the backend how to look
 for scanners, and provide options controlling the operation of the backend.
-This file is read each time the frontend asks the backend for a list 
+This file is read each time the frontend asks the backend for a list
 of scanners, generally only when the frontend starts. If the configuration
 file is missing, the backend will be unable to locate any scanners.
 .PP
@@ -109,8 +109,8 @@ Scanners can be specified in the configuration file in 4 ways:
 .PP
 "scsi FUJITSU"
 .RS
-Requests backend to search all scsi busses in the system for a device 
-which reports itself to be a scanner made by 'FUJITSU'. 
+Requests backend to search all scsi busses in the system for a device
+which reports itself to be a scanner made by 'FUJITSU'.
 .RE
 .PP
 "scsi /dev/sg0" (or other scsi device file)
@@ -122,7 +122,7 @@ specify one. Probably should not be used with the other "scsi" line above.
 .PP
 "usb 0x04c5 0x1042" (or other vendor/product ids)
 .RS
-Requests backend to search all usb busses in the system for a device 
+Requests backend to search all usb busses in the system for a device
 which uses that vendor and product id. The device will then be queried
 to determine if it is a Fujitsu scanner.
 .RE
@@ -134,7 +134,7 @@ untested.
 .RE
 .PP
 The only configuration option supported is "buffer\-size=xxx", allowing you
-to set the number of bytes in the data buffer to something other than the 
+to set the number of bytes in the data buffer to something other than the
 compiled\-in default, 65536 (64K). Some users report that their scanner will
 "hang" mid\-page, or fail to transmit the image if the buffer is not large
 enough.
@@ -174,13 +174,13 @@ enables debugging output to stderr. Valid values are:
 Flatbed units may fail to scan at maximum area, particularly at
 high resolution.
 .PP
-Any model that does not support VPD during inquiry will not function until 
+Any model that does not support VPD during inquiry will not function until
 an override is added to the backend.
 .PP
 CCITT Fax compression used by older scanners is not supported.
 .PP
 JPEG output is supported by the backend, but not by the SANE protocol, so is
-disabled in this release. It can be enabled if you rebuild from source. 
+disabled in this release. It can be enabled if you rebuild from source.
 
 .SH CREDITS
 m3091 backend: Frederik Ramm <frederik a t remote d o t org>
@@ -234,4 +234,3 @@ sane\-epjitsu(5)
 
 .SH AUTHOR
 m. allan noah: <kitno455 a t gmail d o t com>
-
diff --git a/doc/sane-genesys.man b/doc/sane-genesys.man
index cd00cc3..6540754 100644
--- a/doc/sane-genesys.man
+++ b/doc/sane-genesys.man
@@ -8,14 +8,14 @@ The
 library implements a SANE (Scanner Access Now Easy) backend that provides
 access to USB flatbed scanners based on the Genesys GL646, GL841, GL843, GL847 and GL124 chips.
 At present, the following scanners are known to work with this backend:
-.PP 
+.PP
 .RS
 Canon LiDE 35/40/50/60/100/110/120/200/210/220/700
 .br
 Hewlett-Packard HP2300C/HP2400/HP3670/HP3690/G4010/G4050
 .br
 Medion MD5345/MD6228/MD6274
-.br 
+.br
 Panasonic KV-SS080
 .br
 Plustek OpticBook 3600
@@ -29,11 +29,11 @@ Visioneer OneTouch 7100/Strobe XP100 (rev3)/XP200/XP300/Roadwarrior
 Xerox Travel Scanner 100, OneTouch 2400
 .RE
 
-.PP 
+.PP
 This is stable software for supported models. But if you test new or untested scanners, keep
 your hand at the scanner's plug and unplug it, if the head bumps at the end of
 the scan area.
-.PP 
+.PP
 If you own a scanner other than the ones listed above that works with this
 backend, please let me know this by sending the scanner's exact model name and
 the USB vendor and device ids (e.g. from
@@ -41,10 +41,10 @@ the USB vendor and device ids (e.g. from
 .I sane\-find\-scanner
 or syslog) to the sane\-devel mailing list. Even if the scanner's name is only
 slightly different from the models mentioned above, please let me know.
-.PP 
+.PP
 If you own a scanner that isn't detected by the genesys backend but has a GL646,
-GL841, GL843, GL847 or GL124 chipset, you can try to add it to the backend. 
-.PP 
+GL841, GL843, GL847 or GL124 chipset, you can try to add it to the backend.
+.PP
 .SH "CALIBRATION"
 To give correct image quality, sheet fed scanners need to be calibrated using the
 calibration sheet sold with the scanner. To do calibration, you must insert this target
@@ -135,26 +135,26 @@ userwith the calibration clear option. A value of 0 means cache is disabled.
 Additionally, several 'software' options are exposed by the backend. These
 are reimplementations of features provided natively by larger scanners, but
 running on the host computer. This enables smaller machines to have similar
-capabilities. Please note that these features are somewhat simplistic, and 
-may not perform as well as the native implementations. Note also that these 
-features all require that the driver cache the entire image in memory. This 
+capabilities. Please note that these features are somewhat simplistic, and
+may not perform as well as the native implementations. Note also that these
+features all require that the driver cache the entire image in memory. This
 will almost certainly result in a reduction of scanning speed.
 .PP
-.B \-\-swcrop 
+.B \-\-swcrop
 .RS
-	Requests the driver to detect the extremities of the paper within the larger 
-image, and crop the empty edges. 
+	Requests the driver to detect the extremities of the paper within the larger
+image, and crop the empty edges.
 .RE
 .PP
-.B \-\-swdeskew 
+.B \-\-swdeskew
 .RS
-	Requests the driver to detect the rotation of the paper within the larger 
+	Requests the driver to detect the rotation of the paper within the larger
 image, and counter the rotation.
 .RE
 .PP
 .B \-\-swdespeck  \-\-despeck X
 .RS
-	Requests the driver to find and remove dots of X diameter or smaller from the 
+	Requests the driver to find and remove dots of X diameter or smaller from the
 image, and fill the space with the average surrounding color.
 .RE
 .PP
@@ -187,24 +187,24 @@ autodetected by
 statements which are already included into
 .IR genesys.conf .
 "vendor_id" and "product_id" are hexadecimal numbers that identify the
-scanner. 
-.PP 
+scanner.
+.PP
 
 .SH "FILES"
-.TP 
+.TP
 .I @CONFIGDIR@/genesys.conf
 The backend configuration file (see also description of
 .B SANE_CONFIG_DIR
 below).
-.TP 
+.TP
 .I @LIBDIR@/libsane\-genesys.a
 The static library implementing this backend.
-.TP 
+.TP
 .I @LIBDIR@/libsane\-genesys.so
 The shared library implementing this backend (present on systems that
 support dynamic loading).
 .SH "ENVIRONMENT"
-.TP 
+.TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
 contain the configuration file.  Under UNIX, the directories are
@@ -218,7 +218,7 @@ directories.  For example, setting
 .B SANE_CONFIG_DIR
 to "/tmp/config:" would result in directories "tmp/config", ".", and
 "@CONFIGDIR@" being searched (in this order).
-.TP 
+.TP
 .B SANE_DEBUG_GENESYS
 If the library was compiled with debug support enabled, this environment
 variable controls the debug level for this backend.  Higher debug levels
@@ -229,29 +229,29 @@ care. This will print messages related to core genesys functions.
 .B SANE_DEBUG_GENESYS_LOW
 This environment variable controls the debug level for low level functions
 common to all genesys ASICs.
-.TP 
+.TP
 .B SANE_DEBUG_GENESYS_GL646
 This environment variable controls the debug level for the specific GL646 code
 part.
-.TP 
+.TP
 .B SANE_DEBUG_GENESYS_GL841
 This environment variable controls the debug level for the specific GL841 code
 part.
-.TP 
+.TP
 .B SANE_DEBUG_GENESYS_GL843
 This environment variable controls the debug level for the specific GL843 code
 part.
-.TP 
+.TP
 .B SANE_DEBUG_GENESYS_GL847
 This environment variable controls the debug level for the specific GL847 code
 part.
-.TP 
+.TP
 .B SANE_DEBUG_GENESYS_GL124
 This environment variable controls the debug level for the specific GL124 code
 part.
 
 
-Example (full and highly verbose output for gl646): 
+Example (full and highly verbose output for gl646):
 .br
 export SANE_DEBUG_GENESYS=255
 .br
@@ -260,12 +260,12 @@ export SANE_DEBUG_GENESYS_LOW=255
 export SANE_DEBUG_GENESYS_GL646=255
 
 .SH CREDITS
-  
+
 Jack McGill for donating several sheetfed and flatbed scanners, which made possible to add support
 for them in the genesys backend:
 .RS
 Hewlett-Packard HP3670
-.br 
+.br
 Visioneer Strobe XP100 (rev3)/XP200/XP300/Roadwarrior
 .br
 Canon LiDE 200
@@ -292,20 +292,20 @@ Luc Verhaegen for donating a Canoscan LiDE 120.
 .SH "SEE ALSO"
 .BR sane (7),
 .BR sane\-usb (5)
-.br 
+.br
 
 
 .SH "AUTHOR"
 Oliver Rauch
-.br 
+.br
 Henning Meier-Geinitz <henning@meier\-geinitz.de>
-.br 
+.br
 Gerhard Jaeger <gerhard@gjaeger.de>
-.br 
+.br
 St\['e]phane Voltz <stef.dev@free.fr>
-.br 
+.br
 Philipp Schmid <philipp8288@web.de>
-.br 
+.br
 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
 .br
 Alexey Osipov <simba@lerlan.ru> for HP2400 final support
@@ -321,4 +321,4 @@ This backend will be much slower if not using libusb\-1.0. So be sure that sane\
 .SH "BUGS"
 For the LiDE 200, the scanned data at 4800 dpi is obtained "as is" from sensor. It seems the windows driver does some digital processing
 to improve it, which is not implemented in the backend.
-.PP 
+.PP
diff --git a/doc/sane-gphoto2.man b/doc/sane-gphoto2.man
index ef8141f..3e2a046 100644
--- a/doc/sane-gphoto2.man
+++ b/doc/sane-gphoto2.man
@@ -6,7 +6,7 @@ sane\-gphoto2 \- SANE backend for gphoto2 supported cameras
 The
 .B sane\-gphoto2
 library implements a SANE (Scanner Access Now Easy) backend that
-provides access to the digital cameras supported by gphoto2. 
+provides access to the digital cameras supported by gphoto2.
 This backend has only been tested with a handful of cameras so far.  Patches
 to support other models are welcome.
 .PP
@@ -26,16 +26,16 @@ required since they are needed by the sane frontends, but can't be obtained
 through the gphoto2 interface.  Valid ports and cameras can be obtained
 by "gphoto2 \-\-list\-cameras" and "gphoto2 \-\-list\-ports".
 .PP
-The dumpinquiry line causes some information about the camera to 
+The dumpinquiry line causes some information about the camera to
 be printed.
 .PP
 Empty lines and lines starting with a hash mark (#) are
 ignored.  A sample configuration file is shown below:
 .PP
-The "topfolder" line specifies the "fixed" part of the file path.  For 
-example, on the Kodak DC-240, files are stored in the directory 
+The "topfolder" line specifies the "fixed" part of the file path.  For
+example, on the Kodak DC-240, files are stored in the directory
 /DCIM/100DC240.  The /DCIM portion is constant, but 100DC240 will
-change and must be read from the camera.  In this case, the 
+change and must be read from the camera.  In this case, the
 line would read "topfolder=/DCIM"
 .PP
 Some cameras don't implement a file structure and store all pictures
@@ -90,12 +90,12 @@ to "/tmp/config:" would result in directories "tmp/config", ".", and
 .TP
 .B SANE_DEBUG_GPHOTO2
 If the library was compiled with debugging support enabled, this
-environment variable controls the debug level for this backend. 
+environment variable controls the debug level for this backend.
 A value of 128 requests maximally copious debug output; smaller
 levels reduce verbosity.
-.TP 
+.TP
 .B GP_DEBUG
-Set to 1, 2, or 3, to enable various levels of debugging within the 
+Set to 1, 2, or 3, to enable various levels of debugging within the
 gphoto2 libraries.
 
 .SH "SEE ALSO"
@@ -111,8 +111,7 @@ The manpage was largely copied from the dc210 manpage.
 Many, no doubt.
 .PP
 More general comments, suggestions, and inquiries about frontends
-or SANE should go to the SANE Developers mailing list 
-(see http://www.sane\-project.org/mailing\-lists.html for details). 
+or SANE should go to the SANE Developers mailing list
+(see http://www.sane\-project.org/mailing\-lists.html for details).
 You must be subscribed to the list, otherwise your mail won't be
 sent to the subscribers.
-
diff --git a/doc/sane-gt68xx.man b/doc/sane-gt68xx.man
index e3d29af..2e6d3c5 100644
--- a/doc/sane-gt68xx.man
+++ b/doc/sane-gt68xx.man
@@ -8,7 +8,7 @@ The
 library implements a SANE (Scanner Access Now Easy) backend that provides
 access to USB flatbed scanners based on the Grandtech GT-6801 and GT-6816
 chips.  A list of supported scanners can be found on the gt68xx backend
-homepage: 
+homepage:
 .IR http://www.meier\-geinitz.de/sane/gt68xx\-backend/ .
 .PP
 This is BETA software. Especially if you test new or untested scanners, keep
@@ -24,7 +24,7 @@ the models already listed as supported, please let me know.
 .PP
 If you own a scanner that isn't detected by the gt68xx backend but has a GT-6801
 or GT-6816 chipset, you can try to add it to the backend. Have a look at the
-following web page: 
+following web page:
 .I http://www.meier\-geinitz.de/sane/gt68xx\-backend/adding.html
 .PP
 .SH LIBUSB ISSUES
@@ -38,7 +38,7 @@ USB information looks at
 .SH FIRMWARE FILE
 You need a firmware file for your scanner. That's a small file containing
 software that will be uploaded to the scanner's memory. It's usually named
-*.usb, e.g. 
+*.usb, e.g.
 .IR PS1fw.usb .
 It comes on the installation CD that was provided by the manufacturer, but it
 may be packaged together with the installation program in an .exe file. For
@@ -64,9 +64,9 @@ autodetected by
 statements which are already included into
 .IR gt68xx.conf .
 "vendor_id" and "product_id" are hexadecimal numbers that identify the
-scanner. 
+scanner.
 .PP
-The 
+The
 .BR override ,
 .BR firmware ,
 .BR vendor ,
@@ -82,7 +82,7 @@ Option
 is used to override the default model parameters. That's necessary for some
 scanners that use the same vendor/product ids but are different. For these
 scanners there are already commented out override lines in the configuration
-file. 
+file.
 .B override "mustek\-scanexpress\-1200\-ub\-plus"
 is necessary for the Mustek Scanexpress 1200 UB Plus, the
 Medion/Lifetec/Tevion LT 9452, and the Trust Compact Scan USB 19200.
@@ -93,7 +93,7 @@ Medion/ Lifetec/ Tevion/ Cytron MD/LT 9385, the Medion/ Lifetec/ Tevion MD
 .B override "mustek\-bearpaw\-2400\-cu"
 is necessary for the Mustek BearPaw 2400 CU and the Fujitsu 1200CUS. The
 .B override
-option must be the first one after the 
+option must be the first one after the
 .B usb
 line.
 .PP
@@ -107,7 +107,7 @@ at a different path, use a
 .B firmware
 line.
 .PP
-The 
+The
 .B vendor
 and
 .B model
@@ -178,7 +178,7 @@ increase the verbosity of the output. If the debug level is set to 1 or higher,
 some debug options become available that are normally hidden. Handle them with
 care.
 
-Example: 
+Example:
 export SANE_DEBUG_GT68XX=4
 
 .SH "SEE ALSO"
@@ -214,5 +214,5 @@ Support for buttons is missing.
 More detailed bug information is available at the gt68xx backend homepage
 .IR http://www.meier\-geinitz.de/sane/gt68xx\-backend/ .
 Please contact us if you find a bug or missing feature:
-<sane\-devel@lists.alioth.debian.org>. Please send a debug log if your scanner isn't
+<sane\-devel@alioth-lists.debian.net>. Please send a debug log if your scanner isn't
 detected correctly (see SANE_DEBUG_GT68XX above).
diff --git a/doc/sane-hp.man b/doc/sane-hp.man
index 4e7d35d..1aeaea8 100644
--- a/doc/sane-hp.man
+++ b/doc/sane-hp.man
@@ -39,7 +39,7 @@ PhotoSmart     C5100A R029,R030,R032    SCSI
 .RE
 .PP
 Support for models 5100C/5200C connected to the parallel port requires
-the ppSCSI driver available at 
+the ppSCSI driver available at
 .I http://cyberelk.net/tim/parport/ppscsi.html
 and
 .IR http://penguin-breeder.org/kernel/download/ .
@@ -52,7 +52,7 @@ for more details.
 .PP
 The "hp" backend no longer supports OfficeJet multi-function peripherals.
 For these devices use the external "hpoj" backend in version 0.90 and later of
-the "HP OfficeJet Linux driver", available at 
+the "HP OfficeJet Linux driver", available at
 .br
 .IR http://hpoj.sourceforge.net
 .
@@ -66,7 +66,7 @@ by another one. See
 You can also watch the sane\-devel mailing list at
 .IR http://www.sane\-project.org/mailing\-lists.html .
 .PP
-More details about the hp backend can be found on its homepage 
+More details about the hp backend can be found on its homepage
 .IR http://www.kirchgessner.net/sane.html .
 .PP
 .SH "DEVICE NAMES"
@@ -104,7 +104,7 @@ and
 .BR sane\-usb (5)
 on details of what constitutes a valid device name.
 .PP
-Options specified in front of the first line that contains a device name 
+Options specified in front of the first line that contains a device name
 are defaults for all devices. Options specified below a line that
 contains a device name apply just to the most recently mentioned device.
 .PP
@@ -203,7 +203,7 @@ levels reduce verbosity.
 .TP
 .B SANE_HOME_HP
 Only used for OS/2 and along with use of HP PhotoSmart PhotoScanner.
-Must be set to the directory where the directory .sane is located. 
+Must be set to the directory where the directory .sane is located.
 Is used to save and read the calibration file.
 .TP
 .B SANE_HP_KEEPOPEN_SCSI
@@ -237,7 +237,7 @@ and 24 bit color.
 .B Automatic Document Feeder (ADF)
 For use of the ADF with xscanimage(1), first place paper in the ADF and
 then change option scan source to 'ADF'. Press 'change document'
-to load a sheet. Then press 'scan' to start a scan. 
+to load a sheet. Then press 'scan' to start a scan.
 Maybe it is sufficient to press 'scan' without 'change document'
 for repeated scans. The use of the preview window is not recommended
 when working with the ADF.
diff --git a/doc/sane-hp3500.man b/doc/sane-hp3500.man
index 2785b0e..5192983 100644
--- a/doc/sane-hp3500.man
+++ b/doc/sane-hp3500.man
@@ -37,9 +37,9 @@ support dynamic loading).
 .B SANE_DEBUG_HP3500
 If the library was compiled with debug support enabled, this
 environment variable controls the debug level for this backend.  Higher
-debug levels increase the verbosity of the output. 
+debug levels increase the verbosity of the output.
 
-Example: 
+Example:
 export SANE_DEBUG_HP3500=4
 
 .SH "SEE ALSO"
@@ -50,4 +50,3 @@ export SANE_DEBUG_HP3500=4
 
 .SH AUTHOR
 Troy Rollo <sane@troy.rollo.name>
-
diff --git a/doc/sane-hp3900.man b/doc/sane-hp3900.man
index ab0a100..b623ee5 100644
--- a/doc/sane-hp3900.man
+++ b/doc/sane-hp3900.man
@@ -26,7 +26,7 @@ BenQ 5550                  RTS8823L-01E *
 .ft R
 .RE
 .PP
-More details can be found on the hp3900 backend homepage 
+More details can be found on the hp3900 backend homepage
 .IR http://sourceforge.net/projects/hp3900\-series/ .
 .PP
 This is ALPHA software. Keep your hand at the scanner's plug and unplug it, if
@@ -88,9 +88,9 @@ to "/tmp/config:" would result in directories "tmp/config", ".", and
 .B SANE_DEBUG_HP3900
 If the library was compiled with debug support enabled, this
 environment variable controls the debug level for this backend.  Higher
-debug levels increase the verbosity of the output. 
+debug levels increase the verbosity of the output.
 
-Example: 
+Example:
 export SANE_DEBUG_HP3900=4
 
 .SH "SEE ALSO"
@@ -107,4 +107,3 @@ Jonathan Bravo Lopez <jkdsoft@gmail.com>
 Scanning is only tested with Linux/ix86/gcc. Be careful when testing on other
 operating systems and especially on big-endian platforms. The scanner may get
 wrong data.
-
diff --git a/doc/sane-hp4200.man b/doc/sane-hp4200.man
index e392d85..cbb8c5e 100644
--- a/doc/sane-hp4200.man
+++ b/doc/sane-hp4200.man
@@ -16,11 +16,11 @@ ScanJet 4200 Cxi
 ScanJet 4200 Cse
 .RE
 .PP
-More details can be found on the hp4200 backend homepage 
+More details can be found on the hp4200 backend homepage
 .IR http://hp4200\-backend.sourceforge.net/ .
 .PP
 This is BETA software. Keep your hand at the scanner's plug and unplug it, if
-the head bumps at the end of the scan area. 
+the head bumps at the end of the scan area.
 .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
@@ -79,9 +79,9 @@ to "/tmp/config:" would result in directories "tmp/config", ".", and
 .B SANE_DEBUG_HP4200
 If the library was compiled with debug support enabled, this
 environment variable controls the debug level for this backend.  Higher
-debug levels increase the verbosity of the output. 
+debug levels increase the verbosity of the output.
 
-Example: 
+Example:
 export SANE_DEBUG_HP4200=4
 
 .SH "SEE ALSO"
@@ -102,4 +102,4 @@ Only 8 bit color mode works.
 Scanning is slow due to backtracking.
 .PP
 Send bug reports to the sane\-devel mailing list:
-sane\-devel@lists.alioth.debian.org.
+sane\-devel@alioth-lists.debian.net.
diff --git a/doc/sane-hp5400.man b/doc/sane-hp5400.man
index d789215..23c40d8 100644
--- a/doc/sane-hp5400.man
+++ b/doc/sane-hp5400.man
@@ -16,7 +16,7 @@ ScanJet 5470C
 ScanJet 5490C
 .RE
 .PP
-More details can be found on the hp5400 backend homepage 
+More details can be found on the hp5400 backend homepage
 .IR http://hp5400backend.sourceforge.net/ .
 .PP
 This is ALPHA software. Keep your hand at the scanner's plug and unplug it, if
@@ -79,9 +79,9 @@ to "/tmp/config:" would result in directories "tmp/config", ".", and
 .B SANE_DEBUG_HP5400
 If the library was compiled with debug support enabled, this
 environment variable controls the debug level for this backend.  Higher
-debug levels increase the verbosity of the output. 
+debug levels increase the verbosity of the output.
 
-Example: 
+Example:
 export SANE_DEBUG_HP5400=4
 
 .SH "SEE ALSO"
@@ -99,4 +99,3 @@ Martijn van Oosterhout <kleptog@svana.org>, Thomas Soumarmon
 Scanning is only tested with Linux/ix86/gcc. Be careful when testing on other
 operating systems and especially on big-endian platforms. The scanner may get
 wrong data.
-
diff --git a/doc/sane-hp5590.man b/doc/sane-hp5590.man
index 2ccfcc5..5330800 100644
--- a/doc/sane-hp5590.man
+++ b/doc/sane-hp5590.man
@@ -1,69 +1,320 @@
-.TH sane\-hp5590 5 "13 Jul 2008" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
-.IX sane\-hp5590
+.\" Automatically generated by Pandoc 2.7.2
+.\"
+.TH "sane-hp5590" "5" "13 Jul 2008" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.hy
 .SH NAME
-sane\-hp5590 \- SANE backend for
-Hewlett-Packard 4500C/4570C/5500C/5550C/5590/7650 Workgroup/Document scanners
+.PP
+sane-hp5590 - SANE backend for Hewlett-Packard
+4500C/4570C/5500C/5550C/5590/7650 Workgroup/Document scanners
 .SH DESCRIPTION
-The
-.B sane\-hp5590
-library implements a SANE (Scanner Access Now Easy) backend that provides
-access to the following Hewlett-Packard Workgroup/Document scanners:
 .PP
-.RS
+The \f[B]sane-hp5590\f[R] library implements a SANE (Scanner Access Now
+Easy) backend that provides access to the following Hewlett-Packard
+Workgroup/Document scanners:
+.IP \[bu] 2
 ScanJet 4500C
-.br
+.IP \[bu] 2
 ScanJet 4570C
-.br
+.IP \[bu] 2
 ScanJet 5500C
-.br
+.IP \[bu] 2
 ScanJet 5550C
-.br
+.IP \[bu] 2
 ScanJet 5590
-.br
+.IP \[bu] 2
 ScanJet 7650
+.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\[cq]s exact
+model name and the USB vendor and device ids (e.g.\ from
+\f[I]/sys/bus/usb/devices\f[R], \f[I]sane-find-scanner\f[R] or syslog)
+to us.
+Even if the scanner\[cq]s name is only slightly different from the
+models mentioned above, please let us know.
+.SH OPTIONS
+.PP
+The options the backend supports can either be selected through command
+line options to programs like scanimage or through GUI elements in
+\f[I]xscanimage\f[R] or \f[I]xsane\f[R].
+Valid command line options and their syntax can be listed by using:
+.IP
+.nf
+\f[C]
+scanimage --help -d hp5590:interface:device
+\f[R]
+.fi
+.PP
+where \f[I]interface\f[R] and \f[I]device\f[R] specify the device in
+question, as in the configuration file.
+Add \f[I]--all-options\f[R] to also list the hardware read-out options.
+The -d parameter and its argument can be omitted to obtain information
+on the first scanner identified.
+.PP
+Use the command:
+.IP
+.nf
+\f[C]
+scanimage -L
+\f[R]
+.fi
+.PP
+to list all devices recognized by your SANE installation.
+.SH DEVICE SPECIFIC OPTIONS
+.TP
+.B -l \f[I]n\f[R]
+Top-left X position of scan area in \f[B]mm\f[R].
+Allowed range: 0 ..
+215.889.
+.TP
+.B -t \f[I]n\f[R]
+Top-left Y position of scan area in \f[B]mm\f[R].
+Allowed range: 0 ..
+297.699.
+.TP
+.B -x \f[I]n\f[R]
+X width of scan-area in \f[B]mm\f[R].
+Allowed range: 0 ..
+215.889.
+.TP
+.B -y \f[I]n\f[R]
+Y height of scan-area in \f[B]mm\f[R].
+Allowed range: 0 ..
+297.699.
+.PP
+By default, the maximum size will be scanned.
+.TP
+.B --mode \f[I]mode\f[R]
+Select color mode.
+\f[I]mode\f[R] must be one of: \[lq]Color\[rq], \[lq]Color (48
+bits)\[rq], \[lq]Gray\[rq], \[lq]Lineart\[rq].
+.RS
+.IP \[bu] 2
+\[lq]Color\[rq] - Scanning is done with 3 * 8 bit RGB color values per
+pixel.
+.IP \[bu] 2
+\[lq]Color (48 bits)\[rq] - Scanning is done with 3 * 16 bit RGB color
+values per pixel.
+.IP \[bu] 2
+\[lq]Gray\[rq] - Scanning is done with 1 * 8 bit gray value per pixel.
+.IP \[bu] 2
+\[lq]Lineart\[rq] - Scanning is done with 1 bit black and white value
+per pixel.
+.RE
+.TP
+.B --source \f[I]source\f[R]
+Select the source for scanning.
+\f[I]source\f[R] must be one of: \[lq]Flatbed\[rq], \[lq]ADF\[rq],
+\[lq]ADF Duplex\[rq], \[lq]TMA Slides\[rq], \[lq]TMA Negatives\[rq].
+.RS
+.IP \[bu] 2
+\[lq]Flatbed\[rq] - Scan document on the flat document glass.
+.IP \[bu] 2
+\[lq]ADF\[rq] - Scan frontsides of documents with automatic document
+feeder.
+.IP \[bu] 2
+\[lq]ADF Duplex\[rq] - Scan front- and backsides of documents with
+automatic document feeder.
+Note, the backside images must be rotated in a separate post process
+step.
+.IP \[bu] 2
+\[lq]TMA Slides\[rq] - Slide scanning with transparent media adapter.
+(Not fully supported by hp5590 backend).
+.IP \[bu] 2
+\[lq]TMA Negatives\[rq] - Negative film scanning with transparent media
+adapter.
+(Not fully supported by hp5590 backend).
+.RE
+.TP
+.B --resolution \f[I]res\f[R]
+Set the resolution of the scanned image in \f[B]dpi\f[R].
+\f[I]res\f[R] must be one of: 100, 200, 300, 600, 1200, 2400.
+.PP
+Default settings: Lineart, Flatbed, 100dpi.
+.TP
+.B --extend-lamp-timeout[=yes|no]
+Extend lamp timeout period.
+no = 15 minutes, yes = 1 hour.
+(Default: no)
+.TP
+.B --wait-for-button[=yes|no]
+Wait for button press before scanning starts.
+(Default: no)
+.TP
+.B --preview[=yes|no]
+Request a preview-quality scan.
+(Default: no)
+.TP
+.B --hide-eop-pixel[=yes|no]
+Hide end-of-page indicator pixels and overwrite with color of next
+neighbor pixels.
+(Default: yes)
+.PD 0
+.P
+.PD
+The scanner uses the last pixel in every scan line for storing the
+end-of-page status.
+This is needed to detect the end of the document sheet when the
+automatic document feeder (ADF) is used.
+Unfortunately the end-of-page pixels are also generated in flatbed
+scans.
+It is recommended to hide these pixels.
+.TP
+.B --trailing-lines-mode \f[I]mode\f[R]
+Filling mode of trailing lines after end of page when automatic document
+feeder (ADF) is used.
+\f[I]mode\f[R] must be one of: \[lq]last\[rq], \[lq]raw\[rq],
+\[lq]raster\[rq], \[lq]white\[rq], \[lq]black\[rq], \[lq]color\[rq].
+(Default: \[lq]last\[rq])
+.RS
+.IP \[bu] 2
+\[lq]last\[rq] = repeat the last scan line (recommended),
+.IP \[bu] 2
+\[lq]raw\[rq] = read raw scan data (not recommended),
+.IP \[bu] 2
+\[lq]raster\[rq] = generate black and white pixel pattern,
+.IP \[bu] 2
+\[lq]white\[rq] = white pixels,
+.IP \[bu] 2
+\[lq]black\[rq] = black pixels,
+.IP \[bu] 2
+\[lq]color\[rq] = RGB or gray colored pixels (see next option).
 .RE
+.TP
+.B --trailing-lines-color \f[I]n\f[R]
+Set color value for filling trailing scan lines in trailing lines mode
+\[lq]color\[rq] (see previous option).
+(Default color: violet)
+.PD 0
+.P
+.PD
+The RGB color value must be specified and calculated as 65536 * r + 256
+* g + b, with r, g, b being values in the range of 0 ..
+255.
+.SH READ OUT OPTIONS
 .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.
-.SH CONFIGURATION
-None required.
+The following options allow reading out the button state, counter value,
+color setting, and the state of document in ADF.
+This can be used to programmatically control corresponding scanner
+options like switching between \f[I]flatbed\f[R] and \f[I]ADF\f[R] mode,
+or triggering prost processing tasks after scanning.
+.TP
+.B --button-pressed
+Get the id of the last button pressed.
+Id is one of \[lq]none\[rq], \[lq]power\[rq], \[lq]scan\[rq],
+\[lq]collect\[rq], \[lq]file\[rq], \[lq]email\[rq], \[lq]copy\[rq],
+\[lq]up\[rq], \[lq]down\[rq], \[lq]mode\[rq], \[lq]cancel\[rq].
+.PD 0
+.P
+.PD
+The scanner stores the id of the last button pressed until it is read.
+After read out, the state is reset and subsequent readings will return
+\[lq]none\[rq].
+.TP
+.B --color-led
+Get the state of the color LED indicators.
+The state is either \[lq]color\[rq] or \[lq]black_white\[rq].
+.TP
+.B --counter-value
+Get the counter value as shown on LCD.
+The value is in the range of 1 ..
+99.
+.TP
+.B --doc-in-adf
+Get the state of the document-available indicator of the automatic
+document feeder (ADF).
+The state is either \[lq]yes\[rq] or \[lq]no\[rq].
+.SH HINTS FOR USERS OF SCANBD
+.PP
+\f[I]Scanbd\f[R] is a scanner button daemon, which can read scanner
+buttons and trigger scan actions.
+.PP
+Do not use the old \f[I]scanbuttond\f[R] interface with hp5590.
+It is outdated and shall not be used any more.
+Scanbd\[cq]s regular interface is fully supported by the current version
+of the \f[I]hp5590\f[R] backend.
+.PP
+This example shows a minimum configuration file and the corresponding
+script file for scanbd to be included in \f[I]scanbd.conf\f[R].
+.IP \[bu] 2
+\f[B]hp5590.conf\f[R]
+.IP
+.nf
+\f[C]
+device hp5590 {
+    # Device matching
+    filter = \[dq]\[ha]hp5590.*\[dq]
+    desc = \[dq]HP5590 Scanner Family\[dq]
+
+    # Read out counter value and store in environment variable.
+    function function_lcd_counter {
+        filter = \[dq]\[ha]counter-value.*\[dq]
+        desc   = \[dq]hp5590: LCD counter\[dq]
+        env    = \[dq]SCANBD_FUNCTION_LCD_COUNTER\[dq]
+    }
+
+    # Run scan script when button is pressed.
+    action do-scan {
+        filter = \[dq]\[ha]button-pressed.*\[dq]
+        desc   = \[dq]hp5590: Scan button pressed\[dq]
+        script = \[dq]scan_action.script\[dq]
+        string-trigger {
+            from-value  = \[dq]none\[dq]
+            to-value    = \[dq]scan\[dq]
+        }
+    }
+}
+\f[R]
+.fi
+.IP \[bu] 2
+\f[B]scan_action.script\f[R]
+.IP
+.nf
+\f[C]
+#!/bin/bash
+echo device = $SCANBD_DEVICE
+echo action = $SCANBD_ACTION
+echo counter = $SCANBD_FUNCTION_LCD_COUNTER
+scanfile=\[dq]$HOME/tmp/scans/scan-$(date +%s).pnm\[dq]
+case $SCANBD_ACTION in
+do-scan)
+    scanimage -d \[dq]$SCANBD_DEVICE\[dq] > \[dq]$scanfile\[dq]
+    ;;
+*)
+    echo Warning: Unknown scanbd action: \[dq]$SCANBD_ACTION\[dq]
+    ;;
+esac
+\f[R]
+.fi
 .SH FILES
 .TP
-.I @LIBDIR@/libsane\-hp5590.a
+.B \f[I]\[at]LIBDIR\[at]/libsane-hp5590.a\f[R]
 The static library implementing this backend.
 .TP
-.I @LIBDIR@/libsane\-hp5590.so
+.B \f[I]\[at]LIBDIR\[at]/libsane-hp5590.so\f[R]
 The shared library implementing this backend (present on systems that
 support dynamic loading).
 .SH ENVIRONMENT
+.PP
+If the library was compiled with debug support enabled, this environment
+variable controls the debug level for this backend.
+.PP
+\f[B]SANE_DEBUG_HP5590\f[R]
+.PP
+Higher debug levels increase the verbosity of the output:
+.IP
+.nf
+\f[C]
+10 - generic processing
+20 - verbose backend messages
+40 - HP5590 high-level commands
+50 - HP5590 low-level (USB-in-USB) commands
+\f[R]
+.fi
 .TP
-.B SANE_DEBUG_HP5590
-If the library was compiled with debug support enabled, this
-environment variable controls the debug level for this backend.  Higher
-debug levels increase the verbosity of the output. See used levels below.
-.P
-.RS
-Level 10 - generic processing
-.br
-Level 20 - verbose backend messages
-.br
-Level 40 - HP5590 high-level commands
-.br
-Level 50 - HP5590 low-level (USB-in-USB) commands
-
-.P
-Example: 
-
+.B Example:
 export SANE_DEBUG_HP5590=50
-
-.SH "SEE ALSO"
-.BR sane (7),
-.BR sane\-usb (5),
-
-.SH AUTHOR
-Ilia Sotnikov <hostcc@gmail.com>
+.SH SEE ALSO
+.PP
+\f[B]sane\f[R](7), \f[B]sane-usb\f[R](5)
+.SH AUTHORS
+Ilia Sotnikov <hostcc@gmail.com>.
diff --git a/doc/sane-hs2p.man b/doc/sane-hs2p.man
index b0df57d..9757eff 100644
--- a/doc/sane-hs2p.man
+++ b/doc/sane-hs2p.man
@@ -25,12 +25,12 @@ Where
 .I special
 is either the path-name for the special device that corresponds to a SCSI
 scanner. The program
-.I sane\-find\-scanner 
+.I sane\-find\-scanner
 helps to find out the correct device. Under Linux, such a device name could be
 .I /dev/sg0
 or
 .IR /dev/sga ,
-for example.  See 
+for example.  See
 .BR sane\-scsi (5)
 for details.
 
@@ -39,7 +39,7 @@ The contents of the
 .I hs2p.conf
 file is a list of device names that correspond to SCSI
 scanners.  Empty lines and lines starting with a hash mark (#) are
-ignored.  See 
+ignored.  See
 .BR sane\-scsi (5)
 on details of what constitutes a valid device name.
 
@@ -84,29 +84,29 @@ from the flatbed or ADF (either simplex or duplex) is supported. Lineart,
 halftone, 4-bit gray, and 8-bit gray are supported. Pre-set gamma tables and
 halftone patterns are supported, as well as brightness, threshold, contrast.
 Also supported is scan wait mode, binary and gray filtering, negative scanning,
-and absolute or relative white setting. Printing with the optional endorser 
+and absolute or relative white setting. Printing with the optional endorser
 also is supported.
 
 .SH PLANNED FUNCTIONALITY
-This scanner can scan from the ADF in continuous simplex mode. 
+This scanner can scan from the ADF in continuous simplex mode.
 Surprisingly, many scanners scan an entire document from the ADF
 into memory before ejecting the sheet. Thus if the document is too
-long, the scanner cannot hold the entire image data in memory. 
-But if the scanner would send its image data when its memory got full, 
-and then read the next buffer's worth of data, continuous scanning 
-could be achieved.  
+long, the scanner cannot hold the entire image data in memory.
+But if the scanner would send its image data when its memory got full,
+and then read the next buffer's worth of data, continuous scanning
+could be achieved.
 
 .SH MISSING FUNCTIONALITY
 The SCSI commands for uploading (2AH) or downloading (28H)
-custom halftone patterns (02H) and gamma vectors (03H) should work, 
-but require implementing the SANE Option-Value code to allow the 
-user to create the tables to be uploaded to the scanner. No support 
-for Maintenance Data (80H) is planned as this functionality is more 
-suited to a stand-alone utility to be used by a technician when 
-replacing the lamp or ADF unit. Nor is support for reading or changing 
+custom halftone patterns (02H) and gamma vectors (03H) should work,
+but require implementing the SANE Option-Value code to allow the
+user to create the tables to be uploaded to the scanner. No support
+for Maintenance Data (80H) is planned as this functionality is more
+suited to a stand-alone utility to be used by a technician when
+replacing the lamp or ADF unit. Nor is support for reading or changing
 IPU (93H) parameters and adjustments planned, since my IS450 lacks
-such a unit. The 31-byte Auto Photo/Letter struct and 21-byte Dynamic 
-threshold struct are documented in the hs2p-scsi.h file should someone 
+such a unit. The 31-byte Auto Photo/Letter struct and 21-byte Dynamic
+threshold struct are documented in the hs2p-scsi.h file should someone
 wish to use their IPU for image data processing.
 
 .SH "SEE ALSO"
diff --git a/doc/sane-ibm.man b/doc/sane-ibm.man
index 50138d7..0b5013c 100644
--- a/doc/sane-ibm.man
+++ b/doc/sane-ibm.man
@@ -25,12 +25,12 @@ Where
 .I special
 is either the path-name for the special device that corresponds to a SCSI
 scanner. The program
-.I sane\-find\-scanner 
+.I sane\-find\-scanner
 helps to find out the correct device. Under Linux, such a device name could be
 .I /dev/sg0
 or
 .IR /dev/sga ,
-for example.  See 
+for example.  See
 .BR sane\-scsi (5)
 for details.
 
@@ -39,7 +39,7 @@ The contents of the
 .I ibm.conf
 file is a list of device names that correspond to SCSI
 scanners.  Empty lines and lines starting with a hash mark (#) are
-ignored.  See 
+ignored.  See
 .BR sane\-scsi (5)
 on details of what constitutes a valid device name.
 
@@ -75,7 +75,7 @@ to "/tmp/config:" would result in directories "tmp/config", ".", and
 .B SANE_DEBUG_IBM
 If the library was compiled with debug support enabled, this
 environment variable controls the debug level for this backend.  Higher
-debug levels increase the verbosity of the output. 
+debug levels increase the verbosity of the output.
 
 .SH "SEE ALSO"
 .BR sane (7),
diff --git a/doc/sane-kodak.man b/doc/sane-kodak.man
index 2566f3d..61ea88e 100644
--- a/doc/sane-kodak.man
+++ b/doc/sane-kodak.man
@@ -5,7 +5,7 @@
 sane\-kodak \- SANE backend for big Kodak flatbed and ADF scanners
 
 .SH DESCRIPTION
-The 
+The
 .B sane\-kodak
 library implements a SANE (Scanner Access Now Easy) backend which
 provides access to large Kodak flatbed and ADF scanners.
@@ -13,44 +13,44 @@ provides access to large Kodak flatbed and ADF scanners.
 This document describes backend version 7, which shipped with SANE 1.0.21.
 
 .SH SUPPORTED HARDWARE
-This version should support models which speak the Kodak SCSI and Firewire 
-protocols. The i1860 was used to develop the backend, but other models may 
-work with only minimal modifications. Please see the list at 
+This version should support models which speak the Kodak SCSI and Firewire
+protocols. The i1860 was used to develop the backend, but other models may
+work with only minimal modifications. Please see the list at
 http://www.sane\-project.org/sane\-supported\-devices.html for an updated list.
 
-If you have a machine not on that list, or reported as 'untested': the best way 
-to determine level of support is to test the scanner directly, or to collect a 
-trace of the windows driver in action.  Please contact the author for help or 
+If you have a machine not on that list, or reported as 'untested': the best way
+to determine level of support is to test the scanner directly, or to collect a
+trace of the windows driver in action.  Please contact the author for help or
 with test results.
 
 .SH UNSUPPORTED HARDWARE
-Most of the recent Kodak consumer or workgroup level machines are based on 
-other chipsets and are not supported by this backend. Some of these scanners 
+Most of the recent Kodak consumer or workgroup level machines are based on
+other chipsets and are not supported by this backend. Some of these scanners
 may be supported by another backend.
 
 .SH OPTIONS
 Effort has been made to expose the basic hardware options, including:
 .PP
-source s 
+source s
 .RS
 Selects the source for the scan. Options
 may include "Flatbed", "ADF Front", "ADF Back", "ADF Duplex".
 .RE
 .PP
-mode m 
+mode m
 .RS
 Selects the mode for the scan. Options
 may include "Lineart", "Halftone", "Gray", and "Color".
 .RE
 .PP
-resolution 
+resolution
 .RS
 Controls scan resolution. Available choices may be limited by mode.
 .RE
 .PP
 tl\-x, tl\-y, br\-x, br\-y
 .RS
-Sets scan area upper left and lower right coordinates. These are renamed 
+Sets scan area upper left and lower right coordinates. These are renamed
 t, l, x, y by some frontends.
 .RE
 .PP
@@ -61,14 +61,14 @@ coordinates when using ADF and to detect double feed errors.
 .RE
 .PP
 Other options will be available based on the capabilities of the scanner.
-Use 'scanimage \-\-help' to get a list, but be aware that some options may 
-be settable only when another option has been set, and that advanced options 
+Use 'scanimage \-\-help' to get a list, but be aware that some options may
+be settable only when another option has been set, and that advanced options
 may be hidden by some frontend programs.
 .PP
 .SH CONFIGURATION FILE
 The configuration file "kodak.conf" is used to tell the backend how to look
 for scanners, and provide options controlling the operation of the backend.
-This file is read each time the frontend asks the backend for a list 
+This file is read each time the frontend asks the backend for a list
 of scanners, generally only when the frontend starts. If the configuration
 file is missing, the backend will use a set of compiled defaults, which
 are identical to the default configuration file shipped with SANE.
@@ -77,8 +77,8 @@ Scanners can be specified in the configuration file in 2 ways:
 .PP
 "scsi KODAK"
 .RS
-Requests backend to search all scsi busses in the system for a device 
-which reports itself to be a scanner made by 'KODAK'. 
+Requests backend to search all scsi busses in the system for a device
+which reports itself to be a scanner made by 'KODAK'.
 .RE
 .PP
 "scsi /dev/sg0" (or other scsi device file)
@@ -89,7 +89,7 @@ specify one. Probably should not be used with the other "scsi" line above.
 .RE
 .PP
 The only configuration option supported is "buffer\-size=xxx", allowing you
-to set the number of bytes in the data buffer to something other than the 
+to set the number of bytes in the data buffer to something other than the
 compiled\-in default, 32768 (32K). Some users report that their scanner will
 "hang" mid\-page, or fail to transmit the image if the buffer is not large
 enough.
@@ -124,7 +124,7 @@ enables debugging output to stderr. Valid values are:
 .RE
 
 .SH KNOWN ISSUES
-Most hardware options are either not supported or not exposed for control by 
+Most hardware options are either not supported or not exposed for control by
 the user, including: multifeed detection, image compression, autocropping,
 endorser, iThresholding, multi\-stream, etc.
 .PP
@@ -133,7 +133,7 @@ endorser, iThresholding, multi\-stream, etc.
 The various authors of the sane\-fujitsu backend provided useful code.
 .br
 Kodak provided access to hardware, documentation and personnel.
-  
+
 .SH "SEE ALSO"
 sane(7),
 sane\-scsi(5)
diff --git a/doc/sane-kodakaio.man b/doc/sane-kodakaio.man
index 40310ed..664a418 100644
--- a/doc/sane-kodakaio.man
+++ b/doc/sane-kodakaio.man
@@ -5,7 +5,7 @@
 sane\-kodakaio \- SANE backend for Kodak aio printer / scanners
 
 .SH DESCRIPTION
-The 
+The
 .B sane\-kodakaio
 library implements a SANE (Scanner Access Now Easy) backend which
 provides access to Kodak aio printer / scanners, like the ESP and Hero series.
@@ -15,24 +15,24 @@ incorporation in sane-backends.
 
 .SH SUPPORTED HARDWARE
 This version should support models of the Kodak ESP and Hero series, and possibly some
-Advent AiO scanners. The ESP 5250 and Hero 9.1 were used to develop the backend, 
+Advent AiO scanners. The ESP 5250 and Hero 9.1 were used to develop the backend,
 but other models may work. Please see the desc file.
 
-If you have a model not on that list, or reported as 'untested': the best way 
+If you have a model not on that list, or reported as 'untested': the best way
 to determine level of support is to test the scanner directly.
 
 .SH CONFIGURATION FILE
 The configuration file "kodakaio.conf" is used to tell the backend how to look
 for scanners, and provide options controlling the operation of the backend.
-This file is read each time the frontend asks the backend for a list 
+This file is read each time the frontend asks the backend for a list
 of scanners, generally only when the frontend starts.
 
 .SH ENVIRONMENT
 The backend uses a single environment variable, SANE_DEBUG_KODAKAIO, which
-enables debugging output to stderr. 
+enables debugging output to stderr.
 
 .SH KNOWN ISSUES
-Most hardware options are either not supported or not exposed for control by 
+Most hardware options are either not supported or not exposed for control by
 the user, including: multifeed detection, image compression etc.
 .PP
 
diff --git a/doc/sane-kvs1025.man b/doc/sane-kvs1025.man
index 23dcd50..23a67f3 100644
--- a/doc/sane-kvs1025.man
+++ b/doc/sane-kvs1025.man
@@ -5,7 +5,7 @@
 sane\-kvs1025 \- SANE backend for Panasonic KV-S102xC USB ADF scanners.
 
 .SH DESCRIPTION
-The 
+The
 .B sane\-kvs1025
 library implements a SANE (Scanner Access Now Easy) backend which
 provides access to the Panasonic KV-S1020C/1025C and KV-S1045C scanners.
@@ -28,4 +28,3 @@ sane(7), sane\-usb(5)
 
 .SH AUTHOR
 m. allan noah: <kitno455 a t gmail d o t com>
-
diff --git a/doc/sane-kvs20xx.man b/doc/sane-kvs20xx.man
index 8cb8b9c..bd3ecc2 100644
--- a/doc/sane-kvs20xx.man
+++ b/doc/sane-kvs20xx.man
@@ -5,7 +5,7 @@
 sane\-kvs20xx \- SANE backend for Panasonic KV-S20xxC USB/SCSI ADF scanners.
 
 .SH DESCRIPTION
-The 
+The
 .B sane\-kvs20xx
 library implements a SANE (Scanner Access Now Easy) backend which
 provides access to the Panasonic KV-S202xC and KV-S204xC scanners.
@@ -26,4 +26,3 @@ sane(7), sane\-usb(5), sane\-scsi(5)
 
 .SH AUTHOR
 m. allan noah: <kitno455 a t gmail d o t com>
-
diff --git a/doc/sane-kvs40xx.man b/doc/sane-kvs40xx.man
index f1aecbc..5a53853 100644
--- a/doc/sane-kvs40xx.man
+++ b/doc/sane-kvs40xx.man
@@ -5,7 +5,7 @@
 sane\-kvs40xx \- SANE backend for Panasonic KV-S40xxC USB/SCSI ADF scanners.
 
 .SH DESCRIPTION
-The 
+The
 .B sane\-kvs40xx
 library implements a SANE (Scanner Access Now Easy) backend which
 provides access to the Panasonic KV-S40xxC and KV-S70xxC scanners.
@@ -28,4 +28,3 @@ sane(7), sane\-usb(5), sane\-scsi(5)
 
 .SH AUTHOR
 m. allan noah: <kitno455 a t gmail d o t com>
-
diff --git a/doc/sane-leo.man b/doc/sane-leo.man
index a346403..f0d9266 100644
--- a/doc/sane-leo.man
+++ b/doc/sane-leo.man
@@ -32,7 +32,7 @@ elements in xscanimage or xsane.
 If you have any strange behavior, please report to the backend
 maintainer or to the SANE mailing list.
 
-Valid command line options and their syntax can be listed by using 
+Valid command line options and their syntax can be listed by using
 .RS
 scanimage \-\-help \-d leo
 .RE
@@ -42,7 +42,7 @@ scanimage \-\-help \-d leo
 
 .TP
 .B \-\-mode
-selects the basic mode of operation of the scanner valid choices are 
+selects the basic mode of operation of the scanner valid choices are
 .I Black & White
 ,
 .I Grayscale
@@ -62,7 +62,7 @@ between 1 and 300, in increments of 1.
 .B Geometry options
 
 .TP
-.B \-l \-t \-x \-y 
+.B \-l \-t \-x \-y
 control the scan area: \-l sets the top left x coordinate, \-t the top
 left y coordinate, \-x selects the width and \-y the height of the scan
 area. All parameters are specified in millimeters by default.
@@ -76,24 +76,24 @@ area. All parameters are specified in millimeters by default.
 (grayscale and color mode only) allows the user to specify a gamma table (see the
 next 3 parameters).
 
-.TP 
-.B \-\-red\-gamma\-table 
+.TP
+.B \-\-red\-gamma\-table
 (color mode only) can be used to download a user defined
 gamma table for the red channel. The table must be 256 bytes long.
 
-.TP 
-.B \-\-green\-gamma\-table 
+.TP
+.B \-\-green\-gamma\-table
 (color mode only) can be used to download a user defined
 gamma table for the green channel. The table must be 256 bytes long.
 
 .TP
-.B \-\-blue\-gamma\-table 
+.B \-\-blue\-gamma\-table
 (color mode only) can be used to download a user defined gamma table
 for the blue channel. The table must be 256 bytes long.
 
 .TP
 .B \-\-halftone
-(Black & White only) select the halftone mask to use. Possible values are 
+(Black & White only) select the halftone mask to use. Possible values are
 .I Diamond
 ,
 .I 8x8 Coarse Fatting
@@ -104,7 +104,7 @@ for the blue channel. The table must be 256 bytes long.
 and
 .I 8x8 Vertical Line
 
-.TP 
+.TP
 .B \-\-preview
 requests a preview scan. The resolution used for that scan is 28 dpi
 and the scan area is the maximum allowed. The scan mode is user
diff --git a/doc/sane-lexmark.man b/doc/sane-lexmark.man
index 30bba87..06e3359 100644
--- a/doc/sane-lexmark.man
+++ b/doc/sane-lexmark.man
@@ -9,13 +9,13 @@ library implements a SANE (Scanner Access Now Easy) backend that
 provides access to the scanner part of Lexmark X1100/X1200 AIOs. This backend
 should be considered
 .B beta-quality
-software! 
-.PP 
+software!
+.PP
 The scanners that should work with this backend are:
-.PP 
+.PP
 .RS
 .ft CR
-.nf 
+.nf
    Vendor Model           status
 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-  \-\-\-\-\-\-\-\-\-\-\-
   Lexmark X74             good
@@ -28,7 +28,7 @@ The scanners that should work with this backend are:
   Lexmark X12xx           good in USB1.1,
   			  not fully tested in USB2.0
   Dell    A920            good
-.fi 
+.fi
 .ft R
 .RE
 
@@ -36,58 +36,58 @@ The options the backend supports can either be selected through
 command line options to programs like scanimage or through GUI
 elements in xscanimage or xsane.
 
-.br 
+.br
 If you have any strange behavior, please report to the backend
 maintainer or to the SANE mailing list.
 
-Valid command line options and their syntax can be listed by using 
+Valid command line options and their syntax can be listed by using
 .RS
 scanimage \-\-help \-d lexmark:usb:<usb port>
 .RE
 
-.TP 
+.TP
 .B Scan Mode Options
 
-.TP 
+.TP
 .B \-\-mode
-selects the basic mode of operation of the scanner valid choices are 
+selects the basic mode of operation of the scanner valid choices are
 .IR Color ,
 .I Gray
 and
 .I Lineart
-The default mode is Color. The Lineart mode is black and white only (1 bit). 
+The default mode is Color. The Lineart mode is black and white only (1 bit).
 Grayscale will produce 256 levels of gray (8 bits). Color mode allows for over
 16 million different colors produced from 24 bits of color information.
 
-.TP 
+.TP
 .B \-\-resolution
-selects the resolution for a scan. The horizontal and vertical resolutions are set 
+selects the resolution for a scan. The horizontal and vertical resolutions are set
 by the value of this option. The scanner is capable of the following resolutions for the specified option value:
-.PP 
+.PP
 .RS
 .ft CR
-.nf 
-  Value   Hor. Resolution  Vert. Resolution 
+.nf
+  Value   Hor. Resolution  Vert. Resolution
   \-\-\-\-\-   \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-  \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
   75      75dpi            75dpi
-  150     150dpi           150dpi 
-  300     300dpi           300dpi 
-  600     600dpi           600dpi 
+  150     150dpi           150dpi
+  300     300dpi           300dpi
+  600     600dpi           600dpi
   1200    600dpi           1200dpi  (only for X11xx models with 'B2' sensor)
-.fi 
+.fi
 .ft R
 .RE
 
-.TP 
+.TP
 .B \-\-preview
 requests a preview scan. The resolution used for that scan is 75 dpi
-and the scan area and the scan mode are as specified through their options, 
+and the scan area and the scan mode are as specified through their options,
 or the default if not specified. The default value for preview mode is "no".
 
-.TP 
+.TP
 .B \-\-threshold
 selects the  minimum-brightness to get a white point. The threshold is only used with Lineart mode scans.
-It is specified as a percentage in the range 0..100% (in steps of 1).  
+It is specified as a percentage in the range 0..100% (in steps of 1).
 The default value of the threshold option is 50.
 
 
@@ -96,17 +96,17 @@ The configuration file @CONFIGDIR@/lexmark.conf contains only the usb device id
 
 
 .SH "FILES"
-.TP 
+.TP
 .I @LIBDIR@/libsane\-lexmark.a
 The static library implementing this backend.
-.TP 
+.TP
 .I @LIBDIR@/libsane\-lexmark.so
 The shared library implementing this backend (present on systems that
 support dynamic loading).
 
 
 .SH "ENVIRONMENT"
-.TP 
+.TP
 .B SANE_DEBUG_LEXMARK
 .B SANE_DEBUG_LEXMARK_LOW
 If the library was compiled with debug support enabled, this
@@ -125,7 +125,7 @@ The data compression isn't supported for the X1200 series on USB 1.1,
 leading to slow scans.
 
 .SH "BUGS"
-.br 
+.br
 No bugs currently known.
 
 
@@ -135,16 +135,16 @@ sane\-scsi(5), scanimage(1), xscanimage(1), xsane(1), sane(7)
 
 
 .SH "AUTHOR"
-.TP 
+.TP
 The backend was originally written by Fred Odendaal.
 .I http://ca.geocities.com/freshshelf@rogers.com/
-.TP 
+.TP
 The new version is currently developed by St\['e]phane Voltz.
 .I http://stef.dev.free.fr/sane/lexmark
 .TP
 X74 support was written by Torsten Houwaart (<ToHo@gmx.de>)
 .SH "CREDITS"
-.TP 
+.TP
 Many thanks go to:
 Julien Furgerot who lend me a Dell A920.
 Robert Price, Dani Ele  and Dalai Felinto for the time they spent recording
diff --git a/doc/sane-ma1509.man b/doc/sane-ma1509.man
index bdd20f7..2677fcd 100644
--- a/doc/sane-ma1509.man
+++ b/doc/sane-ma1509.man
@@ -13,7 +13,7 @@ also work.
 This backend is ALPHA software.  Be careful and remove the power plug
 immediately if your hear unusual noises.
 .PP
-More details can be found on the ma1509 backend homepage 
+More details can be found on the ma1509 backend homepage
 .IR http://www.meier\-geinitz.de/sane/ma1509\-backend/ .
 .PP
 Other Mustek USB scanners are supported by the gt68xx, mustek_usb and the
@@ -25,7 +25,7 @@ and
 for details.
 .PP
 This backend can only work with scanners that are already detected by the
-operating system. See 
+operating system. See
 .BR sane\-usb (5)
 for details.
 .PP
@@ -59,20 +59,20 @@ file is a list of options and device names that correspond to Mustek BearPaw
 1200F scanners.  Empty lines and lines starting with a hash mark (#) are
 ignored.
 .PP
-Instead of using the device name, the scanner can be autodetected by 
+Instead of using the device name, the scanner can be autodetected by
 .B "usb vendor_id product_id"
 statements which are already included into
 .IR ma1509.conf .
 This is only supported with Linux 2.4.8 and higher and all systems that
 support libsub. "vendor_id" and "product_id" are hexadecimal numbers that
 identify the scanner. If this doesn't work, a device name must be placed in
-.I ma1509.conf 
+.I ma1509.conf
 as described above.
 .PP
 To set the time the lamp needs for warm-up, use
 .B option
 .B warmup-time
-in 
+in
 .IR ma1509.conf .
 The time is given in seconds after the option. The default is 30 seconds.
 .SH FILES
@@ -107,7 +107,7 @@ to "/tmp/config:" would result in directories "tmp/config", ".", and
 .B SANE_DEBUG_MA1509
 If the library was compiled with debug support enabled, this
 environment variable controls the debug level for this backend.  Higher
-debug levels increase the verbosity of the output. 
+debug levels increase the verbosity of the output.
 
 .SH "SEE ALSO"
 .BR sane (7),
diff --git a/doc/sane-magicolor.man b/doc/sane-magicolor.man
index 1e6c0a5..17ef387 100644
--- a/doc/sane-magicolor.man
+++ b/doc/sane-magicolor.man
@@ -10,21 +10,21 @@ backend supports KONICA MINOLTA magicolor scanners connected via USB or LAN. Cur
 The following scanner should work with this backend:
 
 Device Details
-.br 
+.br
 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
-.br 
+.br
 Vendor: KONICA MINOLTA
-.br 
+.br
 Model: magicolor 1690MF
 
 .SH "CONFIGURATION"
-.PP 
+.PP
 This section describes the backend's configuration file entries. The file is located at:
-.IP 
+.IP
 .I @CONFIGDIR@/magicolor.conf
-.PP 
+.PP
 For a proper setup, at least one of the following entries are needed:
-.IP 
+.IP
 .I net autodiscovery
 .br
 .I net [IP ADDRESS] [DEVICE-ID]
@@ -34,22 +34,22 @@ For a proper setup, at least one of the following entries are needed:
 .I usb [VENDOR-ID] [DEVICE-ID]
 
 .SH "FILES"
-.TP 
+.TP
 .I @CONFIGDIR@/magicolor.conf
 The backend configuration file
-.TP 
+.TP
 .I @LIBDIR@/libsane\-magicolor.a
 The static library implementing this backend.
-.TP 
+.TP
 .I @LIBDIR@/libsane\-magicolor.so
 The shared library implementing this backend (present on systems that support dynamic loading).
 .SH "ENVIRONMENT"
-.TP 
+.TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may contain the configuration file.  Under UNIX, the directories are separated by a colon (`:'), under OS/2, they are separated by a semi\-colon (`;').  If this variable is not set, the configuration file is searched in two default directories: first, the current working directory (".") and then in @CONFIGDIR@.  If the value of the environment variable ends with the directory separator character, then the default directories are searched after the explicitly specified directories.  For example, setting
 .B SANE_CONFIG_DIR
 to "/tmp/config:" would result in directories "/tmp/config", ".", and "@CONFIGDIR@" being searched (in this order).
-.TP 
+.TP
 .B SANE_DEBUG_MAGICOLOR
 If the library was compiled with debug support enabled, this environment variable controls the debug level for this backend.  Higher debug levels increase the verbosity of the output.
 
@@ -59,14 +59,14 @@ To obtain debug messages from the backend, set this environment variable before
 
 Example: SANE_DEBUG_MAGICOLOR=65 xscanimage
 .SH "KNOWN BUGS AND RESTRICTIONS"
-.PP 
+.PP
 Large color scans may sometimes timeout due to unknown reasons (the scanner simply stops returning data)
-.PP 
+.PP
 Cancelling large scans may lock up the scanner.
 .SH "SEE ALSO"
 .BR sane (7),
-.br 
+.br
 .I http://wiki.kainhofer.com/hardware/magicolor_scan
 .SH "AUTHOR"
-.PP 
+.PP
 Reinhold Kainhofer <reinhold@kainhofer.com>
diff --git a/doc/sane-matsushita.man b/doc/sane-matsushita.man
index 578421a..5bbf734 100644
--- a/doc/sane-matsushita.man
+++ b/doc/sane-matsushita.man
@@ -31,7 +31,7 @@ backend:
 
 Other Panasonic high speed scanners may or may not work with that backend.
 
-Valid command line options and their syntax can be listed by using 
+Valid command line options and their syntax can be listed by using
 .RS
 scanimage \-\-help \-d matsushita
 .RE
@@ -57,12 +57,12 @@ selects the number of pages to scan (one or until the tray is empty).
 
 .TP
 .B \-\-paper\-size A4|...|Legal|Letter [A4]
-options selects the area to scan. It adjust the 
+options selects the area to scan. It adjust the
 .B \-l \-t \-x \-y
 options accordingly. It does not need to be the real size of the paper.
 
 .TP
-.B \-l \-t \-x \-y 
+.B \-l \-t \-x \-y
 control the scan area: \-l sets the top left x coordinate, \-t the top
 left y coordinate, \-x selects the width and \-y the height of the scan
 area. All parameters are specified in millimeters. It is possible to use
@@ -87,7 +87,7 @@ automatically sets brightness, contrast, white level, gamma, noise reduction and
 option sets the tonal gradation for the halftone mode. Pattern downloading is not implemented by the backend.
 .TP
 .B \-\-autoseparation
-provides automatic separation of text and images. 
+provides automatic separation of text and images.
 .TP
 .B \-\-white\-level
 option indicate the source of the white base.
diff --git a/doc/sane-microtek.man b/doc/sane-microtek.man
index 84047dc..d3bf21c 100644
--- a/doc/sane-microtek.man
+++ b/doc/sane-microtek.man
@@ -46,7 +46,7 @@ port models may work (under Linux), if they use a parport->scsi chip,
 and if you can find a scsi->parport driver.  This is known to be the
 case for the Color PageWiz.
 .PP
-The driver does 
+The driver does
 .B not
 support the newest Microtek scanners, such as the V330 and V660, which use
 a new and very different SCSI-II command set.  For those, try the alternate
@@ -144,7 +144,7 @@ to "/tmp/config:" would result in directories "tmp/config", ".", and
 .TP
 .B SANE_DEBUG_MICROTEK
 If the library was compiled with debugging support enabled, this
-environment variable controls the debug level for this backend. 
+environment variable controls the debug level for this backend.
 A value of 128 requests maximally copious debug output; smaller
 levels reduce verbosity.
 
@@ -169,7 +169,7 @@ i.e. don't complain about these --- but if brightness and/or contrast
 .B do
 work for you, please tell me.
 .PP
-If your scanner locks up, try setting the 
+If your scanner locks up, try setting the
 .I norealcal
 or
 .I noprecal
@@ -188,7 +188,7 @@ setenv SANE_DEBUG_MICROTEK 128
 .RE
 .PP
 More general comments, suggestions, and inquiries about frontends
-or SANE should go to 
-.BR sane\-devel@lists.alioth.debian.org ,
+or SANE should go to
+.BR sane\-devel@alioth-lists.debian.net ,
 the SANE Developers mailing list. Have a look at
 http://www.sane\-project.org/mailing\-lists.html concerning subscription to sane\-devel.
diff --git a/doc/sane-microtek2.man b/doc/sane-microtek2.man
index b0e359b..cc4f6f4 100644
--- a/doc/sane-microtek2.man
+++ b/doc/sane-microtek2.man
@@ -311,8 +311,3 @@ sane\-scsi(5), sane(7)
 Bernd Schroeder (not active anymore)
 .br
 Karsten Festag  karsten.festag@gmx.de
-
-
-
-
-
diff --git a/doc/sane-mustek.man b/doc/sane-mustek.man
index 536466f..f06d9c1 100644
--- a/doc/sane-mustek.man
+++ b/doc/sane-mustek.man
@@ -15,7 +15,7 @@ Paragon MFS-6000CX
 .br
 Paragon MFS-12000CX
 .br
-Paragon MFC-600S, 600 II CD, ScanMagic 600 II SP 
+Paragon MFC-600S, 600 II CD, ScanMagic 600 II SP
 .br
 Paragon MFC-800S, 800 II SP
 .br
@@ -37,7 +37,7 @@ Paragon 1200 SP Pro
 .br
 Paragon 1200 A3 Pro
 .br
-Paragon 600 II EP 
+Paragon 600 II EP
 .br
 Paragon 600 II N
 .br
@@ -53,7 +53,7 @@ Primax Compact 4800 SCSI
 .br
 .RE
 .PP
-More details can be found on the Mustek SCSI backend homepage 
+More details can be found on the Mustek SCSI backend homepage
 .IR http://www.meier\-geinitz.de/sane/mustek\-backend/ .
 .PP
 Don't mix up MFS (Paragon), Pro and ScanExpress models! They're
@@ -92,7 +92,7 @@ If you own a Mustek (or Trust) scanner other than the ones listed
 above that works with this backend, please let us know by sending the
 scanner's exact model name (look at the front and back of the scanner)
 and a debug output to
-.IR sane\-devel@lists.alioth.debian.org .
+.IR sane\-devel@alioth-lists.debian.net .
 You can get the debug output by setting the environment variable
 .B SANE_DEBUG_MUSTEK
 to 5 and showing the list of available scanners with scanimage \-L. Please
@@ -112,17 +112,17 @@ Where
 .I special
 is either the path-name for the special device that corresponds to a
 SCSI scanner or the port number at which the parallel port scanners can
-be found (see section 
+be found (see section
 .B "PARALLEL PORT SCANNERS"
 below).  For SCSI scanners, the special device name must be a generic SCSI
 device or a symlink to such a device.  The program
-.I sane\-find\-scanner 
+.I sane\-find\-scanner
 helps to find out the correct device. Under Linux, such a device name
 could be
 .I /dev/sg0
 or
 .IR /dev/sg3 ,
-for example.  See 
+for example.  See
 .BR sane\-scsi (5)
 for details.
 .SH CONFIGURATION
@@ -130,7 +130,7 @@ The contents of the
 .I mustek.conf
 file is a list of options and device names that correspond to Mustek
 scanners.  Empty lines and lines starting with a hash mark (#) are
-ignored.  See 
+ignored.  See
 .BR sane\-scsi (5)
 on details of what constitutes a valid device name.
 .PP
@@ -279,7 +279,7 @@ for driver- and platform-specific information.
 The ScanExpress models have sometimes trouble with high resolution
 color mode. If you encounter sporadic corrupted images (parts duplicated
 or shifted horizontally) kill all other applications before scanning
-and (if sufficient memory is available) disable swapping. 
+and (if sufficient memory is available) disable swapping.
 .PP
 Details on how to get the Mustek SCSI adapters and other cards running can be
 found at
@@ -306,12 +306,12 @@ only one number on a single line. Example:
 .RE
 .PP
 Note that for these scanners usually root privileges are required to access the
-I/O ports.  Thus, either make frontends such as 
+I/O ports.  Thus, either make frontends such as
 .BR scanimage (1)
-and 
+and
 .BR xscanimage (1)
 setuid root (generally not recommended for safety reasons) or, alternatively,
-access this backend through the network daemon 
+access this backend through the network daemon
 .BR saned (8).
 .PP
 If the Mustek backend blocks while sending the inquiry command to the scanner,
@@ -360,7 +360,7 @@ to "/tmp/config:" would result in directories "tmp/config", ".", and
 .B SANE_DEBUG_MUSTEK
 If the library was compiled with debug support enabled, this
 environment variable controls the debug level for this backend.  Higher
-debug levels increase the verbosity of the output. 
+debug levels increase the verbosity of the output.
 
 .ft CR
 .nf
@@ -374,15 +374,15 @@ Value  Description
 .fi
 .ft R
 
-Example: 
+Example:
 export SANE_DEBUG_MUSTEK=4
 
 .SH "SEE ALSO"
 .BR sane (7),
 .BR sane\-find\-scanner (1),
 .BR sane\-scsi (5),
-.BR sane\-mustek_usb (5), 
-.BR sane\-gt68xx (5), 
+.BR sane\-mustek_usb (5),
+.BR sane\-gt68xx (5),
 .BR sane\-plustek (5),
 .BR sane\-mustek_pp (5)
 .br
@@ -396,7 +396,7 @@ Henning Meier-Geinitz, James Perry (600 II EP).
 
 .SH BUGS
 Scanning with the SCSI adapters supplied by Mustek is very slow at
-high resolutions and wide scan areas. 
+high resolutions and wide scan areas.
 .PP
 Some scanners (e.g. Paragon 1200 A3 + Pro, SE A3) need more testing.
 .PP
diff --git a/doc/sane-mustek_pp.man b/doc/sane-mustek_pp.man
index 253759d..acc2f9b 100644
--- a/doc/sane-mustek_pp.man
+++ b/doc/sane-mustek_pp.man
@@ -18,10 +18,10 @@ The
 library implements a SANE (Scanner Access Now Easy) backend that
 provides access to Mustek parallel port flatbed scanners and OEM versions.
 
-There are 2 classes of Mustek parallel port scanners: regular 
+There are 2 classes of Mustek parallel port scanners: regular
 .B CCD
-(cold cathode device) scanners and 
-.B CIS 
+(cold cathode device) scanners and
+.B CIS
 (contact image sensor) scanners.
 .P
 The current version of this backend supports both CCD type scanners and
@@ -29,7 +29,7 @@ CIS type scanners.
 .P
 The following scanners might work with this backend:
 
-.SS "CCD scanners" 
+.SS "CCD scanners"
 
 .EX
 Model:                  ASIC ID:        CCD Type:       works:
@@ -56,25 +56,25 @@ Mustek 1200 CP+         1015            yes
 .EE
 
 .EX
-OEM versions            Original        works 
+OEM versions            Original        works
 --------------------------------------------------
 Medion/LifeTec/Tevion
    MD/LT 9350/9351      1200 CP         yes
    MD/LT 9850/9851      1200 CP         maybe (**)
    MD/LT 9858           1200 CP         probably
    MD/LT 9890/9891      1200 CP         yes
-Targa 
+Targa
    Funline TS12EP       1200 CP         yes
    Funline TS6EP        600 CP          yes
 Trust
    Easy Connect 9600+   600 CP          yes
-Cybercom 
+Cybercom
    9352                 1200 CP         yes (***)
 .EE
-.HP 
+.HP
 (*)    Calibration  problems existed with earlier version of
 this driver. They seem to be solved now.
-.HP 
+.HP
 (**)   Problems have been reported in the past for the
 MD/LT9850 type (striped scans, head moving in wrong
 direction at some resolutions). It is not known whether
@@ -82,7 +82,7 @@ the current version of the driver still has these problems.
 .PP
 .B  IF YOU HEAR LOUD CLICKING NOISES, IMMEDIATELY UNPLUG THE SCANNER !
 (This holds for any type of scanner).
-.HP 
+.HP
 (***)  Possibly, the engine_delay parameter has to be set to 1 ms
 for accurate engine movements.
 .PP
@@ -90,15 +90,15 @@ Please note that this backend is still under construction. Certain models
 are currently not supported and some may never be because the communication
 protocol is still unknown (eg., SE 12000 P).
 .PP
-Some scanners work faster when 
+Some scanners work faster when
 .B EPP/ECP
 is enabled in the BIOS. EPP mode however may lead to hard-locks on some Linux
 systems. If that is the case for you, you can either disable ECP/EPP in your
 BIOS or disable it in the backend itself (see GLOBAL OPTIONS).
 .PP
 Note that the backend needs to run as root or has to have appropriate access
-rights to /dev/parport* if libieee1284 support is compiled in. To allow user 
-access to the scanner run the backend through the network interface (See 
+rights to /dev/parport* if libieee1284 support is compiled in. To allow user
+access to the scanner run the backend through the network interface (See
 saned(8) and sane\-net(5)). Note also that the backend
 .I does not
 support
@@ -112,7 +112,7 @@ to enable the backend explicitly in your dll.conf, just remove the hash mark
 in the line "mustek_pp".
 
 .SH "DEVICE DEFINITION"
-This backend allows multiple devices being defined and configured via the 
+This backend allows multiple devices being defined and configured via the
 .B mustek_pp.conf
 file (even simultaneously, provided that they are connected to different
 parallel ports). Please make sure to edit this file
@@ -134,23 +134,23 @@ for instance "LifeTec 9350".
 .B <port name>
 is the name of the parallel port to which the device is connected. In case
 libieee1284 is used for communication with the port
-.I (default 
-.IR setup) , 
-valid port names are 
-.BR parport0 , 
-.BR parport1 , 
+.I (default
+.IR setup) ,
+valid port names are
+.BR parport0 ,
+.BR parport1 ,
 and
 .BR parport2 .
 .PP
 In case the backend is configured for raw IO
-.I (old 
+.I (old
 .IR setup) ,
 port addresses have to be used instead of port names:
 .BR 0x378 ,
-.BR 0x278 , 
+.BR 0x278 ,
 or
 .BR 0x3BC .
-The mapping of parallel ports (lp0, lp1, and lp2) to these addresses 
+The mapping of parallel ports (lp0, lp1, and lp2) to these addresses
 can be different for different Linux kernel versions. For instance,
 if you are using a Kernel 2.2.x or better and you have only one
 parallel port, this port is named lp0 regardless of the base address. However,
@@ -159,7 +159,7 @@ port your scanner is connected to, have a look at your /etc/conf.modules,
 /etc/modules.conf and/or /proc/ioports.
 .PP
 If you are unsure which port to use, you can use the magic value
-.BR * 
+.BR *
 to probe for your scanner.
 .PP
 .HP
@@ -169,7 +169,7 @@ is the driver to use for this device. Currently available drivers are:
 .BR cis600 "   : for 600 CP, 96 CP & OEM versions"
 .br
 .BR cis1200 "  : for 1200 CP & OEM versions"
-.br  
+.br
 .BR cis1200+ " : for 1200 CP+ & OEM versions"
 .br
 .BR ccd300 "   : for 600 IIIE P & OEM version"
@@ -187,12 +187,12 @@ cover only half of the width of the scan area (also not dangerous).
 .PP
 If unsure about the exact model of your OEM version, check the optical
 resolution in the manual or on the box: the 600CP has a maximum optical
-resolution of 300x600 DPI, whereas the 1200CP and 1200CP+ have a maximum 
-optical resolution of 600x1200 DPI. 
+resolution of 300x600 DPI, whereas the 1200CP and 1200CP+ have a maximum
+optical resolution of 600x1200 DPI.
 .PP
 Examples:
 .PP
-.RS 
+.RS
 scanner "LifeTec 9350" 0x378 cis1200
 .PP
 scanner Mustek_600CP 0x378 cis600
@@ -201,7 +201,7 @@ scanner Mustek_600IIIEP * ccd300
 .RE
 
 If in doubt which port you have to use, or whether your scanner is
-detected at all, you can use 
+detected at all, you can use
 .B sane\-find\-scanner \-p
 to probe all configured ports.
 
@@ -209,7 +209,7 @@ to probe all configured ports.
 .PP
 The contents of the
 .B mustek_pp.conf
-file is a list of device definitions and device options that correspond to 
+file is a list of device definitions and device options that correspond to
 Mustek scanners.  Empty lines and lines starting with a hash mark (#) are
 ignored. Options have the following format:
 .PP
@@ -220,19 +220,19 @@ ignored. Options have the following format:
 Depending on the nature of the option, a value may or may not be present.
 Options always apply to the scanner definition that precedes them. There
 are no global options. Options are also driver-specific: not all drivers
-support all possible options. 
+support all possible options.
 
 .SS Common options
 .TP
 .B bw <value>
 Black/white discrimination value to be used during lineart scanning. Pixel
 values below this value are assumed to be black, values above are
-assumed to be white. 
+assumed to be white.
 .br
 Default value: 127
-.br 
+.br
 Minimum:         0
-.br 
+.br
 Maximum:       255
 .sp
 Example:  option bw 150
@@ -240,7 +240,7 @@ Example:  option bw 150
 .SS CIS driver options
 .TP
 .B top_adjust <value>
-Vertical adjustment of the origin, expressed in millimeter (floating point). 
+Vertical adjustment of the origin, expressed in millimeter (floating point).
 This option can be used to calibrate the position of the origin, within
 certain limits. Note that CIS scanners are probably temperature sensitive, and
 that a certain inaccuracy may be hard to avoid. Differences in offset between
@@ -261,7 +261,7 @@ scan does not start at the origin, the driver will try to move the scanhead
 to the start of the scan area at the fastest possible speed. On some models,
 this may not work, resulting in large inaccuracies (up to centimeters).
 By setting this option, the driver is forced to use normal speed during
-skipping, which can circumvent the accuracy problems. Currently, there are 
+skipping, which can circumvent the accuracy problems. Currently, there are
 no models for which these inaccuracy problems are known to occur.
 .sp
 By default, fast skipping is used.
@@ -454,13 +454,13 @@ For additional information on the CIS driver, see
 
 .SH AUTHORS
 .nf
-Jochen Eisinger <jochen at penguin\-breeder dot org> 
+Jochen Eisinger <jochen at penguin\-breeder dot org>
 Eddy De Greef <eddy_de_greef at scarlet dot be>
 .fi
 
 .SH BUGS
-Too many... please send bug reports to 
-.I sane\-devel@lists.alioth.debian.org
+Too many... please send bug reports to
+.I sane\-devel@alioth-lists.debian.net
 (note that you have to subscribe first to the list before you can send
 emails... see http://www.sane\-project.org/mailing\-lists.html)
 
diff --git a/doc/sane-mustek_usb.man b/doc/sane-mustek_usb.man
index a934e8a..a70ad5e 100644
--- a/doc/sane-mustek_usb.man
+++ b/doc/sane-mustek_usb.man
@@ -23,11 +23,11 @@ Trust Compact Scan USB 19200
 .br
 .RE
 .PP
-More details can be found on the Mustek USB backend homepage 
+More details can be found on the Mustek USB backend homepage
 .IR http://www.meier\-geinitz.de/sane/mustek_usb\-backend/ .
 .PP
 The Mustek BearPaw 1200 and 2400 scanners are supported by the plustek
-backend. See 
+backend. See
 .BR sane\-plustek (5)
 for details. The Mustek BearPaw 1200F is supported by the MA-1509 backend. See
 .BR sane\-ma1509 (5)
@@ -36,7 +36,7 @@ see
 .BR sane\-gt68xx (5).
 .PP
 This backend can only work with scanners that are already detected by the
-operating system. See 
+operating system. See
 .BR sane\-usb (5)
 for details.
 .PP
@@ -70,7 +70,7 @@ The contents of the
 .I mustek_usb.conf
 file is a list of options and device names that correspond to Mustek
 USB scanners.  Empty lines and lines starting with a hash mark (#) are
-ignored. If a device name is placed in 
+ignored. If a device name is placed in
 .IR mustek_usb.conf ,
 it must be followed by a line containing the keyword
 .B option
@@ -81,7 +81,7 @@ and an option specifying the scanner type. The following options can be used:
 .BR 1200ub .
 For the Trust Compact Scan USB 19200 use `option 1200ub'.
 .PP
-Instead of using the device name, the scanner can be autodetected by 
+Instead of using the device name, the scanner can be autodetected by
 .B "usb vendor_id product_id"
 statements which are already included into
 .IR mustek_usb.conf .
@@ -89,7 +89,7 @@ This is only supported with Linux 2.4.8 and higher and all systems that
 support libsub. "vendor_id" and "product_id" are hexadecimal numbers that
 identify the scanner. If this doesn't work, a device name and the option
 specifying the scanner type must be placed in
-.I mustek_usb.conf 
+.I mustek_usb.conf
 as described above.
 .PP
 The global
@@ -114,7 +114,7 @@ option 600cu
 The first line is ignored. The second line sets the buffer size to a maximum of
 1024 bytes.  The third line tries to autodetect a scanner with vendor id 0x055f
 and product id 0x0001 (Mustek 1200 CU). The fourth line tells the backend to
-attach to 
+attach to
 .I /dev/usb/scanner0
 and the fifth line specifies that
 .I /dev/usb/scanner0
@@ -151,7 +151,7 @@ to "/tmp/config:" would result in directories "tmp/config", ".", and
 .B SANE_DEBUG_MUSTEK_USB
 If the library was compiled with debug support enabled, this
 environment variable controls the debug level for this backend.  Higher
-debug levels increase the verbosity of the output. 
+debug levels increase the verbosity of the output.
 
 .ft CR
 .nf
@@ -167,7 +167,7 @@ Value  Description
 .fi
 .ft R
 
-Example: 
+Example:
 export SANE_DEBUG_MUSTEK_USB=4
 
 .SH "SEE ALSO"
diff --git a/doc/sane-mustek_usb2.man b/doc/sane-mustek_usb2.man
index b134afa..dab26dc 100644
--- a/doc/sane-mustek_usb2.man
+++ b/doc/sane-mustek_usb2.man
@@ -9,7 +9,7 @@ library implements a SANE (Scanner Access Now Easy) backend that provides
 access to USB flatbed scanners based on the Service & Quality SQ113 chipset. At
 the moment, only the Mustek BearPaw 2448 TA Pro is supported. It's planned to add
 support for other scanners that are based on the SQ113 and maybe SQ11 chip. For
-more details, see the mustek_usb2 backend homepage: 
+more details, see the mustek_usb2 backend homepage:
 .IR http://www.meier\-geinitz.de/sane/mustek_usb2\-backend/ .
 .PP
 This is BETA software. Especially if you test new or untested scanners, keep
@@ -44,9 +44,9 @@ support dynamic loading).
 .B SANE_DEBUG_MUSTEK_USB2
 If the library was compiled with debug support enabled, this environment
 variable controls the debug level for this backend.  Higher debug levels
-increase the verbosity of the output. 
+increase the verbosity of the output.
 
-Example: 
+Example:
 export SANE_DEBUG_MUSTEK_USB2=4
 
 .SH "SEE ALSO"
diff --git a/doc/sane-nec.man b/doc/sane-nec.man
index 0fd895e..e36ebe9 100644
--- a/doc/sane-nec.man
+++ b/doc/sane-nec.man
@@ -9,7 +9,7 @@ library implements a SANE (Scanner Access Now Easy) backend that
 provides access to NEC SCSI scanners.  This backend should be
 considered
 .B alpha-quality
-software!  In the current state it is known to work with PC-IN500/4C 
+software!  In the current state it is known to work with PC-IN500/4C
 scanners. Another MultiReader scanner series is not supported. PC-IN
 500/4C and MultiReader scanner are only sold in Japan.(except Multi
 Reader PetiScan.)
diff --git a/doc/sane-p5.man b/doc/sane-p5.man
index 860a019..1c21f12 100644
--- a/doc/sane-p5.man
+++ b/doc/sane-p5.man
@@ -7,28 +7,28 @@ The
 .B sane\-p5
 library implements a SANE (Scanner Access Now Easy) backend that
 provides access to the Primax PagePartner parallel port sheet fed scanner.
-.PP 
+.PP
 This backend handles 100, 150, 200, 300 and 600 dpi scan resolutions,
 in color and gray modes. The 600 dpi is actually 300x600 with lines
 enlarged to match the vertical resolution.
-.PP 
+.PP
 .B EPP/ECP MODES ONLY
-The current version of the backend uses only EPP or ECP mode to communicate 
-with the scanner. It is 
-recommended that you set your parallel port to EPP in BIOS with the current 
+The current version of the backend uses only EPP or ECP mode to communicate
+with the scanner. It is
+recommended that you set your parallel port to EPP in BIOS with the current
 version of this backend. ECPEPP will only
 work if you use a 2.4 or 2.6 kernel with ppdev character device support.
-.PP 
+.PP
 
 .SH "DEVICE NAMES"
 This backend expects device names of the form:
-.PP 
+.PP
 .RS
 .I port value
 .RE
-.PP 
+.PP
 Where
-\fBvalue\fR is : 
+\fBvalue\fR is :
 
 .RS
 .TP
@@ -40,43 +40,43 @@ them for scanner
 uses linux ppdev device, depending on the
 number of available parallel port, you
 have to use /dev/parport1, /dev/parport2, ...
-.PP 
+.PP
 .RE
 You can rename any device using the
-.PP 
+.PP
 .RS
 .br
 .I option name my_name
 .RE
-.PP 
-option. This option apply to the last port option. 
+.PP
+option. This option apply to the last port option.
 
 .SH "CONFIGURATION"
 Please make sure to edit dll.conf
 .B before
 you use the backend, since this backend isn't enabled by default.
-.PP 
+.PP
 
-.PP 
+.PP
 
 
 
 .SH "FILES"
-.TP 
+.TP
 .I @CONFIGDIR@/p5.conf
 The backend configuration file (see also description of
 .B SANE_CONFIG_DIR
 below).
-.TP 
+.TP
 .I @LIBDIR@/libsane\-p5.a
 The static library implementing this backend.
-.TP 
+.TP
 .I @LIBDIR@/libsane\-p5.so
 The shared library implementing this backend (present on systems that
 support dynamic loading).
 
 .SH "ENVIRONMENT"
-.TP 
+.TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
 contain the configuration file.  Under UNIX, the directories are
@@ -90,14 +90,14 @@ directories.  For example, setting
 .B SANE_CONFIG_DIR
 to "/tmp/config:" would result in directories "tmp/config", ".", and
 "@CONFIGDIR@" being searched (in this order).
-.TP 
+.TP
 .B SANE_DEBUG_P5
 If the library was compiled with debug support enabled, this
 environment variable controls the debug level for this backend.  E.g.,
 a value of 255 requests all debug output to be printed.  Smaller
 levels reduce verbosity.
 
-.PP 
+.PP
 .RS
 .ft CR
 .nf
@@ -108,23 +108,23 @@ level   debug output
  2       warnings & minor errors
  4       information messages
  8       start/stop of functions
- 16      tracing messages              
+ 16      tracing messages
  32      I/O functions
  64      I/O functions with traces
  128     scanned/calibration data
 .fi
 .ft R
 .RE
-.PP 
-.TP 
+.PP
+.TP
 
-.PP 
+.PP
 .RS
 .ft CR
 .nf
-.PP 
- 
-.PP 
+.PP
+
+.PP
 .SH "SEE ALSO"
 sane(7), sane\-net(5), saned(8)
 
@@ -136,25 +136,26 @@ Support for the Prima PagePartner has been made possible thank to an hardware do
 by S\['e]bastien Lange.
 
 .SH "BUG REPORTS"
-If something doesn't work mail sane-devel@lists.alioth.debian.org or use the bug
-tracker at https://alioth.debian.org/tracker/?atid=410366&group_id=30186 .
-Please give as much information as you can. 
+If something doesn't work mail sane-devel@alioth-lists.debian.net or submit an
+issue via https://gitlab.com/sane-project/backends/issues/new with a label of
+backend/p5.
+Please give as much information as you can.
 
-.TP 
+.TP
 .I SANE version
 run "scanimage \-V" to determine this
-.TP 
+.TP
 .I the backend version and your scanner hardware
 run "SANE_DEBUG_P5=255 scanimage \-L 2>log" as root. If you don't get any output
 from the p5 backend, make sure a line "p5" is included into
 your @CONFIGDIR@/dll.conf.
 If your scanner isn't detected, make sure you've defined the right port address, or the
-correct device 
+correct device
 in your p5.conf.
-.TP 
+.TP
 .I the name of your scanner/vendor
 also a worthy information. Please also include the optical resolution and lamp type of your scanner, both can be found in the manual of your scanner.
-.TP 
+.TP
 .I any further comments
 if you have comments about the documentation (what could be done better), or you
 think I should know something, please include it.
diff --git a/doc/sane-pint.man b/doc/sane-pint.man
index 7e863a5..1a59608 100644
--- a/doc/sane-pint.man
+++ b/doc/sane-pint.man
@@ -21,7 +21,7 @@ successfully.
 If have successfully used the PINT driver with your scanner, but it
 does not work using this SANE backend, please let us know.  To do
 this, send a mail with the relevant information for your scanner to
-.IR sane\-devel@lists.alioth.debian.org .
+.IR sane\-devel@alioth-lists.debian.net .
 Have a look at http://www.sane\-project.org/mailing\-lists.html concerning subscription
 to sane\-devel.
 
diff --git a/doc/sane-pixma.man b/doc/sane-pixma.man
index 1058e92..1ceb6d6 100644
--- a/doc/sane-pixma.man
+++ b/doc/sane-pixma.man
@@ -1,4 +1,4 @@
-.TH "sane\-pixma" "5" "20 May 2017" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH "sane\-pixma" "5" "29 Jul 2019" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane\-pixma
 .SH NAME
 sane\-pixma \- SANE backend for Canon Multi-Function Printers and CanoScan Scanners
@@ -8,13 +8,17 @@ The
 library implements a SANE (Scanner Access Now Easy) backend that provides
 access to Canon PIXMA / i-SENSYS / imageCLASS / imageRUNNER multi-function
 devices (All-in-one printers) and the Canon CanoScan Flatbed/TPU scanners.
-The backend implements both the USB interface and network interface 
-(using Canon's BJNP and MFNP protocols). The network interface supports scanners 
+The backend implements both the USB interface and network interface
+(using Canon's BJNP and MFNP protocols). The network interface supports scanners
 over IPv4 as well as IPv6 (MFNP over IPv6 is untested).
 .PP
 Currently, the following models work with this backend:
 .PP
 .RS
+PIXMA E510
+.br
+PIXMA G2000, G2100
+.br
 PIXMA MG2100, MG2200, MG2400, MG2500, MG2900, MG3100, MG3200
 .br
 PIXMA MG3500, MG3600, MG4200, MG5100, MG5200, MG5300, MG5400
@@ -47,8 +51,12 @@ PIXMA MX410, MX420, MX470, MX510, MX520, MX530, MX700, MX720
 .br
 PIXMA MX850, MX860, MX870, MX882, MX885, MX890, MX920, MX7600
 .br
+PIXMA TS3100, TS5000, TS6100, TS8000, TS8200
+.br
 PIXUS MP10
 .br
+imageCLASS MF634Cdw, MF733Cdw
+.br
 imageCLASS MF3110, MF3240, MF4010, MF4018
 .br
 imageCLASS MF4120, MF4122, MF4140, MF4150
@@ -59,15 +67,19 @@ imageCLASS MF4410, MF4430, MF4570dw, MF4660, MF4690
 .br
 imageCLASS MF5730, MF5770, MF6550, MPC200, D420, D480, D530
 .br
-i-SENSYS MF230, MF240, MF3010, MF4320d, MF4330d, MF4500, MF4700
+i-SENSYS MF210, MF230, MF240, MF620, MF730, MF731/733, MF3010
 .br
-i-SENSYS MF4800, MF6100, MF8200C, MF8300
+i-SENSYS MF4320d, MF4330d, MF4500, MF4700, MF4800, MF6100
 .br
-imageRUNNER 1020/1024/1025
+i-SENSYS MF8030, MF8200C, MF8300
+.br
+imageRUNNER 1020/1024/1025, 1133
 .br
 CanoScan 8800F, 9000F, 9000F Mark II
 .br
-MAXIFY MB5000 (ADF is not working)
+CanoScan LiDE 300, 400
+.br
+MAXIFY MB2000, MB2100, MB2300, MB2700, MB5000
 .RE
 .PP
 The following models are not well tested and/or the scanner sometimes hangs
@@ -77,13 +89,15 @@ and must be switched off and on.
 PIXMA MP760, MP770, MP780, MP790
 .RE
 .PP
-The following models may use the same Pixma protocol as those listed 
-above, but have not yet been reported to work (or not). They are declared 
-in the backend so that they get recognized and activated. 
+The following models may use the same Pixma protocol as those listed
+above, but have not yet been reported to work (or not). They are declared
+in the backend so that they get recognized and activated.
 Feedback in the sane\-devel mailing list welcome.
 .PP
 .RS
-PIXMA E400, E460, E470, E480, E500, E510, E560, E600, E610
+PIXMA E400, E410, E460, E470, E480, E500, E560, E600, E610
+.br
+PIXMA E3100, E4200
 .br
 PIXMA MG3000, MG4100, MG6500, MG6600, MG6800, MG6900, MG8100
 .br
@@ -91,26 +105,32 @@ PIXMA MP375R, MP493, MP495, MP740
 .br
 PIXMA MX320, MX390, MX430, MX450, MX490, MX710
 .br
-PIXMA G3000
+PIXMA G3000, G3010, G4000, G4010
 .br
-PIXMA TS9000, TS800, TS6000, TS5000
+PIXMA TR4500, TR7500, TR7530, TR8500, TR8530, TR8580, TR9530
 .br
-PIXUS MP5
+PIXMA TS5100, TS6000, TS6130, TS6180, TS6200, TS6230, TS6280
 .br
-imageCLASS MF810/820, MF5630, MF5650, MF5750, MF8030, MF8170c
+PIXMA TS8100, TS8130, TS8180, TS8230, TS8280, TS9000, TS9100
 .br
-imageCLASS MPC190
+PIXMA TS9180, TS9500, TS9580
 .br
-imageRUNNER 1133
+PIXUS MP5, XK50, XK70, XK80
 .br
-i-SENSYS MF210, MF220, MF5880dn, MF5900, MF6680dn, MF8500C
+imageCLASS MF810/820, MF5630, MF5650, MF5750, MF8170c
 .br
-MAXIFY MB2000, MB2300, MB5300
+imageCLASS MPC190, D550, D570
+.br
+i-SENSYS MF110, MF220, MF260, MF410, MF420, MF510, MF520, MF630
+.br
+i-SENSYS MF640, MF740, MF5880dn, MF5900, MF6680dn, MF8500C
+.br
+MAXIFY MB5100, MB5300, MB5400
 .RE
 .PP
 \#The following models may use partly the same Pixma protocol as other devices
-\#listed above, but may still need some work. They are declared in the backend 
-\#as experimental. Snoop logs are required to further investigate, please contact 
+\#listed above, but may still need some work. They are declared in the backend
+\#as experimental. Snoop logs are required to further investigate, please contact
 \#the sane\-devel mailing list.
 \#.PP
 \#.RS
@@ -133,7 +153,7 @@ The backend supports:
 .PP
 The device name for USB devices is in the form pixma:xxxxyyyy_zzzzz
 where x, y and z are vendor ID, product ID and serial number respectively.
-.PP 
+.PP
 Example: pixma:04A91709_123456 is a MP150.
 .PP
 Device names for BJNP/MFNP devices is in the form pixma:aaaa_bbbbb
@@ -141,12 +161,12 @@ where aaaa is the scanners model and bbbb is the hostname or ip-adress.
 .PP
 Example: pixma:MF4800_192.168.1.45 is a MF4800 Series multi-function peripheral.
 .PP
-This backend, based on cloning original Canon drivers protocols, is in 
+This backend, based on cloning original Canon drivers protocols, is in
 a production stage. Designed has been carried out without any applicable
-manufacturer documentation, probably never available. However, we have tested 
-it as well as we could, but it may not work in all situations. You will find 
-an up-to-date status at the project homepage. (See below). 
-Users feedback is essential to help improve features and performances. 
+manufacturer documentation, probably never available. However, we have tested
+it as well as we could, but it may not work in all situations. You will find
+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 options, i.e. the options might change in the future.
@@ -178,20 +198,20 @@ the button and so on. When you finished, press the gray-scan button. (For
 MP150 you have to stop the frontend by pressing Ctrl-C for example.)
 .TP
 .I button\-update (deprecated)
-(write only) In the past this option was required to be set to force 
+(write only) In the past this option was required to be set to force
 reading of the button status for
 .I button\-1
 and
 .I button\-2.
-The 
+The
 .B sane\-pixma
-no longer requires this option to be used: if no fresh data is available, it 
-will be now requested automatically from the scanner. This option is left for 
+no longer requires this option to be used: if no fresh data is available, it
+will be now requested automatically from the scanner. This option is left for
 backward compatibility reasons.
 .TP
 .I button\-1 button\-2
 (read only) These options will return the value of the respective buttons.
-value 0 means that the button was not pressed, 1 is returned when the button 
+value 0 means that the button was not pressed, 1 is returned when the button
 was pressed. Some scanners with more than two buttons send the button number
 as target.
 .TP
@@ -225,52 +245,52 @@ support dynamic loading).
 .I @CONFIGDIR@/pixma.conf
 The backend configuration file (see also description of
 .B SANE_CONFIG_DIR
-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 also may need 
+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 also may need
 to add your scanner here as well.
 .RS
 .PP
-.I Scanners shall be listed in the configuraton file as follows:
+.I Scanners shall be listed in the configuration file as follows:
 .PP
 .RS
 .I <method>://<host>[:port][/timeout=<value>]
 .RE
 .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 
+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
 IPv6-address or bjnp://myscanner.mydomain.org for a hostname.
 .PP
 The port number is optional and in normally implied by the method.
 Port 8610 is the standard port for mfnp, 8612 for bjnp.
 .PP
-A scanner specific timeout value for the network protocol can be set using the 
+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:
+More globally applicable timeouts can be set using the bjnp-timeout parameter as follows:
 .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 
+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. 
+If not explicitly 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
-The pixma backend supports network scanners using the so called Canon BJNP 
+The pixma backend supports network scanners using the so called Canon BJNP
 protocol and MFNP protocol. Both IPv4 and IPv6 are supported, but IPv6 is as
 yet untested with MFNP. Please report your results on the mailing list.
 .PP
@@ -278,28 +298,28 @@ Configuration is normally not required.
 The pixma backend will auto-detect your scanner if it is within
 the same subnet as your computer if your OS does support this.
 .PP
-If your scanner can not be auto-detected, you can add it to the pixma 
+If your scanner can not be auto-detected, you can add it to the pixma
 configuration file (see above).
 .SH FIREWALLING FOR NETWORKED SCANNERS
-The sane pixma backend communicates with port 8610 for MFNP or port 8612 
+The sane pixma backend communicates with port 8610 for MFNP or port 8612
 for BJNP on the scanner. So
-you will have to allow outgoing traffic TO port 8610 or 8612 on the 
+you will have to allow outgoing traffic TO port 8610 or 8612 on the
 common subnet for scanning.
 .PP
 Scanner detection is slightly more complicated. The pixma backend sends
-a broadcast on all direct connected subnets it can find (provided your OS 
-allows for enumeration of all netowrk interfaces). The broadcast is sent FROM 
+a broadcast on all direct connected subnets it can find (provided your OS
+allows for enumeration of all netowrk interfaces). The broadcast is sent FROM
 port 8612 TO port 8610 or 8612 on the broadcast address of each interface.
 The outgoing packets will be allowed by the rule described above.
 .PP
 Responses from the scanner are sent back to the computer TO port 8612.
 Connection tracking however does not see a match as the response does not come
 from the broadcast address but from the scanners own address.
-For automatic detection of your scanner, you will therefore have to allow 
+For automatic detection of your scanner, you will therefore have to allow
 incoming packets TO port 8612 on your computer. This applies to both MFNP and
 BJNP.
 .PP
-So in short: open the firewall for all traffic from your computer to port 
+So in short: open the firewall for all traffic from your computer to port
 8610 (for MFNP) or 8612 (for BJNP)
 AND to port 8612 (for both BJNP and MFNP) to your computer.
 .PP
@@ -331,7 +351,7 @@ the verbosity and includes the information printed at the lower levels.
 .TP
 .B SANE_DEBUG_BJNP
 If the library was compiled with debug support enabled, this environment
-variable controls the debug level for the 
+variable controls the debug level for the
 .B BJNP and MFNP
 network protocols for this backend. Higher value increases
 the verbosity and includes the information printed at the lower levels.
@@ -341,7 +361,7 @@ the verbosity and includes the information printed at the lower levels.
 1 Print error and warning messages (recommended)
 .br
 2 Print high level function tracing information
-.br 
+.br
 3 Print more detailed protocol tracing information
 .br
 4 Print protocol headers
@@ -369,13 +389,11 @@ to "/tmp/config:" would result in directories "tmp/config", ".", and
 .SH "SEE ALSO"
 .BR sane (7),
 .BR sane\-dll (5),
-.I http://home.arcor.de/wittawat/pixma/,
-.I http://mp610.blogspot.com/
 .PP
-In case of trouble with a recent Pixma model, try the latest code for 
+In case of trouble with a recent Pixma model, try the latest code for
 the pixma backend, available in the Sane git repository at:
 .br
-.I http://git.debian.org/?p=sane/sane-backends.git
+.I https://gitlab.com/sane-project/backends.git
 .PP
 You can also post into the Sane-devel mailing list for support.
 
diff --git a/doc/sane-plustek.man b/doc/sane-plustek.man
index a6bb993..2df85b6 100644
--- a/doc/sane-plustek.man
+++ b/doc/sane-plustek.man
@@ -1,4 +1,4 @@
-.TH sane\-plustek 5 "13 Feb 2013" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH sane\-plustek 5 "03 Nov 2017" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane\-plustek
 .SH NAME
 sane\-plustek \- SANE backend for LM983[1/2/3] based
@@ -241,7 +241,7 @@ The Options:
 option warmup t
 .RS
 .I t
-specifies the warmup period in seconds, if set to \-1, the 
+specifies the warmup period in seconds, if set to \-1, the
 automatic warmup function will be used
 .RE
 .PP
@@ -468,8 +468,6 @@ export SANE_DEBUG_PLUSTEK=10
 .BR sane\-gt68xx (5),
 .br
 .I @DOCDIR@/plustek/Plustek-USB.changes
-.br
-.I http://www.gjaeger.de/scanner/plustek/
 
 .SH "CONTACT AND BUG-REPORTS"
 Please send any information and bug-reports to:
@@ -482,16 +480,12 @@ Mailing-List archive at:
 .br
 .B http://www.sane\-project.org/mailing\-lists.html
 .PP
-or directly from the projects' homepage at:
-.br
-.B http://www.gjaeger.de/scanner/plustek/
-.PP
 To obtain debug messages from the backend, please set the
 environment-variable
 .I SANE_DEBUG_PLUSTEK
-before calling your favorite scan-frontend (i.e. xscanimage).
+before calling your favorite scan-frontend (i.e. scanimage).
 .br
-.B i.e.: export SANE_DEBUG_PLUSTEK=20 ; xscanimage
+.B i.e.: export SANE_DEBUG_PLUSTEK=20 ; scanimage
 .PP
 The value controls the verbosity of the backend. Please note, that
 values greater than 24 force the backend to output raw data files,
@@ -505,13 +499,13 @@ For problem reports it should be enough the set the verbosity to
 * The driver does not support these manic scalings up
 to 16 times the physical resolution. The only scaling
 is done on resolutions between the physical resolution
-of the CCD-/CIS-sensor and the stepper motor i.e. you 
-have a 600x1200 dpi scanner and you are scanning using 
-800dpi, so scaling is necessary, because the sensor only 
-delivers 600dpi but the motor is capable to perform 
+of the CCD-/CIS-sensor and the stepper motor i.e. you
+have a 600x1200 dpi scanner and you are scanning using
+800dpi, so scaling is necessary, because the sensor only
+delivers 600dpi but the motor is capable to perform
 1200dpi steps.
 .PP
-* Plusteks' model policy is somewhat inconsistent. They 
+* Plusteks' model policy is somewhat inconsistent. They
 sell technically different devices under the
 same product name. Therefore it is possible that some
 devices like the UT12 or U12 won't work \- please check
diff --git a/doc/sane-plustek_pp.man b/doc/sane-plustek_pp.man
index c01aba6..3d70971 100644
--- a/doc/sane-plustek_pp.man
+++ b/doc/sane-plustek_pp.man
@@ -13,7 +13,7 @@ The access of the scanner is either done directly by the backend
 or via kernel module, called pt_drv which can be created out of
 the plustek_pp backend code \- see also section
 .B "BUILDING THE KERNEL MODULE"
-for further information. 
+for further information.
 
 .SH "SUPPORTED DEVICES"
 
@@ -242,13 +242,13 @@ Within this directory, you should find a script called:
 .br
 .I MakeModule.sh
 .br
-Now if your Linux kernelsources are installed correctly, 
-it should be possible to build, install and load the 
+Now if your Linux kernelsources are installed correctly,
+it should be possible to build, install and load the
 module
 .B pt_drv.
-.B Please note, 
+.B Please note,
 that the kernelsources need to be configured correctly.
-Refer to your distributions 
+Refer to your distributions
 manual on how this is done. As root user, try
 .br
 .I ./MakeModule.sh
@@ -257,7 +257,7 @@ the script will try and get all necessary information about your
 running kernel and will lead you through the whole installation
 process.
 .br
-.B Note: Installing and loading the can only be done as 
+.B Note: Installing and loading the can only be done as
 superuser.
 .PP
 
@@ -448,8 +448,6 @@ export SANE_DEBUG_PLUSTEK_PP=10
 .BR sane (7),
 .br
 .I @DOCDIR@/plustek/Plustek\-PARPORT.changes
-.br
-.I http://www.gjaeger.de/scanner/plustek_pp/
 
 .SH "CONTACT AND BUG-REPORTS"
 Please send any information and bug-reports to:
@@ -462,10 +460,6 @@ Mailing-List archive at:
 .br
 .B http://www.sane\-project.org/mailing\-lists.html
 .PP
-or directly from the projects' homepage at:
-.br
-.B http://www.gjaeger.de/scanner/plustek_pp/
-.PP
 To obtain debug messages from the backend, please set the
 environment-variable
 .I SANE_DEBUG_PLUSTEK_PP
@@ -510,7 +504,7 @@ and without transparency unit.
 * 30bit mode is currently not supported.
 .PP
 * On low end systems under heavy system load the
-driver may lose data, which can result in picture 
+driver may lose data, which can result in picture
 corruption or cause the sensor to hit the scan bed.
 .PP
 * The scanning speed on 600x1200 dpi models is slow.
diff --git a/doc/sane-ricoh.man b/doc/sane-ricoh.man
index 8cb38a2..1452e24 100644
--- a/doc/sane-ricoh.man
+++ b/doc/sane-ricoh.man
@@ -26,8 +26,8 @@ Where
 .I special
 is the path-name for the special device that corresponds to a
 SCSI scanner. The special device name must be a generic SCSI device or a
-symlink to such a device.  The program 
-.IR sane\-find\-scanner 
+symlink to such a device.  The program
+.IR sane\-find\-scanner
 helps to find out the correct device. Under Linux, such a device name
 could be
 .I /dev/sga
@@ -67,13 +67,12 @@ to "/tmp/config:" would result in directories "tmp/config", ".", and
 .B SANE_DEBUG_RICOH
 If the library was compiled with debug support enabled, this
 environment variable controls the debug level for this backend.  Higher
-debug levels increase the verbosity of the output. 
+debug levels increase the verbosity of the output.
 
-Example: 
+Example:
 export SANE_DEBUG_RICOH=4
 
 .SH "SEE ALSO"
 sane(7), sane\-scsi(5)
 .SH AUTHOR
 Feico W. Dillema
-
diff --git a/doc/sane-ricoh2.man b/doc/sane-ricoh2.man
new file mode 100644
index 0000000..86db7c6
--- /dev/null
+++ b/doc/sane-ricoh2.man
@@ -0,0 +1,57 @@
+.TH sane\-ricoh2 5 "28 Sep 2018" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.IX sane\-ricoh2
+.SH NAME
+sane\-ricoh2 \- SANE backend for Ricoh flatbed scanners
+.SH DESCRIPTION
+The
+.B sane\-ricoh2
+library implements a SANE (Scanner Access Now Easy) backend that
+provides access to the following Ricoh flatbed scanners:
+.PP
+.RS
+SG-3100SNw
+.br
+SP-100SU
+.br
+SP-111SU
+.RE
+.PP
+.SH FILES
+.TP
+.I @LIBDIR@/libsane\-ricoh2.a
+The static library implementing this backend.
+.TP
+.I @LIBDIR@/libsane\-ricoh2.so
+The shared library implementing this backend (present on systems that
+support dynamic loading).
+
+.SH OPTIONS
+The options the backend supports can either be selected through command line
+options to programs like scanimage or through GUI elements in programs like
+xscanimage or xsane.
+.PP
+The following options are supported by ricoh2:
+
+.B \-\-mode color|gray
+
+.RS
+Color or grayscale mode.
+.RE
+
+.B \-\-resolution 300|600
+
+.RS
+DPI resolution.
+
+.RE
+.SH ENVIRONMENT
+.TP
+.B SANE_DEBUG_RICOH2
+If the library was compiled with debug support enabled, this
+environment variable controls the debug level for this backend. Higher
+debug levels increase the verbosity of the output.
+
+.SH "SEE ALSO"
+sane(7), sane\-usb(5)
+.SH AUTHOR
+Stanislav Yuzvinsky
diff --git a/doc/sane-rts8891.man b/doc/sane-rts8891.man
index 6424f7a..de0683d 100644
--- a/doc/sane-rts8891.man
+++ b/doc/sane-rts8891.man
@@ -6,19 +6,19 @@ The
 .B sane\-rts8891
 library implements a SANE (Scanner Access Now Easy) backend that
 provides access to scanners based on the rts8891 ASIC.
-.PP 
+.PP
 The scanners that work with this backend are:
-.PP 
+.PP
 .RS
 .ft CR
-.nf 
+.nf
    Vendor Model           status
 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-  \-\-\-\-\-\-\-\-\-\-\-
   Umax Astra 4400       untested
   Umax Astra 4450       untested
   HP scanjet 4000c      good
   HP scanjet 4470c      good
-.fi 
+.fi
 .ft R
 .RE
 
@@ -26,58 +26,58 @@ The options the backend supports can either be selected through
 command line options to programs like scanimage or through GUI
 elements in xscanimage or xsane.
 
-.br 
+.br
 If you have any strange behavior, please report to the backend
 maintainer or to the SANE mailing list.
 
-Valid command line options and their syntax can be listed by using 
+Valid command line options and their syntax can be listed by using
 .RS
 scanimage \-\-help \-d rts8891
 .RE
 
-.TP 
+.TP
 .B Scan Mode Options
 
-.TP 
+.TP
 .B \-\-mode
-selects the basic mode of operation of the scanner valid choices are 
+selects the basic mode of operation of the scanner valid choices are
 .I R Color ,
 .I Gray
 and
 .I Lineart
-The default mode is Color. The Lineart mode is black and white only (1 bit). 
+The default mode is Color. The Lineart mode is black and white only (1 bit).
 Grayscale will produce 256 levels of gray (8 bits). Color mode allows for over
 16 million different colors produced from 24 bits of color information.
 
-.TP 
+.TP
 .B \-\-resolution
-selects the resolution for a scan. The horizontal and vertical resolutions are set 
+selects the resolution for a scan. The horizontal and vertical resolutions are set
 by the value of this option. The scanner is capable of the following resolutions for the specified option value:
-.PP 
+.PP
 .RS
 .ft CR
-.nf 
-  Value   Hor. Resolution  Vert. Resolution 
+.nf
+  Value   Hor. Resolution  Vert. Resolution
   \-\-\-\-\-   \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-  \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
   75      75dpi            75dpi
-  150     150dpi           150dpi 
-  300     300dpi           300dpi 
-  600     600dpi           600dpi 
+  150     150dpi           150dpi
+  300     300dpi           300dpi
+  600     600dpi           600dpi
   1200    1200dpi          1200dpi
-.fi 
+.fi
 .ft R
 .RE
 
-.TP 
+.TP
 .B \-\-preview
 requests a preview scan. The resolution used for that scan is 75 dpi
-and the scan area and the scan mode are as specified through their options, 
+and the scan area and the scan mode are as specified through their options,
 or the default if not specified. The default value for preview mode is "no".
 
-.TP 
+.TP
 .B \-\-threshold
 selects the  minimum\-brightness to get a white point. The threshold is only used with Lineart mode scans.
-It is specified as a percentage in the range 0..100% (in steps of 1).  
+It is specified as a percentage in the range 0..100% (in steps of 1).
 The default value of the threshold option is 50.
 
 
@@ -87,11 +87,11 @@ The configuration file
 contains the usb device ids of supported scanners (eg usb 0x043d 0x007c) and scanner configuration options.
 Empty lines and lines starting with a hash mark (#) are
 ignored.
-.PP 
+.PP
 The options supported are
 .B allowsharing
 ,
-.B modelnumber 
+.B modelnumber
 .
 
 Option
@@ -103,27 +103,27 @@ enables or not the sharing of the scanner between multiple frontends at the same
 is used to force the reported model by the backend and is only useful in the case of a scanner which NVRAM has been erased.
 .RS
 .ft CR
-.nf 
+.nf
 0 to report a HP4470c.
 1 to report a HP4400c.
 2 to report an Astra 4400.
-.fi 
+.fi
 .ft R
 .RE
 
-.PP 
+.PP
 .SH "FILES"
-.TP 
+.TP
 .I @LIBDIR@/libsane\-rts8891.a
 The static library implementing this backend.
-.TP 
+.TP
 .I @LIBDIR@/libsane\-rts8891.so
 The shared library implementing this backend (present on systems that
 support dynamic loading).
 
 
 .SH "ENVIRONMENT"
-.TP 
+.TP
 .B SANE_DEBUG_RTS8891 SANE_DEBUG_RTS8891_LOW SANE_DEBUG_RTS88XX_LIB
 If the library was compiled with debug support enabled, these
 environment variables controls the debug level for this backend. E.g.,
@@ -139,7 +139,7 @@ at the same time (allowsharing option) may not work on some USB controllers.
 .PP
 XPA is no (yet) supported.
 .SH "BUGS"
-.br 
+.br
 No bugs currently known.
 
 
@@ -148,11 +148,11 @@ sane\-scsi(5), scanimage(1), xscanimage(1), xsane(1), sane(7)
 
 
 .SH "AUTHOR"
-.TP 
+.TP
 This backend has been developed by St\['e]phane Voltz.
 .I http://stef.dev.free.fr/sane/rts8891
 .SH "CREDITS"
-.TP 
+.TP
 Many thanks go to:
 Laurent Fournier who donated me a HP4470c.
 Vladimir Sysoev and "TheUnruly Squash" for the time they spent recording
diff --git a/doc/sane-s9036.man b/doc/sane-s9036.man
index fe194b6..468b44e 100644
--- a/doc/sane-s9036.man
+++ b/doc/sane-s9036.man
@@ -19,8 +19,8 @@ Where
 .I special
 is the path-name for the special device that corresponds to a
 SCSI scanner. The special device name must be a generic SCSI device or a
-symlink to such a device.  The program 
-.IR sane\-find\-scanner 
+symlink to such a device.  The program
+.IR sane\-find\-scanner
 helps to find out the correct device. Under Linux, such a device name
 could be
 .I /dev/sga
@@ -60,9 +60,9 @@ to "/tmp/config:" would result in directories "tmp/config", ".", and
 .B SANE_DEBUG_S9036
 If the library was compiled with debug support enabled, this
 environment variable controls the debug level for this backend.  Higher
-debug levels increase the verbosity of the output. 
+debug levels increase the verbosity of the output.
 
-Example: 
+Example:
 export SANE_DEBUG_S9036=4
 
 .SH "SEE ALSO"
diff --git a/doc/sane-sceptre.man b/doc/sane-sceptre.man
index 9c34413..b60da27 100644
--- a/doc/sane-sceptre.man
+++ b/doc/sane-sceptre.man
@@ -29,7 +29,7 @@ The make of this scanner is KINPO, so other scanners from that manufacturer may
 The options the backend supports can either be selected through command line
 options to programs like scanimage or through GUI elements in xscanimage or xsane.
 
-Valid command line options and their syntax can be listed by using 
+Valid command line options and their syntax can be listed by using
 .RS
 scanimage \-\-help \-d sceptre
 .RE
@@ -38,9 +38,9 @@ scanimage \-\-help \-d sceptre
 .B Scan Mode
 
 .TP
-.B \-\-mode 
-selects the basic mode of operation of the scanner valid choices are 
-.I Lineart, Halftone, Gray and Color. 
+.B \-\-mode
+selects the basic mode of operation of the scanner valid choices are
+.I Lineart, Halftone, Gray and Color.
 The Lineart and Halftone mode are black and white only (1 bit). Gray
 will produce 256 levels of gray (8 bits). Color will produce a 24 bits
 color image. The scanner supports 30 bits internally but it only
@@ -56,7 +56,7 @@ resolutions between 50 and 1200.
 selects the pattern mode that is used in Halftone mode. Valid options
 are 1, 2, 3 and 4.
 
-.TP 
+.TP
 .B \-\-gamma\-correction
 controls the scanner internal gamma correction. Valid options are
 "Default", "User defined", "High density printing" "Low density
@@ -67,18 +67,18 @@ printing" and "High contrast printing".
 (color mode only) allows the user to specify a gamma table (see the
 next 3 parameters).
 
-.TP 
-.B \-\-red\-gamma\-table 
+.TP
+.B \-\-red\-gamma\-table
 (color mode only) can be used to download a user defined
 gamma table for the red channel. The table must be 256 bytes long.
 
-.TP 
-.B \-\-green\-gamma\-table 
+.TP
+.B \-\-green\-gamma\-table
 (color mode only) can be used to download a user defined
 gamma table for the green channel. The table must be 256 bytes long.
 
 .TP
-.B \-\-blue\-gamma\-table 
+.B \-\-blue\-gamma\-table
 (color mode only) can be used to download a user defined gamma table
 for the blue channel. The table must be 256 bytes long.
 
@@ -87,7 +87,7 @@ for the blue channel. The table must be 256 bytes long.
 sets the threshold for black and white pixels in lineart
 mode. Possible values are from 0 (darker) to 255 (lighter).
 
-.TP 
+.TP
 .B \-\-preview
 requests a preview scan. The resolution used for that scan is 30 dpi
 and the scan area is the maximum allowed. The scan mode is user
@@ -97,7 +97,7 @@ selected. The default is "no".
 .B The geometry options
 
 .TP
-.B \-l \-t \-x \-y 
+.B \-l \-t \-x \-y
 control the scan area: \-l sets the top left x coordinate, \-t the top
 left y coordinate, \-x selects the width and \-y the height of the scan
 area. All parameters are specified in millimeters by default.
diff --git a/doc/sane-scsi.man b/doc/sane-scsi.man
index bcb7d77..5a27555 100644
--- a/doc/sane-scsi.man
+++ b/doc/sane-scsi.man
@@ -21,9 +21,9 @@ to the generic SCSI device that the scanner is connected to.  In this
 case, the configuration file simply lists the line
 .BR /dev/scanner .
 For a detailed description of each backend's configuration file,
-please refer to the relevant backend manual page (e.g., 
+please refer to the relevant backend manual page (e.g.,
 .BR sane\-epson (5)
-for Epson scanners, 
+for Epson scanners,
 .BR sane\-hp (5)
 for HP scanners, etc.).
 .PP
@@ -65,7 +65,7 @@ will be probed by the backend one by one and registered if the backend thinks
 it is a compatible device.  For example, the line
 .PP
 .RS
-scsi MUSTEK MFS\-06000CX Scanner 0 00 03 00 
+scsi MUSTEK MFS\-06000CX Scanner 0 00 03 00
 .RE
 .PP
 would attach the Mustek SCSI scanner with the following /proc/scsi/scsi entry:
@@ -84,7 +84,7 @@ Usually it's sufficient to use vendor and model strings only or even only the
 vendor string. The following example
 .PP
 .RS
-scsi MUSTEK * * * * * * 
+scsi MUSTEK * * * * * *
 .RE
 .PP
 would have the effect that all SCSI devices in the system with a
@@ -188,10 +188,10 @@ version 2.2.7 on. If the new SG driver is available some backends
 buffers. If a backend does not automatically request a larger scsi buffer, set
 the environment variable
 .B SANE_SG_BUFFERSIZE
-to the desired buffer size in bytes. It is not recommended to use more 
-than 1 MB, because for large values the probability increases that the 
-SG driver cannot allocate the necessary buffer(s). For ISA cards, even 
-1 MB might be a too large value. For a detailed discussion of memory 
+to the desired buffer size in bytes. It is not recommended to use more
+than 1 MB, because for large values the probability increases that the
+SG driver cannot allocate the necessary buffer(s). For ISA cards, even
+1 MB might be a too large value. For a detailed discussion of memory
 issues of the SG driver, see http://www.torque.net/sg.
 .PP
 For Linux kernels before version 2.2.7 the size of the buffer is only 32KB.
@@ -266,7 +266,7 @@ therefore while a scan is in progress, the system becomes almost unusable.
 You may change the values of the USLEEP macros in drivers/scsi/g_NCR5380.c.
 Some documentation is in this file and NCR5380.c.
 .TP
-NCR/Symbios 810 
+NCR/Symbios 810
 For some scanners it may be necessary to disable disconnect/reconnect. To
 achieve this use the option ncr53c8xx="disc:n". Some people reported that
 their scanner only worked with the 53c7,8xx driver, not the ncr53c8xx. Try
@@ -315,7 +315,7 @@ of 255 also prints kernel messages from the SCSI subsystem (where available).
 Smaller levels reduce verbosity.
 .TP
 .B SANE_SCSICMD_TIMEOUT
-sets the timeout value for SCSI commands in seconds. Overriding the default 
+sets the timeout value for SCSI commands in seconds. Overriding the default
 value of 120 seconds should only be necessary for very slow scanners.
 
 .SH "SEE ALSO"
diff --git a/doc/sane-sharp.man b/doc/sane-sharp.man
index f089538..b4453ee 100644
--- a/doc/sane-sharp.man
+++ b/doc/sane-sharp.man
@@ -9,7 +9,7 @@ library implements a SANE (Scanner Access Now Easy) backend that
 provides access to Sharp SCSI scanners.  This backend should be
 considered
 .B beta-quality
-software!  In the current state it is known to work with JX-610 and JX-250 
+software!  In the current state it is known to work with JX-610 and JX-250
 scanners. It is prepared for usage with the JX-330 series scanners,
 but we are not able to test it with these devices.
 .PP
@@ -63,18 +63,18 @@ for example.  See sane\-scsi(5) for details.
 .SH SCAN OPTIONS
 
 .B Scan Mode
-(parameter 
+(parameter
 .B \-\-mode
-for scanimage). Possible settings: 
+for scanimage). Possible settings:
 .RS
 .B Lineart
-(1 bit black & white scans), 
+(1 bit black & white scans),
 .br
 .B Gray
 (8 bit gray scale scans),
 .br
 .B Lineart Color
-(bi-level color scans), 
+(bi-level color scans),
 .br
 .B Color
 (8 bit RGB scans).
@@ -91,11 +91,11 @@ Possible settings:
 .B none
 .br
 .B Dither Bayer
-.br 
+.br
 .B Dither Spiral
 .br
 .B Dither Dispersed
-.br 
+.br
 .B Error Diffusion
 .RE
 The default value is
@@ -114,12 +114,12 @@ feeder or a transparency adapter is installed. Possible settings:
 .B Transparency Adapter
 .RE
 If an ADF or a transparency adapter is installed, using it is the
-default selection. 
+default selection.
 
 .B Custom Gamma
-(parameter 
+(parameter
 .B \-\-custom\-gamma
-for scanimage). This option determines whether a builtin or a custom 
+for scanimage). This option determines whether a builtin or a custom
 gamma-table is used. Possible settings:
 .RS
 .B yes
@@ -130,11 +130,11 @@ enables a built gamma table
 .RE
 
 .B Gamma
-(parameter 
+(parameter
 .B \-\-Gamma
-for scanimage). This option is only available, if 
+for scanimage). This option is only available, if
 .B Custom Gamma
-is set to 
+is set to
 .B no.
 Possible values:
 .RS
@@ -142,32 +142,32 @@ Possible values:
 .br
 .B 2.2
 .RE
-The default value is 2.2. (The JX-250 and JX-350 have no built in gamma 
-correction; for these scanner, a gamma table is downloaded to the scanner 
+The default value is 2.2. (The JX-250 and JX-350 have no built in gamma
+correction; for these scanner, a gamma table is downloaded to the scanner
 by the backend.)
 
 .B Gamma Table
-(parameter 
+(parameter
 .B \-\-gamma\-table
-for scanimage). Allowed values: 0..255; 256 numbers must be defined. 
-The default values are 0, 1, 2, .. 255 (i.e., gamma == 1). This table 
+for scanimage). Allowed values: 0..255; 256 numbers must be defined.
+The default values are 0, 1, 2, .. 255 (i.e., gamma == 1). This table
 is only used for gray scale scans.
 
 .B Red Gamma Table
-(parameter 
-.B \-\-red\-gamma\-table 
+(parameter
+.B \-\-red\-gamma\-table
 for scanimage). Allowed values: 0..255; 256 numbers must be defined.
 The default values are 0, 1, 2, .. 255 (i.e., gamma == 1).
 
 .B Green Gamma Table
-(parameter 
-.B \-\-green\-gamma\-table 
+(parameter
+.B \-\-green\-gamma\-table
 for scanimage). Allowed values: 0..255; 256 numbers must be defined.
 The default values are 0, 1, 2, .. 255 (i.e., gamma == 1).
 
 .B Blue Gamma Table
-(parameter 
-.B \-\-blue\-gamma\-table 
+(parameter
+.B \-\-blue\-gamma\-table
 for scanimage). Allowed values: 0..255; 256 numbers must be defined.
 The default values are 0, 1, 2, .. 255 (i.e., gamma == 1).
 
@@ -177,7 +177,7 @@ in pixel per inch (parameter
 for scanimage). Selects the resolution of the scanned image. Allowed values:
 .RS
 .B 30..600
-(JX-330, JX-350 and JX-610) resp. 
+(JX-330, JX-350 and JX-610) resp.
 .B 30..400
 (JX-250)
 .RE
@@ -203,19 +203,19 @@ in order to see the allowed parameter values for the scan window.
 The scan window parameters are:
 
 .RS
-Top-left x position of scan area (parameter 
+Top-left x position of scan area (parameter
 .B \-l
 for scanimage);
 .br
-Top-left y position of scan area (parameter 
+Top-left y position of scan area (parameter
 .B \-t
 for scanimage);
 .br
-bottom right x position of scan area (parameter 
+bottom right x position of scan area (parameter
 .B \-x
 for scanimage);
 .br
-bottom right y position of scan area (parameter 
+bottom right y position of scan area (parameter
 .B \-y
 for scanimage);
 .RE
@@ -223,7 +223,7 @@ for scanimage);
 .B Edge emphasis
 (parameter
 .B \-\-Edge emphasis
-for scanimage). This option is not available for the JX-250 and the JX-350. 
+for scanimage). This option is not available for the JX-250 and the JX-350.
 Possible settings:
 .RS
 .B None
@@ -234,59 +234,59 @@ Possible settings:
 .br
 .B Blur
 .RE
-The default value is 
+The default value is
 .B None.
 
 .B Threshold
-(parameter 
+(parameter
 .B \-\-threshold
 for scanimage). Sets the threshold for black and white pixels in lineart
 mode. Possible values:
 .RS
 .B 1..255
 .RE
-The default value is 
+The default value is
 .B 128.
 This option is only available in scan mode lineart.
 
 .B Threshold Red
-(parameter 
+(parameter
 .B \-\-threshold-red
 for scanimage). Sets the threshold for the red component of a pixel in
 in lineart color scan mode. Possible values:
 .RS
 .B 1..255
 .RE
-The default value is 
+The default value is
 .B 128.
 This option is only available in scan mode color lineart.
 
 .B Threshold Green
-(parameter 
+(parameter
 .B \-\-threshold-green
 for scanimage). Sets the threshold for the green component of a pixel in
 in lineart color scan mode. Possible values:
 .RS
 .B 1..255
 .RE
-The default value is 
+The default value is
 .B 128.
 This option is only available in scan mode color lineart.
 
 .B Threshold Blue
-(parameter 
+(parameter
 .B \-\-threshold-blue
 for scanimage). Sets the threshold for the blue component of a pixel in
 in lineart color scan mode. Possible values:
 .RS
 .B 1..255
 .RE
-The default value is 
+The default value is
 .B 128.
 This option is only available in scan mode color lineart.
 
 .B Light Color
-(parameter 
+(parameter
 .B \-\-LightColor
 for scanimage). Sets the color of the light source. Possible values:
 .RS
@@ -298,7 +298,7 @@ for scanimage). Sets the color of the light source. Possible values:
 .br
 .B blue
 .RE
-The default value is 
+The default value is
 .B white.
 This option is only available in scan modes lineart color and color.
 
@@ -310,75 +310,75 @@ be opened and closed, even if the jammed paper can be removed without opening
 the maintenance cover. Otherwise, the error condition cannot be cleared.
 
 .SH CONFIGURATION
-The contents of the 
+The contents of the
 .I sharp.conf
-file is a list of options and device names that correspond to Sharp 
+file is a list of options and device names that correspond to Sharp
 scanners. Empty lines and lines beginning with a hash mark (#) are
 ignored. See sane\-scsi(5) for details about device names.
 .PP
 Lines setting an option start with the key word
 .B option,
 followed by the option's name and the option's value. At present, three
-options are defined: 
-.B buffers, buffersize, 
+options are defined:
+.B buffers, buffersize,
 and
-.B readqueue. 
+.B readqueue.
 .PP
-Options defined at the start of 
+Options defined at the start of
 .I sharp.conf
 apply to all devices; options defined after a
 device name apply to this device.
 .PP
-The options 
+The options
 .B buffers
 and
 .B
 readqueue
 are only significant if the backend has been compiled
-so that for each scan a second process is forked (switch 
+so that for each scan a second process is forked (switch
 .B USE_FORK
-in 
+in
 .I sharp.c
 ). This process reads the
 scan data from the scanner and writes this data into a block of shared memory.
-The parent process reads the data from this memory block and delivers it 
-to the frontend. The options control the size and usage of this shared 
+The parent process reads the data from this memory block and delivers it
+to the frontend. The options control the size and usage of this shared
 memory block.
 .PP
 .B option buffers
-defines the number of buffers used. The smallest number allowed is 2. 
+defines the number of buffers used. The smallest number allowed is 2.
 .PP
 .B option buffersize
-defines the size of one buffer. Since each buffer is filled with a 
+defines the size of one buffer. Since each buffer is filled with a
 single read command sent to the scanner, its size is limited automatically
 to the size allowed by the operating system or by the Sane SCSI library
 for SCSI read commands. A buffer size of 128 kB or 256 kB is recommended
 for scan resolutions of 300 dpi and above.
 .PP
-.B option readqueue 
+.B option readqueue
 defines how many read commands to be sent to the scanner
-are queued. At present, the Sane SCSI library supports queued read 
-commands only for for Linux. For other operating systems, 
+are queued. At present, the Sane SCSI library supports queued read
+commands only for for Linux. For other operating systems,
 .B option readqueue
-should be set to 0. For Linux, 
+should be set to 0. For Linux,
 .B option readqueue
 should be set to 2. Larger values than 2 for
 .B option readqueue
 are not reasonable in most cases.
 .B option buffers
-should be greater than 
+should be greater than
 .B option readqueue.
 
 .SH Performance Considerations
 This section focuses on the problem of stops of the scanner's carriage
-during a scan. Carriage stops happen mainly with the JX-250. This scanner 
-has obviously only a small internal buffer compared to its speed. That 
-means that the backend must read the data as fast as possible from the 
-scanner in order to avoid carriage stops. 
+during a scan. Carriage stops happen mainly with the JX-250. This scanner
+has obviously only a small internal buffer compared to its speed. That
+means that the backend must read the data as fast as possible from the
+scanner in order to avoid carriage stops.
 .PP
-Even the JX-250 needs only less than 10 seconds for a 400 dpi A4 gray 
-scale scan, which results in a data transfer rate of more than 1.6 MB 
-per second. This means that the data produced by the scanner must be 
+Even the JX-250 needs only less than 10 seconds for a 400 dpi A4 gray
+scale scan, which results in a data transfer rate of more than 1.6 MB
+per second. This means that the data produced by the scanner must be
 processed fairly fast. Due to the small internal buffer of the JX-250,
 the backend must issue a read request for the next data block as soon
 as possible after reading a block of data in order to avoid carriage
@@ -395,25 +395,25 @@ Stops of the carriage can be caused by the following reasons:
 .PP
 .RE
 Too much "traffic" on the SCSI bus: This happens for example, if hard disks
-are connected to the same SCSI bus as the scanner, and when data transfer 
+are connected to the same SCSI bus as the scanner, and when data transfer
 from/to these hard disks requires a considerable part of the SCSI bandwidth
-during a scan. If this is the case, you should consider to connect the 
+during a scan. If this is the case, you should consider to connect the
 scanner to a separate SCSI adapter.
 .PP
 Slow responses by the backend to the scanner: Unfortunately,
 Unix-like operating systems generally have no real time capabilities.
 Thus there is no guarantee that the backend is under any circumstances
 able to communicate with the scanner as fast as required. To minimize this
-problem, the backend should be compiled so that a separate reader process 
+problem, the backend should be compiled so that a separate reader process
 is forked: Make sure that
 .B USE_FORK
-is defined when you compile 
+is defined when you compile
 .I sharp.c.
 If slow responses of the backend remain to be problem, you could try to
-reduce the load of the system. Even while the backend and the reader 
-process need only a minor amount of processor time, other running 
+reduce the load of the system. Even while the backend and the reader
+process need only a minor amount of processor time, other running
 processes can cause an increase in the time delay between two time
-slices given to the reader process. On slower systems, such an 
+slices given to the reader process. On slower systems, such an
 increased delay can be enough to cause a carriage stop with the JX-250.
 For Linux, the usage of the SG driver version 2.1.36 or above is
 recommended, because it supports, in combination with
@@ -424,20 +424,20 @@ This queueing implementation, combined with a buffer size of at least
 Slow processing of the scan data: An example for this situation is
 the access to the scanner via a 10 MBit Ethernet, which is definitely
 too slow to transfer the scan data as fast as they are produced by the
-scanner. If you have enough memory available, you can increase 
+scanner. If you have enough memory available, you can increase
 .B option buffers,
-so that an entire image can be stored in these buffers. 
+so that an entire image can be stored in these buffers.
 .PP
 In order to see, if the backend is too slow or if the further processing
 of the data is too slow, set the environment variable
 .B SANE_DEBUG_SHARP
 to 1. When a scan is finished, the backend writes the line "buffer full
-conditions: 
+conditions:
 .I nn"
 to stderr. If
 .I nn
 is zero, carriage stops are caused by too slow responses of the backend
-or too much "traffic" on the SCSI bus. If 
+or too much "traffic" on the SCSI bus. If
 .I nn
 is greater than zero, the backend had to wait
 .I nn
@@ -469,21 +469,21 @@ levels reduce verbosity.
 1. ADF Mode
 .RS
 After several ADF scans, the scanner moves the carriage back to the idle
-position and back to ADF scan position, before a scan starts. We do not 
-know, if this is a problem of the scanner, or if this is a bug of the 
+position and back to ADF scan position, before a scan starts. We do not
+know, if this is a problem of the scanner, or if this is a bug of the
 backend. At present, the scanner must power off and on to stop this
 annoying behaviour.
 .RE
 
 2. Threshold level does not work (only JX-610)
 .PP
-3. The maximum resolution is limited to 600 dpi(JX-610 supported 
+3. The maximum resolution is limited to 600 dpi(JX-610 supported
 to 1200 dpi) resp. 400 dpi (JX-250)
 .PP
 4. If the JX250 is used with an ADF, the following situation can occur: After
 several scans, the scanner moves, after loading a new sheet of paper, the
 carriage to the idle position, and then back to the position used for ADF
-scans. This happens for 
+scans. This happens for
 .I
 every
 scan, in contrast to the calibration, which is done after 10 scans. (For the
diff --git a/doc/sane-sm3600.man b/doc/sane-sm3600.man
index 8f58622..7f5c9a4 100644
--- a/doc/sane-sm3600.man
+++ b/doc/sane-sm3600.man
@@ -8,7 +8,7 @@ The
 library implements a SANE (Scanner Access Now Easy) backend that
 provides access to some Microtek scanners with the Toshiba M011 custom
 USB chip.  This backend should be considered alpha.
-.PP 
+.PP
 There are also backends for Microtek scanners with SCSI command set.
 Refer to sane\-microtek(5) and sane\-microtek2(5) for details.
 .PP
@@ -79,4 +79,3 @@ Marian Eichholz (eichholz@computer.org)
 .br
 Glenn Ramsey (glenn@componic.com)
 .br
-
diff --git a/doc/sane-sm3840.man b/doc/sane-sm3840.man
index 96959b6..e6af3a1 100644
--- a/doc/sane-sm3840.man
+++ b/doc/sane-sm3840.man
@@ -8,7 +8,7 @@ The
 library implements a SANE (Scanner Access Now Easy) backend that
 provides access to some Microtek scanners with the SCAN08
 USB chip.
-.PP 
+.PP
 There exist backends for Microtek scanners with SCSI command set.
 Refer to sane\-microtek(5) and sane\-microtek2(5) for details.
 .PP
@@ -92,4 +92,3 @@ sane\-microtek2(5), sane\-sm3600(5), http://www.ziplabel.com/sm3840
 .br
 Earle F. Philhower III (earle@ziplabel.com)
 .br
-
diff --git a/doc/sane-snapscan.man b/doc/sane-snapscan.man
index 3914868..6e71875 100644
--- a/doc/sane-snapscan.man
+++ b/doc/sane-snapscan.man
@@ -33,8 +33,8 @@ or
 .IR /dev/sge ,
 for example.  See sane\-scsi(5) for details.
 .P
-For USB scanners the devicename must contain the keyword "usb", as in 
-.I /dev/usbscanner 
+For USB scanners the devicename must contain the keyword "usb", as in
+.I /dev/usbscanner
 or
 .IR /dev/usb/scanner0 .
 For scanners that need a firmware upload before scanning add a line starting
@@ -107,5 +107,5 @@ Mikko Tyolajarvi, David Mosberger-Tang, Wolfgang Goeller,
 Petter Reinholdtsen, Gary Plewa, Sebastien Sable, Oliver Schwartz
 and Mikael Magnusson.
 .br
-Man page by Henning Meier-Geinitz (mostly based on the web pages and 
+Man page by Henning Meier-Geinitz (mostly based on the web pages and
 source code).
diff --git a/doc/sane-st400.man b/doc/sane-st400.man
index 9dac97c..affdf72 100644
--- a/doc/sane-st400.man
+++ b/doc/sane-st400.man
@@ -22,7 +22,7 @@ The Siemens ST/Highscan series includes several more models, e.g. the ST300
 and ST600.  If you own one of these scanners, or a scanner other than the
 ones listed above that works with this backend, please let us know by sending
 the scanner's model name, SCSI ID, and firmware revision to
-.IR sane\-devel@lists.alioth.debian.org .
+.IR sane\-devel@alioth-lists.debian.net .
 Have a look at http://www.sane\-project.org/mailing\-lists.html concerning subscription
 to sane\-devel.
 
@@ -139,7 +139,7 @@ me the report.
 .SH "SEE ALSO"
 sane(7), sane\-scsi(5)
 .br
-http://www.informatik.uni-oldenburg.de/~ingo/sane/ 
+http://www.informatik.uni-oldenburg.de/~ingo/sane/
 
 .SH AUTHOR
 
diff --git a/doc/sane-stv680.man b/doc/sane-stv680.man
index 7b63b92..90cdf53 100644
--- a/doc/sane-stv680.man
+++ b/doc/sane-stv680.man
@@ -32,7 +32,7 @@ for the exact status of each camera.
 For startup of this backend check that if present the stv680 kernel module is
 removed or disabled.
 .br
-Also before using, enable the backend by editing the /etc/sane.d/dll.conf file, 
+Also before using, enable the backend by editing the /etc/sane.d/dll.conf file,
 change #stv680 to stv680.
 
 For problems with the untested cameras, you
@@ -62,7 +62,7 @@ If you have any success with a camera not listed here, or if you have
 any strange behavior, please report to the backend maintainer or to
 the SANE mailing list.
 
-Valid command line options and their syntax can be listed by using 
+Valid command line options and their syntax can be listed by using
 .RS
 scanimage \-\-help \-d stv680
 .RE
@@ -75,7 +75,7 @@ scanimage \-\-help \-d stv680
 .B \-\-mode
 selects the basic mode of operation of the webcams valid choices.
 
-The read resolution mode is 8 bits, output resolution is 24 bits. 
+The read resolution mode is 8 bits, output resolution is 24 bits.
 Selects the resolution for a scan.
 The camera can do only the resolutions listed.
 .TP
@@ -98,7 +98,7 @@ Bayer unshuffle, color correction, textline with date and time is added
 .TP
 .B \-\-white\-level\-r
 Selects what red radiance level should be
-considered "white", when scanning some sheets by changing the calibration 
+considered "white", when scanning some sheets by changing the calibration
 value loaded into the scanner. Scale \-32 .. 0 .. +32 in steps of 1.
 
 .TP
@@ -173,4 +173,3 @@ STV680 kernel module
 pencam2 program
 .br
 libghoto2 program (camlib stv0680)
-
diff --git a/doc/sane-tamarack.man b/doc/sane-tamarack.man
index 628069c..7084924 100644
--- a/doc/sane-tamarack.man
+++ b/doc/sane-tamarack.man
@@ -28,8 +28,8 @@ Where
 .I special
 is the path-name for the special device that corresponds to a
 SCSI scanner. The special device name must be a generic SCSI device or a
-symlink to such a device.  The program 
-.IR sane\-find\-scanner 
+symlink to such a device.  The program
+.IR sane\-find\-scanner
 helps to find out the correct device. Under Linux, such a device name
 could be
 .I /dev/sga
@@ -69,9 +69,9 @@ to "/tmp/config:" would result in directories "tmp/config", ".", and
 .B SANE_DEBUG_TAMARACK
 If the library was compiled with debug support enabled, this
 environment variable controls the debug level for this backend.  Higher
-debug levels increase the verbosity of the output. 
+debug levels increase the verbosity of the output.
 
-Example: 
+Example:
 export SANE_DEBUG_TAMARACK=4
 
 .SH "SEE ALSO"
diff --git a/doc/sane-teco1.man b/doc/sane-teco1.man
index acb4985..4f4ce85 100644
--- a/doc/sane-teco1.man
+++ b/doc/sane-teco1.man
@@ -20,21 +20,21 @@ The scanners that should work with this backend are:
 .nf
    Vendor Model           TECO model      status
 ----------------------  --------------  -----------
-  Relisys AVEC 2400        VM3520        tested  
+  Relisys AVEC 2400        VM3520        tested
   Relisys AVEC 2412        VM3520+       tested
-  Relisys AVEC 4800        VM4530        untested  
-  Relisys AVEC 4816        VM4530+       untested  
-  Relisys RELI 2400        VM3530        untested  
+  Relisys AVEC 4800        VM4530        untested
+  Relisys AVEC 4816        VM4530+       untested
+  Relisys RELI 2400        VM3530        untested
   Relisys RELI 2412        VM3530+       tested
-  Relisys RELI 2412        VM3530+       untested  
-  Relisys RELI 4816        VM4540        tested  
+  Relisys RELI 2412        VM3530+       untested
+  Relisys RELI 4816        VM4540        tested
   Relisys RELI 4830        VM4542        tested
-  Relisys RELI 9600        VM6530        untested  
-  Relisys RELI 9612        VM6530*       untested  
-  Relisys RELI 9624        VM6530+       untested  
-  Relisys RELI 9630        VM6540        untested  
-  Relisys RELI DS15        VM3440        untested  
-  Relisys RELI DS6         VM3420        untested  
+  Relisys RELI 9600        VM6530        untested
+  Relisys RELI 9612        VM6530*       untested
+  Relisys RELI 9624        VM6530+       untested
+  Relisys RELI 9630        VM6540        untested
+  Relisys RELI DS15        VM3440        untested
+  Relisys RELI DS6         VM3420        untested
   Dextra  DF-600P          VM3510        tested
   Dextra  DF-4830T         VM4542        untested
   Dextra  DF-1200T+        VM3530+       untested
@@ -59,7 +59,7 @@ If you have any success with a scanner not listed here, or if you have
 any strange behavior, please report to the backend maintainer or to
 the SANE mailing list.
 
-Valid command line options and their syntax can be listed by using 
+Valid command line options and their syntax can be listed by using
 .RS
 scanimage \-\-help \-d teco1
 .RE
@@ -69,7 +69,7 @@ scanimage \-\-help \-d teco1
 
 .TP
 .B \-\-mode
-selects the basic mode of operation of the scanner valid choices are 
+selects the basic mode of operation of the scanner valid choices are
 .I Black & White
 ,
 .I Grayscale
@@ -89,7 +89,7 @@ between 1 and 600, in increments of 1.
 .B Geometry options
 
 .TP
-.B \-l \-t \-x \-y 
+.B \-l \-t \-x \-y
 control the scan area: \-l sets the top left x coordinate, \-t the top
 left y coordinate, \-x selects the width and \-y the height of the scan
 area. All parameters are specified in millimeters by default.
@@ -103,24 +103,24 @@ area. All parameters are specified in millimeters by default.
 (color mode only) allows the user to specify a gamma table (see the
 next 3 parameters).
 
-.TP 
-.B \-\-red\-gamma\-table 
+.TP
+.B \-\-red\-gamma\-table
 (color mode only) can be used to download a user defined
 gamma table for the red channel. The table must be 256 bytes long.
 
-.TP 
-.B \-\-green\-gamma\-table 
+.TP
+.B \-\-green\-gamma\-table
 (color mode only) can be used to download a user defined
 gamma table for the green channel. The table must be 256 bytes long.
 
 .TP
-.B \-\-blue\-gamma\-table 
+.B \-\-blue\-gamma\-table
 (color mode only) can be used to download a user defined gamma table
 for the blue channel. The table must be 256 bytes long.
 
 .TP
 .B \-\-dither
-(Black & White only) select the dither mask to use. Possible values are 
+(Black & White only) select the dither mask to use. Possible values are
 .I Line art
 ,
 .I 2x2
@@ -140,7 +140,7 @@ and
 .I 8x8 vertical
 
 
-.TP 
+.TP
 .B \-\-preview
 requests a preview scan. The resolution used for that scan is 22 dpi
 and the scan area is the maximum allowed. The scan mode is user
diff --git a/doc/sane-teco2.man b/doc/sane-teco2.man
index 3abd3b8..4b79960 100644
--- a/doc/sane-teco2.man
+++ b/doc/sane-teco2.man
@@ -45,7 +45,7 @@ Note that the untested scanner will not be directly supported. You
 should contact the author for that.
 
 The TECO VM number can usually be found at the back of the
-scanner. It is also part of the FCC ID. 
+scanner. It is also part of the FCC ID.
 
 The options the backend supports can either be selected through
 command line options to programs like scanimage or through GUI
@@ -56,7 +56,7 @@ If you have any success with a scanner not listed here, or if you have
 any strange behavior, please report to the backend maintainer or to
 the SANE mailing list.
 
-Valid command line options and their syntax can be listed by using 
+Valid command line options and their syntax can be listed by using
 .RS
 scanimage \-\-help \-d teco2
 .RE
@@ -66,7 +66,7 @@ scanimage \-\-help \-d teco2
 
 .TP
 .B \-\-mode
-selects the basic mode of operation of the scanner valid choices are 
+selects the basic mode of operation of the scanner valid choices are
 .I Lineart
 ,
 .I Gray
@@ -84,21 +84,21 @@ between 1 and 600, in increments of 1.
 
 
 Color
-selects the resolution for a scan. The scanner can do only the 
+selects the resolution for a scan. The scanner can do only the
 resolutions listed.
 
-All values with ydpi > 300 (300 x 600) or 600 (600 x 1200) result in 
-a wrong proportion for the scan. The proportion can be adjusted with 
-the following imagemagick command: 
-convert \-geometry (dpi/max_xdpi * 100%)x100% 
-max_xdpi is for the vm3575 constant with 300 dpi      
-e.g. 600dpi adjust with: convert \-geometry 200%x100%  
+All values with ydpi > 300 (300 x 600) or 600 (600 x 1200) result in
+a wrong proportion for the scan. The proportion can be adjusted with
+the following imagemagick command:
+convert \-geometry (dpi/max_xdpi * 100%)x100%
+max_xdpi is for the vm3575 constant with 300 dpi
+e.g. 600dpi adjust with: convert \-geometry 200%x100%
 
 .TP
 .B Geometry options
 
 .TP
-.B \-l \-t \-x \-y 
+.B \-l \-t \-x \-y
 control the scan area: \-l sets the top left x coordinate, \-t the top
 left y coordinate, \-x selects the width and \-y the height of the scan
 area. All parameters are specified in millimeters by default.
@@ -112,25 +112,25 @@ area. All parameters are specified in millimeters by default.
 (color mode only) allows the user to specify a gamma table (see the
 next 3 parameters).
 
-.TP 
-.B \-\-red\-gamma\-table 
+.TP
+.B \-\-red\-gamma\-table
 (color mode only) can be used to download a user defined
 gamma table for the red channel. The table must be 256 bytes long.
 
-.TP 
-.B \-\-green\-gamma\-table 
+.TP
+.B \-\-green\-gamma\-table
 (color mode only) can be used to download a user defined
 gamma table for the green channel. The table must be 256 bytes long.
 
 .TP
-.B \-\-blue\-gamma\-table 
+.B \-\-blue\-gamma\-table
 (color mode only) can be used to download a user defined gamma table
 for the blue channel. The table must be 256 bytes long.
 
 .TP
 .B \-\-white\-level\-r
 (VM3564, VM356A, VM3575 and VM6575 only) Selects what red radiance level should be
-considered "white", when scanning some sheets by changing the calibration 
+considered "white", when scanning some sheets by changing the calibration
 value loaded into the scanner. Scale 0..64 in steps of 1.
 
 .TP
@@ -145,10 +145,10 @@ value loaded into the scanner. Scale 0..64 in steps of 1.
 considered "white", when scanning some sheets by changing the calibration
 value loaded into the scanner. Scale 0..64 in steps of 1.
 
-.TP 
+.TP
 .B \-\-preview
 requests a preview scan. The resolution used for that scan is 50  dpi
-(for VM356A and VM6575 75 dpi) and the scan area is the maximum allowed. 
+(for VM356A and VM6575 75 dpi) and the scan area is the maximum allowed.
 The scan mode is user selected. The default is "no".
 
 
diff --git a/doc/sane-teco3.man b/doc/sane-teco3.man
index a2b041d..8fc6c3c 100644
--- a/doc/sane-teco3.man
+++ b/doc/sane-teco3.man
@@ -31,7 +31,7 @@ The scanners that should work with this backend are:
 .RE
 
 The TECO VM number can usually be found at the back of the
-scanner. It is also part of the FCC ID. 
+scanner. It is also part of the FCC ID.
 
 The options the backend supports can either be selected through
 command line options to programs like scanimage or through GUI
@@ -42,7 +42,7 @@ If you have any success with a scanner not listed here, or if you have
 any strange behavior, please report to the backend maintainer or to
 the SANE mailing list.
 
-Valid command line options and their syntax can be listed by using 
+Valid command line options and their syntax can be listed by using
 .RS
 scanimage \-\-help \-d teco3
 .RE
@@ -52,7 +52,7 @@ scanimage \-\-help \-d teco3
 
 .TP
 .B \-\-mode
-selects the basic mode of operation of the scanner valid choices are 
+selects the basic mode of operation of the scanner valid choices are
 .I Black & White
 ,
 .I Grayscale
@@ -72,7 +72,7 @@ between 1 and 1200, in increments of 1.
 .B Geometry options
 
 .TP
-.B \-l \-t \-x \-y 
+.B \-l \-t \-x \-y
 control the scan area: \-l sets the top left x coordinate, \-t the top
 left y coordinate, \-x selects the width and \-y the height of the scan
 area. All parameters are specified in millimeters by default.
@@ -86,23 +86,23 @@ area. All parameters are specified in millimeters by default.
 (color mode only) allows the user to specify a gamma table (see the
 next 3 parameters).
 
-.TP 
-.B \-\-red\-gamma\-table 
+.TP
+.B \-\-red\-gamma\-table
 (color mode only) can be used to download a user defined
 gamma table for the red channel. The table must be 1024 bytes long.
 
-.TP 
-.B \-\-green\-gamma\-table 
+.TP
+.B \-\-green\-gamma\-table
 (color mode only) can be used to download a user defined
 gamma table for the green channel. The table must be 1024 bytes long.
 
 .TP
-.B \-\-blue\-gamma\-table 
+.B \-\-blue\-gamma\-table
 (color mode only) can be used to download a user defined gamma table
 for the blue channel. The table must be 1024 bytes long.
 
 
-.TP 
+.TP
 .B \-\-preview
 requests a preview scan. The resolution used for that scan is 22 dpi
 and the scan area is the maximum allowed. The scan mode is user
diff --git a/doc/sane-test.man b/doc/sane-test.man
index e582895..08c9f86 100644
--- a/doc/sane-test.man
+++ b/doc/sane-test.man
@@ -15,10 +15,10 @@ The idea is not only to find bugs in frontends but also to show all
 capabilities of SANE.  Therefore
 .B sane\-test
 implements functions and options that are not (or seldom) found in other
-backends. 
+backends.
 .PP
 The backend is commented out in @CONFIGDIR@/dll.conf, so either the comment
-character must be removed or the backend must be called explicitly.  E.g. 
+character must be removed or the backend must be called explicitly.  E.g.
 `scanimage \-d test' or `xscanimage test'.
 
 .SH SCAN MODE OPTIONS
@@ -86,7 +86,7 @@ If option
 is set, the maximum amount of data transferred with each call to sane_read() is
 limited.
 .PP
-Option 
+Option
 .B read\-limit\-size
 sets the limit for option read-limit.  A low limit slows down scanning.  It
 can be used to detect errors in frontend that occur because of wrong
@@ -198,7 +198,7 @@ backend.
 .PP
 
 .SH INT TEST OPTIONS
-There are 6 int test options in total. 
+There are 6 int test options in total.
 .PP
 Option
 .B int
@@ -229,7 +229,7 @@ Option
 constraint.
 
 .SH FIXED TEST OPTIONS
-There are 3 fixed test options in total. 
+There are 3 fixed test options in total.
 .PP
 Option
 .B fixed
@@ -246,7 +246,7 @@ Option
 .PP
 
 .SH STRING TEST OPTIONS
-There are 3 string test options in total. 
+There are 3 string test options in total.
 .PP
 Option
 .B string
@@ -276,7 +276,7 @@ The backend configuration file (see also description of
 below). The initial values of most of the basic SANE options can be configured
 in this file. A template containing all the default values is provided
 together with this backend. One of the more interesting values may be
-.BR number_of_devices . 
+.BR number_of_devices .
 It can be used to check the frontend's ability to show a long list of devices.
 The config values concerning resolution and geometry can be useful to test
 the handling of big file sizes.
@@ -307,13 +307,13 @@ to "/tmp/config:" would result in directories "tmp/config", ".", and
 .B SANE_DEBUG_TEST
 If the library was compiled with debug support enabled, this
 environment variable controls the debug level for this backend.  Higher
-debug levels increase the verbosity of the output. 
+debug levels increase the verbosity of the output.
 
-Example: 
+Example:
 export SANE_DEBUG_TEST=4
 
 .SH "SEE ALSO"
-sane(7), 
+sane(7),
 .IR http://www.meier\-geinitz.de/sane/test\-backend/
 
 
diff --git a/doc/sane-u12.man b/doc/sane-u12.man
index 8b35fdf..680ce0c 100644
--- a/doc/sane-u12.man
+++ b/doc/sane-u12.man
@@ -150,8 +150,6 @@ export SANE_DEBUG_U12=10
 .BR sane\-plustek (5),
 .br
 .I @DOCDIR@/u12/U12.changes
-.br
-.I http://www.gjaeger.de/scanner/u12/
 
 .SH "CONTACT AND BUG-REPORTS"
 Please send any information and bug-reports to:
@@ -164,10 +162,6 @@ Mailing-List archive at:
 .br
 .B http://www.sane\-project.org/mailing\-lists.html
 .PP
-or directly from the projects' homepage at:
-.br
-.B http://www.gjaeger.de/scanner/u12/
-.PP
 To obtain debug messages from the backend, please set the
 environment-variable
 .I SANE_DEBUG_U12
@@ -180,5 +174,5 @@ The value controls the verbosity of the backend.
 .SH "KNOWN BUGS & RESTRICTIONS"
 * The driver is in alpha state, so please don't expect too much!!!
 .PP
-* When using libusb, it might be, that the backend hangs. 
+* When using libusb, it might be, that the backend hangs.
 In that case, reconnect the scanner.
diff --git a/doc/sane-umax.man b/doc/sane-umax.man
index 7dd9382..41b4beb 100644
--- a/doc/sane-umax.man
+++ b/doc/sane-umax.man
@@ -20,12 +20,12 @@ parallel- and USB-scanners are not (and probably will never be) supported!
 
 .SH CONFIGURATION
 
-The configuration file for this backend resides in 
+The configuration file for this backend resides in
 .IR @CONFIGDIR@/umax.conf .
 
 Its contents is a list of device names that correspond to UMAX and UMAX compatible scanners. Empty lines
 and lines starting with a hash mark (#) are ignored. A sample configuration file is
-shown below: 
+shown below:
 
 .nf
  # this is a comment
@@ -44,19 +44,19 @@ shown below:
  option calibration\-width\-offset \-1
  option calibration\-bytes\-pixel \-1
  option exposure\-time\-rgb\-bind \-1
- option invert\-shading\-data \-1 
+ option invert\-shading\-data \-1
  option lamp\-control\-available 0
  option gamma\-lsb\-padded 0
- /dev/sge 
-\ 
- #scsi Vendor Model Type Bus Channel ID LUN 
+ /dev/sge
+\
+ #scsi Vendor Model Type Bus Channel ID LUN
  # The following scanner supports lamp control
  option lamp\-control\-available 1
- scsi UMAX * Scanner * * * * * 
-\ 
+ scsi UMAX * Scanner * * * * *
+\
  # scanner on /dev/scanner does not support lamp control
  option lamp\-control\-available 0
- /dev/scanner 
+ /dev/scanner
 .fi
 
 .TP
@@ -194,7 +194,7 @@ command queueing you can try to set this value to 1.
 .PP
 The special device name must be a generic SCSI device or a symlink to such a device.
 To find out to which device your scanner is assigned and how you have to set the
-permissions of that device, have a look at sane\-scsi. 
+permissions of that device, have a look at sane\-scsi.
 
 .SH SCSI ADAPTER TIPS
 
@@ -203,7 +203,7 @@ well by Linux (I suggest not to use it), the PCI-SCSI-adapters that come with so
 Umax-scanners are not supported at all (as far as I know). On other platforms these
 SCSI-adapters are not supported. So you typically need to purchase another SCSI-adapter
 that is supported by your platform. See the relevant hardware FAQs and HOWTOs for your
-platform for more information. 
+platform for more information.
 
 The UMAX-scanners do block the scsi-bus for a few seconds while scanning. It is not
 necessary to connect the scanner to its own SCSI-adapter. But if you need short
@@ -240,7 +240,7 @@ SANE_DEBUG_UMAX values
 .ft CR
 .nf
 Number  Remark
-\ 
+\
  0       print important errors (printed each time)
  1       print errors
  2       print sense
diff --git a/doc/sane-umax1220u.man b/doc/sane-umax1220u.man
index e90a4e9..a83db59 100644
--- a/doc/sane-umax1220u.man
+++ b/doc/sane-umax1220u.man
@@ -18,7 +18,7 @@ For more information on this backend, please visit
 This backend is also able to drive the UMAX Astra 1600U/2000U/2100U.  The
 2100U is confirmed to work. For the other scanners no reports have been received
 yet. Please contact us and tell us if your scanner works
-(sane\-devel@lists.alioth.debian.org).
+(sane\-devel@alioth-lists.debian.net).
 
 .SH CONFIGURATION
 
@@ -27,13 +27,13 @@ Usually, no manual configuration is necessary. The configuration file for this b
 
 Its contents is a list of device names that correspond to UMAX Astra scanners.
 Empty lines and lines starting with a hash mark (#) are ignored. A sample
-configuration file is shown below: 
+configuration file is shown below:
 
 .nf
  #usb vendor product
  usb 0x1606 0x0010
  # Device list for non-linux systems
- /dev/scanner 
+ /dev/scanner
  /dev/usb/scanner0
 .fi
 
@@ -66,7 +66,7 @@ SANE_DEBUG_UMAX1220U values
 .ft CR
 .nf
 Number  Remark
-\ 
+\
  1       print failures
  2       print information
  3       print high-level function calls
@@ -106,7 +106,7 @@ sane(7), sane\-usb(5)
 Marcio Luis Teixeira <marciot@users.sourceforge.net>
 
 .SH EMAIL-CONTACT
-sane\-devel@lists.alioth.debian.org
+sane\-devel@alioth-lists.debian.net
 
 .SH REPORTING BUGS
 
diff --git a/doc/sane-umax_pp.man b/doc/sane-umax_pp.man
index 09e6ea0..40972ce 100644
--- a/doc/sane-umax_pp.man
+++ b/doc/sane-umax_pp.man
@@ -8,52 +8,52 @@ The
 library implements a SANE (Scanner Access Now Easy) backend that
 provides access to Umax parallel port flatbed scanners.  The
 following scanners work with this backend:
-.PP 
+.PP
 .RS
-Model:                
-.br 
-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- 
-.br 
-Astra 610P         
-.br 
-Astra 1220P         
-.br 
-HP3200C            
-.br 
-Astra 1600P       
-.br 
-Astra 2000P      
-.br 
+Model:
+.br
+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+.br
+Astra 610P
+.br
+Astra 1220P
+.br
+HP3200C
+.br
+Astra 1600P
+.br
+Astra 2000P
+.br
 Genius ColorPage-Life Pro
-.br 
+.br
 .RE
-.PP 
+.PP
 This backend handles 75x75, 150x150, 300x300, 600x600 and 600x1200 for 1220P/1600P/2000P
-dpi scan resolutions, and 75x75, 150x150, 300x300 and 300x600 for 610P. In color and gray 
+dpi scan resolutions, and 75x75, 150x150, 300x300 and 300x600 for 610P. In color and gray
 levels, there is a software lineart mode.
-.PP 
-The new generation models share a newer version of the 610P ASIC embedded in an EPAT chip. 
+.PP
+The new generation models share a newer version of the 610P ASIC embedded in an EPAT chip.
 Only parts such as CCD and ADC change from
 one to another. They even all reports being UMAX Astra 1220P via IEEE1284.
 There isn't software way to recognize them properly. Under windows, model is
-set by the driver installed, regardless of the hardware. 
-.PP 
-.TP 
+set by the driver installed, regardless of the hardware.
+.PP
+.TP
 .B EPP/ECP MODES ONLY
-The current version of the backend uses only EPP or ECP mode to communicate 
-with the scanner. PS/2 mode isn't implemented. The 610P only use SPP. It is 
-recommended that you set your parallel port to EPP in BIOS with the current 
-version of this 
+The current version of the backend uses only EPP or ECP mode to communicate
+with the scanner. PS/2 mode isn't implemented. The 610P only use SPP. It is
+recommended that you set your parallel port to EPP in BIOS with the current
+version of this
 backend. You can leave it to ECP or ECP+EPP, but in this case you may not use
 ppdev but only direct hardware access if you have to use ECP.  ECPEPP will only
 work if you use a 2.4 or 2.6 kernel with ppdev character device support.
-.PP 
-This backend does support parport sharing only 
-.I 
+.PP
+This backend does support parport sharing only
+.I
 if you have a kernel with ppdev support.
-.I 
-.PP 
-Note that if you don't use the ppdev character device, the backend 
+.I
+.PP
+Note that if you don't use the ppdev character device, the backend
 needs to run as root. To allow user access to the scanner
 run the backend through the network interface (See saned(8) and sane\-net(5)).
 A more relaxed solution (security wise) is to add suid bit to the frontend
@@ -63,13 +63,13 @@ access to IO ports, which lessen risks when being root.
 
 .SH "DEVICE NAMES"
 This backend expects device names of the form:
-.PP 
+.PP
 .RS
 .I port value
 .RE
-.PP 
+.PP
 Where
-\fBvalue\fR is : 
+\fBvalue\fR is :
 
 .RS
 .TP
@@ -95,40 +95,40 @@ have to use /dev/parport1, /dev/parport2, ...
 0x378
 does direct hardware access on the given
 address. Usual values are 0x378, 0x278, 0x3BC
-In this case, you have to run the scanner as 
+In this case, you have to run the scanner as
 root (*BSD and linux), or with 'IOPL=yes' on
 OS/2
-.PP 
+.PP
 .RE
 \fBNOTE:\fR in all cases, you must have sufficient privileges
 to get access to the chosen device or address. Depending on the
 security settings, devices may not be available for all users.
-You have to change permissions on the dev/ppi* or /dev/parport* devices. 
-.PP 
+You have to change permissions on the dev/ppi* or /dev/parport* devices.
+.PP
 .RE
 You can rename any device using the
-.PP 
+.PP
 .RS
 .I name devname
-.br 
+.br
 .I model model
-.br 
+.br
 .I vendor vendor
 .RE
-.PP 
-options. These options apply to the last port option. 
+.PP
+options. These options apply to the last port option.
 
 .SH "CONFIGURATION"
 Please make sure to edit umax_pp.conf
 .B before
 you use the backend.
-.PP 
+.PP
 The contents of the
 .B umax_pp.conf
 file is a list of options and device names that correspond to Umax
 scanners.  Empty lines and lines starting with a hash mark (#) are
 ignored.
-.PP 
+.PP
 The eight options supported are
 .BR red\-gain ,
 .BR green\-gain ,
@@ -151,7 +151,7 @@ range from 0 (lowest gain) to 15 (highest). If the advanced option "Gain" isn't
 checked in the frontend, the backend does automatic gain calibration, and do not use
 user provided values.
 
-.PP 
+.PP
 
 Options
 .B red\-offset
@@ -160,21 +160,21 @@ Options
 and
 .B blue\-offset
 allow you to adjust the offset of your scanner for the given color. Values
-range from 0 (lowest offset) to 15 (highest). 
-.PP 
+range from 0 (lowest offset) to 15 (highest).
+.PP
 
 Option
 .B astra
 allows you to change the model of your scanner. Current auto detection is based
 on side effects on scanning when using 1220P command set on other models, so
-it may fail on unknown hardware combination. Valid values are 610, 1220, 1600 
+it may fail on unknown hardware combination. Valid values are 610, 1220, 1600
 and 2000. It is useful only when autodetection fails to detect properly
-your scanner model. If your scanner work properly but is reported wrongly, 
-let it be that way. 
-The only valid case to change the model is when your scanner produces "black" or 
-"inverted" scans. In this case you can put the model. Be aware that it will 
+your scanner model. If your scanner work properly but is reported wrongly,
+let it be that way.
+The only valid case to change the model is when your scanner produces "black" or
+"inverted" scans. In this case you can put the model. Be aware that it will
 prevent scanner model autodetection.
-.PP 
+.PP
 
 Option
 .B buffer
@@ -183,26 +183,26 @@ bytes. The default value is 2 megabytes. Decreasing this value will improve the
 smoothness of progress bar in the frontend, but will stall the
 scan more often.
 
-.PP 
+.PP
 
 
 
 .SH "FILES"
-.TP 
+.TP
 .I @CONFIGDIR@/umax_pp.conf
 The backend configuration file (see also description of
 .B SANE_CONFIG_DIR
 below).
-.TP 
+.TP
 .I @LIBDIR@/libsane\-umax_pp.a
 The static library implementing this backend.
-.TP 
+.TP
 .I @LIBDIR@/libsane\-umax_pp.so
 The shared library implementing this backend (present on systems that
 support dynamic loading).
 
 .SH "ENVIRONMENT"
-.TP 
+.TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
 contain the configuration file.  Under UNIX, the directories are
@@ -216,14 +216,14 @@ directories.  For example, setting
 .B SANE_CONFIG_DIR
 to "/tmp/config:" would result in directories "tmp/config", ".", and
 "@CONFIGDIR@" being searched (in this order).
-.TP 
+.TP
 .B SANE_DEBUG_UMAX_PP
 If the library was compiled with debug support enabled, this
 environment variable controls the debug level for this backend.  E.g.,
 a value of 128 requests all debug output to be printed.  Smaller
 levels reduce verbosity.
 
-.PP 
+.PP
 .RS
 .ft CR
 .nf
@@ -239,14 +239,14 @@ level   debug output
 .fi
 .ft R
 .RE
-.PP 
-.TP 
+.PP
+.TP
 .B SANE_DEBUG_UMAX_PP_LOW
 This variable sets the debug level for the SANE interface for the Umax
 ASIC. Note that enabling this will spam your terminal with some
 million lines of debug output.
 
-.PP 
+.PP
 .RS
 .ft CR
 .nf
@@ -256,18 +256,18 @@ level   debug output
  1       errors
  8       command blocks
  16      detailed code flow
- 32      dump datafiles      
+ 32      dump datafiles
  255     everything
 .fi
 .ft R
 .RE
-.PP 
- 
-.PP 
+.PP
+
+.PP
 .SH "SEE ALSO"
 sane(7), sane\-net(5), saned(8)
 
-.TP 
+.TP
 For latest bug fixes and information see
 .I http://umax1220p.sourceforge.net/
 
@@ -282,21 +282,21 @@ by William Stuart.
 If something doesn't work, please contact me. But I need some information about
 your scanner to be able to help you...
 
-.TP 
+.TP
 .I SANE version
 run "scanimage \-V" to determine this
-.TP 
+.TP
 .I the backend version and your scanner hardware
 run "SANE_DEBUG_UMAX_PP=255 scanimage \-L 2>log" as root. If you don't get any output
 from the umax_pp backend, make sure a line "umax_pp" is included into
 your @CONFIGDIR@/dll.conf.
 If your scanner isn't detected, make sure you've defined the right port address, or the
-correct device 
+correct device
 in your umax_pp.conf.
-.TP 
+.TP
 .I the name of your scanner/vendor
 also a worthy information. Please also include the optical resolution and lamp type of your scanner, both can be found in the manual of your scanner.
-.TP 
+.TP
 .I any further comments
 if you have comments about the documentation (what could be done better), or you
 think I should know something, please include it.
diff --git a/doc/sane-usb.man b/doc/sane-usb.man
index 8237a8a..cb65c7f 100644
--- a/doc/sane-usb.man
+++ b/doc/sane-usb.man
@@ -12,7 +12,7 @@ sanei_usb interface. However, there is one exceptions: USB Scanners
 supported by the microtek2 backend need a special USB kernel
 driver, see
 .BR sane\-microtek2 (5)
-for details. 
+for details.
 
 .SH "QUICK START"
 This is a short HOWTO-like section. For the full details, read the following
@@ -71,11 +71,11 @@ Usually udev or for older distributions the hotplug utilities are used, which
 support dynamic setting of access permissions. SANE comes with udev and hotplug
 scripts in the directory tools/udev and tools/hotplug. They can be used for
 setting permissions, see @DOCDIR@/README.linux, tools/README and the README in
-the tools/hotplug directory for more details. 
+the tools/hotplug directory for more details.
 .PP
 For the
 .BR BSDs ,
-the device files used by libusb are named 
+the device files used by libusb are named
 .IR /dev/ugen* .
 Use chmod to apply appropriate permissions.
 
@@ -114,7 +114,7 @@ usb 0x055f 0x0006
 .PP
 would have the effect that all USB devices in the system with a vendor id of
 0x55f and a product id of 0x0006 would be probed and recognized by the
-backend. 
+backend.
 .PP
 If your scanner is not detected automatically, it may be necessary to edit the
 appropriate backend configuration file before using SANE for the first time.
@@ -138,6 +138,13 @@ environment variable controls the debug level for the USB I/O
 subsystem.  E.g., a value of 128 requests all debug output to be
 printed.  Smaller levels reduce verbosity. Values greater than 4 enable
 libusb debugging (if available). Example: export SANE_DEBUG_SANEI_USB=4.
+.PP
+.TP
+.B SANE_USB_WORKAROUND
+If your scanner does not work when plugged into a USB3 port, try
+setting the environment variable SANE_USB_WORKAROUND to 1. This
+may work around issues which happen with particular kernel
+versions. Example: export SANE_USB_WORKAROUND=1.
 
 .SH "SEE ALSO"
 .BR sane (7),
diff --git a/doc/sane-v4l.man b/doc/sane-v4l.man
index c0cae22..5af92ce 100644
--- a/doc/sane-v4l.man
+++ b/doc/sane-v4l.man
@@ -83,7 +83,7 @@ Juergen G. Schimmer, Henning Meier-Geinitz
 If more than one video card is present, a crash may occur. Frequency and geometry
 selection is missing.
 .br
-Send bug reports to the SANE mailing list: sane\-devel@lists.alioth.debian.org.  You must
+Send bug reports to the SANE mailing list: sane\-devel@alioth-lists.debian.net.  You must
 be subscribed to the list to send mail. See
 http://www.sane\-project.org/mailing\-lists.html for details.
 
diff --git a/doc/sane-xerox_mfp.man b/doc/sane-xerox_mfp.man
index 0ffa3e8..c03ddd4 100644
--- a/doc/sane-xerox_mfp.man
+++ b/doc/sane-xerox_mfp.man
@@ -20,7 +20,7 @@ For SCX\-4500W in network mode you need to specify
 .B tcp host_address [port]
 .RE
 .PP
-The 
+The
 .B host_address
 is passed through resolver, thus can be a dotted quad or a name from /etc/hosts or resolvable through DNS.
 .SH FILES
@@ -39,9 +39,9 @@ support dynamic loading).
 .B SANE_DEBUG_XEROX_MFP
 If the library was compiled with debug support enabled, this
 environment variable controls the debug level for this backend.  Higher
-debug levels increase the verbosity of the output. 
+debug levels increase the verbosity of the output.
 
-Example: 
+Example:
 export SANE_DEBUG_XEROX_MFP=4
 
 .SH LIMITATIONS
@@ -49,7 +49,7 @@ Multicast autoconfiguration for LAN scanners is not implemented yet. IPv6 addres
 
 .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 
+mail\-lists http://www.sane\-project.org/mailing\-lists.html or SANE bug tracker
 http://www.sane\-project.org/bugs.html
 
 .SH AUTHORS
@@ -65,4 +65,3 @@ Laxmeesh Onkar Markod <m.laxmeesh@samsung.com>
 .BR sane (7),
 .BR sane\-usb (5)
 .br
-
diff --git a/doc/sane.man b/doc/sane.man
index 3eadf42..a9fd50a 100644
--- a/doc/sane.man
+++ b/doc/sane.man
@@ -24,33 +24,33 @@ If you have trouble getting your scanner detected, read the PROBLEMS section.
 
 .SH TERMINOLOGY
 
-An application that uses the 
+An application that uses the
 .B SANE
-interface is called a 
+interface is called a
 .B SANE frontend.
-A driver that implements the 
+A driver that implements the
 .B SANE
 interface is called a
 .B SANE backend.
-A 
+A
 .B meta backend
 provides some means to manage one or more other backends.
 
 
 .SH "SOFTWARE PACKAGES"
-The package 
+The package
 .RB ` sane\-backends '
-contains a lot of backends, documentation (including the 
+contains a lot of backends, documentation (including the
 .B SANE
-standard), networking support, and the command line frontend 
+standard), networking support, and the command line frontend
 .RB ` scanimage '.
-The frontends 
+The frontends
 .RB ` xscanimage "', `" xcam "', and `" scanadf '
 are included in the package
-.RB ` sane\-frontends '. 
+.RB ` sane\-frontends '.
 Both packages can be downloaded from the
 .B SANE
-homepage 
+homepage
 .RI ( http://www.sane\-project.org/ ).
 Information about other frontends and backends can also be found on the
 .B SANE
@@ -60,15 +60,15 @@ homepage.
 The following sections provide short descriptions and links to more
 information about several aspects of
 .B SANE.
-A name with a number in parenthesis (e.g. 
+A name with a number in parenthesis (e.g.
 .RB ` sane\-dll (5)')
-points to a manual page. In this case 
+points to a manual page. In this case
 .RB ` "man 5 sane\-dll" '
 will display the page. Entries like
 .RI ` @DOCDIR@/sane.tex '
 are references to text files that were copied to the
 .B SANE
-documentation directory 
+documentation directory
 .RI ( @DOCDIR@/ )
 during installation. Everything else is a URL to a resource on the web.
 
@@ -79,9 +79,9 @@ can be found on the SANE homepage:
 .IR http://www.sane\-project.org/ .
 .TP
 .B SANE device lists
-The 
+The
 .B SANE
-device lists contain information about the status of 
+device lists contain information about the status of
 .B SANE
 support for a specific device. If your scanner is not listed there (either
 supported or unsupported), please contact us. See section HOW CAN YOU HELP
@@ -100,9 +100,9 @@ unsubscribe:
 .TP
 .B SANE IRC channel
 The IRC (Internet Relay Chat) channel #sane can be found on the Freenode
-network (irc.freenode.net). It's for discussing 
+network (irc.freenode.net). It's for discussing
 .B SANE
-problems, talking about development and general 
+problems, talking about development and general
 .B SANE
 related chatting. Before asking for help, please read the other documentation
 mentioned in this manual page. The channel's topic is also used for
@@ -127,13 +127,13 @@ For information about USB configuration see
 .SH "FRONTENDS AND MISCELLANEOUS PROGRAMS"
 .TP 2
 .B scanimage
-Command-line frontend. See 
+Command-line frontend. See
 .BR scanimage (1).
 .TP
 .B saned
 .B SANE
 network daemon that allows remote clients to access image acquisition devices
-available on the local host. See 
+available on the local host. See
 .BR saned (8).
 .TP
 .B sane\-find\-scanner
@@ -192,7 +192,7 @@ This backend supports several Avision based scanners. This includes the
 original Avision scanners (like AV 630, AV 620, ...) as well as the HP
 ScanJet 53xx and 74xx series, Fujitsu ScanPartner, some Mitsubishi and
 Minolta film-scanners.
-See 
+See
 .BR sane\-avision (5)
 for details.
 .TP
@@ -225,7 +225,7 @@ parallel port scanners.  See
 for details.
 .TP
 .B cardscan
-This backend provides support for Corex Cardscan USB scanners. See 
+This backend provides support for Corex Cardscan USB scanners. See
 .BR sane\-cardscan (5)
 for details.
 .TP
@@ -260,7 +260,7 @@ and adf scanners. See
 for details.
 .TP
 .B genesys
-The genesys backend provides support for several scanners based on the Genesys Logic 
+The genesys backend provides support for several scanners based on the Genesys Logic
 GL646, GL841, GL843, GL847 and GL124 chips like the Medion 6471 and Hewlett-Packard 2300c.
  See
 .BR sane\-genesys (5)
@@ -363,7 +363,7 @@ for details.
 .TP
 .B microtek
 The microtek backend provides access to the "second generation" Microtek
-scanners with SCSI-1 command set. See 
+scanners with SCSI-1 command set. See
 .BR sane\-microtek (5)
 for details.
 .TP
@@ -448,6 +448,12 @@ scanners: IS50 and IS60. See
 .BR sane\-ricoh (5)
 for details.
 .TP
+.B ricoh2
+The ricoh2 backend provides access to the following Ricoh flatbed
+scanners: SG-3100SNw, SP-100SU, and SP-111SU. See
+.BR sane\-ricoh2 (5)
+for details.
+.TP
 .B s9036
 The s9036 backend provides access to Siemens 9036 flatbed scanners. See
 .BR sane\-s9036 (5)
@@ -515,7 +521,7 @@ for details.
 .TP
 .B umax_pp
 The sane\-umax_pp backend provides access to Umax parallel port flatbed scanners
-and the HP 3200C. See 
+and the HP 3200C. See
 .BR sane\-umax_pp (5)
 for details.
 .TP
@@ -565,12 +571,12 @@ backend.  See
 .BR sane\-gphoto2 (5).
 .TP
 .B qcam
-Backend for Connectix QuickCam cameras. See 
+Backend for Connectix QuickCam cameras. See
 .BR sane\-qcam (5).
 .TP
 .B stv680
-The sane\-st680 backend provides access to webcams with a stv680 chip. See
-.BR sane\-st680 (5)
+The sane\-stv680 backend provides access to webcams with a stv680 chip. See
+.BR sane\-stv680 (5)
 for details.
 .PP
 Also, have a look at the backend information page at
@@ -589,7 +595,7 @@ backends by dynamic loading. See
 .BR sane\-dll (5).
 .TP
 .B net
-The 
+The
 .B SANE
 network daemon saned provides access to scanners located on different
 computers in connection with the net backend. See
@@ -634,9 +640,9 @@ and the list of projects in
 .IR @DOCDIR@/PROJECTS .
 
 .SH "CHANGING THE TOP-LEVEL BACKEND"
-By default, all 
+By default, all
 .B SANE
-backends (drivers) are loaded dynamically by the 
+backends (drivers) are loaded dynamically by the
 .B sane\-dll
 meta backend. If you have any questions about the dynamic loading,
 read
@@ -655,8 +661,8 @@ It's not hard to write a
 backend. It can take some time, however. You should have basic knowledge of C
 and enough patience to work through the documentation and find out how your
 scanner works. Appended is a list of some documents that help to write backends
-and frontends. 
-.PP 
+and frontends.
+.PP
 The
 .B SANE
 standard defines the application programming interface (API) that is used to
@@ -685,7 +691,7 @@ for projects that are planned or not yet included into the
 distribution and at our bug-tracking system:
 .IR http://www.http://www.sane\-project.org/bugs.html .
 .PP
-There are some links on how to find out about the protocol of a scanner: 
+There are some links on how to find out about the protocol of a scanner:
 .IR http://www.meier\-geinitz.de/sane/misc/develop.html .
 
 .PP
@@ -731,9 +737,9 @@ If your scanner (or other device) is not connected over the SCSI bus or USB,
 read the backend's manual page for details on how to set it up.
 .PP
 
-Now your scanner is detected by the operating system but not by 
+Now your scanner is detected by the operating system but not by
 .BR SANE ?
-Try 
+Try
 .BR "scanimage \-L" .
 If the scanner is not found, check that the backend's name is mentioned in
 .IR @CONFIGDIR@/dll.conf .
@@ -741,7 +747,7 @@ Some backends are commented out by default. Remove the comment sign for your
 backend in this case. Also some backends aren't compiled at all if one of their
 prerequisites are missing. Examples include dc210, dc240, canon_pp, hpsj5s,
 gphoto2, pint, qcam, v4l, net, sm3600, snapscan, pnm. If you need one of these
-backends and they aren't available, read the build instructions in the 
+backends and they aren't available, read the build instructions in the
 .B README
 file and the individual manual pages of the backends.
 .PP
@@ -761,7 +767,7 @@ debugging.  The environment variables are documented in the
 relevant manual pages.  For example, to get the maximum amount of debug
 information when testing a Mustek SCSI scanner, set environment variables
 .BR SANE_DEBUG_DLL ", " SANE_DEBUG_MUSTEK ", and " SANE_DEBUG_SANEI_SCSI
-to 128 and then invoke 
+to 128 and then invoke
 .B scanimage
 .B \-L .
 The debug messages for the dll backend tell if the mustek backend was found
@@ -803,11 +809,11 @@ works and you want to use one of the graphical frontends like
 .BR xscanimage ", or"
 .B quiteinsane
 but those frontends don't detect your scanner? One reason may be that you
-installed two versions of 
+installed two versions of
 .BR SANE .
-E.g. the version that was installed by your distribution in 
+E.g. the version that was installed by your distribution in
 .I /usr
-and one you installed from source in 
+and one you installed from source in
 .IR /usr/local/ .
 Make sure that only one version is installed. Another possible reason is, that
 your system's dynamic loader can't find the
@@ -825,7 +831,7 @@ See also the documentation of the frontends.
 
 .SH "HOW CAN YOU HELP SANE"
 We appreciate any help we can get. Please have a look at our web page about
-contributing to 
+contributing to
 .BR SANE :
 .I http://www.sane\-project.org/contrib.html
 .PP
@@ -903,6 +909,7 @@ for details).
 .BR sane\-pnm (5),
 .BR sane\-qcam (5),
 .BR sane\-ricoh (5),
+.BR sane\-ricoh2 (5),
 .BR sane\-s9036 (5),
 .BR sane\-sceptre (5),
 .BR sane\-scsi (5),
diff --git a/doc/sane.tex b/doc/sane.tex
index 4611797..71ff6fc 100644
--- a/doc/sane.tex
+++ b/doc/sane.tex
@@ -423,7 +423,7 @@ numbers.
     frontend/backend pair is compatible.  The minor version and the
     build revision are used for informational and bug-fixing purposes
     only.
-  
+
   \item[\code{\defn{SANE\_VERSION\_MAJOR}(\var{vc})}:] This macro returns the
     major version number component of the version code passed in
     argument \var{vc}.
@@ -574,7 +574,7 @@ typedef char SANE_Char;
 
 Type \code{\defn{SANE\_String}} represents a text string as a sequence
 of C \verb|char| values.  The end of the sequence is indicated by a
-\verb|'\0'| (\defn{NUL}) character.  
+\verb|'\0'| (\defn{NUL}) character.
 \begin{quote}
 \begin{verbatim}
 typedef SANE_Char *SANE_String;
@@ -702,20 +702,20 @@ will be expanded as need arises):
       \hline
       \multicolumn{2}{|c|}{\bf \defn{Vendor Strings}} \\
       \hline\hline
-      \code{AGFA}            & \code{Microtek} \\ 
-      \code{Abaton}          & \code{Minolta} \\             
-      \code{Acer}            & \code{Mitsubishi} \\  
-      \code{Apple}           & \code{Mustek} \\      
-      \code{Artec}           & \code{NEC} \\         
-      \code{Avision}         & \code{Nikon} \\       
-      \code{CANON}           & \code{Plustek} \\     
-      \code{Connectix}       & \code{Polaroid} \\    
-      \code{Epson}           & \code{Relisys} \\     
-      \code{Fujitsu}         & \code{Ricoh} \\       
-      \code{Hewlett-Packard} & \code{Sharp} \\       
-      \code{IBM}             & \code{Siemens} \\     
-      \code{Kodak}           & \code{Tamarack} \\    
-      \code{Lexmark}	     & \code{UMAX} \\        
+      \code{AGFA}            & \code{Microtek} \\
+      \code{Abaton}          & \code{Minolta} \\
+      \code{Acer}            & \code{Mitsubishi} \\
+      \code{Apple}           & \code{Mustek} \\
+      \code{Artec}           & \code{NEC} \\
+      \code{Avision}         & \code{Nikon} \\
+      \code{CANON}           & \code{Plustek} \\
+      \code{Connectix}       & \code{Polaroid} \\
+      \code{Epson}           & \code{Relisys} \\
+      \code{Fujitsu}         & \code{Ricoh} \\
+      \code{Hewlett-Packard} & \code{Sharp} \\
+      \code{IBM}             & \code{Siemens} \\
+      \code{Kodak}           & \code{Tamarack} \\
+      \code{Lexmark}	     & \code{UMAX} \\
       \code{Logitech}        & \code{Noname} \\
       \hline
     \end{tabular}
@@ -823,29 +823,29 @@ in Table \ref{tab:valuetype}.
 \hline\hline
 
 \code{\defn{SANE\_TYPE\_BOOL}} & 0 & Option value is of type
-  \verb|SANE_Bool|. \\ 
+  \verb|SANE_Bool|. \\
 
 \code{\defn{SANE\_TYPE\_INT}} & 1 & Option value is of type
-  \verb|SANE_Int|. \\ 
+  \verb|SANE_Int|. \\
 
 \code{\defn{SANE\_TYPE\_FIXED}}&2 & Option value is of type
-  \verb|SANE_Fixed|. \\ 
+  \verb|SANE_Fixed|. \\
 
 \code{\defn{SANE\_TYPE\_STRING}}&3 & Option value is of type
-  \verb|SANE_String|. \\ 
+  \verb|SANE_String|. \\
 
 \code{\defn{SANE\_TYPE\_BUTTON}} & 4 & An option of this type has no value.
 Instead, setting an option of this type has an option-specific
 side-effect.  For example, a button-typed option could be used by a
 backend to provide a means to select default values or to the tell an
-automatic document feeder to advance to the next sheet of paper. \\ 
+automatic document feeder to advance to the next sheet of paper. \\
 
 \code{\defn{SANE\_TYPE\_GROUP}} & 5 & An option of this type has no value.
 This type is used to group logically related options.  A group option
 is in effect up to the point where another group option is encountered
 (or up to the end of the option list, if there are no other group
 options).  For group options, only members \code{title} and
-\code{type} are valid in the option descriptor. \\ 
+\code{type} are valid in the option descriptor. \\
 
   \hline
     \end{tabular}
@@ -945,14 +945,14 @@ capability bitset:
 \hline\hline
 
 \code{\defn{SANE\_CAP\_SOFT\_SELECT}} & 1 & The option
-  value can be set by a call to \code{sane\_con\-trol\_opt\-ion()}.\\ 
+  value can be set by a call to \code{sane\_con\-trol\_opt\-ion()}.\\
 
 \code{\defn{SANE\_CAP\_HARD\_SELECT}} & 2 & The option value can be set by
   user-intervention (e.g., by flipping a switch).  The user-interface
   should prompt the user to execute the appropriate action to set such
   an option.  This capability is mutually exclusive with
   SANE\_CAP\_SOFT\_SELECT (either one of them can be set, but not both
-  simultaneously).  \\ 
+  simultaneously).  \\
 
 \code{\defn{SANE\_CAP\_SOFT\_DETECT}} & 4 & The option
   value can be detected by software.  If
@@ -961,23 +961,23 @@ capability bitset:
   may or may not be set.  If this capability is set but neither
   \code{SANE\_CAP\_SO\-FT\_SEL\-ECT} nor \code{SANE\_CAP\_HA\-RD\_SEL\-ECT}
   are, then there is no way to control the option.  That is, the
-  option provides read-out of the current value only.  \\ 
+  option provides read-out of the current value only.  \\
 
 \code{\defn{SANE\_CAP\_EMULATED}} & 8 & If set, this capability indicates
   that an option is not directly supported by the device and is
   instead emulated in the backend.  A sophisticated frontend may
   elect to use its own (presumably better) emulation in lieu of an emulated
-  option. \\ 
+  option. \\
 
 \code{\defn{SANE\_CAP\_AUTOMATIC}} & 16 & If set, this capability indicates
   that the backend (or the device) is capable to picking a reasonable
   option value automatically.  For such options, it is possible to
   select automatic operation by calling \code{sane\_control\_option()}
-  with an action value of \code{SANE\_ACTION\_SET\_AUTO}.  \\ 
+  with an action value of \code{SANE\_ACTION\_SET\_AUTO}.  \\
 
 \code{\defn{SANE\_CAP\_INACTIVE}} & 32 & If set, this capability indicates
   that the option is not currently active (e.g., because it's
-  meaningful only if another option is set to some other value). \\ 
+  meaningful only if another option is set to some other value). \\
 
 \code{\defn{SANE\_CAP\_ADVANCED}} & 64 &
   If set, this capability indicates that the option should be
@@ -985,7 +985,7 @@ capability bitset:
   displays such options in a less conspicuous way than regular options
   (e.g., a command line interface may list such options last or a
   graphical interface may make them available in a seperate ``advanced
-  settings'' dialog). 
+  settings'' dialog).
   \\
 
 \hline
@@ -1045,7 +1045,7 @@ SANE_Range;
   specifies the quantization value.  If $l$ is the minimum value, $u$
   the maximum value and $q$ the (non-zero) quantization of a range,
   then the legal values are $v=k\cdot q+l$ for all non-negative
-  integer values of $k$ such that $v<=u$.  \\ 
+  integer values of $k$ such that $v<=u$.  \\
 
 \code{\defn{SANE\_CONSTRAINT\_WORD\_LIST}} & 2 & This constraint is applicable
   to integer and fixed-point valued options only.  It constrains the
@@ -1055,7 +1055,7 @@ SANE_Range;
   integer (\verb|SANE_Int|) that specifies the length of the list (not
   counting the length itself).  The remaining elements in the list are
   interpreted according to the type of the option value
-  (\verb|SANE_TYPE_INT| or \verb|SANE_TYPE_FIXED|). \\ 
+  (\verb|SANE_TYPE_INT| or \verb|SANE_TYPE_FIXED|). \\
 
 \code{\defn{SANE\_CONSTRAINT\_STRING\_LIST}} & 3 & This constraint is
   applicable to string-valued options only.  It constrains the option
@@ -1288,7 +1288,7 @@ described in Table~\ref{tab:actions}.
 
 \code{\defn{SANE\_ACTION\_SET\_VALUE}} & 1 & Set option value.  The
   option value passed through argument \code{v} may be modified by the
-  backend if the value cannot be set exactly.  \\ 
+  backend if the value cannot be set exactly.  \\
 
 \code{\defn{SANE\_ACTION\_SET\_AUTO}} & 2 & Turn on automatic mode.  Backend
   or device will automatically select an appropriate value.  This mode
@@ -1862,7 +1862,7 @@ regarding these options:
 
 \item A frontend must work properly with any or all of these options
   missing.
-  
+
 \end{itemize}
 
 \input{net.tex}
@@ -1873,7 +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}
-\url{sane-devel-request@lists.alioth.debian.org}
+\url{sane-devel-request@alioth-lists.debian.net}
 \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 7b0fa4a..d019901 100644
--- a/doc/saned.man
+++ b/doc/saned.man
@@ -1,17 +1,26 @@
-.TH saned 8 "20 Apr 2009" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH saned 8 "29 Sep 2017" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX saned
 .SH NAME
 saned \- SANE network daemon
 .SH SYNOPSIS
 .B saned
-.B [ \-a 
+.B [ \-a
 .I [ username ]
-.B | \-d 
-.I [ n ]
-.B | \-s
-.I [ n ]
-.B | \-h
 .B ]
+.B [ \-u
+.I username
+.B ]
+.B [ \-b
+.I address
+.B ]
+.B [ \-l ]
+.B [ \-D ]
+.B [ \-o ]
+.B [ \-d
+.I n
+.B ]
+.B [ \-e ]
+.B [ \-h ]
 .SH DESCRIPTION
 .B saned
 is the SANE (Scanner Access Now Easy) daemon that allows remote clients
@@ -19,59 +28,77 @@ to access image acquisition devices available on the local host.
 .SH OPTIONS
 .PP
 The
-.B \-a
+.B \-l
 flag requests that
 .B saned
-run in standalone daemon mode. In this mode, 
+run in standalone daemon mode.  In this mode,
 .B saned
-will detach from the console and run in the background, listening for incoming
-client connections; 
+will listen for incoming client connections;
 .B inetd
 is not required for
 .B saned
-operations in this mode. If the optional
-.B username
-is given after
-.B \-a
-,
+operations in this mode. The
+.B \-b
+flag tells
+.B saned
+to bind to the
+.I address
+given.  The
+.B \-u
+flag requests that
 .B saned
-will drop root privileges and run as this user (and group).
+drop root privileges and run as the user (and group) associated with
+.I username
+after binding.
+The
+.B \-D
+flag will request
+.B saned
+to detach from the console and run in the background.
+The flag
+.B \-a
+is equivalent to the combination of
+.B \-l \-B \-u
+.I username
+options.
 .PP
 The
 .B \-d
-and
-.B \-s
-flags request that
-.B saned
-run in debug mode (as opposed to
-.BR inetd (8)
-daemon mode).  In this mode,
+flag sets the level of
 .B saned
-explicitly waits for a connection request.  When compiled with
-debugging enabled, these flags may be followed by a number to request
-debug info. The larger the number, the more verbose the debug output.
-E.g.,
+debug output.  When compiled with debugging enabled, this flag may be
+followed by a number to request more or less debug info.  The larger
+the number, the more verbose the debug output.  E.g.,
 .B \-d128
-will request printing of all debug info. Debug level 0 means no debug output
-at all. The default value is 2. If flag
-.B \-d
-is used, the debug messages will be printed to stderr while
-.B \-s
-requests using syslog.
+will request output of all debug info.  A level of 0 produces no
+output at all.  The default value is 2.
 .PP
-If 
+The
+.B \-e
+flag will divert
+.B saned
+debug output to stderr instead of the syslog default.
+.PP
+The
+.B \-o
+flag requests that
 .B saned
-is run from inetd, xinetd or systemd, no option can be given.
+exits after the first client disconnects.  This is useful for debugging.
 .PP
 The
 .B \-h
 flag displays a short help message.
+.PP
+If
+.B saned
+is run from other programs such as inetd, xinetd and systemd, check that
+program's documentation on how to pass command-line options.
 .SH CONFIGURATION
-First and foremost: 
+First and foremost:
 .B saned
 is not intended to be exposed to the internet or other non-trusted
 networks. Make sure that access is limited by tcpwrappers and/or a firewall
-setup. Don't depend only on 
+setup. Don't depend only on
 .BR saned 's
 own authentication. Don't run
 .B saned
@@ -81,7 +108,7 @@ install
 .B saned
 as setuid root.
 .PP
-The 
+The
 .I saned.conf
 configuration file contains both options for the daemon and the access
 list.
@@ -93,6 +120,13 @@ may have performance issues. Use this option if your \fBsaned\fP
 server is sitting behind a firewall. If that firewall is a Linux
 machine, we strongly recommend using the Netfilter
 \fInf_conntrack_sane\fP module instead.
+.TP
+\fBdata_connect_timeout\fP = \fItimeout\fP
+Specify the time in milliseconds that saned will wait for a data
+connection. Without this option, if the data connection is not done
+before the scanner reaches the end of scan, the scanner will continue
+to scan past the end and may damage it depending on the
+backend. Specify zero to have the old behavior. The default is 4000ms.
 .PP
 The access list is a list of host names, IP addresses or IP subnets
 (CIDR notation) that are permitted to use local SANE devices. IPv6
@@ -131,21 +165,21 @@ identical to ahost.com.
 .SH SERVER DAEMON CONFIGURATION
 For
 .B saned
-to work properly in its default mode of operation, it is also necessary to 
-add the appropriate configuration for 
+to work properly in its default mode of operation, it is also necessary to
+add the appropriate configuration for
 .I (x)inetd or systemd.
 (see below).
 Note that your inetd must support IPv6 if you
-want to connect to saned over IPv6 ; xinetd, openbsd-inetd and systemd 
+want to connect to saned over IPv6 ; xinetd, openbsd-inetd and systemd
 are known to support IPv6, check the documentation for your inetd daemon.
 .PP
-In the sections below the configuration for 
+In the sections below the configuration for
 .I inetd, xinetd
 and
 .I systemd
 are described in more detail.
 .PP
-For the configurations below it is necessary to add a line of the following 
+For the configurations below it is necessary to add a line of the following
 form to
 .IR /etc/services :
 .PP
@@ -153,7 +187,7 @@ form to
 sane\-port 6566/tcp # SANE network scanner daemon
 .RE
 .PP
-The official IANA short name for port 6566 is "sane\-port". The older name 
+The official IANA short name for port 6566 is "sane\-port". The older name
 "sane" is now deprecated.
 .SH INETD CONFIGURATION
 It is required to add a single line to the inetd configuration file
@@ -183,22 +217,22 @@ Note that both examples assume that there is a
 .B saned
 group and a
 .B saned
-user.  If you follow this example, please make sure that the 
+user.  If you follow this example, please make sure that the
 access permissions on the special device are set such that
 .B saned
 can access the scanner (the program generally needs read and
 write access to scanner devices).
 .SH XINETD CONFIGURATION
 If xinetd is installed on your system instead of inetd the following example
-for 
-.I /etc/xinetd.conf 
+for
+.I /etc/xinetd.conf
 may be helpful:
 .PP
 .RS
 .ft CR
 .nf
 # default: off
-# description: The sane server accepts requests 
+# description: The sane server accepts requests
 # for network access to a local scanner via the
 # network.
 service sane\-port
@@ -214,14 +248,14 @@ service sane\-port
 .ft R
 .RE
 .SH SYSTEMD CONFIGURATION
-Saned can be compiled with explicit systemd support. This 
+Saned can be compiled with explicit systemd support. This
 will allow logging debugging information to be forwarded
 to the systemd journal. The systemd support
 requires compilation with the systemd-devel package
 installed on the system. this is the preferred option.
 
-Saned can be used wih systemd without the systemd integration 
-compiled in, but then logging of debug information is not supported. 
+Saned can be used wih systemd without the systemd integration
+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.
@@ -229,8 +263,8 @@ both are described below.
 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 
-.I saned.socket. 
+The first file we need to add here is called
+.I saned.socket.
 It shall have
 the following contents:
 .PP
@@ -251,8 +285,8 @@ WantedBy=sockets.target
 .ft R
 .RE
 .PP
-The second file to be added is 
-.I saned@.service 
+The second file to be added is
+.I saned@.service
 with the following contents:
 .PP
 .RS
@@ -269,7 +303,7 @@ Group=saned
 StandardInput=null
 StandardOutput=syslog
 StandardError=syslog
-Environment=SANE_CONFIG_DIR=@CONFIGDIR@ 
+Environment=SANE_CONFIG_DIR=@CONFIGDIR@
 # If you need to debug your configuration uncomment the next line and
 # change it as appropriate to set the desired debug options
 # Environment=SANE_DEBUG_DLL=255 SANE_DEBUG_BJNP=5
@@ -280,21 +314,21 @@ Also=saned.socket
 .ft R
 .RE
 .PP
-You need to set an environment variable for 
+You need to set an environment variable for
 .B SANE_CONFIG_DIR
 pointing to the directory where saned can find its configuration files.
-you will have to remove the # on the last line and set the variables 
-for the desired debugging information if required.  Multiple variables 
-can be set by separating the assignments by spaces as shown in the 
+you will have to remove the # on the last line and set the variables
+for the desired debugging information if required.  Multiple variables
+can be set by separating the assignments by spaces as shown in the
 example above.
 .PP
-Unlike 
+Unlike
 .I (x)inetd
 , systemd allows debugging output from backends set using
 .B SANE_DEBUG_XXX
 to be captured. See the man-page for your backend to see what options
 are  supported.
-With the service unit as described above, the debugging output is 
+With the service unit as described above, the debugging output is
 forwarded to the system log.
 
 .SH Systemd configuration when saned is compiled without systemd support
@@ -305,7 +339,7 @@ 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
-.I saned.socket. 
+.I saned.socket.
 It is identical to the version for systemd with the support compiled in.
 It shall have the following contents:
 .PP
diff --git a/doc/scanimage.man b/doc/scanimage.man
index 4d47eb8..83624a4 100644
--- a/doc/scanimage.man
+++ b/doc/scanimage.man
@@ -11,7 +11,7 @@ scanimage \- scan an image
 .RB [ \-i | \-\-icc\-profile
 .IR profile ]
 .RB [ \-L | \-\-list\-devices ]
-.RB [ \-f | \-\-formatted\-device\-list 
+.RB [ \-f | \-\-formatted\-device\-list
 .IR format ]
 .RB [ \-b | \-\-batch
 .RI [= format ]]
@@ -24,6 +24,7 @@ scanimage \- scan an image
 .RB [ \-\-batch\-double ]
 .RB [ \-\-accept\-md5\-only ]
 .RB [ \-p | \-\-progress ]
+.RB [ \-o | \-\-output-file ]
 .RB [ \-n | \-\-dont\-scan ]
 .RB [ \-T | \-\-test ]
 .RB [ \-A | \-\-all-options ]
@@ -84,9 +85,9 @@ or
 .B \-\-device\-name
 options must be followed by a
 .B SANE
-device-name like 
+device-name like
 .RI ` epson:/dev/sg0 '
-or 
+or
 .RI ` hp:/dev/usbscanner0 '.
 A (partial) list of available devices can be obtained with the
 .B \-\-list\-devices
@@ -94,14 +95,15 @@ option (see below).  If no device-name is specified explicitly,
 .B scanimage
 reads a device-name from the environment variable
 .BR SANE_DEFAULT_DEVICE .
-If this variable is not set, 
+If this variable is not set,
 .B scanimage
 will attempt to open the first available device.
 .PP
 The
-.B \-\-format 
+.B \-\-format
 .I format
-option selects how image data is written to standard output.
+option selects how image data is written to standard output or the file specified by
+the \-\-output\-file option.
 .I format
 can be
 .BR pnm ,
@@ -111,7 +113,7 @@ or
 .BR jpeg .
 If
 .B \-\-format
-is not used, PNM is written.
+is not specified, PNM is written by default.
 .PP
 The
 .B \-i
@@ -126,7 +128,7 @@ or
 option requests a (partial) list of devices that are available.  The
 list is not complete since some devices may be available, but are not
 listed in any of the configuration files (which are typically stored
-in directory 
+in directory
 .IR @CONFIGDIR@ ).
 This is particularly the case when accessing scanners through the network.  If
 a device is not listed in a configuration file, the only way to access it is
@@ -161,7 +163,7 @@ SCSI, produced by SHARP
 The
 .B \-\-batch*
 options provide the features for scanning documents using document
-feeders.  
+feeders.
 .BR \-\-batch
 .RI [ format ]
 is used to specify the format of the filename that each page will be written
@@ -169,6 +171,7 @@ to.  Each page is written out to a single file.  If
 .I format
 is not specified, the default of out%d.pnm (or out%d.tif for \-\-format tiff,
 out%d.png for \-\-format png or out%d.jpg for \-\- format jpeg) will be used.
+This option is incompatible with the \-\-output\-path option.
 .I format
 is given as a printf style string with one integer parameter.
 .B \-\-batch\-start
@@ -177,11 +180,11 @@ selects the page number to start naming files with. If this option is not
 given, the counter will start at 1.
 .B \-\-batch\-count
 .I count
-specifies the number of pages to attempt to scan.  If not given, 
+specifies the number of pages to attempt to scan.  If not given,
 scanimage will continue scanning until the scanner returns a state
 other than OK.  Not all scanners with document feeders signal when the
 ADF is empty, use this command to work around them.
-With 
+With
 .B \-\-batch\-increment
 .I increment
 you can change the amount that the number in the filename is incremented
@@ -211,10 +214,20 @@ option requests that
 .B scanimage
 prints a progress counter. It shows how much image data of the current image has
 already been received by
-.B scanimage 
+.B scanimage
 (in percent).
 .PP
 The
+.B \-o
+or
+.B \-\-output\-file
+option requests that
+.B scanimage
+saves the scanning output to the given path. This option is incompatible with the
+\-\-batch option. The program will try to guess \-\-format from the file name.
+If that is not possible, it will print an error message and exit.
+.PP
+The
 .B \-n
 or
 .B \-\-dont\-scan
@@ -265,7 +278,7 @@ level.
 .PP
 The
 .B \-B
-option without argument changes the input buffer size from the default 32KB to 1MB.  For finer grained control, use 
+option without argument changes the input buffer size from the default 32KB to 1MB.  For finer grained control, use
 .B \-\-buffer-size=
 followed by the number of KB.
 .PP
@@ -426,7 +439,7 @@ is possible to specify multiple such linear segments.  For example,
 "[0]3-[2]3-[6]7,[7]10-[9]6" is equivalent to "3,3,3,4,5,6,7,10,8,6".
 The program
 .B gamma4scanimage
-can be used to generate such gamma tables (see 
+can be used to generate such gamma tables (see
 .BR gamma4scanimage (1)
 for details).
 .RE
@@ -440,7 +453,7 @@ for details).
 The description above is an example of an option that takes an
 arbitrary string value (which happens to be a filename).  Again,
 the value in brackets show that the option is current set to the
-filename 
+filename
 .BR /tmp/input.ppm .
 .RE
 
diff --git a/doc/sceptre/s1200.txt b/doc/sceptre/s1200.txt
index ade81db..2dc100a 100644
--- a/doc/sceptre/s1200.txt
+++ b/doc/sceptre/s1200.txt
@@ -30,13 +30,13 @@ Vendor Spec
 02 00 00 00 04 00
   Get 4 bytes of status. Used to check the button.
   Default result when the button is not pressed
-    06 00 00 00 
+    06 00 00 00
 
 INQUIRY
   result:
-    06 00 02 02 30 00 00 10  4b 49 4e 50 4f 20 20 20    ....0...KINPO       
-    56 69 76 69 64 73 63 61  6e 20 53 31 32 30 20 20    Vividscan S120      
-    53 31 33 20 20 20 20 20  02 01 00 00 4a 45 46 46    S13     ....JEFF    
+    06 00 02 02 30 00 00 10  4b 49 4e 50 4f 20 20 20    ....0...KINPO
+    56 69 76 69 64 73 63 61  6e 20 53 31 32 30 20 20    Vividscan S120
+    53 31 33 20 20 20 20 20  02 01 00 00 4a 45 46 46    S13     ....JEFF
     ...
 
 MODE SEL
@@ -55,15 +55,15 @@ SET WINDOW
 24 00 00 00 00 00 00 00 52 00
   The window size is always 0x52 bytes. The parameters look standard:
     - X/Y resolution       |
-    - Upper left X,Y       |- all three coded in 600 dpi units 
+    - Upper left X,Y       |- all three coded in 600 dpi units
     - Width, Length        |
-    
+
   The supported scan modes are:
     - lineart image comp=0, halftone=0, depth=1
     - halftone image comp=0, haltone=1 to 4, depth=1
     - grayscale image comp=2,  halftone=0, depth=8
     - color image comp=5, halftone=0, depth=24
-  
+
   Y resolution is not used (X is also used for Y)
   X resolution is limited to 600 (if above, scanner defaults to 600)
   Y resolution is limited to 1200 (if above, scanner defaults to 1200)
@@ -105,5 +105,3 @@ The shifts are:
    50				  0
 
 Some resolution give garbage. However that table might not be complete.
-
-
diff --git a/doc/teco/teco1.txt b/doc/teco/teco1.txt
index d555e9e..47519fa 100644
--- a/doc/teco/teco1.txt
+++ b/doc/teco/teco1.txt
@@ -6,8 +6,8 @@
 Relisys RELI 2412 (no ADF, no transparency adapter)
 single pass scanner - 300*1200 dpi - 8.5*14
 Inquiry:
-   000: 06 00 02 02 30 00 00 10 52 45 4c 49 53 59 53 20    ....0...RELISYS 
-   016: 56 4d 33 35 33 30 2b 20 20 20 20 20 20 20 20 20    VM3530+         
+   000: 06 00 02 02 30 00 00 10 52 45 4c 49 53 59 53 20    ....0...RELISYS
+   016: 56 4d 33 35 33 30 2b 20 20 20 20 20 20 20 20 20    VM3530+
    032: 31 2e 30 38 31 2e 30 38 02 00 54 45 43 4f 20 56    1.081.08..TECO V
    048: 4d 33 35 33 41                                     M353A
 Inquiry page 0x82
@@ -16,16 +16,16 @@ Inquiry page 0x82
 
 AVEC Colour 2412
 three pass scanner - 300*600 dpi - 8.5*14
-    000: 06 00 02 02 30 00 00 10 20 20 20 20 20 20 20 20    ....0...        
-    016: 49 6d 61 67 65 20 53 63 61 6e 6e 65 72 20 20 20    Image Scanner   
+    000: 06 00 02 02 30 00 00 10 20 20 20 20 20 20 20 20    ....0...
+    016: 49 6d 61 67 65 20 53 63 61 6e 6e 65 72 20 20 20    Image Scanner
     032: 31 2e 30 38 31 2e 30 38 02 00 54 45 43 4f 20 56    1.081.08..TECO V
     048: 4d 33 35 32 41                                     M352A
 
 Avec Color Office 2400 (no ADF, no transparency adapter)
 three pass scanner - 300*600 dpi - 8.5*14
 Inquiry:
-   000: 06 00 02 02 30 00 00 10 20 20 20 20 20 20 20 20    ....0...        
-   016: 49 6d 61 67 65 20 53 63 61 6e 6e 65 72 20 20 20    Image Scanner   
+   000: 06 00 02 02 30 00 00 10 20 20 20 20 20 20 20 20    ....0...
+   016: 49 6d 61 67 65 20 53 63 61 6e 6e 65 72 20 20 20    Image Scanner
    032: 32 2e 30 34 32 2e 30 34 02 00 54 45 43 4f 20 56    2.042.04..TECO V
    048: 4d 33 35 32 30                                     M3520
 Inquiry page 0x82
@@ -33,8 +33,8 @@ Inquiry page 0x82
    016: 20 56 32 2e 30 34                                   V2.04
 
 RELI 4830 (no ADF, with transparency adapter)
-   000: 06 00 02 02 30 00 00 10 52 45 4c 49 53 59 53 20    ....0...RELISYS 
-   016: 52 45 4c 49 20 34 38 33 30 20 20 20 20 20 20 20    RELI 4830       
+   000: 06 00 02 02 30 00 00 10 52 45 4c 49 53 59 53 20    ....0...RELISYS
+   016: 52 45 4c 49 20 34 38 33 30 20 20 20 20 20 20 20    RELI 4830
    032: 31 2e 30 33 31 2e 30 33 02 00 54 45 43 4f 20 56    1.031.03..TECO V
    048: 4d 34 35 34 32                                     M4542
 Inquiry page 0x82
@@ -42,9 +42,9 @@ Inquiry page 0x82
    016: 20 56 31 2e 30 33                                  V1.03
 
 Dextra DF-600P - VM3510
-   000: 06 00 02 02 24 00 00 10 44 46 2D 36 30 30 4D 20    ....$...DF-600M 
-   016: 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20                     
-   032: 31 2E 31 37 31 2E 31 37 02                         1.171.17.       
+   000: 06 00 02 02 24 00 00 10 44 46 2D 36 30 30 4D 20    ....$...DF-600M
+   016: 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20
+   032: 31 2E 31 37 31 2E 31 37 02                         1.171.17.
 
 
 /*--------------------------------------------------------------------------*/
@@ -54,13 +54,13 @@ SCSI commands supported by the RELISYS VM3530+:
 TEST UNIT READY
 00 00 00 00 00 00
 
-REQ SENSE  
+REQ SENSE
 03 00 00 00 12 00
 
 VENDOR-09
 09 00 00 78 00 00
-  3-4 = length of data to receive. Always 30720 bytes. 
-        Probably 12 lines of calibration at 300dpi. 
+  3-4 = length of data to receive. Always 30720 bytes.
+        Probably 12 lines of calibration at 300dpi.
         8.5*300*12=30600
 
 VENDOR-0E (?)
@@ -77,21 +77,21 @@ INQUIRY:
 
   page 0x82 (vendor specific) - real scanner name with version
      0-3 = page header
-       4 = string length 
+       4 = string length
     5-21 = real scanner name with version
 
 MODE SELECT
 15 10 00 00 18 00
   always sends:
-    00 00 00 00 00 00 00 08 00 00 00 00 00 00 00 01 
-	03 06 02 00 00 01 00 00 
+    00 00 00 00 00 00 00 08 00 00 00 00 00 00 00 01
+	03 06 02 00 00 01 00 00
 
 
 SCAN
 1B 00 00 00 00 00
 
 SET WINDOW
-24 00 00 00 00 00 00 00 63 00 
+24 00 00 00 00 00 00 00 63 00
 Total length is 99
   07 = length (99-8 = 91)
   10-11 = X Resolution
@@ -116,7 +116,7 @@ Total length is 99
 	 0x06 = 8 X 8 Smooth
 	 0x07 = 8 X 8 Horizontal
 	 0x08 = 8 X 8 Vertical
-  37 = 
+  37 =
      0x80 = RIF (VM353A only?)
   63 = calibration?
         0x00 yes
@@ -127,9 +127,9 @@ Total length is 99
   93 =
      0x80 = ? (seems to activate a contrast value on VM353A)
 
-  37, 55, 57, 59, 61, 65, 67, 69, 71, 73, 75, 77, 79 = 0x80 
+  37, 55, 57, 59, 61, 65, 67, 69, 71, 73, 75, 77, 79 = 0x80
   85, 89, 93, 97 = 0xff
-  
+
 READ
 28 00 00 00 00 00 00 00 3E 00
   6-8 = length
@@ -147,10 +147,10 @@ GET DATA BUFFER STATUS
   returned buffer is 0x10 bytes long.
     0-2 = additional length (0x10-3 = 0x0D)
       3 = reserved(?)
-      8 = ? 
+      8 = ?
    9-11 = filled data buffer
   12-13 = number of lines (constant during a scan)
-  14-15 = bytes per line (constant during a scan)  
+  14-15 = bytes per line (constant during a scan)
 
 
 /*--------------------------------------------------------------------------*/
diff --git a/doc/teco/teco2.txt b/doc/teco/teco2.txt
index 5b64a83..b45b795 100644
--- a/doc/teco/teco2.txt
+++ b/doc/teco/teco2.txt
@@ -4,15 +4,15 @@
 INQUIRY
 
 TECO VM3564 (1)
-000: 06 00 02 02 43 00 00 10 52 45 4c 49 53 59 53 20    ....C...RELISYS 
-016: 41 56 45 43 20 49 49 20 53 33 20 20 20 20 20 20    AVEC II S3      
+000: 06 00 02 02 43 00 00 10 52 45 4c 49 53 59 53 20    ....C...RELISYS
+016: 41 56 45 43 20 49 49 20 53 33 20 20 20 20 20 20    AVEC II S3
 032: 31 2e 30 37 31 2e 30 37 00 01 54 45 43 4f 20 56    1.071.07..TECO V
 048: 4d 33 35 36 34 20 00 01 01 2c 00 01 02 58 09 f6    M3564 ...,...X..
 064: 0d af 01 2c 00 08 01 00                            ...,....
 
 TECO VM3564 (2)
-000: 06 00 02 02 43 00 00 10 52 45 4c 49 53 59 53 20    ....C...RELISYS 
-016: 41 56 45 43 20 49 49 20 53 33 20 20 20 20 20 20    AVEC II S3      
+000: 06 00 02 02 43 00 00 10 52 45 4c 49 53 59 53 20    ....C...RELISYS
+016: 41 56 45 43 20 49 49 20 53 33 20 20 20 20 20 20    AVEC II S3
 032: 31 2e 30 39 31 2e 30 39 00 01 54 45 43 4f 20 56    1.091.09..TECO V
 048: 4d 33 35 36 34 20 00 01 01 2c 00 01 02 58 09 f6    M3564 ...,...X..
 064: 0d af 01 2c 00 08 01 00                            ...,....
@@ -25,21 +25,21 @@ TECO VM356A (1)
 064: 0d af 01 2c 00 08 01 00                            ...,....
 
 TECO VM356A (2)
-000: 06 00 02 02 43 00 00 10 50 72 69 6d 61 78 20 20    ....C...Primax  
-016: 4a 65 77 65 6c 20 20 20 20 20 20 20 20 20 20 20    Jewel           
+000: 06 00 02 02 43 00 00 10 50 72 69 6d 61 78 20 20    ....C...Primax
+016: 4a 65 77 65 6c 20 20 20 20 20 20 20 20 20 20 20    Jewel
 032: 31 2e 30 31 31 2e 30 31 00 01 54 45 43 4f 20 56    1.011.01..TECO V
 048: 4d 33 35 36 41 20 00 01 01 2c 00 01 02 58 09 f6    M356A ...,...X..
 064: 0d af 01 2c 00 08 01 00                            ...,....
 
 TECO VM3575
-000: 06 00 02 02 43 00 00 00 20 20 20 20 20 20 20 20    ....C...        
-016: 46 6c 61 74 62 65 64 20 53 63 61 6e 6e 65 72 20    Flatbed Scanner 
+000: 06 00 02 02 43 00 00 00 20 20 20 20 20 20 20 20    ....C...
+016: 46 6c 61 74 62 65 64 20 53 63 61 6e 6e 65 72 20    Flatbed Scanner
 032: 31 2e 30 33 31 2e 30 33 00 01 54 45 43 4f 20 56    1.031.03..TECO V
 048: 4d 33 35 37 35 20 00 01 01 2c 00 01 02 58 09 f6    M3575 ...,...X..
 064: 0d af 01 2c 00 08 01 00                            ...,....
 
 TECO VM656A
-000: 06 00 02 02 43 00 00 00 52 45 4c 49 53 59 53 20    ....C...RELISYS 
+000: 06 00 02 02 43 00 00 00 52 45 4c 49 53 59 53 20    ....C...RELISYS
 016: 41 50 4f 4c 4c 4f 20 45 78 70 72 65 73 73 20 36    APOLLO Express 6
 032: 31 2e 30 33 31 2e 30 33 00 01 54 45 43 4f 20 56    1.031.03..TECO V
 048: 4d 36 35 36 41 00 01 01 2c 00 01 02 58 09 f6 0d    M656A...,...X...
@@ -53,8 +53,8 @@ TECO VM6575
 064: 0d af 01 2c 00 08 01 00                            ...,....
 
 TECO VM6586
-000: 06 00 02 02 43 00 00 00 20 20 20 20 20 20 20 20    ....C...        
-016: 46 6c 61 74 62 65 64 20 53 63 61 6e 6e 65 72 20    Flatbed Scanner 
+000: 06 00 02 02 43 00 00 00 20 20 20 20 20 20 20 20    ....C...
+016: 46 6c 61 74 62 65 64 20 53 63 61 6e 6e 65 72 20    Flatbed Scanner
 032: 33 2e 30 31 33 2e 30 31 00 01 54 45 43 4f 20 56    3.013.01..TECO V
 048: 4d 36 35 38 36 20 00 01 01 2c 00 01 02 58 09 f6    M6586 ...,...X..
 064: 0d af 01 2c 00 08 01 00                            ...,....
@@ -93,7 +93,7 @@ Set calibration. Apparently the line is computed from the calibration lines. It
 
 
 INQUIRY
-12 00 00 00 48 00 
+12 00 00 00 48 00
   standard inquiry
     72 bytes
     32-39: firmware version
@@ -123,8 +123,8 @@ SET WINDOW
 24 00 00 00 00 00 00 00 35 00 (VM3575)
 24 00 00 00 00 00 00 00 38 00 (VM6586)
 
-Total length is 
-  07 = length 
+Total length is
+  07 = length
        VM3575 53-8 = 45
 	   VM6586 56-8 = 48
 	   VM3552 69-8 = 61
@@ -142,11 +142,11 @@ Total length is
   34 = bit depth? - invariant, always 8
   36 = (vm6586 only ?) halftone pattern ?
          1 = type 1 dithering
-  37 = 
+  37 =
      0x80 = RIF?
   48 = color channel to use
      if scan mode is 0 or 2:
-       0x00 = red 
+       0x00 = red
        0x01 = green
        0x02 = blue
      if scan mode is 05 -> ignored
@@ -161,10 +161,10 @@ Total length is
 READ
 28 00 00 00 00 19 00 1f 0e 00
   5 = number of lines to read
-  7-8 = buffer size. 
+  7-8 = buffer size.
        Always number of lines to read * size of a line.
        0x2000 appears to be the upper limit
-  
+
 
 SEND
 2A 00 03 00 00 04 00 0C 00 00
@@ -194,7 +194,7 @@ GET DATA BUFFER STATUS
       7 = ? always 0x14
      11 = bit 7 - (maybe) scanner is ready to send data
   12-13 = number of lines (constant during a scan)
-  14-15 = bytes per line (constant during a scan)  
+  14-15 = bytes per line (constant during a scan)
   16-17 = garbage (the command only returns 0x10 bytes)
 
 
@@ -236,32 +236,31 @@ TECO VM656A reads 8 lines of calibration
 TECO VM6586 ??
 
 Algorithms used (text from Alex Wulms):
-The old algorithm was based on the assumption that the calibration value needs 
-to be an offset, to go from the value obtained during input to the average 
+The old algorithm was based on the assumption that the calibration value needs
+to be an offset, to go from the value obtained during input to the average
 value (0x800).
 
-E.g., if the input value is 0x800, the calibration value must be 0x800 (0x1000 
+E.g., if the input value is 0x800, the calibration value must be 0x800 (0x1000
 - 0x800).
-Likewise, if the input value is 0x700, the calibration value must be 0x900 
+Likewise, if the input value is 0x700, the calibration value must be 0x900
 (0x1000 - 0x700)
 And if the input value is 0x600, the calibration value must be 0xA00
 
-The new algorithm is based on the assumption that the calibration needs to be 
-a multiplication factor, to compensate for the too strong or too weak pixel 
-in the sensor. Again, we want to obtain the average value (approximately 
+The new algorithm is based on the assumption that the calibration needs to be
+a multiplication factor, to compensate for the too strong or too weak pixel
+in the sensor. Again, we want to obtain the average value (approximately
 0x800) for every pixel read during calibration.
 
-E.g., if the input value is 0x800, the calibration value must be 0x800 
+E.g., if the input value is 0x800, the calibration value must be 0x800
 (0x800*0x800 / 0x800).
-Likewise, if the input value is 0x700, the calibration value must be 0x924 
+Likewise, if the input value is 0x700, the calibration value must be 0x924
 (0x800*0x800 / 0x700).
-And if the input value is 0x600, the calibration value must 0xAAA (0x800*0x800 
+And if the input value is 0x600, the calibration value must 0xAAA (0x800*0x800
 / 0x600)
 
-Though, carefull comparison with scans done under windows has shown that the 
-factor is slightly different from 0x800*0x800(=0x400000) but in stead it 
-seems to be approximately 0x40302f (which would mean that the average value 
+Though, carefull comparison with scans done under windows has shown that the
+factor is slightly different from 0x800*0x800(=0x400000) but in stead it
+seems to be approximately 0x40302f (which would mean that the average value
 is approximately 0x803 in stead of 0x800).
 
 Hope this is clarifies the new algorithm.
-
diff --git a/doc/teco/teco3.txt b/doc/teco/teco3.txt
index bc6391f..c263f95 100644
--- a/doc/teco/teco3.txt
+++ b/doc/teco/teco3.txt
@@ -7,7 +7,7 @@ sharing features of both. Hence a third backend.
 
 
 PIOTECH 3024 (TECO Scorpio/Taurus Infinity VM3552):
-   000: 06 00 02 02 43 00 00 10 20 20 20 20 20 20 20 20    ....C...        
+   000: 06 00 02 02 43 00 00 10 20 20 20 20 20 20 20 20    ....C...
    016: 46 6c 61 74 2d 62 65 64 20 73 63 61 6e 6e 65 72    Flat-bed scanner
    032: 35 2e 30 38 35 2e 30 38 03 02 54 45 43 4f 20 56    5.085.08..TECO V
    048: 4d 33 35 35 32 20 00 01 01 2c 00 01 04 b0 09 f6    M3552 ...,......
@@ -41,13 +41,13 @@ SCSI commands supported by the RELISYS VM3530+:
 TEST UNIT READY
 00 00 00 00 00 00
 
-REQ SENSE  
+REQ SENSE
 03 00 00 00 12 00
 
 VENDOR-09
 09 00 00 78 00 00
-  3-4 = length of data to receive. Always 30720 bytes. 
-        Probably 12 lines of calibration at 300dpi. 
+  3-4 = length of data to receive. Always 30720 bytes.
+        Probably 12 lines of calibration at 300dpi.
         8.5*300*12=30600
 
 VENDOR-0E (?)
@@ -91,7 +91,7 @@ Total length is 99
 	 0x06 = 8 X 8 Smooth
 	 0x07 = 8 X 8 Horizontal
 	 0x08 = 8 X 8 Vertical
-  37 = 
+  37 =
      0x80 = RIF ?
   48 = color channel to use
      if scan mode is 0 or 2:
@@ -105,7 +105,7 @@ Total length is 99
       02 = no
   53, 57, 61, 65: 0xff
 
-  
+
 READ
 28 00 00 00 00 00 00 00 3E 00
   6-8 = length
@@ -130,7 +130,7 @@ GET DATA BUFFER STATUS
     6-8 = scanner memory (with no RAM, it is 32KB on the VM3552)
    9-11 = filled data buffer
   12-13 = number of lines (constant during a scan)
-  14-15 = bytes per line (constant during a scan)  
+  14-15 = bytes per line (constant during a scan)
      16 = ?
      17 = in color mode, 0x07 seems to means to the colors are shifted
           and given by rasters. 0x00 seems to mean that there is no
@@ -163,4 +163,3 @@ park the CCD:
   OBJECT POSITION
 
 /*--------------------------------------------------------------------------*/
-
diff --git a/doc/umax/negative-types.txt b/doc/umax/negative-types.txt
index c1f26ce..142807f 100644
--- a/doc/umax/negative-types.txt
+++ b/doc/umax/negative-types.txt
@@ -12,4 +12,3 @@ konica		38%	21%	14%	3%	0%	0%
 ---------------------------------------------------------------
 agfa		61%	24%	13%	6%	2%	0%
 ---------------------------------------------------------------
-
diff --git a/doc/umax/sane-umax-advanced-options-doc.html b/doc/umax/sane-umax-advanced-options-doc.html
index dd2277b..fa29952 100644
--- a/doc/umax/sane-umax-advanced-options-doc.html
+++ b/doc/umax/sane-umax-advanced-options-doc.html
@@ -64,7 +64,7 @@ Supported scanners:
 <li><a href="http://www.xsane.org/">XSane homepage</a></li>
 </ul>
 <br>
-</td>              
+</td>
 
 <td VALIGN=TOP BGCOLOR="#FFFFFF">
 <blockquote>
diff --git a/doc/umax/sane-umax-config-doc.html b/doc/umax/sane-umax-config-doc.html
index c5f43b1..a269079 100644
--- a/doc/umax/sane-umax-config-doc.html
+++ b/doc/umax/sane-umax-config-doc.html
@@ -194,7 +194,7 @@ with the calibration please enable debug output.
 <p>
 <i>calibration-full-ccd</i>:<br>
 The calibration can be done for each element of the CCD (1)
-or for each pixel of the requested image(0). 
+or for each pixel of the requested image(0).
 The value -1 enables the value defined in the driver.
 <p>
 <i>calibration-width-offset</i>:<br>
@@ -205,7 +205,7 @@ The value -1 enables the value defined in the driver.
 <i>calibration-bytes-pixel</i>:<br>
 Some scanners use 1 byte calibration data although the
 scanner supports more than 8 bits/pixel. You can define
-1 or 2 bytes per pixel calinration data. 
+1 or 2 bytes per pixel calinration data.
 The value -1 enables the value defined in the driver.
 <p>
 <i>invert-shading-data</i>:<br>
diff --git a/doc/umax/sane-umax-mirage-doc.html b/doc/umax/sane-umax-mirage-doc.html
index 7c81b43..5d15982 100644
--- a/doc/umax/sane-umax-mirage-doc.html
+++ b/doc/umax/sane-umax-mirage-doc.html
@@ -278,4 +278,3 @@ Author: <a href="mailto:Oliver.Rauch@rauch-domain.de">Oliver Rauch</a>
 
 </body>
 </html>
-
diff --git a/doc/umax/sane-umax-standard-options-doc.html b/doc/umax/sane-umax-standard-options-doc.html
index da0ade3..b80ca40 100644
--- a/doc/umax/sane-umax-standard-options-doc.html
+++ b/doc/umax/sane-umax-standard-options-doc.html
@@ -64,7 +64,7 @@ Supported scanners:
 <li><a href="http://www.xsane.org/">XSane homepage</a></li>
 </ul>
 <br>
-</td>              
+</td>
 
 <td VALIGN=TOP BGCOLOR="#FFFFFF">
 <br>
@@ -271,4 +271,3 @@ Author: <a href="mailto:Oliver.Rauch@rauch-domain.de">Oliver Rauch</a>
 
 </body>
 </html>
-
diff --git a/doc/umax/umax.BUGS b/doc/umax/umax.BUGS
index 90af9b8..37e55da 100644
--- a/doc/umax/umax.BUGS
+++ b/doc/umax/umax.BUGS
@@ -9,4 +9,3 @@ KNOWN BUGS:
 	* pixel count in x-direction is sometimes wrong if xres > 600dpi (Vista S12)
 
         * first scan with Astra 2400S produces wrong colors
-
diff --git a/doc/umax/umax.CHANGES b/doc/umax/umax.CHANGES
index 77d8d62..79cca89 100644
--- a/doc/umax/umax.CHANGES
+++ b/doc/umax/umax.CHANGES
@@ -101,7 +101,7 @@ sane-0.6 / 0.61 / 0.62 -> 0.63
 
     * added support for each color (R,G,B) for highlight and shadow
 
-    * added "Astra 1200S" and "UC840" as supported 
+    * added "Astra 1200S" and "UC840" as supported
 
     * added bad bugfix for preview-problem with S6E
       (in umax-scsi.c function start_scan)
@@ -344,7 +344,7 @@ sane-0.70/0.71 -> 0.72
 
     * combined bind for highlight, shadow, analog-gamma and new
       exposure time functions to rgb-bind
-      
+
     * added set_WD_line_arrangement(buffer_r, WD_line_arrengement_by_driver);
       if driver is doing color-ordering from line to pixel
 
@@ -423,11 +423,11 @@ sane-0.73 -> 0.74
     * added sigterm_handler for umax_reader_process
       changed sane_canel, do_canel and do_eof(=close_pipe),
       cancel now works!
-     
+
     * changed trim_rowbufsize that made problems with SGI,
       there has been an overflow because of big buffersize
 
-      
+
 sane-0.74 -> 1.00 (build 0)
 ---------------------------
 
@@ -682,7 +682,7 @@ build-15 -> build-16
 
     * OPT_SOURCE: removed change of width/height and "*info |= SANE_INFO_RELOAD_PARAMS;"
       from get_value to set_value and added "*info |= SANE_INFO_RELOAD_OPTIONS;"
-     
+
 
 build-16 -> build-17
 --------------------
@@ -782,7 +782,7 @@ build-21 -> build-22
        scsi-read commands, it also is possible to give
        bothe scanners different scsi command queueing depth).
 
-    * prepared replacement of pipe by sanei_ipc_* routines 
+    * prepared replacement of pipe by sanei_ipc_* routines
 
     * added routines umax_get_lamp_status and umax_set_lamp_status
 
@@ -826,7 +826,7 @@ build-22 -> build-23
 
     * for Astra 2200 selection for different x/y resolutions is disabled
 
-    
+
 build-23 -> build-24 (sane-1.0.4)
 --------------------
 
@@ -837,8 +837,8 @@ build-23 -> build-24 (sane-1.0.4)
     * enabled lamp control for Astra 2100S
 
     * Added warning in sane_control_option if option could not be set
- 
-    
+
+
 build-24 -> build-25
 --------------------
 
@@ -906,7 +906,7 @@ build-24 -> build-25
    * added #define SANE_I18N(text) text to umax.c. This is to mark the backend
      specific texts that shall be translated by the frontend
 
-    
+
 build-25 -> build-26
 --------------------
 
@@ -925,11 +925,11 @@ build-25 -> build-26
 
    * changed some static unsigned int to static int
 
-   * sane_exit does free devlist 
+   * sane_exit does free devlist
 
    * added some options for Powerlook 3000 - still is not completly supported
 
-    
+
 build-26 -> build-27
 --------------------
 
@@ -940,7 +940,7 @@ build-26 -> build-27
 
    * changed default minimum scsi buffer size from 64KB to 32 KB
 
-    
+
 build-27 -> build-28
 --------------------
 
@@ -967,7 +967,7 @@ build-27 -> build-28
 
    * added Heidelberg Linoscan 1400 "HDM LS4H1S" as supported scanner
 
-    
+
 build-28 -> build-29
 --------------------
 
@@ -1026,10 +1026,10 @@ build-32 -> build-33
   * added USB support for Astra 2200
     thanks to Frank Zago <fzago@greshamstorage.com>
     for creating umax-usb.c and suggesting several changes to umax.c
-   
+
   * added umax.conf option "connection-type", values: 1=scsi, 2=usb
 
-  * added umax.conf device selection "usb 0x1606 0x0230" (usb vendor_id product_id) 
+  * added umax.conf device selection "usb 0x1606 0x0230" (usb vendor_id product_id)
 
   * removed #ifdef HAVE_SANEI_IPC parts (SANEI_IPC was never defined)
 
@@ -1169,4 +1169,3 @@ build-44 -> build-45
 
    * added defualt options for Linotype Opal2
    * changed bug in highlight-blue function (using green value)
-
diff --git a/doc/umax/umax.FAQ b/doc/umax/umax.FAQ
index 0901a2c..2ffbdfd 100644
--- a/doc/umax/umax.FAQ
+++ b/doc/umax/umax.FAQ
@@ -39,7 +39,7 @@ A: There are at least two kind of scsi controller cards that
    On linux you may have the chance to get it work with the recent
    g_NCR5380-driver. The card does not have IRQ/DMA.
 
-   Try the following option for kernel:  dtc3181e=0x280,255  
+   Try the following option for kernel:  dtc3181e=0x280,255
    or use the following command:
 
      insmod g_NCR5380 ncr_irq=255 ncr_addr=0x280 dtc3181e=1
@@ -143,5 +143,3 @@ A: The optimization set by "-O2" makes problems, try which one of the following
 
 You find a lot of tips and informations in the internet. E.g. take a look
 at http://www.scantips.com
-
-
diff --git a/doc/umax/umax.TODO b/doc/umax/umax.TODO
index 6af64b6..0d6f5a9 100644
--- a/doc/umax/umax.TODO
+++ b/doc/umax/umax.TODO
@@ -19,4 +19,3 @@ TODO UMAX BACKEND FOR SANE
 
  - I will NOT add support for parallel-port and USB scanners to this backend!
    Don`t ask for it.
-
author	Jörg Frings-Fürst <debian@jff-webhosting.net>	2019-07-31 17:00:20 +0200
committer	Jörg Frings-Fürst <debian@jff-webhosting.net>	2019-07-31 17:00:20 +0200
commit	3759ce55ba79b8d3b9d8ed247a252273ee7dade3 (patch)
tree	d69692a274dd1c7d0672e6bb7155a0fc106f9d49 /doc
parent	c8bd2513ecba169cff44c09c8058c36987357b18 (diff)
parent	1687222e1b9e74c89cafbb5910e72d8ec7bfd40f (diff)