Merge branch 'feature/upstream' into develop

1 files changed, 43 insertions, 20 deletions

diff --git a/doc/sane-pixma.man b/doc/sane-pixma.man
index ea85ec5..87aadd4 100644
--- a/doc/sane-pixma.man
+++ b/doc/sane-pixma.man
@@ -1,4 +1,4 @@
-.TH "sane\-pixma" "5" "28 Dec 2019" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH "sane\-pixma" "5" "15 Aug 2020" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane\-pixma
 .SH NAME
 sane\-pixma \- SANE backend for Canon Multi-Function Printers and CanoScan Scanners
@@ -15,9 +15,9 @@ over IPv4 as well as IPv6 (MFNP over IPv6 is untested).
 Currently, the following models work with this backend:
 .PP
 .RS
-PIXMA E510
+PIXMA E410, E510
 .br
-PIXMA G2000, G2010, G2100
+PIXMA G2000, G2010, G2100, G4000
 .br
 PIXMA MG2100, MG2200, MG2400, MG2500, MG2900, MG3000, MG3100
 .br
@@ -33,7 +33,7 @@ PIXMA MP210, MP220, MP230, MP240, MP250, MP260, MP270, MP280
 .br
 PIXMA MP360, MP370, MP390
 .br
-PIXMA MP450, MP460, MP470, MP480, MP490
+PIXMA MP450, MP460, MP470, MP480, MP490, MP495
 .br
 PIXMA MP500, MP510, MP520, MP530, MP540, MP550, MP560
 .br
@@ -51,7 +51,11 @@ PIXMA MX410, MX420, MX470, MX510, MX520, MX530, MX700, MX720
 .br
 PIXMA MX850, MX860, MX870, MX882, MX885, MX890, MX920, MX7600
 .br
-PIXMA TS3100, TS5000, TS6100, TS6200, TS8000, TS8200
+PIXMA TR4500
+.br
+PIXMA TS3100, TS3300, TS5000, TS5100, TS6100, TS6200, TS8000
+.br
+PIXMA TS8200
 .br
 PIXUS MP10
 .br
@@ -69,11 +73,13 @@ imageCLASS MF5730, MF5770, MF6550, MPC200
 .br
 imageCLASS D420, D480, D530, D570
 .br
-i-SENSYS MF210, MF230, MF240, MF620, MF630, MF640, MF645C, MF730
+i-SENSYS MF210, MF230, MF240, MF440, MF620, MF630, MF640
+.br
+i-SENSYS MF645C, MF730, MF731/733, MF741/743
 .br
-i-SENSYS MF731/733, MF741/743, MF3010, MF4320d, MF4330d, MF4500
+i-SENSYS MF3010, MF4320d, MF4330d, MF4500, MF4700, MF4800
 .br
-i-SENSYS MF4700, MF4800, MF6100, MF8030, MF8200C, MF8300
+i-SENSYS MF6100, MF8030, MF8200C, MF8300
 .br
 imageRUNNER 1020/1024/1025, 1133
 .br
@@ -81,7 +87,7 @@ CanoScan 8800F, 9000F, 9000F Mark II
 .br
 CanoScan LiDE 300, 400
 .br
-MAXIFY MB2000, MB2100, MB2300, MB2700, MB5000, MB5400
+MAXIFY MB2000, MB2100, MB2300, MB2700, MB5000, MB5100, MB5400
 .RE
 .PP
 The following models are not well tested and/or the scanner sometimes hangs
@@ -97,31 +103,31 @@ in the backend so that they get recognized and activated.
 Feedback in the sane\-devel mailing list welcome.
 .PP
 .RS
-PIXMA E400, E410, E460, E470, E480, E500, E560, E600, E610
+PIXMA E400, E460, E470, E480, E500, E560, E600, E610
 .br
 PIXMA E3100, E3300, E4200
 .br
 PIXMA MG4100, MG6500, MG6600, MG6800, MG6900, MG8100
 .br
-PIXMA MP375R, MP493, MP495, MP740
+PIXMA MP375R, MP493, MP740
 .br
 PIXMA MX320, MX390, MX430, MX450, MX490, MX710
 .br
-PIXMA G3000, G3010, G4000, G4010, G6000, G6080
+PIXMA G3000, G3010, G4010, G6000, G6080, G7000, GM4000
 .br
-PIXMA TR4500, TR7500, TR7530, TR8500, TR8530, TR8580, TR9530
+PIXMA TR7500, TR7530, TR8500, TR8530, TR8580, TR9530
 .br
-PIXMA TS5100, TS6000, TS6130, TS6180, TS6230, TS6280, TS6300
+PIXMA TS6000, TS6130, TS6180, TS6230, TS6280, TS6300, TS6330
 .br
-PIXMA TS6330, TS6380, TS7330, TS8100, TS8130, TS8180, TS8230
+PIXMA TS6380, TS7330, TS8100, TS8130, TS8180, TS8230, TS8280
 .br
-PIXMA TS8280,, TS8300, TS8330, TS8380, TS9000, TS9100, TS9180
+PIXMA TS8300, TS8330, TS8380, TS9000, TS9100, TS9180, TS9500
 .br
-PIXMA TS9500, TS9580
+PIXMA TS9580
 .br
 PIXUS MP5, XK50, XK60, XK70, XK80
 .br
-imageCLASS MF810/820, MF5630, MF5650, MF5750, MF8170c
+imageCLASS MF720, MF810/820, MF5630, MF5650, MF5750, MF8170c
 .br
 imageCLASS MPC190, D550
 .br
@@ -129,7 +135,7 @@ i-SENSYS MF110, MF220, MF260, MF410, MF420, MF510, MF520, MF740
 .br
 i-SENSYS MF5880dn, MF5900, MF6680dn, MF8500C
 .br
-MAXIFY MB5100, MB5300
+MAXIFY MB5300
 .RE
 .PP
 The following models may use partly the same Pixma protocol as other devices
@@ -234,10 +240,25 @@ or 1 = JPEG, 2 = TIFF, 3 = PDF, 4 = Compact PDF. For some scanners this value
 is equivalent to the number of the pressed button. Not all scanners can provide
 this data.
 .TP
-.I scan-resolution
+.I scan\-resolution
 (read only) Returns the resolution of the scan operation if the scanner
 provides that data. Known values: 1 = 75 dpi, 2 = 150 dpi, 3 = 300 dpi,
 4 = 600 dpi. Not all scanners can provide this data.
+.TP
+.I document\-type
+(read only) Returns the type of the scanned document if the scanner provides
+that data. Known values: 1 = Document, 2 = Photo, 3 = Auto scan. Not all scanners
+can provide this data.
+.TP
+.I adf\-status
+(read only) Returns the status of the document feeder if the scanner provides
+that data. Known values: 1 = ADF empty, 2 = ADF filled. Not all scanners can
+provide this data.
+.TP
+.I adf\-orientation
+(read only) Returns the scan orientation of the medium scanned from ADF if the
+scanner provides that data. Known values: 1 = Portrait, 2 = Landscape. Not all
+scanners can provide this data.
 .SH FILES
 .TP
 .I @LIBDIR@/libsane\-pixma.a
@@ -418,6 +439,8 @@ to "/tmp/config:" would result in directories "tmp/config", ".", and
 .SH "SEE ALSO"
 .BR sane (7),
 .BR sane\-dll (5),
+.BR scanimage (1),
+.BR gamma4scanimage (1),
 .PP
 In case of trouble with a recent Pixma model, try the latest code for
 the pixma backend, available in the Sane git repository at: