Updated man page and added Perfection 1660 and 2400 to desc file.

doc/descriptions/epson.desc

@@ -112,11 +112,18 @@
 :interface "USB"
 :status :stable
 
-:model "Perfection 2450"
+:model "Perfection 1660"
-:comment "IEEE-1394 is not supported"
 :interface "USB"
 :status :stable
 
+:model "Perfection 2400"
+:interface "USB"
+:status :stable
+
+:model "Perfection 2450"
+:interface "USB IEEE-1394"
+:status :stable
+
 :model "Expression 636"
 :comment "US version of GT-9500"
 :interface "SCSI"

doc/sane-epson.man

@@ -10,7 +10,7 @@ provides access to Epson flatbed scanners.  Some functions of this
 backend should be considered
 .B beta-quality
 software! Most functions have been stable for a long time, but of 
-course new development can not and will not function properly from
+course new development can not and often times will not function properly from
 the very first day. Please report any strange behavior to the 
 maintainer of the backend.
 .PP
@@ -47,20 +47,26 @@ Perfection 1640              USB, SCSI
 .br
 Perfection 1650              USB
 .br
-Perfection 2450              USB
+Perfection 1660              USB
+.br
+Perfection 2400              USB
+.br
+Perfection 2450              USB, IEEE-1394
 .br
 Expression 636 / GT-9500     SCSI
 .br
 Expression 1600              USB, SCSI, IEEE-1394
+.br
+Expression 1680              USB, SCSI, IEEE-1394
 .RE
 
 For other scanners the software  may or may not work.  Please send mail to 
-the backend author (khk@khk.net) to report successes with scanners not on
+the backend author (khk@khk.net) to report success with scanners not on
-the list or failures with scanners that are listed. At this time, the
+the list or problems with scanners that are listed. 
-Perfection 2450 is only supported with the USB interface.
 .SH OPTIONS
 The options the backend supports can either be selected through command line
-options to programs like scanimage or through GUI elements in xscanimage or xsane.
+options to programs like scanimage or through GUI elements in programs like
+xscanimage or xsane.
 
 Valid command line options and their syntax can be listed by using 
 .RS
@@ -71,113 +77,113 @@ Not all devices support all options.
 .I Scan Mode
 The 
 .I --mode 
-switch selects the basic mode of operation of the scanner valid choices are 
+switch selects the basic mode of operation of the scanner. Valid choices
-.I Binary, Gray and Color. 
+are Binary, Gray and Color.  The Binary mode is black and white only,
-The Binary mode is black and white only, Gray will produce 256 levels of gray 
+Gray will produce 256 levels of gray or more depending on the scanner
-or more depending on the scanner and Color means 24 bit color mode or more 
+and Color means 24 bit color mode or more depending on the scanner.
-depending on the scanner.  Some scanners will internally use 36 bit color, 
+Some scanners will internally use 36 bit color, their external interface
-the external interface however does only support 24 bits.
+however may only support 24 bits.
 
 The
 .I --depth
-option selects the bit depth the scanner is using. This option is only available
+option selects the bit depth the scanner is using. This option is only
-for scanners that support more than one bit depth. Older scanners will always
+available for scanners that support more than one bit depth. Older
-transfer the image in 8bit mode. Newer scanners allow to select either 8 bits 
+scanners will always transfer the image in 8bit mode. Newer scanners
-or 12 or 14 bits per color channel. For a color scan this means an effective
+allow to select either 8 bits, 12 or 14 bits per color channel. For a
-color depth of 36 or 42 bits over all channels. The valid choice depend on 
+color scan this means an effective color depth of 36 or 42 bits over
-the scanner model.
+all three channels. The valid choices depend on the scanner model.
-
-The 
-.I --dropout 
-option determines which color filters are used to scan in Binary mode. Valid choices
-are None, Red, Green and Blue.
 
 The
 .I --halftoning
-switch selects the mode that is used in Binary mode. Valid options are None, 
+switch selects the mode that is used in Binary mode. Valid options
-Halftone A (Hard Tone), Halftone B (Soft Tone), Halftone C (Net Screen), 
+are None, Halftone A (Hard Tone), Halftone B (Soft Tone), Halftone C
-Dither A (4x4 Bayer), Dither B (4x4 Spiral), Dither C (4x4 Net Screen), 
+(Net Screen), Dither A (4x4 Bayer), Dither B (4x4 Spiral), Dither C
-Dither D (8x4 Net Screen), Text Enhanced Technology, Download pattern A, 
+(4x4 Net Screen), Dither D (8x4 Net Screen), Text Enhanced Technology,
-and Download pattern B.
+Download pattern A, and Download pattern B.
 
 The 
 .I --dropout
