Merge branch 'feature/upstream' into develop

11 files changed, 318 insertions, 162 deletions

diff --git a/doc/descriptions/avision.desc b/doc/descriptions/avision.desc
index b694e89..dc013bf 100644
--- a/doc/descriptions/avision.desc
+++ b/doc/descriptions/avision.desc
@@ -29,6 +29,12 @@
 :mfg "Avision"
 :url "http://www.avision.com"
 
+:model "AD345F"
+:interface "USB"
+:usbid "0x0638" "0x2e59"
+:comment "sheetfed duplex + flatbed scanner; ADF limitation: one sheet per one scan, scanner reboot needed otherwise"
+:status :basic
+
 :model "AV100CS"
 :interface "SCSI"
 :status :untested
@@ -348,6 +354,12 @@
 :comment "1 pass, 600 dpi, zero-edge" ASIC 7
 :status :basic
 
+:model "FB2280E"
+:interface "USB"
+:usbid "0x0638" "0x2a1f"
+:comment "1 pass, 600 dpi, zero-edge" ASIC 7
+:status :basic
+
 :model "AV8000S"
 :interface "SCSI"
 :comment "1 pass, 1200 dpi, A3"
diff --git a/doc/descriptions/canon.desc b/doc/descriptions/canon.desc
index 78a20c4..1a7e837 100644
--- a/doc/descriptions/canon.desc
+++ b/doc/descriptions/canon.desc
@@ -13,7 +13,7 @@
 :version "1.12 (unmaintained)"	; version of backend
 ;:status :good			; :alpha, :beta, :stable, :new
 
-:url "http://www.rzg.mpg.de/~mpd/sane/" ; backend home page
+:url "https://web.archive.org/web/20051103043526/http://www.rzg.mpg.de/~mpd/sane/" ; backend home page
 
 :devicetype :scanner
 
diff --git a/doc/descriptions/canon_dr.desc b/doc/descriptions/canon_dr.desc
index d43b1ea..b1f663b 100644
--- a/doc/descriptions/canon_dr.desc
+++ b/doc/descriptions/canon_dr.desc
@@ -335,6 +335,12 @@
 :usbid "0x1083" "0x162c"
 :status :good
 
+:model "P-150"
+:interface "USB"
+:usbid "0x1083" "0x162d"
+:status :unsupported
+:comment "This is the same device as the 0x162c P-150, but the mode switch on the scanner is in the wrong position, you must move the switch."
+
 :model "P-201"
 :interface "USB"
 :usbid "0x1083" "0x1652"
@@ -355,7 +361,7 @@
 :model "P-208"
 :interface "USB"
 :usbid "0x1083" "0x164e"
-:status :basic
+:status :unsupported
 :comment "This is the same device as the 0x164c P-208, but the mode switch on the scanner is in the wrong position, you must move the switch."
 
 :model "DR-P208II"
@@ -372,7 +378,7 @@
 :model "P-208II"
 :interface "USB"
 :usbid "0x1083" "0x1660"
-:status :basic
+:status :unsupported
 :comment "This is the same device as the 0x165f P-208II, but the mode switch on the scanner is in the wrong position, you must move the switch."
 
 :model "DR-P215"
@@ -390,7 +396,7 @@
 :model "P-215"
 :interface "USB"
 :usbid "0x1083" "0x1647"
-:status :basic
+:status :unsupported
 :comment "This is the same device as the 0x1646 P-215, but the mode switch on the scanner is in the wrong position, you must move the switch."
 
 :model "DR-P215II"
@@ -407,3 +413,9 @@
 :interface "USB"
 :usbid "0x1083" "0x1648"
 :status :untested
+
+:model "R40"
+:interface "USB"
+:usbid "0x1083" "0x1679"
+:status :basic
+:comment "Letter-size ADF. Hardware provides: Gray/Color, Simplex/Duplex, Full-width, 300/600dpi horizontal, with front mirrored horizontally. Driver provides: Binary, Despeckle, Deskew, Cropping, Calibration, other resolutions. Multistream unsupported."
diff --git a/doc/descriptions/epjitsu.desc b/doc/descriptions/epjitsu.desc
index 03bc8fb..e7b0ff6 100644
--- a/doc/descriptions/epjitsu.desc
+++ b/doc/descriptions/epjitsu.desc
@@ -10,15 +10,16 @@
 ;
 
 :backend "epjitsu"               ; name of backend
-:version "31"                    ; version of backend
+:version "33"                    ; version of backend
 :manpage "sane-epjitsu"          ; name of manpage (if it exists)
-:comment "Backend updated for SANE release 1.0.26, see sane-epjitsu manpage"
+:comment "Backend updated for SANE release 1.1.2, see sane-epjitsu manpage"
 :devicetype :scanner             ; start of a list of devices....
                                  ; other types:  :stillcam, :vidcam,
                                  ;               :meta, :api
 
 :mfg "Fujitsu"                   ; name a manufacturer
 :url "http://www.fujitsu.com/"
