From 2f37052d2aae8f5eed72a16f2c7acb1074621611 Mon Sep 17 00:00:00 2001
From: Rolf Bensch <roben-guest@alioth.debian.org>
Date: Mon, 16 Dec 2013 18:31:43 +0100
Subject: [PATCH] rename Canon imageCLASS MF4770n to i-SENSYS MF4700 Series

---
 backend/pixma_imageclass.c  |  6 +++---
 doc/descriptions/pixma.desc | 12 ++++++------
 doc/sane-pixma.man          |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/backend/pixma_imageclass.c b/backend/pixma_imageclass.c
index a53dd6687..e0c58e23f 100644
--- a/backend/pixma_imageclass.c
+++ b/backend/pixma_imageclass.c
@@ -83,7 +83,7 @@
 #define MF4550_PID 0x2736
 #define MF4410_PID 0x2737
 #define MF3010_PID 0x2759
-#define MF4770_PID 0x2774
+#define MF4700_PID 0x2774
 /* the following are all untested */
 #define MF5630_PID 0x264e
 #define MF5650_PID 0x264f
@@ -505,7 +505,7 @@ iclass_check_param (pixma_t * s, pixma_scan_param_t * sp)
   /* Some exceptions here for particular devices */
   /* Those devices can scan up to Legal 14" with ADF, but A4 11.7" in flatbed */
   if (sp->source == PIXMA_SOURCE_FLATBED
-      && ( s->cfg->pid == MF4770_PID ))
+      && ( s->cfg->pid == MF4700_PID ))
     sp->h = MIN (sp->h, 877 * sp->xdpi / 75);
 
   return 0;
@@ -773,7 +773,7 @@ const pixma_config_t pixma_iclass_devices[] = {
   DEV ("Canon imageCLASS MF4410", "MF4410", MF4410_PID, 600, 640, 877, PIXMA_CAP_ADF),
   DEV ("Canon i-SENSYS MF4550d", "MF4550", MF4550_PID, 600, 640, 877, PIXMA_CAP_ADF),
   DEV ("Canon i-SENSYS MF3010", "MF3010", MF3010_PID, 600, 640, 877, 0),
-  DEV ("Canon imageCLASS MF4770n", "MF4770", MF4770_PID, 600, 640, 1050, PIXMA_CAP_ADF),
+  DEV ("Canon i-SENSYS MF4700 Series", "MF4700", MF4700_PID, 600, 640, 1050, PIXMA_CAP_ADF),
   /* FIXME: the following capabilities all need updating/verifying */
   DEV ("Canon imageCLASS MF5630", "MF5630", MF5630_PID, 600, 640, 877, PIXMA_CAP_ADF),
   DEV ("Canon laserBase MF5650", "MF5650", MF5650_PID, 600, 640, 877, PIXMA_CAP_ADF),
diff --git a/doc/descriptions/pixma.desc b/doc/descriptions/pixma.desc
index 55d4ec47f..e50621c52 100644
--- a/doc/descriptions/pixma.desc
+++ b/doc/descriptions/pixma.desc
@@ -787,12 +787,6 @@
 :status :good
 :comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI)."
 
-:model "imageCLASS MF4770n"
-:interface "USB Ethernet"
-:usbid "0x04a9" "0x2774"
-:status :good
-:comment "Flatbed scan. All resolutions supported (up to 600DPI). ADF buggy."
-
 :model "imageCLASS MF4570dw"
 :interface "USB"
 :usbid "0x04a9" "0x275a"
@@ -811,6 +805,12 @@
 :status :complete
 :comment "Flatbed and ADF scan.  All resolutions supported (up to 600DPI)"
 
+:model "i-SENSYS MF4700 Series"
+:interface "USB Ethernet"
+:usbid "0x04a9" "0x2774"
+:status :good
+:comment "Flatbed scan. All resolutions supported (up to 600DPI). ADF buggy."
+
 :model "i-SENSYS MF4800 Series"
 :interface "USB Ethernet"
 :usbid "0x04a9" "0x2773"
diff --git a/doc/sane-pixma.man b/doc/sane-pixma.man
index 0c32e1bce..abd5747b8 100644
--- a/doc/sane-pixma.man
+++ b/doc/sane-pixma.man
@@ -49,11 +49,11 @@ imageCLASS MF4120, MF4122, MF4140, MF4150
 .br
 imageCLASS MF4270, MF4350d, MF4370dn, MF4380dn
 .br
-imageCLASS MF4410, MF4430, MF4660, MF4690, MF4770n
+imageCLASS MF4410, MF4430, MF4660, MF4690
 .br
 imageCLASS MF5730, MF5770, MF6550, D420, D480
 .br
-i-SENSYS MF3010, MF4320d, MF4330d, MF4550d
+i-SENSYS MF3010, MF4320d, MF4330d, MF4550d, MF4700 Series
 .br
 imageRUNNER 1020/1024/1025
 .br