14 files changed, 200 insertions, 49 deletions
diff --git a/doc/descriptions/artec_eplus48u.desc b/doc/descriptions/artec_eplus48u.desc
index 674333a..17b8b21 100644
--- a/doc/descriptions/artec_eplus48u.desc
+++ b/doc/descriptions/artec_eplus48u.desc
@@ -15,13 +15,13 @@
 :status :good
 :interface "USB"
 :usbid "0x05d8" "0x4003"
-:comment "CIS scanner based on the GT6816 chip. Apparently all other devices are re-badged Artec scanners."
+:comment "CIS scanner based on the GT6816 chip. Apparently all other devices are re-badged Artec scanners. Needs firmware 'Artec48.usb'"
 
 :model "E+ Pro"
 :status :minimal
 :interface "USB"
 :usbid "0x05d8" "0x4004"
-:comment "Works up to 600dpi, but not 1200. Needs better calibration. See bug #310490"
+:comment "Works up to 600dpi, but not 1200. Needs better calibration. See bug #310490. Needs firmware '1200.usb'"
 
 
 :mfg "Medion/Lifetec/Tevion/Cytron"
@@ -32,17 +32,19 @@
 :status :good
 :interface "USB"
 :usbid "0x05d8" "0x4003"
+:comment "Needs firmware 'Artec48.usb'"
 
 :model "MD9705"
 :status :good
 :interface "USB"
 :usbid "0x05d8" "0x4003"
+:comment "Needs firmware 'Artec48.usb'"
 
 :model "MD4394"
 :status :good
 :interface "USB"
 :usbid "0x05d8" "0x4003"
-:comment "Only scanners with product id 0x4003 will work; try the gt68xx backend, if your scanner has product id 0x4002 "
+:comment "Only scanners with product id 0x4003 will work; try the gt68xx backend, if your scanner has product id 0x4002 . Needs firmware 'Artec48.usb'"
 
 
 :mfg "Trust"
@@ -52,12 +54,13 @@
 :status :good
 :interface "USB"
 :usbid "0x05d8" "0x4006"
+:comment "Needs firmware 'Artec48.usb'"
 
 :model "240H Easy Webscan Gold"
 :status :basic
 :interface "USB"
 :usbid "0x05d8" "0x4007"
-:comment "Works up to 600 dpi"
+:comment "Works up to 600 dpi. Needs firmware 'Artec48.usb'"
 
 
 :mfg "Memorex"
@@ -67,6 +70,7 @@
 :status :good
 :interface "USB"
 :usbid "0x05d8" "0x4005"
+:comment "Needs firmware 'Artec48.usb'"
 
 
 :mfg "Microstar"
@@ -76,6 +80,7 @@
 :status :good
 :interface "USB"
 :usbid "0x05d8" "0x4003"
+:comment "Needs firmware 'Artec48.usb'"
 
 
 :mfg "UMAX"
@@ -90,11 +95,13 @@
 :status :good
 :interface "USB"
 :usbid "0x05d8" "0x4009"
+:comment "Needs firmware 'Artec48.usb'"
 
 :model "AstraSlim 1200 SE"
 :status :good
 :interface "USB"
 :usbid "0x05d8" "0x4010"
+:comment "Needs firmware '1200.usb'"
 
 
 :mfg "Yakumo"
@@ -104,3 +111,4 @@
 :status :good
 :interface "USB"
 :usbid "0x05d8" "0x4011"
+:comment "Needs firmware 'Artec48.usb'"
diff --git a/doc/descriptions/avision.desc b/doc/descriptions/avision.desc
index dc013bf..0938300 100644
--- a/doc/descriptions/avision.desc
+++ b/doc/descriptions/avision.desc
@@ -754,6 +754,12 @@
 
 :mfg "Xerox"
 
+:model "Book Scanner 4167"
+:interface "USB"
+:usbid "0x262c" "0x2001"
+:comment "1 pass, 1200 dpi, A3 - duplex! - zero edge! (rebadged Avision FB6080E)"
+:status :complete
+
 :model "DocuMate150"
 :interface "USB"
 :usbid "0x04a7" "0x049c"