+:url "https://fujitsuscanners.com/"
 
 ;==================================================
 :model "fi-60F"
diff --git a/doc/descriptions/epsonds.desc b/doc/descriptions/epsonds.desc
index 9a17f43..989caf8 100644
--- a/doc/descriptions/epsonds.desc
+++ b/doc/descriptions/epsonds.desc
@@ -341,20 +341,20 @@
 
 :model      "ET-2810 Series"
 :interface  "USB"
-:usbid      "0x04b8" "0x118A"
+:usbid      "0x04b8" "0x118a"
 :status     :complete
 
 :model      "L3250 Series"
 :interface  "USB"
-:usbid      "0x04b8" "0x118A"
+:usbid      "0x04b8" "0x118a"
 :status     :complete
 
 :model      "XP-2150 Series"
 :interface  "USB"
-:usbid      "0x04b8" "0x119B"
+:usbid      "0x04b8" "0x119b"
 :status     :complete
 
-:model      ""
+:model      "XP-2200 Series"
 :interface  "USB"
-:usbid      "0x04b8" "0x00"
+:usbid      "0x04b8" "0x11b1"
 :status     :complete
diff --git a/doc/descriptions/escl.desc b/doc/descriptions/escl.desc
index fa5b32b..e09c4b4 100644
--- a/doc/descriptions/escl.desc
+++ b/doc/descriptions/escl.desc
@@ -23,13 +23,23 @@
 :status :good
 :comment "All resolutions supported."
 
+:model "MFC-J985DW"
+:interface "Ethernet WiFi"
+:status :good
+:comment "All resolutions supported, Flatbed and ADF supported."
+
+:model "MFC-J1300DW"
+:interface "Ethernet WiFi"
+:status :good
+:comment "All resolutions supported, Flatbed and ADF supported."
+
 :mfg "Canon"
 :url "https://www.canon-europe.com/support/"
 
 :model "IR C3520"
 :interface "WiFi"
 :status :good
-:comment "All resolutions supported, Flatted and ADF supported."
+:comment "All resolutions supported, Flatbed and ADF supported."
 
 :model "PIXMA MG5765"
 :interface "WiFi"
@@ -47,39 +57,39 @@
 :comment "Testers needed!"
 
 :model "PIXMA TR4520 Series"
-:interface "Wifi"
+:interface "WiFi"
 :status :good
-:comment "All resolutions supported, Flatted and ADF supported."
+:comment "All resolutions supported, Flatbed and ADF supported."
 
 :model "PIXMA TR4540 Series"
-:interface "Wifi"
+:interface "WiFi"
 :status :good
-:comment "All resolutions supported, Flatted and ADF supported."
+:comment "All resolutions supported, Flatbed and ADF supported."
 
 :model "PIXMA TR4550 Series"
-:interface "Wifi"
+:interface "WiFi"
 :status :good
-:comment "All resolutions supported, Flatted and ADF supported."
+:comment "All resolutions supported, Flatbed and ADF supported."
 
 :model "PIXMA TR4551"
-:interface "Wifi"
+:interface "WiFi"
 :status :good
-:comment "All resolutions supported, Flatted and ADF supported."
+:comment "All resolutions supported, Flatbed and ADF supported."
 
 :model "PIXMA TR7500 Series"
 :interface "WiFi"
 :status :good
-:comment "All resolutions supported, Flatted and ADF supported."
+:comment "All resolutions supported, Flatbed and ADF supported."
 
 :model "PIXMA TR8500 Series"
 :interface "Ethernet WiFi"
 :status :good
-:comment "All resolutions supported, Flatted and ADF supported."
+:comment "All resolutions supported, Flatbed and ADF supported."
 
 :model "PIXMA TR8520"
 :interface "Ethernet WiFi"
 :status :good
-:comment "All resolutions supported, Flatted and ADF supported."
+:comment "All resolutions supported, Flatbed and ADF supported."
 
 :model "PIXMA TS3100 Series"
 :interface "WiFi"
@@ -121,6 +131,21 @@
 :status :good
 :comment "All resolutions supported."
 
+:model "PIXMA TS3450"
+:interface "WiFi"
+:status :good
+:comment "All resolutions supported."
+
+:model "PIXMA TS3451"
+:interface "WiFi"
+:status :good
+:comment "All resolutions supported."
+
+:model "PIXMA TS3452"
+:interface "WiFi"
+:status :good
+:comment "All resolutions supported."
+
 :model "PIXMA TS5350 Series"
 :interface "WiFi"
 :status :good
@@ -132,17 +157,22 @@
 :comment "All resolutions supported."
 
 :model "PIXMA TS6150 Series"
