Merge branch 'feature/upstream' into develop

1 files changed, 23 insertions, 9 deletions

diff --git a/doc/sane-mustek.man b/doc/sane-mustek.man
index f06d9c1..925e6d8 100644
--- a/doc/sane-mustek.man
+++ b/doc/sane-mustek.man
@@ -95,8 +95,9 @@ and a debug output to
 .IR sane\-devel@alioth-lists.debian.net .
 You can get the debug output by setting the environment variable
 .B SANE_DEBUG_MUSTEK
-to 5 and showing the list of available scanners with scanimage \-L. Please
-send all of it to the mailing list. You must be subscribed to sane\-devel
+to 5 and showing the list of available scanners with
+.IR "scanimage \-L" .
+Please send all of it to the mailing list. You must be subscribed to sane\-devel
 before you can send mail to the list. See
 .I http://www.sane\-project.org/mailing\-lists.html
 for details.
@@ -116,7 +117,7 @@ be found (see section
 .B "PARALLEL PORT SCANNERS"
 below).  For SCSI scanners, the special device name must be a generic SCSI
 device or a symlink to such a device.  The program
-.I sane\-find\-scanner
+.BR sane\-find\-scanner (1)
 helps to find out the correct device. Under Linux, such a device name
 could be
 .I /dev/sg0
@@ -220,8 +221,9 @@ Finally,
 is a global option. If set, the backend will wait until the device is ready
 before sending the inquiry command. Further more the backend will force the
 scan slider to return to its starting position (not implemented for all
-scanners). This option may be necessary with the 600 II N or when scanimage is
-used multiple times (e.g. in scripts). The default is off (not set).
+scanners). This option may be necessary with the 600 II N or when
+.BR scanimage (1)
+is used multiple times (e.g. in scripts). The default is off (not set).
 .PP
 A sample configuration file is shown below:
 .PP
@@ -328,6 +330,7 @@ you use the scanner again, the lamp turns back on to the normal high
 brightness. However, the first image scanned after such a shutdown may
 have stripes and appear to be over-exposed.  When this happens, just
 take another scan, and the image will be fine.
+
 .SH FILES
 .TP
 .I @CONFIGDIR@/mustek.conf
@@ -341,6 +344,7 @@ The static library implementing this backend.
 .I @LIBDIR@/libsane\-mustek.so
 The shared library implementing this backend (present on systems that
 support dynamic loading).
+
 .SH ENVIRONMENT
 .TP
 .B SANE_CONFIG_DIR
@@ -349,13 +353,19 @@ 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 @CONFIGDIR@.  If the value of the
+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
 .B SANE_CONFIG_DIR
-to "/tmp/config:" would result in directories "tmp/config", ".", and
-"@CONFIGDIR@" being searched (in this order).
+to "/tmp/config:" would result in directories
+.IR "tmp/config" ,
+.IR "." ,
+and
+.I "@CONFIGDIR@"
+being searched (in this order).
 .TP
 .B SANE_DEBUG_MUSTEK
 If the library was compiled with debug support enabled, this
@@ -384,7 +394,11 @@ export SANE_DEBUG_MUSTEK=4
 .BR sane\-mustek_usb (5),
 .BR sane\-gt68xx (5),
 .BR sane\-plustek (5),
-.BR sane\-mustek_pp (5)
+.BR sane\-mustek_pp (5),
+.BR sane\-ma1509 (5),
+.BR scanimage (1),
+.BR xscanimage (1)
+
 .br
 .I @DOCDIR@/mustek/mustek.CHANGES
 .br