Merge branch 'feature/upstream' into develop

1 files changed, 22 insertions, 11 deletions

diff --git a/doc/sane-microtek.man b/doc/sane-microtek.man
index d3bf21c..cb42aa3 100644
--- a/doc/sane-microtek.man
+++ b/doc/sane-microtek.man
@@ -50,7 +50,7 @@ The driver does
 .B not
 support the newest Microtek scanners, such as the V330 and V660, which use
 a new and very different SCSI-II command set.  For those, try the alternate
-.B microtek2
+.BR microtek2 (5)
 backend.  Most non-SCSI scanners would use the new command set.  Most
 scanners newer than the Scanmaker E6 would use the new command set.
 .PP
@@ -63,8 +63,9 @@ Although this manual page is generally updated with each release,
 up-to-date information on new releases and extraneous helpful hints
 are available from the backend homepage:
 .br
+.PP
 .RS
-.B http://www.mir.com/mtek/
+.I http://www.mir.com/mtek/
 .RE
 
 .SH "DEVICE NAMES"
@@ -134,13 +135,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_MICROTEK
 If the library was compiled with debugging support enabled, this
@@ -149,7 +156,9 @@ A value of 128 requests maximally copious debug output; smaller
 levels reduce verbosity.
 
 .SH "SEE ALSO"
-sane(7), sane\-scsi(5)
+.BR sane (7),
+.BR sane\-scsi (5),
+.BR sane\-microtek2 (5)
 
 .SH AUTHOR
 Matt Marjanovic
@@ -177,11 +186,12 @@ option in the configuration file (first one, then both), and see if it helps.
 (If it does, report it.)
 .PP
 Send lengthy bug reports and new scanner information to
-.BR mtek\-bugs@mir.com .
+.IR mtek\-bugs@mir.com .
 All bug reports and new scanner inquiries should include an error log file.
 You can generate copious
-stderr output by setting the SANE_DEBUG_MICROTEK environment variable
-described above.  For example:
+stderr output by setting the
+.B SANE_DEBUG_MICROTEK
+environment variable described above.  For example:
 .PP
 .RS
 setenv SANE_DEBUG_MICROTEK 128
@@ -189,6 +199,7 @@ setenv SANE_DEBUG_MICROTEK 128
 .PP
 More general comments, suggestions, and inquiries about frontends
 or SANE should go to
-.BR sane\-devel@alioth-lists.debian.net ,
+.IR sane\-devel@alioth-lists.debian.net ,
 the SANE Developers mailing list. Have a look at
-http://www.sane\-project.org/mailing\-lists.html concerning subscription to sane\-devel.
+.I http://www.sane\-project.org/mailing\-lists.html
+concerning subscription to sane\-devel.