diff --git a/doc/descriptions/epjitsu.desc b/doc/descriptions/epjitsu.desc
index e7b0ff6..50f3ca1 100644
--- a/doc/descriptions/epjitsu.desc
+++ b/doc/descriptions/epjitsu.desc
@@ -26,46 +26,46 @@
 :interface "USB"
 :status :good
 :usbid "0x04c5" "0x10c7"
-:comment "A6-size flatbed. Hardware provides 150/200/300/400/600 dpi in color. Software creates other resolutions, plus grayscale and binary modes. Hardware grayscale mode is not used due to poor calibration."
+:comment "A6-size flatbed. Hardware provides 150/200/300/400/600 dpi in color. Software creates other resolutions, plus grayscale and binary modes. Hardware grayscale mode is not used due to poor calibration. Needs firmware '60f_0A00.nal'"
 
 :model "ScanSnap S300"
 :interface "USB"
 :status :good
 :usbid "0x04c5" "0x1156"
-:comment "Letter-size ADF. Hardware provides duplex, 150/225/300/600 dpi in color on AC or USB power. Software creates other resolutions, plus grayscale and binary modes. All buttons and sensors are exposed. Scanner always scans in _triplex_ color, fast USB required."
+:comment "Letter-size ADF. Hardware provides duplex, 150/225/300/600 dpi in color on AC or USB power. Software creates other resolutions, plus grayscale and binary modes. All buttons and sensors are exposed. Scanner always scans in _triplex_ color, fast USB required. Needs firmware '300_0C00.nal'"
 
 :model "ScanSnap S300M"
 :interface "USB"
 :status :good
 :usbid "0x04c5" "0x117f"
-:comment "Same as S300, with different usb id"
+:comment "Same as S300, with different usb id. Needs firmware '300M_0C00.nal'"
 
 :model "fi-65F"
 :interface "USB"
 :status :good
 :usbid "0x04c5" "0x11bd"
-:comment "Same as fi-60f, with different usb id. Button support untested."
+:comment "Same as fi-60f, with different usb id. Button support untested. Needs firmware '65f_0A01.nal'"
 
 :model "ScanSnap S1300"
 :interface "USB"
 :status :good
 :usbid "0x04c5" "0x11ed"
-:comment "Same as S300, with different usb id"
+:comment "Same as S300, with different usb id. Needs firmware '1300_0C26.nal'"
 
 :model "ScanSnap S1100"
 :interface "USB"
 :status :good
 :usbid "0x04c5" "0x1200"
-:comment "Letter-size ADF. Hardware provides simplex, 300/600 dpi in color on USB power. Software creates other resolutions, plus grayscale and binary modes. All buttons and sensors are exposed. Scanner always scans in _triplex_ color, fast USB required."
+:comment "Letter-size ADF. Hardware provides simplex, 300/600 dpi in color on USB power. Software creates other resolutions, plus grayscale and binary modes. All buttons and sensors are exposed. Scanner always scans in _triplex_ color, fast USB required. Needs firmware '1100_0B00.nal'"
 
 :model "ScanSnap S1300i"
 :interface "USB"
 :status :good
 :usbid "0x04c5" "0x128d"
-:comment "Same as S300, with different usb id"
+:comment "Same as S300, with different usb id. Needs firmware '1300i_0D12.nal'"
 
 :model "ScanSnap S1100i"
 :interface "USB"
 :status :good
 :usbid "0x04c5" "0x1447"
-:comment "Same as S1100, with different usb id"
+:comment "Same as S1100, with different usb id. Needs firmware '1100i_0A00.nal'"
diff --git a/doc/descriptions/escl.desc b/doc/descriptions/escl.desc
index e09c4b4..12f1ad9 100644
--- a/doc/descriptions/escl.desc
+++ b/doc/descriptions/escl.desc
@@ -23,6 +23,11 @@
 :status :good
 :comment "All resolutions supported."
 
+:model "MFC-J453DW"
+:interface "Ethernet WiFi"
+:status :good
+:comment "All resolutions supported, Flatbed and ADF supported."
+
 :model "MFC-J985DW"
 :interface "Ethernet WiFi"
 :status :good
@@ -146,6 +151,16 @@
 :status :good
 :comment "All resolutions supported."
 
