Update upstream source from tag 'upstream/1.1.1'

Update to upstream version '1.1.1'
with Debian dir 4cb81ae9eaa2503b9c320ac1e8125f9df6e7f7b3

88 files changed, 1304 insertions, 600 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 5cf3011..17ae02f 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -86,7 +86,7 @@ all: bemans html-pages
 
 dist_doc_DATA = backend-writing.txt
 nobase_dist_doc_DATA = $(BEDOCS)
-EXTRA_DIST += descriptions.txt releases.txt sane-logo2.jpg sane-logo.png \
+EXTRA_DIST += descriptions.txt releases.md sane-logo2.jpg sane-logo.png \
   sane.png
 
 MAN2HTML = nroff -c -man |\
diff --git a/doc/descriptions-external/scangearmp2.desc b/doc/descriptions-external/scangearmp2.desc
index c82aa40..b670144 100644
--- a/doc/descriptions-external/scangearmp2.desc
+++ b/doc/descriptions-external/scangearmp2.desc
@@ -11,7 +11,7 @@
 
 :backend "canon_pixma"                 ; name of backend
 ;:version "(external)"             ; version of backend
-:url "https://github.com/Ordissimo/scangearmp2/blob/master/README.md"     ; backend's web page
+:url "https://github.com/Ordissimo/libmfp2-canon/blob/master/README.md"     ; backend's web page
 :comment "External binary-only backend for Linux i386 and x86_64?. See the website for the latest release."
 
 
@@ -28,6 +28,22 @@
 ; Canon MFP2 conf file
 ;
 
+; ---- V420 --------------------------
+:model "GX6000 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x0153"
+:status :good
+
+:model "GX7000 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x0157"
+:status :good
+
+:model "TS5400 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x0151"
+:status :good
+
 ; ---- V410 --------------------------
 :model "TS3400 series"
 :interface "USB WiFi"
@@ -466,6 +482,11 @@
 
 
 ; ---- V310 --------------------------
+:model "MX455 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1768"
+:status :good
+
 :model "MX490 series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1787"
diff --git a/doc/descriptions/epson.desc b/doc/descriptions/epson.desc
index fc901a7..eb9bdb2 100644
--- a/doc/descriptions/epson.desc
+++ b/doc/descriptions/epson.desc
@@ -11,7 +11,6 @@
 
 :backend "epson"                  ; name of backend
 :version "0.2.42 (unmaintained)"  ; version of backend
-:new :no
 :manpage "sane-epson"             ; name of manpage (if it exists)
 :url "http://www.khk.net/sane"    ; backend's web page
 
diff --git a/doc/descriptions/epson2.desc b/doc/descriptions/epson2.desc
index 1af191f..ad1d183 100644
--- a/doc/descriptions/epson2.desc
+++ b/doc/descriptions/epson2.desc
@@ -8,8 +8,6 @@
 ; distributed with "Image Scan!" and released under GPL.
 
 :backend "epson2"
-:version "1.0.124 (unmaintained)"
-:new :no
 :manpage "sane-epson2"
 
 :devicetype :scanner
@@ -22,7 +20,6 @@
 :usbid      "0x04b8" "0x08ac"
 :status     :complete
 :comment    "network interface supported via DFSG non-free iscan-network-nt package<br>all-in-one"
-:url        "http://www.epson.com/"
 
 :model      "AL-MX300DNF Series"
 :interface  "USB"
@@ -164,7 +161,7 @@
 :model      "DS-G20000"
 :interface  "USB"
 :usbid      "0x04b8" "0x015b"
-:status     :good
+:status     :complete
 
 :model      "EP-702A"
 :interface  "USB"
@@ -528,10 +525,20 @@
 :status     :good
 :comment    "network interface supported via DFSG non-free iscan-network-nt package"
 
-:model      "ET-2600"
+:model      "ET-2500 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1105"
+:status     :complete
+
+:model      "ET-2600 Series"
 :interface  "USB"
 :usbid      "0x04b8" "0x1122"
-:status     :good
+:status     :complete
+
+:model      "ET-2610 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1122"
+:status     :complete
 
 :model      "ET-2650"
 :interface  "USB Ethernet"
@@ -606,7 +613,7 @@
 :model      "Expression 12000XL"
 :interface  "USB"
 :usbid      "0x04b8" "0x015b"
-:status     :good
+:status     :complete
 :comment    "overseas version of the DS-G20000"
 
 :model      "F-3200"			; product spec (JP)
@@ -698,12 +705,6 @@
 :status     :unsupported
 :comment    "supported by the epkowa backend plus non-free interpreter"
 
-:model      "GT-7400U"			; product spec (JP)
-:interface  "USB"
-:usbid      "0x04b8" "0x0120"
-:status     :unsupported
-:comment    "supported by the snapscan backend"
-
 :model      "GT-7600S"			; product spec (JP)
 :interface  "SCSI"
 :status     :complete
@@ -745,11 +746,6 @@
 :usbid      "0x04b8" "0x011e"
 :status     :complete
 
-:model      "GT-8400UF"			; product spec (JP)
-:interface  "USB"
-:usbid      "0x04b8" "0x011f"
-:status     :unsupported
-
 :model      "GT-8500"
 :status     :untested
 
@@ -761,7 +757,7 @@
 :model      "GT-8700F"			; product spec (JP)
 :interface  "SCSI USB"
 :usbid      "0x04b8" "0x010a"
-:status     :good
+:status     :complete
 :comment    "GT-8700U with TPU option bundled"
 
 :model      "GT-9000"
@@ -1059,11 +1055,36 @@
 :status     :complete
 :comment    "network interface supported via DFSG non-free iscan-network-nt package<br>all-in-one"
 
+:model      "L365 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x08d2"
+:status     :complete
+
+:model      "L366 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x08d2"
+:status     :complete
+
+:model      "L375 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1105"
+:status     :complete
+
 :model      "L380"
 :interface  "USB"
 :usbid      "0x04b8" "0x1120"
 :status     :good
 
+:model      "L395 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1122"
+:status     :complete
+
+:model      "L396 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1122"
+:status     :complete
+
 :model      "L495"
 :interface  "USB Ethernet"
 :usbid      "0x04b8" "0x1121"
@@ -1081,6 +1102,36 @@
 :status     :complete
 :comment    "all-in-one"
 
+:model      "L3050 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1122"
+:status     :complete
+
+:model      "L3060 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1122"
+:status     :complete
+
+:model      "L3100 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1141"
+:status     :complete
+
+:model      "L3110 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1142"
+:status     :complete
+
+:model      "L3200 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1189"
+:status     :complete
+
+:model      "L3210 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1188"
+:status     :complete
+
 :model      "LP-7900CS"
 :status     :untested
 :comment    "business all-in-one; scanner is a ES-7000H"
@@ -1421,6 +1472,16 @@
 :status     :complete
 :comment    "network interface supported via DFSG non-free iscan-network-nt package<br>all-in-one"
 
+:model      "PX-048A Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1102"
+:status     :complete
+
+:model      "PX-049A Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1116"
+:status     :complete
+
 :model      "PX-1600F"
 :interface  "USB"
 :usbid      "0x04b8" "0x0869"
@@ -1607,6 +1668,11 @@
 :status     :good
 :comment    "all-in-one"
 
+:model      "PX-M160T Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x110f"
+:status     :complete
+
 :model      "PX-M350F"
 :interface  "USB"
 :usbid      "0x04b8" "0x08d0"
@@ -1655,11 +1721,6 @@
 :status     :complete
 :comment    "network interface supported via DFSG non-free iscan-network-nt package<br>all-in-one"
 
-:model      "Perfection 600"
-:interface  "SCSI"
-:status     :unsupported
-:comment    "supported by the umax backend<br>rebadged UMAX Astra 1200S"
-
 :model      "Perfection 610"		; command spec
 :interface  "USB"
 :usbid      "0x04b8" "0x0103"
@@ -1684,12 +1745,6 @@
 :status     :complete
 :comment    "overseas version of the GT-6700U"
 
-:model      "Perfection 660"
-:interface  "USB"
-:usbid      "0x04b8" "0x0114"
-:status     :unsupported
-:comment    "supported by the snapscan backend"
-
 :model      "Perfection 1200S"		; command spec
 :interface  "SCSI"
 :scsi       "EPSON" "Perfection1200" "processor"
@@ -1738,12 +1793,6 @@
 :status     :unsupported
 :comment    "supported by the epkowa backend plus non-free interpreter"
 
-:model      "Perfection 1270"
-:interface  "USB"
-:usbid      "0x04b8" "0x0120"
-:status     :unsupported
-:comment    "supported by the snapscan backend<br>overseas version of the GT-7400"
-
 :model      "Perfection 1600"
 :interface  "SCSI"
 :status     :unsupported
@@ -1759,7 +1808,7 @@
 :interface  "SCSI USB"
 :scsi       "EPSON" "Perfection1640" "processor"
 :usbid      "0x04b8" "0x010a"
-:status     :good
+:status     :complete
 :comment    "overseas version of the GT-8700F"
 
 :model      "Perfection 1650"		; command spec
@@ -1780,18 +1829,6 @@
 :status     :complete
 :comment    "overseas version of the GT-8300UF"
 
-:model      "Perfection 1670"
-:interface  "USB"
-:usbid      "0x04b8" "0x011f"
-:status     :unsupported
-:comment    "supported by the snapscan backend"
-
-:model      "Perfection 1670 PHOTO"
-:interface  "USB"
-:usbid      "0x04b8" "0x011f"
-:status     :unsupported
-:comment    "supported by the snapscan backend<br>overseas version of the GT-8400UF"
-
 :model      "Perfection 2400 PHOTO"	; command spec
 :interface  "USB"
 :usbid      "0x04b8" "0x011b"
@@ -1986,12 +2023,6 @@
 :status     :good
 :comment    "overseas version of the GT-X980"
 
-:model      "Stylus CX1500"		; Australia
-:interface  "USB"
-:usbid      "0x04b8" "0x080c"
-:status     :unsupported
-:comment    "supported by the snapscan backend<br>all-in-one"
-
 :model      "Stylus CX2800"
 :interface  "USB"
 :usbid      "0x04b8" "0x0830"
@@ -3377,10 +3408,20 @@
 :status     :complete
 :comment    "network interface supported via DFSG non-free iscan-network-nt package<br>all-in-one<br>overseas version of the PX-047A"
 
-:model      "XP-243 245 247 Series"
+:model      "XP-230 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1102"
+:status     :complete
+
+:model      "XP-235 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1102"
+:status     :complete
+
+:model      "XP-240 243 245 247 Series"
 :interface  "USB"
 :usbid      "0x04b8" "0x1116"
-:status     :good
+:status     :complete
 :comment    "network interface supported via DFSG non-free iscan-network-nt package<br>all-in-one"
 
 :model      "XP-255"
@@ -3430,6 +3471,12 @@
 :status     :good
 :comment    "network interface supported via DFSG non-free iscan-network-nt package<br>all-in-one"
 
+:model      "XP-452 455 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x113e"
+:status     :good
+:comment    "all-in-one"
+
 :model      "XP-600 Series"
 :interface  "USB"
 :usbid      "0x04b8" "0x089e"
diff --git a/doc/descriptions/epsonds.desc b/doc/descriptions/epsonds.desc
index 690dd25..9a17f43 100644
--- a/doc/descriptions/epsonds.desc
+++ b/doc/descriptions/epsonds.desc
@@ -7,7 +7,6 @@
 
 :backend "epsonds"
 :version "1.0.18 (unmaintained)"
-:new :no
 :manpage "sane-epsonds"
 
 :devicetype :scanner
@@ -94,3 +93,268 @@
 :interface  "USB"
 :usbid      "0x04b8" "0x08cc"
 :status     :untested
+
+:model      "DS-410"
+:interface  "USB"
+:usbid      "0x04b8" "0x0165"
+:status     :complete
+
+:model      "ES-50"
+:interface  "USB"
+:usbid      "0x04b8" "0x016c"
+:status     :complete
+
+:model      "DS-70"
+:interface  "USB"
+:usbid      "0x04b8" "0x0160"
+:status     :complete
+
+:model      "ES-55R"
+:interface  "USB"
+:usbid      "0x04b8" "0x016d"
+:status     :complete
+
+:model      "RR-60"
+:interface  "USB"
+:usbid      "0x04b8" "0x018c"
+:status     :complete
+
+:model      "ES-60W"
+:interface  "USB"
+:usbid      "0x04b8" "0x016e"
+:status     :complete
+
+:model      "DS-80W"
+:interface  "USB"
+:usbid      "0x04b8" "0x0166"
+:status     :complete
+
+:model      "ES-65WR"
+:interface  "USB"
+:usbid      "0x04b8" "0x016f"
+:status     :complete
+
+:model      "RR-70W"
+:interface  "USB"
+:usbid      "0x04b8" "0x018b"
+:status     :complete
+
+:model      "ES-60WW"
+:interface  "USB"
+:usbid      "0x04b8" "0x016e"
+:status     :complete
+
+:model      "ES-60WB"
+:interface  "USB"
+:usbid      "0x04b8" "0x016e"
+:status     :complete
+
+:model      "DS-1630"
+:interface  "USB"
+:usbid      "0x04b8" "0x015c"
+:status     :complete
+
+:model      "DS-1610"
+:interface  "USB"
+:usbid      "0x04b8" "0x015d"
+:status     :complete
+
+:model      "DS-1660W"
+:interface  "USB"
+:usbid      "0x04b8" "0x015e"
+:status     :complete
+
+:model      "DS-310"
+:interface  "USB"
+:usbid      "0x04b8" "0x0159"
+:status     :complete
+
+:model      "ES-200"
+:interface  "USB"
+:usbid      "0x04b8" "0x0159"
+:status     :complete
+
+:model      "DS-320"
+:interface  "USB"
+:usbid      "0x04b8" "0x0162"
+:status     :complete
+
+:model      "DS-360W"
+:interface  "USB"
+:usbid      "0x04b8" "0x015a"
+:status     :complete
+
+:model      "ES-300W"
+:interface  "USB"
+:usbid      "0x04b8" "0x015a"
+:status     :complete
+
+:model      "ES-300WR"
+:interface  "USB"
+:usbid      "0x04b8" "0x0177"
+:status     :complete
+
+:model      "ES-400II"
+:interface  "USB"
+:usbid      "0x04b8" "0x0181"
+:status     :complete
+
+:model      "DS-535II"
+:interface  "USB"
+:usbid      "0x04b8" "0x0183"
+:status     :complete
+
+:model      "DS-531"
+:interface  "USB"
+:usbid      "0x04b8" "0x0184"
+:status     :complete
+
+:model      "DS-530II"
+:interface  "USB"
+:usbid      "0x04b8" "0x0182"
+:status     :complete
+
+:model      "ES-500WII"
+:interface  "USB"
+:usbid      "0x04b8" "0x0185"
+:status     :complete
+
+:model      "DS-571W"
+:interface  "USB"
+:usbid      "0x04b8" "0x0188"
+:status     :complete
+
+:model      "DS-575WII"
+:interface  "USB"
+:usbid      "0x04b8" "0x0187"
+:status     :complete
+
+:model      "DS-570WII"
+:interface  "USB"
+:usbid      "0x04b8" "0x0186"
+:status     :complete
+
+:model      "ES-580W"
+:interface  "USB"
+:usbid      "0x04b8" "0x017f"
+:status     :complete
+
+:model      "RR-600W"
+:interface  "USB"
+:usbid      "0x04b8" "0x0180"
+:status     :complete
+
+:model      "DS-535"
+:interface  "USB"
+:usbid      "0x04b8" "0x0167"
+:status     :complete
+
+:model      "DS-535H"
+:interface  "USB"
+:usbid      "0x04b8" "0x017a"
+:status     :complete
+
+:model      "ES-400"
+:interface  "USB"
+:usbid      "0x04b8" "0x0156"
+:status     :complete
+
+:model      "DS-530"
+:interface  "USB"
+:usbid      "0x04b8" "0x0155"
+:status     :complete
+
+:model      "FF-680W"
+:interface  "USB"
+:usbid      "0x04b8" "0x016b"
+:status     :complete
+
+:model      "DS-570W"
+:interface  "USB"
+:usbid      "0x04b8" "0x0157"
+:status     :complete
+
+:model      "ES-500W"
+:interface  "USB"
+:usbid      "0x04b8" "0x0157"
+:status     :complete
+
+:model      "DS-575W"
+:interface  "USB"
+:usbid      "0x04b8" "0x0169"
+:status     :complete
+
+:model      "ES-500WR"
+:interface  "USB"
+:usbid      "0x04b8" "0x0176"
+:status     :complete
+
+:model      "EW-052A Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x114e"
+:status     :complete
+
+:model      "XP-2100 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x114e"
+:status     :complete
+
+:model      "ET-2700 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1135"
+:status     :complete
+
+:model      "L4150 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1135"
+:status     :complete
+
+:model      "ET-M2140 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x114a"
+:status     :complete
+
+:model      "M2140 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x114a"
+:status     :complete
+
+:model      "ET-M3140 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x114f"
+:status     :complete
+
+:model      "M3140 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x114f"
+:status     :complete
+
+:model      "L3150 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1143"
+:status     :complete
+
+:model      "ET-2710 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1143"
+:status     :complete
+
+:model      "ET-2810 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x118A"
+:status     :complete
+
+:model      "L3250 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x118A"
+:status     :complete
+
+:model      "XP-2150 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x119B"
+:status     :complete
+
+:model      ""
+:interface  "USB"
+:usbid      "0x04b8" "0x00"
+:status     :complete
diff --git a/doc/descriptions/escl.desc b/doc/descriptions/escl.desc
index 88f0fdb..fa5b32b 100644
--- a/doc/descriptions/escl.desc
+++ b/doc/descriptions/escl.desc
@@ -8,12 +8,17 @@
 :mfg "Brother"
 :url "https://www.brother.ee/support/drivers"
 
