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

1 files changed, 51 insertions, 39 deletions

diff --git a/doc/sane-pixma.man b/doc/sane-pixma.man
index 9811742..ce2ce26 100644
--- a/doc/sane-pixma.man
+++ b/doc/sane-pixma.man
@@ -19,9 +19,9 @@ Currently, the following models work with this backend:
 .RS
 PIXMA E410, E510, E4500
 .br
-PIXMA G600, G2000, G2010, G2100, G4000, G4511
+PIXMA G600, G2000, G2010, G2030, G2070, G2100, G3030, G3070, G4000, G4070, G4511
 .br
-PIXMA GX6000, GX7000
+PIXMA GX1000, GX2000, GX3000, GX4000, GX6000, GX6500, GX7000
 .br
 PIXMA MG2100, MG2200, MG2400, MG2500, MG2900, MG3000, MG3100
 .br
@@ -55,13 +55,15 @@ PIXMA MX410, MX420, MX470, MX510, MX520, MX530, MX700, MX720
 .br
 PIXMA MX850, MX860, MX870, MX882, MX885, MX890, MX920, MX7600
 .br
+PIXMA TC-20M, TC-5200M
+.br
 PIXMA TR4500, TR4600, TR4700
 .br
 PIXMA TS2400, TS2600, TS3100, TS3300, TS3450, TS3451, TS3452
 .br
 PIXMA TS3500, TS5000, TS5100, TS5350i, TS5400, TS6100, TS6200
 .br
-PIXMA TS7530, TS7450i ,TS8000, TS8530, TS8200
+PIXMA TS7530, TS7450i ,TS8000, TS8200, TS8530, TS8630, TS8630
 .br
 PIXUS MP10
 .br
@@ -123,25 +125,27 @@ PIXMA MX320, MX390, MX430, MX450, MX490, MX710
 .br
 PIXMA G3000, G3010, G4010, G6000, G6080, G7000, GM4000, GM4080
 .br
-PIXMA TR7500, TR7530, TR7600, TR8500, TR8530, TR8580, TR8600
+PIXMA TR7500, TR7530, TR7600, TR7800, TR8500, TR8530, TR8580 TR8600
 .br
 PIXMA TR8630, TR9530
 .br
 PIXMA TS3400, TS5100, TS6000, TS6130, TS6180, TS6230, TS6280, TS6300
 .br
-PIXMA TS6330, TS6330, TS6380, TS6400, TS7330, TS7400, TS7430, TS8100
+PIXMA TS6330, TS6330, TS6380, TS6400, TS6630, TS6730, TS7330, TS7400,
+.br
+PIXMA TS7430, TS7600i, TS7700, TS7700A, TS7700i, TS8100, TS8130
 .br
-PIXMA TS8130, TS8180, TS8230, TS8280, TS8300, TS8330, TS8380, TS9000
+PIXMA TS8180, TS8230, TS8280, TS8300, TS8330, TS8380, TS8700, TS9000
 .br
 PIXMA TS9100, TS9180, TS9500, TS9580
 .br
-PIXUS MP5, XK50, XK60, XK70, XK80, XK90, XK100, XK500
+PIXUS MP5, XK50, XK60, XK70, XK80, XK90, XK100, XK110, XK120, XK500
 .br
 imageCLASS MF720, MF810/820, MF5630, MF5650, MF5750, MF8170c
 .br
 imageCLASS MPC190, D550
 .br
-i-SENSYS MF110, MF220, MF260, MF410, MF420, MF510, MF520, MF740
+i-SENSYS MF110, MF220, MF260, MF410, MF420, MF510, MF520, MF740, MF750
 .br
 i-SENSYS MF5880dn, MF5900, MF6680dn, MF8500C
 .br
@@ -167,7 +171,7 @@ The backend supports:
 .br
 * a custom gamma table,
 .br