-:interface "Wifi"
+:interface "WiFi"
 :status :untested
 :comment "Testers needed!"
 
 :model "PIXMA TS8050 Series"
-:interface "Wifi"
+:interface "WiFi"
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA TS8350 Series"
+:interface "WiFi"
+:status :good
+:comment "All resolutions supported."
+
 :model "PIXMA TS9100 Series"
-:interface "Wifi"
+:interface "WiFi"
 :status :untested
 :comment "Testers needed!"
 
@@ -152,22 +182,27 @@
 :model "ET-2750"
 :interface "WiFi"
 :status :good
-:comment "All resolutions supported, Flatted only supported."
+:comment "All resolutions supported, Flatbed only supported."
 
 :model "ET-3750"
 :interface "WiFi"
 :status :good
-:comment "All resolutions supported, Flatted and ADF supported."
+:comment "All resolutions supported, Flatbed and ADF supported."
 
 :model "ET-4750"
 :interface "WiFi"
 :status :good
-:comment "All resolutions supported, Flatted and ADF supported."
+:comment "All resolutions supported, Flatbed and ADF supported."
+
+:model "EcoTank L3160"
+:interface "WiFi"
+:status :good
+:comment "All resolutions supported."
 
 :model "XP-6100"
 :interface "WiFi"
 :status :good
-:comment "All resolutions supported, Flatted only supported."
+:comment "All resolutions supported, Flatbed only supported."
 
 :mfg "HP"
 :url "https://support.hp.com/us-en/drivers/printers"
@@ -215,7 +250,7 @@
 :model "OfficeJet Pro 8610"
 :interface "Ethernet WiFi"
 :status :good
-:comment "All resolutions supported, Flatted and ADF supported."
+:comment "All resolutions supported, Flatbed and ADF supported."
 
 :mfg "Ricoh"
 :url "http://support.ricoh.com/bb/html/dr_ut_e/re2/"
@@ -231,4 +266,4 @@
 :model "VERSALINK C7220"
 :interface "WiFi"
 :status :good
-:comment "All resolutions supported, Flatted and ADF supported."
+:comment "All resolutions supported, Flatbed and ADF supported."
diff --git a/doc/descriptions/fujitsu.desc b/doc/descriptions/fujitsu.desc
index d484168..6cf8381 100644
--- a/doc/descriptions/fujitsu.desc
+++ b/doc/descriptions/fujitsu.desc
@@ -11,16 +11,16 @@
 
 
 :backend "fujitsu"               ; name of backend
-:url "http://www.thebility.com/fujitsu/"
-:version "137"                   ; version of backend
+:version "139"                   ; version of backend
 :manpage "sane-fujitsu"          ; name of manpage (if it exists)
-:comment "Backend updated for SANE release 1.0.32, see sane-fujitsu manpage"
+:comment "Backend updated for SANE release 1.1.2, see sane-fujitsu manpage"
 :devicetype :scanner             ; start of a list of devices....
                                  ; other types:  :stillcam, :vidcam,
                                  ;               :meta, :api
 
 :mfg "Fujitsu"                   ; name a manufacturer
 :url "http://www.fujitsu.com/"
+:url "https://fujitsuscanners.com/"
 
 ;==================================================
 ; DISCONTINUED OLDER MODELS, SMALL
@@ -28,12 +28,10 @@
 :interface "SCSI"
 :url "http://www.remote.org/frederik/projects/software/sane/"
 :status :complete
-:comment "small, old, discontinued"
 
 :model "M3092DC"
 :interface "SCSI"
 :status :complete
-:comment "small, old, discontinued"
 
 ;==================================================
 ; DISCONTINUED NEWER MODELS, SMALL
@@ -41,61 +39,55 @@
 :interface "SCSI USB"
 :usbid "0x04c5" "0x1041"
 :status :complete
-:comment "small, recent, discontinued, usb 1.1"
+:comment "Slow USB 1.1"
 
 :model "fi-4120C2"
 :interface "SCSI USB"
 :usbid "0x04c5" "0x10ae"
 :status :complete
-:comment "small, recent, discontinued, usb 2.0"
+:comment "Faster USB 2.0"
 
 :model "fi-4220C"
 :interface "SCSI USB"
 :usbid "0x04c5" "0x1042"
 :status :complete
-:comment "small, recent, discontinued, usb 1.1"
+:comment "Slow USB 1.1"
 
 :model "fi-4220C2"
 :interface "SCSI USB"
 :usbid "0x04c5" "0x10af"
 :status :complete
-:comment "small, recent, discontinued, usb 2.0"
+:comment "Faster USB 2.0"
 
 :model "fi-5110C"
 :interface "USB"
 :status :complete
 :usbid "0x04c5" "0x1097"
-:comment "small, recent, discontinued"
 
 :model "fi-5110EOX/2"
 :interface "USB"
 :status :complete
 :usbid "0x04c5" "0x1096"
