Merge branch 'release/debian/1.0.32-1'debian/1.0.32-1

3 files changed, 129 insertions, 13 deletions

diff --git a/doc/descriptions-external/epkowa.desc b/doc/descriptions-external/epkowa.desc
index 5bc43bf..78769cb 100644
--- a/doc/descriptions-external/epkowa.desc
+++ b/doc/descriptions-external/epkowa.desc
@@ -15,11 +15,7 @@
 ;;;  See the GNU General Public License for more details.
 ;;;
 ;;;  You should have received a verbatim copy of the GNU General Public
-;;;  License along with this program; if not, write to:
-;;;
-;;;      Free Software Foundation, Inc.
-;;;      59 Temple Place, Suite 330
-;;;      Boston, MA  02111-1307  USA
+;;;  License.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;;  This list of devices has been compiled using the following sources:
 ;;;
diff --git a/doc/descriptions-external/scangearmp2.desc b/doc/descriptions-external/scangearmp2.desc
index d3ea973..c82aa40 100644
--- a/doc/descriptions-external/scangearmp2.desc
+++ b/doc/descriptions-external/scangearmp2.desc
@@ -28,6 +28,105 @@
 ; Canon MFP2 conf file
 ;
 
+; ---- V410 --------------------------
+:model "TS3400 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18b7"
+:status :good
+
+:model "E3400 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18b8"
+:status :good
+
+:model "TR7000 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18b9"
+:status :good
+
+:model "G2020 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18bd"
+:status :good
+
+:model "G3060 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18c3"
+:status :good
+
+:model "G2060 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18c1"
+:status :good
+
+:model "G3020 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18bf"
+:status :good
+
+:model "TS7430 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18b2"
+:status :good
+
+:model "XK90 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18b6"
+:status :good
+
+:model "TS8430 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18b5"
+:status :good
+
+:model "TR7600 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18aa"
+:status :good
+
+:model "TR8600 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18ad"
+:status :good
+
+:model "TR8630 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18af"
+:status :good
+
+:model "TS6400 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18a9"
+:status :good
+
+:model "TS7400 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18a9"
+:status :good
+
+
+; ---- V400 --------------------------
+:model "G7000 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1863"
+:status :good
+
+:model "G7080 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1864"
+:status :good
+
+:model "GM4000 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1869"
+:status :good
+
+:model "GM4080 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x186a"
+:status :good
+
+
 ; ---- V390 --------------------------
 :model "G6000 series"
 :interface "USB WiFi"
diff --git a/doc/descriptions-external/utsushi.desc b/doc/descriptions-external/utsushi.desc
index 231711d..eb5462f 100644
--- a/doc/descriptions-external/utsushi.desc
+++ b/doc/descriptions-external/utsushi.desc
@@ -1,5 +1,5 @@
 ;;;  utsushi.desc                               -*- emacs-lisp -*- (sort of)
-;;;  Copyright (C) 2015-2019  Olaf Meeuwissen
+;;;  Copyright (C) 2015-2021  Olaf Meeuwissen
 ;;;
 ;;;  License: GPL-3.0+
 ;;;  Author : Olaf Meeuwissen
@@ -192,6 +192,16 @@
 :usbid     "0x04b8" "0x1106"
 :status    :good
 
+:model     "ET-2600"
+:interface "USB"
+:usbid     "0x04b8" "0x1122"
+:status    :good
+
+:model     "ET-2720"
+:interface "USB"
+:usbid     "0x04b8" "0x1157"
+:status    :good
+
 :model     "ET-3750"
 :interface "USB"
 :usbid     "0x04b8" "0x1130"
@@ -282,6 +292,16 @@
 :usbid     "0x04b8" "0x112e"
 :status    :good
 
+:model     "RR-60"
+:interface "USB"
+:status    :good
+:comment   "USB ID 0x018b or 0x018c"
+
+:model     "RR-70W"
+:interface "USB"
+:status    :good
+:comment   "USB ID 0x018b or 0x018c"
+
 :model     "WF-2850"
 :interface "USB"
 :usbid     "0x04b8" "0x1138"
@@ -445,25 +465,25 @@
 :interface "USB"
 :usbid     "0x04b8" "0x0165"
 :status    :good
-:comment   "propably one of DS-410, DS-535, DS-575W, DS-775"
+:comment   "probably one of DS-410, DS-535, DS-575W, DS-775"
 
 :model     "PID 0167"
 :interface "USB"
 :usbid     "0x04b8" "0x0167"
 :status    :good
-:comment   "propably one of DS-410, DS-535, DS-575W, DS-775"
+:comment   "probably one of DS-410, DS-535, DS-575W, DS-775"
 
 :model     "PID 0168"
 :interface "USB"
 :usbid     "0x04b8" "0x0168"
 :status    :good
-:comment   "propably one of DS-410, DS-535, DS-575W, DS-775"
+:comment   "probably one of DS-410, DS-535, DS-575W, DS-775"
 
 :model     "PID 0169"
 :interface "USB"
 :usbid     "0x04b8" "0x0169"
 :status    :good
-:comment   "propably one of DS-410, DS-535, DS-575W, DS-775"
+:comment   "probably one of DS-410, DS-535, DS-575W, DS-775"
 
 :model     "PID 016B"
 :interface "USB"
@@ -475,13 +495,13 @@
 :interface "USB"
 :usbid     "0x04b8" "0x016d"
 :status    :good
-:comment   "propably one of ES-55R, ES-65WR"
+:comment   "probably one of ES-55R, ES-65WR"
 
 :model     "PID 016F"
 :interface "USB"
 :usbid     "0x04b8" "0x016f"
 :status    :good
-:comment   "propably one of ES-55R, ES-65WR"
+:comment   "probably one of ES-55R, ES-65WR"
 
 :model     "PID 0176"
 :interface "USB"
@@ -585,6 +605,7 @@
 :interface "USB"
 :usbid     "0x04b8" "0x1122"
 :status    :good
+:comment   "ET-2600"
 
 :model     "PID 1123"
 :interface "USB"
@@ -870,7 +891,7 @@
 :interface "USB"
 :usbid     "0x04b8" "0x1157"
 :status    :good
-:comment   "L3xxx"
+:comment   "ET-2720, L3xxx"
 
 :model     "PID 1158"
 :interface "USB"