diff options
Diffstat (limited to 'docs/smbdotconf/printing')
| -rw-r--r-- | docs/smbdotconf/printing/cupsoptions.xml | 11 | ||||
| -rw-r--r-- | docs/smbdotconf/printing/cupsserver.xml | 10 | ||||
| -rw-r--r-- | docs/smbdotconf/printing/deleteprintercommand.xml | 2 | ||||
| -rw-r--r-- | docs/smbdotconf/printing/enumportscommand.xml | 2 | ||||
| -rw-r--r-- | docs/smbdotconf/printing/loadprinters.xml | 2 | ||||
| -rw-r--r-- | docs/smbdotconf/printing/lppausecommand.xml | 8 | ||||
| -rw-r--r-- | docs/smbdotconf/printing/lpresumecommand.xml | 2 | ||||
| -rw-r--r-- | docs/smbdotconf/printing/lprmcommand.xml | 4 | ||||
| -rw-r--r-- | docs/smbdotconf/printing/maxreportedprintjobs.xml | 11 | ||||
| -rw-r--r-- | docs/smbdotconf/printing/os2drivermap.xml | 8 |
10 files changed, 35 insertions, 25 deletions
diff --git a/docs/smbdotconf/printing/cupsoptions.xml b/docs/smbdotconf/printing/cupsoptions.xml index 6bb3782dc3..180c52bf7d 100644 --- a/docs/smbdotconf/printing/cupsoptions.xml +++ b/docs/smbdotconf/printing/cupsoptions.xml @@ -5,17 +5,20 @@ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> <description> <para> - This parameter is only applicable if <smbconfoption name="printing"/> is + This parameter is only applicable if <smbconfoption name="printing"/> is set to <constant>cups</constant>. Its value is a free form string of options passed directly to the cups library. </para> - <para>You can pass any generic print option known to CUPS (as listed + <para> + You can pass any generic print option known to CUPS (as listed in the CUPS "Software Users' Manual"). You can also pass any printer specific option (as listed in "lpoptions -d printername -l") - valid for the target queue.</para> + valid for the target queue. + </para> - <para>You should set this parameter to <constant>raw</constant> if your CUPS server + <para> + You should set this parameter to <constant>raw</constant> if your CUPS server <filename>error_log</filename> file contains messages such as "Unsupported format 'application/octet-stream'" when printing from a Windows client through Samba. It is no longer necessary to enable diff --git a/docs/smbdotconf/printing/cupsserver.xml b/docs/smbdotconf/printing/cupsserver.xml index 045d260277..e00707c824 100644 --- a/docs/smbdotconf/printing/cupsserver.xml +++ b/docs/smbdotconf/printing/cupsserver.xml @@ -4,12 +4,14 @@ 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> + This parameter is only applicable if <smbconfoption name="printing"/> is set to <constant>cups</constant>. </para> - <para>If set, this option overrides the ServerName option in the CUPS - <filename>client.conf</filename>. This is necessary if you have virtual - samba servers that connect to different CUPS daemons.</para> + <para> + If set, this option overrides the ServerName option in the CUPS <filename>client.conf</filename>. This is + necessary if you have virtual samba servers that connect to different CUPS daemons. + </para> </description> <value type="default">""</value> diff --git a/docs/smbdotconf/printing/deleteprintercommand.xml b/docs/smbdotconf/printing/deleteprintercommand.xml index 5fc01edc57..b48ab5700d 100644 --- a/docs/smbdotconf/printing/deleteprintercommand.xml +++ b/docs/smbdotconf/printing/deleteprintercommand.xml @@ -24,7 +24,7 @@ been executed, <command moreinfo="none">smbd</command> will reparse the <filename moreinfo="none"> smb.conf</filename> to associated printer no longer exists. If the sharename is still valid, then <command moreinfo="none">smbd -</command> will return an ACCESS_DENIED error to the client.</para> + </command> will return an ACCESS_DENIED error to the client.</para> </description> <related>addprinter command</related> diff --git a/docs/smbdotconf/printing/enumportscommand.xml b/docs/smbdotconf/printing/enumportscommand.xml index 0a5178ea03..41db739544 100644 --- a/docs/smbdotconf/printing/enumportscommand.xml +++ b/docs/smbdotconf/printing/enumportscommand.xml @@ -17,7 +17,7 @@ can define <parameter moreinfo="none">enumports command</parameter> to point to a program which should generate a list of ports, one per line, to standard output. This listing will then be used in response - to the level 1 and 2 EnumPorts() RPC.</para> + to the level 1 and 2 EnumPorts() RPC.</para> </description> <value type="default"></value> diff --git a/docs/smbdotconf/printing/loadprinters.xml b/docs/smbdotconf/printing/loadprinters.xml index b136505009..7e40ebee18 100644 --- a/docs/smbdotconf/printing/loadprinters.xml +++ b/docs/smbdotconf/printing/loadprinters.xml @@ -7,7 +7,7 @@ <para>A boolean variable that controls whether all printers in the printcap will be loaded for browsing by default. See the <smbconfoption name="printers"/> section for - more details.</para> + more details.</para> </description> <value type="default">yes</value> diff --git a/docs/smbdotconf/printing/lppausecommand.xml b/docs/smbdotconf/printing/lppausecommand.xml index f42f4cc4b2..0bb66226f2 100644 --- a/docs/smbdotconf/printing/lppausecommand.xml +++ b/docs/smbdotconf/printing/lppausecommand.xml @@ -29,7 +29,11 @@ <related>printing</related> <value type="default"><comment>Currently no default value is given to - this string, unless the value of the <parameter moreinfo="none">printing</parameter> - 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> + 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> <value type="example">/usr/bin/lpalt %p-%j -p0</value> </samba:parameter> diff --git a/docs/smbdotconf/printing/lpresumecommand.xml b/docs/smbdotconf/printing/lpresumecommand.xml index dc807f1f71..97f556e2ca 100644 --- a/docs/smbdotconf/printing/lpresumecommand.xml +++ b/docs/smbdotconf/printing/lpresumecommand.xml @@ -29,7 +29,7 @@ <para><command moreinfo="none">lp -i %p-%j -H resume</command></para> <para>or if the value of the <parameter moreinfo="none">printing</parameter> parameter - is <constant>SOFTQ</constant>, then the default is:</para> + is <constant>SOFTQ</constant>, then the default is:</para> <para><command moreinfo="none">qstat -s -j%j -r</command></para> </description> diff --git a/docs/smbdotconf/printing/lprmcommand.xml b/docs/smbdotconf/printing/lprmcommand.xml index f98825348a..0b8375f94d 100644 --- a/docs/smbdotconf/printing/lprmcommand.xml +++ b/docs/smbdotconf/printing/lprmcommand.xml @@ -20,13 +20,13 @@ <para> Examples of use are: -<screen> +<programlisting> lprm command = /usr/bin/lprm -P%p %j or lprm command = /usr/bin/cancel %p-%j -</screen> +</programlisting> </para> </description> diff --git a/docs/smbdotconf/printing/maxreportedprintjobs.xml b/docs/smbdotconf/printing/maxreportedprintjobs.xml index 78639670d7..34a5eb71c1 100644 --- a/docs/smbdotconf/printing/maxreportedprintjobs.xml +++ b/docs/smbdotconf/printing/maxreportedprintjobs.xml @@ -4,11 +4,12 @@ print="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> <description> - <para>This parameter limits the maximum number of - jobs displayed in a port monitor for Samba printer queue at any given - moment. If this number is exceeded, the excess jobs will not be shown. - A value of zero means there is no limit on the number of print - jobs reported.</para> + <para> + This parameter limits the maximum number of jobs displayed in a port monitor for + Samba printer queue at any given moment. If this number is exceeded, the excess + jobs will not be shown. A value of zero means there is no limit on the number of + print jobs reported. + </para> </description> <related>max print jobs</related> diff --git a/docs/smbdotconf/printing/os2drivermap.xml b/docs/smbdotconf/printing/os2drivermap.xml index a7e59b786b..4243ecab15 100644 --- a/docs/smbdotconf/printing/os2drivermap.xml +++ b/docs/smbdotconf/printing/os2drivermap.xml @@ -15,10 +15,10 @@ LaserJet 5L</command>.</para> <para> - The need for the file is due to the printer driver namespace problem described in <link - linkend="classicalprinting">the chapter on Classical Printing in the book Samba3-HOWTO</link>. For more - details on OS/2 clients, please refer to <link linkend="Other-Clients"/>. - </para> + The need for the file is due to the printer driver namespace problem described in <link + linkend="classicalprinting">the chapter on Classical Printing in the book Samba3-HOWTO</link>. For more + details on OS/2 clients, please refer to <link linkend="Other-Clients"/>. + </para> </description> <value type="default"/> </samba:parameter> |