Changed configuration file back to remain compatible with the old format.

backend/plustek.c

@@ -139,7 +139,7 @@
 #include "../include/sane/sanei.h"
 #include "../include/sane/saneopts.h"
 
-#define BACKEND_VERSION "0.46-7"
+#define BACKEND_VERSION "0.46-8"
 #define BACKEND_NAME	plustek
 #include "../include/sane/sanei_backend.h"
 #include "../include/sane/sanei_config.h"
@@ -162,7 +162,7 @@
 
 /*****************************************************************************/
 
-#define _SECTION        "[merlin-device]"
+#define _SECTION        "[usb]"
 #define _DEFAULT_DEVICE "auto"
 
 /** to disable the backend... */

backend/plustek.conf

@@ -3,10 +3,10 @@
 #
 
 # each device needs at least two lines:
-# - [merlin-device] vendor-ID and product-ID
+# - [usb] vendor-ID and product-ID
 # - device devicename
 # i.e. for Plustek (0x07B3) UT12/16/24 (0x0017)
-# [merlin-device] 0x07B3 0x0017
+# [usb] 0x07B3 0x0017
 # device /dev/usbscanner
 # or
 # device libusb:bbb:ddd
@@ -17,15 +17,15 @@
 # warmup, lOffOnEnd, lampOff
 #
 # For autodetection use
-# [merlin-device]
+# [usb]
 # device /dev/usbscanner
 #
 # or simply
-# [merlin-device]
+# [usb]
 #
 # or if you want a specific device but you have no idea about the
 # device node or you use libusb, simply set vendor- and product-ID
-# [merlin-device] 0x07B3 0x0017
+# [usb] 0x07B3 0x0017
 # device auto
 #
 # NOTE: autodetection is safe, as it uses the info it got
@@ -34,7 +34,7 @@
 #       at your USB-port, that you have specified...
 #
 
-[merlin-device]
+[usb]
 
 #
 # options for the previous USB entry
@@ -129,5 +129,5 @@ device auto
 
 #
 # to define a new device, start with a new section:
-# [merlin-device] 
+# [usb] 
 #

doc/sane-plustek.man

@@ -1,4 +1,4 @@
-.TH sane-plustek 5 "28 September 2003" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH sane-plustek 5 "27 October 2003" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane-plustek
 .SH NAME
 sane-plustek \- SANE backend for Plustek parallel port and
@@ -178,11 +178,11 @@ entries in the configuration file
 .br
 .I @CONFIGDIR@/plustek.conf
 .TP
-.I [merlin-device] vendor-id product-id
+.I [usb] vendor-id product-id
 .TP
 .I device /dev/usbscanner
 .PP
-.I merlin-device
+.I [usb]
 tells the backend, that the following devicename (here
 .I /dev/usbscanner
 ) has to be interpreted as USB scanner device. If vendor- and