-switch selects the so called dropout color. Vald options are None, Red, Green 
+switch selects the so called dropout color. Vald options are None,
-and Blue. The default is None. The dropout color is used for 
+Red, Green and Blue. The default is None. The dropout color is used for
-monochrome scanning and selects the color that is not scanned. This can be used
+monochrome scanning and selects the color that is not scanned. This can
-to e.g. scan an original with a colored background.
+be used to e.g. scan an original with a colored background.
 
 The
 .I --brightness
-switch controls the brightness of the scan. Valid options are the numbers from -3 to 
+switch controls the brightness of the scan. Valid options are integer
-3. The default is 0. The larger the brightness value, the brighter the image gets. If 
+values from -3 to 3. The default is 0. The larger the brightness value,
-a user defined table for the gamma correction is selected, the brightness parameter is
+the brighter the image gets. If a user defined table for the gamma
-not available.
+correction is selected, the brightness parameter is not available.
 
 The
 .I --sharpness
-switch sets the sharpness of the image data. Valid options are the numbers from -2 to 
+switch sets the sharpness of the image data. Valid options are integer
-2, with -2 meaning "Defocus", -1 "Defocus slightly", 0 "Normal", 1 "Sharpen slighly"
+values from -2 to 2, with -2 meaning "Defocus", -1 "Defocus slightly",
-and 2 "Sharpen". 
+0 "Normal", 1 "Sharpen slighly" and 2 "Sharpen".
 
 The 
 .I --gamma-correction
-switch controls the scanne internal gamma correction. Valid options are "Default", "User
+switch controls the scanner's internal gamma correction. Valid options are
-defined", "High density printing" "Low density printing" and "High contrast printing".
+"Default", "User defined", "High density printing" "Low density printing"
+and "High contrast printing".
 
 The 
 .I --color-correction
-switch controls the scanner internal color correction function. Valid options are "No 
+switch controls the scanner's internal color correction function. Valid
-Correction", "Impact-dot printers", "Thermal printers", "Ink-jet printers" and "CRT
+options are "No Correction", "Impact-dot printers", "Thermal printers",
-monitors". The default is "CRT monitors". 
+"Ink-jet printers" and "CRT monitors". The default is "CRT monitors".
 
 The 
 .I --resolution
-switch selects the resolution for a scan. Many EPSON scanners will scan in any resulution between
+switch selects the resolution for a scan. Some EPSON scanners will scan in
-the lowest and highest possible value. The list reported by the scanner can be displayed using
+any resulution between the lowest and highest possible value. The list
-the "--help -d epson" parameters to scanimage.
+reported by the scanner can be displayed using the "--help -d epson"
+parameters to scanimage.
 
 The 
 .I --mirror
-option controls the way the image is scanned. By reading the image data from right to left the
+option controls the way the image is scanned. By reading the image data
-image is mirored. Valid options are "yes" and "no". The default is "no".
+from right to left the image is mirored. Valid options are "yes" and
+"no". The default is "no".
 
 The 
 .I --speed
-option can improve the scan speed in monochrome mode. Valid options are "yes" or "no", the "yes"
+option can improve the scan speed in monochrome mode. Valid options are
-option will speed up the scan if this option is supported.
+"yes" or "no", the "yes" option will speed up the scan if this option
+is supported.
 
 The 
 .I --auto-area-segmentation 
-switch turns on the automatic area segmentation for monochrome scans. The scanner will try to 
+switch activates the automatic area segmentation for monochrome scans. The
-determine which areas are text and which contain images. The image areas will be halftoned, 
+scanner will try to determine which areas are text and which contain
-and the text will be impoved. Valid options are "yes" and "no". The default is "yes".
+images. The image areas will be halftoned, and the text will be
+impoved. Valid options are "yes" and "no". The default is "yes".
 
 The 
 .I --gamma-table
-parameter can be used to download a user defined gamma table. The options takes 256 values from
+parameter can be used to download a user defined gamma table. The option
-the range 0-255. In color mode this option equally affects the red, green, and blue channel.
+takes 256 values from the range 0-255. In color mode this option equally
+affects the red, green, and blue channel.
 
 The 
 .I --red-gamma-table 
-parameter can be used to download a user defined gamma table for the red channel. The valid
+parameter can be used to download a user defined gamma table for the
-options are the same as for --gamma-table.
+red channel. The valid options are the same as for --gamma-table.
 
 The 
 .I --green-gamma-table 
-parameter can be used to download a user defined gamma table for the green channel. The valid
+parameter can be used to download a user defined gamma table for the
-options are the same as for --gamma-table.
+green channel. The valid options are the same as for --gamma-table.
 
 The 
 .I --blue-gamma-table 
-parameter can be used to download a user defined gamma table for the blue channel. The valid
+parameter can be used to download a user defined gamma table for the
-options are the same as for --gamma-table.
+blue channel. The valid options are the same as for --gamma-table.
 
 The color correction coefficients
 .I --cct-1 --cct-2 --cct-3 ... --cct-9
