Merge branch 'feature/upstream' into develop

3 files changed, 7 insertions, 7 deletions

diff --git a/doc/plustek/FAQ b/doc/plustek/FAQ
index a3a224f..92a4e72 100644
--- a/doc/plustek/FAQ
+++ b/doc/plustek/FAQ
@@ -111,7 +111,7 @@ SOLUTION:
 ---------
 Simply load the parport module. You can add this dependency to
 your /etc/modules.conf (or /etc/conf.modules) file (see INSTALL).
-Then everytime you load pt_drv with modprobe, parport will be loaded
+Then every time you load pt_drv with modprobe, parport will be loaded
 automatically. After modifying this file, call
 depmod -va
 
@@ -339,7 +339,7 @@ A:  I recommend to uninstall the previous one.
 
     rpm -e sane-1.0.1-94
 
-    After theses steps, sane should be removed.
+    After these steps, sane should be removed.
     I'm not sure,  but you might have to remove the /etc/sane.d manually...
     Now got to your sane-1.0.3 stuff and reinstall this
     as described. Before using, you might have a look
diff --git a/doc/plustek/Plustek-PARPORT.changes b/doc/plustek/Plustek-PARPORT.changes
index 6aa878b..43131f7 100644
--- a/doc/plustek/Plustek-PARPORT.changes
+++ b/doc/plustek/Plustek-PARPORT.changes
@@ -97,7 +97,7 @@ Version 0.39 08/11/2001
     3.0 Added forceMode switch
     4.0 Fixed a problem in the PT12 code that causes I/O timeouts
     5.0 Added Genius Colorpage Vivivd III V2 stuff
-    6.0 Added A3I stuff aquired from Plustek
+    6.0 Added A3I stuff acquired from Plustek
     7.0 Fixed a bug, that causes some seg-faults
 
 Version 0.40 12/17/2001
@@ -110,7 +110,7 @@ Version 0.41 01/10/2002
     1.0 Changed IOCTL interface to the kernel module to allow adjustment of some
         driver internal variables
     2.0 Changed plustek.conf configuration fileformat to reflect the enhanced
-        capabilites
+        capabilities
 
 Version 0.42 02/12/2002
     1.0 Added custom gamma table support
diff --git a/doc/plustek/Plustek-USB.txt b/doc/plustek/Plustek-USB.txt
index 939d4d7..29989d0 100644
--- a/doc/plustek/Plustek-USB.txt
+++ b/doc/plustek/Plustek-USB.txt
@@ -195,7 +195,7 @@ When using libusb with SANE, then you should also use the hotplug utilities to
 automatically setup your device nodes (at least the permissions) and prevent
 scanner.o from loading.
 
-Assuming, that these utilites are properly installed on your box, you have
+Assuming, that these utilities are properly installed on your box, you have
 to tweak and add some files.
 
 In directory (where of course the config files reside):
@@ -292,7 +292,7 @@ it.
 If you have carried out all of the above steps, then sane-find-scanner should
 be able to recognise your scanner correctly.
 
-sane-find-scanner probes all of the devices on the SCSI and USB busses, and
+sane-find-scanner probes all of the devices on the SCSI and USB buses, and
 so you may find that it outputs "unable to get minor data" errors or similar
 to your terminal, or to your error logs, you can safely ignore these as long
 as it does that, and has recognised your scanner.
@@ -339,7 +339,7 @@ log, as well as (where possible) the output of the scanimage command (if
 you can't capture it directly, an as-accurate-as-possible description is
 MUCH better than nothing!), and try and get all of the activity that
 your scanner did as well (light
-came on? didnt? motors came on? etc?) and email that to the plustek list
+came on? didn't? motors came on? etc?) and email that to the plustek list
 (<plustek@linuxhacker.org>).
 
 For the particularly adventurous only...