+:model "PIXMA TS5100"
+:interface "WiFi"
+:status :good
+:comment "All resolutions supported."
+
+:model "PIXMA TS5150"
+:interface "WiFi"
+:status :good
+:comment "All resolutions supported."
+
 :model "PIXMA TS5350 Series"
 :interface "WiFi"
 :status :good
@@ -199,6 +214,11 @@
 :status :good
 :comment "All resolutions supported."
 
+:model "XP-4200 Series"
+:interface "WiFi"
+:status :good
+:comment "All resolutions supported, Flatbed only supported."
+
 :model "XP-6100"
 :interface "WiFi"
 :status :good
diff --git a/doc/descriptions/genesys.desc b/doc/descriptions/genesys.desc
index 740c246..43b0736 100644
--- a/doc/descriptions/genesys.desc
+++ b/doc/descriptions/genesys.desc
@@ -71,6 +71,12 @@
 :status :complete
 :comment "900, 1800, 3600 and 7200 dpi resolutions are supported in both regular transparency and infrared modes"
 
+:model "OpticFilm 8200i"
+:interface "USB"
+:usbid "0x07b3" "0x1825"
+:status :unsupported
+:comment "GL128 based"
+
 ; -----------------------------------------------------------------------------
 
 :mfg "Medion/Lifetec/Tevion/Cytron"
diff --git a/doc/descriptions/gt68xx.desc b/doc/descriptions/gt68xx.desc
index b911e98..15b258a 100644
--- a/doc/descriptions/gt68xx.desc
+++ b/doc/descriptions/gt68xx.desc
@@ -14,7 +14,7 @@
 :interface "USB"
 :usbid "0x05d8" "0x4002"
 :status :good
-:comment "Works, only product id 0x4002 is supported"
+:comment "Works, only product id 0x4002 is supported. Needs firmware 'Gt680xfw.usb'"
 
 :model "Ultima 2000 e+"
 :interface "USB"
@@ -52,17 +52,19 @@
 :interface "USB"
 :usbid "0x0458" "0x201e"
 :status :untested
-:comment "Untested but should work."
+:comment "Untested but should work. Needs firmware 'Cis3r5b1.fw'"
 
-:model "Colorpage SF600"
+:model "ColorPage SF600"
 :interface "USB"
 :usbid "0x0458" "0x2021"
 :status :basic
+:comment "Needs firmware 'cism216.fw'"
 
 :model "Colorpage Vivid3x"
 :interface "USB"
 :usbid "0x0458"	"0x2011"
 :status :good
+:comment "Needs firmware 'ccd548.fw'"
 
 :model "Colorpage Vivid3 V2"
 :interface "USB"
@@ -74,35 +76,42 @@
 :interface "USB"
 :usbid "0x0458"	"0x2017"
 :status :good
+:comment "Needs firmware 'ccd548.fw'"
 
-:model "Colorpage Vivid4"
+:model "ColorPage Vivid 4"
 :usbid "0x0458"	"0x2014"
 :interface "USB"
 :status :good
+:comment "Needs firmware 'ccd68861.fw'"
 
 :model "Colorpage Vivid4x"
 :usbid "0x0458"	"0x201b"
 :interface "USB"
 :status :good
+:comment "Needs firmware 'ccd548.fw'"
 
 :model "Colorpage Vivid4xe"
 :usbid "0x0458"	"0x201a"
 :interface "USB"
 :status :good
+:comment "Needs firmware 'ccd548.fw'"
 
 :model "Colorpage Vivid 1200 X"
 :interface "USB"
 :usbid "0x0458"	"0x201d"
 :status :good
+:comment "Needs firmware 'ccd569.fw'"
 
 :model "Colorpage Vivid 1200 XE"
 :interface "USB"
 :usbid "0x0458"	"0x201f"
 :status :good
+:comment "Needs firmware 'ccd569.fw'"
 
 ; -----------------------------------------------------------------------------
 
 :mfg "Googlegear"
+
 :model "2000"
 :interface "USB"
 :usbid "0x05d8" "0x4002"
@@ -123,7 +132,7 @@
 :interface "USB"
 :usbid "0x043d" "0x002d"
 :status :good
-:comment "Works, some resolutions fail at 16 bit, same as X70"
+:comment "Works, some resolutions fail at 16 bit, same as X70. Needs firmware 'OSLO3071b2.usb'"
 
 ; -----------------------------------------------------------------------------
 
