Merge branch 'feature/upstream' into develop

11 files changed, 33 insertions, 33 deletions

diff --git a/doc/umax/sane-umax-astra-doc.html b/doc/umax/sane-umax-astra-doc.html
index 0b94019..d59fe3d 100644
--- a/doc/umax/sane-umax-astra-doc.html
+++ b/doc/umax/sane-umax-astra-doc.html
@@ -557,7 +557,7 @@ Supported scanners:
 <br>
 <font color="#990000">*** Astra 6400 and 6450 are firewire scanners: not tested.</font>
 <p>
-<font color="#990000">UTA = Umax Transparancy Adapter, ADF = Automatic Document Feeder</font>
+<font color="#990000">UTA = Umax Transparency Adapter, ADF = Automatic Document Feeder</font>
 <br>
 <font color="#990000">(X = supported by scanner, incl = is included)</font>
 <br>
diff --git a/doc/umax/sane-umax-config-doc.html b/doc/umax/sane-umax-config-doc.html
index a269079..57be082 100644
--- a/doc/umax/sane-umax-config-doc.html
+++ b/doc/umax/sane-umax-config-doc.html
@@ -121,7 +121,7 @@ and how you have to set the permissions of that device, have a look at
 <blockquote>
 When the generic scsi driver of the system supports selection
 of scsi buffer sizes the umax backend calculates the scsi buffer
-sizes in dependance of the numbers of bytes per scanline.
+sizes in dependence of the numbers of bytes per scanline.
 With <i>scsi-buffer-size-min</i> and <i>scsi-buffer-size-max</i>
 the scsi buffer size can be defined in a range between 4KB and 1MB.
 Especially the minimum value is very important. If this value is
@@ -150,7 +150,7 @@ work you can set the option <i>force-preview-bit-rgb 1</i>.
 This always sets the preview bit when acquiring a color scan.
 The image quality may be reduced.
 <p>
-Some scanners (especally very old scanners) may need the options
+Some scanners (especially very old scanners) may need the options
 <i>slow-speed</i> and/or <i>care-about-smearing</i>. The value
 -1 uses the value defined by the driver, 0 disables the feature,
 1 enables the feature. <b>Do not change these options unless
@@ -411,7 +411,7 @@ export SANE_DEBUG_UMAX=8
 <center>
 <hr WIDTH="100%">
 <br>
-<font color="#009900">This page has been changed on 27th. feburary 2001</font>
+<font color="#009900">This page has been changed on 27th. february 2001</font>
 <br>
 <br>
 </center>
diff --git a/doc/umax/sane-umax-mirage-doc.html b/doc/umax/sane-umax-mirage-doc.html
index 5d15982..a98f288 100644
--- a/doc/umax/sane-umax-mirage-doc.html
+++ b/doc/umax/sane-umax-mirage-doc.html
@@ -258,7 +258,7 @@ series:</b></td>
 <br>
 <font color="#990000">* Mirage D-16L scanners allow scanning up to 800x800 / 1600x1600 dpi.</font>
 <p>
-<font color="#990000">UTA = Umax Transparancy Adapter, ADF = Automatic Document Feeder</font>
+<font color="#990000">UTA = Umax Transparency Adapter, ADF = Automatic Document Feeder</font>
 <br>
 <font color="#990000">(X = supported by scanner, incl = is included)</font>
 <br>
diff --git a/doc/umax/sane-umax-others-doc.html b/doc/umax/sane-umax-others-doc.html
index e1ed10d..9c0c072 100644
--- a/doc/umax/sane-umax-others-doc.html
+++ b/doc/umax/sane-umax-others-doc.html
@@ -217,7 +217,7 @@ and USB- scanners are not supported!</b>
 </table></center>
 
 <center>
-<p><font color="#990000">UTA = Umax Transparancy Adapter, ADF = Automatic Document Feeder</font>
+<p><font color="#990000">UTA = Umax Transparency Adapter, ADF = Automatic Document Feeder</font>
 <br><font color="#990000">(X = supported by scanner, incl = is included)</font>
 <br>
 <br>
diff --git a/doc/umax/sane-umax-powerlook-doc.html b/doc/umax/sane-umax-powerlook-doc.html
index 23eb3dc..47b4586 100644
--- a/doc/umax/sane-umax-powerlook-doc.html
+++ b/doc/umax/sane-umax-powerlook-doc.html
@@ -517,7 +517,7 @@ Supported scanners:
 <font color="#990000">* Powerlook 1100 is a firewire scanner: not tested</font>
 <br>
 <br>
-<font color="#990000">UTA = Umax Transparancy Adapter, ADF = Automatic Document Feeder</font>
+<font color="#990000">UTA = Umax Transparency Adapter, ADF = Automatic Document Feeder</font>
 <br>
 <font color="#990000">(X = supported by scanner, incl = is included)</font>
 <br>
diff --git a/doc/umax/sane-umax-scanner-clones-doc.html b/doc/umax/sane-umax-scanner-clones-doc.html
index f43d7eb..b6cc265 100644
--- a/doc/umax/sane-umax-scanner-clones-doc.html
+++ b/doc/umax/sane-umax-scanner-clones-doc.html
@@ -686,7 +686,7 @@ Here is a list of the UMAX-compatible scanners:
 
 <center>
 <p><font color="#990000">* Scanner is able to scan up to 1200 x 1200 dpi.</font>
-<p><font color="#990000">UTA = Umax Transparancy Adapter, ADF = Automatic Document Feeder</font>
+<p><font color="#990000">UTA = Umax Transparency Adapter, ADF = Automatic Document Feeder</font>
 <br><font color="#990000">(X = supported by scanner, incl = is included)</font>
 </center>
 
@@ -1028,7 +1028,7 @@ Here is a list of the UMAX-compatible scanners:
 
 <center>
 <p><font color="#990000">* Scanner is able to scan up to 1200 x 1200 dpi.</font>
-<p><font color="#990000">UTA = Umax Transparancy Adapter, ADF = Automatic Document Feeder</font>
+<p><font color="#990000">UTA = Umax Transparency Adapter, ADF = Automatic Document Feeder</font>
 <br><font color="#990000">(X = supported by scanner, incl = is included)</font>
 </center>
 <br>
diff --git a/doc/umax/sane-umax-standard-options-doc.html b/doc/umax/sane-umax-standard-options-doc.html
index b80ca40..4cba2d2 100644
--- a/doc/umax/sane-umax-standard-options-doc.html
+++ b/doc/umax/sane-umax-standard-options-doc.html
@@ -82,7 +82,7 @@ is an example of the frontend
 <p><br>
 The options Gamma, brightness, contrast and negative in the
 main window come from xsane that calculates a gamma table using this values.
-These values are corelated to highlight, midlight and shadow sliders in
+These values are correlated to highlight, midlight and shadow sliders in
 the Histogram window.
 
 <br>
diff --git a/doc/umax/sane-umax-uc-doc.html b/doc/umax/sane-umax-uc-doc.html
index a894b47..9fd1e2e 100644
--- a/doc/umax/sane-umax-uc-doc.html
+++ b/doc/umax/sane-umax-uc-doc.html
@@ -595,7 +595,7 @@ Supported scanners:
 <p>
 
 
-<p><font color="#990000">UTA = Umax Transparancy Adapter, ADF = Automatic Document Feeder</font>
+<p><font color="#990000">UTA = Umax Transparency Adapter, ADF = Automatic Document Feeder</font>
 <br><font color="#990000">(X = supported by scanner, incl = is included)</font>
 
 
diff --git a/doc/umax/sane-umax-vista-doc.html b/doc/umax/sane-umax-vista-doc.html
index a4e68a4..67ff1a1 100644
--- a/doc/umax/sane-umax-vista-doc.html
+++ b/doc/umax/sane-umax-vista-doc.html
@@ -599,7 +599,7 @@ Supported scanners:
 
 <center>
 <p><font color="#990000">* Supervista S12 scanners allow scanning up to 1200x1200 dpi.</font>
-<p><font color="#990000">UTA = Umax Transparancy Adapter, ADF = Automatic Document Feeder</font>
+<p><font color="#990000">UTA = Umax Transparency Adapter, ADF = Automatic Document Feeder</font>
 <br><font color="#990000">(X = supported by scanner, incl = is included)</font>
 
 
