Merge branch 'feature/upstream' into develop

1 files changed, 42 insertions, 15 deletions

diff --git a/doc/sane-gphoto2.man b/doc/sane-gphoto2.man
index 3e2a046..d98387e 100644
--- a/doc/sane-gphoto2.man
+++ b/doc/sane-gphoto2.man
@@ -11,9 +11,14 @@ This backend has only been tested with a handful of cameras so far.  Patches
 to support other models are welcome.
 .PP
 Because of the limited testing of this backend, it is commented out
-in @CONFIGDIR@/dll.conf by default.  Either the comment
+in
+.I @CONFIGDIR@/dll.conf
+by default.  Either the comment
 character must be removed or the backend must be called explicitly.
-E.g. `scanimage \-d gphoto2' or `xscanimage gphoto2'.
+E.g.
+.I "scanimage \-d gphoto2"
+or
+.IR "xscanimage gphoto2" .
 .SH "DEVICE NAMES"
 The current version of the backend only allows one camera to be
 connected.  The device name is always "0".
@@ -24,22 +29,32 @@ specify the characteristics of the camera to be used.   Resolutions
 (high resolution, low resolution, and thumbnail size) are
 required since they are needed by the sane frontends, but can't be obtained
 through the gphoto2 interface.  Valid ports and cameras can be obtained
-by "gphoto2 \-\-list\-cameras" and "gphoto2 \-\-list\-ports".
+by
+.I "gphoto2 \-\-list\-cameras"
+and
+.I "gphoto2 \-\-list\-ports".
 .PP
-The dumpinquiry line causes some information about the camera to
-be printed.
+The
+.B dumpinquiry
+line causes some information about the camera to be printed.
 .PP
 Empty lines and lines starting with a hash mark (#) are
 ignored.  A sample configuration file is shown below:
 .PP
-The "topfolder" line specifies the "fixed" part of the file path.  For
+The
+.B topfolder
+line specifies the "fixed" part of the file path.  For
 example, on the Kodak DC-240, files are stored in the directory
-/DCIM/100DC240.  The /DCIM portion is constant, but 100DC240 will
-change and must be read from the camera.  In this case, the
-line would read "topfolder=/DCIM"
+.IR /DCIM/100DC240.
+The
+.I /DCIM
+portion is constant, but 100DC240 will change and must be read from the camera.
+In this case, the line would read "topfolder=/DCIM"
 .PP
 Some cameras don't implement a file structure and store all pictures
-in the "/" directory.  This is indicated by setting "subdirs=0" with
+in the
+.I "/"
+directory.  This is indicated by setting "subdirs=0" with
 "topfolder=/"
 .PP
 .RS
@@ -80,13 +95,21 @@ 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
+.RI ( "." )
+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_GPHOTO2
 If the library was compiled with debugging support enabled, this
@@ -99,7 +122,9 @@ Set to 1, 2, or 3, to enable various levels of debugging within the
 gphoto2 libraries.
 
 .SH "SEE ALSO"
-sane(7)
+.BR sane (7)
+.BR scanimage (1)
+.BR xscanimage (1)
 
 .SH AUTHOR
 Peter S. Fales
@@ -112,6 +137,8 @@ Many, no doubt.
 .PP
 More general comments, suggestions, and inquiries about frontends
 or SANE should go to the SANE Developers mailing list
-(see http://www.sane\-project.org/mailing\-lists.html for details).
+(see
+.I http://www.sane\-project.org/mailing\-lists.html
+for details).
 You must be subscribed to the list, otherwise your mail won't be
 sent to the subscribers.