summaryrefslogtreecommitdiff
path: root/backend/pixma.conf.in
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-07-15 11:29:05 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-07-15 11:29:05 +0200
commit324a8a71bb7d9e4f8bc49b6bc47efaf9fb58282e (patch)
treebd2d48a139bfbe869f4f49359b63097931a45e7b /backend/pixma.conf.in
parent2ca8a81bd0d99fe4d75c229d0e988d8ef710285f (diff)
parent1edb02101a9306fc711cd422ed507d18165b1691 (diff)
Merge branch 'release/experimental/1.0.27-1_experimental1'experimental/1.0.27-1_experimental1
Diffstat (limited to 'backend/pixma.conf.in')
-rw-r--r--backend/pixma.conf.in15
1 files changed, 13 insertions, 2 deletions
diff --git a/backend/pixma.conf.in b/backend/pixma.conf.in
index a275b03..3f5c61a 100644
--- a/backend/pixma.conf.in
+++ b/backend/pixma.conf.in
@@ -1,5 +1,11 @@
# pixma.conf configuration for the sane pixma backend
#
+# bjnp-timeout=5000
+# Specify the timeout (in ms) to be used for all the folllowing
+# scanners.
+# May be specified multiple times.
+# The last value (if any) will be used for auto-detection
+#
# define URI's of scanners (one per line)
# This is only used for network scanners.
# normally scanners will be detected by sending a broadcast
@@ -8,7 +14,12 @@
#
# method must be bjnp
# port number can normally be left out, port 8612 is used as default
+# The timeout parameter sets a timeout value for the scanner on
+# the same line
# Example:
-# bjnp://myscanner.my.domain:8612
-# bjnp://printer-1.pheasant.org
+# bjnp://myscanner.my.domain:8612 // uses the default 1000ms timeout
+# bjnp-timeout=5000
+# bjnp://printer-1.pheasant.org // will use the 5000 ms timeout
+# bjnp://scanner.bad-network.org/timeout=1500 // timeout set to 1500 ms
+# bjnp-timeout=3000 // will be used for auto-detected scanners
#