doc updates for release

doc/descriptions/pixma.desc

@@ -28,13 +28,73 @@
 :interface "USB"
 :usbid "0x04a9" "0x1758"
 :status :untested
-:comment "All resolutions supported (up to 1200DPI)."
+:comment "Testers needed!"
 
 :model "PIXMA E600"
 :interface "USB"
 :usbid "0x04a9" "0x175a"
 :status :untested
-:comment "Flatbed and ADF scan. All resolutions supported (up to 1200DPI)."
+:comment "Testers needed!"
+
+:model "PIXMA MG2100 Series"
+:interface "USB"
+:usbid "0x04a9" "0x1751"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA MG3100 Series"
+:interface "USB"
+:usbid "0x04a9" "0x1752"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA MG4100 Series"
+:interface "USB"
+:usbid "0x04a9" "0x1753"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA MG5100 Series"
+:interface "USB"
+:usbid "0x04a9" "0x1748"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA MG5200 Series"
+:interface "USB"
+:usbid "0x04a9" "0x1749"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA MG5300 Series"
+:interface "USB"
+:usbid "0x04a9" "0x1754"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA MG6100 Series"
+:interface "USB"
+:usbid "0x04a9" "0x174a"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA MG6200 Series"
+:interface "USB"
+:usbid "0x04a9" "0x1755"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA MG8100 Series"
+:interface "USB"
+:usbid "0x04a9" "0x174b"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA MG8200 Series"
+:interface "USB"
+:usbid "0x04a9" "0x1756"
+:status :untested
+:comment "Testers needed!"
 
 :model "PIXMA MP140"
 :interface "USB"
@@ -108,7 +168,7 @@
 :model "PIXMA MP280"
 :interface "USB"
 :usbid "0x04a9" "0x1746"
-:status :complete
+:status :good
 :comment "All resolutions supported (up to 600DPI)."
 
 :model "PIXMA MP360"
@@ -165,6 +225,18 @@
 :status :complete
 :comment "All resolutions supported (up to 1200DPI)"
 
+:model "PIXMA MP493"
+:interface "USB"
+:usbid "0x04a9" "0x1757"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA MP495"
+:interface "USB"
+:usbid "0x04a9" "0x1747"
+:status :untested
+:comment "Same protocol as Pixma MP280? Testers needed!"
+
 :model "PIXMA MP500"
 :interface "USB"
 :usbid "0x04a9" "0x170c"
@@ -277,12 +349,24 @@
 :status :minimal
 :comment "No grayscale. The scanner sometimes hangs!"
 
+:model "PIXMA MP770"
+:interface "USB"
+:usbid "0x04a9" "0x1708"
+:status :minimal
+:comment "No grayscale. The scanner sometimes hangs!"
+
 :model "PIXMA MP780"
 :interface "USB"
 :usbid "0x04a9" "0x1707"
 :status :minimal
 :comment "No grayscale. The scanner sometimes hangs!"
 
+:model "PIXMA MP790"
+:interface "USB"
+:usbid "0x04a9" "0x1707"
+:status :minimal
+:comment "No grayscale. The scanner sometimes hangs!"
+
 :model "PIXMA MP800"
 :interface "USB"
 :usbid "0x04a9" "0x170d"
@@ -377,31 +461,31 @@
 :interface "USB"
 :usbid "0x04a9" "0x1759"
 :status :untested
-:comment "Flatbed and ADF scan. All resolutions supported (up to 1200DPI). ADF empty buggy."
+:comment "Testers needed!"
 
 :model "PIXMA MX410"
-:interface "USB WLAN"
+:interface "USB Ethernet"
 :usbid "0x04a9" "0x174e"
 :status :untested
-:comment "Flatbed and ADF scan. All resolutions supported (up to 1200DPI). ADF empty buggy."
+:comment "Same protocol as Pixma MX420? Testers needed!"
 
 :model "PIXMA MX420"