@@ -177,22 +186,25 @@
 :interface "USB"
 :usbid "0x05d8" "0x4002"
 :status :good
+:comment "Needs firmware 'PS1fw.usb'"
 
-:model "BearPaw 1200 CU Plus"
+:model "Bearpaw 1200 CU Plus"
 :interface "USB"
 :usbid "0x055f" "0x021b"
 :status :good
+:comment "Needs firmware 'PS1Gfw.usb'"
 
-:model "BearPaw 1200 CU Plus"
+:model "Bearpaw 1200 CU Plus"
 :interface "USB"
 :usbid "0x055f" "0x021c"
 :status :good
+:comment "Needs firmware 'PS1Dfw.usb'"
 
 :model "BearPaw 1200 TA"
 :interface "USB"
 :usbid "0x055f" "0x021e"
 :status :good
-:comment "Transparency adapter supported"
+:comment "Transparency adapter supported. Needs firmware 'A1fw.usb'"
 
 :model "BearPaw 1248 CU"
 :interface "USB"
@@ -216,24 +228,25 @@
 :interface "USB"
 :usbid "0x05d8" "0x4002"
 :status :basic
-:comment "Works, but is slow"
+:comment "Works, but is slow. Needs firmware 'PS2fw.usb'"
 
 :model "BearPaw 2400 CU Plus"
 :interface "USB"
 :usbid "0x055f" "0x021d"
 :status :good
+:comment "Needs firmware 'PS2Dfw.usb'"
 
 :model "BearPaw 2400 TA"
 :interface "USB"
 :usbid "0x055f" "0x0218"
 :status :good
-:comment "Transparency adapter supported"
+:comment "Transparency adapter supported. Needs firmware 'A2fw.usb'"
 
 :model "BearPaw 2400 TA Plus"
 :interface "USB"
 :usbid "0x055f" "0x0219"
 :status :good
-:comment "Transparency adapter supported"
+:comment "Transparency adapter supported. Needs firmware 'A2Dfw.usb'"
 
 :model "BearPaw 2448 CS Plus"
 :interface "USB"
@@ -245,7 +258,7 @@
 :interface "USB"
 :usbid "0x055f" "0x021a"
 :status :basic
-:comment "Slow. Transparency adapter supported. Slow. Brightness depends on resolution?"
+:comment "Slow. Transparency adapter supported. Slow. Brightness depends on resolution?. Needs firmware 'A2Nfw.usb'"
 
 :model "Plug-n-Scan 2400 MT"
 :interface "USB"
@@ -263,23 +276,25 @@
 :interface "USB"
 :usbid "0x05d8" "0x4002"
 :status :good
+:comment "Needs firmware 'SBfw.usb'"
 
 :model "ScanExpress 1248 UB"
 :interface "USB"
 :usbid "0x055f" "0x021f"
 :status :complete
+:comment "Needs firmware 'SBSfw.usb'"
 
 :model "ScanExpress 2400 USB"
 :interface "USB"
 :usbid "0x05d8" "0x4002"
 :status :minimal
-:comment "Should be detected but may need some more work in the code. Testers welcome. Please contact me if you own this scanner."
+:comment "Should be detected but may need some more work in the code. Testers welcome. Please contact me if you own this scanner. Needs firmware 'P9fw.usb'"
 
 :model "ScanExpress A3 USB"
 :interface "USB"
 :usbid "0x055f" "0x0210"
 :status :basic
-:comment "Still some vertical stripes."
+:comment "Still some vertical stripes. Needs firmware 'A32fw.usb'"
 
 :model "ScanMagic 1200 UB Plus"
 :interface "USB"
@@ -349,16 +364,19 @@
 :interface "USB"
 :usbid "0x07b3" "0x0400"
 :status :good
+:comment "Needs firmware 'ccd548.fw'"
 
 :model "OpticPro 1248U"
 :interface "USB"
 :usbid "0x07b3" "0x0401"
 :status :good
+:comment "Needs firmware 'ccd548.fw'"
 
 :model "OpticPro U16B"
 :interface "USB"
 :usbid "0x07b3" "0x0402"
 :status :good
