Merge branch 'feature/upstream' into develop

1 files changed, 65 insertions, 36 deletions

diff --git a/doc/sane-pixma.man b/doc/sane-pixma.man
index 1ceb6d6..ea85ec5 100644
--- a/doc/sane-pixma.man
+++ b/doc/sane-pixma.man
@@ -1,4 +1,4 @@
-.TH "sane\-pixma" "5" "29 Jul 2019" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH "sane\-pixma" "5" "28 Dec 2019" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane\-pixma
 .SH NAME
 sane\-pixma \- SANE backend for Canon Multi-Function Printers and CanoScan Scanners
@@ -17,15 +17,15 @@ Currently, the following models work with this backend:
 .RS
 PIXMA E510
 .br
-PIXMA G2000, G2100
+PIXMA G2000, G2010, G2100
 .br
-PIXMA MG2100, MG2200, MG2400, MG2500, MG2900, MG3100, MG3200
+PIXMA MG2100, MG2200, MG2400, MG2500, MG2900, MG3000, MG3100
 .br
-PIXMA MG3500, MG3600, MG4200, MG5100, MG5200, MG5300, MG5400
+PIXMA MG3200, MG3500, MG3600, MG4200, MG5100, MG5200, MG5300
 .br
-PIXMA MG5500, MG5600, MG5700, MG6100, MG6200, MG6300, MG6400
+PIXMA MG5400, MG5500, MG5600, MG5700, MG6100, MG6200, MG6300
 .br
-PIXMA MG7100, MG7500, MG7700, MG8200
+PIXMA MG6400, MG7100, MG7500, MG7700, MG8200
 .br
 PIXMA MP140, MP150, MP160, MP170, MP180, MP190
 .br
@@ -51,7 +51,7 @@ PIXMA MX410, MX420, MX470, MX510, MX520, MX530, MX700, MX720
 .br
 PIXMA MX850, MX860, MX870, MX882, MX885, MX890, MX920, MX7600
 .br
-PIXMA TS3100, TS5000, TS6100, TS8000, TS8200
+PIXMA TS3100, TS5000, TS6100, TS6200, TS8000, TS8200
 .br
 PIXUS MP10
 .br
@@ -65,13 +65,15 @@ imageCLASS MF4270, MF4350d, MF4370dn, MF4380dn
 .br
 imageCLASS MF4410, MF4430, MF4570dw, MF4660, MF4690
 .br
-imageCLASS MF5730, MF5770, MF6550, MPC200, D420, D480, D530
+imageCLASS MF5730, MF5770, MF6550, MPC200
 .br
-i-SENSYS MF210, MF230, MF240, MF620, MF730, MF731/733, MF3010
+imageCLASS D420, D480, D530, D570
 .br
-i-SENSYS MF4320d, MF4330d, MF4500, MF4700, MF4800, MF6100
+i-SENSYS MF210, MF230, MF240, MF620, MF630, MF640, MF645C, MF730
 .br
-i-SENSYS MF8030, MF8200C, MF8300
+i-SENSYS MF731/733, MF741/743, MF3010, MF4320d, MF4330d, MF4500
+.br
+i-SENSYS MF4700, MF4800, MF6100, MF8030, MF8200C, MF8300
 .br
 imageRUNNER 1020/1024/1025, 1133
 .br
@@ -79,7 +81,7 @@ CanoScan 8800F, 9000F, 9000F Mark II
 .br
 CanoScan LiDE 300, 400
 .br
-MAXIFY MB2000, MB2100, MB2300, MB2700, MB5000
+MAXIFY MB2000, MB2100, MB2300, MB2700, MB5000, MB5400
 .RE
 .PP
 The following models are not well tested and/or the scanner sometimes hangs
@@ -97,46 +99,49 @@ Feedback in the sane\-devel mailing list welcome.
 .RS
 PIXMA E400, E410, E460, E470, E480, E500, E560, E600, E610
 .br
-PIXMA E3100, E4200
+PIXMA E3100, E3300, E4200
 .br
-PIXMA MG3000, MG4100, MG6500, MG6600, MG6800, MG6900, MG8100
+PIXMA MG4100, MG6500, MG6600, MG6800, MG6900, MG8100
 .br
 PIXMA MP375R, MP493, MP495, MP740
 .br
 PIXMA MX320, MX390, MX430, MX450, MX490, MX710
 .br
-PIXMA G3000, G3010, G4000, G4010
+PIXMA G3000, G3010, G4000, G4010, G6000, G6080
 .br
 PIXMA TR4500, TR7500, TR7530, TR8500, TR8530, TR8580, TR9530
 .br