diff --git a/doc/umax/umax.CHANGES b/doc/umax/umax.CHANGES
index 79cca89..fae53a4 100644
--- a/doc/umax/umax.CHANGES
+++ b/doc/umax/umax.CHANGES
@@ -5,9 +5,9 @@ umax -> sane-0.6:
 -----------------
 
     * umax-sane-backend created:
-      - umax.c splitted in:
+      - umax.c split in:
         umax-cli.c, umax-scsi.c, umax-driver.c, umax-text.c
-      - umax.h splitted in:
+      - umax.h split in:
         umax-scanner.h, umax-scsi.h, umax-scsidef.h, umax-struct.h
       - outputs done by DBG(level,msg,args...) defined in debug.h
       - scsi-calls changed to sane-format (of sane-0.57)
@@ -91,7 +91,7 @@ sane-0.6 / 0.61 / 0.62 -> 0.63
 
     * reset adf and uta flag when not used (in sane_start)
 
-    * added possibilty to change calibration-mode if available
+    * added possibility to change calibration-mode if available
 
     * added send_halftone_pattern to umax-scsi.c
 
@@ -119,7 +119,7 @@ sane-0.6 / 0.61 / 0.62 -> 0.63
       and added missing 3 wid-bytes in scan.cmd
 
     * removed parameter color in three_pass_function_headers,
-      the color ist taken from us->three_pass_color now.
+      the color is taken from us->three_pass_color now.
 
 
 sane-0.63/0.64/0.65 -> 0.66
@@ -189,7 +189,7 @@ sane-0.66 -> 0.67
 
     * removed bug (wrong length for 10 bit-gamma) in send_gamma_data
 
-    * changed all buffer-definitions to unsigned char and insterted
+    * changed all buffer-definitions to unsigned char and inserted
       type conversions, so there are no more warnings because of
       typemismatches.
 
@@ -201,7 +201,7 @@ sane-0.67 -> 0.68
 
     * changed open config to fp = sanei_config_open(UMAX_CONFIG_FILE)
 
-    * changed all set OPT...BIND commands, endless-loop happend in sane-0.67
+    * changed all set OPT...BIND commands, endless-loop happened in sane-0.67
       =>ane-0.67-umax-fix.diff.gz
       after that patch changed same for ten_bit_mode
 
@@ -232,7 +232,7 @@ sane-0.68 -> 0.69
 
     * changed name: umax_read_data_block -> umax_read_image_data
 
-    * changed length offest in do_inquiry from 5 to 4
+    * changed length offset in do_inquiry from 5 to 4
       and changed set_inquiry_length-offset from 5 to 4
 
     * added calib_lines to structure US and added it to
@@ -278,7 +278,7 @@ sane-0.69 -> 0.70
     * moved reader_process from umax.c to umax-scsi.c
       and added routine for color ordering.
 
-    * reset length offest in do_inquiry from 4 to 5
+    * reset length offset in do_inquiry from 4 to 5
       and set_inquiry_length-offset from 4 to 5
       because umax-S6E didn't work with it!
 
@@ -395,7 +395,7 @@ sane-0.73 -> 0.74
       There must'nt be a "wait_scanner" in calibration by driver routine!!!
 
     * added usage of driver internal values for calibration by driver if
-      the scanner does not give back the informations about the shading data:
+      the scanner does not give back the information about the shading data:
       width = dev->width * dev->inquiry_optical_res ( * 3 in RGB-mode )
 
     * added 2 calibration-routines:
@@ -497,7 +497,7 @@ build-2 -> build-3 (sane-1.0.1)
 
    * inversion of calibration is automatically set for Astra 6X0S and Vista S6E
 
-   * check for machine endianess is done only at backend start now!
+   * check for machine endianness is done only at backend start now!
 
    * made umax_do request_sense static
 
@@ -566,7 +566,7 @@ build-7 -> build-8
     * for Mirage D-16L the driver does not wait any more until scanner is repositioned
       this is experimental, it may work with other scanners too!
 