-:comment "small, recent, discontinued"
 
 :model "fi-5110EOX3"
 :interface "USB"
 :status :complete
 :usbid "0x04c5" "0x10e6"
-:comment "small, recent, discontinued"
 
 :model "fi-5110EOXM"
 :interface "USB"
 :usbid "0x04c5" "0x10f2"
 :status :complete
-:comment "small, recent, discontinued"
 
 :model "fi-5120C"
 :interface "SCSI USB"
 :status :complete
 :usbid "0x04c5" "0x10e0"
-:comment "small, recent, discontinued"
 
 :model "fi-5220C"
 :interface "SCSI USB"
 :status :complete
 :usbid "0x04c5" "0x10e1"
-:comment "small, recent, discontinued"
 
 :model "fi-5000N"
 :interface "Ethernet"
@@ -105,154 +97,132 @@
 :model "fi-6000NS"
 :interface "Ethernet"
 :status :untested
-:comment "small, recent, discontinued, integrated touchscreen and keyboard"
 
 :model "ScanSnap S500"
 :interface "USB"
 :status :complete
 :usbid "0x04c5" "0x10fe"
-:comment "small, recent, discontinued"
 
 :model "ScanSnap S500M"
 :interface "USB"
 :status :complete
 :usbid "0x04c5" "0x1135"
-:comment "small, recent, discontinued"
 
 :model "ScanSnap S510"
 :interface "USB"
 :status :complete
 :usbid "0x04c5" "0x1155"
-:comment "small, recent, discontinued"
 
 :model "ScanSnap S510M"
 :interface "USB"
 :status :complete
 :usbid "0x04c5" "0x116f"
-:comment "small, recent, discontinued"
 
 :model "fi-6130"
 :interface "USB"
 :status :complete
 :usbid "0x04c5" "0x114f"
-:comment "small, recent, discontinued"
 
 :model "fi-6230"
 :interface "USB"
 :status :complete
 :usbid "0x04c5" "0x1150"
-:comment "small, recent, discontinued"
 
 :model "fi-6130Z"
 :interface "USB"
 :status :complete
 :usbid "0x04c5" "0x11f3"
-:comment "small, recent, discontinued"
 
 :model "fi-6230Z"
 :interface "USB"
 :status :complete
 :usbid "0x04c5" "0x11f4"
-:comment "small, recent, discontinued"
 
 :model "fi-6120ZLA"
 :interface "SCSI USB"
 :status :untested
 :usbid "0x04c5" "0x146d"
-:comment "small, recent, discontinued, expected to work"
 
 :model "fi-6220ZLA"
 :interface "SCSI USB"
 :status :untested
 :usbid "0x04c5" "0x146e"
-:comment "small, recent, discontinued, expected to work"
 
 :model "fi-6125ZLA"
 :interface "SCSI USB"
 :status :untested
 :usbid "0x04c5" "0x1463"
-:comment "small, recent, discontinued, expected to work"
 
 :model "fi-6225ZLA"
 :interface "SCSI USB"
 :status :untested
 :usbid "0x04c5" "0x1464"
-:comment "small, recent, discontinued, expected to work"
 
 :model "fi-6130ZLA"
 :interface "SCSI USB"
 :status :complete
 :usbid "0x04c5" "0x1461"
-:comment "small, recent, discontinued"
 
 :model "fi-6230ZLA"
 :interface "SCSI USB"
 :status :untested
 :usbid "0x04c5" "0x1462"
-:comment "small, recent, discontinued, expected to work"
 
 :model "ScanSnap S1500"
 :interface "USB"
 :status :complete
 :usbid "0x04c5" "0x11a2"
-:comment "small, discontinued"
 
 :model "ScanSnap S1500M"
 :interface "USB"
 :status :complete
 :usbid "0x04c5" "0x11a2"
-:comment "small, discontinued, same as S1500"
+:comment "Same as S1500"
 
 :model "ScanSnap N1800"
 :interface "Ethernet"
-:status :untested
-:comment "small, discontinued, integrated touchscreen and keyboard"
+:status :unsupported
 
 ;==================================================
 ; CURRENT MODELS, SMALL
 :model "ScanSnap N7100"
 :interface "Ethernet"
-:status :untested
-:comment "small, current, integrated touchscreen and keyboard"
+:status :unsupported
 
 :model "ScanSnap fi-6010N"
 :interface "Ethernet"
-:status :untested
-:comment "small, current, integrated touchscreen and keyboard"
+:status :unsupported
 
 :model "fi-6110"
 :interface "USB"
 :status :complete
 :usbid "0x04c5" "0x11fc"
-:comment "small, current"
 
 :model "fi-7160"
 :interface "USB"
 :status :complete
 :usbid "0x04c5" "0x132e"