+:comment "Needs firmware 'ccd68861.fw'"
 
 :model "OpticPro U16B+"
 :interface "USB"
@@ -375,13 +393,13 @@
 :interface "USB"
 :usbid "0x07b3" "0x040b"
 :status :good
-:comment "Product ID 0x040b only."
+:comment "Product ID 0x040b only. Needs firmware 'ccd548.fw'"
 
 :model "OpticPro S24"
 :interface "USB"
 :usbid "0x07b3" "0x040e"
 :status :good
-:comment "Product ID 0x040e only. Is reported to work."
+:comment "Product ID 0x040e only. Is reported to work. Needs firmware 'ccd569.fw'"
 
 :model "OpticPro ST12"
 :interface "USB"
@@ -393,12 +411,13 @@
 :interface "USB"
 :usbid "0x07b3" "0x0413"
 :status :good
+:comment "Needs firmware 'cism216.fw'"
 
 :model "OpticSlim 2400"
 :interface "USB"
 :usbid "0x07b3" "0x0422"
 :status :good
-:comment "Works up to 1200 dpi."
+:comment "Works up to 1200 dpi. Needs firmware 'cis3R5B1.fw'"
 
 :model "OpticSlim 2400 plus"
 :interface "USB"
@@ -406,24 +425,24 @@
 :status :good
 :comment "Same as OpticSlim 2400."
 
-:model "OpticSlim 500 plus"
+: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."
+:comment "Image is upside down because hardware in this model is upside down. Buttons not tested. Needs firmware 'cis3R5B1.fw'"
 
 :model "Iriscan Express 2"
 :interface "USB"
 :usbid "0x07b3" "0x045f"
 :status :complete
-:comment "Works up to 1200 dpi. Calibration with external calibration sheet supported"
+:comment "Works up to 1200 dpi. Calibration with external calibration sheet supported. Needs firmware 'cism216.fw'"
 ; -----------------------------------------------------------------------------
 
 :model "OpticSlim M12"
 :interface "USB"
 :usbid "0x07b3" "0x0412"
 :status :complete
-:comment "Works up to 1200 dpi. Calibration with external calibration sheet supported"
+:comment "Works up to 1200 dpi. Calibration with external calibration sheet supported. Needs firmware 'cism216.fw'"
 ; -----------------------------------------------------------------------------
 
 :mfg "RevScan"
@@ -473,6 +492,6 @@
 :interface "USB"
 :usbid "0x04a7" "0x0444"
 :status :good
-:comment "Works up to 1200 dpi and 12 bits/color."
+:comment "Works up to 1200 dpi and 12 bits/color. Needs firmware 'Cis3r5b1.fw'"
 
 ; -----------------------------------------------------------------------------
diff --git a/doc/descriptions/magicolor.desc b/doc/descriptions/magicolor.desc
index f650c90..9195a9a 100644
--- a/doc/descriptions/magicolor.desc
+++ b/doc/descriptions/magicolor.desc
@@ -39,3 +39,13 @@
 :usbid      "ignore"
 :status     :unsupported
 :comment    "Uses a similar protocol as the magicolor 1690MF, according to Ilia Sotnikov."
+
+:mfg "Toshiba TEC"
+:url "https://toshibatec.com/"
+
+:model      "e-STUDIO2323AM"
+:interface  "Network"
+:usbid      "0x08a6" "0x8056"
+:status     :good
+:comment    "Multi-function laser printer, scanner and network interface"
+:url        "https://www.toshibatec.eu/products/multifunctional-systems-and-printers/e-studio2323am/"
diff --git a/doc/descriptions/mustek.desc b/doc/descriptions/mustek.desc
index 2ba44f1..3613768 100644
--- a/doc/descriptions/mustek.desc
+++ b/doc/descriptions/mustek.desc
@@ -123,10 +123,10 @@
 :interface "SCSI"
 :status :good
 
-:model "Paragon 1200 A3 Pro"
+:model "Paragon 1200 A3 Pro/1200 A3 Pro"
 :interface "SCSI"
 :status :complete
-:comment "ADF and TA untested. Please contact me if you own such equipment."
+:comment "ADF and TA untested. Both Paragon branded and not. Please contact me if you own such equipment."
 
 :model "Paragon 600 II N"
 :interface "Proprietary"