-will install color correction coefficients for the user defined color correction. Possible 
+will install color correction coefficients for the user defined color
-values are in the range -127..127.
+correction. Values are specified as integers in the range -127..127.
-
 
 The 
 .I --preview
@@ -186,26 +192,26 @@ resolution. Valid options are "yes" and "no". The default is "no".
 
 The 
 .I --preview-speed
-options will increase the scan speed if this is supported by the scanner. Valid options
+options will increase the scan speed if this is supported by the
-are "yes" and "no", the default is "no".
+scanner. Valid options are "yes" and "no", the default is "no".
- 
+
 
 The geometry options
 .I -l -t -x -y 
-control the scan area: -l sets the top left x coordinate, -t the top left y coordinate, 
+control the scan area: -l sets the top left x coordinate, -t the top
--x selects the width and -y the height of the scan aea. All parameters are specified in
+left y coordinate, -x selects the width and -y the height of the scan
-milimeters.
+aea. All parameters are specified in milimeters.
 
 The
 .I --quick-format
-option lets the user select a scan area with predefined sizes. Valid parameters are "CD", 
+option lets the user select a scan area with predefined sizes. Valid
-"A5 portrait", "A5 landscape", "Letter", "A4" and "max". The default is "max", which 
+parameters are "CD", "A5 portrait", "A5 landscape", "Letter", "A4" and
-selects the largest possible area.
+"max". The default is "max", which selects the largest possible area.
 
 The
 .I --source
-option selects the scan source. Valid options depend on the installed options. The default
+option selects the scan source. Valid options depend on the installed
-is "Flatbed".
+options. The default is "Flatbed".
 
 The 
 .I --auto-eject
@@ -213,35 +219,36 @@ option will eject a page after scanning from the document feeder.
 
 The
 .I --film-type
-option will select the film type for scans with the transparency unit. This
+option will select the film type for scans with the transparency
-option is only activated of the TPU is selected as scan source. Valid options
+unit. This option is only activated if the TPU is selected as scan
-are "Negative Film" and "Positive Film".
+source. Valid options are "Negative Film" and "Positive Film".
 
 The
 .I --focus-position
-option selects the focus position for all scans. Valid options are "Focus 2.5mm above
+option selects the focus position for all scans. Valid options are "Focus
-glass" and "Focus on glass". The focus on the 2.5mm point above the glass is 
+2.5mm above glass" and "Focus on glass". The focus on the 2.5mm point
-necessary for scans with the transparency unit, so that the scanner can focus on the
+above the glass is necessary for scans with the transparency unit, so
-film if one of the film holders is used.
+that the scanner can focus on the film if one of the film holders is used.
-
+This option is only functional for selected scanners, all other scanners
+will ignore this option.
 
 
 .SH CONFIGURATION FILE
 The configuration file @CONFIGDIR@/epson.conf specifies the device(s) that the 
-backend will use. The current version only supports one scanner per Epson 
+backend will use. Possible connection types are:
-backend. Possible connection types are:
 .TP
 .I SCSI
 This is the default, and if nothing else is specified the backend software will
-open a given patch as SCSI device. More information about valid syntax for SCSI
+open a given path as SCSI device. More information about valid syntax for SCSI
 devices can be found in sane-scsi(5).
 .TP
 .I PIO - Parallel Interface
-The parallel interface can be configured in two ways: An integer number starting
+The parallel interface can be configured in two ways: An integer value starting
 at the beginning of a line will be interpreted as the IO address of the parallel
 port. To make it clearer that a configured IO address is a parallel port the 
 port address can be preceded by the string "PIO". The PIO connection does not
-use a special device file in the /dev directory.
+use a special device file in the /dev directory. The IO address can be specified
+in hex mode (prefixed with "0x").
 .TP
 .I USB
 A device file that is preceded by the string "USB" is treated as a scanner 
@@ -272,7 +279,7 @@ uses to communicate with the scanner. The function level a scanner
 supports is determined during the initialization of the device. If
 the backend does not recognize the function level reported by the 
 scanner it will default to function level B5. Valid function levels
-are A1, A2, B1, B2, B3, B4, B5, B6, B7, B8 and F5. Use this feature
+are A1, A2, B1, B2, B3, B4, B5, B6, B7, B8, D1 and F5. Use this feature
 only if you know what you are doing!
 
 .SH "SEE ALSO"
@@ -295,8 +302,8 @@ correct format. Please send this information to the backend maintainer
 (email address is in the AUTHOR section of this man page or in the
 AUTHORS file of the SANE distribution). 
 
-The Perfection 600 and Perfection 1250 are not supported by this
+The Perfection 600, Perfection 650, Perfection 660, Perfection 1250 and 
-backend.
+Perfection 1260 are not supported by this backend.
 
 .SH AUTHOR