Merge branch 'feature/upstream' into develop

1 files changed, 44 insertions, 38 deletions

diff --git a/doc/sane-canon_lide70.man b/doc/sane-canon_lide70.man
index ae807a3..83c54bc 100644
--- a/doc/sane-canon_lide70.man
+++ b/doc/sane-canon_lide70.man
@@ -1,12 +1,13 @@
-.TH sane\-canon_lide70 5 "26 Nov 2019"  "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH sane\-canon_lide70 5 "22 Aug 2020"  "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane\-canon_lide70
 .SH NAME
-sane\-canon_lide70 \- SANE backend for the Canon LiDE 70 USB flatbed scanner
+sane\-canon_lide70 \- SANE backend for the Canon LiDE 70 and 600(F) USB flatbed scanners
 .SH DESCRIPTION
 The
 .B canon_lide70
 library implements a SANE (Scanner Access Now Easy) backend that
-provides access to the Canon Inc. CanoScan LiDE 70 flatbed scanner.
+provides access to the Canon Inc. CanoScan LiDE 70 and 600(F)
+flatbed scanners. The film unit of the LiDE 600F is not supported.
 .PP
 Due to Canon's unwillingness to provide scanner documentation, this
 software was developed by analyzing the USB traffic of the Windows
@@ -15,55 +16,51 @@ to the scanner is known only to a very limited extent. Some sophistication
 present in the Windows XP driver has been left out. There is, for example,
 no active calibration.
 .PP
-TESTERS ARE WELCOME. Send your bug reports and comments to
-the sane\-devel mailing list <sane\-devel@alioth-lists.debian.net>
-.PP
-The
-.B Canoscan LiDE 600
-(or 600f, with film unit) is closely related to the LiDE 70, but
-it does not work with this backend. Support for the LiDE 600 will
-be added by the end of 2020.
+Testers and reviewers are welcome. Send your bug reports and comments to
+the sane\-devel mailing list
+.IR <sane\-devel@alioth-lists.debian.net> .
 .PP
 .SH CONFIGURATION
 The
 .I @CONFIGDIR@/canon_lide70.conf
 file identifies the LiDE 70 by its vendor code 0x04a9 and its
-product code 0x2225. For the LiDE 600(f) the product code would be 0x2224.
-.PP
+product code 0x2225. For the LiDE 600(f) the product code is 0x2224.
+
 .SH BACKEND SPECIFIC OPTIONS
-.PP
 .B Scan Mode:
+
 .TP
-\-\-resolution 75|150|300|600|1200 [default 600]
-.BR
-Sets the resolution of the scanned image in dots per inch. Scanning at 1200 dpi is very slow.
+.B \-\-resolution 75|150|300|600|1200 [default 600]
+Sets the resolution of the scanned image in dots per inch. Scanning at 1200 dpi
+is not available on the LiDE 600(F) and it is very slow on the LiDE 70.
+
 .TP
-\-\-mode Color|Gray|Lineart [default: Color]
-.BR
+.B \-\-mode Color|Gray|Lineart [default: Color]
 Selects the scan mode. Lineart means fully black and fully white pixels only.
+
 .TP
-\-\-threshold 0..100 (in steps of 1) [default 75]
-.BR
+.B \-\-threshold 0..100 (in steps of 1) [default 75]
 Select minimum-brightness percentage to get a white point, relevant only for Lineart
+
 .TP
-\-\-non-blocking[=(yes|no)] [inactive]
-.BR
+.B \-\-non-blocking[=(yes|no)] [inactive]
 This option has not yet been implemented. Scans are captured in a temporary file with a typical size of 100MB.
+
 .PP
 .B Geometry:
 .TP
-\-l 0..216.069 [default 0]
-        Top-left x position of scan area in millimeters.
+.B \-l 0..216.069 [default 0]
+Top-left x position of scan area in millimeters.
 .TP
-\-t 0..297 [default 0]
-        Top-left y position of scan area in millimeters.
+.B \-t 0..297 [default 0]
+Top-left y position of scan area in millimeters.
 .TP
-\-x 0..216.069 [default 80]
-        Width of scan-area in millimeters.
+.B \-x 0..216.069 [default 80]
+Width of scan-area in millimeters.
 .TP
-\-y 0..297 [default 100]
-        Height of scan-area in millimeters.
-.PP
+.B \-y 0..297 [default 100]
+Height of scan-area in millimeters.
+
 .SH FILES
 .TP
 .I @CONFIGDIR@/canon_lide70.conf
@@ -87,18 +84,27 @@ Example:
 SANE_DEBUG_CANON_LIDE70=128 scanimage > /dev/null
 .SH KNOWN PROBLEMS
 At low resolutions (75 and 150 dpi, implying high slider speeds)
-the scanner misses the top one millimeter of the scan area. This can
+the LiDE 70 misses the top one millimeter of the scan area. This can
 be remedied by shifting the document one millimeter downward, in cases
-where such precision matters. Note that xsane uses the 75 dpi mode for
-prescans.
+where such precision matters. Note that
+.BR xsane (1)
+uses the 75 dpi mode for prescans. The problem is worse on the LiDE 600(F),
+where the offset is five millimeters.
 .PP
-It is recommended that in xsane the gamma value be set to approximately 1.5
+It is recommended that in
+.BR xsane (1)
+the gamma value be set to approximately 1.7
 to get more realistic colors. This also wipes out some artifacts caused by
 the lack of real calibration.
+
 .SH "SEE ALSO"
-sane(7), sane\-usb(5), sane\-find\-scanner(1), scanimage(1)
+.BR sane (7),
+.BR sane\-usb (5),
+.BR sane\-find\-scanner (1),
+.BR scanimage (1),
+.BR xsane (1),
 .br
 http://www.juergen-ernst.de/info_sane.html
-.br
+
 .SH AUTHOR
 pimvantend, building upon pioneering work by Juergen Ernst.