Release 1.0.25+git20150425-1

14 files changed, 316 insertions, 47 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 12ec658..5b450e0 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -18,7 +18,7 @@ EXTRA_DIST = scanimage.man sane-config.man sane-find-scanner.man \
 # custom install/uninstall if we required man pages for every backend.
 BACKEND_MANS_ENABLED = @BACKEND_MANS_ENABLED@
 BACKEND_5MANS = sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-as6e.5 \
-	sane-dll.5 sane-dc25.5 sane-dmc.5 sane-epson.5 sane-epson2.5 \
+	sane-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-pint.5 sane-pnm.5 \
@@ -41,7 +41,7 @@ BACKEND_5MANS = sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-as6e.5 \
 
 EXTRA_DIST += 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-hp.man sane-gphoto2.man sane-leo.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-pint.man sane-pnm.man sane-umax.man \
@@ -169,6 +169,7 @@ DESC_FILES = descriptions/abaton.desc descriptions/agfafocus.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 \
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 20b8ffb..cb8757d 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -336,8 +336,8 @@ 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-hp.man \
-	sane-gphoto2.man sane-leo.man sane-lexmark.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-pint.man sane-pnm.man sane-umax.man sane-qcam.man \
@@ -373,7 +373,7 @@ EXTRA_DIST = scanimage.man sane-config.man sane-find-scanner.man \
 	icons/references.gif icons/references_gr.gif icons/up.gif \
 	icons/up_gr.gif
 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-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-pint.5 sane-pnm.5 \
@@ -452,6 +452,7 @@ DESC_FILES = descriptions/abaton.desc descriptions/agfafocus.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 \
diff --git a/doc/descriptions/avision.desc b/doc/descriptions/avision.desc
index 708f5ea..bff25f5 100644
--- a/doc/descriptions/avision.desc
+++ b/doc/descriptions/avision.desc
@@ -19,7 +19,7 @@
 ;:status :stable
 
 ; backend's web page
-:url "http://skull.piratehaven.org/~mike/sane/avision.html"
+:url "http://exactcode.com/site/open_source/saneavision/"
 
 ; name of manpage (if it exists)
 :manpage "sane-avision"
@@ -111,7 +111,13 @@
 :interface "USB"
 :usbid "0x0638" "0x0a2b"
 :comment "duplex! sheetfed scanner"
-:status :complete
+:status :basic
+
+:model "AV220D2"
+:interface "USB"
+:usbid "0x0638" "0x1a31"
+:comment "duplex! sheetfed scanner"
+:status :untested
 
 :model "AV220+"
 :interface "USB"
diff --git a/doc/descriptions/canon_dr.desc b/doc/descriptions/canon_dr.desc
index 406bbfb..149ca4c 100644
--- a/doc/descriptions/canon_dr.desc
+++ b/doc/descriptions/canon_dr.desc
@@ -11,7 +11,7 @@
 
 :backend "canon_dr"              ; name of backend
 :url "http://www.thebility.com/canon/" 
-:version "47"                    ; version of backend
+:version "49"                    ; 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"
 :devicetype :scanner             ; start of a list of devices....
@@ -273,8 +273,7 @@
 :model "DR-C125"
 :interface "USB"
 :usbid "0x1083" "0x1640"
-:status :untested
-:comment "Similar protocol to other canon_dr machines, but unsupported image format."
+:status :good
 
 :model "DR-C130"
 :interface "USB"
@@ -285,6 +284,7 @@
 :interface "USB"
 :usbid "0x1083" "0x1658"
 :status :untested
+:comment "Perhaps similar to DR-C125?"
 
 :model "DR-F120"
 :interface "USB"
diff --git a/doc/descriptions/epjitsu.desc b/doc/descriptions/epjitsu.desc
index 630a1f7..b11ee96 100644
--- a/doc/descriptions/epjitsu.desc
+++ b/doc/descriptions/epjitsu.desc
@@ -11,9 +11,9 @@
 
 :backend "epjitsu"               ; name of backend
 :url "http://www.thebility.com/epjitsu/" 
-:version "25"                    ; version of backend
+:version "27"                    ; version of backend
 :manpage "sane-epjitsu"          ; name of manpage (if it exists)
-:comment "Backend updated for SANE release 1.0.25, see sane-epjitsu manpage"
+:comment "Backend updated for SANE release 1.0.26, see sane-epjitsu manpage"
 :devicetype :scanner             ; start of a list of devices....
                                  ; other types:  :stillcam, :vidcam,
                                  ;               :meta, :api
