Merge branch 'feature/upstream' into develop

2 files changed, 21 insertions, 24 deletions

diff --git a/doc/canon/canon.changes b/doc/canon/canon.changes
index 30eb6e9..f07c225 100644
--- a/doc/canon/canon.changes
+++ b/doc/canon/canon.changes
@@ -37,6 +37,3 @@ Version 990201:
   because it sets the resolution down first.
 
 * I have included a new directory containing scripts I find useful.
-
-
-
diff --git a/doc/canon/canon.install2700F.txt b/doc/canon/canon.install2700F.txt
index 923a6d4..b80e8d9 100644
--- a/doc/canon/canon.install2700F.txt
+++ b/doc/canon/canon.install2700F.txt
@@ -1,6 +1,6 @@
 
 -----------------------------------------------------------------------
-How to install a CanoScan 2700F on a Linux box ? 
+How to install a CanoScan 2700F on a Linux box ?
 by Stephan Hegel <ea273@fen.baynet.de>.
 Date:   Fri Jan 15 16:13:15 MEZ 1999
 -----------------------------------------------------------------------
@@ -17,13 +17,13 @@ Corrections and suggestions are welcome, of course. Thank you.
 -----------------------------------------
 
    The AVA-1502AP is is a small ISA Adaptec SCSI controller which is
-   shipped with the CanoScan slide scanner. Per default is has the 
+   shipped with the CanoScan slide scanner. Per default is has the
    address 0x140, the IRQ 10 and the SCSI host id 7. Check first for
    conflicts with your already existing hardware.
 
    Install the controller into the computer.
 
-   After starting the BIOS should detect the board as a PNP board. 
+   After starting the BIOS should detect the board as a PNP board.
    Boot the computer with the "SCSISelect" disk which is shipped with
    the scanner to check that the controller is detected. Don't change
    any settings except address, IRQ or SCSI id if necessary.
@@ -32,13 +32,13 @@ Corrections and suggestions are welcome, of course. Thank you.
       SCSI Support (yes)
       SCSI Generic support (yes)
       Low level driver for aha152x (yes)
-   Note: here you can try to compile the SCSI support as modules as 
+   Note: here you can try to compile the SCSI support as modules as
          long as you don't boot the computer from a SCSI disk. But this
          is not tested.
 
    Compile and install the new Linux kernel.
 
-   Add "aha152x=0x140,10,7" to the "append" line to the already existing 
+   Add "aha152x=0x140,10,7" to the "append" line to the already existing
    kernel parameters in lilo.conf, e.g:
    -------------------
    # Linux bootable partition config begins
@@ -46,7 +46,7 @@ Corrections and suggestions are welcome, of course. Thank you.
    root = /dev/hdc1
    label = linux
    append = "sbpcd=0x230,SoundBlaster aha152x=0x140,10,7"
-   # Linux bootable partition config ends 
+   # Linux bootable partition config ends
    -------------------
 
    Invoke lilo to activate the changes.
@@ -64,12 +64,12 @@ Corrections and suggestions are welcome, of course. Thank you.
    on" since the scanner is the one and only device connected to my host
    adapter.
 
-   Turn on the scanner first and wait for a few second. The scanner 
+   Turn on the scanner first and wait for a few second. The scanner
    performs a short self test.
 
    Turn on the computer.
 
-   Watch the boot messages, there should be a message indicating that 
+   Watch the boot messages, there should be a message indicating that
    the SCSI host adapter and the scanner are there.
 
    Now you can check again that the scanner device is there:
@@ -85,18 +85,18 @@ Corrections and suggestions are welcome, of course. Thank you.
 
    Fetch the latest SANE distribution from the SANE homepage at:
        http://www.sane-project.org/
-   
+
    Unpack and configure it.
-   
+
    Get the latest canon backend from Manuel's homepage:
       http://www.rzg.mpg.de/~mpd/sane
 
    Put the files in the sane/backend directory as described in the
    README of the package. This overwrites the existing canon.* files
    with the latest version of these files.
-   
+
    Compile and install SANE.
-   
+
    Add the "canon" scanner to the /usr/local/etc/sane.d/dll.conf file:
       -------- cut here ------------
       # enable the next line if you want to allow access through the network:
@@ -108,12 +108,12 @@ Corrections and suggestions are welcome, of course. Thank you.
       #umax
       canon
       -------- cut here ------------
-   
+
    Add a "canon.conf" file to the /usr/local/etc/sane.d directory:
       -------- cut here ------------
-      scsi CANON 
+      scsi CANON
       -------- cut here ------------
-   
+
    Check the available scanners:
       scanimage -L
    This should give something like this:
@@ -122,14 +122,14 @@ Corrections and suggestions are welcome, of course. Thank you.
       device `pnm:1' is a Noname PNM file reader virtual device
 
    Invoke the frontend:
-      xscanimage & 
-   NOTE: The "xscanimage" frontend is in the SANE distribution. There 
-   is also another SANE frontend available which is called "xsane" by 
-   Oliver Rauch. It is still under heavy development and can be grabbed 
+      xscanimage &
+   NOTE: The "xscanimage" frontend is in the SANE distribution. There
+   is also another SANE frontend available which is called "xsane" by
+   Oliver Rauch. It is still under heavy development and can be grabbed
    from:
       http://www.wolfsburg.de/~rauch
 
-   A dialog box appears, select the canon scanner and here we go ... 
+   A dialog box appears, select the canon scanner and here we go ...
    Happy scanning !!!
-   
+
 -----------------------------------------------------------------------