-    * Mirage D-16L does not give back informations for calibration by driver,
+    * Mirage D-16L does not give back information for calibration by driver,
       added new modus that "guesses" the values for Mirage D-16L.
 
     * Added read_shading_data to 16 bit calibration routine and made a routine for
@@ -594,7 +594,7 @@ build-8 -> build-9
 
     * gamma table is disabled in lineart and halftone modes
 
-    * if image is transmitted completly sane_read (close_pipe)
+    * if image is transmitted completely sane_read (close_pipe)
       returns with SANE_STATUS_GOOD in adf mode and in any other case
       with SANE_STATUS_EOF
 
@@ -735,7 +735,7 @@ build-19 -> build-20
     * added variable calibration_width_offset, Mirage D-16L offset of 308 is defined there
       and added offset of 28 for PowerLook III
 
-    * umax_do_calibration: guessed calibration data vaules use 2 bytes/color if scanner
+    * umax_do_calibration: guessed calibration data values use 2 bytes/color if scanner
       supports gamma input bit depth supports 2 bytes/color
 
     * calibration by driver now does work for PowerLook III
@@ -780,7 +780,7 @@ build-21 -> build-22
        higher scsi-ID (=priority) does scan without stops,
        the other scanner has to wait long time between the
        scsi-read commands, it also is possible to give
-       bothe scanners different scsi command queueing depth).
+       both scanners different scsi command queueing depth).
 
     * prepared replacement of pipe by sanei_ipc_* routines
 
@@ -915,7 +915,7 @@ build-25 -> build-26
    * added Mirage II as supported scanner
 
    * added routine umax_set_max_geometry that defines available surface
-     and resolution in dependance of scansource and double optical resolution
+     and resolution in dependence of scansource and double optical resolution
      (before this bugfix the change of dor mode overwrote the settings of
       scansource and vice versa)
 
@@ -927,7 +927,7 @@ build-25 -> build-26
 
    * sane_exit does free devlist
 
-   * added some options for Powerlook 3000 - still is not completly supported
+   * added some options for Powerlook 3000 - still is not completely supported
 
 
 build-26 -> build-27
@@ -1140,7 +1140,7 @@ build-41 -> build-42
 
   * replaced fork() routines by sanei_thread routines
 
-  * added call sanei_scsi_req_flush_all(); to do_cancel - in threaded case this is not done when reader_process is cancled
+  * added call sanei_scsi_req_flush_all(); to do_cancel - in threaded case this is not done when reader_process is canceled
 
   * in reader_process: marked freed scsi buffers as freed(NULL). This is necessary when reader_process is run as thread!
 
@@ -1156,7 +1156,7 @@ build-42 -> build-43
 build-43 -> build-44
 --------------------
 
-  * the sense_hanlder stores the sense data in buffer[0] when valid sense data is avialable
+  * the sense_handler stores the sense data in buffer[0] when valid sense data is available
 
   * do_calibration:
 	- corrected bug in reading calibration width from scanner (added /bytespp)
@@ -1167,5 +1167,5 @@ build-43 -> build-44
 build-44 -> build-45
 --------------------
 
-   * added defualt options for Linotype Opal2
+   * added default options for Linotype Opal2
    * changed bug in highlight-blue function (using green value)
diff --git a/doc/umax/umax.FAQ b/doc/umax/umax.FAQ
index 2ffbdfd..84d217c 100644
--- a/doc/umax/umax.FAQ
+++ b/doc/umax/umax.FAQ
@@ -64,7 +64,7 @@ A: There are at least two kind of scsi controller cards that
 Q: I use linux with a NCR/Symbios logic SCSI-Controller, sane does not work
    right.
 
-A: There are two differen drivers in the linux Kernel/modules.
+A: There are two different drivers in the linux Kernel/modules.
    Use the BSD-driver ncr53c8xx or sym53c8xx.
 
 -------------------------------------------------------------------------------
@@ -141,5 +141,5 @@ A: The optimization set by "-O2" makes problems, try which one of the following
 
 -------------------------------------------------------------------------------
 
-You find a lot of tips and informations in the internet. E.g. take a look
+You find a lot of tips and information on the internet. E.g. take a look
 at http://www.scantips.com