diff --git a/doc/descriptions/pixma.desc b/doc/descriptions/pixma.desc
index 07c4740..386d398 100644
--- a/doc/descriptions/pixma.desc
+++ b/doc/descriptions/pixma.desc
@@ -100,6 +100,12 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA E3600 Series"
+:interface "USB"
+:usbid "0x04a9" "0x1157"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA E4200 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1855"
@@ -196,6 +202,18 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "G3080 series"
+:interface "USB"
+:usbid "0x04a9" "0x114d"
+:status :untested
+:comment "Testers needed!"
+
+:model "G3090 series"
+:interface "USB"
+:usbid "0x04a9" "0x114c"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA G4000 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x181d"
@@ -214,6 +232,18 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "G4070 series"
+:interface "USB"
+:usbid "0x04a9" "0x18f3"
+:status :untested
+:comment "Testers needed!"
+
+:model "G4090 series"
+:interface "USB"
+:usbid "0x04a9" "0x114b"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA G4511"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x183d"
@@ -1139,6 +1169,18 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA TS3600 Series"
+:interface "USB"
+:usbid "0x04a9" "0x1156"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS3700 Series"
+:interface "USB"
+:usbid "0x04a9" "0x1158"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA TS5000 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1802"
@@ -1146,7 +1188,13 @@
 :comment "All resolutions supported (up to 1200DPI). WiFi not working."
 
 :model "PIXMA TS5100 Series"
-:interface "USB WiFi"
+:interface "USB"
+:usbid "0x04a9" "0x1825"
+:status :good
+:comment "All resolutions supported (up to 1200DPI). WiFi not working."
+
+:model "PIXMA TS5150 Series"
+:interface "USB"
 :usbid "0x04a9" "0x1825"
 :status :good
 :comment "All resolutions supported (up to 1200DPI). WiFi not working."
@@ -1391,6 +1439,12 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA TS8800 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1159"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA TS9000 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x179f"
@@ -1475,6 +1529,12 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXUS XK130 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x115a"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXUS XK500 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x18df"
diff --git a/doc/sane-escl.man b/doc/sane-escl.man
index ee70d69..6f7c43e 100644
--- a/doc/sane-escl.man
+++ b/doc/sane-escl.man
@@ -15,7 +15,7 @@ BROTHER DCP-J772DW, DCP-L2530DW
 .br
 BROTHER HL-L2590DW
 .br
-BROTHER MFC-J985DW, MFC-J1300DW
+BROTHER MFC-J4540DW, MFC-J985DW, MFC-J1300DW
 .br
 CANON IR C3520
 .br
@@ -31,13 +31,13 @@ CANON PIXMA TS3100, TS3150, TS3151, TS3152, TS3300, TS3350
 .br
 CANON PIXMA TS3351, TS3352, TS3450, TS3451, TS3452, TS5350
 .br
-CANON PIXMA TS5351, TS6150, TS8050, TS8350, TS9100
+CANON PIXMA TS5351, TS5150, TS6150, TS8050, TS8350, TS9100
 .br
 EPSON ET-2750, ET-3750, ET-4750
 .br
 EPSON EcoTank L3160
 .br
-EPSON XP-6100
+EPSON XP-4200, XP-6100
 .br
 HP DESKJET 2710, DESKJET 2723, DESKJET 3760
 .br
diff --git a/doc/sane-magicolor.man b/doc/sane-magicolor.man
index 19716e0..3766f50 100644
--- a/doc/sane-magicolor.man
+++ b/doc/sane-magicolor.man
@@ -1,11 +1,11 @@
 .\" .IX sane-magicolor
 .TH "sane-magicolor" "5" "10 Jan 2011" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .SH "NAME"
-sane\-magicolor \- SANE backend for KONICA MINOLTA magicolor scanners
+sane\-magicolor \- SANE backend for KONICA MINOLTA magicolor and Toshiba TEC e-STUDIO scanners
 .SH "DESCRIPTION"
 The
 .B sane\-magicolor
