Merge branch 'feature/upstream' into develop

1 files changed, 8 insertions, 9 deletions

diff --git a/doc/sane-dc240.man b/doc/sane-dc240.man
index ba7fd63..70629ab 100644
--- a/doc/sane-dc240.man
+++ b/doc/sane-dc240.man
@@ -14,16 +14,16 @@ connected.  The device name is always "0".
 .SH CONFIGURATION
 The contents of the
 .I dc240.conf
-specify the serial port and baud rate to use.  The baud rate 
+specify the serial port and baud rate to use.  The baud rate
 specifies the maximum rate to use while downloading pictures.  (The
 camera is always initialized using 9600 baud, then switches to the
 higher rate).  On a 450MHz Pentium, I usually have no problems downloading
 at 115200 baud, though the camera sometimes has to resend packets due
-to lost characters.  Results are better when 
+to lost characters.  Results are better when
 the "interrupt-unmask flag" is set in the IDE driver (hdparm \-u1).
 Supported baud rates are: 9600, 19200, 38400, 57600, and 115200.
 .PP
-The dumpinquiry line causes some information about the camera to 
+The dumpinquiry line causes some information about the camera to
 be printed.
 .PP
 cmdrespause specifies how many usec (1,000,000ths of a) between
@@ -31,7 +31,7 @@ writing the command and reading the result should be used. 125000
 seems to be the lowest I could go reliably.
 .PP
 breakpause is the time in 1,000,000ths of a usec between sending the
-"back to default" break sending commands.      
+"back to default" break sending commands.
 .PP
 Empty lines and lines starting with a hash mark (#) are
 ignored.  A sample configuration file is shown below:
@@ -82,7 +82,7 @@ to "/tmp/config:" would result in directories "tmp/config", ".", and
 .TP
 .B SANE_DEBUG_DC240
 If the library was compiled with debugging support enabled, this
-environment variable controls the debug level for this backend. 
+environment variable controls the debug level for this backend.
 A value of 128 requests maximally copious debug output; smaller
 levels reduce verbosity.
 
@@ -101,13 +101,12 @@ The manpage was largely copied from the dc210 manpage.
 .SH BUGS
 The major limitation that I know of is that the backend assumes
 the directory in the camera is 100dc240.  Once the camera has
-taken more than 9999 pictures, the directory will increment to 101dc240. 
+taken more than 9999 pictures, the directory will increment to 101dc240.
 Not only should we check for the additional directory, but pictures may
 actually be found in multiple directories.
 .PP
 More general comments, suggestions, and inquiries about frontends
-or SANE should go to the SANE Developers mailing list 
-(see http://www.sane\-project.org/mailing\-lists.html for details). 
+or SANE should go to the SANE Developers mailing list
+(see http://www.sane\-project.org/mailing\-lists.html for details).
 You must be subscribed to the list, otherwise your mail won't be
 sent to the subscribers.
-