Merging upstream version 4.23.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 5 insertions, 3 deletions

diff --git a/upstream/mageia-cauldron/man5/sane-coolscan3.5 b/upstream/mageia-cauldron/man5/sane-coolscan3.5
index 24b0dc5b..0b329dcc 100644
--- a/upstream/mageia-cauldron/man5/sane-coolscan3.5
+++ b/upstream/mageia-cauldron/man5/sane-coolscan3.5
@@ -82,7 +82,9 @@ unit is mm).
 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
+If you use
+.BR scanimage (1),
+perform a batch scan with
 .B \-\-batch\-count=2
 to obtain the IR information.
 .TP
@@ -120,9 +122,9 @@ 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 (with the SF\-200 bulk loader)
+turned on: it will eject the slide (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
+whenever the scanner refuses to load a slide properly, as a result of
 which
 .B \-\-eject
 does not work.