-:interface "USB Ethernet WLAN"
+:interface "USB Ethernet"
 :usbid "0x04a9" "0x174f"
 :status :complete
 :comment "Flatbed and ADF scan. All resolutions supported (up to 1200DPI). ADF empty buggy."
 
 :model "PIXMA MX430 Series"
-:interface "USB WLAN"
+:interface "USB Ethernet"
 :usbid "0x04a9" "0x175b"
 :status :untested
-:comment "Flatbed and ADF scan. All resolutions supported (up to 1200DPI). ADF empty buggy."
+:comment "Testers needed!"
 
 :model "PIXMA MX510 Series"
-:interface "USB Ethernet WLAN"
+:interface "USB Ethernet"
 :usbid "0x04a9" "0x175c"
 :status :untested
-:comment "Flatbed and ADF scan. All resolutions supported (up to 1200DPI). ADF empty buggy."
+:comment "Testers needed!"
 
 :model "PIXMA MX700"
 :interface "USB Ethernet"
@@ -410,10 +494,10 @@
 :comment "Flatbed and ADF scan. All resolutions supported (up to 2400DPI)"
 
 :model "PIXMA MX710 Series"
-:interface "USB Ethernet WLAN"
+:interface "USB Ethernet"
 :usbid "0x04a9" "0x175d"
 :status :untested
-:comment "All resolutions supported (up to 2400DPI). Flatbed, ADF simplex and Duplex supported, ADF empty buggy."
+:comment "Testers needed!"
 
 :model "PIXMA MX850"
 :interface "USB Ethernet"
@@ -439,11 +523,23 @@
 :status :complete
 :comment "All resolutions supported (up to 2400DPI). Flatbed, ADF simplex and Duplex supported, ADF empty buggy."
 
+:model "PIXMA MX882"
+:interface "USB Ethernet"
+:usbid "0x04a9" "0x1750"
+:status :complete
+:comment "All resolutions supported (up to 2400DPI). Flatbed, ADF simplex and Duplex supported, ADF empty buggy."
+
+:model "PIXMA MX885"
+:interface "USB Ethernet"
+:usbid "0x04a9" "0x1750"
+:status :complete
+:comment "All resolutions supported (up to 2400DPI). Flatbed, ADF simplex and Duplex supported, ADF empty buggy."
+
 :model "PIXMA MX890 Series"
-:interface "USB Ethernet WLAN"
+:interface "USB Ethernet"
 :usbid "0x04a9" "0x175e"
 :status :untested
-:comment "All resolutions supported (up to 2400DPI). Flatbed, ADF simplex and Duplex supported, ADF empty buggy."
+:comment "Testers needed!"
 
 :model "PIXMA MX7600"
 :interface "USB Ethernet"
@@ -547,6 +643,12 @@
 :status :complete
 :comment "All resolutions supported (up to 600DPI)"
 
+:model "imageCLASS MF4660"
+:interface "USB"
+:usbid "0x04a9" "0x26b0"
+:status :complete
+:comment "Flatbed and ADF scan.  All resolutions supported (up to 600DPI)"
+
 :model "imageCLASS MF4690"
 :interface "USB"
 :usbid "0x04a9" "0x26b0"
@@ -589,12 +691,30 @@
 :status :complete
 :comment "Flatbed and ADF scan.  All resolutions supported (up to 600DPI)"
 
+:model "imageCLASS MF6550"
+:interface "USB"
+:usbid "0x04a9" "0x2686"
+:status :complete
+:comment "Flatbed and ADF scan.  All resolutions supported (up to 600DPI)"
+
+:model "imageCLASS MF8030"
+:interface "USB"
+:usbid "0x04a9" "0x2707"
+:status :untested
+:comment "Testers needed!"
+
 :model "imageCLASS MF8170c"
 :interface "USB"
 :usbid "0x04a9" "0x2659"
 :status :untested
 :comment "Testers needed!"
 
+:model "imageRUNNER 1020/1024/1025"
+:interface "USB"
+:usbid "0x04a9" "0x26e6"
+:status :untested
+:comment "Testers needed!"
+
 :model "CanoScan 8800F"
 :interface "USB"
 :usbid "0x04a9" "0x1901"

