Merge changes from CUPS 1.7svn-r10578.

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

diff --git a/man/lpadmin.man b/man/lpadmin.man
index 675c8e082c75f1ed16a6210d3fa39b738effe920..d2ebbbec7914222087375d86cceaf3bbf33ce128 100644 (file)
--- a/man/lpadmin.man
+++ b/man/lpadmin.man
@@ -3,7 +3,7 @@
 .\"
 .\"   lpadmin man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2012 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" "7 January 2011" "Apple Inc."
+.TH lpadmin 8 "CUPS" "16 July 2012" "Apple Inc."
 .SH NAME
 lpadmin \- configure cups printers and classes
 .SH SYNOPSIS
@@ -30,7 +30,11 @@ lpadmin \- configure cups printers and classes
 ] [ -h
 .I server[:port]
 ] -p
-.I destination option(s)
+.I destination
+[ -R
+.I name-default
+]
+.I option(s)
 .br
 .B lpadmin
 [ -E ] [-U
@@ -82,6 +86,18 @@ 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 cupsIPPSupplies=true
+.TP 5
+-o cupsIPPSupplies=false
+.br
+Specifies whether IPP supply level values should be reported.
+.TP 5
+-o cupsSNMPSupplies=true
+.TP 5
+-o cupsSNMPSupplies=false
+.br
+Specifies whether SNMP supply level (RFC 3805) values should be reported.
+.TP 5
 -o job-k-limit=value
 .br
 Sets the kilobyte limit for per-user quotas. The value is an
@@ -123,8 +139,8 @@ specified port monitor must be listed in the printer's PPD file.
 .TP 5
 -o printer-error-policy=name
 .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 
+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", "retry-current-job", or "stop-printer". The default
 error policy is "stop-printer" for printers and "retry-current-job" for
 classes.
@@ -143,6 +159,10 @@ 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
+-R name-default
+.br
+Deletes the named option from \fIprinter\fR.
+.TP 5
 -r class
 .br
 Removes the named \fIprinter\fR from \fIclass\fR.  If the
@@ -162,10 +182,9 @@ user-level access control off.
 .TP 5
 -v "device-uri"
 .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 \fI-v\fR option with the
-\fIlpinfo(8)\fR command to get a list of supported device URIs and schemes.
+Sets the \fIdevice-uri\fR attribute of the printer queue. 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
@@ -202,7 +221,7 @@ System V or Solaris printing system configuration options.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2012 by Apple Inc.
 .\"
 .\" End of "$Id: lpadmin.man 7600 2008-05-20 21:06:23Z mike $".
 .\"