+:model "DCP-J772DW"
+:interface "WiFi"
+:status :good
+:comment "All resolutions supported."
+
 :model "DCP-L2530DW"
 :interface "WiFi"
 :status :good
 :comment "All resolutions supported."
 
-:model "HL-L258DW"
+:model "HL-L2590DW"
 :interface "WiFi"
 :status :good
 :comment "All resolutions supported."
@@ -21,42 +26,117 @@
 :mfg "Canon"
 :url "https://www.canon-europe.com/support/"
 
+:model "IR C3520"
+:interface "WiFi"
+:status :good
+:comment "All resolutions supported, Flatted and ADF supported."
+
 :model "PIXMA MG5765"
 :interface "WiFi"
 :status :good
 :comment "All resolutions supported."
 
+:model "PIXMA G4511"
+:interface "Ethernet WiFi"
+:status :basic
+:comment "All resolutions supported."
+
 :model "PIXMA G7050"
 :interface "Ethernet WiFi"
 :status :untested
 :comment "Testers needed!"
 
-:model "IR C3520"
+:model "PIXMA TR4520 Series"
+:interface "Wifi"
+:status :good
+:comment "All resolutions supported, Flatted and ADF supported."
+
+:model "PIXMA TR4540 Series"
+:interface "Wifi"
+:status :good
+:comment "All resolutions supported, Flatted and ADF supported."
+
+:model "PIXMA TR4550 Series"
+:interface "Wifi"
+:status :good
+:comment "All resolutions supported, Flatted and ADF supported."
+
+:model "PIXMA TR4551"
+:interface "Wifi"
+:status :good
+:comment "All resolutions supported, Flatted and ADF supported."
+
+:model "PIXMA TR7500 Series"
 :interface "WiFi"
 :status :good
 :comment "All resolutions supported, Flatted and ADF supported."
 
+:model "PIXMA TR8500 Series"
+:interface "Ethernet WiFi"
+:status :good
+:comment "All resolutions supported, Flatted and ADF supported."
+
+:model "PIXMA TR8520"
+:interface "Ethernet WiFi"
+:status :good
+:comment "All resolutions supported, Flatted and ADF supported."
+
 :model "PIXMA TS3100 Series"
 :interface "WiFi"
 :status :good
 :comment "All resolutions supported."
 
+:model "PIXMA TS3150 Series"
+:interface "WiFi"
+:status :good
+:comment "All resolutions supported."
+
+:model "PIXMA TS3151"
+:interface "WiFi"
+:status :good
+:comment "All resolutions supported."
+
+:model "PIXMA TS3152"
+:interface "WiFi"
+:status :good
+:comment "All resolutions supported."
+
 :model "PIXMA TS3300 Series"
 :interface "WiFi"
 :status :good
 :comment "All resolutions supported."
 
+:model "PIXMA TS3350 Series"
+:interface "WiFi"
+:status :good
+:comment "All resolutions supported."
+
+:model "PIXMA TS3351"
+:interface "WiFi"
+:status :good
+:comment "All resolutions supported."
+
+:model "PIXMA TS3352"
+:interface "WiFi"
+:status :good
+:comment "All resolutions supported."
+
+:model "PIXMA TS5350 Series"
+:interface "WiFi"
+:status :good
+:comment "All resolutions supported."
+
 :model "PIXMA TS5351"
 :interface "WiFi"
 :status :good
 :comment "All resolutions supported."
 
-:model "PIXMA TS6150"
+:model "PIXMA TS6150 Series"
 :interface "Wifi"
 :status :untested
 :comment "Testers needed!"
 
-:model "PIXMA TS8050"
+:model "PIXMA TS8050 Series"
 :interface "Wifi"
 :status :untested
 :comment "Testers needed!"
@@ -66,24 +146,14 @@
 :status :untested
 :comment "Testers needed!"
 
-:model "PIXMA TR4540 Series"
-:interface "Wifi"
-:status :good
-:comment "All resolutions supported, Flatted and ADF supported."
-
-:model "PIXMA TR8500 Series"
-:interface "Ethernet WiFi"
-:status :good
-:comment "All resolutions supported, Flatted and ADF supported."
-
-:model "PIXMA TR8520"
-:interface "Ethernet WiFi"
-:status :good
-:comment "All resolutions supported, Flatted and ADF supported."
-
 :mfg "Epson"
 :url "http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
 
+:model "ET-2750"
+:interface "WiFi"
+:status :good
+:comment "All resolutions supported, Flatted only supported."
+
 :model "ET-3750"
 :interface "WiFi"
 :status :good
@@ -94,6 +164,11 @@
 :status :good
 :comment "All resolutions supported, Flatted and ADF supported."
 
+:model "XP-6100"
+:interface "WiFi"
+:status :good
+:comment "All resolutions supported, Flatted only supported."
+
 :mfg "HP"
 :url "https://support.hp.com/us-en/drivers/printers"
 
@@ -112,10 +187,15 @@
 :status :good
 :comment "All resolutions supported."
 
+:model "LaserJet Entreprise Flow MFP M578"
+:interface "WiFi"
+:status :basic
+:comment "All resolutions supported."
+
 :model "LaserJet MFP M28w"
 :interface "WiFi"
-:status :untested
-:comment "Testers needed!"
+:status :basic
+:comment "All resolutions supported."
 
 :model "LaserJet FlowMFP M578"
 :interface "WiFi"
diff --git a/doc/descriptions/fujitsu.desc b/doc/descriptions/fujitsu.desc
index 0527579..d484168 100644
--- a/doc/descriptions/fujitsu.desc
+++ b/doc/descriptions/fujitsu.desc
@@ -12,9 +12,9 @@
 
 :backend "fujitsu"               ; name of backend
 :url "http://www.thebility.com/fujitsu/"
-:version "134"                   ; version of backend
+:version "137"                   ; version of backend
 :manpage "sane-fujitsu"          ; name of manpage (if it exists)
-:comment "Backend updated for SANE release 1.0.28, see sane-fujitsu manpage"
+:comment "Backend updated for SANE release 1.0.32, see sane-fujitsu manpage"
 :devicetype :scanner             ; start of a list of devices....
                                  ; other types:  :stillcam, :vidcam,
                                  ;               :meta, :api
@@ -579,7 +579,7 @@
 
 :model "fi-7140"
 :interface "USB"
-:status :untested
+:status :good
 :usbid "0x04c5" "0x14df"
 
 :model "fi-7240"
@@ -673,3 +673,9 @@
 :interface "USB"
 :status :good
 :usbid "0x04c5" "0x160b"
+
+:model "ScanSnap iX1600"
+:interface "USB WiFi"
+:status :good
+:usbid "0x04c5" "0x1632"
+:comment "small, current, WiFi not supported."
diff --git a/doc/descriptions/pieusb.desc b/doc/descriptions/pieusb.desc
index c0d17a9..0deb7af 100644
--- a/doc/descriptions/pieusb.desc
+++ b/doc/descriptions/pieusb.desc
@@ -11,7 +11,6 @@
 
 :backend "pieusb"                 ; name of backend
 :version "1.0 (unmaintained)"     ; version of backend
-:new :no
 :manpage "sane-pieusb"            ; name of manpage (if it exists)
 :url "https://github.com/kkaempf/sane-backends"  ; backend's web page
 
diff --git a/doc/descriptions/pixma.desc b/doc/descriptions/pixma.desc
index 933780f..618d128 100644
--- a/doc/descriptions/pixma.desc
+++ b/doc/descriptions/pixma.desc
@@ -172,6 +172,12 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA G4511"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x183d"
+:status :complete
+:comment "Flatbed and ADF scan.  All resolutions supported (up to 600DPI). WIFI not supported"
+
 :model "PIXMA G6000"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1865"
diff --git a/doc/descriptions/snapscan.desc b/doc/descriptions/snapscan.desc
index 33d7ec3..ae6c246 100644
--- a/doc/descriptions/snapscan.desc
+++ b/doc/descriptions/snapscan.desc
@@ -305,6 +305,18 @@
 :mfg "Epson"
 :url "http://www.epson.com"
 
+:model "GT-7400U"	; product spec (JP)
+:interface "USB"
+:usbid "0x04b8" "0x0120"
+:status :good
+:comment "Requires firmware esfw3e.bin."
+
+:model "GT-8400UF"	; product spec (JP)
+:interface "USB"
+:usbid "0x04b8" "0x011f"
+:status :good
+:comment "Requires firmware esfw30.bin, film scanning unit untested."
+
 :model "Perfection 660"
 :interface "USB"
 :usbid "0x04b8" "0x0114"
@@ -315,7 +327,7 @@
 :interface "USB"
 :usbid "0x04b8" "0x0120"
 :status :good
-:comment "Requires firmware esfw3e.bin."
+:comment "Requires firmware esfw3e.bin.<br>overseas version of the GT-7400U"
 
 :model "Perfection 1670"
 :interface "USB"
@@ -323,6 +335,12 @@
 :status :good
 :comment "Requires firmware esfw30.bin."
 
+:model "Perfection 1670 PHOTO"
+:interface "USB"
+:usbid "0x04b8" "0x011f"
+:status :good
+:comment "Requires firmware esfw30.bin, film scanning unit untested.<br>overseas version of the GT-8400UF"
+
 :model "Perfection 2480 PHOTO"
 :interface "USB"
 :usbid "0x04b8" "0x0121"
diff --git a/doc/descriptions/umax.desc b/doc/descriptions/umax.desc
index 8f5a22b..25f51ba 100644
--- a/doc/descriptions/umax.desc
+++ b/doc/descriptions/umax.desc
@@ -333,7 +333,7 @@
 :model "Perfection 600"
 :interface "SCSI"
 :status :good
-:comment "OK, SCSI-ID=EPSON Perfection600"
+:comment "OK, SCSI-ID=EPSON Perfection600<br>rebadged UMAX Astra 1200S"
 
 :mfg "Escom"                      ; another manufacturer...
 