-:comment "small, current"
 
 :model "fi-7260"
 :interface "USB"
 :status :complete
 :usbid "0x04c5" "0x132f"
-:comment "small, current"
 
 :model "ScanSnap iX500"
 :interface "USB WiFi"
 :status :good
 :usbid "0x04c5" "0x132b"
-:comment "small, current, WiFi not supported. Hardware only scans in color. Backend generates binary and grayscale modes."
+:comment "WiFi not supported. Hardware only scans in color. Backend generates binary and grayscale modes."
 
 :model "ScanSnap iX100"
 :interface "USB WiFi"
 :status :good
 :usbid "0x04c5" "0x13f4"
-:comment "small, current, WiFi not supported."
+:comment "WiFi not supported."
 
 :model "ScanSnap SV600"
 :interface "USB"
-:status :untested
+:status :unsupported
 :usbid "0x04c5" "0x128e"
 :comment "Also has a second USB VID 0x13ba. Will require some gymnastics to support."
 
@@ -261,57 +231,46 @@
 :model "M3093E"
 :interface "RS232C/Video"
 :status :unsupported
-:comment "medium, old, discontinued"
 
 :model "M3093DE"
 :interface "RS232C/Video"
 :status :unsupported
-:comment "medium, old, discontinued"
 
 :model "M3093DG"
 :interface "SCSI"
 :status :complete
-:comment "medium, old, discontinued"
 
 :model "M3093EX"
 :interface "RS232C/Video"
 :status :unsupported
-:comment "medium, old, discontinued"
 
 :model "M3093GX"
 :interface "SCSI"
 :status :complete
-:comment "medium, old, discontinued"
 
 :model "M3096EX"
 :interface "RS232C/Video"
 :status :unsupported
-:comment "medium, old, discontinued"
 
 :model "M3096GX"
 :interface "SCSI"
 :status :complete
-:comment "medium, old, discontinued"
 
 :model "M3097E+"
 :interface "RS232C/Video"
 :status :unsupported
-:comment "medium, old, discontinued"
 
 :model "M3097G+"
 :interface "SCSI"
 :status :complete
-:comment "medium, old, discontinued"
 
 :model "M3097DE"
 :interface "RS232C/Video"
 :status :unsupported
-:comment "medium, old, discontinued"
 
 :model "M3097DG"
 :interface "SCSI"
 :status :complete
-:comment "medium, old, discontinued"
 
 ;==================================================
 ; DISCONTINUED NEWER MODELS, MEDIUM
@@ -319,77 +278,64 @@
 :interface "SCSI USB"
 :usbid "0x04c5" "0x10cf"
 :status :complete
-:comment "medium, current"
 
 :model "fi-4530C"
 :interface "SCSI USB"
 :status :complete
 :usbid "0x04c5" "0x1078"
-:comment "medium, recent, discontinued"
 
 :model "fi-4640S"
 :interface "SCSI"
 :status :complete
-:comment "medium, recent, discontinued"
 
 :model "fi-4750C"
 :interface "SCSI"
 :status :complete
-:comment "medium, recent, discontinued"
 
 :model "fi-5530C"
 :interface "SCSI USB"
 :status :complete
 :usbid "0x04c5" "0x10e2"
-:comment "medium, recent, discontinued"
 
 :model "fi-6140"
 :interface "SCSI USB"
 :status :complete
 :usbid "0x04c5" "0x114d"
-:comment "medium, recent, discontinued"
 
 :model "fi-6240"
 :interface "SCSI USB"
 :status :complete
 :usbid "0x04c5" "0x114e"
-:comment "medium, recent, discontinued"
 
 :model "fi-6140Z/fi-6140ZLA"
 :interface "SCSI USB"
 :status :complete
 :usbid "0x04c5" "0x11f1"
-:comment "medium, recent, discontinued"
 
 :model "fi-6240Z"
 :interface "SCSI USB"
 :status :complete
 :usbid "0x04c5" "0x11f2"
-:comment "medium, recent, discontinued"
 
 :model "fi-6135ZLA"
 :interface "SCSI USB"
 :status :untested
 :usbid "0x04c5" "0x146b"
-:comment "medium, recent, discontinued, expected to work"
 
 :model "fi-6235ZLA"
 :interface "SCSI USB"
 :status :untested
 :usbid "0x04c5" "0x146c"
-:comment "medium, recent, discontinued, expected to work"
 
 :model "fi-6140ZLA"
 :interface "SCSI USB"
 :status :untested
 :usbid "0x04c5" "0x145f"
-:comment "medium, recent, discontinued, expected to work"
 
 :model "fi-6240ZLA"
 :interface "SCSI USB"
 :status :untested
 :usbid "0x04c5" "0x1460"
-:comment "medium, recent, discontinued, expected to work"
 
 ;==================================================
 ; CURRENT MODELS, MEDIUM