-PIXMA TS5100, TS6000, TS6130, TS6180, TS6200, TS6230, TS6280
+PIXMA TS5100, TS6000, TS6130, TS6180, TS6230, TS6280, TS6300
+.br
+PIXMA TS6330, TS6380, TS7330, TS8100, TS8130, TS8180, TS8230
 .br
-PIXMA TS8100, TS8130, TS8180, TS8230, TS8280, TS9000, TS9100
+PIXMA TS8280,, TS8300, TS8330, TS8380, TS9000, TS9100, TS9180
 .br
-PIXMA TS9180, TS9500, TS9580
+PIXMA TS9500, TS9580
 .br
-PIXUS MP5, XK50, XK70, XK80
+PIXUS MP5, XK50, XK60, XK70, XK80
 .br
 imageCLASS MF810/820, MF5630, MF5650, MF5750, MF8170c
 .br
-imageCLASS MPC190, D550, D570
+imageCLASS MPC190, D550
 .br
-i-SENSYS MF110, MF220, MF260, MF410, MF420, MF510, MF520, MF630
+i-SENSYS MF110, MF220, MF260, MF410, MF420, MF510, MF520, MF740
 .br
-i-SENSYS MF640, MF740, MF5880dn, MF5900, MF6680dn, MF8500C
+i-SENSYS MF5880dn, MF5900, MF6680dn, MF8500C
 .br
-MAXIFY MB5100, MB5300, MB5400
+MAXIFY MB5100, MB5300
+.RE
+.PP
+The following models may use partly the same Pixma protocol as other devices
+listed above, but may still need some work. They are declared in the backend
+as experimental and need the environment variable PIXMA_EXPERIMENT=1 to get
+recognized and activated. Snoop logs are required to further investigate,
+please contact the sane\-devel mailing list.
+.PP
+.RS
+\-\- none \-\-
 .RE
 .PP
-\#The following models may use partly the same Pixma protocol as other devices
-\#listed above, but may still need some work. They are declared in the backend
-\#as experimental. Snoop logs are required to further investigate, please contact
-\#the sane\-devel mailing list.
-\#.PP
-\#.RS
-\#PIXMA MP---
-\#.RE
-\#.PP
 The backend supports:
 .PP
 .RS
@@ -245,12 +250,15 @@ support dynamic loading).
 .I @CONFIGDIR@/pixma.conf
 The backend configuration file (see also description of
 .B SANE_CONFIG_DIR
-below). The file contains an optional list of networked scanners. Normally
+below).
+.RS
+.PP
+The file contains an optional list of networked scanners using the BJNP or MFNP protools
+(See below for datails on networking support for scanners). Normally
 only scanners that cannot be auto-detected because they are on a different
-subnet shall be listed here. If your OS does not allow enumeration of
+subnet shall be listed here. If you do not use Linux and your OS does not allow enumeration of
 interfaces (i.e. it does not support the getifaddrs() function) you also may need
 to add your scanner here as well.
-.RS
 .PP
 .I Scanners shall be listed in the configuration file as follows:
 .PP
@@ -287,11 +295,32 @@ If not explicitly set, the default 1000ms setting will apply.
 .PP
 Setting timeouts should only be required in exceptional cases.
 .PP
+.RE
+.PP
+If so desired networking can be disbled as follows:
+.RS
+.IP -
+If the first non-commented line contains
+.B networking=no
+all networking will be disabled.
+This will cause all further statements in the configuration file to be ignored.
+.IP -
+A line that contains
+.B auto_detection=no
+will cause auto-detection to be skipped. Explicitely defined network scanners will still be probed.
 .SH USB SUPPORT
 USB scanners will be auto-detected and require no configuration.
 .SH NETWORKING SUPPORT
 The pixma backend supports network scanners using the so called Canon BJNP
-protocol and MFNP protocol. Both IPv4 and IPv6 are supported, but IPv6 is as
+and MFNP protocols.
+.PP
+Canon seems to be dropping support for these protocols in recent scanners.
+To verify if your scanner supports one of these protocols, check the content of
+the _scanner._tcp service entry in mDNS/DNS-SD (using for example  avahi-discover).
+If that does not list port 8610
+or 8612 your scanner probably does not support the mfmp or bjnp protols.
+.PP
+Both IPv4 and IPv6 are supported, but IPv6 is as
 yet untested with MFNP. Please report your results on the mailing list.
 .PP
 Configuration is normally not required.