diff --git a/doc/releases.md b/doc/releases.md
new file mode 100644
index 0000000..4bc85af
--- /dev/null
+++ b/doc/releases.md
@@ -0,0 +1,199 @@
+---
+Copyright: © 2021 SANE Project
+SPDX-License-Identifier: CC-BY-SA-4.0
+---
+
+# Creating A New `sane-backends` Release
+
+This file summarizes most points to pay attention to when planning for
+a new `sane-backends` release.  Content has been checked while working
+on `$old_version` and getting ready for `$new_version`, where:
+
+``` sh
+old_version=1.0.31
+new_version=1.0.32
+```
+
+## Timetable
+
+It is easiest to pick a release date well in advance so everyone knows
+what to expect.  Ignoring security bug fix releases, `sane-backends`
+has been released on a roughly half-yearly schedule since `1.0.28`.
+
+Once you pick a date (and time), say `DT`, the planning is simply a
+matter of counting back from there:
+
+ - `$DT -  0 days`: **release** :confetti_ball:
+ - `$DT - 21 days`: **branch off** after which the release branch will not get any new features,
+   only bug fixes and translations.
+ - `$DT - 35 days`: **schedule announcement** including the timetable.
+
+Feel free to adjust the offsets if that works better.  Also, pinging
+on the mailing list well in advance, say two, three months, about a
+suitable date for everyone involved is a good idea.
+
+> If you mention time of day, on the mailing list, in issues or merge
+> requests, use UTC times and mention that, e.g. 09:00 UTC.  People
+> are in time zones all over the place and converting to and from UTC
+> should be relatively easy for everyone.  Converting from other
+> time zones is generally cumbersome, even without things like DST.
+
+## Schedule Announcement
+
+Send an announcement to the `sane-devel` mailing list announcing the schedule.
+
+All notable changes are tracked as separate files in the newsfragments directory which means there's
+no need to track them manually.
+
+## Branch off
+
+A separate branch for the upcoming release is created on the repository. This marks the point when
+the code for the release effectively enters a feature freeze and no new features will land into
+the release branch.
+
+Use branch in the format of `release-1.2.x` so that it's clear that further bugfix releases will
+happen on that branch.
+
+Notify `sane-devel` of the Branch Off and point out that merge requests that have to be included
+in the upcoming release need to be targeted at release branch. Anything else can go to `master` as
+usual.
+
+For backends added since the `$old_version`, make sure that its
+`.desc` file includes a `:new :yes` near the top.  You can find such
+backends from the list of added files with:
+
+``` sh
+git ls-files -- backend | while read f; do
+  git log --follow --diff-filter=A --find-renames=40% \
+          --format="%ai  $f" $old_version..release/$new_version -- "$f"
+done | cat
+```
+
+Feature changes are no longer allowed, bar exceptional circumstances, so now is a good time to
+sync the `po/*.po` files in the repository for translators.
+
+Announce the Branch Off on `sane-devel` and invite translators to contribute their updates.
+Release manager should ensure that whichever branch the translator work on, their work lands on
+both the release branch and the master branch.
+
+Occasionally, you may notice changes that have not been documented,
+either in a `.desc` file or a manual page.  Now is a good time to
+rectify the omission.
+
+The `NEWS` file is updated during the release time, there's no need to do anything with the
+release notes now.
+
+## Release
+
+The release consists of two parts: a release notes MR and the actual release.
+
+The release notes are handled by the towncrier tool. The easiest way to use it is from virtualenv:
+
+``` sh
+virtualenv some/path/to/virtualenv
+source some/path/to/virtualenv
+pip install towncrier
+```
+
+To update the `NEWS `document, run the following:
+
+```
+towncrier --version $new_version --date `date -u  +%F`
+```
+
+After that, create a new MR, merge it and fetch the new release branch.
+
+The actual release is as easy as pushing a tag and clicking a web UI button.  GitLab CI/CD
+takes care of the rest.
+
+``` sh
+git tag -a -s $new_version -m "Release $new_version"
+git push --tags origin release-$new_release
+```
+
+The final job in the release pipeline that is triggered by the above
+is a manual job.  You have to press a button in the web UI.  However,
+before you do so, create a Personal Access Token (with `api` scope) in
+your own GitLab account's `Settings` > [`Access Tokens`][] and use its
+value to set the `PRIVATE_TOKEN` variable for the `upload` job in the
+`Release` stage.  You need to set this on the page that triggers the
+`upload` job.
+
+ [`Access Tokens`]: https://gitlab.com/-/profile/personal_access_tokens
+ [`CI/CD`]: https://gitlab.com/sane-project/backends/-/settings/ci_cd
+
+### Updating The Website
+
+After the release artifacts, i.e. the source tarball, have hit the
+GitLab [Release][] tab, grab the source tarball to create updated
+lists of supported devices and HTML manual pages for the website.
+
+With the `$new_version`'s source tarball:
+
+``` sh
+tar xaf sane-backends-$new_version.tar.gz@
+cd sane-backends-$new_version
+./configure
+make -C lib
+make -C sanei
+make -C doc html-pages
+LANG=C make -C doc html-man
+```
+
+The last command assumes you have `man2html` in your `$PATH`.  There
+are various versions of this command but `make` assumes you are using
+the version from one of:
+
+- https://savannah.nongnu.org/projects/man2html/
+- https://web.archive.org/web/20100611002649/http://hydra.nac.uci.edu/indiv/ehood/tar/man2html3.0.1.tar.gz
+
+Using anything else is asking for trouble.
+
+> See also #261.
+
+With the various HTML pages generated in `sane-backends-$new_version`,
+check out the latest code of the sane-project/website and:
+
+``` sh
+cd website
+rm man/*
+cp .../sane-backends-$new_version/doc/*.[1578].html man/
+git add man/
+git mv sane-backends.html sane-backends-$old_version.html
+cp .../sane-backends-$new_version/doc/sane-{backends,mfgs}.html .
+git add sane-{backends,mfgs}.html
+```
+
+Next, add a hyperlink to the `$old_version`'s file in
+`sane-supported-devices.html` and add an entry for the new release to
+`index.html`.
+
+Finally
+
+``` sh
+git add sane-supported-devices.html index.html
+git commit -m "Update for sane-backends-$new_version release"
+git push
+```
+
+The push will trigger a GitLab CI/CD pipeline that will update the
+website.  Make sure it succeeds (see sane-project/website#33 for one
+reason it might fail).
+
+ [Release]: https://gitlab.com/sane-project/backends/-/releases
+
+### Mailing List Announcement
+
+Once the website has been updated successfully, announce the release
+on the `sane-announce` mailing list (and Cc: `sane-devel`).  You may
+want to ping the `sane-announce` list's moderator (@kitno455) to get
+your post approved sooner rather than later.
+
+## Post-Release
+
+With the release all done, there are still a few finishing touches that need taking care of:
+
+* remove the `:new` tag from all `doc/descriptions*/*.desc` files
+* update this file!
+
+That's All Folks!
diff --git a/doc/releases.txt b/doc/releases.txt
deleted file mode 100644
index 0cb7518..0000000
--- a/doc/releases.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-2019-08-24
-
-This text summarizes some points to pay attention to when a new release
-of sane-backends is planned.
-
-Timetable (approximate periods):
-
-Day  0: Announcement of upcoming release on sane-devel including timetable
-        and pointer to the GitLab milestone
-Day 14: Feature freeze (only bugfixes + documentation updates)
-Day 28: Code freeze (only fixes for bugs that can destroy hardware, can cause
-        compilation problems or render a backend completely unusable, and
-        documentation updates are allowed)
-Day 35: Release
-
-Before the release:
-
-* set :new :yes on any new backend .desc files, by looking for added files:
-
-  version=1.0.27
-  git ls-files -- backend | while read f; do
-    git log --follow --diff-filter=A --find-renames=40% \
-            --format="%ai  $f" $version..HEAD -- "$f"
-  done | cat
-
-* NEWS: update and enter date of release, etc
-  Get list of heavily change backends via: git diff --stat $version..HEAD
-  Get list of details from: git log $version..HEAD
-* git commit -a
-* git push origin master
-
-Making the release:
-
-* temporarily set a PRIVATE_TOKEN variable in the GitLab CI/CD
-  variables.  You have to create one in your own Settings > Access
-  Tokens.  Set it to expire the next day to avoid abuse.  Better yet,
-  remove it from the CI/CD variables when the job is finished.
-* git tag -a -s 1.0.28 -m Release
-* git push --tags origin master
-* trigger the manual 'release' stage of the build via the web UI when
-  this becomes possible.  This requires a valid PRIVATE_TOKEN.
-
-Updating the website and announcing the release:
-
-* checkout the sane/website.git module and:
-* copy sane-backends.html to sane-backends-"old-version".html
-* update sane-supported-devices.html with link to above "old" file
-* rebuild sane-backends.html and sane-mfgs.html (make -C doc html-pages)
-* [TBD] use man2html from http://hydra.nac.uci.edu/indiv/ehood/man2html.html
-  to rebuild html man pages (make -C doc html-man) (no other version works)
-* update announcement to index.html
-* git commit -a && git push
-* check that website's pipeline succeeded
-* announce release on sane-announce mailing list (and Cc: sane-devel).
-  Ping the sane-announce list's moderator (m. allan noah) to get your
-  post approved ASAP.
-
-After the release:
-
-* remove the ':new' tag from all doc/descriptions*/*.desc files
-* git add new and changed files and commit
-* git push
diff --git a/doc/sane-abaton.man b/doc/sane-abaton.man
index 13c3c6b..8765dad 100644
--- a/doc/sane-abaton.man
+++ b/doc/sane-abaton.man
@@ -78,7 +78,7 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
diff --git a/doc/sane-agfafocus.man b/doc/sane-agfafocus.man
index 53b2d37..f9abb04 100644
--- a/doc/sane-agfafocus.man
+++ b/doc/sane-agfafocus.man
@@ -47,9 +47,9 @@ This backend expects device names of the form:
 .I special
 .RE
 .PP
-Where
+where
 .I special
-is either the path-name for the special device that corresponds to a
+is the path-name for the special device that corresponds to a
 SCSI scanner. For SCSI scanners, the special device name must be a
 generic SCSI device or a symlink to such a device.  Under Linux, such
 a device name could be
@@ -93,7 +93,7 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
diff --git a/doc/sane-apple.man b/doc/sane-apple.man
index 0c057fb..ef7d4ce 100644
--- a/doc/sane-apple.man
+++ b/doc/sane-apple.man
@@ -35,9 +35,9 @@ This backend expects device names of the form:
 .I special
 .RE
 .PP
-Where
+where
 .I special
-is either the path-name for the special device that corresponds to a
+is the path-name for the special device that corresponds to a
 SCSI scanner. For SCSI
 scanners, the special device name must be a generic SCSI device or a
 symlink to such a device.  Under Linux, such a device name could be
@@ -85,7 +85,7 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable is list of directories where SANE looks
-for the configuration file.  Under UNIX directory names are
+for the configuration file.  On *NIX systems, directory names are
 separated by a colon (`:'), under OS/2 by a semi-colon (`;').
 If SANE_CONFIG_DIR is not set, SANE defaults to
 searching the current working directory (".") and then
diff --git a/doc/sane-artec.man b/doc/sane-artec.man
index a738660..d612732 100644
--- a/doc/sane-artec.man
+++ b/doc/sane-artec.man
@@ -79,7 +79,7 @@ model AT3
 .SH SCSI ADAPTER TIPS
 
 Some Artec scanners come with an included SCSI adapter.  If your scanner came
-with a DTC ISA scsi cards, you can probably use it with recent (>= 2.2.0)
+with a DTC ISA SCSI cards, you can probably use it with recent (>= 2.2.0)
 kernels using the generic NCR5380 support.  You must pass the following
 boot argument to the kernel: "dtc3181e=0x2c0,0"
 .br
@@ -104,11 +104,11 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
-separated by a colon (`:'), under OS/2, they are separated by a semi-
-colon (`;').  If this variable is not set, the configuration file is
-searched in two default directories: first, the current working direc-
-tory (".") and then in
+contain the configuration file.  On *NIX systems, the directories are
+separated by a colon (`:'), under OS/2, they are separated by a
+semi-colon (`;').  If this variable is not set, the configuration file is
+searched in two default directories: first, the current working
+directory (".") and then in
 .IR @CONFIGDIR@ .
 If the value of the
 environment variable ends with the directory separator character, then
diff --git a/doc/sane-artec_eplus48u.man b/doc/sane-artec_eplus48u.man
index 70f4254..fa6fe7f 100644
--- a/doc/sane-artec_eplus48u.man
+++ b/doc/sane-artec_eplus48u.man
@@ -6,7 +6,7 @@ The
 .B sane\-artec_eplus48u
 library implements a SANE (Scanner Access Now Easy) backend that provides
 access to several USB flatbed scanners using the GT6816 chipset like the Artec E+ 48U.
-These scanners have a contact image sensor (CIS) and an USB interface.
+These scanners have a contact image sensor (CIS).
 .PP
 A complete list of supported devices can be found on
 .IR http://www.sane\-project.org/sane\-supported\-devices.html .
@@ -57,10 +57,9 @@ autodetected by
 .I usb vendor_id product_id
 statements which are already included into
 .I artec_eplus48u.conf .
-"vendor_id" and "product_id" are hexadecimal numbers that identify the
-.B scanner.
+"vendor_id" and "product_id" are hexadecimal numbers that identify the scanner.
 .PP
-Every usb section can have additional options
+Every usb section can have additional options.
 .TP
 .B artecFirmwareFile @DATADIR@/sane/artec_eplus48u/Artec48.usb
 The path to the firmware file. This option is required.
@@ -86,8 +85,9 @@ then the gamma options are reset to the values specified here.
 .B greenExposure    0x116
 .TP
 .B blueExposure     0xdc
-These are the default values for offset and exposure time. You can e.g. change them to speed up calibration,
-if you don't want to save the calibration data to disk.
+These are the default values for offset and exposure time.
+You can change them (e.g. to speed up calibration)
+if you don't want to save the calibration data permanently.
 .TP
 .B vendorString "Artec"
 .TP
@@ -111,7 +111,7 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
diff --git a/doc/sane-avision.man b/doc/sane-avision.man
index 517ac1b..9aae5e1 100644
--- a/doc/sane-avision.man
+++ b/doc/sane-avision.man
@@ -2,7 +2,7 @@
 .IX sane\-avision
 
 .SH NAME
-sane\-avision \- SANE backend for original Avision and Avision OEM scanners
+sane\-avision \- SANE backend for Avision branded and Avision OEM
 (HP, Minolta, Mitsubishi, UMAX and possibly more) flatbed and film scanners.
 
 .SH DESCRIPTION
@@ -16,7 +16,7 @@ It is fully big-endian aware and in everyday use on PowerPC and SPARC
 systems.
 
 .B I suggest you hold one hand on the power-button of the scanner while
-you try the first scans \- especially with film-scanners!
+.B you try the first scans \- especially with film-scanners!
 
 .SH CONFIGURATION
 
@@ -69,19 +69,19 @@ respond.
 .TP
 disable\-gamma\-table:
 Disables the usage of the scanner's gamma-table. You
-might try this if your scans hang or only produces
+might try this if your scans hang or only produce
 random garbage.
 .TP
 disable\-calibration:
 Disables the scanner's color calibration. You
-might try this if your scans hang or only produces
+might try this if your scans hang or only produce
 random garbage.
 .TP
 Note:
 Any option above modifies the default code-flow
 for your scanner. The options should only be used
-when you encounter problems with the default be-
-haviour of the backend. Please report the need of
+when you encounter problems with the default behavior
+of the backend. Please report the need of
 options to the backend-author so the backend can
 be fixed as soon as possible.
 
@@ -146,7 +146,7 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
diff --git a/doc/sane-bh.man b/doc/sane-bh.man
index de1336e..218fd39 100644
--- a/doc/sane-bh.man
+++ b/doc/sane-bh.man
@@ -418,7 +418,7 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file. On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
diff --git a/doc/sane-canon.man b/doc/sane-canon.man
index 6cc23a5..7d181f2 100644
--- a/doc/sane-canon.man
+++ b/doc/sane-canon.man
@@ -74,7 +74,7 @@ image data are exported without corrections as 16-bit intensities; this
 mode can be recommended if extensive adjustments have to be made to a
 picture (and if the frontend can handle 16-bit intensities).
 .PP
-Negatives are handled by simple color inversion and may require manual
+Negatives are handled by simple color inversion and will require manual
 removal of blue discoloration.
 .PP
 .SH FILES
diff --git a/doc/sane-canon630u.man b/doc/sane-canon630u.man
index f569695..73bb3bd 100644
--- a/doc/sane-canon630u.man
+++ b/doc/sane-canon630u.man
@@ -40,7 +40,7 @@ for details.
 .PP
 This product-specific scanner driver uses the lower-level kernel USB driver
 "scanner".  Check for "Driver=usbscanner" under
-.IR /proc/bus/usb/devices.
+.IR /proc/bus/usb/devices .
 If "Driver=(none)", try forcing it with
 .I "insmod scanner vendor=0x04a9 product=0x2204"
 .SH NOTES
@@ -56,12 +56,12 @@ kernel 2.4.12 or later.
 Some users have reported that this driver doesn't work at all.  This seems
 to be a hardware specific issue, although I dsane\-uson't know what exactly the
 problem is.  If you are having problems, please send me the info in
-.IR /proc/bus/usb/devices,
-.IR /proc/pci,
+.IR /proc/bus/usb/devices ,
+.IR /proc/pci ,
 the kernel
 .I scanner.c
 driver version from
-.IR /var/log/messages,
+.IR /var/log/messages ,
 and the output from
 .I "SANE_DEBUG_CANON630U=12 scanimage > /dev/null"
 .PP
@@ -87,7 +87,7 @@ Deleting this file will force recalibration.
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file. On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
diff --git a/doc/sane-canon_dr.man b/doc/sane-canon_dr.man
index db483e0..1704291 100644
--- a/doc/sane-canon_dr.man
+++ b/doc/sane-canon_dr.man
@@ -1,4 +1,4 @@
-.TH sane\-canon_dr 5 "31 Aug 2015" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH sane\-canon_dr 5 "13 Feb 2021" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane\-canon_dr
 
 .SH NAME
@@ -10,7 +10,7 @@ The
 library implements a SANE (Scanner Access Now Easy) backend which
 provides access to some Canon DR-series scanners.
 
-This document describes backend version 57, which shipped with SANE 1.0.28.
+This document describes backend version 60, which shipped with SANE 1.0.32.
 
 .SH SUPPORTED HARDWARE
 This version has only been tested with a few scanner models. Please see
@@ -55,7 +55,8 @@ by some frontends.
 .TP
 .B \-\-page\-width, \-\-page\-height
 Sets paper size. Used by scanner to determine centering of scan
-coordinates when using ADF and to detect double feed errors.
+coordinates when using the ADF (Automatic Document Feeder) and
+to detect double feed errors.
 
 .PP
 Other options will be available based on the capabilities of the scanner:
@@ -161,7 +162,7 @@ Some scanners pad the upper edge of one side of a duplex scan. There is some var
 .RE
 .PP
 .BR NOTE :
-'option' lines may appear multiple times in the configuration file.
+"option" lines may appear multiple times in the configuration file.
 They only apply to scanners discovered by the next 'scsi/usb' line.
 .PP
 
diff --git a/doc/sane-canon_lide70.man b/doc/sane-canon_lide70.man
index 83c54bc..c243a90 100644
--- a/doc/sane-canon_lide70.man
+++ b/doc/sane-canon_lide70.man
@@ -90,12 +90,6 @@ where such precision matters. Note that
 .BR xsane (1)
 uses the 75 dpi mode for prescans. The problem is worse on the LiDE 600(F),
 where the offset is five millimeters.
-.PP
-It is recommended that in
-.BR xsane (1)
-the gamma value be set to approximately 1.7
-to get more realistic colors. This also wipes out some artifacts caused by
-the lack of real calibration.
 
 .SH "SEE ALSO"
 .BR sane (7),
diff --git a/doc/sane-canon_pp.man b/doc/sane-canon_pp.man
index 72a9381..6889c05 100644
--- a/doc/sane-canon_pp.man
+++ b/doc/sane-canon_pp.man
@@ -132,7 +132,7 @@ dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may contain
-the configuration file.  Under UNIX, the directories are separated by a colon
+the configuration file.  On *NIX systems, the directories are separated by a colon
 (`:'), under OS/2, they are separated by a semi-colon (`;').  If this variable
 is not set, the configuration file is searched in two default directories:
 first, the current working directory (".") and then in
diff --git a/doc/sane-coolscan2.man b/doc/sane-coolscan2.man
index c801034..84e8a93 100644
--- a/doc/sane-coolscan2.man
+++ b/doc/sane-coolscan2.man
@@ -85,7 +85,7 @@ with no options altered. The backend must not be restarted between the scans.
 If you use
 .BR scanimage (1),
 perform a batch scan with
-.B batch\-count=2
+.B \-\-batch\-count=2
 to obtain the IR information.
 .TP
 .B \-\-depth <n>
@@ -115,15 +115,17 @@ Multiply all exposure times with this value. This allows exposure
 correction without modifying white balance.
 .TP
 .B \-\-load
-Load the next slide when using the slide loader.
+Load the next slide when using the slide loader
+(applies only to the SF\-200 bulk feeder).
 .TP
 .B \-\-eject
 Eject the film strip or mounted slide when using the slide loader.
 .TP
 .B \-\-reset
 Reset scanner. The scanner will perform the same action as when power is
-turned on: it will eject the film strip and calibrate itself. Use this
-whenever the scanner refuses to load a film strip properly, as a result of
+turned on: it will eject the film strip (with the SF\-200 bulk feeder)
+and calibrate itself. Use this whenever the scanner refuses to load
+a film strip properly, as a result of
 which
 .B \-\-eject
 does not work.
@@ -186,8 +188,9 @@ whenever the hardware changes. Thus the number of choices for the
 .B \-\-frame
 option will be fixed when the backend is initialized (usually when the user
 runs the frontend). In particular, if there is no film strip in the
-automatic film strip feeder when the backend is initialized, the frame option
-will not appear at all. Also, restarting the frontend after swapping film
+automatic film strip feeder when the backend is initialized, the
+.B \-\-frame
+option will not appear at all. Also, restarting the frontend after swapping film
 adapters is strongly recommended.
 
 Linux kernels prior to 2.4.19 had a patch that truncated INQUIRY data
diff --git a/doc/sane-coolscan3.man b/doc/sane-coolscan3.man
index 57c0652..7c59f43 100644
--- a/doc/sane-coolscan3.man
+++ b/doc/sane-coolscan3.man
@@ -83,7 +83,7 @@ If set to "yes", the scanner will read the infrared channel, thus allowing
 defect removal in software. The infrared image is read during a second scan,
 with no options altered. The backend must not be restarted between the scans.
 If you use scanimage, perform a batch scan with
-.B batch\-count=2
+.B \-\-batch\-count=2
 to obtain the IR information.
 .TP
 .B \-\-depth <n>
@@ -113,14 +113,15 @@ Multiply all exposure times with this value. This allows exposure
 correction without modifying white balance.
 .TP
 .B \-\-load
-Load the next slide when using the slide loader.
+Load the next slide when using the slide loader (SF\-200 bulk loader only).
 .TP
 .B \-\-eject
 Eject the film strip or mounted slide when using the slide loader.
 .TP
 .B \-\-reset
 Reset scanner. The scanner will perform the same action as when power is
-turned on: it will eject the film strip and calibrate itself. Use this
+turned on: it will eject the film strip (with the SF\-200 bulk loader)
+and calibrate itself. Use this
 whenever the scanner refuses to load a film strip properly, as a result of
 which
 .B \-\-eject
@@ -142,7 +143,7 @@ These lines are ignored, thus '#' can be used to include comments.
 .TP
 .I containing only the word """auto"""
 This instructs the backend to probe for a scanner by scanning the buses for
-devices with know identifiers. This is the action taken when no
+devices with known identifiers. This is the default action when no
 configuration file is present.
 .TP
 .I a line of the form <interface>:<device>
@@ -175,8 +176,8 @@ levels reduce verbosity.
 .BR sane\-scsi (5),
 .BR sane\-usb (5),
 .BR scanimage (1),
-.BR xscanimage(1),
-.BR xsane(1)
+.BR xscanimage (1),
+.BR xsane (1)
 
 .SH BUGS
 Currently, the SANE protocol does not allow automatically updating options
@@ -184,9 +185,10 @@ whenever the hardware changes. Thus the number of choices for the
 .B \-\-frame
 option will be fixed when the backend is initialized (usually when the user
 runs the frontend). In particular, if there is no film strip in the
-automatic film strip feeder when the backend is initialized, the frame option
-will not appear at all. Also, restarting the frontend after swapping film
-adapters is strongly recommended.
+automatic film strip feeder when the backend is initialized, the
+.B \-\-frame
+option will not appear at all.
+Also, restarting the frontend after swapping film adapters is strongly recommended.
 
 Linux kernels prior to 2.4.19 had a patch that truncated INQUIRY data
 from IEEE 1394 scanners to 36 bytes, discarding vital information
diff --git a/doc/sane-dc210.man b/doc/sane-dc210.man
index 89e9e72..a782aec 100644
--- a/doc/sane-dc210.man
+++ b/doc/sane-dc210.man
@@ -30,13 +30,13 @@ line causes some information about the camera to
 be printed.
 .PP
 .B cmdrespause
-specifies how many usec (1,000,000ths of a) between
-writing the command and reading the result should be used. 125000
-seems to be the lowest I could go reliably.
+specifies how many usec (1,000,000ths of a second) to wait between
+writing the command and reading the result. 125000 seems to be the
+lowest I could go reliably.
 .PP
 .B breakpause
-is the time in 1,000,000ths of a usec between sending the
-"back to default" break sending commands.
+specifies how many usec (1,000,000ths of a second) between sending the
+"back to default" break and sending commands.
 .PP
 Empty lines and lines starting with a hash mark (#) are
 ignored.  A sample configuration file is shown below:
@@ -73,7 +73,7 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
diff --git a/doc/sane-dc240.man b/doc/sane-dc240.man
index 27547c1..6d0e9b1 100644
--- a/doc/sane-dc240.man
+++ b/doc/sane-dc240.man
@@ -30,13 +30,13 @@ The
 line causes some information about the camera to be printed.
 .PP
 .B cmdrespause
-specifies how many usec (1,000,000ths of a) between
-writing the command and reading the result should be used. 125000
-seems to be the lowest I could go reliably.
+specifies how many usec (1,000,000ths of a second) to wait between
+writing the command and reading the result. 125000 seems to be the
+lowest I could go reliably.
 .PP
 .B breakpause
-is the time in 1,000,000ths of a usec between sending the
-"back to default" break sending commands.
+specifies how many usec (1,000,000ths of a second) between sending the
+"back to default" break and sending commands.
 .PP
 Empty lines and lines starting with a hash mark (#) are
 ignored.  A sample configuration file is shown below:
@@ -73,7 +73,7 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
@@ -104,10 +104,16 @@ levels reduce verbosity.
 Peter S. Fales
 
 .PP
-This backend borrows heavily from the dc210 backend by Brian J. Murrell
-which is based somewhat on the dc25 backend by Peter Fales.
+This backend borrows heavily from the
+.BR sane\-dc210 (5)
+backend by Brian J. Murrell
+which is based somewhat on the
+.BR sane\-dc25 (5)
+backend by Peter Fales.
 .PP
-The manpage was largely copied from the dc210 manpage.
+The manpage was largely copied from the
+.BR sane\-dc210 (5)
+manpage.
 
 .SH BUGS
 The major limitation that I know of is that the backend assumes
diff --git a/doc/sane-dc25.man b/doc/sane-dc25.man
index 23f4717..160aa02 100644
--- a/doc/sane-dc25.man
+++ b/doc/sane-dc25.man
@@ -61,7 +61,7 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
diff --git a/doc/sane-dll.man b/doc/sane-dll.man
index aaa3577..b7f98c9 100644
--- a/doc/sane-dll.man
+++ b/doc/sane-dll.man
@@ -136,7 +136,7 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
diff --git a/doc/sane-dmc.man b/doc/sane-dmc.man
index a076736..eee5e92 100644
--- a/doc/sane-dmc.man
+++ b/doc/sane-dmc.man
@@ -102,7 +102,7 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
diff --git a/doc/sane-epsonds.man b/doc/sane-epsonds.man
index a7c9e32..e75dac6 100644
--- a/doc/sane-epsonds.man
+++ b/doc/sane-epsonds.man
@@ -111,4 +111,4 @@ a bug report.
 
 .SH AUTHOR
 
-The package is written by Alessandro Zummo
+The backend is written by Alessandro Zummo.
diff --git a/doc/sane-escl.man b/doc/sane-escl.man
index 92a6650..f0c7821 100644
--- a/doc/sane-escl.man
+++ b/doc/sane-escl.man
@@ -11,7 +11,7 @@ eSCL protocol scanners.
 Currently, the following models work with this backend (This list is not exhaustive):
 .PP
 .RS
-BROTHER DCP-L2530
+BROTHER DCP-J772DW, DCP-L2530DW
 .br
 BROTHER HL-L2590DW
 .br
@@ -19,15 +19,27 @@ CANON IR C3520
 .br
 CANON PIXMA MG5765
 .br
-CANON PIXMA TS3100, TS3150, TS3300, TS3151, TS3350, TS3351,
+CANON PIXMA G4511, G7050
 .br
-CANON PIXMA TS3352, TS5351, TS6150, TS8050, TS9100, TR4540,
+CANON PIXMA TR4520, TR4540, TR4550, TR4551, TR7500, TR8500,
 .br
-CANON PIXMA TR8500, TR8520
+CANON PIXMA TR8520
 .br
-EPSON ET3740, ET4750
+CANON PIXMA TS3100, TS3150, TS3151, TS3152, TS3300, TS3350,
 .br
-HP DESKJET 2710, DESKJET 2723, DESKJET 3760, LASERJET MFP M28W,
+CANON PIXMA TS3351, TS3352, TS5350, TS5351, TS6150, TS8050,
+.br
+CANON PIXMA TS9100
+.br
+EPSON ET-2750, ET-3750, ET-4750
+.br
+EPSON XP-6100
+.br
+HP DESKJET 2710, DESKJET 2723, DESKJET 3760
+.br
+HP LASERJET ENTREPRISE FLOW MFP M578,
+.br
+HP LASERJET MFP M28W, LASERJET MFP M630
 .br
 HP OFFICEJET 4630, OFFICEJET PRO 8610
 .br
diff --git a/doc/sane-find-scanner.man b/doc/sane-find-scanner.man
index ae46369..22b17e3 100644
--- a/doc/sane-find-scanner.man
+++ b/doc/sane-find-scanner.man
@@ -35,7 +35,7 @@ isn't supported by any SANE backend.
 For
 .B USB
 scanners, first the USB kernel scanner device files (e.g.
-.IR /dev/usb/scanner0 ),
+.IR /dev/usb/scanner0 ,
 .IR /dev/usb/scanner ,
 and
 .IR /dev/usbscanner )
@@ -59,7 +59,7 @@ won't find most
 parallel port scanners, or scanners connected to proprietary ports. Some
 .B parallel port
 scanners may be detected by
-.I sane\-find\-scanner -p.
+.I "sane\-find\-scanner -p" .
 At the time of writing this will only detect Mustek parallel port scanners.
 
 .SH OPTIONS
diff --git a/doc/sane-fujitsu.man b/doc/sane-fujitsu.man
index 161347f..4db6d41 100644
--- a/doc/sane-fujitsu.man
+++ b/doc/sane-fujitsu.man
@@ -1,4 +1,4 @@
-.TH sane\-fujitsu 5 "07 Feb 2020" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH sane\-fujitsu 5 "13 Feb 2021" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane\-fujitsu
 
 .SH NAME
@@ -10,7 +10,7 @@ The
 library implements a SANE (Scanner Access Now Easy) backend which provides
 access to most Fujitsu flatbed and ADF scanners.
 
-This document describes backend version 136, which shipped with SANE 1.0.30.
+This document describes backend version 137, which shipped with SANE 1.0.32.
 
 .SH SUPPORTED HARDWARE
 This version supports every known model which speaks the Fujitsu SCSI and
@@ -83,7 +83,8 @@ by some frontends.
 .B page\-width, page\-height
 .RS
 Sets paper size. Used by scanner to determine centering of scan
-coordinates when using ADF and to detect double feed errors.
+coordinates when using the ADF (Automatic Document Feeder) and to detect
+double feed errors.
 .RE
 .PP
 Other options will be available based on the capabilities of the scanner:
@@ -98,6 +99,24 @@ capabilities. Please note that these features are somewhat simplistic, and
 may not perform as well as the native implementations. Note also that these
 features all require that the driver cache the entire image in memory. This
 will almost certainly result in a reduction of scanning speed.
+.PP
+swcrop
+.RS
+Requests the driver to detect the extremities of the paper within the larger
+image, and crop the empty edges.
+.RE
+.PP
+swdeskew
+.RS
+Requests the driver to detect the rotation of the paper within the larger
+image, and counter the rotation.
+.RE
+.PP
+swdespeck X
+.RS
+Requests the driver to find and remove dots of X diameter or smaller from the
+image, and fill the space with the average surrounding color.
+.RE
 
 Use
 .I 'scanimage \-\-help'
diff --git a/doc/sane-genesys.man b/doc/sane-genesys.man
index cf4fa38..85b80ff 100644
--- a/doc/sane-genesys.man
+++ b/doc/sane-genesys.man
@@ -196,7 +196,7 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
diff --git a/doc/sane-gphoto2.man b/doc/sane-gphoto2.man
index d98387e..2b2d66f 100644
--- a/doc/sane-gphoto2.man
+++ b/doc/sane-gphoto2.man
@@ -91,7 +91,7 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
@@ -122,15 +122,18 @@ Set to 1, 2, or 3, to enable various levels of debugging within the
 gphoto2 libraries.
 
 .SH "SEE ALSO"
-.BR sane (7)
-.BR scanimage (1)
-.BR xscanimage (1)
+.BR sane (7) ,
+.BR scanimage (1) ,
+.BR xscanimage (1) ,
+.BR libgphoto2 (3)
 
 .SH AUTHOR
 Peter S. Fales
 
 .PP
-The manpage was largely copied from the dc210 manpage.
+The manpage was largely copied from the
+.BR sane\-dc210 (5)
+manpage.
 
 .SH BUGS
 Many, no doubt.
diff --git a/doc/sane-gt68xx.man b/doc/sane-gt68xx.man
index 8a1cff9..62bd045 100644
--- a/doc/sane-gt68xx.man
+++ b/doc/sane-gt68xx.man
@@ -31,7 +31,7 @@ following web page:
 Please use libusb-0.1.8 or later. Without libusb or with older libusb versions
 all kinds of trouble can be expected. The scanner should be found by
 .BR sane\-find\-scanner (1)
-without further actions. For setting permissions and general USB information looks at
+without further actions. For setting permissions and general USB information, look at
 .BR sane\-usb (5).
 .PP
 
@@ -44,7 +44,8 @@ It comes on the installation CD that was provided by the manufacturer, but it
 may be packaged together with the installation program in an .exe file. For
 Mustek scanners, the file can be downloaded from the gt68xx backend homepage. For
 other scanners, check the CD for .usb files. If you only find *.cab files, try
-cabextract to unpack. If everything else fails, you must install the Windows
+.BR cabextract (1)
+to unpack. If everything else fails, you must install the Windows
 driver and get the firmware from there (usually in the
 .I windows/system
 or
@@ -159,7 +160,7 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
@@ -195,7 +196,8 @@ export SANE_DEBUG_GT68XX=4
 .BR sane\-ma1509 (5),
 .BR sane\-mustek_usb (5),
 .BR sane\-mustek (5),
-.BR sane\-mustek_pp (5)
+.BR sane\-mustek_pp (5),
+.BR cabextract (1)
 .br
 .I @DOCDIR@/gt68xx/gt68xx.CHANGES
 .br
diff --git a/doc/sane-hp.man b/doc/sane-hp.man
index 7a6fa14..d0b0ff8 100644
--- a/doc/sane-hp.man
+++ b/doc/sane-hp.man
@@ -192,7 +192,7 @@ changed to 'print media'.
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
diff --git a/doc/sane-hp3900.man b/doc/sane-hp3900.man
index 4c2e562..2afbdc0 100644
--- a/doc/sane-hp3900.man
+++ b/doc/sane-hp3900.man
@@ -27,7 +27,7 @@ BenQ 5550                  RTS8823L-01E *
 .RE
 .PP
 More details can be found on the
-.BR sane\-hp3900 (1)
+.BR sane\-hp3900 (5)
 backend homepage
 .IR http://sourceforge.net/projects/hp3900\-series/ .
 .PP
@@ -77,7 +77,7 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
diff --git a/doc/sane-hp4200.man b/doc/sane-hp4200.man
index 7d92cde..bc0fe58 100644
--- a/doc/sane-hp4200.man
+++ b/doc/sane-hp4200.man
@@ -64,7 +64,7 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
diff --git a/doc/sane-hp5400.man b/doc/sane-hp5400.man
index 4738c08..e0752da 100644
--- a/doc/sane-hp5400.man
+++ b/doc/sane-hp5400.man
@@ -64,7 +64,7 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
diff --git a/doc/sane-hpsj5s.man b/doc/sane-hpsj5s.man
index aae2f51..56a940b 100644
--- a/doc/sane-hpsj5s.man
+++ b/doc/sane-hpsj5s.man
@@ -19,7 +19,7 @@ is due to dependence on the
 .BR libieee1284 (3)
 library. If your system supports
 .BR libieee1284 (3)
-too,this backend should work. If you ported
+too, this backend should work. If you ported
 .BR libieee1284 (3)
 for your platform, please let me know. Your system should support
 .B EPP
@@ -61,10 +61,10 @@ for this moment. Future versions will support daisy chain selection.
 .SH TIPS
 .PP
 It seems that HP ScanJet 5S scanner uses software noise correction. This
-feature is not implemented for now. So does gamma correction and calibration.
-I'll handle it in future versions.
-Native resolution for this scanner is 300 DPI. Other modes could be jagged in some
-ways.
+feature, along with gamma correction and calibration, are not implemented for now.
+They will be handled in future versions.
+Native resolution for this scanner is 300 DPI.
+Other modes may present aliasing artifacts.
 .PP
 .SH FILES
 .TP
@@ -83,7 +83,7 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
diff --git a/doc/sane-hs2p.man b/doc/sane-hs2p.man
index fcbdae1..1b39296 100644
--- a/doc/sane-hs2p.man
+++ b/doc/sane-hs2p.man
@@ -23,7 +23,7 @@ This backend expects device names of the form:
 .PP
 Where
 .I special
-is either the path-name for the special device that corresponds to a SCSI
+is the path-name for the special device that corresponds to a SCSI
 scanner. The program
 .BR sane\-find\-scanner (1)
 helps to find out the correct device. Under Linux, such a device name could be
@@ -60,7 +60,7 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
diff --git a/doc/sane-ibm.man b/doc/sane-ibm.man
index 1ecb285..677de8f 100644
--- a/doc/sane-ibm.man
+++ b/doc/sane-ibm.man
@@ -23,7 +23,7 @@ This backend expects device names of the form:
 .PP
 Where
 .I special
-is either the path-name for the special device that corresponds to a SCSI
+is the path-name for the special device that corresponds to a SCSI
 scanner. The program
 .BR sane\-find\-scanner (1)
 helps to find out the correct device. Under Linux, such a device name could be
@@ -60,7 +60,7 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
diff --git a/doc/sane-kodak.man b/doc/sane-kodak.man
index 9b89c2b..3261f68 100644
--- a/doc/sane-kodak.man
+++ b/doc/sane-kodak.man
@@ -59,7 +59,8 @@ by some frontends.
 .BR --page\-width ", " --page\-height
 .RS
 Sets paper size. Used by scanner to determine centering of scan
-coordinates when using ADF and to detect double feed errors.
+coordinates when using the ADF (Automatic Document Feeder) and to
+detect double feed errors.
 .RE
 .PP
 Other options will be available based on the capabilities of the scanner.
@@ -133,7 +134,7 @@ which enables debugging output to stderr. Valid values are:
 .SH KNOWN ISSUES
 Most hardware options are either not supported or not exposed for control by
 the user, including: multifeed detection, image compression, autocropping,
-endorser, iThresholding, multi\-stream, etc.
+endorser, thresholding, multi\-stream, etc.
 .PP
 
 .SH CREDITS
diff --git a/doc/sane-kodakaio.man b/doc/sane-kodakaio.man
index 6c94ce0..990195c 100644
--- a/doc/sane-kodakaio.man
+++ b/doc/sane-kodakaio.man
@@ -16,7 +16,8 @@ incorporation in sane-backends.
 .SH SUPPORTED HARDWARE
 This version should support models of the Kodak ESP and Hero series, and possibly some
 Advent AiO scanners. The ESP 5250 and Hero 9.1 were used to develop the backend,
-but other models may work. Please see the desc file.
+but other models may work. Please see the supported devices list at
+.IR http://www.sane-project.org/sane-backends.html#S-KODAKAIO .
 
 If you have a model not on that list, or reported as 'untested': the best way
 to determine level of support is to test the scanner directly.
diff --git a/doc/sane-kvs1025.man b/doc/sane-kvs1025.man
index d366c0b..c8e9631 100644
--- a/doc/sane-kvs1025.man
+++ b/doc/sane-kvs1025.man
@@ -24,7 +24,7 @@ sanei_usb instead of libusb by m. allan noah.
 The backend was tested on KV-S1025C and 1045C by Tiago Zaniquelli.
 
 .SH "SEE ALSO"
-.BR sane (7) ,
+.BR sane (7),
 .BR sane\-usb (5)
 
 .SH AUTHOR
diff --git a/doc/sane-leo.man b/doc/sane-leo.man
index 00ec8fd..b2548b7 100644
--- a/doc/sane-leo.man
+++ b/doc/sane-leo.man
@@ -46,15 +46,18 @@ scanimage \-\-help \-d leo
 
 .TP
 .B \-\-mode
-selects the basic mode of operation of the scanner valid choices are
-.I Black & White
-,
+selects the basic mode of operation of the scanner. Valid choices are
+.IR "Black & White" ,
 .I Grayscale
 and
+.IR Color .
+The
+.I Black & White
+mode is black and white only (1 bit).
+.I Grayscale
+mode will produce 256 levels of gray (8 bits).
 .I Color
-The Black & White mode is black and white only (1 bit). Grayscale
-will produce 256 levels of gray (8 bits). Color will produce a 24 bits
-color image.
+mode will produce a 24 bit color image.
 
 .TP
 .B \-\-resolution
@@ -98,15 +101,12 @@ for the blue channel. The table must be 256 bytes long.
 .TP
 .B \-\-halftone
 (Black & White only) select the halftone mask to use. Possible values are
-.I Diamond
-,
-.I 8x8 Coarse Fatting
-,
-.I 8x8 Fine Fatting
-,
+.IR Diamond ,
+.IR "8x8 Coarse Fatting" ,
+.IR "8x8 Fine Fatting" ,
 .I 8x8 Bayer
 and
-.I 8x8 Vertical Line
+.IR "8x8 Vertical Line" .
 
 .TP
 .B \-\-preview
@@ -147,7 +147,7 @@ backend. However they are only software adjustments. This backend only
 implements what the scanner can support.
 
 
-SH BUGS
+.SH BUGS
 None known.
 
 
diff --git a/doc/sane-lexmark.man b/doc/sane-lexmark.man
index 3ab9f8f..0f1fd6e 100644
--- a/doc/sane-lexmark.man
+++ b/doc/sane-lexmark.man
@@ -55,14 +55,21 @@ scanimage \-\-help \-d lexmark:usb:<usb port>
 
 .TP
 .B \-\-mode
-selects the basic mode of operation of the scanner valid choices are
+selects the basic mode of operation of the scanner. Valid choices are
 .IR Color ,
 .I Gray
 and
+.IR Lineart .
+The default mode is
+.IR Color .
+The
 .I Lineart
-The default mode is Color. The Lineart mode is black and white only (1 bit).
-Grayscale will produce 256 levels of gray (8 bits). Color mode allows for over
-16 million different colors produced from 24 bits of color information.
+mode is black and white only (1 bit).
+.I Gray
+mode will produce 256 levels of gray (8 bits).
+.I Color
+mode allows for over 16 million different colors produced from 24
+bits of color information.
 
 .TP
 .B \-\-resolution
diff --git a/doc/sane-ma1509.man b/doc/sane-ma1509.man
index e6b3a7e..06f3840 100644
--- a/doc/sane-ma1509.man
+++ b/doc/sane-ma1509.man
@@ -13,16 +13,17 @@ also work.
 This backend is ALPHA software.  Be careful and remove the power plug
 immediately if your hear unusual noises.
 .PP
-More details can be found on the ma1509 backend homepage
+More details can be found on the
+.B sane\-ma1509
+backend homepage
 .IR http://www.meier\-geinitz.de/sane/ma1509\-backend/ .
 .PP
-Other Mustek USB scanners are supported by the gt68xx, mustek_usb and the
-plustek backends. See
+Other Mustek USB scanners are supported by the
 .BR sane\-mustek_usb (5),
 .BR sane\-gt68xx (5)
 and
 .BR sane\-plustek (5)
-for details.
+backends.
 .PP
 This backend can only work with scanners that are already detected by the
 operating system. See
@@ -92,7 +93,7 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
diff --git a/doc/sane-magicolor.man b/doc/sane-magicolor.man
index 8b2446a..19716e0 100644
--- a/doc/sane-magicolor.man
+++ b/doc/sane-magicolor.man
@@ -47,9 +47,15 @@ The shared library implementing this backend (present on systems that support dy
 .SH "ENVIRONMENT"
 .TP
 .B SANE_CONFIG_DIR
-This environment variable specifies the list of directories that may contain the configuration file.  Under UNIX, the directories are separated by a colon (`:'), under OS/2, they are separated by a semi\-colon (`;').  If this variable is not set, the configuration file is searched in two default directories: first, the current working directory (".") and then in
+This environment variable specifies the list of directories that may contain the
+configuration file.  On *NIX systems, the directories are separated by a
+colon (`:'), under OS/2, they are separated by a semi\-colon (`;').
+If this variable is not set, the configuration file is searched in two
+default directories: first, the current working directory (".") and then in
 .IR @CONFIGDIR@ .
-If the value of the environment variable ends with the directory separator character, then the default directories are searched after the explicitly specified directories.  For example, setting
+If the value of the environment variable ends with the directory separator character,
+then the default directories are searched after the explicitly specified directories.
+For example, setting
 .B SANE_CONFIG_DIR
 to "/tmp/config:" would result in directories
 .IR "/tmp/config" ,
@@ -69,7 +75,7 @@ To obtain debug messages from the backend, set this environment variable before
 Example: SANE_DEBUG_MAGICOLOR=65 xscanimage
 .SH "KNOWN BUGS AND RESTRICTIONS"
 .PP
-Large color scans may sometimes timeout due to unknown reasons (the scanner simply stops returning data)
+Large color scans may sometimes timeout due to unknown reasons (the scanner simply stops returning data).
 .PP
 Cancelling large scans may lock up the scanner.
 
diff --git a/doc/sane-microtek.man b/doc/sane-microtek.man
index cb42aa3..674f0bd 100644
--- a/doc/sane-microtek.man
+++ b/doc/sane-microtek.man
@@ -131,7 +131,7 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
diff --git a/doc/sane-mustek.man b/doc/sane-mustek.man
index 925e6d8..45ea2d3 100644
--- a/doc/sane-mustek.man
+++ b/doc/sane-mustek.man
@@ -349,7 +349,7 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
diff --git a/doc/sane-mustek_pp.man b/doc/sane-mustek_pp.man
index 8443306..0ab8e41 100644
--- a/doc/sane-mustek_pp.man
+++ b/doc/sane-mustek_pp.man
@@ -411,7 +411,7 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
diff --git a/doc/sane-mustek_usb.man b/doc/sane-mustek_usb.man
index cea9e36..105228f 100644
--- a/doc/sane-mustek_usb.man
+++ b/doc/sane-mustek_usb.man
@@ -136,7 +136,7 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
diff --git a/doc/sane-mustek_usb2.man b/doc/sane-mustek_usb2.man
index 2ad7b24..cc96919 100644
--- a/doc/sane-mustek_usb2.man
+++ b/doc/sane-mustek_usb2.man
@@ -9,7 +9,9 @@ library implements a SANE (Scanner Access Now Easy) backend that provides
 access to USB flatbed scanners based on the Service & Quality SQ113 chipset. At
 the moment, only the Mustek BearPaw 2448 TA Pro is supported. It's planned to add
 support for other scanners that are based on the SQ113 and maybe SQ11 chip. For
-more details, see the mustek_usb2 backend homepage:
+more details, see the
+.B sane\-mustek_usb2
+backend homepage:
 .IR http://www.meier\-geinitz.de/sane/mustek_usb2\-backend/ .
 .PP
 This is BETA software. Especially if you test new or untested scanners, keep
@@ -28,7 +30,7 @@ Please use libusb-0.1.8 or later. Without libusb or with older libusb versions
 all kinds of trouble can be expected. The scanner should be found by
 .BR sane\-find\-scanner (1)
 without further actions. For setting permissions and general
-USB information looks at
+USB information, look at
 .BR sane\-usb (5).
 .PP
 
diff --git a/doc/sane-nec.man b/doc/sane-nec.man
index 1990c1b..effbeea 100644
--- a/doc/sane-nec.man
+++ b/doc/sane-nec.man
@@ -10,7 +10,7 @@ provides access to NEC SCSI scanners.  This backend should be
 considered
 .B alpha-quality
 software!  In the current state it is known to work with PC-IN500/4C
-scanners. Another MultiReader scanner series is not supported. PC-IN
+scanners. Other MultiReader scanner series are not supported. PC-IN
 500/4C and MultiReader scanner are only sold in Japan (except Multi
 Reader PetiScan).
 
diff --git a/doc/sane-net.man b/doc/sane-net.man
index 0f62684..ee7e82e 100644
--- a/doc/sane-net.man
+++ b/doc/sane-net.man
@@ -119,7 +119,7 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
diff --git a/doc/sane-p5.man b/doc/sane-p5.man
index dd1db03..80438e8 100644
--- a/doc/sane-p5.man
+++ b/doc/sane-p5.man
@@ -76,7 +76,7 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
diff --git a/doc/sane-pint.man b/doc/sane-pint.man
index b6dd181..4fa7d2e 100644
--- a/doc/sane-pint.man
+++ b/doc/sane-pint.man
@@ -73,7 +73,7 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
diff --git a/doc/sane-pixma.man b/doc/sane-pixma.man
index bebe485..860c9a9 100644
--- a/doc/sane-pixma.man
+++ b/doc/sane-pixma.man
@@ -17,7 +17,7 @@ Currently, the following models work with this backend:
 .RS
 PIXMA E410, E510
 .br
-PIXMA G2000, G2010, G2100, G4000
+PIXMA G2000, G2010, G2100, G4000, G4511
 .br
 PIXMA MG2100, MG2200, MG2400, MG2500, MG2900, MG3000, MG3100
 .br
@@ -184,7 +184,7 @@ an up-to-date status at the project homepage. (See below).
 Users feedback is essential to help improve features and performances.
 .SH OPTIONS
 Besides "well-known" options (e.g. resolution, mode etc.)
-.Bsane\-pixma
+.B sane\-pixma
 backend also
 provides the following options, i.e. the options might change in the future.
 .br
@@ -445,7 +445,7 @@ You should also set SANE_DEBUG_PIXMA to 11.
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
diff --git a/doc/sane-plustek.man b/doc/sane-plustek.man
index c043072..50e2c6a 100644
--- a/doc/sane-plustek.man
+++ b/doc/sane-plustek.man
@@ -444,7 +444,7 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
@@ -477,7 +477,7 @@ export SANE_DEBUG_PLUSTEK=10
 .BR sane\-gt68xx (5),
 .BR sane-\mustek_pp (5),
 .BR sane\-find\-scanner (1),
-.BR scanimage (1),
+.BR scanimage (1)
 .br
 .I @DOCDIR@/plustek/Plustek-USB.changes
 
diff --git a/doc/sane-plustek_pp.man b/doc/sane-plustek_pp.man
index e225c95..2ef9b96 100644
--- a/doc/sane-plustek_pp.man
+++ b/doc/sane-plustek_pp.man
@@ -435,7 +435,7 @@ The Linux kernelmodule for kernels >= 2.6.x.
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
diff --git a/doc/sane-qcam.man b/doc/sane-qcam.man
index 30d2e83..d809e09 100644
--- a/doc/sane-qcam.man
+++ b/doc/sane-qcam.man
@@ -60,7 +60,7 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
diff --git a/doc/sane-ricoh.man b/doc/sane-ricoh.man
index 4006b49..d0c6185 100644
--- a/doc/sane-ricoh.man
+++ b/doc/sane-ricoh.man
@@ -54,7 +54,7 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
diff --git a/doc/sane-rts8891.man b/doc/sane-rts8891.man
index 75c5ac1..95d028b 100644
--- a/doc/sane-rts8891.man
+++ b/doc/sane-rts8891.man
@@ -45,14 +45,21 @@ scanimage \-\-help \-d rts8891
 
 .TP
 .B \-\-mode
-selects the basic mode of operation of the scanner valid choices are
-.IR "R Color" ,
+selects the basic mode of operation of the scanner. Valid choices are
+.IR "Color" ,
 .I Gray
 and
+.IR Lineart .
+The default mode is
+.IR Color .
+The
 .I Lineart
-The default mode is Color. The Lineart mode is black and white only (1 bit).
-Grayscale will produce 256 levels of gray (8 bits). Color mode allows for over
-16 million different colors produced from 24 bits of color information.
+mode is for black and white only (1 bit).
+.I Gray
+will produce 256 levels of gray (8 bits).
+.I Color
+mode allows for over 16 million different colors produced from
+24 bits of color information.
 
 .TP
 .B \-\-resolution
diff --git a/doc/sane-s9036.man b/doc/sane-s9036.man
index 5065a3d..f1e4020 100644
--- a/doc/sane-s9036.man
+++ b/doc/sane-s9036.man
@@ -47,7 +47,7 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
diff --git a/doc/sane-scsi.man b/doc/sane-scsi.man
index 9239250..0cd63ca 100644
--- a/doc/sane-scsi.man
+++ b/doc/sane-scsi.man
@@ -122,7 +122,7 @@ $ chmod 660 /dev/sg0
 .RE
 .PP
 When your system uses the device filesystem (devfs), you have to edit
-.BIR /etc/devfs/perms.
+.IR /etc/devfs/perms.
 There you should search the line
 .PP
 .RS
@@ -172,7 +172,7 @@ If there are no
 devices, just do a
 .I sh MAKEDEV uk0
 in the
-.i /dev
+.I /dev
 directory. The scanner should then be accessible as
 .I /dev/uk0
 if it was probed during boot.
diff --git a/doc/sane-sharp.man b/doc/sane-sharp.man
index 3200990..34ad8cb 100644
--- a/doc/sane-sharp.man
+++ b/doc/sane-sharp.man
@@ -50,15 +50,17 @@ This backend expects device names of the form:
 .I special
 .RE
 .PP
-Where
+where
 .I special
-is either the path-name for the special device that corresponds to a
+is the path-name for the special device that corresponds to a
 SCSI scanner. The special device name must be a generic SCSI device or a
 symlink to such a device.  Under Linux, such a device name could be
 .I /dev/sga
 or
 .IR /dev/sge ,
-for example.  See sane\-scsi(5) for details.
+for example.  See
+.BR sane\-scsi (5)
+for details.
 
 .SH SCAN OPTIONS
 .TP
diff --git a/doc/sane-sm3600.man b/doc/sane-sm3600.man
index 849acd0..bd4bc55 100644
--- a/doc/sane-sm3600.man
+++ b/doc/sane-sm3600.man
@@ -39,11 +39,11 @@ This backend dynamically enables the options for the frontend,
 that are supported by the scanner dependent on the scanning-mode
 and other options. Unsupported options are disabled.
 .PP
-The following options are supported by the Microtek2-driver:
-.PP
+The following options are supported by the
+.B sane\-sm3600
+backend:
 Color, grayscale, halftone and lineart scans.
-.PP
-contrast, brightness, control, gamma correction.
+Also contrast, brightness, and gamma correction.
 
 .SH "DEVICE NAMES"
 This backend does not support device names in a standardized form.
diff --git a/doc/sane-snapscan.man b/doc/sane-snapscan.man
index aff29a9..0fb493e 100644
--- a/doc/sane-snapscan.man
+++ b/doc/sane-snapscan.man
@@ -77,7 +77,7 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
diff --git a/doc/sane-sp15c.man b/doc/sane-sp15c.man
index f0dc72a..9056947 100644
--- a/doc/sane-sp15c.man
+++ b/doc/sane-sp15c.man
@@ -41,8 +41,8 @@ to set scanning region,
 resolution, bit-depth (and color), and enable the automatic document feeder.
 
 .SH "SEE ALSO"
-.BR sane (7) ,
-.BR sane\-scsi (5) ,
+.BR sane (7),
+.BR sane\-scsi (5),
 .BR sane\-fujitsu (5),
 .BR xscanimage (1)
 .br
diff --git a/doc/sane-st400.man b/doc/sane-st400.man
index b93dc49..dab23f6 100644
--- a/doc/sane-st400.man
+++ b/doc/sane-st400.man
@@ -36,7 +36,7 @@ This backend expects device names of the form:
 .PP
 Where
 .I special
-is either the path-name for the special device that corresponds to a
+is the path-name for the special device that corresponds to a
 SCSI scanner. For SCSI scanners, the special device name must be a
 generic SCSI device or a symlink to such a device.  Under Linux, such
 a device name could be
@@ -98,7 +98,7 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
diff --git a/doc/sane-stv680.man b/doc/sane-stv680.man
index d4a8d3a..58488e0 100644
--- a/doc/sane-stv680.man
+++ b/doc/sane-stv680.man
@@ -160,7 +160,7 @@ Plenty. Parts of this backend are still under development.
 
 
 .SH "SEE ALSO"
-.BR sane(7),
+.BR sane (7),
 .BR sane\-usb (5),
 .BR scanimage (1),
 .BR xcam (1)
diff --git a/doc/sane-tamarack.man b/doc/sane-tamarack.man
index 16b1128..82ec419 100644
--- a/doc/sane-tamarack.man
+++ b/doc/sane-tamarack.man
@@ -56,7 +56,7 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
diff --git a/doc/sane-teco1.man b/doc/sane-teco1.man
index e9d9663..936ce00 100644
--- a/doc/sane-teco1.man
+++ b/doc/sane-teco1.man
@@ -77,14 +77,19 @@ scanimage \-\-help \-d teco1
 
 .TP
 .B \-\-mode Black & White|Grayscale|Color
-Selects the basic mode of operation of the scanner valid choices are
+Selects the basic mode of operation of the scanner. Valid choices are
+.IR "Black & White" ,
+.I "Grayscale"
+and
+.IR Color .
+
 The
 .I Black & White
-mode is black and white only (1 bit).
+mode is for black and white only (1 bit).
 .I Grayscale
 will produce 256 levels of gray (8 bits).
 .I Color
-will produce a 24 bits color image.
+will produce a 24 bit color image.
 
 .TP
 .B \-\-resolution 1..600
diff --git a/doc/sane-teco2.man b/doc/sane-teco2.man
index 6b04290..6fd9780 100644
--- a/doc/sane-teco2.man
+++ b/doc/sane-teco2.man
@@ -96,7 +96,9 @@ a restricted set of resolutions are available.
 .B Note:
 All values with ydpi > 300 (300 x 600) or 600 (600 x 1200) result in
 a wrong proportion for the scan. The proportion can be adjusted with
-the following imagemagick command:
+the following
+.BR convert (1)
+command from imagemagick:
 .br
 .I convert \-geometry (dpi/max_xdpi * 100%)x100%
 .br
@@ -164,7 +166,7 @@ value loaded into the scanner. Scale 0..64 in steps of 1.
 .TP
 .B \-\-white\-level\-g 0..64
 Selects what green radiance level should be
-considered "white", when scanning some sheets by changing the calibration i
+considered "white", when scanning some sheets by changing the calibration
 value loaded into the scanner. Scale 0..64 in steps of 1.
 
 .TP
@@ -252,4 +254,4 @@ Dave Parker for testing the support for the VM6575.
 .TP
 Michael Hoeller for testing the support for the VM356A.
 .TP
-Christoph.Hoeffner for testing the support for the VM3564 (Relisys AVEC II S3 firmware 1.09).
+Christoph Hoeffner for testing the support for the VM3564 (Relisys AVEC II S3 firmware 1.09).
diff --git a/doc/sane-test.man b/doc/sane-test.man
index 3368bdf..194fd8b 100644
--- a/doc/sane-test.man
+++ b/doc/sane-test.man
@@ -51,7 +51,7 @@ correctly.  This option also enables a fixed width of 11 cm.
 Setting option
 .B three\-pass
 simulates a three-pass scanner.  Older color scanners needed to scan the image
-once per color (reg/green/blue) to get the full image.  Therefore, in this mode
+once per color (red/green/blue) to get the full image.  Therefore, in this mode
 three single frames are transmitted in color mode.
 .PP
 Option
@@ -303,7 +303,7 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
diff --git a/doc/sane-u12.man b/doc/sane-u12.man
index a09ae91..81ab725 100644
--- a/doc/sane-u12.man
+++ b/doc/sane-u12.man
@@ -126,7 +126,7 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
diff --git a/doc/sane-umax.man b/doc/sane-umax.man
index 21caa3c..747277e 100644
--- a/doc/sane-umax.man
+++ b/doc/sane-umax.man
@@ -6,9 +6,9 @@ sane\-umax \- SANE backend for UMAX scanners
 
 .SH ABOUT THIS FILE
 
-This file only is a short description of the
+This file is only a brief description of the
 .B sane\-umax
-backend for sane! For detailed information take a look at
+backend for SANE! For detailed information take a look at
 sane\-umax\-doc.html (it is included in the sane source directory and in the
 .BR xsane (1)
 online help)!
@@ -17,7 +17,7 @@ online help)!
 
 The
 .B sane\-umax
-library implements a SANE backend that provides access to several UMAX-SCSI-scanners and some Linotye Hell SCSI-scanners,
+library implements a SANE backend that provides access to several UMAX-SCSI-scanners and some Linotype Hell SCSI-scanners,
 parallel- and USB-scanners are not (and probably will never be) supported!
 
 .B I suggest you hold one hand on the power-button of the scanner while you try the first scans!
@@ -69,9 +69,11 @@ values: 0 = disabled, 1 = enabled
 .br
 default = 0
 .br
-If set to 1 umax_do_request_sense is called in
-umax_do_calibration. This can hang the system
-(but has been enabled until this version)
+If set to 1,
+.BR umax_do_request_sense ()
+is called in
+.BR umax_do_calibration ().
+This can hang the system, but has been enabled until this version.
 .TP
 scsi\-buffer\-size\-min, scsi\-buffer\-size\-max:
 values: 4096-1048576
@@ -113,10 +115,11 @@ values:
 .br
 default = \-1
 .br
-dangerous options, needed for some scanners
-do not changed these options until you really know
-what you do, you may destroy your scanner when you
-define wrong values for this options
+Dangerous options, needed for some scanners.
+.br
+Do not change these options unless you really know
+what you are doing otherwise you may destroy your scanner
+with invalid values.
 .TP
 calibration\-full\-ccd:
 values:
@@ -132,8 +135,7 @@ selected image
 calibration\-width\-offset:
 values: \-99999 = auto, > \-99999 set value
 .br
-add an offset width to the calculated with for
-image/ccd
+add an offset to the calculated width for image/ccd
 .TP
 calibration\-bytes\-pixel:
 values:
@@ -191,7 +193,7 @@ values:
 default = 2
 .br
 most SCSI drivers allow internal command queueing with a depth
-of 2 commands. In most cases it does not mprove anything when you
+of 2 commands. In most cases it does not improve anything when you
 increase this value. When your SCSI driver does not support any
 command queueing you can try to set this value to 1.
 
@@ -203,9 +205,9 @@ permissions of that device, have a look at
 
 .SH SCSI ADAPTER TIPS
 
-The ISA-SCSI-adapters that are shipped with some Umax-scanners are not supported very
+The ISA-SCSI-adapters that are shipped with some UMAX-scanners are not supported very
 well by Linux (I suggest not to use it), the PCI-SCSI-adapters that come with some
-Umax-scanners are not supported at all (as far as I know). On other platforms these
+UMAX-scanners are not supported at all (as far as I know). On other platforms these
 SCSI-adapters are not supported. So you typically need to purchase another SCSI-adapter
 that is supported by your platform. See the relevant hardware FAQs and HOWTOs for your
 platform for more information.
@@ -215,7 +217,7 @@ necessary to connect the scanner to its own SCSI-adapter. But if you need short
 response time for your SCSI-harddisk (e.g. if your computer is a file-server) or
 other SCSI devices, I suggest you use an own SCSI-adapter for your UMAX-scanner.
 
-If you have any problems with your Umax scanner, check your SCSI chain
+If you have any problems with your UMAX scanner, check your SCSI chain
 (cable length, termination, ...).
 
 See also:
@@ -240,9 +242,9 @@ The shared library implementing this backend:
 .B SANE_DEBUG_UMAX
 If the library was compiled with debug support enabled, this environment
 variable controls the debug level for this backend. E.g., a value of 128
-requests all debug output to be printed. Smaller levels reduce verbosity:
+requests all debug output to be printed. Smaller levels reduce verbosity.
 .B SANE_DEBUG_UMAX
-values.
+values:
 
 .ft CR
 .nf
diff --git a/doc/sane-umax_pp.man b/doc/sane-umax_pp.man
index 1d15061..7bfa750 100644
--- a/doc/sane-umax_pp.man
+++ b/doc/sane-umax_pp.man
@@ -217,7 +217,7 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
diff --git a/doc/sane-v4l.man b/doc/sane-v4l.man
index 41a600e..1ecaa65 100644
--- a/doc/sane-v4l.man
+++ b/doc/sane-v4l.man
@@ -59,7 +59,7 @@ support dynamic loading).
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
diff --git a/doc/sane-xerox_mfp.man b/doc/sane-xerox_mfp.man
index c41a770..da189b8 100644
--- a/doc/sane-xerox_mfp.man
+++ b/doc/sane-xerox_mfp.man
@@ -8,7 +8,7 @@ The
 library implements a SANE (Scanner Access Now Easy) backend that provides
 access to several Samsung-based Samsung, Xerox, and Dell scanners.
 Please see full list of supported devices at
-http://www.sane\-project.org/sane\-supported\-devices.html
+.IR http://www.sane\-project.org/sane\-supported\-devices.html .
 
 .SH CONFIGURATION
 .TP
@@ -50,7 +50,7 @@ Example:
 export SANE_DEBUG_XEROX_MFP=4
 
 .SH LIMITATIONS
-Multicast autoconfiguration for LAN scanners is not implemented yet. IPv6 addressing never been tested.
+Multicast autoconfiguration for LAN scanners is not implemented yet. IPv6 addressing has never been tested.
 
 .SH BUGS AND SUPPORT
 If you have found a bug or need support please follow open\-source way of acquiring support via
diff --git a/doc/sane.man b/doc/sane.man
index 80f7c1a..a37e8d2 100644
--- a/doc/sane.man
+++ b/doc/sane.man
@@ -49,7 +49,7 @@ The frontends
 and
 .BR scanadf (1)
 are included in the package
-.BR sane\-frontends.
+.BR sane\-frontends .
 Both packages can be downloaded from the
 .B SANE
 homepage
@@ -90,7 +90,8 @@ supported or unsupported), please contact us. See section HOW CAN YOU HELP
 SANE for details. There are lists for specific releases of SANE, for the
 current development version and a search engine:
 .IR http://www.sane\-project.org/sane\-supported\-devices.html .
-The lists are also installed on your system at \fI@DOCDIR@/\fR.
+The lists are also installed on your system at
+.IR @DOCDIR@/ .
 .TP
 .B SANE mailing list
 There is a mailing list for the purpose of discussing the SANE standard and its
@@ -102,7 +103,7 @@ unsubscribe:
 .TP
 .B SANE IRC channel
 The IRC (Internet Relay Chat) channel #sane can be found on the Freenode
-network (irc.freenode.net). It's for discussing
+network (irc.libera.chat). It's for discussing
 .B SANE
 problems, talking about development and general
 .B SANE
@@ -222,7 +223,7 @@ Supports the Canon DR-Series ADF SCSI and USB scanners. See
 for details.
 .TP
 .B canon_lide70
-Supports the CanoScan LiDE 70 USB scanner. See
+Supports the CanoScan LiDE 70 and 600 USB scanners. See
 .BR sane\-canon_lide70 (5)
 for details.
 .TP
@@ -251,8 +252,18 @@ Supports Epson-based Fujitsu USB scanners. See
 for details.
 .TP
 .B epson
-Supports Epson SCSI, parallel port and USB flatbed scanners. See
+Old driver for Epson SCSI, parallel port and USB flatbed scanners. See
 .BR sane\-epson (5)
+for details but try
+.BR epson2
+first.
+.TP
+.B epson2
+Newer driver for Epson SCSI, parallel port, network and USB flatbed
+scanners (try this before
+.BR epson
+which is outdated). See
+.BR sane\-epson2 (5)
 for details.
 .TP
 .B escl
@@ -267,16 +278,20 @@ for details.
 .TP
 .B genesys
 Supports several scanners based on the Genesys Logic
-GL646, GL841, GL843, GL847 and GL124 chips like the Medion 6471 and Hewlett-Packard 2300c.
- See
+GL646, GL841, GL843, GL847 and GL124 chips like the
+Medion 6471 and Hewlett-Packard 2300c.
+See
 .BR sane\-genesys (5)
 for details.
 .TP
 .B gt68xx
 Supports scanners based on the Grandtech
-GT-6801 and GT-6816 chips like the Artec Ultima 2000 and several Mustek
-BearPaw CU and TA models. Some Genius, Lexmark, Medion, Packard Bell, Plustek,
-and Trust scanners are also supported. See
+GT-6801 and GT-6816 chips like the Artec Ultima 2000
+and several Mustek BearPaw CU and TA models.
+.br
+Some Genius,
+Lexmark, Medion, Packard Bell, Plustek, and Trust scanners
+are also supported. See
 .BR sane\-gt68xx (5)
 for details.
 .TP
@@ -313,7 +328,7 @@ for details.
 .TP
 .B hpljm1005
 Supports the Hewlett-Packard LaserJet M1005 scanner. See
-.BR sane\-hpljm1005(5)
+.BR sane\-hpljm1005 (5)
 for details.
 .TP
 .B hs2p
@@ -601,9 +616,9 @@ The
 network daemon
 .BR saned (8)
 provides access to scanners located on different
-computers in connection with the net backend. See
+computers in connection with the
 .BR sane\-net (5)
-and
+backend. See
 .BR saned (8).
 .TP
 .B pnm
@@ -761,9 +776,16 @@ information when testing a Mustek SCSI scanner, set environment variables
 .BR SANE_DEBUG_DLL ", " SANE_DEBUG_MUSTEK ", and " SANE_DEBUG_SANEI_SCSI
 to 128 and then invoke
 .IR scanimage\ \-L .
-The debug messages for the dll backend tell if the mustek backend was found
-and loaded at all. The mustek messages explain what the mustek backend is
-doing while the SCSI debugging shows the low level handling. If you can't find
+The
+.B SANE_DEBUG_DLL
+messages tell if the
+.BR sane\-mustek (5)
+backend was found and loaded at all. The
+.B SANE_DEBUG_MUSTEK
+messages explain what the backend is
+doing while the
+.B SANE_DEBUG_SCSI
+debugging shows the low level handling. If you can't find
 out what's going on by checking the messages carefully, contact the sane\-devel
 mailing list for help (see REPORTING BUGS below).
 .PP
@@ -792,11 +814,11 @@ You should get a list of PASSed tests. You can do the same with your backend
 by changing "test" to your backend's name.
 .PP
 So now scanning with
-.B scanimage(1)
+.B scanimage (1)
 works and you want to use one of the graphical frontends like
-.BR xsane(1) ,
-.BR xscanimage(1) ", or"
-.B quiteinsane(1)
+.BR xsane (1) ,
+.BR xscanimage (1) ", or"
+.B quiteinsane (1)
 but those frontends don't detect your scanner? One reason may be that you
 installed two versions of
 .BR SANE .
@@ -866,6 +888,7 @@ for details).
 .BR sane\-dll (5),
 .BR sane\-dmc (5),
 .BR sane\-epson (5),
+.BR sane\-epson2 (5),
 .BR sane\-escl (5),
 .BR sane\-fujitsu (5),
 .BR sane\-genesys (5),
diff --git a/doc/saned.man b/doc/saned.man
index 89484d5..d91f817 100644
--- a/doc/saned.man
+++ b/doc/saned.man
@@ -24,81 +24,99 @@ saned \- SANE network daemon
 .B ]
 .B [ \-e ]
 .B [ \-h ]
+
 .SH DESCRIPTION
 .B saned
 is the SANE (Scanner Access Now Easy) daemon that allows remote clients
 to access image acquisition devices available on the local host.
+
 .SH OPTIONS
 .PP
-The
-.B \-l
-flag requests that
-.B saned
-run in standalone daemon mode.  In this mode,
 .B saned
-will listen for incoming client connections;
-.BR inetd (8)
-is not required for
+recognises the following options:
+
+.TP
+.BR \-a "\fI [username]\fR, " \-\-alone [=\fIusername]\fR
+is equivalent to the combination of
+.B \-l \-D \-u
+.I username
+options. However,
+.I username
+is optional and running user will only be set when specified.
+
+.TP
+.BR \-u "\fI username\fR, " \-\-user =\fIusername\fR
+requests that
 .B saned
-operations in this mode. The
-.B \-b
-flag tells
+drop root privileges and run as the user (and group) associated with
+.I username
+after binding.
+
+.TP
+.BR \-b "\fI address\fR, " \-\-bind =\fIaddress\fR
+tells
 .B saned
 to bind to the
 .I address
-given.  The
-.B \-p
-flags tells
+given.
+
+.TP
+.BR \-p "\fI port\fR, " \-\-port=\fIport\fR
+tells
 .B saned
-to listen on the port given.  A value of 0 tells
+to listen on the
+.I port
+given.  A value of 0 tells
 .B saned
 to pick an unused port.  The default is the
 .B sane-port (6566).
-The
-.B \-u
-flag requests that
+
+.TP
+.BR \-l ", " \-\-listen
+requests that
 .B saned
-drop root privileges and run as the user (and group) associated with
-.I username
-after binding.
-The
-.B \-D
-flag will request
+run in standalone daemon mode.  In this mode,
+.B saned
+will listen for incoming client connections;
+.BR inetd (8)
+is not required for
+.B saned
+operations in this mode.
+
+.TP
+.BR \-D ", " \-\-daemonize
+will request
 .B saned
 to detach from the console and run in the background.
-The flag
-.B \-a
-is equivalent to the combination of
-.B \-l \-B \-u
-.I username
-options.
-.PP
-The
-.B \-d
-flag sets the level of
+
+.TP
+.BR \-o ", " \-\-once
+requests that
+.B saned
+exits after the first client disconnects.  This is useful for debugging.
+
+.TP
+.BR \-d "\fI n\fR, " \-\-debug =\fIn\fR
+sets the level of
 .B saned
-debug output.  When compiled with debugging enabled, this flag may be
+debug output to
+.IR n .
+When compiled with debugging enabled, this flag may be
 followed by a number to request more or less debug info.  The larger
 the number, the more verbose the debug output.  E.g.,
 .B \-d128
 will request output of all debug info.  A level of 0 produces no
 output at all.  The default value is 2.
-.PP
-The
-.B \-e
-flag will divert
+
+.TP
+.BR \-e ", " \-\-stderr
+will divert
 .B saned
 debug output to stderr instead of the syslog default.
-.PP
-The
-.B \-o
-flag requests that
-.B saned
-exits after the first client disconnects.  This is useful for debugging.
-.PP
-The
-.B \-h
-flag displays a short help message.
+
+.TP
+.BR \-h ", " \-\-help
+displays a short help message.
 .PP
 If
 .B saned
@@ -108,6 +126,7 @@ is run from other programs such as
 and
 .BR systemd (1),
 check that program's documentation on how to pass command-line options.
+
 .SH CONFIGURATION
 First and foremost:
 .B saned
@@ -290,14 +309,15 @@ service sane\-port
 .SH SYSTEMD CONFIGURATION
 .B saned
 can be compiled with explicit
-.BR systemd (1) support. This
+.BR systemd (1)
+support. This
 will allow logging debugging information to be forwarded
 to the
 .BR systemd (1)
 journal. The
 .BR systemd (1)
 support requires compilation with the systemd-devel package
-installed on the system. this is the preferred option.
+installed on the system. This is the preferred option.
 
 .B saned
 can be used with
@@ -314,7 +334,7 @@ configuration is different for the 2 options, so both are described below.
 For
 .BR systemd (1)
 configuration we need to add 2 configuration files in
-.I /etc/systemd/system.
+.IR /etc/systemd/system .
 .PP
 The first file we need to add here is called
 .I saned.socket.
@@ -372,7 +392,7 @@ You need to set an environment variable for
 pointing to the directory where
 .B saned
 can find its configuration files.
-you will have to remove the # on the last line and set the variables
+You will have to remove the # on the last line and set the variables
 for the desired debugging information if required.  Multiple variables
 can be set by separating the assignments by spaces as shown in the
 example above.
@@ -393,15 +413,15 @@ forwarded to the system log.
 This configuration will also work when
 .B saned
 is compiled WITH
-.BR systemd (1) integration support, but it does not allow debugging
-information to be logged.
+.BR systemd (1)
+integration support, but it does not allow debugging information to be logged.
 .PP
 For
 .BR systemd (1)
 configuration for
 .BR saned ,
 we need to add 2 configuration files in
-.I /etc/systemd/system.
+.IR /etc/systemd/system .
 .PP
 The first file we need to add here is called
 .I saned.socket.
@@ -428,7 +448,7 @@ WantedBy=sockets.target
 .RE
 .PP
 The second file to be added is
-.I saned@.service
+.IR saned@.service .
 This one differs from the version with
 .BR systemd (1)
 integration compiled in:
@@ -480,7 +500,7 @@ if supported by the client.
 .TP
 .B SANE_CONFIG_DIR
 This environment variable specifies the list of directories that may
-contain the configuration file.  Under UNIX, the directories are
+contain the configuration file.  On *NIX systems, the directories are
 separated by a colon (`:'), under OS/2, they are separated by a
 semi-colon (`;').  If this variable is not set, the configuration file
 is searched in two default directories: first, the current working
@@ -508,7 +528,7 @@ being searched (in this order).
 .BR sane\-"backendname" (5),
 .BR inetd (8),
 .BR xinetd (8),
-.BR systemd (1),
+.BR systemd (1)
 .br
 .I http://www.penguin-breeder.org/?page=sane\-net
 .SH AUTHOR
diff --git a/doc/scanimage.man b/doc/scanimage.man
index 7d48389..a86fe2a 100644
--- a/doc/scanimage.man
+++ b/doc/scanimage.man
@@ -14,7 +14,7 @@ scanimage \- scan an image
 .RB [ \-f | \-\-formatted\-device\-list
 .IR format ]
 .RB [ \-b | \-\-batch
-.RI [= format ]]
+.RI [ format ]]
 .RB [ \-\-batch\-start
 .IR start ]
 .RB [ \-\-batch\-count
@@ -24,7 +24,8 @@ scanimage \- scan an image
 .RB [ \-\-batch\-double ]
 .RB [ \-\-accept\-md5\-only ]
 .RB [ \-p | \-\-progress ]
-.RB [ \-o | \-\-output-file ]
+.RB [ \-o | \-\-output-file
+.IR path ]
 .RB [ \-n | \-\-dont\-scan ]
 .RB [ \-T | \-\-test ]
 .RB [ \-A | \-\-all-options ]
@@ -75,17 +76,33 @@ To print all available options:
   scanimage \-h
 
 .SH OPTIONS
+There are two sets of options available when running
+.BR scanimage .
+.PP
+The options that are provided by
+.B scanimage
+itself are listed below. In addition, each backend offers its own set of options and these
+can also be specified. Note that the options available from the backend may vary depending on the
+scanning device that is selected.
+.PP
+Often options that are similar in function may be implemented
+differently across backends. An example of this difference is
+.I \-\-mode Gray
+and
+.IR "\-\-mode Grayscale" .
+This may be due to differing backend author preferences.
+At other times, options are defined by the scanning device itself and therefore out of the
+control of the backend code.
+
+.PP
 Parameters are separated by a blank from single-character options (e.g.
-.BR "\-d epson" )
+.BI "\-d " epson )
 and by a "=" from multi-character options (e.g.
-.BR \-\-device\-name=epson ).
+.BR \-\-device\-name =\fIepson\FR ).
 
-.PP
-The
-.B \-d
-or
-.B \-\-device\-name
-options must be followed by a SANE device-name like
+.TP
+.BR \-d "\fI dev\fR, " \-\-device\-name =\fIdev\fR
+specifies the device to access and must be followed by a SANE device-name like
 .RI ` epson:/dev/sg0 '
 or
 .RI ` hp:/dev/usbscanner0 '.
@@ -98,11 +115,10 @@ reads a device-name from the environment variable
 If this variable is not set,
 .B scanimage
 will attempt to open the first available device.
-.PP
-The
-.B \-\-format
-.I format
-option selects how image data is written to standard output or the file specified by
+
+.TP
+.BR \-\-format =\fIformat\fR
+selects how image data is written to standard output or the file specified by
 the
 .B \-\-output\-file
 option.
@@ -116,19 +132,15 @@ or
 If
 .B \-\-format
 is not specified, PNM is written by default.
-.PP
-The
-.B \-i
-or
-.B \-\-icc\-profile
-option is used to include an ICC profile into a TIFF file.
-.PP
-The
-.B \-L
-or
-.B \-\-list\-devices
-option requests a (partial) list of devices that are available.  The
-list is not complete since some devices may be available, but are not
+
+.TP
+.BR \-i "\fI profile\fR, " \-\-icc\-profile =\fIprofile\fR
+is used to include an ICC profile into a TIFF file.
+
+.TP
+.BR \-L ", " \-\-list\-devices
+requests a (partial) list of devices that are available.  The
+list may not be complete since some devices may be available, but are not
 listed in any of the configuration files (which are typically stored
 in directory
 .IR @CONFIGDIR@ ).
@@ -136,12 +148,10 @@ This is particularly the case when accessing scanners through the network.  If
 a device is not listed in a configuration file, the only way to access it is
 by its full device name.  You may need to consult your system administrator to
 find out the names of such devices.
-.PP
-The
-.B \-f
-or
-.B \-\-formatted\-device\-list
-option works similar to
+
+.TP
+.BR \-f "\fI format\fR, " \-\-formatted\-device\-list =\fIformat\fR
+works similar to
 .BR \-\-list\-devices ,
 but requires a format string.
 .B scanimage
@@ -149,25 +159,30 @@ replaces the placeholders
 .B %d %v %m %t %i %n
 with the device name, vendor name, model name, scanner type, an index
 number and newline respectively. The command
-.PP
+.LP
 .RS
 .B scanimage \-f
 .I \*(lq scanner number %i device %d is a %t, model %m, produced by %v \*(rq
-.PP
-.RE
+.LP
+
 will produce something like:
 .PP
 .RS
 scanner number 0  device sharp:/dev/sg1 is  a  flatbed scanner, model JX250
 SCSI, produced by SHARP
 .RE
+.RE
+
 .PP
 The
 .B \-\-batch*
-options provide the features for scanning documents using document
+options provide features for scanning documents using document
 feeders.
-.BR \-\-batch
-.RI [ format ]
+
+.RS
+
+.TP
+.BR \-b " [\fIformat\fR], " \-\-batch =[\fIformat\fR]
 is used to specify the format of the filename that each page will be written
 to.  Each page is written out to a single file.  If
 .I format
@@ -190,129 +205,126 @@ This option is incompatible with the
 option.
 .I format
 is given as a printf style string with one integer parameter.
-.B \-\-batch\-start
-.I start
+
+
+.TP
+.BR \-\-batch\-start =\fIstart\fR
 selects the page number to start naming files with. If this option is not
 given, the counter will start at 1.
-.B \-\-batch\-count
-.I count
+
+.TP
+.BR \-\-batch\-count =\fIcount\fR
 specifies the number of pages to attempt to scan.  If not given,
-scanimage will continue scanning until the scanner returns a state
+.B scanimage
+will continue scanning until the scanner returns a state
 other than OK.  Not all scanners with document feeders signal when the
-ADF is empty, use this command to work around them.
-With
-.B \-\-batch\-increment
-.I increment
-you can change the amount that the number in the filename is incremented
+ADF is empty. Use this option to work around them.
+
+.TP
+.BR \-\-batch\-increment =\fIincrement\fR
+sets the amount that the number in the filename is incremented
 by.  Generally this is used when you are scanning double-sided documents
-on a single-sided document feeder.  A specific command is provided to
-aid this:
+on a single-sided document feeder.
+.B \-\-batch\-double
+is a specific command provided to aid this.
+
+.TP
 .B \-\-batch\-double
 will automatically set the increment to 2.
+Equivalent to
+.BR \-\-batch\-increment =2
+
+.TP
 .B \-\-batch\-prompt
 will ask for pressing RETURN before scanning a page. This can be used for
 scanning multiple pages without an automatic document feeder.
-.PP
-The
+.RE
+
+.TP
 .B \-\-accept\-md5\-only
-option only accepts user authorization requests that support MD5 security. The
+only accepts user authorization requests that support MD5 security. The
 .B SANE
 network daemon
-.RB ( saned )
-is capable of doing such requests. See
-.BR saned (8).
-.PP
-The
-.B \-p
-or
-.B \-\-progress
-option requests that
+.BR saned (8)
+is capable of doing such requests.
+
+.TP
+.BR \-p ", " \-\-progress
+requests that
 .B scanimage
 prints a progress counter. It shows how much image data of the current image has
-already been received by
-.B scanimage
-(in percent).
-.PP
-The
-.B \-o
-or
-.B \-\-output\-file
-option requests that
+already been received (in percent).
+
+.TP
+.BR \-o "\fI path\fR, " \-\-output\-file =\fIpath\fR
+requests that
 .B scanimage
-saves the scanning output to the given path. This option is incompatible with the
-\-\-batch option. The program will try to guess
+saves the scanning output to the given
+.IR path .
+This option is incompatible with the
+.B \-\-batch
+option. The program will try to guess
 .B \-\-format
 from the file name. If that is not possible, it will print an error message and exit.
-.PP
-The
-.B \-n
-or
-.B \-\-dont\-scan
-option requests that
+
+.TP
+.BR \-n ", " \-\-dont\-scan
+requests that
 .B scanimage
 only sets the options provided by the user but doesn't actually perform a
 scan. This option can be used to e.g. turn off the scanner's lamp (if
 supported by the backend).
-.PP
-The
-.B \-T
-or
-.B \-\-test
-option requests that
+
+.TP
+.BR \-T ", " \-\-test
+requests that
 .B scanimage
 performs a few simple sanity tests to make sure the backend works as
 defined by the
 .B SANE
-API (in particular the
+API. In particular the
 .BR sane_read ()
-function is exercised by this test).
-.PP
-The
-.B \-A
-or
-.B \-\-all-options
-option requests that
+function is exercised by this test.
+
+.TP
+.BR \-A ", " \-\-all\-options
+requests that
 .B scanimage
-lists all available options exposed the backend, including button options.
-The information is printed on standard output and no scan will be done.
-.PP
-The
-.B \-h
-or
-.B \-\-help
-options request help information.  The information is printed on
-standard output and in this case, no attempt will be made to acquire
-an image.
-.PP
-The
-.B \-v
-or
-.B \-\-verbose
-options increase the verbosity of the operation of
+lists all available options exposed by the backend, including button options.
+The information is printed on standard output and no scan will be performed.
+
+.TP
+.BR \-h ", " \-\-help
+requests help information.  The information is printed on
+standard output and no scan will be performed.
+
+.TP
+.BR \-v ", " \-\-verbose
+increases the verbosity of the output of
 .B scanimage.
 The option may be specified repeatedly, each time increasing the verbosity
 level.
-.PP
-The
-.B \-B
-option without argument changes the input buffer size from the default 32KB to 1MB.  For finer grained control, use
-.B \-\-buffer-size=
-followed by the number of KB.
-.PP
-The
-.B \-V
-or
-.B \-\-version
-option requests that
+
+.TP
+.BR \-B " [\fIsize\fR], " \-\-buffer\-size =[\fIsize\fR]
+changes input buffer size from the default of 32KB to
+.I size
+KB. If
+.I size
+is not specified then the buffer is set to 1 MB.
+
+.TP
+.BR \-V ", " \-\-version
+requests that
 .B scanimage
 prints the program and package name, the version number of
 the
 .B SANE
 distribution that it came with and the version of the backend that it
-loads. Usually that's the dll backend. If more information about the version
+loads. If more information about the version
 numbers of the backends are necessary, the
 .B DEBUG
-variable for the dll backend can be used. Example:
+variable for the dll layer can be used. Example:
 .I "SANE_DEBUG_DLL=3 scanimage \-L" .
 .PP
 As you might imagine, much of the power of
@@ -336,24 +348,26 @@ The documentation for the device-specific options printed by
 is best explained with a few examples:
 
 .B \-l 0..218mm [0]
-.br
-    Top-left x position of scan area.
-.PP
 .RS
+Top-left x position of scan area.
+.PP
 The description above shows that option
 .B \-l
 expects an option value in the range from 0 to 218 mm.  The
 value in square brackets indicates that the current option value is 0
-mm. Most backends provide similar geometry options for top-left y position (\-t),
-width (\-x) and height of scan-area (\-y).
+mm. Most backends provide similar geometry options for top-left y position
+.RB ( \-t ),
+width
+.RB ( \-x )
+and height of scan-area
+.RB (\-y ).
 .RE
 
 
 .B \-\-brightness \-100..100% [0]
-.br
-    Controls the brightness of the acquired image.
-.PP
 .RS
+Controls the brightness of the acquired image.
+.PP
 The description above shows that option
 .B \-\-brightness
 expects an option value in the range from \-100 to 100 percent.  The
@@ -362,10 +376,9 @@ percent.
 .RE
 
 .B \-\-default\-enhancements
-.br
-    Set default values for enhancement controls.
-.PP
 .RS
+Set default values for enhancement controls.
+.PP
 The description above shows that option
 .B \-\-default\-enhancements
 has no option value.  It should be thought of as having an immediate
@@ -378,10 +391,9 @@ would effectively be a no-op.
 .RE
 
 .B \-\-mode Lineart|Gray|Color [Gray]
-.br
-    Selects the scan mode (e.g., lineart or color).
-.PP
 .RS
+Selects the scan mode (e.g., lineart or color).
+.PP
 The description above shows that option
 .B \-\-mode
 accepts an argument that must be one of the strings
@@ -401,10 +413,9 @@ is identical to
 .RE
 
 .B \-\-custom\-gamma[=(yes|no)] [inactive]
-.br
-    Determines whether a builtin or a custom gamma-table should be used.
-.PP
 .RS
+Determines whether a builtin or a custom gamma-table should be used.
+.PP
 The description above shows that option
 .B \-\-custom\-gamma
 expects either no option value, a "yes" string, or a "no" string.
@@ -434,14 +445,11 @@ is selected.
 .RE
 
 .B \-\-gamma\-table 0..255,...
-.br
-    Gamma-correction table.  In color mode this option
-.br
-    equally affects the red, green, and blue channels
-.br
-    simultaneously (i.e., it is an intensity gamma table).
-.PP
 .RS
+Gamma-correction table.  In color mode this option
+equally affects the red, green, and blue channels
+simultaneously (i.e., it is an intensity gamma table).
+.PP
 The description above shows that option
 .B \-\-gamma\-table
 expects zero or more values in the range 0 to 255.  For example, a
@@ -459,12 +467,10 @@ can be used to generate such gamma tables (see
 for details).
 .RE
 
-.br
 .B \-\-filename <string> [/tmp/input.ppm]
-.br
-    The filename of the image to be loaded.
-.PP
 .RS
+The filename of the image to be loaded.
+.PP
 The description above is an example of an option that takes an
 arbitrary string value (which happens to be a filename).  Again,
 the value in brackets show that the option is current set to the
@@ -501,8 +507,8 @@ to 127 characters.
 .BR sane (7),
 .BR gamma4scanimage (1),
 .BR xscanimage (1),
-.BR xcam(1) ,
-.BR xsane(1) ,
+.BR xcam (1) ,
+.BR xsane (1) ,
 .BR scanadf (1),
 .BR sane\-dll (5),
 .BR sane\-net (5),