diff --git a/doc/descriptions/epsonds.desc b/doc/descriptions/epsonds.desc
new file mode 100644
index 0000000..0b7c6c6
--- /dev/null
+++ b/doc/descriptions/epsonds.desc
@@ -0,0 +1,97 @@
+;
+; SANE Backend specification file for the epsonds backend
+;
+; Copyright (C) 2015 Alessandro Zummo
+; Released under GPLv2
+;
+
+:backend "epsonds"
+:version "1.0.18"
+:new :yes
+:manpage "sane-epsonds"
+
+:devicetype :scanner
+
+:mfg "Epson"
+:url "http://www.epson.com/"
+
+:model      "DS-5500"
+:interface  "USB"
+:usbid      "0x04b8" "0x0145"
+:status     :untested
+
+:model      "DS-6500"
+:interface  "USB"
+:usbid      "0x04b8" "0x0145"
+:status     :untested
+
+:model      "DS-7500"
+:interface  "USB"
+:usbid      "0x04b8" "0x0145"
+:status     :untested
+
+:model      "DS-50000"
+:interface  "USB"
+:usbid      "0x04b8" "0x0146"
+:status     :untested
+
+:model      "DS-60000"
+:interface  "USB"
+:usbid      "0x04b8" "0x0146"
+:status     :good
+
+:model      "DS-70000"
+:interface  "USB"
+:usbid      "0x04b8" "0x0146"
+:status     :untested
+
+:model      "DS-510"
+:interface  "USB"
+:usbid      "0x04b8" "0x014c"
+:status     :good
+
+:model      "DS-560"
+:interface  "USB"
+:usbid      "0x04b8" "0x014d"
+:status     :untested
+
+:model      "DS-40"
+:interface  "USB"
+:usbid      "0x04b8" "0x0150"
+:status     :untested
+
+:model      "DS-760"
+:interface  "USB"
+:usbid      "0x04b8" "0x0152"
+:status     :untested
+
+:model      "DS-860"
+:interface  "USB"
+:usbid      "0x04b8" "0x0152"
+:status     :untested
+
+:model      "DS-520"
+:interface  "USB"
+:usbid      "0x04b8" "0x0154"
+:status     :untested
+
+:model      "PX-M7050 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x08bc"
+:status     :untested
+
+:model      "WF-8510/8590 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x08bc"
+:status     :untested
+
+:model      "PX-M7050FX Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x08cc"
+:status     :untested
+
+:model      "WF-R8590 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x08cc"
+:status     :untested
+
diff --git a/doc/descriptions/genesys.desc b/doc/descriptions/genesys.desc
index eb060f6..cb91476 100644
--- a/doc/descriptions/genesys.desc
+++ b/doc/descriptions/genesys.desc
@@ -145,6 +145,12 @@
 :status :complete
 :comment "GL124 based, resolution from 75 to 2400 dpi"
 
+:model "CanoScan LiDE 120"
+:interface "USB"
+:usbid "0x04a9" "0x190e"
+:status :untested
+:comment "GL124+ based, resolution from 75 to 2400 dpi"
+
 :model "CanoScan LiDE 200"
 :interface "USB"
 :usbid "0x04a9" "0x1905"
@@ -155,7 +161,13 @@
 :interface "USB"
 :usbid "0x04a9" "0x190a"
 :status :complete
-:comment "GL124 based, resolution from 75 to 2400 dpi"
+:comment "GL124 based, resolution from 75 to 4800 dpi"
+
+:model "CanoScan LiDE 220"
+:interface "USB"
+:usbid "0x04a9" "0x190f"
+:status :complete
+:comment "GL124+ based, resolution from 75 to 4800 dpi"
 
 :model "CanoScan 4400f"
 :interface "USB"
diff --git a/doc/descriptions/kodakaio.desc b/doc/descriptions/kodakaio.desc
index 5fb18ed..a5fc126 100644
--- a/doc/descriptions/kodakaio.desc
+++ b/doc/descriptions/kodakaio.desc
@@ -1,6 +1,6 @@
 :backend "kodakaio"
 :url "http://sourceforge.net/projects/cupsdriverkodak/" 
-:version "2.4.7"
+:version "2.7.2"
 :manpage "sane-kodakaio"
 :comment "Backend for Kodak AiO ESP and Hero printers. Also possibly Advent AWL10"
 :devicetype :scanner
