Merge branch 'feature/upstream' into develop

1 files changed, 34 insertions, 16 deletions

diff --git a/doc/sane-canon630u.man b/doc/sane-canon630u.man
index e9ec3cd..f569695 100644
--- a/doc/sane-canon630u.man
+++ b/doc/sane-canon630u.man
@@ -19,7 +19,8 @@ Color scanning is supported at 75, 150, 300, and 600 dpi, and gamma and
 analog gain are adjustable.
 .PP
 TESTERS ARE WELCOME. Send your bug reports and comments to
-Nathan Rutman <nthn1@yahoo.com>
+Nathan Rutman
+.IR <nthn1@yahoo.com> .
 .PP
 .SH CONFIGURATION
 The contents of the
@@ -29,15 +30,19 @@ USB scanners.  Empty lines and lines starting with a hash mark (#) are
 ignored.  Only one device name can be listed in
 .IR canon630u.conf .
 The program
-.IR 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/usb/scanner0
-for example.  See sane\-usb(5) for details.
+for example.  See
+.BR sane\-usb (5)
+for details.
 .PP
 This product-specific scanner driver uses the lower-level kernel USB driver
-"scanner".  Check for "Driver=usbscanner" under /proc/bus/usb/devices.  If
-"Driver=(none)", try forcing it with "insmod scanner vendor=0x04a9 product=0x2204"
+"scanner".  Check for "Driver=usbscanner" under
+.IR /proc/bus/usb/devices.
+If "Driver=(none)", try forcing it with
+.I "insmod scanner vendor=0x04a9 product=0x2204"
 .SH NOTES
 .PP
 Due to Canon's unwillingness to provide scanner documentation, this
@@ -49,10 +54,16 @@ This driver requires the ability to send USB Control Messages, available in
 kernel 2.4.12 or later.
 .PP
 Some users have reported that this driver doesn't work at all.  This seems
-to be a hardware specific issue, although I don't know what exactly the
+to be a hardware specific issue, although I dsane\-uson't know what exactly the
 problem is.  If you are having problems, please send me the info in
-/proc/bus/usb/devices, /proc/pci, the kernel scanner.c driver version from
-/var/log/messages, and the output from "SANE_DEBUG_CANON630U=12 scanimage > /dev/null"
+.IR /proc/bus/usb/devices,
+.IR /proc/pci,
+the kernel
+.I scanner.c
+driver version from
+.IR /var/log/messages,
+and the output from
+.I "SANE_DEBUG_CANON630U=12 scanimage > /dev/null"
 .PP
 .SH FILES
 .TP
@@ -80,13 +91,18 @@ 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
-environment variable ends with the directory separator character, then
-the default directories are searched after the explicitly specified
-directories.  For example, setting
+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_CANON630U
 If the library was compiled with debug support enabled, this
@@ -97,9 +113,11 @@ Example:
 .br
 SANE_DEBUG_CANON630U=12 scanimage > /dev/null
 .SH "SEE ALSO"
-sane(7), sane\-usb(5), sane\-find\-scanner(1)
+.BR sane (7),
+.BR sane\-usb (5),
+.BR sane\-find\-scanner (1)
 .br
-http://canon-fb630u.sourceforge.net/
+.I http://canon-fb630u.sourceforge.net/
 .br
 .SH AUTHOR
 Nathan Rutman