Merge branch 'feature/upstream' into develop

9 files changed, 505 insertions, 86 deletions

diff --git a/doc/descriptions/epson.desc b/doc/descriptions/epson.desc
index fc901a7..eb9bdb2 100644
--- a/doc/descriptions/epson.desc
+++ b/doc/descriptions/epson.desc
@@ -11,7 +11,6 @@
 
 :backend "epson"                  ; name of backend
 :version "0.2.42 (unmaintained)"  ; version of backend
-:new :no
 :manpage "sane-epson"             ; name of manpage (if it exists)
 :url "http://www.khk.net/sane"    ; backend's web page
 
diff --git a/doc/descriptions/epson2.desc b/doc/descriptions/epson2.desc
index 1af191f..ad1d183 100644
--- a/doc/descriptions/epson2.desc
+++ b/doc/descriptions/epson2.desc
@@ -8,8 +8,6 @@
 ; distributed with "Image Scan!" and released under GPL.
 
 :backend "epson2"
-:version "1.0.124 (unmaintained)"
-:new :no
 :manpage "sane-epson2"
 
 :devicetype :scanner
@@ -22,7 +20,6 @@
 :usbid      "0x04b8" "0x08ac"
 :status     :complete
 :comment    "network interface supported via DFSG non-free iscan-network-nt package<br>all-in-one"
-:url        "http://www.epson.com/"
 
 :model      "AL-MX300DNF Series"
 :interface  "USB"
@@ -164,7 +161,7 @@
 :model      "DS-G20000"
 :interface  "USB"
 :usbid      "0x04b8" "0x015b"
-:status     :good
+:status     :complete
 
 :model      "EP-702A"
 :interface  "USB"
@@ -528,10 +525,20 @@
 :status     :good
 :comment    "network interface supported via DFSG non-free iscan-network-nt package"
 
-:model      "ET-2600"
+:model      "ET-2500 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1105"
+:status     :complete
+
+:model      "ET-2600 Series"
 :interface  "USB"
 :usbid      "0x04b8" "0x1122"
-:status     :good
+:status     :complete
+
+:model      "ET-2610 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1122"
+:status     :complete
 
 :model      "ET-2650"
 :interface  "USB Ethernet"
@@ -606,7 +613,7 @@
 :model      "Expression 12000XL"
 :interface  "USB"
 :usbid      "0x04b8" "0x015b"
-:status     :good
+:status     :complete
 :comment    "overseas version of the DS-G20000"
 
 :model      "F-3200"			; product spec (JP)
@@ -698,12 +705,6 @@
 :status     :unsupported
 :comment    "supported by the epkowa backend plus non-free interpreter"
 
-:model      "GT-7400U"			; product spec (JP)
-:interface  "USB"
-:usbid      "0x04b8" "0x0120"
-:status     :unsupported
-:comment    "supported by the snapscan backend"
-
 :model      "GT-7600S"			; product spec (JP)
 :interface  "SCSI"
 :status     :complete
@@ -745,11 +746,6 @@
 :usbid      "0x04b8" "0x011e"
 :status     :complete
 
-:model      "GT-8400UF"			; product spec (JP)
-:interface  "USB"
-:usbid      "0x04b8" "0x011f"
-:status     :unsupported
-
 :model      "GT-8500"
 :status     :untested
 
@@ -761,7 +757,7 @@
 :model      "GT-8700F"			; product spec (JP)
 :interface  "SCSI USB"
 :usbid      "0x04b8" "0x010a"
-:status     :good
+:status     :complete
 :comment    "GT-8700U with TPU option bundled"
 
 :model      "GT-9000"
@@ -1059,11 +1055,36 @@
 :status     :complete
 :comment    "network interface supported via DFSG non-free iscan-network-nt package<br>all-in-one"
 
+:model      "L365 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x08d2"
+:status     :complete
+
+:model      "L366 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x08d2"
+:status     :complete
+
+:model      "L375 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1105"
+:status     :complete
+
 :model      "L380"
 :interface  "USB"
 :usbid      "0x04b8" "0x1120"
 :status     :good
 
+:model      "L395 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1122"
+:status     :complete
+
+:model      "L396 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1122"
+:status     :complete
+
 :model      "L495"
 :interface  "USB Ethernet"
 :usbid      "0x04b8" "0x1121"
@@ -1081,6 +1102,36 @@
 :status     :complete
 :comment    "all-in-one"
 
