summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2014-01-09 14:22:06 +1300
committerAndrew Bartlett <abartlet@samba.org>2014-01-28 17:26:40 +1300
commit92b0344e6847af6d8fda3e63f1d6c8e34d74da6f (patch)
tree4e4be290ce0f745ac50095247b45d17320d2bca2
parentb9678e5b0f78c996c03c046688fb0f7087d06692 (diff)
downloadsamba-92b0344e6847af6d8fda3e63f1d6c8e34d74da6f.tar.gz
samba-92b0344e6847af6d8fda3e63f1d6c8e34d74da6f.tar.xz
samba-92b0344e6847af6d8fda3e63f1d6c8e34d74da6f.zip
docs: explain where the defaults for these printing parameters comes from
The use of <comment> allows the XML parser in the tests to skip the descriptive text. Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Alexander Bokovoy <ab@samba.org>
-rw-r--r--docs-xml/smbdotconf/printing/lppausecommand.xml13
-rw-r--r--docs-xml/smbdotconf/printing/lpqcommand.xml2
-rw-r--r--docs-xml/smbdotconf/printing/lpresumecommand.xml1
-rw-r--r--docs-xml/smbdotconf/printing/lprmcommand.xml2
-rw-r--r--docs-xml/smbdotconf/printing/printing.xml6
-rw-r--r--docs-xml/smbdotconf/printing/queuepausecommand.xml1
-rw-r--r--docs-xml/smbdotconf/printing/queueresumecommand.xml2
7 files changed, 17 insertions, 10 deletions
diff --git a/docs-xml/smbdotconf/printing/lppausecommand.xml b/docs-xml/smbdotconf/printing/lppausecommand.xml
index 0bb66226f2d..a165375e042 100644
--- a/docs-xml/smbdotconf/printing/lppausecommand.xml
+++ b/docs-xml/smbdotconf/printing/lppausecommand.xml
@@ -24,16 +24,19 @@
<para>Note that it is good practice to include the absolute path
in the lppause command as the PATH may not be available to the server.</para>
-</description>
-
-<related>printing</related>
-<value type="default"><comment>Currently no default value is given to
+ <para>Currently no default value is given to
this string, unless the value of the <smbconfoption name="printing"/>
parameter is <constant>SYSV</constant>, in which case the default is :
<command moreinfo="none">lp -i %p-%j -H hold</command> or if the value of the
<parameter moreinfo="none">printing</parameter> parameter is
<constant>SOFTQ</constant>, then the default is:
- <command moreinfo="none">qstat -s -j%j -h</command>. </comment></value>
+ <command moreinfo="none">qstat -s -j%j -h</command>. </para>
+
+</description>
+
+<related>printing</related>
+
+<value type="default"><comment>determined by printing parameter</comment></value>
<value type="example">/usr/bin/lpalt %p-%j -p0</value>
</samba:parameter>
diff --git a/docs-xml/smbdotconf/printing/lpqcommand.xml b/docs-xml/smbdotconf/printing/lpqcommand.xml
index 8c06b758985..1e021399817 100644
--- a/docs-xml/smbdotconf/printing/lpqcommand.xml
+++ b/docs-xml/smbdotconf/printing/lpqcommand.xml
@@ -38,5 +38,5 @@
<related>printing</related>
<value type="example">/usr/bin/lpq -P%p</value>
-<value type="default"></value>
+<value type="default"><comment>determined by printing parameter</comment></value>
</samba:parameter>
diff --git a/docs-xml/smbdotconf/printing/lpresumecommand.xml b/docs-xml/smbdotconf/printing/lpresumecommand.xml
index 706a999b1f7..ef7639cbfa4 100644
--- a/docs-xml/smbdotconf/printing/lpresumecommand.xml
+++ b/docs-xml/smbdotconf/printing/lpresumecommand.xml
@@ -34,5 +34,6 @@
<para><command moreinfo="none">qstat -s -j%j -r</command></para>
</description>
+<value type="default"><comment>determined by printing parameter</comment></value>
<value type="example">/usr/bin/lpalt %p-%j -p2</value>
</samba:parameter>
diff --git a/docs-xml/smbdotconf/printing/lprmcommand.xml b/docs-xml/smbdotconf/printing/lprmcommand.xml
index 0b8375f94d9..7ce99640b73 100644
--- a/docs-xml/smbdotconf/printing/lprmcommand.xml
+++ b/docs-xml/smbdotconf/printing/lprmcommand.xml
@@ -32,5 +32,5 @@ lprm command = /usr/bin/cancel %p-%j
</description>
<related>printing</related>
-<value type="default"> determined by printing parameter</value>
+<value type="default"><comment>determined by printing parameter</comment></value>
</samba:parameter>
diff --git a/docs-xml/smbdotconf/printing/printing.xml b/docs-xml/smbdotconf/printing/printing.xml
index eb5925f740f..a1a21789402 100644
--- a/docs-xml/smbdotconf/printing/printing.xml
+++ b/docs-xml/smbdotconf/printing/printing.xml
@@ -36,7 +36,9 @@
<para>See also the discussion in the <link linkend="PRINTERSSECT">
[printers]</link> section.</para>
+
+ <para>See <command moreinfo="none">testparm -v.</command> for the default
+ value on your system</para>
</description>
-<value type="default">Depends on the operating system, see
-<command moreinfo="none">testparm -v.</command></value>
+<value type="default"><comment>Depends on the operating system</comment></value>
</samba:parameter>
diff --git a/docs-xml/smbdotconf/printing/queuepausecommand.xml b/docs-xml/smbdotconf/printing/queuepausecommand.xml
index aee822ea804..21b56c96654 100644
--- a/docs-xml/smbdotconf/printing/queuepausecommand.xml
+++ b/docs-xml/smbdotconf/printing/queuepausecommand.xml
@@ -24,5 +24,6 @@
server.</para>
</description>
+<value type="default"><comment>determined by printing parameter</comment></value>
<value type="example">disable %p</value>
</samba:parameter>
diff --git a/docs-xml/smbdotconf/printing/queueresumecommand.xml b/docs-xml/smbdotconf/printing/queueresumecommand.xml
index f6593c22899..749bb02c658 100644
--- a/docs-xml/smbdotconf/printing/queueresumecommand.xml
+++ b/docs-xml/smbdotconf/printing/queueresumecommand.xml
@@ -26,6 +26,6 @@
server.</para>
</description>
-<value type="default"></value>
+<value type="default"><comment>determined by printing parameter</comment></value>
<value type="example">enable %p</value>
</samba:parameter>