-* Automatic Document Feeder, Simplex and Duplex.
+* Automatic Document Feeder, Simplex and Duplex,
 .br
 * Transparency Unit, 24 or 48 bits depth. Infrared channel on certain models.
 .RE
@@ -183,7 +187,7 @@ where aaaa is the scanners model and bbbb is the hostname or ip-adress.
 Example: pixma:MF4800_192.168.1.45 is a MF4800 Series multi-function peripheral.
 .PP
 This backend, based on cloning original Canon drivers protocols, is in
-a production stage. Designed has been carried out without any applicable
+a production stage. Design has been carried out without any applicable
 manufacturer documentation, probably never available. However, we have tested
 it as well as we could, but it may not work in all situations. You will find
 an up-to-date status at the project homepage. (See below).
@@ -235,8 +239,8 @@ backward compatibility reasons.
 .TP
 .I button\-1 button\-2
 (read only) These options will return the value of the respective buttons.
-value 0 means that the button was not pressed, 1 is returned when the button
-was pressed. Some scanners with more than two buttons send the button number
+Value 0 means that the button was not pressed, 1 is returned when the button
+was pressed. Some scanners, with more than two buttons, send the button number
 as target.
 .TP
 .I original
@@ -293,7 +297,7 @@ only scanners that cannot be auto-detected because they are on a different
 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
 .BR getifaddrs ()
-qfunction) you also may need
+function) you also may need
 to add your scanner here as well.
 .PP
 Scanners shall be listed in the configuration file as follows:
@@ -302,48 +306,56 @@ Scanners shall be listed in the configuration file as follows:
 .I <method>://<host>[:port][/timeout=<value>]
 .RE
 .PP
-where method indicates the protocol used (bjnp is used for inkjet 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
-IPv6-address or bjnp://myscanner.mydomain.org for a hostname.
-.PP
-The port number is optional and in normally implied by the method.
+.TP
+.B method
+indicates the protocol used.
+.I bjnp
+is used for inkjet multi-functionals and
+.I mfnp
+is used for laser multi-functionals).
+.TP
+.B host
+is the hostname or IP address of the scanner, e.g.
+.I bjnp://10.0.1.4
+for IPv4,
+.I bjnp://[2001:888:118e:18e2:21e:8fff:fe36:b64a]
+for a literal IPv6-address or
+.I bjnp://myscanner.mydomain.org
+for a hostname.
+.TP
+.B port
+is optional and is normally implied by the method.
 Port 8610 is the standard port for mfnp, 8612 for bjnp.
+.TP
+.B timeout
+scanner-specific timeout value for the network protocol. The value is in ms.
 .PP
-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.
+Define each scanner each on a separate line.
 .PP
-More globally applicable timeouts can be set using the bjnp-timeout parameter as follows:
+More globally-applicable timeouts can be set using the bjnp-timeout parameter as follows:
 .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
+in the file. If required, the bjnp-timeout setting
 can be defined multiple times, where each setting will apply only to the scanners that
-follow the setting. The last setting is used for the auto discovered scanners.
+follow the setting. The last setting is used for auto-discovered scanners.
 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 disabled as follows:
+If so desired, networking can be disabled 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. Explicitly defined network scanners will still be probed.
+.IP \fInetworking=no\FR
+If the first non-commented line contains this entry all networking will be disabled.
+All further statements in the configuration file will be ignored.
+.IP \fIauto_detection=no\fR
+This line will cause auto-detection to be skipped.
+Explicitly defined network scanners will still be probed.
 .SH USB SUPPORT
 USB scanners will be auto-detected and require no configuration.
 .SH NETWORKING SUPPORT
@@ -446,7 +458,7 @@ the verbosity and includes the information printed at the lower levels.
 .RE
 .TP
 .B PIXMA_EXPERIMENT
-Setting to a non-zero value will enable the support for experimental models.
+Setting to a non-zero value will enable experimental support for further models.
 You should also set SANE_DEBUG_PIXMA to 11.
 .TP
 .B SANE_CONFIG_DIR