+:model      "L3050 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1122"
+:status     :complete
+
+:model      "L3060 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1122"
+:status     :complete
+
+:model      "L3100 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1141"
+:status     :complete
+
+:model      "L3110 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1142"
+:status     :complete
+
+:model      "L3200 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1189"
+:status     :complete
+
+:model      "L3210 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1188"
+:status     :complete
+
 :model      "LP-7900CS"
 :status     :untested
 :comment    "business all-in-one; scanner is a ES-7000H"
@@ -1421,6 +1472,16 @@
 :status     :complete
 :comment    "network interface supported via DFSG non-free iscan-network-nt package<br>all-in-one"
 
+:model      "PX-048A Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1102"
+:status     :complete
+
+:model      "PX-049A Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1116"
+:status     :complete
+
 :model      "PX-1600F"
 :interface  "USB"
 :usbid      "0x04b8" "0x0869"
@@ -1607,6 +1668,11 @@
 :status     :good
 :comment    "all-in-one"
 
+:model      "PX-M160T Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x110f"
+:status     :complete
+
 :model      "PX-M350F"
 :interface  "USB"
 :usbid      "0x04b8" "0x08d0"
@@ -1655,11 +1721,6 @@
 :status     :complete
 :comment    "network interface supported via DFSG non-free iscan-network-nt package<br>all-in-one"
 
-:model      "Perfection 600"
-:interface  "SCSI"
-:status     :unsupported
-:comment    "supported by the umax backend<br>rebadged UMAX Astra 1200S"
-
 :model      "Perfection 610"		; command spec
 :interface  "USB"
 :usbid      "0x04b8" "0x0103"
@@ -1684,12 +1745,6 @@
 :status     :complete
 :comment    "overseas version of the GT-6700U"
 
-:model      "Perfection 660"
-:interface  "USB"
-:usbid      "0x04b8" "0x0114"
-:status     :unsupported
-:comment    "supported by the snapscan backend"
-
 :model      "Perfection 1200S"		; command spec
 :interface  "SCSI"
 :scsi       "EPSON" "Perfection1200" "processor"
@@ -1738,12 +1793,6 @@
 :status     :unsupported
 :comment    "supported by the epkowa backend plus non-free interpreter"
 
-:model      "Perfection 1270"
-:interface  "USB"
-:usbid      "0x04b8" "0x0120"
-:status     :unsupported
-:comment    "supported by the snapscan backend<br>overseas version of the GT-7400"
-
 :model      "Perfection 1600"
 :interface  "SCSI"
 :status     :unsupported
@@ -1759,7 +1808,7 @@
 :interface  "SCSI USB"
 :scsi       "EPSON" "Perfection1640" "processor"
 :usbid      "0x04b8" "0x010a"
-:status     :good
+:status     :complete
 :comment    "overseas version of the GT-8700F"
 
 :model      "Perfection 1650"		; command spec
@@ -1780,18 +1829,6 @@
 :status     :complete
 :comment    "overseas version of the GT-8300UF"
 
-:model      "Perfection 1670"
-:interface  "USB"
-:usbid      "0x04b8" "0x011f"
-:status     :unsupported
-:comment    "supported by the snapscan backend"
-
-:model      "Perfection 1670 PHOTO"
-:interface  "USB"
-:usbid      "0x04b8" "0x011f"
-:status     :unsupported
-:comment    "supported by the snapscan backend<br>overseas version of the GT-8400UF"
-
 :model      "Perfection 2400 PHOTO"	; command spec
 :interface  "USB"
 :usbid      "0x04b8" "0x011b"
@@ -1986,12 +2023,6 @@
 :status     :good
 :comment    "overseas version of the GT-X980"
 
-:model      "Stylus CX1500"		; Australia
-:interface  "USB"
-:usbid      "0x04b8" "0x080c"
-:status     :unsupported
-:comment    "supported by the snapscan backend<br>all-in-one"
-
 :model      "Stylus CX2800"
 :interface  "USB"
 :usbid      "0x04b8" "0x0830"
@@ -3377,10 +3408,20 @@
 :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"
+:model      "XP-230 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1102"
+:status     :complete
+
+:model      "XP-235 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1102"
+:status     :complete
+
+:model      "XP-240 243 245 247 Series"
 :interface  "USB"
 :usbid      "0x04b8" "0x1116"