@@ -398,107 +344,90 @@
 :interface "SCSI USB"
 :status :complete
 :usbid "0x04c5" "0x114a"
-:comment "medium, current"
 
 :model "fi-7180"
 :interface "USB"
 :status :complete
 :usbid "0x04c5" "0x132c"
-:comment "medium, current"
 
 :model "fi-7280"
 :interface "USB"
 :status :complete
 :usbid "0x04c5" "0x132d"
-:comment "medium, current"
 
 ;==================================================
 ; DISCONTINUED OLDER MODELS, BIG
 :model "M3099A"
 :interface "RS232C/Video"
 :status :unsupported
-:comment "big, old, discontinued"
 
 :model "M3099G"
 :interface "SCSI"
 :status :complete
-:comment "big, old, discontinued"
 
 :model "M3099EH"
 :interface "RS232C/Video"
 :status :unsupported
-:comment "big, old, discontinued"
 
 :model "M3099GH"
 :interface "SCSI"
 :status :complete
-:comment "big, old, discontinued"
 
 :model "M3099EX"
 :interface "RS232C/Video"
 :status :unsupported
-:comment "big, old, discontinued"
 
 :model "M3099GX"
 :interface "SCSI"
 :status :complete
-:comment "big, old, discontinued"
 
 :model "M4097D"
 :interface "SCSI"
 :status :complete
-:comment "big, old, discontinued"
 
 :model "M4099D"
 :interface "SCSI"
 :status :complete
-:comment "big, old, discontinued"
 
 ;==================================================
 ; DISCONTINUED NEWER MODELS, BIG
 :model "fi-4750L"
 :interface "SCSI"
 :status :complete
-:comment "big, recent, discontinued"
 
 :model "fi-4860C"
 :interface "SCSI"
 :status :complete
-:comment "big, recent, discontinued"
 
 :model "fi-4860C2"
 :interface "SCSI"
 :status :complete
-:comment "big, recent, discontinued"
 
 :model "fi-4990C"
 :interface "SCSI"
 :status :complete
-:comment "big, recent, discontinued"
 
 :model "fi-5650C"
 :interface "SCSI USB"
 :usbid "0x04c5" "0x10ad"
 :status :complete
-:comment "big, recent, discontinued"
 
 :model "fi-5750C"
 :interface "SCSI USB"
 :usbid "0x04c5" "0x1095"
 :status :complete
-:comment "big, recent, discontinued"
 
 :model "fi-5900C"
 :interface "SCSI USB"
 :usbid "0x04c5" "0x10e7"
 :status :good
-:comment "big, recent, discontinued. Independent ultrasonic control and multistream unsupported"
+:comment "Independent ultrasonic control and multistream unsupported"
 
 :model "fi-6750S"
 :interface "USB"
 :status :untested
 :usbid "0x04c5" "0x1178"
-:comment "Simplex, USB only version of fi-6770, won't wakeup via software, discontinued"
+:comment "Simplex, USB only version of fi-6770, won't wakeup via software"
 
 ;==================================================
 ; CURRENT MODELS, BIG
@@ -506,43 +435,42 @@
 :interface "SCSI USB"
 :usbid "0x04c5" "0x1213"
 :status :untested
-:comment "big, current. Faster version of fi-5900?"
 
 :model "fi-6670"
 :interface "SCSI USB"
 :status :good
 :usbid "0x04c5" "0x1176"
-:comment "big, current, won't wakeup via software"
+:comment "Won't wakeup via software"
 
 :model "fi-6670A"
 :interface "SCSI USB"
 :status :good
 :usbid "0x04c5" "0x1177"
-:comment "big, current, VRS CGA board unsupported, won't wakeup via software"
+:comment "VRS CGA board unsupported, won't wakeup via software"
 
 :model "fi-6770"
 :interface "SCSI USB"
 :status :good
 :usbid "0x04c5" "0x1174"
-:comment "big, current, won't wakeup via software"
+:comment "Won't wakeup via software"
 
 :model "fi-6770A"
 :interface "SCSI USB"
 :status :good
 :usbid "0x04c5" "0x1175"
-:comment "big, current, VRS CGA board unsupported, won't wakeup via software"
+:comment "VRS CGA board unsupported, won't wakeup via software"
 
 :model "fi-6800"
 :interface "SCSI USB"
 :status :untested
 :usbid "0x04c5" "0x119d"
-:comment "big, current. Independent ultrasonic control and multistream unsupported"
+:comment "Independent ultrasonic control and multistream unsupported"
 
 :model "fi-6800-CGA"
 :interface "SCSI USB"
 :status :untested
 :usbid "0x04c5" "0x119e"
-:comment "big, current. VRS CGA board unsupported, Independent ultrasonic control and multistream unsupported"
+:comment "VRS CGA board unsupported, Independent ultrasonic control and multistream unsupported"
 
 :model "fi-6400"
 :interface "SCSI USB"
