Merge branch 'feature/upstream' into develop

1 files changed, 11 insertions, 9 deletions

diff --git a/doc/sane-coolscan3.man b/doc/sane-coolscan3.man
index 57c0652..7c59f43 100644
--- a/doc/sane-coolscan3.man
+++ b/doc/sane-coolscan3.man
@@ -83,7 +83,7 @@ If set to "yes", the scanner will read the infrared channel, thus allowing
 defect removal in software. The infrared image is read during a second scan,
 with no options altered. The backend must not be restarted between the scans.
 If you use scanimage, perform a batch scan with
-.B batch\-count=2
+.B \-\-batch\-count=2
 to obtain the IR information.
 .TP
 .B \-\-depth <n>
@@ -113,14 +113,15 @@ Multiply all exposure times with this value. This allows exposure
 correction without modifying white balance.
 .TP
 .B \-\-load
-Load the next slide when using the slide loader.
+Load the next slide when using the slide loader (SF\-200 bulk loader only).
 .TP
 .B \-\-eject
 Eject the film strip or mounted slide when using the slide loader.
 .TP
 .B \-\-reset
 Reset scanner. The scanner will perform the same action as when power is
-turned on: it will eject the film strip and calibrate itself. Use this
+turned on: it will eject the film strip (with the SF\-200 bulk loader)
+and calibrate itself. Use this
 whenever the scanner refuses to load a film strip properly, as a result of
 which
 .B \-\-eject
@@ -142,7 +143,7 @@ These lines are ignored, thus '#' can be used to include comments.
 .TP
 .I containing only the word """auto"""
 This instructs the backend to probe for a scanner by scanning the buses for
-devices with know identifiers. This is the action taken when no
+devices with known identifiers. This is the default action when no
 configuration file is present.
 .TP
 .I a line of the form <interface>:<device>
@@ -175,8 +176,8 @@ levels reduce verbosity.
 .BR sane\-scsi (5),
 .BR sane\-usb (5),
 .BR scanimage (1),
-.BR xscanimage(1),
-.BR xsane(1)
+.BR xscanimage (1),
+.BR xsane (1)
 
 .SH BUGS
 Currently, the SANE protocol does not allow automatically updating options
@@ -184,9 +185,10 @@ whenever the hardware changes. Thus the number of choices for the
 .B \-\-frame
 option will be fixed when the backend is initialized (usually when the user
 runs the frontend). In particular, if there is no film strip in the
-automatic film strip feeder when the backend is initialized, the frame option
-will not appear at all. Also, restarting the frontend after swapping film
-adapters is strongly recommended.
+automatic film strip feeder when the backend is initialized, the
+.B \-\-frame
+option will not appear at all.
+Also, restarting the frontend after swapping film adapters is strongly recommended.
 
 Linux kernels prior to 2.4.19 had a patch that truncated INQUIRY data
 from IEEE 1394 scanners to 36 bytes, discarding vital information