-:status     :good
+:status     :complete
 :comment    "network interface supported via DFSG non-free iscan-network-nt package<br>all-in-one"
 
 :model      "XP-255"
@@ -3430,6 +3471,12 @@
 :status     :good
 :comment    "network interface supported via DFSG non-free iscan-network-nt package<br>all-in-one"
 
+:model      "XP-452 455 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x113e"
+:status     :good
+:comment    "all-in-one"
+
 :model      "XP-600 Series"
 :interface  "USB"
 :usbid      "0x04b8" "0x089e"
diff --git a/doc/descriptions/epsonds.desc b/doc/descriptions/epsonds.desc
index 690dd25..9a17f43 100644
--- a/doc/descriptions/epsonds.desc
+++ b/doc/descriptions/epsonds.desc
@@ -7,7 +7,6 @@
 
 :backend "epsonds"
 :version "1.0.18 (unmaintained)"
-:new :no
 :manpage "sane-epsonds"
 
 :devicetype :scanner
@@ -94,3 +93,268 @@
 :interface  "USB"
 :usbid      "0x04b8" "0x08cc"
 :status     :untested
+
+:model      "DS-410"
+:interface  "USB"
+:usbid      "0x04b8" "0x0165"
+:status     :complete
+
+:model      "ES-50"
+:interface  "USB"
+:usbid      "0x04b8" "0x016c"
+:status     :complete
+
+:model      "DS-70"
+:interface  "USB"
+:usbid      "0x04b8" "0x0160"
+:status     :complete
+
+:model      "ES-55R"
+:interface  "USB"
+:usbid      "0x04b8" "0x016d"
+:status     :complete
+
+:model      "RR-60"
+:interface  "USB"
+:usbid      "0x04b8" "0x018c"
+:status     :complete
+
+:model      "ES-60W"
+:interface  "USB"
+:usbid      "0x04b8" "0x016e"
+:status     :complete
+
+:model      "DS-80W"
+:interface  "USB"
+:usbid      "0x04b8" "0x0166"
+:status     :complete
+
+:model      "ES-65WR"
+:interface  "USB"
+:usbid      "0x04b8" "0x016f"
+:status     :complete
+
+:model      "RR-70W"
+:interface  "USB"
+:usbid      "0x04b8" "0x018b"
+:status     :complete
+
+:model      "ES-60WW"
+:interface  "USB"
+:usbid      "0x04b8" "0x016e"
+:status     :complete
+
+:model      "ES-60WB"
+:interface  "USB"
+:usbid      "0x04b8" "0x016e"
+:status     :complete
+
+:model      "DS-1630"
+:interface  "USB"
+:usbid      "0x04b8" "0x015c"
+:status     :complete
+
+:model      "DS-1610"
+:interface  "USB"
+:usbid      "0x04b8" "0x015d"
+:status     :complete
+
+:model      "DS-1660W"
+:interface  "USB"
+:usbid      "0x04b8" "0x015e"
+:status     :complete
+
+:model      "DS-310"
+:interface  "USB"
+:usbid      "0x04b8" "0x0159"
+:status     :complete
+
+:model      "ES-200"
+:interface  "USB"
+:usbid      "0x04b8" "0x0159"
+:status     :complete
+
+:model      "DS-320"
+:interface  "USB"
+:usbid      "0x04b8" "0x0162"
+:status     :complete
+
+:model      "DS-360W"
+:interface  "USB"
+:usbid      "0x04b8" "0x015a"
+:status     :complete
+
+:model      "ES-300W"
+:interface  "USB"
+:usbid      "0x04b8" "0x015a"
+:status     :complete
+
+:model      "ES-300WR"
+:interface  "USB"
+:usbid      "0x04b8" "0x0177"
+:status     :complete
+
+:model      "ES-400II"
+:interface  "USB"
+:usbid      "0x04b8" "0x0181"
+:status     :complete
+
+:model      "DS-535II"
+:interface  "USB"
+:usbid      "0x04b8" "0x0183"
+:status     :complete
+
+:model      "DS-531"
+:interface  "USB"
+:usbid      "0x04b8" "0x0184"
+:status     :complete
+
+:model      "DS-530II"
+:interface  "USB"
+:usbid      "0x04b8" "0x0182"
+:status     :complete
+
+:model      "ES-500WII"
+:interface  "USB"
+:usbid      "0x04b8" "0x0185"
+:status     :complete
+
+:model      "DS-571W"
+:interface  "USB"
+:usbid      "0x04b8" "0x0188"
+:status     :complete
+
+:model      "DS-575WII"
+:interface  "USB"
+:usbid      "0x04b8" "0x0187"
+:status     :complete
+
+:model      "DS-570WII"
+:interface  "USB"
+:usbid      "0x04b8" "0x0186"
+:status     :complete
+
+:model      "ES-580W"
+:interface  "USB"
+:usbid      "0x04b8" "0x017f"
+:status     :complete
+
+:model      "RR-600W"
+:interface  "USB"
+:usbid      "0x04b8" "0x0180"
+:status     :complete
+
+:model      "DS-535"
+:interface  "USB"
+:usbid      "0x04b8" "0x0167"
+:status     :complete
+
+:model      "DS-535H"
+:interface  "USB"
+:usbid      "0x04b8" "0x017a"
+:status     :complete
+
+:model      "ES-400"
+:interface  "USB"
+:usbid      "0x04b8" "0x0156"
+:status     :complete
+
+:model      "DS-530"
+:interface  "USB"
+:usbid      "0x04b8" "0x0155"
+:status     :complete
+
+:model      "FF-680W"
+:interface  "USB"
+:usbid      "0x04b8" "0x016b"
+:status     :complete
+
+:model      "DS-570W"
+:interface  "USB"
+:usbid      "0x04b8" "0x0157"
+:status     :complete
+
+:model      "ES-500W"
+:interface  "USB"
+:usbid      "0x04b8" "0x0157"
+:status     :complete
+
+:model      "DS-575W"
+:interface  "USB"
+:usbid      "0x04b8" "0x0169"
+:status     :complete
+
+:model      "ES-500WR"
+:interface  "USB"
+:usbid      "0x04b8" "0x0176"
+:status     :complete
+
+:model      "EW-052A Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x114e"
+:status     :complete
+
+:model      "XP-2100 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x114e"
+:status     :complete
+
+:model      "ET-2700 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1135"
+:status     :complete
+
+:model      "L4150 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1135"
+:status     :complete
+
+:model      "ET-M2140 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x114a"
+:status     :complete
+
+:model      "M2140 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x114a"
+:status     :complete
+
+:model      "ET-M3140 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x114f"
+:status     :complete
+
+:model      "M3140 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x114f"
+:status     :complete
+
+:model      "L3150 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1143"
+:status     :complete
+
+:model      "ET-2710 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1143"
+:status     :complete
+
+:model      "ET-2810 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x118A"
+:status     :complete
+
+:model      "L3250 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x118A"
+:status     :complete
+
+:model      "XP-2150 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x119B"
+:status     :complete
+
+:model      ""
+:interface  "USB"
+:usbid      "0x04b8" "0x00"
+:status     :complete
diff --git a/doc/descriptions/escl.desc b/doc/descriptions/escl.desc
index 88f0fdb..fa5b32b 100644
--- a/doc/descriptions/escl.desc
+++ b/doc/descriptions/escl.desc
@@ -8,12 +8,17 @@
 :mfg "Brother"
 :url "https://www.brother.ee/support/drivers"
 
