Merge branch 'release/experimental/1.0.27-1_experimental1'experimental/1.0.27-1_experimental1

1 files changed, 59 insertions, 25 deletions

diff --git a/doc/sane-pixma.man b/doc/sane-pixma.man
index ca692cb..1058e92 100644
--- a/doc/sane-pixma.man
+++ b/doc/sane-pixma.man
@@ -1,4 +1,4 @@
-.TH "sane\-pixma" "5" "30 Sep 2015" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH "sane\-pixma" "5" "20 May 2017" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane\-pixma
 .SH NAME
 sane\-pixma \- SANE backend for Canon Multi-Function Printers and CanoScan Scanners
@@ -17,9 +17,11 @@ Currently, the following models work with this backend:
 .RS
 PIXMA MG2100, MG2200, MG2400, MG2500, MG2900, MG3100, MG3200
 .br
-PIXMA MG3500, MG4200, MG5100, MG5200, MG5300, MG5500, MG5600
+PIXMA MG3500, MG3600, MG4200, MG5100, MG5200, MG5300, MG5400
 .br
-PIXMA MG6100, MG6200, MG6300, MG6400, MG7100, MG7500, MG8200
+PIXMA MG5500, MG5600, MG5700, MG6100, MG6200, MG6300, MG6400
+.br
+PIXMA MG7100, MG7500, MG7700, MG8200
 .br
 PIXMA MP140, MP150, MP160, MP170, MP180, MP190
 .br
@@ -45,6 +47,8 @@ PIXMA MX410, MX420, MX470, MX510, MX520, MX530, MX700, MX720
 .br
 PIXMA MX850, MX860, MX870, MX882, MX885, MX890, MX920, MX7600
 .br
+PIXUS MP10
+.br
 imageCLASS MF3110, MF3240, MF4010, MF4018
 .br
 imageCLASS MF4120, MF4122, MF4140, MF4150
@@ -53,17 +57,17 @@ imageCLASS MF4270, MF4350d, MF4370dn, MF4380dn
 .br
 imageCLASS MF4410, MF4430, MF4570dw, MF4660, MF4690
 .br
-imageCLASS MF5730, MF5770, MF6550, D420, D480, D530
-.br
-i-SENSYS MF3010, MF4320d, MF4330d, MF4500 Series
+imageCLASS MF5730, MF5770, MF6550, MPC200, D420, D480, D530
 .br
-i-SENSYS MF4700 Series, MF4800 Series, MF8200C Series
+i-SENSYS MF230, MF240, MF3010, MF4320d, MF4330d, MF4500, MF4700
 .br
-i-SENSYS MF8300 Series
+i-SENSYS MF4800, MF6100, MF8200C, MF8300
 .br
 imageRUNNER 1020/1024/1025
 .br
 CanoScan 8800F, 9000F, 9000F Mark II
+.br
+MAXIFY MB5000 (ADF is not working)
 .RE
 .PP
 The following models are not well tested and/or the scanner sometimes hangs
@@ -79,23 +83,29 @@ in the backend so that they get recognized and activated.
 Feedback in the sane\-devel mailing list welcome.
 .PP
 .RS
-PIXMA E400, E460, E480, E500, E510, E560, E600, E610
+PIXMA E400, E460, E470, E480, E500, E510, E560, E600, E610
 .br
-PIXMA MG3600, MG4100, MG5400, MG6500, MG6600, MG8100
+PIXMA MG3000, MG4100, MG6500, MG6600, MG6800, MG6900, MG8100
 .br
 PIXMA MP375R, MP493, MP495, MP740
 .br
 PIXMA MX320, MX390, MX430, MX450, MX490, MX710
 .br
+PIXMA G3000
+.br
+PIXMA TS9000, TS800, TS6000, TS5000
+.br
+PIXUS MP5
+.br
 imageCLASS MF810/820, MF5630, MF5650, MF5750, MF8030, MF8170c
 .br