doc/sane-pixma.man

@@ -4,7 +4,9 @@
 .B sane\-pixma 
 \- SANE backend for Canon PIXMA Multi-Functions Printers
 .br 
-             MP, MX, ImageCLASS and I-SENSYS series
+             E, MG, MP, MX, ImageCLASS, imageRunner and I-SENSYS series
+.br
+             and for Canon CanoScan Flatbed/TPU Scanners
 .SH DESCRIPTION
 The
 .B sane\-pixma
@@ -25,23 +27,29 @@ PIXMA MP450, MP460, MP470, MP480, MP490
 .br
 PIXMA MP500, MP510, MP520, MP530, MP540, MP550, MP560
 .br
-PIXMA MP600, MP600R, MP610, MP620, MP630, MP640, MP710
+PIXMA MP600, MP600R, MP610, MP620, MP630, MP640
 .br
-PIXMA MP800, MP800R, MP810, MP830, MP960, MP970, MP980, MP990
+PIXMA MP700, MP710, MP730, PIXMA MP750 (no grayscale)
 .br
-PIXMA MX300, MX310, MX330, MX340, MX350, MX360, MX420
+PIXMA MP800, MP800R, MP810, MP830
 .br
-PIXMA MX700, MX850, MX860, MX870, MX7600
+PIXMA MP960, MP970, MP980, MP990
 .br
-PIXMA MX880 Series, MX882, MX885
+PIXMA MX300, MX310, MX330, MX340, MX350, MX360
 .br
-PIXMA MP700, MP730, PIXMA MP750 (no grayscale)
+PIXMA MX420, MX700, MX7600
 .br
-ImageCLASS MF3110, MF3240, MF4010, MF4018, MF4120, MF4122, MF4410
+PIXMA MX850, MX860, MX870, MX882, MX885
 .br
-ImageCLASS MF4140, MF4150, MF4270, MF4350d, MF4370dn, MF4380dn
+ImageCLASS MF3110, MF3240, MF4010, MF4018
 .br
-ImageCLASS MF4660, MF4690, MF5770, MF6550, D480
+ImageCLASS MF4120, MF4122, MF4140, MF4150
+.br
+ImageCLASS MF4270, MF4350d, MF4370dn, MF4380dn
+.br
+ImageCLASS MF4410, MF4660, MF4690
+.br
+ImageCLASS MF5770, MF6550, D480
 .br
 I-SENSYS MF4320d, MF4330d
 .br
@@ -52,7 +60,9 @@ The following models are not well tested and/or the scanner sometimes hangs
 and must be switched off and on.
 .PP
 .RS
-PIXMA MP760, MP770, MP780, MP790, MX360
+PIXMA MP760, MP770, MP780, MP790
+.br
+PIXMA MX360
 .RE
 .PP
 The following models may use the same Pixma protocol as those listed 
@@ -61,16 +71,22 @@ in the backend so that they get recognized and activated.
 Feedback in the sane\-devel mailing list welcome.
 .PP
 .RS
-PIXMA MP375R, MP740
+PIXMA MG2100, MG3100, MG4100, MG5100, MG5200, MG5300 
+.br
+PIXMA MG6100, MG6200, MG8100, MG8200
+.br
+PIXMA MP375R, MP493, MP495, MP740
 .br
 PIXMA MX320, MX410
 .br
-ImageCLASS MF5630, MF5650, MF5730, MF5750, MF8170c
+ImageCLASS MF5630, MF5650, MF5730, MF5750, MF8030, MF8170c
+.br
+imageRunner iR1020, iR1024, iR1025
 .RE
 .PP
-The following models may use partly the same Pixma protocol as MPs listed
+The following models may use partly the same Pixma protocol as other devices
-above, but may still need some work. They are declared in the backend as 
+listed above, but may still need some work. They are declared in the backend 
-experimental. Snoop logs are required to further investigate, please contact 
+as experimental. Snoop logs are required to further investigate, please contact 
 the sane\-devel mailing list.
 .PP
 .RS