+:model "DCP-J772DW"
+:interface "WiFi"
+:status :good
+:comment "All resolutions supported."
+
 :model "DCP-L2530DW"
 :interface "WiFi"
 :status :good
 :comment "All resolutions supported."
 
-:model "HL-L258DW"
+:model "HL-L2590DW"
 :interface "WiFi"
 :status :good
 :comment "All resolutions supported."
@@ -21,42 +26,117 @@
 :mfg "Canon"
 :url "https://www.canon-europe.com/support/"
 
+:model "IR C3520"
+:interface "WiFi"
+:status :good
+:comment "All resolutions supported, Flatted and ADF supported."
+
 :model "PIXMA MG5765"
 :interface "WiFi"
 :status :good
 :comment "All resolutions supported."
 
+:model "PIXMA G4511"
+:interface "Ethernet WiFi"
+:status :basic
+:comment "All resolutions supported."
+
 :model "PIXMA G7050"
 :interface "Ethernet WiFi"
 :status :untested
 :comment "Testers needed!"
 
-:model "IR C3520"
+:model "PIXMA TR4520 Series"
+:interface "Wifi"
+:status :good
+:comment "All resolutions supported, Flatted and ADF supported."
+
+:model "PIXMA TR4540 Series"
+:interface "Wifi"
+:status :good
+:comment "All resolutions supported, Flatted and ADF supported."
+
+:model "PIXMA TR4550 Series"
+:interface "Wifi"
+:status :good
+:comment "All resolutions supported, Flatted and ADF supported."
+
+:model "PIXMA TR4551"
+:interface "Wifi"
+:status :good
+:comment "All resolutions supported, Flatted and ADF supported."
+
+:model "PIXMA TR7500 Series"
 :interface "WiFi"
 :status :good
 :comment "All resolutions supported, Flatted and ADF supported."
 
