Merge branch 'feature/upstream' into develop

1 files changed, 20 insertions, 8 deletions

diff --git a/doc/sane-net.man b/doc/sane-net.man
index 5cf0481..0f62684 100644
--- a/doc/sane-net.man
+++ b/doc/sane-net.man
@@ -44,10 +44,10 @@ isn't one of the options listed below will be treated as an host name.
 .TP
 .B connect_timeout = nsecs
 Timeout (in seconds) for the initial connection to the
-.I saned
+.BR saned (8)
 server. This will prevent the backend from blocking for several
 minutes trying to connect to an unresponsive
-.I saned
+.BR saned (8)
 host (network outage, host down, ...). The environment variable
 .B SANE_NET_TIMEOUT
 can also be used to specify the timeout at runtime.
@@ -123,13 +123,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_NET_HOSTS
 A colon-separated list of host names or IP addresses to be contacted by this
@@ -137,7 +143,7 @@ backend.
 .TP
 .B SANE_NET_TIMEOUT
 Number of seconds to wait for a response from the
-.I saned
+.BR saned (8)
 server for the initial connection request.
 .TP
 .B SANE_DEBUG_NET
@@ -146,9 +152,15 @@ environment variable controls the debug level for this backend.  E.g.,
 a value of 128 requests all debug output to be printed.  Smaller
 levels reduce verbosity.
 .SH BUGS
-If saned has timed out, the net backend may loop with authorization requests.
+If
+.BR saned (8)
+has timed out, the net backend may loop with authorization requests.
+
 .SH "SEE ALSO"
-sane(7), saned(8), sane\-dll(5), scanimage(1)
+.BR sane (7),
+.BR saned (8),
+.BR sane\-dll (5),
+.BR scanimage (1)
 
 .I http://www.penguin-breeder.org/?page=sane\-net
 .SH AUTHOR