diff -up cups-1.6svn-r10108/doc/help/policies.html.orig cups-1.6svn-r10108/doc/help/policies.html
--- cups-1.6svn-r10108/doc/help/policies.html.orig	2011-11-16 13:25:16.362204341 -0500
+++ cups-1.6svn-r10108/doc/help/policies.html	2011-11-16 13:44:57.413546203 -0500
@@ -149,6 +149,7 @@ HREF="ref-cupsd-conf.html#LimitIPP"><TT>
 <TR>
 	<TH>Name</TH>
 	<TH>Used by CUPS?</TH>
+	<TH>Applicable to Printer Op Policy?</TH>
 	<TH>Description</TH>
 </TR>
 </THEAD>
@@ -156,87 +157,104 @@ HREF="ref-cupsd-conf.html#LimitIPP"><TT>
 <TR>
 	<TD NOWRAP><TT>Print-Job</TT></TD>
 	<TD>Yes</TD>
+	<TD>Yes</TD>
 	<TD>Creates a print job with a single file.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Print-URI</TT></TD>
 	<TD>No</TD>
+	<TD>No</TD>
 	<TD>Create a print job with a single URI.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Validate-Job</TT></TD>
 	<TD>Yes</TD>
+	<TD>Yes</TD>
 	<TD>Validates a print request before printing.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Create-Job</TT></TD>
 	<TD>Yes</TD>
+	<TD>Yes</TD>
 	<TD>Creates a print job with no files or URIs.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Send-Document</TT></TD>
 	<TD>Yes</TD>
+	<TD>Yes</TD>
 	<TD>Adds a file to a print job.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Send-URI</TT></TD>
 	<TD>No</TD>
+	<TD>No</TD>
 	<TD>Adds a URI to a print job.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Cancel-Job</TT></TD>
 	<TD>Yes</TD>
+	<TD>Yes</TD>
 	<TD>Cancels a print job.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Get-Job-Attributes</TT></TD>
 	<TD>Yes</TD>
+	<TD>Yes</TD>
 	<TD>Gets information and options associated with a job.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Get-Jobs</TT></TD>
 	<TD>Yes</TD>
+	<TD>Yes</TD>
 	<TD>Gets a list of jobs.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Get-Printer-Attributes</TT></TD>
 	<TD>Yes</TD>
+	<TD>Yes</TD>
 	<TD>Gets information and options associated with a printer or class.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Hold-Job</TT></TD>
 	<TD>Yes</TD>
+	<TD>Yes</TD>
 	<TD>Holds a print job for printing.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Release-Job</TT></TD>
 	<TD>Yes</TD>
+	<TD>Yes</TD>
 	<TD>Releases a print job for printing.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Restart-Job</TT></TD>
 	<TD>Yes</TD>
+	<TD>Yes</TD>
 	<TD>Reprints a print job.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Pause-Printer</TT></TD>
 	<TD>Yes</TD>
+	<TD>Yes</TD>
 	<TD>Stops a printer or class.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Resume-Printer</TT></TD>
 	<TD>Yes</TD>
+	<TD>Yes</TD>
 	<TD>Starts a printer or class.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Purge-Jobs</TT></TD>
 	<TD>Yes</TD>
+	<TD>Yes</TD>
 	<TD>Cancels all jobs on the server or a printer or class
 	and removes the job history information.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Set-Printer-Attributes</TT></TD>
-	<TD>No</TD>
+	<TD>Yes</TD>
+	<TD>Yes</TD>
 	<TD>Sets printer or class information; CUPS uses
 	CUPS-Add-Modify-Printer and CUPS-Add-Modify-Class
 	instead.</TD>
@@ -244,216 +262,258 @@ HREF="ref-cupsd-conf.html#LimitIPP"><TT>
 <TR>
 	<TD NOWRAP><TT>Set-Job-Attributes</TT></TD>
 	<TD>Yes</TD>
+	<TD>Yes</TD>
 	<TD>Changes job options.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Get-Printer-Supported-Values</TT></TD>
 	<TD>No</TD>
+	<TD>No</TD>
 	<TD>Gets -supported attributes for a printer based on job
 	options.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Create-Printer-Subscription</TT></TD>
 	<TD>Yes</TD>
+	<TD>Yes</TD>
 	<TD>Creates an event subscription for a printer or the server.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Create-Job-Subscription</TT></TD>
 	<TD>Yes</TD>
+	<TD>No</TD>
 	<TD>Creates an event subscription for a job.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Get-Subscription-Attributes</TT></TD>
 	<TD>Yes</TD>
+	<TD>Yes</TD>
 	<TD>Gets information for an event subscription.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Get-Subscriptions</TT></TD>
 	<TD>Yes</TD>
+	<TD>Yes</TD>
 	<TD>Gets a list of event subscriptions.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Renew-Subscription</TT></TD>
 	<TD>Yes</TD>
+	<TD>Yes</TD>
 	<TD>Renews an event subscription that is about to expire.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Cancel-Subscription</TT></TD>
 	<TD>Yes</TD>
+	<TD>Yes</TD>
 	<TD>Cancels an event subscription.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Get-Notifications</TT></TD>
 	<TD>Yes</TD>
+	<TD>Yes</TD>
 	<TD>Gets (pending) events for an event subscription.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Send-Notifications</TT></TD>
 	<TD>No</TD>
+	<TD>No</TD>
 	<TD>Sends events for an event subscription.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Get-Printer-Support-Files</TT></TD>
 	<TD>No</TD>
+	<TD>No</TD>
 	<TD>Gets printer driver files for a Novell client.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Enable-Printer</TT></TD>
 	<TD>Yes</TD>
+	<TD>Yes</TD>
 	<TD>Starts a printer or class.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Disable-Printer</TT></TD>
 	<TD>Yes</TD>
