Updated documentation concerning udev.

ChangeLog

@@ -2,7 +2,9 @@
 
 	* tools/hotplug-ng/convert-usermap.sh
 	  tools/udev/convert-usermap.sh: Removed. No longer needed as
-	  hotplug-ng and udev files are generated by sane-desc now. 
+	  hotplug-ng and udev files are generated by sane-desc now.
+	* tools/README tools/hotplug/README tools/hotplug-ng/README
+	  doc/sane-usb.man: Updated documentation concerning udev.
 
 2006-05-06  Henning Meier-Geinitz <henning@meier-geinitz.de>
 

doc/sane-usb.man

@@ -1,4 +1,4 @@
-.TH sane-usb 5 "16 August 2005"  "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH sane-usb 5 "10 May 2006"  "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane-usb
 .SH NAME
 sane-usb \- USB configuration tips for SANE
@@ -61,18 +61,17 @@ none /proc/bus/usb usbfs defaults  0  0
 The permissions for the device files used by libusb must be adjusted for user
 access. Otherwise only root can use SANE devices. For
 .IR Linux ,
-the devices are located in /proc/bus/usb/. There are directories named
-e.g. "001" (the bus name) containing files "001", "002" etc. (the device
-files). The right device files can be found out by running scanimage -L as
-root. Setting permissions with "chmod" is not permanent, however. They will be
-reset after reboot or replugging the scanner.
+the devices are located in /proc/bus/usb/ or in /dev/bus/usb, if you use
+udev. There are directories named e.g. "001" (the bus name) containing files
+"001", "002" etc. (the device files). The right device files can be found out by
+running scanimage -L as root. Setting permissions with "chmod" is not permanent,
+however. They will be reset after reboot or replugging the scanner.
 .PP
-Usually the the hotplug utilities
-.RI ( http://linux-hotplug.sourceforge.net/ ") are used, "
-which support dynamic setting of access permissions. SANE comes with hotplug
-scripts in the directory tools/hotplug. They can be used for setting
-permissions.  Precompiled SANE packages may have already installed such hotplug
-scrips in /etc/hotplug/.
+Usually udev or for older distributions the hotplug utilities are used, which
+support dynamic setting of access permissions. SANE comes with udev and hotplug
+scripts in the directory tools/udev and tools/hotplug. They can be used for
+setting permissions, see @DOCDIR@/README.linux, tools/README and the README in
+the tools/hotplug directory for more details. 
 .PP
 For the
 .BR BSDs ,

tools/README

@@ -1,16 +1,25 @@
-2004-06-05
+2006-05-10
 
 This directory contains various tools that may be useful:
 
  hotplug/:
-        Linux hotplug script and config file used to change the persmissions
-        on the libusb "device nodes" when a scanner is plugged in.
-        Please read the README file in this directory for instructions.
+        Linux hotplug script and an automatically generated config file
+        (libsane.usermap) used to change the permissions on the libusb "device
+        nodes" in /proc/bus/usb/ when a scanner is plugged in. For newer Linux
+        kernels, you may need to use udev instead.  Please read the README file
+        in this directory for instructions.
 
- udev:
-	Contains the convert-usermap.sh script to produce a udev rules file
-	based on tools/hotplug/libsane.usermap. udev now replaces hotplug and
-	provides all the functionalities of hotplug.
+ hotplug-ng/:
+        Linux hotplug-ng script and an automatically generated config file
+        (libsane.db) used to change the permissions on the libusb "device nodes"
+        in /proc/bus/usb/ when a scanner is plugged in. For newer Linux kernels,
+        you may need to use udev instead.  Please read the README file in this
+        directory for instructions.
+
+ udev/:
+	Contains a automatically generated udev rules file. udev now replaces
+	hotplug and provides all the functionalities of hotplug. libusb 0.1.12
+	or newer is necessary.
 
  sane-find-scanner:
         Attempts to find a SCSI scanner attached to your system.

tools/hotplug-ng/README

@@ -3,7 +3,8 @@ hotplug/hotplug-ng hook for sane-backends
 
 The libsane.hotplug script is intended to replace the existing hotplug scripts,
 as those won't be usable with the new hotplug-ng. The libsane.hotplug script
-works with both hotplug and hotplug-ng.
+works with both hotplug and hotplug-ng.  For current Linux kernels, "udev" is
+state of the art, see the "udev" directory instead.
 
 This script is provided in the hope that it will be useful, simpler, faster and
 more extensible than the current usermap approach.
@@ -14,12 +15,7 @@ INSTALLATION
 
 Install libsane.hotplug in /etc/hotplug/usb, and make it executable.
 
-Create the directory /etc/sane.d/hotplug, then run the convert-usermap.sh
-script on libsane.usermap to produce the libsane.db file:
-    $ ./convert-usermap.sh libsane.usermap
-
-The libsane.usermap file can be found in the tools/hotplug directory; for now
-the usermap file remains the authoritative source for the list of USB scanners.
+Create the directory /etc/sane.d/hotplug and copy libsane.db there.
 
 
 FILE FORMAT

tools/hotplug/README

@@ -1,8 +1,11 @@
 README for the USB hotplug scripts for sane-backends :
 ------------------------------------------------------
 
-If you intend to use a USB scanner with libusb and Linux, you should install the
-hotplug package, and then take the following steps :
+If you intend to use a USB scanner with libusb and older versions of Linux, you
+should install the hotplug package, and then take the following steps. For
+current Linux kernels, "udev" is state of the art, see the "udev" directory
+instead.
+
   o Copy the libsane.usermap and libusbscanner files from this directory to
     /etc/hotplug/usb/
   o If you use Linux 2.6.3 or older, add scanner to /etc/hotplug/blacklist so