Merge changes from CUPS 1.4svn-r8033.

[thirdparty/cups.git] / doc / help / ref-printers-conf.html

diff --git a/doc/help/ref-printers-conf.html b/doc/help/ref-printers-conf.html
index 33397e8b0717ffa5c34e4c6be6db1680f3955e10..e3fb078404ddc2b231a72acc565020ac4591d444 100644 (file)
--- a/doc/help/ref-printers-conf.html
+++ b/doc/help/ref-printers-conf.html
@@ -37,12 +37,12 @@ active.</P>
 
 <P>The <CODE>Accepting</CODE> directive defines the initial state
 of the <VAR>printer-is-accepting-jobs</VAR> attribute. This state
-is also set by the <CODE>accept(8)</CODE> and
-<CODE>reject(8)</CODE> commands:</P>
+is also set by the <CODE>cupsaccept(8)</CODE> and
+<CODE>cupsreject(8)</CODE> commands:</P>
 
 <PRE CLASS="command">
-<KBD>/usr/sbin/accept printername
-/usr/sbin/reject printername</KBD>
+<KBD>/usr/sbin/cupsaccept printername
+/usr/sbin/cupsreject printername</KBD>
 </PRE>
 
 <P>This directive must appear inside a <A
@@ -211,6 +211,27 @@ HREF="#DefaultPrinter"><CODE>DefaultPrinter</CODE></A>
 section.</P>
 
 
+<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.4</SPAN><A NAME="Filter">Filter</A></H2>
+
+<H3>Examples</H3>
+
+<PRE CLASS="command">
+&lt;Printer name&gt;
+  ...
+  Filter mime/type 100 program
+&lt;/Printer&gt;
+</PRE>
+
+<H3>Description</H3>
+
+<P>The <CODE>Filter</CODE> directive lists a single filter program as defined
+in the printer's PPD file.</P>
+
+<P>This directive must appear inside a
+<A HREF="#Printer"><CODE>Printer</CODE></A> or
+<A HREF="#DefaultPrinter"><CODE>DefaultPrinter</CODE></A> section.</P>
+
+
 <H2 CLASS="title"><A NAME="Info">Info</A></H2>
 
 <H3>Examples</H3>
@@ -482,6 +503,27 @@ HREF="#DefaultPrinter"><CODE>DefaultPrinter</CODE></A>
 section.</P>
 
 
+<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.4</SPAN><A NAME="PreFilter">PreFilter</A></H2>
+
+<H3>Examples</H3>
+
+<PRE CLASS="command">
+&lt;Printer name&gt;
+  ...
+  PreFilter mime/type 100 program
+&lt;/Printer&gt;
+</PRE>
+
+<H3>Description</H3>
+
+<P>The <CODE>PreFilter</CODE> directive lists a single pre-filter program as
+defined in the printer's PPD file.</P>
+
+<P>This directive must appear inside a
+<A HREF="#Printer"><CODE>Printer</CODE></A> or
+<A HREF="#DefaultPrinter"><CODE>DefaultPrinter</CODE></A> section.</P>
+
+
 <H2 CLASS="title"><A NAME="Printer">Printer</A></H2>
 
 <H3>Examples</H3>
@@ -503,6 +545,27 @@ command:
 </PRE>
 
 
+<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.4</SPAN><A NAME="Product">Product</A></H2>
+
+<H3>Examples</H3>
+
+<PRE CLASS="command">
+&lt;Printer name&gt;
+  ...
+  Product Acme PaperWriter
+&lt;/Printer&gt;
+</PRE>
+
+<H3>Description</H3>
+
+<P>The <CODE>Product</CODE> directive defines the main product string from the
+printer's PPD file and is used when advertising the queue via DNS-SD.</P>
+
+<P>This directive must appear inside a
+<A HREF="#Printer"><CODE>Printer</CODE></A> or
+<A HREF="#DefaultPrinter"><CODE>DefaultPrinter</CODE></A> section.</P>
+
+
 <H2 CLASS="title"><A NAME="QuotaPeriod">QuotaPeriod</A></H2>
 
 <H3>Examples</H3>