+:model "PIXMA TR8500 Series"
+:interface "Ethernet WiFi"
+:status :good
+:comment "All resolutions supported, Flatted and ADF supported."
+
+:model "PIXMA TR8520"
+:interface "Ethernet WiFi"
+:status :good
+:comment "All resolutions supported, Flatted and ADF supported."
+
 :model "PIXMA TS3100 Series"
 :interface "WiFi"
 :status :good
 :comment "All resolutions supported."
 
+:model "PIXMA TS3150 Series"
+:interface "WiFi"
+:status :good
+:comment "All resolutions supported."
+
+:model "PIXMA TS3151"
+:interface "WiFi"
+:status :good
+:comment "All resolutions supported."
+
+:model "PIXMA TS3152"
+:interface "WiFi"
+:status :good
+:comment "All resolutions supported."
+
 :model "PIXMA TS3300 Series"
 :interface "WiFi"
 :status :good
 :comment "All resolutions supported."
 
+:model "PIXMA TS3350 Series"
+:interface "WiFi"
+:status :good
+:comment "All resolutions supported."
+
+:model "PIXMA TS3351"
+:interface "WiFi"
+:status :good
+:comment "All resolutions supported."
+
+:model "PIXMA TS3352"
+:interface "WiFi"
+:status :good
+:comment "All resolutions supported."
+
+:model "PIXMA TS5350 Series"
+:interface "WiFi"
+:status :good
+:comment "All resolutions supported."
+
 :model "PIXMA TS5351"
 :interface "WiFi"
 :status :good
 :comment "All resolutions supported."
 
-:model "PIXMA TS6150"
+:model "PIXMA TS6150 Series"
 :interface "Wifi"
 :status :untested
 :comment "Testers needed!"
 
-:model "PIXMA TS8050"
+:model "PIXMA TS8050 Series"
 :interface "Wifi"
 :status :untested
 :comment "Testers needed!"
@@ -66,24 +146,14 @@
 :status :untested
 :comment "Testers needed!"
 
-:model "PIXMA TR4540 Series"
-:interface "Wifi"
-:status :good
-:comment "All resolutions supported, Flatted and ADF supported."
-
-:model "PIXMA TR8500 Series"
-:interface "Ethernet WiFi"
-:status :good
-:comment "All resolutions supported, Flatted and ADF supported."
-
-:model "PIXMA TR8520"
-:interface "Ethernet WiFi"
-:status :good
-:comment "All resolutions supported, Flatted and ADF supported."
-
 :mfg "Epson"
 :url "http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
 
+:model "ET-2750"
+:interface "WiFi"
+:status :good
+:comment "All resolutions supported, Flatted only supported."
+
 :model "ET-3750"
 :interface "WiFi"
 :status :good
@@ -94,6 +164,11 @@
 :status :good
 :comment "All resolutions supported, Flatted and ADF supported."
 
+:model "XP-6100"
+:interface "WiFi"
+:status :good
+:comment "All resolutions supported, Flatted only supported."
+
 :mfg "HP"
 :url "https://support.hp.com/us-en/drivers/printers"
 
@@ -112,10 +187,15 @@
 :status :good
 :comment "All resolutions supported."
 
+:model "LaserJet Entreprise Flow MFP M578"
+:interface "WiFi"
+:status :basic
+:comment "All resolutions supported."
+
 :model "LaserJet MFP M28w"
 :interface "WiFi"
-:status :untested
-:comment "Testers needed!"
+:status :basic
+:comment "All resolutions supported."
 
 :model "LaserJet FlowMFP M578"
 :interface "WiFi"
diff --git a/doc/descriptions/fujitsu.desc b/doc/descriptions/fujitsu.desc
index 0527579..d484168 100644
--- a/doc/descriptions/fujitsu.desc
+++ b/doc/descriptions/fujitsu.desc
@@ -12,9 +12,9 @@
 
 :backend "fujitsu"               ; name of backend
 :url "http://www.thebility.com/fujitsu/"
