Merge branch 'release/experimental/1.0.29-1_experimental1'experimental/1.0.29-1_experimental1

8 files changed, 24 insertions, 31 deletions

diff --git a/doc/plustek/FAQ b/doc/plustek/FAQ
index 7d65f41..a3a224f 100644
--- a/doc/plustek/FAQ
+++ b/doc/plustek/FAQ
@@ -51,7 +51,7 @@ SOLUTION:
 ---------
 Set the link /usr/src/linux
 to your current kernel-source tree before recompiling
-kernel-modules like pt_drv, then your version mismatch 
+kernel-modules like pt_drv, then your version mismatch
 problem should be solved.
 
 
@@ -303,7 +303,7 @@ A:  Normally, there is no need to do so, because once you
     have to worry about loading the driver. It happens automagically. ;-)
     The driver will be loaded when needed (and eventually
     removed after a specific time of not using it).
-	
+
     Nevertheless, another possibility is to do a modprobe pt_drv in the
     /etc/rc.d/boot.local (using SuSE) or
     /etc/rc.d/rc.local (using RedHat or Mandrake) file
@@ -382,4 +382,3 @@ A:  In general you can install it over. BUT this has caused
 
     This should cover all the directories where maybe some
     sane files are installed...
-
diff --git a/doc/plustek/Makefile.kernel24 b/doc/plustek/Makefile.kernel24
index 207ef39..28677c1 100644
--- a/doc/plustek/Makefile.kernel24
+++ b/doc/plustek/Makefile.kernel24
@@ -43,7 +43,7 @@ REFOPT = -xref-all -index-all -html32
 
 #
 # add the following to get assembly listing
-# -Wa,-alh,-L -g 
+# -Wa,-alh,-L -g
 
 #
 # get some version numbers
@@ -248,4 +248,3 @@ depend .depend dep:
 ifeq (.depend,$(wildcard .depend))
 #include .depend
 endif
-
diff --git a/doc/plustek/Plustek-PARPORT-TODO.txt b/doc/plustek/Plustek-PARPORT-TODO.txt
index 94ef5f7..6eb8667 100644
--- a/doc/plustek/Plustek-PARPORT-TODO.txt
+++ b/doc/plustek/Plustek-PARPORT-TODO.txt
@@ -28,7 +28,7 @@ Genius HR6               negative scanning not okay            none
 
 ********************************* DONE ***************************************
 
-- PS/2 bidi does not work (libieee1284)                          
+- PS/2 bidi does not work (libieee1284)
 - Update the IOCTL interface and remove some old structs (CmdBlk)
 
 ******************************** SKIPPED *************************************
diff --git a/doc/plustek/Plustek-PARPORT.changes b/doc/plustek/Plustek-PARPORT.changes
index 0e7d73b..6aa878b 100644
--- a/doc/plustek/Plustek-PARPORT.changes
+++ b/doc/plustek/Plustek-PARPORT.changes
@@ -149,11 +149,11 @@ Version 0.43-7 05/11/2005
     1.0 Fixed timer issues in user-space (Thanx to Rod Roark)
 
 Version 0.43-8 08/10/2005
-    1.0 Fixed problem on ASIC96003/1 based devices, when scanning 
+    1.0 Fixed problem on ASIC96003/1 based devices, when scanning
         lineart at 200 and 300 dpi
 
 Version 0.43-9 11/14/2005
-    1.0 Fixed sizeof(long) issue for 64bit platforms, see 
+    1.0 Fixed sizeof(long) issue for 64bit platforms, see
         bug #302195
 
 Version 0.43-10 02/16/2006
@@ -177,4 +177,4 @@ Version 0.43-13 06/18/2007
 Version 0.44-1 02/13/2013
     1.0 Fixed issues for Kernels > 2.6.35
     2.0 Define ULong and friends to uint32_t to make the driver
-        work in a 64 bit environment
\ No newline at end of file
+        work in a 64 bit environment
diff --git a/doc/plustek/Plustek-PARPORT.txt b/doc/plustek/Plustek-PARPORT.txt
index e5b6097..a181b9c 100644
--- a/doc/plustek/Plustek-PARPORT.txt
+++ b/doc/plustek/Plustek-PARPORT.txt
@@ -22,7 +22,7 @@ in sane-backends/backend. Simply do (as root user)
 
 Then the module should be compiled, installed and loaded.
 
-Add the following three lines to file /etc/modules.conf 
+Add the following three lines to file /etc/modules.conf
 
 alias char-major-40	pt_drv
 pre-install pt_drv modprobe -k parport
@@ -44,6 +44,3 @@ protocol will be changed and newer drivers won't work with older backends
 and vice versa.
 In this case (error -9019 in the SANE debug output!!) you have to recompile SANE
 AND the driver (have a look at the installation procedure above).
