Merge branch 'release/debian/1.0.32-1'debian/1.0.32-1

1 files changed, 7 insertions, 11 deletions

diff --git a/testsuite/tools/data/testfile.desc b/testsuite/tools/data/testfile.desc
index bae4099..be78f98 100644
--- a/testsuite/tools/data/testfile.desc
+++ b/testsuite/tools/data/testfile.desc
@@ -1919,7 +1919,6 @@
 
 :devicetype :meta
 :desc "Dynamic loading of shared-library backends."
-; $Id$
 ;
 ; SANE Backend specification file (Matto Marjanovic's format)
 ;
@@ -5605,7 +5604,7 @@
 :interface "USB"
 :usbid "0x04a7" "0x0444"
 :status :good
-:comment "Works upto 1200 dpi and 12 bits/color."
+:comment "Works up to 1200 dpi and 12 bits/color."
 
 ; -----------------------------------------------------------------------------
 ; SANE Backend specification file
@@ -5906,7 +5905,7 @@
 :url "http://www.hp.com/"
 
 :model "ScanJet Plus"           ; name models for above-specified mfg.
-:interface "Propietary"
+:interface "Proprietary"
 :status :complete
 :comment "Driver for HP parallel interface card required"
 
@@ -6794,7 +6793,7 @@
 :interface "USB"
 :usbid "0x055f" "0x0010"
 :status :good
-:comment "Works upto 600 dpi. No support for TA and ADF yet."
+:comment "Works up to 600 dpi. No support for TA and ADF yet."
 :mfg "Fujitsu"		; name a manufacturer
 :url "http://www.fujitsu.com/"
 
@@ -7593,7 +7592,7 @@
 :devicetype :meta
 :desc "Network access to saned servers"
 :comment "Can be used to access any scanner supported by SANE over the net. Supports IPv4 and IPv6."
-; $Id$
+
 ; SANE Backend specification file
 ;
 ; It's basically emacs-lisp --- so ";" indicates comment to end of line.
@@ -7812,7 +7811,7 @@
 :manpage "sane-pixma"             ; name of manpage (if it exists)
 :url "http://home.arcor.de/wittawat/pixma/" ; 0.13.2 backend's web page
 :url "http://mp610.blogspot.com/"            ; the pixma backend blog
-;:comment "Devices marked as experimantal are disabled by default. See the manual page for how to enable them."
+;:comment "Devices marked as experimental are disabled by default. See the manual page for how to enable them."
 
 :devicetype :scanner              ; start of a list of devices....
                                   ; other types:  :stillcam, :vidcam,
@@ -9383,9 +9382,6 @@
 
 ; :status specifier is optional after :model and at the top-level
 
-
-; $Id$
-;
 ; SANE Backend specification file (Matto Marjanovic's format)
 ;
 ; It's basically emacs-lisp --- so ";" indicates comment to end of line.
@@ -11448,7 +11444,7 @@
 :interface "USB"
 :usbid "0x06dc" "0x0012"
 :status :unsupported
-:comment "Unsuported. See link for details."
+:comment "Unsupported. See link for details."
 
 :model "ColorPage HR8"
 :url "unsupported/genius-colorpage-hr8.html"
@@ -13020,7 +13016,7 @@
 :interface "Parport"
 :status :unsupported
 :url "http://www.autistici.org/tamarhack/"
-:comment "Unsupported at the moment. See link for a project for that scanner taht may support it in future."
+:comment "Unsupported at the moment. See link for a project for that scanner that may support it in future."
 
 :model "Artiscan 9600 pro 36"                ; name models for above-specified mfg.
 :interface "Parport"