summaryrefslogtreecommitdiff
path: root/doc/umax
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2019-07-31 17:00:58 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2019-07-31 17:00:58 +0200
commitd087d778ffb62e2713cb848540bcc819470365bd (patch)
treed69692a274dd1c7d0672e6bb7155a0fc106f9d49 /doc/umax
parentc8bd2513ecba169cff44c09c8058c36987357b18 (diff)
parent3759ce55ba79b8d3b9d8ed247a252273ee7dade3 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'doc/umax')
-rw-r--r--doc/umax/negative-types.txt1
-rw-r--r--doc/umax/sane-umax-advanced-options-doc.html2
-rw-r--r--doc/umax/sane-umax-config-doc.html4
-rw-r--r--doc/umax/sane-umax-mirage-doc.html1
-rw-r--r--doc/umax/sane-umax-standard-options-doc.html3
-rw-r--r--doc/umax/umax.BUGS1
-rw-r--r--doc/umax/umax.CHANGES33
-rw-r--r--doc/umax/umax.FAQ4
-rw-r--r--doc/umax/umax.TODO1
9 files changed, 21 insertions, 29 deletions
diff --git a/doc/umax/negative-types.txt b/doc/umax/negative-types.txt
index c1f26ce..142807f 100644
--- a/doc/umax/negative-types.txt
+++ b/doc/umax/negative-types.txt
@@ -12,4 +12,3 @@ konica 38% 21% 14% 3% 0% 0%
---------------------------------------------------------------
agfa 61% 24% 13% 6% 2% 0%
---------------------------------------------------------------
-
diff --git a/doc/umax/sane-umax-advanced-options-doc.html b/doc/umax/sane-umax-advanced-options-doc.html
index dd2277b..fa29952 100644
--- a/doc/umax/sane-umax-advanced-options-doc.html
+++ b/doc/umax/sane-umax-advanced-options-doc.html
@@ -64,7 +64,7 @@ Supported scanners:
<li><a href="http://www.xsane.org/">XSane homepage</a></li>
</ul>
<br>
-</td>
+</td>
<td VALIGN=TOP BGCOLOR="#FFFFFF">
<blockquote>
diff --git a/doc/umax/sane-umax-config-doc.html b/doc/umax/sane-umax-config-doc.html
index c5f43b1..a269079 100644
--- a/doc/umax/sane-umax-config-doc.html
+++ b/doc/umax/sane-umax-config-doc.html
@@ -194,7 +194,7 @@ with the calibration please enable debug output.
<p>
<i>calibration-full-ccd</i>:<br>
The calibration can be done for each element of the CCD (1)
-or for each pixel of the requested image(0).
+or for each pixel of the requested image(0).
The value -1 enables the value defined in the driver.
<p>
<i>calibration-width-offset</i>:<br>
@@ -205,7 +205,7 @@ The value -1 enables the value defined in the driver.
<i>calibration-bytes-pixel</i>:<br>
Some scanners use 1 byte calibration data although the
scanner supports more than 8 bits/pixel. You can define
-1 or 2 bytes per pixel calinration data.
+1 or 2 bytes per pixel calinration data.
The value -1 enables the value defined in the driver.
<p>
<i>invert-shading-data</i>:<br>
diff --git a/doc/umax/sane-umax-mirage-doc.html b/doc/umax/sane-umax-mirage-doc.html
index 7c81b43..5d15982 100644
--- a/doc/umax/sane-umax-mirage-doc.html
+++ b/doc/umax/sane-umax-mirage-doc.html
@@ -278,4 +278,3 @@ Author: <a href="mailto:Oliver.Rauch@rauch-domain.de">Oliver Rauch</a>
</body>
</html>
-
diff --git a/doc/umax/sane-umax-standard-options-doc.html b/doc/umax/sane-umax-standard-options-doc.html
index da0ade3..b80ca40 100644
--- a/doc/umax/sane-umax-standard-options-doc.html
+++ b/doc/umax/sane-umax-standard-options-doc.html
@@ -64,7 +64,7 @@ Supported scanners:
<li><a href="http://www.xsane.org/">XSane homepage</a></li>
</ul>
<br>
-</td>
+</td>
<td VALIGN=TOP BGCOLOR="#FFFFFF">
<br>
@@ -271,4 +271,3 @@ Author: <a href="mailto:Oliver.Rauch@rauch-domain.de">Oliver Rauch</a>
</body>
</html>
-
diff --git a/doc/umax/umax.BUGS b/doc/umax/umax.BUGS
index 90af9b8..37e55da 100644
--- a/doc/umax/umax.BUGS
+++ b/doc/umax/umax.BUGS
@@ -9,4 +9,3 @@ KNOWN BUGS:
* pixel count in x-direction is sometimes wrong if xres > 600dpi (Vista S12)
* first scan with Astra 2400S produces wrong colors
-
diff --git a/doc/umax/umax.CHANGES b/doc/umax/umax.CHANGES
index 77d8d62..79cca89 100644
--- a/doc/umax/umax.CHANGES
+++ b/doc/umax/umax.CHANGES
@@ -101,7 +101,7 @@ sane-0.6 / 0.61 / 0.62 -> 0.63
* added support for each color (R,G,B) for highlight and shadow
- * added "Astra 1200S" and "UC840" as supported
+ * added "Astra 1200S" and "UC840" as supported
* added bad bugfix for preview-problem with S6E
(in umax-scsi.c function start_scan)
@@ -344,7 +344,7 @@ sane-0.70/0.71 -> 0.72
* combined bind for highlight, shadow, analog-gamma and new
exposure time functions to rgb-bind
-
+
* added set_WD_line_arrangement(buffer_r, WD_line_arrengement_by_driver);
if driver is doing color-ordering from line to pixel
@@ -423,11 +423,11 @@ sane-0.73 -> 0.74
* added sigterm_handler for umax_reader_process
changed sane_canel, do_canel and do_eof(=close_pipe),
cancel now works!
-
+
* changed trim_rowbufsize that made problems with SGI,
there has been an overflow because of big buffersize
-
+
sane-0.74 -> 1.00 (build 0)
---------------------------
@@ -682,7 +682,7 @@ build-15 -> build-16
* OPT_SOURCE: removed change of width/height and "*info |= SANE_INFO_RELOAD_PARAMS;"
from get_value to set_value and added "*info |= SANE_INFO_RELOAD_OPTIONS;"
-
+
build-16 -> build-17
--------------------
@@ -782,7 +782,7 @@ build-21 -> build-22
scsi-read commands, it also is possible to give
bothe scanners different scsi command queueing depth).
- * prepared replacement of pipe by sanei_ipc_* routines
+ * prepared replacement of pipe by sanei_ipc_* routines
* added routines umax_get_lamp_status and umax_set_lamp_status
@@ -826,7 +826,7 @@ build-22 -> build-23
* for Astra 2200 selection for different x/y resolutions is disabled
-
+
build-23 -> build-24 (sane-1.0.4)
--------------------
@@ -837,8 +837,8 @@ build-23 -> build-24 (sane-1.0.4)
* enabled lamp control for Astra 2100S
* Added warning in sane_control_option if option could not be set
-
-
+
+
build-24 -> build-25
--------------------
@@ -906,7 +906,7 @@ build-24 -> build-25
* added #define SANE_I18N(text) text to umax.c. This is to mark the backend
specific texts that shall be translated by the frontend
-
+
build-25 -> build-26
--------------------
@@ -925,11 +925,11 @@ build-25 -> build-26
* changed some static unsigned int to static int
- * sane_exit does free devlist
+ * sane_exit does free devlist
* added some options for Powerlook 3000 - still is not completly supported
-
+
build-26 -> build-27
--------------------
@@ -940,7 +940,7 @@ build-26 -> build-27
* changed default minimum scsi buffer size from 64KB to 32 KB
-
+
build-27 -> build-28
--------------------
@@ -967,7 +967,7 @@ build-27 -> build-28
* added Heidelberg Linoscan 1400 "HDM LS4H1S" as supported scanner
-
+
build-28 -> build-29
--------------------
@@ -1026,10 +1026,10 @@ build-32 -> build-33
* added USB support for Astra 2200
thanks to Frank Zago <fzago@greshamstorage.com>
for creating umax-usb.c and suggesting several changes to umax.c
-
+
* added umax.conf option "connection-type", values: 1=scsi, 2=usb
- * added umax.conf device selection "usb 0x1606 0x0230" (usb vendor_id product_id)
+ * added umax.conf device selection "usb 0x1606 0x0230" (usb vendor_id product_id)
* removed #ifdef HAVE_SANEI_IPC parts (SANEI_IPC was never defined)
@@ -1169,4 +1169,3 @@ build-44 -> build-45
* added defualt 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 0901a2c..2ffbdfd 100644
--- a/doc/umax/umax.FAQ
+++ b/doc/umax/umax.FAQ
@@ -39,7 +39,7 @@ A: There are at least two kind of scsi controller cards that
On linux you may have the chance to get it work with the recent
g_NCR5380-driver. The card does not have IRQ/DMA.
- Try the following option for kernel: dtc3181e=0x280,255
+ Try the following option for kernel: dtc3181e=0x280,255
or use the following command:
insmod g_NCR5380 ncr_irq=255 ncr_addr=0x280 dtc3181e=1
@@ -143,5 +143,3 @@ 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
at http://www.scantips.com
-
-
diff --git a/doc/umax/umax.TODO b/doc/umax/umax.TODO
index 6af64b6..0d6f5a9 100644
--- a/doc/umax/umax.TODO
+++ b/doc/umax/umax.TODO
@@ -19,4 +19,3 @@ TODO UMAX BACKEND FOR SANE
- I will NOT add support for parallel-port and USB scanners to this backend!
Don`t ask for it.
-