-imageRUNNER 1133
+imageCLASS MPC190
 .br
-i-SENSYS MF210 Series, MF220 Series, MF5880dn, MF5900 Series
+imageRUNNER 1133
 .br
-i-SENSYS MF6100 Series, MF6680dn, MF8500C Series
+i-SENSYS MF210, MF220, MF5880dn, MF5900, MF6680dn, MF8500C
 .br
-MAXIFY MB2000, MB2300, MB5000, MB5300
+MAXIFY MB2000, MB2300, MB5300
 .RE
 .PP
 \#The following models may use partly the same Pixma protocol as other devices
@@ -139,15 +149,21 @@ an up-to-date status at the project homepage. (See below).
 Users feedback is essential to help improve features and performances. 
 .SH OPTIONS
 Besides "well-known" options (e.g. resolution, mode etc.) pixma backend also
-provides the following
-\#.B experimental
-options for button handling, i.e. the options might change in the future.
+provides the following options, i.e. the options might change in the future.
 .br
 The button status can be polled i.e. with 'scanimage \-A'.
 .br
 Button scan is disabled on MAC OS X due to darwin libusb not handling
 timeouts in usb interrupt reads, but may work when using the network protocol.
 .TP
+.I adf\-wait
+This option enables and sets the time in seconds waiting for a document
+inserted into the
+.BR Automatic
+.BR Document
+.BR Feeder .
+The maximum allowed waiting time is 3600 sec (= 1 hour).
+.TP
 .I button\-controlled
 This option can be used by applications (like
 .BR scanadf (1)
@@ -209,21 +225,21 @@ support dynamic loading).
 .I @CONFIGDIR@/pixma.conf
 The backend configuration file (see also description of
 .B SANE_CONFIG_DIR
-below). The files contains an optional list of networked scanners. Normally 
-only scanners that can not be auto-detected because they are on a different 
+below). The file contains an optional list of networked 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 
-interfaces (i.e. it does not support the getifaddrs() function) you may need 
+interfaces (i.e. it does not support the getifaddrs() function) you also may need 
 to add your scanner here as well.
+.RS
 .PP
-Scanners shall be listed as:
+.I Scanners shall be listed in the configuraton file as follows:
 .PP
 .RS
-.I <method>://<host>[:port] 
+.I <method>://<host>[:port][/timeout=<value>]
 .RE
-.RS
 .PP
 where method indicates the protocol used (bjnp is used for inkjet multi-functionals
-and mfnp is used for laser multi-functionals).
+and mfnp is used for laser multi-functionals). 
 .PP
 host is the hostname or IP address of the scanner, e.g. bjnp://10.0.1.4 
 for IPv4, bjnp://[2001:888:118e:18e2:21e:8fff:fe36:b64a] for a literal 
@@ -232,7 +248,25 @@ IPv6-address or bjnp://myscanner.mydomain.org for a hostname.
 The port number is optional and in normally implied by the method.
 Port 8610 is the standard port for mfnp, 8612 for bjnp.
 .PP
-Define each scanner on a new line.
+A scanner specific timeout value for the network protocol can be set using the 
+bjnp-timeout parameter. The value is in ms.
+.PP
+Define scanners each on a new line.
+.PP
+More globally applicable tinmeouts can be set using the bjnp-timeout parameter as folllows:
+.PP
+.RS
+.I bjnp-timeout=<value>
+.RE
+.PP
+A timeout defined using bjnp-timeout will apply to the following scanner definitions
+in the file. If required the bjnp-timeout setting 
+can be defined multiple times, where each settng will apply only to the scanners that
+follow the setting. The last setting is used for the auto discovered scanners.
+If not explicitely set,  the default 1000ms setting will apply. 
+.PP
+Setting timeouts should only be required in exceptional cases.
+.PP
 .SH USB SUPPORT
 USB scanners will be auto-detected and require no configuration.
 .SH NETWORKING SUPPORT