-
-
-
diff --git a/doc/plustek/Plustek-USB-TODO.txt b/doc/plustek/Plustek-USB-TODO.txt
index 0ea7e8b..7d03e9b 100644
--- a/doc/plustek/Plustek-USB-TODO.txt
+++ b/doc/plustek/Plustek-USB-TODO.txt
@@ -50,4 +50,3 @@ make mono/gray modes work on Canon scanners                     done
 copy picture line by line to backend                            done
 cancel function does not work correctly in large resolutions    fixed
 Move documents to its correct SANE place                        done
-
diff --git a/doc/plustek/Plustek-USB.changes b/doc/plustek/Plustek-USB.changes
index 8ed5cc8..ae6e69e 100644
--- a/doc/plustek/Plustek-USB.changes
+++ b/doc/plustek/Plustek-USB.changes
@@ -148,7 +148,7 @@ optical one (sensor stops too early)
 V 0.50-2 (2005-08-19)
 ---------------------
 More cleanup.
-Removed obsolete _WAF_BLACKFINE. 
+Removed obsolete _WAF_BLACKFINE.
 LiDE20 does not seem to have a reliable black calibration area,
 so the devices now will switch off the lamp for dark calibration.
 Fixed line statistics and added  calibration data output.
@@ -283,7 +283,7 @@ V 0.47-1 - 0.47-4
 
 V 0.46-9 (2003-11-03)
 ---------------------
-- Added alternate calibration for CIS devices 
+- Added alternate calibration for CIS devices
 - Added coarse calibration data-cache
 - Moved parallelport code to extra backend file plustek_pp
 - Fixed some minor bugs
diff --git a/doc/plustek/Plustek-USB.txt b/doc/plustek/Plustek-USB.txt
index e1ee793..939d4d7 100644
--- a/doc/plustek/Plustek-USB.txt
+++ b/doc/plustek/Plustek-USB.txt
@@ -20,7 +20,7 @@ PLUSTEK
 =======
 Vendor ID: 0x07B3
 
-Product ID       Device-description and status	
+Product ID       Device-description and status
 0x0005           not identified yet
 0x0007           not identified yet
 0x000F           not identified yet
@@ -32,21 +32,21 @@ Product ID       Device-description and status
 0x0015           U24 (LM9832) - working
 0x0016           not identified yet
 0x0017           UT12 - working, UT16 - working, UT24 - working
-	
+
 MUSTEK
 ======
 BearPaw vendor ID: 0x0400 (They use the NationalSemiconductors ID!!!)
 
-Product ID       Device-description and status	
+Product ID       Device-description and status
 0x1000           BearPaw 1200 (LM9831) - working
 0x1001           BearPaw 1200 (LM9832) - not tested
 0x1001           BearPaw 2400 (LM9832) - mostly working
-    	
+
 KYE (Genius)
 ============
 Vendor ID: 0x0458
-	
-Product ID       Device-description and status	
+
+Product ID       Device-description and status
 0x2007           ColorPage-HR6 V2 - working
 0x2008           ColorPage-HR6 V2 - not tested
 0x2009           ColorPage-HR6A   - not tested
@@ -58,7 +58,7 @@ Hewlett Packard
 ===============
 Vendor ID: 0x03F0
 
-Product ID       Device-description and status	
+Product ID       Device-description and status
 0x0505           HP Scanjet 2100c - working
 0x0605           HP Scanjet 2200c - working
 
@@ -66,7 +66,7 @@ EPSON
 =====
 Vendor ID: 0x04b8
 
-Product ID       Device-description and status	
+Product ID       Device-description and status
 0x010F           EPSON Perfection 1250/Photo - working
 0x011D           EPSON Perfection 1260/Photo - working
 
@@ -74,9 +74,9 @@ UMAX
 ====
 Vendor ID: 0x1606
 
-Product ID       Device-description and status	
-0x0050           UMAX 3400 - working 
-0x0060           UMAX 3400/3450 - working 
+Product ID       Device-description and status
+0x0050           UMAX 3400 - working
+0x0060           UMAX 3400/3450 - working
 0x0160           UMAX 5400 - working
 
 COMPAQ
@@ -90,7 +90,7 @@ CANON
 =====
 Vendor ID: 0x04A9
 
-Product ID       Device-description and status	
+Product ID       Device-description and status
 0x????           FB620U        - not integrated
 0x2206           N650U         - working
 0x2207           N1220U        - working
@@ -216,7 +216,7 @@ usbscanner 0x0003 0x1606 0x0160 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00
 The example line shows the vendor ID of UMAX 0x1606 and the product ID of the 5400
 0x0160 - these values must match the ones of your scanner.
 
-Last step is adding a script in 
+Last step is adding a script in
 /etc/hotplug/usb/
 It is called "usbscanner" (don't forget the executable rights)
 
@@ -232,7 +232,7 @@ fi
 
 This script will correct the access right to your scanner device when the device
 is plugged in.
-              
+
 
 Debugging your USB scanner (written by Kev Green)
 -------------------------------------------------
@@ -454,4 +454,3 @@ CM - Color Mode (unitless), 3 for channel pixel rate color, else 1
 
 
 -------------------------
-