+	<TD>Yes</TD>
 	<TD>Stops a printer or class.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Pause-Printer-After-Current-Job</TT></TD>
 	<TD>No</TD>
+	<TD>No</TD>
 	<TD>Stops a printer or class after the current job is finished.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Hold-New-Jobs</TT></TD>
 	<TD>No</TD>
+	<TD>No</TD>
 	<TD>Holds new jobs submitted to a printer or class.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Release-Held-New-Jobs</TT></TD>
 	<TD>No</TD>
+	<TD>No</TD>
 	<TD>Releases jobs that were held because of the
 	Hold-New-Jobs operation.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Deactivate-Printer</TT></TD>
 	<TD>No</TD>
+	<TD>No</TD>
 	<TD>Deactivates a printer or class.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Activate-Printer</TT></TD>
 	<TD>No</TD>
+	<TD>No</TD>
 	<TD>Activates a printer or class.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Restart-Printer</TT></TD>
 	<TD>No</TD>
+	<TD>No</TD>
 	<TD>Restarts a printer or class, resuming print jobs as needed.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Shutdown-Printer</TT></TD>
 	<TD>No</TD>
+	<TD>No</TD>
 	<TD>Powers a printer or class off.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Startup-Printer</TT></TD>
 	<TD>No</TD>
+	<TD>No</TD>
 	<TD>Powers a printer or class on.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Reprocess-Job</TT></TD>
 	<TD>No</TD>
+	<TD>No</TD>
 	<TD>Reprints a job on a different printer or class; CUPS has the
 	CUPS-Move-Job operation instead.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Cancel-Current-Job</TT></TD>
 	<TD>No</TD>
+	<TD>No</TD>
 	<TD>Cancels the current job on a printer or class.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Suspend-Current-Job</TT></TD>
 	<TD>No</TD>
+	<TD>No</TD>
 	<TD>Stops the current job on a printer or class.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Resume-Job</TT></TD>
 	<TD>No</TD>
+	<TD>No</TD>
 	<TD>Resumes printing of a stopped job.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Promote-Job</TT></TD>
 	<TD>No</TD>
+	<TD>No</TD>
 	<TD>Prints a job before others.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>Schedule-Job-After</TT></TD>
 	<TD>No</TD>
+	<TD>No</TD>
 	<TD>Prints a job after others.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>CUPS-Get-Default</TT></TD>
 	<TD>Yes</TD>
+	<TD>No</TD>
 	<TD>Gets the server/network default printer or class.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>CUPS-Get-Printers</TT></TD>
 	<TD>Yes</TD>
+	<TD>No</TD>
 	<TD>Gets a list of printers and/or classes.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>CUPS-Add-Modify-Printer</TT></TD>
 	<TD>Yes</TD>
+	<TD>Yes</TD>
 	<TD>Adds or modifies a printer.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>CUPS-Delete-Printer</TT></TD>
 	<TD>Yes</TD>
+	<TD>No</TD>
 	<TD>Removes a printer.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>CUPS-Get-Classes</TT></TD>
 	<TD>Yes</TD>
+	<TD>No</TD>
 	<TD>Gets a list of classes.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>CUPS-Add-Modify-Class</TT></TD>
 	<TD>Yes</TD>
+	<TD>Yes</TD>
 	<TD>Adds or modifies a class.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>CUPS-Delete-Class</TT></TD>
 	<TD>Yes</TD>
+	<TD>No</TD>
 	<TD>Removes a class.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>CUPS-Accept-Jobs</TT></TD>
 	<TD>Yes</TD>
+	<TD>Yes</TD>
 	<TD>Sets a printer's or class' printer-is-accepting-jobs
 	attribute to true.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>CUPS-Reject-Jobs</TT></TD>
 	<TD>Yes</TD>
+	<TD>Yes</TD>
 	<TD>Sets a printer's or class' printer-is-accepting-jobs
 	attribute to false.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>CUPS-Set-Default</TT></TD>
 	<TD>Yes</TD>
+	<TD>No</TD>
 	<TD>Sets the server/network default printer or class.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>CUPS-Get-Devices</TT></TD>
 	<TD>Yes</TD>
+	<TD>No</TD>
 	<TD>Gets a list of printer devices.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>CUPS-Get-PPDs</TT></TD>
 	<TD>Yes</TD>
+	<TD>No</TD>
 	<TD>Gets a list of printer drivers or manufacturers.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>CUPS-Move-Job</TT></TD>
 	<TD>Yes</TD>
+	<TD>Yes</TD>
 	<TD>Moves a job to a different printer or class.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>CUPS-Authenticate-Job</TT></TD>
 	<TD>Yes</TD>
+	<TD>Yes</TD>
 	<TD>Authenticates a job for printing.</TD>
 </TR>
 <TR>
 	<TD NOWRAP><TT>CUPS-Get-Document</TT></TD>
 	<TD>Yes</TD>
+	<TD>No</TD>
 	<TD>Retrieves a document file from a job.</TD>
 </TR>
 </TBODY>
@@ -597,5 +657,7 @@ lpadmin -p LaserJet4000 -o printer-op-po
 
 <P>To make the same change in the web interface, go to the printer's web page, for example "http://localhost:631/printers/LaserJet4000", and choose <VAR>Set Default Options</VAR> from the <VAR>Administration</VAR> menu button. Click on the <VAR>Policies</VAR> link and choose the desired policy from the pull-down list. Click on <VAR>Set Default Options</VAR> to change the policy for the printer.</P>
 
+<P>Note that CUPS only checks the default policy for certain IPP operations.  Refer to <A HREF="#TABLE01">Table 1</A> to determine whether a particular IPP operation can be controlled via a printer operation policy.
+
 </BODY>
 </HTML>