-:version "134"                   ; version of backend
+:version "137"                   ; version of backend
 :manpage "sane-fujitsu"          ; name of manpage (if it exists)
-:comment "Backend updated for SANE release 1.0.28, see sane-fujitsu manpage"
+:comment "Backend updated for SANE release 1.0.32, see sane-fujitsu manpage"
 :devicetype :scanner             ; start of a list of devices....
                                  ; other types:  :stillcam, :vidcam,
                                  ;               :meta, :api
@@ -579,7 +579,7 @@
 
 :model "fi-7140"
 :interface "USB"
-:status :untested
+:status :good
 :usbid "0x04c5" "0x14df"
 
 :model "fi-7240"
@@ -673,3 +673,9 @@
 :interface "USB"
 :status :good
 :usbid "0x04c5" "0x160b"
+
+:model "ScanSnap iX1600"
+:interface "USB WiFi"
+:status :good
+:usbid "0x04c5" "0x1632"
+:comment "small, current, WiFi not supported."
diff --git a/doc/descriptions/pieusb.desc b/doc/descriptions/pieusb.desc
index c0d17a9..0deb7af 100644
--- a/doc/descriptions/pieusb.desc
+++ b/doc/descriptions/pieusb.desc
@@ -11,7 +11,6 @@
 
 :backend "pieusb"                 ; name of backend
 :version "1.0 (unmaintained)"     ; version of backend
-:new :no
 :manpage "sane-pieusb"            ; name of manpage (if it exists)
 :url "https://github.com/kkaempf/sane-backends"  ; backend's web page
 
diff --git a/doc/descriptions/pixma.desc b/doc/descriptions/pixma.desc
index 933780f..618d128 100644
--- a/doc/descriptions/pixma.desc
+++ b/doc/descriptions/pixma.desc
@@ -172,6 +172,12 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA G4511"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x183d"
+:status :complete
+:comment "Flatbed and ADF scan.  All resolutions supported (up to 600DPI). WIFI not supported"
+
 :model "PIXMA G6000"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1865"
diff --git a/doc/descriptions/snapscan.desc b/doc/descriptions/snapscan.desc
index 33d7ec3..ae6c246 100644
--- a/doc/descriptions/snapscan.desc
+++ b/doc/descriptions/snapscan.desc
@@ -305,6 +305,18 @@
 :mfg "Epson"
 :url "http://www.epson.com"
 
+:model "GT-7400U"	; product spec (JP)
+:interface "USB"
+:usbid "0x04b8" "0x0120"
+:status :good
+:comment "Requires firmware esfw3e.bin."
+
+:model "GT-8400UF"	; product spec (JP)
+:interface "USB"
+:usbid "0x04b8" "0x011f"
+:status :good
+:comment "Requires firmware esfw30.bin, film scanning unit untested."
+
 :model "Perfection 660"
 :interface "USB"
 :usbid "0x04b8" "0x0114"
@@ -315,7 +327,7 @@
 :interface "USB"
 :usbid "0x04b8" "0x0120"
 :status :good
-:comment "Requires firmware esfw3e.bin."
+:comment "Requires firmware esfw3e.bin.<br>overseas version of the GT-7400U"
 
 :model "Perfection 1670"
 :interface "USB"
@@ -323,6 +335,12 @@
 :status :good
 :comment "Requires firmware esfw30.bin."
 
+:model "Perfection 1670 PHOTO"
+:interface "USB"
+:usbid "0x04b8" "0x011f"
+:status :good
+:comment "Requires firmware esfw30.bin, film scanning unit untested.<br>overseas version of the GT-8400UF"
+
 :model "Perfection 2480 PHOTO"
 :interface "USB"
 :usbid "0x04b8" "0x0121"
diff --git a/doc/descriptions/umax.desc b/doc/descriptions/umax.desc
index 8f5a22b..25f51ba 100644
--- a/doc/descriptions/umax.desc
+++ b/doc/descriptions/umax.desc
@@ -333,7 +333,7 @@
 :model "Perfection 600"
 :interface "SCSI"
 :status :good
-:comment "OK, SCSI-ID=EPSON Perfection600"
+:comment "OK, SCSI-ID=EPSON Perfection600<br>rebadged UMAX Astra 1200S"
 
 :mfg "Escom"                      ; another manufacturer...