@@ -550,7 +478,7 @@
 :usbid "0x04c5" "0x14ac"
 
 ;==================================================
-; 2015/2016/2017 NEW MODELS, UNORDERED
+; 2015 and later NEW MODELS, UNORDERED
 
 :model "fi-6420"
 :interface "SCSI USB"
@@ -656,13 +584,13 @@
 :interface "USB WiFi"
 :status :good
 :usbid "0x04c5" "0x159f"
-:comment "small, current, WiFi not supported."
+:comment "WiFi not supported."
 
 :model "fi-800R"
 :interface "USB"
 :status :good
 :usbid "0x04c5" "0x15fc"
-:comment "small, current, both feed methods are supported."
+:comment "Both feed methods are supported."
 
 :model "fi-7900"
 :interface "USB"
@@ -674,8 +602,77 @@
 :status :good
 :usbid "0x04c5" "0x160b"
 
+:model "ScanSnap iX1300"
+:interface "USB WiFi"
+:status :good
+:usbid "0x04c5" "0x162c"
+:comment "WiFi not supported."
+
+:model "ScanSnap iX1400"
+:interface "USB"
+:status :untested
+:usbid "0x04c5" "0x1630"
+
 :model "ScanSnap iX1600"
 :interface "USB WiFi"
 :status :good
 :usbid "0x04c5" "0x1632"
-:comment "small, current, WiFi not supported."
+:comment "WiFi not supported."
+
+:model "ScanPartner SP30"
+:interface "USB"
+:status :good
+:usbid "0x04c5" "0x140a"
+:comment "Reported to work, but that is questionable because other SP scanners are unsupported."
+
+:model "fi-7300NX"
+:interface "USB"
+:status :good
+:usbid "0x04c5" "0x1575"
+:comment "Ethernet and WiFi not supported."
+
+:model "fi-8190"
+:interface "USB"
+:status :good
+:usbid "0x04c5" "0x15fd"
+:comment "Ethernet not supported."
+
+:model "fi-8290"
+:interface "USB"
+:status :good
+:usbid "0x04c5" "0x15fe"
+:comment "Ethernet not supported."
+
+:model "fi-8170"
+:interface "USB"
+:status :good
+:usbid "0x04c5" "0x15ff"
+:comment "Ethernet not supported."
+
+:model "fi-8270"
+:interface "USB"
+:status :good
+:usbid "0x04c5" "0x1600"
+:comment "Ethernet not supported."
+
+:model "fi-8150"
+:interface "USB"
+:status :good
+:usbid "0x04c5" "0x1601"
+:comment "Ethernet not supported."
+
+:model "fi-8250"
+:interface "USB"
+:status :good
+:usbid "0x04c5" "0x1602"
+:comment "Ethernet not supported."
+
+:model "fi-8150U"
+:interface "USB"
+:status :good
+:usbid "0x04c5" "0x162d"
+
+:model "fi-8250U"
+:interface "USB"
+:status :good
+:usbid "0x04c5" "0x162e"
diff --git a/doc/descriptions/pixma.desc b/doc/descriptions/pixma.desc
index 618d128..b1a5657 100644
--- a/doc/descriptions/pixma.desc
+++ b/doc/descriptions/pixma.desc
@@ -106,6 +106,18 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA E4500 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18db"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA G600"
+:interface "USB"
+:usbid "0x04a9" "0x18d5"
+:status :complete
+:comment "All resolutions supported (up to 600DPI)."
+
 :model "PIXMA G2000"
 :interface "USB"
 :usbid "0x04a9" "0x1795"
@@ -214,6 +226,18 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA GX6000 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x18a6"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA GX7000"
+:interface "USB"
+:usbid "0x04a9" "0x18a8"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA MG2100 Series"
 :interface "USB"
 :usbid "0x04a9" "0x1751"
@@ -917,6 +941,17 @@
 :status :complete
 :comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI)"
 
+:model "PIXMA TR4600 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18da"
+:status :complete
+:comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI)"
+
+:model "PIXMA TR4700 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18dc"
+:status :complete
+:comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI)"
 
 :model "PIXMA TR7000 Series"
 :interface "USB"
@@ -978,6 +1013,18 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA TS2400 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1108"
+:status :good
+:comment "All resolutions supported (up to 600DPI). WiFi not working."
+
+:model "PIXMA TS2600 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1107"
+:status :good
+:comment "All resolutions supported (up to 600DPI). WiFi not working."
+
 :model "PIXMA TS3100 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1827"
@@ -990,9 +1037,27 @@
 :status :good
 :comment "All resolutions supported (up to 1200DPI). WiFi not working."
 