@@ -57,7 +57,7 @@
 :model "ESP 5200"
 :interface "USB Ethernet"
 :usbid "0x040a" "0x4041"
-:status :basic
+:status :complete
 :comment "USB good, Network good"
 
 :model "ESP 5300"
@@ -156,8 +156,8 @@
 :model "Hero Office 6.1"
 :interface "USB"
 :usbid "0x040a" "0x4062"
-:status :untested
-:comment "Please test!"
+:status :basic
+:comment "Does the adf work?"
 
 :model "Hero 7.1"
 :interface "USB"
@@ -168,7 +168,7 @@
 :model "Hero 9.1"
 :interface "USB Ethernet"
 :usbid "0x040a" "0x4067"
-:status :basic
+:status :complete
 :comment "USB good, Network good"
 
 ;===================================
diff --git a/doc/descriptions/pixma.desc b/doc/descriptions/pixma.desc
index f354ada..51c3bec 100644
--- a/doc/descriptions/pixma.desc
+++ b/doc/descriptions/pixma.desc
@@ -11,10 +11,8 @@
 ; See doc/descriptions.txt for details.
 
 :backend "pixma"                  ; name of backend
-:version "0.17.14"                ; version of backend (or "unmaintained")
+:version "0.17.17"                ; version of backend (or "unmaintained")
 :manpage "sane-pixma"             ; name of manpage (if it exists)
-:url "http://home.arcor.de/wittawat/pixma/" ; 0.13.2 backend's web page
-:url "http://mp610.blogspot.com/"            ; the pixma backend blog
 ;:comment "Devices marked as experimantal are disabled by default. See the manual page for how to enable them."
 
 :devicetype :scanner              ; start of a list of devices....
@@ -36,6 +34,12 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA E480 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1789"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA E500"
 :interface "USB"
 :usbid "0x04a9" "0x1758"
@@ -75,8 +79,8 @@
 :model "PIXMA MG2200 Series"
 :interface "USB"
 :usbid "0x04a9" "0x1760"
-:status :untested
-:comment "Testers needed!"
+:status :complete
+:comment "All resolutions supported (up to 1200DPI)."
 
 :model "PIXMA MG2400 Series"
 :interface "USB"
@@ -87,8 +91,8 @@
 :model "PIXMA MG2500 Series"
 :interface "USB"
 :usbid "0x04a9" "0x176d"
-:status :untested
-:comment "Testers needed!"
+:status :complete
+:comment "All resolutions supported (up to 600DPI)."
 
 :model "PIXMA MG2900 Series"
 :interface "USB WiFi"
@@ -181,10 +185,10 @@
 :comment "All resolutions supported (up to 2400DPI)."
 
 :model "PIXMA MG6400 Series"
-:interface "USB"
+:interface "USB WiFi"
 :usbid "0x04a9" "0x1770"
-:status :untested
-:comment "Testers needed!"
+:status :complete
+:comment "All resolutions supported (up to 1200DPI)."
 
 :model "PIXMA MG6500 Series"
 :interface "USB"
@@ -631,6 +635,12 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA MX490 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1787"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA MX510 Series"
 :interface "USB Ethernet"
 :usbid "0x04a9" "0x175c"
@@ -710,7 +720,7 @@
 :comment "All resolutions supported (up to 2400DPI). Flatbed, ADF simplex and Duplex supported."
 
 :model "PIXMA MX920 Series"
-:interface "USB"
+:interface "USB Ethernet WiFi"
 :usbid "0x04a9" "0x176b"
 :status :good
 :comment "All resolutions supported (up to 2400DPI). Flatbed, ADF simplex and Duplex supported."
@@ -739,6 +749,24 @@
 :status :complete
 :comment "All resolutions supported (up to 600DPI)"
 
+:model "i-SENSYS MF210 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x27a9"
+:status :untested
+:comment "Testers needed!"
+
+:model "i-SENSYS MF220 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x27a8"
+:status :untested
+:comment "Testers needed!"
+
+:model "i-SENSYS MF810/820"
+:interface "USB Ethernet"
+:usbid "0x04a9" "0x27a6"
+:status :untested
+:comment "Testers needed!"
+
 :model "i-SENSYS MF3010"
 :interface "USB Ethernet"
 :usbid "0x04a9" "0x2759"
