Merge changes from CUPS 1.5svn-r9313.

[thirdparty/cups.git] / man / lpadmin.man

diff --git a/man/lpadmin.man b/man/lpadmin.man
index cf34cd47418f75878e0106a056492eaf06a7cb7a..694f0b8175f14e56f2798050fb63531d8a56319f 100644 (file)
--- a/man/lpadmin.man
+++ b/man/lpadmin.man
@@ -3,7 +3,7 @@
 .\"
 .\"   lpadmin man page for the Common UNIX Printing System (CUPS).
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2010 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -12,7 +12,7 @@
 .\"   which should have been included with this file.  If this file is
 .\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.TH lpadmin 8 "CUPS" "3 November 2008" "Apple Inc."
+.TH lpadmin 8 "CUPS" "1 September 2010" "Apple Inc."
 .SH NAME
 lpadmin \- configure cups printers and classes
 .SH SYNOPSIS
@@ -30,7 +30,7 @@ lpadmin \- configure cups printers and classes
 ] [ -h
 .I server[:port]
 ] -p
-.I printer option(s)
+.I destination option(s)
 .br
 .B lpadmin
 [ -E ] [-U
@@ -55,7 +55,7 @@ destination unless the user specifies otherwise with the
 \fIlpoptions(1)\fR command.
 .LP
 The second form of the command (\fI-p\fR) configures the named
-printer.  The additional options are described below.
+printer or class.  The additional options are described below.
 .LP
 The third form of the command (\fI-x\fR) deletes the printer or
 class \fIdestination\fR. Any jobs that are pending for the
@@ -78,8 +78,9 @@ and is intended for providing support for legacy printer drivers.
 .TP 5
 -m model
 .br
-Sets a standard System V interface script or PPD file from the
-\fImodel\fR directory.
+Sets a standard System V interface script or PPD file for the printer from the
+\fImodel\fR directory or using one of the driver interfaces. Use the \fI-m\fR
+option with the \fIlpinfo(8)\fR command to get a list of supported models.
 .TP 5
 -o job-k-limit=value
 .br
@@ -105,13 +106,12 @@ Sets the default banner page(s) to use for print jobs.
 .TP 5
 -o name=value
 .br
-Sets a PPD option for the printer. PPD options can be
-listed using the \fI-l\fR option with the \fIlpoptions(1)\fR
-command.
+Sets a PPD option for the printer. PPD options can be listed using the \fI-l\fR
+option with the \fIlpoptions(1)\fR command.
 .TP 5
 -o name-default=value
 .br
-Sets a default server-side option for the printer. Any print-time
+Sets a default server-side option for the destination. Any print-time
 option can be defaulted, e.g. "-o cpi-default=17" to set the default
 "cpi" option value to 17.
 .TP 5
@@ -125,20 +125,21 @@ specified port monitor must be listed in the printer's PPD file.
 .br
 Sets the error policy to be used when the printer backend is 
 unable to send the job to the printer. The name must be one of 
-"abort-job", "retry-job" or "stop-printer". The default error 
-policy is "stop-printer".
+"abort-job", "retry-job", "retry-current-job", or "stop-printer". The default
+error policy is "stop-printer" for printers and "retry-current-job" for
+classes.
 .TP 5
 -o printer-is-shared=true/false
 .br
-Sets the printer to shared/published or unshared/unpublished.
-Shared/published printers are publically announced by the server
+Sets the destination to shared/published or unshared/unpublished.
+Shared/published destinations are publically announced by the server
 on the LAN based on the browsing configuration in
-\fBcupsd.conf\fR, while unshared/unpublished printers are not
+\fBcupsd.conf\fR, while unshared/unpublished destinations are not
 announced. The default value is "true".
 .TP 5
 -o printer-op-policy=name
 .br
-Sets the IPP operation policy associated with the printer. The
+Sets the IPP operation policy associated with the destination. The
 name must be defined in the \fBcupsd.conf\fR in a Policy section.
 The default operation policy is "default".
 .TP 5
@@ -155,7 +156,7 @@ resulting class becomes empty it is removed.
 .TP 5
 -u deny:none
 .br
-Sets user-level access control on a printer. Names starting with
+Sets user-level access control on a destination. Names starting with
 "@" are interpreted as UNIX groups. The latter two forms turn
 user-level access control off.
 .TP 5
@@ -163,21 +164,21 @@ user-level access control off.
 .br
 Sets the \fIdevice-uri\fR attribute of the printer queue.  If
 \fIdevice-uri\fR is a filename it is automatically converted to
-the form \fIfile:///file/name\fR. Use the \fIlpinfo(8)\fR command
-to get a list of supported device URIs and schemes.
+the form \fIfile:///file/name\fR. Use the \fI-v\fR option with the
+\fIlpinfo(8)\fR command to get a list of supported device URIs and schemes.
 .TP 5
 -D "info"
 .br
-Provides a textual description of the printer.
+Provides a textual description of the destination.
 .TP 5
 -E
 .br
-Enables the printer and accepts jobs; this is the same as running the
-\fIcupsaccept(8)\fR and \fIcupsenable(8)\fR programs on the printer.
+Enables the destination and accepts jobs; this is the same as running the
+\fIcupsaccept(8)\fR and \fIcupsenable(8)\fR programs on the destination.
 .TP 5
 -L "location"
 .br
-Provides a textual location of the printer.
+Provides a textual location of the destination.
 .TP 5
 -P ppd-file
 .br
@@ -201,7 +202,7 @@ System V or Solaris printing system configuration options.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2009 by Apple Inc.
+Copyright 2007-2010 by Apple Inc.
 .\"
 .\" End of "$Id: lpadmin.man 7600 2008-05-20 21:06:23Z mike $".
 .\"