Merge changes from CUPS 1.4svn-r7961.

[thirdparty/cups.git] / doc / help / spec-ipp.html

diff --git a/doc/help/spec-ipp.html b/doc/help/spec-ipp.html
index e9e05fac5250cdb6fe0ee4830531d91f89aebaa9..da4d217f36fb8feb2c6277acc6febfd470476601 100644 (file)
--- a/doc/help/spec-ipp.html
+++ b/doc/help/spec-ipp.html
@@ -912,16 +912,16 @@ CUPS-Get-Printers request:
        attributes as described in section 3.1.4.1 of the IPP Model and
        Semantics document.
 
        attributes as described in section 3.1.4.1 of the IPP Model and
        Semantics document.
 

+       <dt>"first-printer-name" (name(127)):<span class='info'>CUPS 1.2</span>
+
+       <dd>The client OPTIONALLY supplies this attribute to
+       select the first printer that is returned.
+

        <dt>"limit" (integer (1:MAX)):
 
        <dd>The client OPTIONALLY supplies this attribute limiting the
        number of printers that are returned.
 
        <dt>"limit" (integer (1:MAX)):
 
        <dd>The client OPTIONALLY supplies this attribute limiting the
        number of printers that are returned.
 

-       <dt>"printer-info" (text(127)):<span class='info'>CUPS 1.1</span>
-
-       <dd>The client OPTIONALLY supplies this attribute to
-       select which printers are returned.
-

        <dt>"printer-location" (text(127)): <span class='info'>CUPS 1.1.7</span>
 
        <dd>The client OPTIONALLY supplies this attribute to
        <dt>"printer-location" (text(127)): <span class='info'>CUPS 1.1.7</span>
 
        <dd>The client OPTIONALLY supplies this attribute to


@@ -946,6 +946,11 @@ CUPS-Get-Printers request:
        responds as if this attribute had been supplied with a value of
        'all'.
 
        responds as if this attribute had been supplied with a value of
        'all'.
 

+       <dt>"requested-user-name" (name(127)) : <span class='info'>CUPS 1.2</span>
+
+       <dd>The client OPTIONALLY supplies a user name that is used to filter
+       the returned printers.
+

 </dl>
 
 <h4>CUPS-Get-Printers Response</h4>
 </dl>
 
 <h4>CUPS-Get-Printers Response</h4>


@@ -1171,15 +1176,16 @@ CUPS-Get-Classes request:
        attributes as described in section 3.1.4.1 of the IPP Model and
        Semantics document.
 
        attributes as described in section 3.1.4.1 of the IPP Model and
        Semantics document.
 

+       <dt>"first-printer-name" (name(127)):<span class='info'>CUPS 1.2</span>
+
+       <dd>The client OPTIONALLY supplies this attribute to
+       select the first printer that is returned.
+

        <dt>"limit" (integer (1:MAX)):
 
        <dd>The client OPTIONALLY supplies this attribute limiting the
        number of printer classes that are returned.
 
        <dt>"limit" (integer (1:MAX)):
 
        <dd>The client OPTIONALLY supplies this attribute limiting the
        number of printer classes that are returned.
 

-       <dt>"printer-info" (text(127)): <span class='info'>CUPS 1.1.7</span>
-       <dd>The client OPTIONALLY supplies this attribute to
-       select which printer classes are returned.
-

        <dt>"printer-location" (text(127)): <span class='info'>CUPS 1.1.7</span>
        <dd>The client OPTIONALLY supplies this attribute to
        select which printer classes are returned.
        <dt>"printer-location" (text(127)): <span class='info'>CUPS 1.1.7</span>
        <dd>The client OPTIONALLY supplies this attribute to
        select which printer classes are returned.


@@ -1200,6 +1206,11 @@ CUPS-Get-Classes request:
        interested. If the client omits this attribute, the server responds as
        if this attribute had been supplied with a value of 'all'.
 
        interested. If the client omits this attribute, the server responds as
        if this attribute had been supplied with a value of 'all'.
 

+       <dt>"requested-user-name" (name(127)) : <span class='info'>CUPS 1.2</span>
+
+       <dd>The client OPTIONALLY supplies a user name that is used to filter
+       the returned printers.
+

 </dl>
 
 <h4>CUPS-Get-Classes Response</h4>
 </dl>
 
 <h4>CUPS-Get-Classes Response</h4>


@@ -2710,7 +2721,7 @@ summary='Printer Type Bits'>
        <td>Is the a default printer on the network.</td>
 </tr>
 <tr>
        <td>Is the a default printer on the network.</td>
 </tr>
 <tr>

-       <td>0x00040000<td>
+       <td>0x00040000</td>

        <td>Is a facsimile device.</td>
 </tr>
 <tr>
        <td>Is a facsimile device.</td>
 </tr>
 <tr>