-backend supports KONICA MINOLTA magicolor scanners connected via USB or LAN. Currently, only the magicolor 1690MF device is supported, no other devices with the same scanning protocol are known.
+backend supports KONICA MINOLTA magicolor and Toshiba TEC e-STUDIO scanners connected via USB or LAN.
 .SH "SUPPORTED DEVICES"
 The following scanner should work with this backend:
 
@@ -16,6 +16,10 @@ Device Details
 Vendor: KONICA MINOLTA
 .br
 Model: magicolor 1690MF
+.br
+Vendor: Toshiba TEC
+.br
+Model: e-STUDIO2323AM
 
 .SH "CONFIGURATION"
 .PP
diff --git a/doc/sane-mustek.man b/doc/sane-mustek.man
index b269678..64ffa6c 100644
--- a/doc/sane-mustek.man
+++ b/doc/sane-mustek.man
@@ -35,7 +35,7 @@ ScanExpress A3 SP
 .br
 Paragon 1200 SP Pro
 .br
-Paragon 1200 A3 Pro
+Paragon 1200 A3 Pro/1200 A3 Pro
 .br
 Paragon 600 II EP
 .br
@@ -57,7 +57,7 @@ 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
-completely different. Check the exact model name!
+completely different. Check the exact model name! Note that we have encountered some Mustek models that are not specifically Paragon branded (e.g. "1200 A3 Pro"), but are also known to work.
 .PP
 Note that most of the above scanners come with a SCSI interface.  The only
 non-SCSI scanners that have some support at this point is the 600 II N and 600
diff --git a/doc/sane-pixma.man b/doc/sane-pixma.man
index ce2ce26..2cbb605 100644
--- a/doc/sane-pixma.man
+++ b/doc/sane-pixma.man
@@ -17,9 +17,11 @@ Currently, the following models work with this backend:
 
 .PP
 .RS
-PIXMA E410, E510, E4500
+PIXMA E410, E510, E3600, E4500
 .br
-PIXMA G600, G2000, G2010, G2030, G2070, G2100, G3030, G3070, G4000, G4070, G4511
+PIXMA G600, G2000, G2010, G2030, G2070, G2100, G3030, G3070
+.br
+PIXMA G3080, G3090, G4000, G4070, G4080, G4511
 .br
 PIXMA GX1000, GX2000, GX3000, GX4000, GX6000, GX6500, GX7000
 .br
@@ -61,9 +63,11 @@ PIXMA TR4500, TR4600, TR4700
 .br
 PIXMA TS2400, TS2600, TS3100, TS3300, TS3450, TS3451, TS3452
 .br
-PIXMA TS3500, TS5000, TS5100, TS5350i, TS5400, TS6100, TS6200
+PIXMA TS3500, TS3600, TS3700, TS5000, TS5100, TS5150, TS5350i
+.br
+PIXMA TS5400, TS6100, TS6200, TS7530, TS7450i ,TS8000, TS8200
 .br
-PIXMA TS7530, TS7450i ,TS8000, TS8200, TS8530, TS8630, TS8630
+PIXMA TS8530, TS8630, TS8800
 .br
 PIXUS MP10
 .br
@@ -139,7 +143,9 @@ PIXMA TS8180, TS8230, TS8280, TS8300, TS8330, TS8380, TS8700, TS9000
 .br
 PIXMA TS9100, TS9180, TS9500, TS9580
 .br
-PIXUS MP5, XK50, XK60, XK70, XK80, XK90, XK100, XK110, XK120, XK500
+PIXUS MP5, XK50, XK60, XK70, XK80, XK90, XK100, XK110, XK120, XK130
+.br
+PIXUS XK500
 .br
 imageCLASS MF720, MF810/820, MF5630, MF5650, MF5750, MF8170c
 .br
diff --git a/doc/saned.man b/doc/saned.man
index 400ab6c..f7f6504 100644
--- a/doc/saned.man
+++ b/doc/saned.man
@@ -93,6 +93,18 @@ will request
 to detach from the console and run in the background.
 
 .TP
+.BR \-n ", " \-\-allow\-network
+allows
+.B saned
+to use network scanners. By default this is forbidden to prevent
+.B saned
+from contacting itself. When enabled, the configuration of the
+.BR sane-net (5)
+backend should not mention the address on which
+.B saned
+is listening.
+
+.TP
 .BR \-o ", " \-\-once
 requests that
 .B saned