@@ -913,6 +941,18 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "i-SENSYS MF5900 Series"
+:interface "USB Ethernet"
+:usbid "0x04a9" "0x2743"
+:status :untested
+:comment "Testers needed!"
+
+:model "i-SENSYS MF6100 Series"
+:interface "USB Ethernet"
+:usbid "0x04a9" "0x278e"
+:status :untested
+:comment "Testers needed!"
+
 :model "imageCLASS MF6500 series"
 :interface "USB"
 :usbid "0x04a9" "0x2686"
diff --git a/doc/sane-avision.man b/doc/sane-avision.man
index 805d342..299bb72 100644
--- a/doc/sane-avision.man
+++ b/doc/sane-avision.man
@@ -157,9 +157,9 @@ export SANE_DEBUG_AVISION=7
 .SH "SEE ALSO"
 sane(7), sane\-scsi(5), sane\-usb(5)
 .br
-http://skull.piratehaven.org/~mike/sane/avision.html
+http://exactcode.com/site/open_source/saneavision/
 
 .SH MAINTAINER
-Mike Kelly
+Ren\['e] Rebe
 .SH AUTHOR
 Ren\['e] Rebe and Meino Christian Cramer
diff --git a/doc/sane-epjitsu.man b/doc/sane-epjitsu.man
index ebb87e1..5d2a8ca 100644
--- a/doc/sane-epjitsu.man
+++ b/doc/sane-epjitsu.man
@@ -10,7 +10,7 @@ The
 library implements a SANE (Scanner Access Now Easy) backend which provides basic access the Fujitsu fi\-60F/fi\-65F and ScanSnap S300/S1300/S1100 scanners.
 
 .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) in software, but makes no effort to offer intermediate resolutions and 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.
diff --git a/doc/sane-epsonds.man b/doc/sane-epsonds.man
new file mode 100644
index 0000000..ea9bcbb
--- /dev/null
+++ b/doc/sane-epsonds.man
@@ -0,0 +1,101 @@
+.TH sane\-epsonds 5 "29 Mar 2015" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.IX sane\-epsonds
+.SH NAME
+sane\-epsonds \- SANE backend for EPSON ESC/I-2 scanners
+.SH DESCRIPTION
+The
+.B sane\-epsonds
+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 
+.RS
+scanimage \-\-help \-d epsonds
+.RE
+Not all devices support all options.
+.TP
+.I Scan 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
+and Color means 24 bit color mode or more depending on the scanner.
+Some scanners will internally use 36 bit color, their external interface
+however may only support 24 bits.
+
+The
+.I \-\-depth
+option selects the bit depth the scanner is using. This option is only
+available for scanners that support more than one bit depth. Older
+scanners will always transfer the image in 8bit mode. Newer scanners
+allow to select either 8 bits, 12 or 14 bits per color channel. For a
+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 
+.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 geometry options
+.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.
+
+The
+.I \-\-source
+option selects the scan source. Valid options depend on the installed
+options. The default is "Flatbed".
+
+The
+.I \-\-eject
+option ejects the sheet in the ADF.
+
+The
+.I \-\-adf-mode
+option select the ADF mode (simplex/duplex).
+
+.SH CONFIGURATION FILE
+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.  
+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 
+.I
+net 
+keyword.  An IP address to connect to can also be used.
+.SH FILES
+.TP
+.I @LIBDIR@/libsane\-epsonds.a
+The static library implementing this backend.
+.TP
+.I @LIBDIR@/libsane\-epsonds.so
+The shared library implementing this backend (present on systems that
+support dynamic loading).
+.SH ENVIRONMENT
+.TP
+.B SANE_DEBUG_EPSONDS
+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. Values around 11-16 will usuallybe enough for
+a bug report.
+
+.SH "SEE ALSO"
+
+sane\-usb(5), scanimage(1), xscanimage(1), xsane(1)
+
+.SH AUTHOR
+
+The package is written by Alessandro Zummo
diff --git a/doc/sane-genesys.man b/doc/sane-genesys.man
index 2b96483..2acd717 100644
--- a/doc/sane-genesys.man
+++ b/doc/sane-genesys.man
@@ -10,7 +10,7 @@ access to USB flatbed scanners based on the Genesys GL646, GL841, GL843, GL847 a
 At present, the following scanners are known to work with this backend:
 .PP 
 .RS
-Canon LiDE 35/40/50/60/100/110/200/210/700
+Canon LiDE 35/40/50/60/100/110/120/200/210/220/700
 .br
 Hewlett-Packard HP2300C/HP2400/HP3670/HP3690/G4010/G4050
 .br
@@ -55,10 +55,11 @@ If you plug the scanner in another machine or use it with another account, calib
 will have to be redone, unles you use the \-\-calibration\-file option.
 If no home directory is defined,
 USERAPPPROFILE will be used, then TMPDIR or TMP. If none of these directories exist, the backend will try
-to write in the current working directory. Flatbed scanners alos make use of the calibration file as a cache
+to write in the current working directory. Flatbed scanners also make use of the calibration file as a cache
 to avoid calibration before each scan. Calibration file name is the name of the scanner model if only
 one scanner is detected. In the case of several identical model, the file name will be the name
-of the logical USB device name.
+of the logical USB device name. The expiration time manages the time a calibration is valid in cache.
+A value of -1 means forever, 0 means no cache.
 
 .SH EXTRAS SCAN OPTIONS
 
@@ -123,6 +124,13 @@ as root. It maybe used in case of sheet-fed scanners to share a calibration file
 users.
 .RE
 
+.B \-\-expiration\-time
+.RS
+        Specify the time (in minutes) a cached calibration is considered valid. If older than the given value, a new
+calibration is done. A value of -1 means no expiration and cached value are kept forever unless cleared by
+userwith the calibration clear option. A value of 0 means cache is disabled.
+.RE
+
 .PP
 Additionally, several 'software' options are exposed by the backend. These
 are reimplementations of features provided natively by larger scanners, but
@@ -274,6 +282,9 @@ cncsolutions (http://www.cncsolutions.com.br) sponsored and supported the work o
 .TP
 Brian Paavo from Benthic Science Limited for donating a Canoscan LiDE 700F.
 .br
+.TP
+Dany Qumsiyeh for donating a Canoscan LiDE 210 and a LiDE 220.
+.br
 
 .SH "SEE ALSO"
 .BR sane (7),
diff --git a/doc/sane-pixma.man b/doc/sane-pixma.man
index c780ba8..c72cbda 100644
--- a/doc/sane-pixma.man
+++ b/doc/sane-pixma.man
@@ -1,4 +1,4 @@
-.TH "sane\-pixma" "5" "29 Oct 2014" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH "sane\-pixma" "5" "03 Apr 2015" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane\-pixma
 .SH NAME
 sane\-pixma \- SANE backend for Canon Multi-Function Printers and CanoScan Scanners
@@ -15,11 +15,11 @@ over IPv4 as well as IPv6 (MFNP over IPv6 is untested).
 Currently, the following models work with this backend:
 .PP
 .RS
-PIXMA MG2100, MG2400, MG2900, MG3100, MG3200, MG3500, MG4200
+PIXMA MG2100, MG2200, MG2400, MG2500, MG2900, MG3100, MG3200
 .br
-PIXMA MG5100, MG5200, MG5300, MG5500, MG6100, MG6200, MG6300
+PIXMA MG3500, MG4200, MG5100, MG5200, MG5300, MG5500, MG6100
 .br
-PIXMA MG7100, MG8200
+PIXMA MG6200, MG6300, MG6400, MG7100, MG8200
 .br
 PIXMA MP140, MP150, MP160, MP170, MP180, MP190
 .br
@@ -77,21 +77,21 @@ in the backend so that they get recognized and activated.
 Feedback in the sane\-devel mailing list welcome.
 .PP
 .RS
-PIXMA E400, E460, E500, E510, E560, E600, E610
+PIXMA E400, E460, E480, E500, E510, E560, E600, E610
 .br
-PIXMA MG2200, MG2500, MG4100, MG5400, MG5600
-.br
-PIXMA MG6400, MG6500, MG6600, MG7500, MG8100
+PIXMA MG4100, MG5400, MG5600, MG6500, MG6600, MG7500, MG8100
 .br
 PIXMA MP375R, MP493, MP495, MP740
 .br
-PIXMA MX320, MX390, MX430, MX450, MX470, MX710
+PIXMA MX320, MX390, MX430, MX450, MX470, MX490, MX710
 .br
-imageCLASS MF5630, MF5650, MF5750, MF8030, MF8170c
+imageCLASS MF810/820, MF5630, MF5650, MF5750, MF8030, MF8170c
 .br
 imageRUNNER 1133
 .br
-i-SENSYS MF5880dn, MF6680dn, MF8500C Series
+i-SENSYS MF210 Series, MF220 Series, MF5880dn, MF5900 Series
+.br
+i-SENSYS MF6100 Series, MF6680dn, MF8500C Series
 .br
 MAXIFY MB2000, MB2300, MB5000, MB5300
 .RE