diff options
Diffstat (limited to 'docs/smbdotconf/printing')
| -rw-r--r-- | docs/smbdotconf/printing/cupsoptions.xml | 4 | ||||
| -rw-r--r-- | docs/smbdotconf/printing/cupsserver.xml | 4 | ||||
| -rw-r--r-- | docs/smbdotconf/printing/defaultdevmode.xml | 2 | ||||
| -rw-r--r-- | docs/smbdotconf/printing/deleteprintercommand.xml | 12 | ||||
| -rw-r--r-- | docs/smbdotconf/printing/loadprinters.xml | 2 | ||||
| -rw-r--r-- | docs/smbdotconf/printing/lpresumecommand.xml | 6 | ||||
| -rw-r--r-- | docs/smbdotconf/printing/os2drivermap.xml | 2 | ||||
| -rw-r--r-- | docs/smbdotconf/printing/printable.xml | 3 | ||||
| -rw-r--r-- | docs/smbdotconf/printing/printcapname.xml | 2 | ||||
| -rw-r--r-- | docs/smbdotconf/printing/printcommand.xml | 9 | ||||
| -rw-r--r-- | docs/smbdotconf/printing/printername.xml | 20 | ||||
| -rw-r--r-- | docs/smbdotconf/printing/queueresumecommand.xml | 3 |
12 files changed, 35 insertions, 34 deletions
diff --git a/docs/smbdotconf/printing/cupsoptions.xml b/docs/smbdotconf/printing/cupsoptions.xml index ce3eb83c7e..6bb3782dc3 100644 --- a/docs/smbdotconf/printing/cupsoptions.xml +++ b/docs/smbdotconf/printing/cupsoptions.xml @@ -4,8 +4,8 @@ print="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> <description> - <para>This parameter is only applicable if <link - linkend="PRINTING"><parameter moreinfo="none">printing</parameter></link> is + <para> + 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> diff --git a/docs/smbdotconf/printing/cupsserver.xml b/docs/smbdotconf/printing/cupsserver.xml index ecd2958e61..045d260277 100644 --- a/docs/smbdotconf/printing/cupsserver.xml +++ b/docs/smbdotconf/printing/cupsserver.xml @@ -4,9 +4,7 @@ print="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> <description> - <para>This parameter is only applicable if <link - linkend="PRINTING"><parameter moreinfo="none">printing</parameter></link> 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 diff --git a/docs/smbdotconf/printing/defaultdevmode.xml b/docs/smbdotconf/printing/defaultdevmode.xml index 971c507e5a..fba5b898bb 100644 --- a/docs/smbdotconf/printing/defaultdevmode.xml +++ b/docs/smbdotconf/printing/defaultdevmode.xml @@ -4,7 +4,7 @@ print="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> <description> - <para>This parameter is only applicable to <link linkend="PRINTOK">printable</link> services. + <para>This parameter is only applicable to <smbconfoption name="printable"/> services. When smbd is serving Printer Drivers to Windows NT/2k/XP clients, each printer on the Samba server has a Device Mode which defines things such as paper size and orientation and duplex settings. The device mode can only correctly be diff --git a/docs/smbdotconf/printing/deleteprintercommand.xml b/docs/smbdotconf/printing/deleteprintercommand.xml index ed24ff4048..1f9a91656d 100644 --- a/docs/smbdotconf/printing/deleteprintercommand.xml +++ b/docs/smbdotconf/printing/deleteprintercommand.xml @@ -10,17 +10,17 @@ DeletePrinter() RPC call.</para> <para>For a Samba host this means that the printer must be - physically deleted from underlying printing system. The <parameter moreinfo="none"> - deleteprinter command</parameter> defines a script to be run which + physically deleted from underlying printing system. The + <smbconfoption name="deleteprinter command"/> defines a script to be run which will perform the necessary operations for removing the printer from the print system and from <filename moreinfo="none">smb.conf</filename>. </para> - <para>The <parameter moreinfo="none">deleteprinter command</parameter> is - automatically called with only one parameter: <parameter moreinfo="none"> - "printer name"</parameter>.</para> + <para>The <smbcomfoption name="deleteprinter command"/> is + automatically called with only one parameter: <smbconfoption name="printer name"/>. + </para> - <para>Once the <parameter moreinfo="none">deleteprinter command</parameter> has + <para>Once the <smbconfoption name="deleteprinter command"/> has 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 diff --git a/docs/smbdotconf/printing/loadprinters.xml b/docs/smbdotconf/printing/loadprinters.xml index 63b110dadf..b136505009 100644 --- a/docs/smbdotconf/printing/loadprinters.xml +++ b/docs/smbdotconf/printing/loadprinters.xml @@ -6,7 +6,7 @@ <description> <para>A boolean variable that controls whether all printers in the printcap will be loaded for browsing by default. - See the <link linkend="PRINTERSSECT">printers</link> section for + See the <smbconfoption name="printers"/> section for more details.</para> </description> diff --git a/docs/smbdotconf/printing/lpresumecommand.xml b/docs/smbdotconf/printing/lpresumecommand.xml index 4a703057de..dc807f1f71 100644 --- a/docs/smbdotconf/printing/lpresumecommand.xml +++ b/docs/smbdotconf/printing/lpresumecommand.xml @@ -10,8 +10,7 @@ <para>This command should be a program or script which takes a printer name and job number to resume the print job. See - also the <link linkend="LPPAUSECOMMAND"><parameter moreinfo="none">lppause command - </parameter></link> parameter.</para> + also the <smbconfoption name="lppause command"/> parameter.</para> <para>If a <parameter moreinfo="none">%p</parameter> is given then the printer name is put in its place. A <parameter moreinfo="none">%j</parameter> is replaced with @@ -21,8 +20,7 @@ in the <parameter moreinfo="none">lpresume command</parameter> as the PATH may not be available to the server.</para> - <para>See also the <link linkend="PRINTING"><parameter moreinfo="none">printing - </parameter></link> parameter.</para> + <para>See also the <smbconfoption name="printing"/> parameter.</para> <para>Default: Currently no default value is given to this string, unless the value of the <parameter moreinfo="none">printing</parameter> diff --git a/docs/smbdotconf/printing/os2drivermap.xml b/docs/smbdotconf/printing/os2drivermap.xml index ac49babd40..d646071e3a 100644 --- a/docs/smbdotconf/printing/os2drivermap.xml +++ b/docs/smbdotconf/printing/os2drivermap.xml @@ -15,7 +15,7 @@ LaserJet 5L</command>.</para> <para>The need for the file is due to the printer driver namespace - problem described in <link linkend="printing"/>. For more details on OS/2 clients, please + problem described in <link linkend="classicalprinting"/>. For more details on OS/2 clients, please refer to <link linkend="Other-Clients"/>.</para> </description> <value type="default"/> diff --git a/docs/smbdotconf/printing/printable.xml b/docs/smbdotconf/printing/printable.xml index b8991ae9ad..73aa533ed3 100644 --- a/docs/smbdotconf/printing/printable.xml +++ b/docs/smbdotconf/printing/printable.xml @@ -11,8 +11,7 @@ <para>Note that a printable service will ALWAYS allow writing to the service path (user privileges permitting) via the spooling - of print data. The <link linkend="READONLY"><parameter moreinfo="none">read only - </parameter></link> parameter controls only non-printing access to + of print data. The <smbconfoption name="read only"/> parameter controls only non-printing access to the resource.</para> </description> <value type="default">no</value> diff --git a/docs/smbdotconf/printing/printcapname.xml b/docs/smbdotconf/printing/printcapname.xml index c0d228896e..7ade8881b6 100644 --- a/docs/smbdotconf/printing/printcapname.xml +++ b/docs/smbdotconf/printing/printcapname.xml @@ -13,7 +13,7 @@ <para>To use the CUPS printing interface set <command moreinfo="none">printcap name = cups </command>. This should be supplemented by an addtional setting - <link linkend="PRINTING">printing = cups</link> in the [global] + <smbconfoption name="printing">cups</smbconfoption> in the [global] section. <command moreinfo="none">printcap name = cups</command> will use the "dummy" printcap created by CUPS, as specified in your CUPS configuration file. diff --git a/docs/smbdotconf/printing/printcommand.xml b/docs/smbdotconf/printing/printcommand.xml index e17fb7ae2f..461d6de8e3 100644 --- a/docs/smbdotconf/printing/printcommand.xml +++ b/docs/smbdotconf/printing/printcommand.xml @@ -47,8 +47,7 @@ <para>Note that printing may fail on some UNIXes from the <constant>nobody</constant> account. If this happens then create - an alternative guest account that can print and set the <link linkend="GUESTACCOUNT"> - <parameter moreinfo="none">guest account</parameter></link> + an alternative guest account that can print and set the <smbconfoption name="guest account"/> in the [global] section.</para> <para>You can form quite complex print commands by realizing @@ -61,8 +60,8 @@ <para>You may have to vary this command considerably depending on how you normally print files on your system. The default for - the parameter varies depending on the setting of the <link linkend="PRINTING"> - <parameter moreinfo="none">printing</parameter></link> parameter.</para> + the parameter varies depending on the setting of the <smbconfoption name="printing"/> + parameter.</para> <para>Default: For <command moreinfo="none">printing = BSD, AIX, QNX, LPRNG or PLP :</command></para> @@ -75,7 +74,7 @@ <para><command moreinfo="none">print command = lp -d%p -s %s; rm %s</command></para> <para>For printing = CUPS : If SAMBA is compiled against - libcups, then <link linkend="PRINTING">printcap = cups</link> + libcups, then <smbconfoption name="printcap">cups</smbconfoption> uses the CUPS API to submit jobs, etc. Otherwise it maps to the System V commands with the -oraw option for printing, i.e. it diff --git a/docs/smbdotconf/printing/printername.xml b/docs/smbdotconf/printing/printername.xml index ed55a9bb70..fad127cad1 100644 --- a/docs/smbdotconf/printing/printername.xml +++ b/docs/smbdotconf/printing/printername.xml @@ -5,14 +5,22 @@ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> <synonym>printer</synonym> <description> - <para>This parameter specifies the name of the printer - to which print jobs spooled through a printable service will be sent.</para> + <para> + This parameter specifies the name of the printer to which print jobs spooled through a printable service + will be sent. + </para> - <para>If specified in the [global] section, the printer - name given will be used for any printable service that does - not have its own printer name specified.</para> + <para> + If specified in the [global] section, the printer name given will be used for any printable service that + does not have its own printer name specified. + </para> + + <para> + The default value of the <smbconfoption name="printer name"/> may be <literal>lp</literal> on many + systems. + </para> </description> -<value type="default"><comment>none (but may be <constant>lp</constant> on many systems)</comment></value> +<value type="default">none</value> <value type="example">laserwriter</value> </samba:parameter> diff --git a/docs/smbdotconf/printing/queueresumecommand.xml b/docs/smbdotconf/printing/queueresumecommand.xml index 1a878c2098..f6593c2289 100644 --- a/docs/smbdotconf/printing/queueresumecommand.xml +++ b/docs/smbdotconf/printing/queueresumecommand.xml @@ -7,8 +7,7 @@ <para>This parameter specifies the command to be executed on the server host in order to resume the printer queue. It is the command to undo the behavior that is caused by the - previous parameter (<link linkend="QUEUEPAUSECOMMAND"><parameter moreinfo="none"> - queuepause command</parameter></link>).</para> + previous parameter (<smbconfoption name="queuepause command"/>).</para> <para>This command should be a program or script which takes a printer name as its only parameter and resumes the printer queue, |