From 5357c5e6e30035fa8d7a552675aaa355f7a27bb4 Mon Sep 17 00:00:00 2001 From: John Terpstra Date: Wed, 6 Jul 2005 21:23:58 +0000 Subject: Removal of CRUFT. 50 lashes to those who created CRUFT. Argh. (This used to be commit 555e174de5d390cdc744b8bcbecbeccc31079a23) --- docs/smbdotconf/printing/cupsoptions.xml | 4 ++-- docs/smbdotconf/printing/cupsserver.xml | 4 +--- docs/smbdotconf/printing/defaultdevmode.xml | 2 +- docs/smbdotconf/printing/deleteprintercommand.xml | 12 ++++++------ docs/smbdotconf/printing/loadprinters.xml | 2 +- docs/smbdotconf/printing/lpresumecommand.xml | 6 ++---- docs/smbdotconf/printing/os2drivermap.xml | 2 +- docs/smbdotconf/printing/printable.xml | 3 +-- docs/smbdotconf/printing/printcapname.xml | 2 +- docs/smbdotconf/printing/printcommand.xml | 9 ++++----- docs/smbdotconf/printing/printername.xml | 20 ++++++++++++++------ docs/smbdotconf/printing/queueresumecommand.xml | 3 +-- 12 files changed, 35 insertions(+), 34 deletions(-) (limited to 'docs/smbdotconf/printing') 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"> - This parameter is only applicable if printing is + + This parameter is only applicable if is set to cups. Its value is a free form string of options passed directly to the cups library. 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"> - This parameter is only applicable if printing is - set to cups. + This parameter is only applicable if is set to cups. 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"> - This parameter is only applicable to printable services. + This parameter is only applicable to 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. For a Samba host this means that the printer must be - physically deleted from underlying printing system. The - deleteprinter command defines a script to be run which + physically deleted from underlying printing system. The + defines a script to be run which will perform the necessary operations for removing the printer from the print system and from smb.conf. - The deleteprinter command is - automatically called with only one parameter: - "printer name". + The is + automatically called with only one parameter: . + - Once the deleteprinter command has + Once the has been executed, smbd will reparse the smb.conf to associated printer no longer exists. If the sharename is still valid, then 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 @@ A boolean variable that controls whether all printers in the printcap will be loaded for browsing by default. - See the printers section for + See the section for more details. 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 @@ This command should be a program or script which takes a printer name and job number to resume the print job. See - also the lppause command - parameter. + also the parameter. If a %p is given then the printer name is put in its place. A %j is replaced with @@ -21,8 +20,7 @@ in the lpresume command as the PATH may not be available to the server. - See also the printing - parameter. + See also the parameter. Default: Currently no default value is given to this string, unless the value of the printing 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. The need for the file is due to the printer driver namespace - problem described in . For more details on OS/2 clients, please + problem described in . For more details on OS/2 clients, please refer to . 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 @@ Note that a printable service will ALWAYS allow writing to the service path (user privileges permitting) via the spooling - of print data. The read only - parameter controls only non-printing access to + of print data. The parameter controls only non-printing access to the resource. no 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 @@ To use the CUPS printing interface set printcap name = cups . This should be supplemented by an addtional setting - printing = cups in the [global] + cups in the [global] section. printcap name = cups 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 @@ Note that printing may fail on some UNIXes from the nobody account. If this happens then create - an alternative guest account that can print and set the - guest account + an alternative guest account that can print and set the in the [global] section. You can form quite complex print commands by realizing @@ -61,8 +60,8 @@ 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 - printing parameter. + the parameter varies depending on the setting of the + parameter. Default: For printing = BSD, AIX, QNX, LPRNG or PLP : @@ -75,7 +74,7 @@ print command = lp -d%p -s %s; rm %s For printing = CUPS : If SAMBA is compiled against - libcups, then printcap = cups + libcups, then cups 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"> printer - This parameter specifies the name of the printer - to which print jobs spooled through a printable service will be sent. + + This parameter specifies the name of the printer to which print jobs spooled through a printable service + will be sent. + - 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. + + 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. + + + + The default value of the may be lp on many + systems. + -none (but may be lp on many systems) +none laserwriter 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 @@ 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 ( - queuepause command). + previous parameter (). This command should be a program or script which takes a printer name as its only parameter and resumes the printer queue, -- cgit