-:model "PIXMA TS3400 Series"
+:model "PIXMA TS3450"
+:interface "USB"
+:usbid "0x04a9" "0x18b7"
+:status :good
+:comment ""All resolutions supported (up to 600DPI). WiFi not working.
+
+:model "PIXMA TS3451"
+:interface "USB"
+:usbid "0x04a9" "0x18b7"
+:status :good
+:comment ""All resolutions supported (up to 600DPI). WiFi not working.
+
+:model "PIXMA TS3452"
 :interface "USB"
 :usbid "0x04a9" "0x18b7"
+:status :good
+:comment ""All resolutions supported (up to 600DPI). WiFi not working.
+
+:model "PIXMA TS3500 Series"
+:interface "USB"
+:usbid "0x04a9" "0x18d4"
 :status :untested
 :comment "Testers needed!"
 
@@ -1014,12 +1079,24 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA TS5350i Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18d9"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA TS5380 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x188c"
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA TS5400 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18d8"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA TS6000 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1801"
@@ -1083,8 +1160,8 @@
 :model "PIXMA TS6400 Series"
 :interface "USB"
 :usbid "0x04a9" "0x18d3"
-:status :untested
-:comment "Testers needed!"
+:status :good
+:comment "All resolutions supported (up to 1200DPI). WiFi not tested by Pixma as yet."
 
 :model "PIXMA TS7330 Series"
 :interface "USB WiFi"
@@ -1104,18 +1181,24 @@
 :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 TS7450i Series"
+:interface "USB"
+:usbid "0x04a9" "0x18f7"
+:status :untested
+:comment "Testers needed!"
 
-:model "PIXMA TS8430 Series"
+:model "PIXMA TS7530 Series"
 :interface "USB"
-:usbid "0x04a9" "0x18b5"
+:usbid "0x04a9" "0x18e1"
 :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 supported by Pixma."
+
 :model "PIXMA TS8100 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1821"
@@ -1170,6 +1253,18 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA TS8430 Series"
+:interface "USB"
+:usbid "0x04a9" "0x18b5"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS8530 Series"
+:interface "USB"
+:usbid "0x04a9" "0x18e0"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA TS9000 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x179f"
@@ -1236,6 +1331,18 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXUS XK100 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18e2"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXUS XK500 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18df"
+:status :untested
+:comment "Testers needed!"
+
 :model "imageCLASS D420"
 :interface "USB"
 :usbid "0x04a9" "0x26ef"
@@ -1650,6 +1757,12 @@
 :status :complete
 :comment "All resolutions supported (up to 600DPI). Identical with SmartBase MPC200 and PIXUS MP10."
 
+:model "imageRUNNER 1018/1022/1023"
+:interface "USB"
+:usbid "0x04a9" "0x269d"
+:status :complete
+:comment "Flatbed and ADF scan.  All resolutions supported (up to 600DPI)"
+
 :model "imageRUNNER 1020/1024/1025"
 :interface "USB"
 :usbid "0x04a9" "0x26e6"
diff --git a/doc/descriptions/sp15c.desc b/doc/descriptions/sp15c.desc
index c43af80..f75c2cf 100644
--- a/doc/descriptions/sp15c.desc
+++ b/doc/descriptions/sp15c.desc
@@ -19,8 +19,8 @@
                                   ;               :meta, :api
 
 :mfg "Fujitsu"  ; name a manufacturer
-:url "http://www.fcpa.fujitsu.com/products/scanners/"
 :url "http://www.fujitsu.com/"
+:url "https://fujitsuscanners.com/"
 
 :model "ScanPartner 15C"                  ; name models for above-specified mfg.
 :interface "SCSI"
diff --git a/doc/descriptions/template.desc. b/doc/descriptions/template.desc
index a6b6bab..a6b6bab 100644
--- a/doc/descriptions/template.desc.
+++ b/doc/descriptions/template.desc
diff --git a/doc/descriptions/unsupported.desc b/doc/descriptions/unsupported.desc
index e7c1954..809be9b 100644
--- a/doc/descriptions/unsupported.desc
+++ b/doc/descriptions/unsupported.desc
@@ -434,27 +434,6 @@
 :status :unsupported
 :comment "Probably not supported. Scanner cardridge for Canon inkjet printers."
 
-:model "ImageRunner iR1018"
-: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"
-:interface "USB"
-:usbid "0x04a9" "0x269d"
-:status :unsupported
-:comment "Probably not supported. See link for details."
-
-:model "ImageRunner iR1023"
-: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"
 :interface "USB"
@@ -1837,6 +1816,13 @@
 :status :unsupported
 :comment "Unsupported. See link for more details."
 
+:model "OpticSlim 550"
+:url "unsupported/plustek-opticslim-550.html"
+:interface "USB"
+:usbid "0x07b3" "0x0c33"
+:status :unsupported
+:comment "GL843 based, to be added to genesys backend"
+
 :model "OpticSlim 2420"
 :url "unsupported/plustek-opticslim-2420.html"
 :interface "USB"