Merge branch 'feature/upstream' into develop

1 files changed, 14 insertions, 15 deletions

diff --git a/doc/sane-find-scanner.man b/doc/sane-find-scanner.man
index da2d377..26c5258 100644
--- a/doc/sane-find-scanner.man
+++ b/doc/sane-find-scanner.man
@@ -4,12 +4,12 @@
 sane\-find\-scanner \- find SCSI and USB scanners and their device files
 .SH SYNOPSIS
 .B sane\-find\-scanner
-.RB [ \-h | \-? ]
+.RB [ \-? | \-h | \-\-help ]
 .RB [ \-v ]
 .RB [ \-q ]
 .RB [ \-p ]
 .RB [ \-f ]
-.RB [ \-F 
+.RB [ \-F
 .IR filename ]
 .RI [ devname ]
 
@@ -19,15 +19,15 @@ is a command-line tool to find SCSI and USB scanners and determine their Unix
 device files. Its primary aim is to make sure that scanners can be detected by
 SANE backends.
 .PP
-For 
+For
 .B SCSI
-scanners, it checks the default generic SCSI device files (e.g., 
+scanners, it checks the default generic SCSI device files (e.g.,
 .IR /dev/sg0 )
-and 
+and
 .IR /dev/scanner .
 The test is done by sending a SCSI inquiry command and looking for a device
 type of "scanner" or "processor" (some old HP scanners seem to send
-"processor"). So 
+"processor"). So
 .B sane\-find\-scanner
 will find any SCSI scanner connected to those default device files even if it
 isn't supported by any SANE backend.
@@ -42,12 +42,12 @@ and
 are tested. The files are opened and the vendor and device ids are determined,
 if the operating system supports this feature. Currently USB scanners are only
 found this way if they are supported by the Linux scanner module or the
-FreeBSD or OpenBSD uscanner driver. After that test, 
+FreeBSD or OpenBSD uscanner driver. After that test,
 .B sane\-find\-scanner
 tries to scan for USB devices found by the USB library libusb (if
 available). There is no special USB class for scanners, so the heuristics used
 to distinguish scanners from other USB devices is not
-perfect. 
+perfect.
 .B sane\-find\-scanner
 also tries to find out the type of USB chip used in the scanner. If detected,
 it will be printed after the vendor and product ids.
@@ -55,20 +55,20 @@ it will be printed after the vendor and product ids.
 will even find USB scanners, that are not supported by any SANE backend.
 .PP
 .B sane\-find\-scanner
-won't find most 
+won't find most
 parallel port scanners, or scanners connected to proprietary ports. Some
 .B parallel port
 scanners may be detected by
-.B sane\-find\-scanner -p. 
+.B sane\-find\-scanner -p.
 At the time of writing this will only detect Mustek parallel port scanners.
 
 .SH OPTIONS
 .TP 8
-.B \-h, \-?
+.B \-?, \-h, \-\-help
 Prints a short usage message.
 .TP 8
 .B \-v
-Verbose output. If used once, 
+Verbose output. If used once,
 .B sane\-find\-scanner
 shows every device name and the test result.  If used twice, SCSI inquiry
 information and the USB device descriptors are also printed.
@@ -81,7 +81,7 @@ Probe parallel port scanners.
 .TP 8
 .B \-f
 Force opening all explicitly given devices as SCSI and USB devices. That's
-useful if 
+useful if
 .B sane\-find\-scanner
 is wrong in determining the device type.
 .TP 8
@@ -128,7 +128,6 @@ SCSI support is available on Irix, EMX, Linux, Next, AIX, Solaris, FreeBSD,
 NetBSD, OpenBSD, and HP-UX.
 
 .SH BUGS
-No support for most parallel port scanners yet. 
+No support for most parallel port scanners yet.
 .br
 Detection of USB chipsets is limited to a few chipsets.
-