Merge branch 'feature/upstream' into develop

1 files changed, 12 insertions, 12 deletions

diff --git a/doc/sane-umax.man b/doc/sane-umax.man
index 7dd9382..41b4beb 100644
--- a/doc/sane-umax.man
+++ b/doc/sane-umax.man
@@ -20,12 +20,12 @@ parallel- and USB-scanners are not (and probably will never be) supported!
 
 .SH CONFIGURATION
 
-The configuration file for this backend resides in 
+The configuration file for this backend resides in
 .IR @CONFIGDIR@/umax.conf .
 
 Its contents is a list of device names that correspond to UMAX and UMAX compatible scanners. Empty lines
 and lines starting with a hash mark (#) are ignored. A sample configuration file is
-shown below: 
+shown below:
 
 .nf
  # this is a comment
@@ -44,19 +44,19 @@ shown below:
  option calibration\-width\-offset \-1
  option calibration\-bytes\-pixel \-1
  option exposure\-time\-rgb\-bind \-1
- option invert\-shading\-data \-1 
+ option invert\-shading\-data \-1
  option lamp\-control\-available 0
  option gamma\-lsb\-padded 0
- /dev/sge 
-\ 
- #scsi Vendor Model Type Bus Channel ID LUN 
+ /dev/sge
+\
+ #scsi Vendor Model Type Bus Channel ID LUN
  # The following scanner supports lamp control
  option lamp\-control\-available 1
- scsi UMAX * Scanner * * * * * 
-\ 
+ scsi UMAX * Scanner * * * * *
+\
  # scanner on /dev/scanner does not support lamp control
  option lamp\-control\-available 0
- /dev/scanner 
+ /dev/scanner
 .fi
 
 .TP
@@ -194,7 +194,7 @@ command queueing you can try to set this value to 1.
 .PP
 The special device name must be a generic SCSI device or a symlink to such a device.
 To find out to which device your scanner is assigned and how you have to set the
-permissions of that device, have a look at sane\-scsi. 
+permissions of that device, have a look at sane\-scsi.
 
 .SH SCSI ADAPTER TIPS
 
@@ -203,7 +203,7 @@ well by Linux (I suggest not to use it), the PCI-SCSI-adapters that come with so
 Umax-scanners are not supported at all (as far as I know). On other platforms these
 SCSI-adapters are not supported. So you typically need to purchase another SCSI-adapter
 that is supported by your platform. See the relevant hardware FAQs and HOWTOs for your
-platform for more information. 
+platform for more information.
 
 The UMAX-scanners do block the scsi-bus for a few seconds while scanning. It is not
 necessary to connect the scanner to its own SCSI-adapter. But if you need short
@@ -240,7 +240,7 @@ SANE_DEBUG_UMAX values
 .ft CR
 .nf
 Number  Remark
-\ 
+\
  0       print important errors (printed each time)
  1       print errors
  2       print sense