summaryrefslogtreecommitdiff
path: root/docs-xml/smbdotconf/printing
diff options
context:
space:
mode:
Diffstat (limited to 'docs-xml/smbdotconf/printing')
-rw-r--r--docs-xml/smbdotconf/printing/cupsconnectiontimeout.xml20
-rw-r--r--docs-xml/smbdotconf/printing/cupstimeout.xml17
2 files changed, 20 insertions, 17 deletions
diff --git a/docs-xml/smbdotconf/printing/cupsconnectiontimeout.xml b/docs-xml/smbdotconf/printing/cupsconnectiontimeout.xml
new file mode 100644
index 0000000000..1c7df15c3c
--- /dev/null
+++ b/docs-xml/smbdotconf/printing/cupsconnectiontimeout.xml
@@ -0,0 +1,20 @@
+<samba:parameter name="cups connection timeout"
+ context="G"
+ type="integer"
+ print="1"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+ <para>
+ This parameter is only applicable if <smbconfoption name="printing"/> is set to <constant>cups</constant>.
+ </para>
+
+ <para>
+ If set, this option specifies the number of seconds that smbd will wait
+ whilst trying to contact to the CUPS server. The connection will fail
+ if it takes longer than this number of seconds.
+ </para>
+</description>
+
+<value type="default">30</value>
+<value type="example">60</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/printing/cupstimeout.xml b/docs-xml/smbdotconf/printing/cupstimeout.xml
deleted file mode 100644
index 727ccce67b..0000000000
--- a/docs-xml/smbdotconf/printing/cupstimeout.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<samba:parameter name="cups timeout"
- context="G"
- type="integer"
- print="1"
- advanced="1"
- xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
-
-<description>
- <para>
- This parameter determines the timeout for connections to a CUPS server
- in seconds.
- </para>
-</description>
-
-<value type="default">30</value>
-<value type="example">cups timeout = 10</value>
-</samba:parameter>