Mark cupsGetDevices as deprecated.

Update CUPS Programming Manual.

Update CUPS Admin API documentation.

Update CUPS PPD documentation.

diff --git a/cups/adminutil.h b/cups/adminutil.h
index 77e5941159940ff177664ffa54f4f56e6988f036..c3c0dc3b56cd4072a4e23112eccae7831ad9fa53 100644 (file)
--- a/cups/adminutil.h
+++ b/cups/adminutil.h
@@ -77,7 +77,7 @@ extern ipp_status_t   cupsGetDevices(http_t *http, int timeout,
                                       const char *include_schemes,
                                       const char *exclude_schemes,
                                       cups_device_cb_t callback,
-                                      void *user_data) _CUPS_API_1_4;
+                                      void *user_data) _CUPS_DEPRECATED;
 
 
 #  ifdef __cplusplus

diff --git a/cups/getdevices.c b/cups/getdevices.c
index e0ac9b5ccd50186756a3b469b910d2ce130c2c55..4981fd896d9673ef55b1b8437cee9c4cbccdf076 100644 (file)
--- a/cups/getdevices.c
+++ b/cups/getdevices.c
@@ -23,7 +23,10 @@
  * parameters provide comma-delimited lists of backends to include or omit from
  * the request respectively.
  *
- * @since CUPS 1.4/macOS 10.6@
+ * This function is deprecated with the IPP printer discovery functionality
+ * being provided by the @link cupsEnumDests@ and @cupsGetDests@ functions.
+ *
+ * @deprecated@
  */
 
 ipp_status_t                           /* O - Request status - @code IPP_OK@ on success. */

diff --git a/doc/help/api-admin.html b/doc/help/api-admin.html
index 10336b6c5ef76c2677edc4b4f161c93d3e3773b3..e5ae8181942b40b94b5d60291176cc4eae20f185 100644 (file)
--- a/doc/help/api-admin.html
+++ b/doc/help/api-admin.html
@@ -657,7 +657,7 @@ int cupsAdminSetServerSettings(http_t *http, int num_settings, cups_option_t *se
 </tbody></table>
 <h4 class="returnvalue">Return Value</h4>
         <p class="description">1 on success, 0 on failure</p>
-<h3 class="function"><span class="info">&#160;CUPS 1.4/macOS 10.6&#160;</span><a id="cupsGetDevices">cupsGetDevices</a></h3>
+<h3 class="function"><span class="info">&#160;DEPRECATED&#160;</span><a id="cupsGetDevices">cupsGetDevices</a></h3>
         <p class="description">Get available printer devices.</p>
 <p class="code">
 ipp_status_t cupsGetDevices(http_t *http, int timeout, const char *include_schemes, const char *exclude_schemes, <a href="#cups_device_cb_t">cups_device_cb_t</a> callback, void *user_data);</p>
@@ -683,7 +683,10 @@ ipp_status_t cupsGetDevices(http_t *http, int timeout, const char *include_schem
 devices to the specified callback function. The &quot;timeout&quot; parameter controls
 how long the request lasts, while the &quot;include_schemes&quot; and &quot;exclude_schemes&quot;
 parameters provide comma-delimited lists of backends to include or omit from
-the request respectively.
+the request respectively.<br>
+<br>
+This function is deprecated with the IPP printer discovery functionality
+being provided by the <a href="#cupsEnumDests"><code>cupsEnumDests</code></a> and @cupsGetDests@ functions.
 
 </p>
       <h2 class="title"><a id="TYPES">Data Types</a></h2>

diff --git a/doc/help/api-ppd.html b/doc/help/api-ppd.html
index c287479e55469443e38c609e1a08fa74c027cd0e..a0918afd5a6432c511599eb94a04aff2e2b44bdd 100644 (file)
--- a/doc/help/api-ppd.html
+++ b/doc/help/api-ppd.html
@@ -563,6 +563,7 @@ h3.title {
         </ul></li>
         <li><a href="#ENUMERATIONS">Enumerations</a><ul class="subcontents">
           <li><a href="#ppd_conform_e">ppd_conform_e</a></li>
+          <li><a href="#ppd_cptype_e">ppd_cptype_e</a></li>
           <li><a href="#ppd_cs_e">ppd_cs_e</a></li>
           <li><a href="#ppd_section_e">ppd_section_e</a></li>
           <li><a href="#ppd_status_e">ppd_status_e</a></li>
@@ -1513,103 +1514,103 @@ float ppdPageWidth(<a href="#ppd_file_t">ppd_file_t</a> *ppd, const char *name);
 <h4 class="returnvalue">Return Value</h4>
         <p class="description">Width of page in points or 0.0</p>
       <h2 class="title"><a id="TYPES">Data Types</a></h2>
-      <h3 class="typedef"><a id="ppd_attr_t"><span class="info">&#160;CUPS 1.1.19/macOS 10.3&#160;</span>ppd_attr_t</a></h3>
+      <h3 class="typedef"><a id="ppd_attr_t"><span class="info">&#160;DEPRECATED&#160;</span>ppd_attr_t</a></h3>
         <p class="description">PPD Attribute Structure </p>
       <p class="code">
 typedef struct <a href="#ppd_attr_s">ppd_attr_s</a> ppd_attr_t;
 </p>
-      <h3 class="typedef"><a id="ppd_choice_t">ppd_choice_t</a></h3>
-        <p class="description">Option choices</p>
+      <h3 class="typedef"><a id="ppd_choice_t"><span class="info">&#160;DEPRECATED&#160;</span>ppd_choice_t</a></h3>
+        <p class="description">Option choices </p>
       <p class="code">
 typedef struct <a href="#ppd_choice_s">ppd_choice_s</a> ppd_choice_t;
 </p>
-      <h3 class="typedef"><a id="ppd_conform_t"><span class="info">&#160;CUPS 1.1.19/macOS 10.3&#160;</span>ppd_conform_t</a></h3>
+      <h3 class="typedef"><a id="ppd_conform_t"><span class="info">&#160;DEPRECATED&#160;</span>ppd_conform_t</a></h3>
         <p class="description">Conformance Levels </p>
       <p class="code">
 typedef enum <a href="#ppd_conform_e">ppd_conform_e</a> ppd_conform_t;
 </p>
-      <h3 class="typedef"><a id="ppd_const_t">ppd_const_t</a></h3>
-        <p class="description">Constraints</p>
+      <h3 class="typedef"><a id="ppd_const_t"><span class="info">&#160;DEPRECATED&#160;</span>ppd_const_t</a></h3>
+        <p class="description">Constraints </p>
       <p class="code">
 typedef struct <a href="#ppd_const_s">ppd_const_s</a> ppd_const_t;
 </p>
-      <h3 class="typedef"><a id="ppd_coption_t"><span class="info">&#160;CUPS 1.2/macOS 10.5&#160;</span>ppd_coption_t</a></h3>
+      <h3 class="typedef"><a id="ppd_coption_t"><span class="info">&#160;DEPRECATED&#160;</span>ppd_coption_t</a></h3>
         <p class="description">Custom Option </p>
       <p class="code">
 typedef struct <a href="#ppd_coption_s">ppd_coption_s</a> ppd_coption_t;
 </p>
-      <h3 class="typedef"><a id="ppd_cparam_t"><span class="info">&#160;CUPS 1.2/macOS 10.5&#160;</span>ppd_cparam_t</a></h3>
+      <h3 class="typedef"><a id="ppd_cparam_t"><span class="info">&#160;DEPRECATED&#160;</span>ppd_cparam_t</a></h3>
         <p class="description">Custom Parameter </p>
       <p class="code">
 typedef struct <a href="#ppd_cparam_s">ppd_cparam_s</a> ppd_cparam_t;
 </p>
-      <h3 class="typedef"><a id="ppd_cplimit_t"><span class="info">&#160;CUPS 1.2/macOS 10.5&#160;</span>ppd_cplimit_t</a></h3>
+      <h3 class="typedef"><a id="ppd_cplimit_t"><span class="info">&#160;DEPRECATED&#160;</span>ppd_cplimit_t</a></h3>
         <p class="description">Custom Parameter Limit </p>
       <p class="code">
 typedef union <a href="#ppd_cplimit_u">ppd_cplimit_u</a> ppd_cplimit_t;
 </p>
-      <h3 class="typedef"><a id="ppd_cptype_t"><span class="info">&#160;CUPS 1.2/macOS 10.5&#160;</span>ppd_cptype_t</a></h3>
+      <h3 class="typedef"><a id="ppd_cptype_t"><span class="info">&#160;DEPRECATED&#160;</span>ppd_cptype_t</a></h3>
         <p class="description">Custom Parameter Type </p>
       <p class="code">
-typedef enum ppd_cptype_e ppd_cptype_t;
+typedef enum <a href="#ppd_cptype_e">ppd_cptype_e</a> ppd_cptype_t;
 </p>
-      <h3 class="typedef"><a id="ppd_cpvalue_t"><span class="info">&#160;CUPS 1.2/macOS 10.5&#160;</span>ppd_cpvalue_t</a></h3>
+      <h3 class="typedef"><a id="ppd_cpvalue_t"><span class="info">&#160;DEPRECATED&#160;</span>ppd_cpvalue_t</a></h3>
         <p class="description">Custom Parameter Value </p>
       <p class="code">
 typedef union <a href="#ppd_cpvalue_u">ppd_cpvalue_u</a> ppd_cpvalue_t;
 </p>
-      <h3 class="typedef"><a id="ppd_cs_t">ppd_cs_t</a></h3>
-        <p class="description">Colorspaces</p>
+      <h3 class="typedef"><a id="ppd_cs_t"><span class="info">&#160;DEPRECATED&#160;</span>ppd_cs_t</a></h3>
+        <p class="description">Colorspaces </p>
       <p class="code">
 typedef enum <a href="#ppd_cs_e">ppd_cs_e</a> ppd_cs_t;
 </p>
-      <h3 class="typedef"><a id="ppd_emul_t">ppd_emul_t</a></h3>
-        <p class="description">Emulators</p>
+      <h3 class="typedef"><a id="ppd_emul_t"><span class="info">&#160;DEPRECATED&#160;</span>ppd_emul_t</a></h3>
+        <p class="description">Emulators </p>
       <p class="code">
 typedef struct <a href="#ppd_emul_s">ppd_emul_s</a> ppd_emul_t;
 </p>
-      <h3 class="typedef"><a id="ppd_file_t">ppd_file_t</a></h3>
-        <p class="description">PPD File</p>
+      <h3 class="typedef"><a id="ppd_file_t"><span class="info">&#160;DEPRECATED&#160;</span>ppd_file_t</a></h3>
+        <p class="description">PPD File </p>
       <p class="code">
 typedef struct <a href="#ppd_file_s">ppd_file_s</a> ppd_file_t;
 </p>
-      <h3 class="typedef"><a id="ppd_group_t">ppd_group_t</a></h3>
-        <p class="description">Groups</p>
+      <h3 class="typedef"><a id="ppd_group_t"><span class="info">&#160;DEPRECATED&#160;</span>ppd_group_t</a></h3>
+        <p class="description">Groups </p>
       <p class="code">
 typedef struct <a href="#ppd_group_s">ppd_group_s</a> ppd_group_t;
 </p>
-      <h3 class="typedef"><a id="ppd_option_t">ppd_option_t</a></h3>
-        <p class="description">Options</p>
+      <h3 class="typedef"><a id="ppd_option_t"><span class="info">&#160;DEPRECATED&#160;</span>ppd_option_t</a></h3>
+        <p class="description">Options </p>
       <p class="code">
 typedef struct <a href="#ppd_option_s">ppd_option_s</a> ppd_option_t;
 </p>
-      <h3 class="typedef"><a id="ppd_profile_t">ppd_profile_t</a></h3>
-        <p class="description">sRGB Color Profiles</p>
+      <h3 class="typedef"><a id="ppd_profile_t"><span class="info">&#160;DEPRECATED&#160;</span>ppd_profile_t</a></h3>
+        <p class="description">sRGB Color Profiles </p>
       <p class="code">
 typedef struct <a href="#ppd_profile_s">ppd_profile_s</a> ppd_profile_t;
 </p>
-      <h3 class="typedef"><a id="ppd_section_t">ppd_section_t</a></h3>
-        <p class="description">Order dependency sections</p>
+      <h3 class="typedef"><a id="ppd_section_t"><span class="info">&#160;DEPRECATED&#160;</span>ppd_section_t</a></h3>
+        <p class="description">Order dependency sections </p>
       <p class="code">
 typedef enum <a href="#ppd_section_e">ppd_section_e</a> ppd_section_t;
 </p>
-      <h3 class="typedef"><a id="ppd_size_t">ppd_size_t</a></h3>
-        <p class="description">Page Sizes</p>
+      <h3 class="typedef"><a id="ppd_size_t"><span class="info">&#160;DEPRECATED&#160;</span>ppd_size_t</a></h3>
+        <p class="description">Page Sizes </p>
       <p class="code">
 typedef struct <a href="#ppd_size_s">ppd_size_s</a> ppd_size_t;
 </p>
-      <h3 class="typedef"><a id="ppd_status_t"><span class="info">&#160;CUPS 1.1.19/macOS 10.3&#160;</span>ppd_status_t</a></h3>
+      <h3 class="typedef"><a id="ppd_status_t"><span class="info">&#160;DEPRECATED&#160;</span>ppd_status_t</a></h3>
         <p class="description">Status Codes </p>
       <p class="code">
 typedef enum <a href="#ppd_status_e">ppd_status_e</a> ppd_status_t;
 </p>
-      <h3 class="typedef"><a id="ppd_ui_t">ppd_ui_t</a></h3>
-        <p class="description">UI Types</p>
+      <h3 class="typedef"><a id="ppd_ui_t"><span class="info">&#160;DEPRECATED&#160;</span>ppd_ui_t</a></h3>
+        <p class="description">UI Types </p>
       <p class="code">
 typedef enum <a href="#ppd_ui_e">ppd_ui_e</a> ppd_ui_t;
 </p>
       <h2 class="title"><a id="STRUCTURES">Structures</a></h2>
-<h3 class="struct"><span class="info">&#160;CUPS 1.1.19/macOS 10.3&#160;</span><a id="ppd_attr_s">ppd_attr_s</a></h3>
+<h3 class="struct"><span class="info">&#160;DEPRECATED&#160;</span><a id="ppd_attr_s">ppd_attr_s</a></h3>
         <p class="description">PPD Attribute Structure </p>
 <p class="code">struct ppd_attr_s {<br>
 &#160;&#160;&#160;&#160;char name[PPD_MAX_NAME];<br>
@@ -1628,8 +1629,8 @@ typedef enum <a href="#ppd_ui_e">ppd_ui_e</a> ppd_ui_t;
 <tr><th>value </th>
         <td class="description">Value string</td></tr>
 </tbody></table>
-<h3 class="struct"><a id="ppd_choice_s">ppd_choice_s</a></h3>
-        <p class="description">Option choices</p>
+<h3 class="struct"><span class="info">&#160;DEPRECATED&#160;</span><a id="ppd_choice_s">ppd_choice_s</a></h3>
+        <p class="description">Option choices </p>
 <p class="code">struct ppd_choice_s {<br>
 &#160;&#160;&#160;&#160;char choice[PPD_MAX_NAME];<br>
 &#160;&#160;&#160;&#160;char *code;<br>
@@ -1650,8 +1651,8 @@ typedef enum <a href="#ppd_ui_e">ppd_ui_e</a> ppd_ui_t;
 <tr><th>text[PPD_MAX_TEXT] </th>
         <td class="description">Human-readable option name</td></tr>
 </tbody></table>
-<h3 class="struct"><a id="ppd_const_s">ppd_const_s</a></h3>
-        <p class="description">Constraints</p>
+<h3 class="struct"><span class="info">&#160;DEPRECATED&#160;</span><a id="ppd_const_s">ppd_const_s</a></h3>
+        <p class="description">Constraints </p>
 <p class="code">struct ppd_const_s {<br>
 &#160;&#160;&#160;&#160;char choice1[PPD_MAX_NAME];<br>
 &#160;&#160;&#160;&#160;char choice2[PPD_MAX_NAME];<br>
@@ -1669,7 +1670,7 @@ typedef enum <a href="#ppd_ui_e">ppd_ui_e</a> ppd_ui_t;
 <tr><th>option2[PPD_MAX_NAME] </th>
         <td class="description">Second keyword</td></tr>
 </tbody></table>
-<h3 class="struct"><span class="info">&#160;CUPS 1.2/macOS 10.5&#160;</span><a id="ppd_coption_s">ppd_coption_s</a></h3>
+<h3 class="struct"><span class="info">&#160;DEPRECATED&#160;</span><a id="ppd_coption_s">ppd_coption_s</a></h3>
         <p class="description">Custom Option </p>
 <p class="code">struct ppd_coption_s {<br>
 &#160;&#160;&#160;&#160;char keyword[PPD_MAX_NAME];<br>
@@ -1688,7 +1689,7 @@ typedef enum <a href="#ppd_ui_e">ppd_ui_e</a> ppd_ui_t;
 <tr><th>params </th>
         <td class="description">Parameters</td></tr>
 </tbody></table>
-<h3 class="struct"><span class="info">&#160;CUPS 1.2/macOS 10.5&#160;</span><a id="ppd_cparam_s">ppd_cparam_s</a></h3>
+<h3 class="struct"><span class="info">&#160;DEPRECATED&#160;</span><a id="ppd_cparam_s">ppd_cparam_s</a></h3>
         <p class="description">Custom Parameter </p>
 <p class="code">struct ppd_cparam_s {<br>
 &#160;&#160;&#160;&#160;<a href="#ppd_cpvalue_t">ppd_cpvalue_t</a> current;<br>
@@ -1713,8 +1714,8 @@ typedef enum <a href="#ppd_ui_e">ppd_ui_e</a> ppd_ui_t;
 <tr><th>type </th>
         <td class="description">Parameter type</td></tr>
 </tbody></table>
-<h3 class="struct"><a id="ppd_emul_s">ppd_emul_s</a></h3>
-        <p class="description">Emulators</p>
+<h3 class="struct"><span class="info">&#160;DEPRECATED&#160;</span><a id="ppd_emul_s">ppd_emul_s</a></h3>
+        <p class="description">Emulators </p>
 <p class="code">struct ppd_emul_s {<br>
 &#160;&#160;&#160;&#160;char name[PPD_MAX_NAME];<br>
 &#160;&#160;&#160;&#160;char *start;<br>
@@ -1729,8 +1730,8 @@ typedef enum <a href="#ppd_ui_e">ppd_ui_e</a> ppd_ui_t;
 <tr><th>stop </th>
         <td class="description">Code to stop this emulation</td></tr>
 </tbody></table>
-<h3 class="struct"><a id="ppd_file_s">ppd_file_s</a></h3>
-        <p class="description">PPD File</p>
+<h3 class="struct"><span class="info">&#160;DEPRECATED&#160;</span><a id="ppd_file_s">ppd_file_s</a></h3>
+        <p class="description">PPD File </p>
 <p class="code">struct ppd_file_s {<br>
 &#160;&#160;&#160;&#160;int accurate_screens;<br>
 &#160;&#160;&#160;&#160;int color_device;<br>
@@ -1862,8 +1863,8 @@ typedef enum <a href="#ppd_ui_e">ppd_ui_e</a> ppd_ui_t;
 <tr><th>variable_sizes </th>
         <td class="description">1 = supports variable sizes, 0 = doesn't</td></tr>
 </tbody></table>
-<h3 class="struct"><a id="ppd_group_s">ppd_group_s</a></h3>
-        <p class="description">Groups</p>
+<h3 class="struct"><span class="info">&#160;DEPRECATED&#160;</span><a id="ppd_group_s">ppd_group_s</a></h3>
+        <p class="description">Groups </p>
 <p class="code">struct ppd_group_s {<br>
 &#160;&#160;&#160;&#160;char text[PPD_MAX_TEXT - PPD_MAX_NAME];<br>
 &#160;&#160;&#160;&#160;char name[PPD_MAX_NAME];<br>
@@ -1887,8 +1888,8 @@ typedef enum <a href="#ppd_ui_e">ppd_ui_e</a> ppd_ui_t;
 <tr><th>subgroups </th>
         <td class="description">Sub-groups (max depth = 1)</td></tr>
 </tbody></table>
-<h3 class="struct"><a id="ppd_option_s">ppd_option_s</a></h3>
-        <p class="description">Options</p>
+<h3 class="struct"><span class="info">&#160;DEPRECATED&#160;</span><a id="ppd_option_s">ppd_option_s</a></h3>
+        <p class="description">Options </p>
 <p class="code">struct ppd_option_s {<br>
 &#160;&#160;&#160;&#160;<a href="#ppd_choice_t">ppd_choice_t</a> *choices;<br>
 &#160;&#160;&#160;&#160;char conflicted;<br>
@@ -1921,8 +1922,8 @@ typedef enum <a href="#ppd_ui_e">ppd_ui_e</a> ppd_ui_t;
 <tr><th>ui </th>
         <td class="description">Type of UI option</td></tr>
 </tbody></table>
-<h3 class="struct"><a id="ppd_profile_s">ppd_profile_s</a></h3>
-        <p class="description">sRGB Color Profiles</p>
+<h3 class="struct"><span class="info">&#160;DEPRECATED&#160;</span><a id="ppd_profile_s">ppd_profile_s</a></h3>
+        <p class="description">sRGB Color Profiles </p>
 <p class="code">struct ppd_profile_s {<br>
 &#160;&#160;&#160;&#160;float density;<br>
 &#160;&#160;&#160;&#160;float gamma;<br>
@@ -1943,8 +1944,8 @@ typedef enum <a href="#ppd_ui_e">ppd_ui_e</a> ppd_ui_t;
 <tr><th>resolution[PPD_MAX_NAME] </th>
         <td class="description">Resolution or &quot;-&quot;</td></tr>
 </tbody></table>
-<h3 class="struct"><a id="ppd_size_s">ppd_size_s</a></h3>
-        <p class="description">Page Sizes</p>
+<h3 class="struct"><span class="info">&#160;DEPRECATED&#160;</span><a id="ppd_size_s">ppd_size_s</a></h3>
+        <p class="description">Page Sizes </p>
 <p class="code">struct ppd_size_s {<br>
 &#160;&#160;&#160;&#160;float bottom;<br>
 &#160;&#160;&#160;&#160;float left;<br>
@@ -1975,7 +1976,7 @@ typedef enum <a href="#ppd_ui_e">ppd_ui_e</a> ppd_ui_t;
         <td class="description">Width of media in points</td></tr>
 </tbody></table>
       <h2 class="title"><a id="UNIONS">Unions</a></h2>
-<h3 class="union"><span class="info">&#160;CUPS 1.2/macOS 10.5&#160;</span><a id="ppd_cplimit_u">ppd_cplimit_u</a></h3>
+<h3 class="union"><span class="info">&#160;DEPRECATED&#160;</span><a id="ppd_cplimit_u">ppd_cplimit_u</a></h3>
         <p class="description">Custom Parameter Limit </p>
 <p class="code">union ppd_cplimit_u {<br>
 &#160;&#160;&#160;&#160;float custom_curve;<br>
@@ -2006,7 +2007,7 @@ typedef enum <a href="#ppd_ui_e">ppd_ui_e</a> ppd_ui_t;
 <tr><th>custom_string </th>
         <td class="description">String length</td></tr>
 </tbody></table>
-<h3 class="union"><span class="info">&#160;CUPS 1.2/macOS 10.5&#160;</span><a id="ppd_cpvalue_u">ppd_cpvalue_u</a></h3>
+<h3 class="union"><span class="info">&#160;DEPRECATED&#160;</span><a id="ppd_cpvalue_u">ppd_cpvalue_u</a></h3>
         <p class="description">Custom Parameter Value </p>
 <p class="code">union ppd_cpvalue_u {<br>
 &#160;&#160;&#160;&#160;float custom_curve;<br>
@@ -2038,15 +2039,28 @@ typedef enum <a href="#ppd_ui_e">ppd_ui_e</a> ppd_ui_t;
         <td class="description">String value</td></tr>
 </tbody></table>
       <h2 class="title"><a id="ENUMERATIONS">Constants</a></h2>
-      <h3 class="enumeration"><a id="ppd_conform_e"><span class="info">&#160;CUPS 1.1.19/macOS 10.3&#160;</span>ppd_conform_e</a></h3>
+      <h3 class="enumeration"><a id="ppd_conform_e"><span class="info">&#160;DEPRECATED&#160;</span>ppd_conform_e</a></h3>
         <p class="description">Conformance Levels </p>
       <h4 class="constants">Constants</h4>
       <table class="list"><tbody>
         <tr><th>PPD_CONFORM_RELAXED </th>        <td class="description">Relax whitespace and control char</td></tr>
         <tr><th>PPD_CONFORM_STRICT </th>        <td class="description">Require strict conformance</td></tr>
 </tbody></table>
-      <h3 class="enumeration"><a id="ppd_cs_e">ppd_cs_e</a></h3>
-        <p class="description">Colorspaces</p>
+      <h3 class="enumeration"><a id="ppd_cptype_e"><span class="info">&#160;DEPRECATED&#160;</span>ppd_cptype_e</a></h3>
+        <p class="description">Custom Parameter Type </p>
+      <h4 class="constants">Constants</h4>
+      <table class="list"><tbody>
+        <tr><th>PPD_CUSTOM_CURVE </th>        <td class="description">Curve value for f(x) = x^value</td></tr>
+        <tr><th>PPD_CUSTOM_INT </th>        <td class="description">Integer number value</td></tr>
+        <tr><th>PPD_CUSTOM_INVCURVE </th>        <td class="description">Curve value for f(x) = x^(1/value)</td></tr>
+        <tr><th>PPD_CUSTOM_PASSCODE </th>        <td class="description">String of (hidden) numbers</td></tr>
+        <tr><th>PPD_CUSTOM_PASSWORD </th>        <td class="description">String of (hidden) characters</td></tr>
+        <tr><th>PPD_CUSTOM_POINTS </th>        <td class="description">Measurement value in points</td></tr>
+        <tr><th>PPD_CUSTOM_REAL </th>        <td class="description">Real number value</td></tr>
+        <tr><th>PPD_CUSTOM_STRING </th>        <td class="description">String of characters</td></tr>
+</tbody></table>
+      <h3 class="enumeration"><a id="ppd_cs_e"><span class="info">&#160;DEPRECATED&#160;</span>ppd_cs_e</a></h3>
+        <p class="description">Colorspaces </p>
       <h4 class="constants">Constants</h4>
       <table class="list"><tbody>
         <tr><th>PPD_CS_CMY </th>        <td class="description">CMY colorspace</td></tr>
@@ -2056,8 +2070,8 @@ typedef enum <a href="#ppd_ui_e">ppd_ui_e</a> ppd_ui_t;
         <tr><th>PPD_CS_RGB </th>        <td class="description">RGB colorspace</td></tr>
         <tr><th>PPD_CS_RGBK </th>        <td class="description">RGBK (K = gray) colorspace</td></tr>
 </tbody></table>
-      <h3 class="enumeration"><a id="ppd_section_e">ppd_section_e</a></h3>
-        <p class="description">Order dependency sections</p>
+      <h3 class="enumeration"><a id="ppd_section_e"><span class="info">&#160;DEPRECATED&#160;</span>ppd_section_e</a></h3>
+        <p class="description">Order dependency sections </p>
       <h4 class="constants">Constants</h4>
       <table class="list"><tbody>
         <tr><th>PPD_ORDER_ANY </th>        <td class="description">Option code can be anywhere in the file</td></tr>
@@ -2067,7 +2081,7 @@ typedef enum <a href="#ppd_ui_e">ppd_ui_e</a> ppd_ui_t;
         <tr><th>PPD_ORDER_PAGE </th>        <td class="description">... must be in the PageSetup section</td></tr>
         <tr><th>PPD_ORDER_PROLOG </th>        <td class="description">... must be in the Prolog section</td></tr>
 </tbody></table>
-      <h3 class="enumeration"><a id="ppd_status_e"><span class="info">&#160;CUPS 1.1.19/macOS 10.3&#160;</span>ppd_status_e</a></h3>
+      <h3 class="enumeration"><a id="ppd_status_e"><span class="info">&#160;DEPRECATED&#160;</span>ppd_status_e</a></h3>
         <p class="description">Status Codes </p>
       <h4 class="constants">Constants</h4>
       <table class="list"><tbody>
@@ -2096,8 +2110,8 @@ typedef enum <a href="#ppd_ui_e">ppd_ui_e</a> ppd_ui_t;
         <tr><th>PPD_NULL_FILE </th>        <td class="description">NULL PPD file pointer</td></tr>
         <tr><th>PPD_OK </th>        <td class="description">OK</td></tr>
 </tbody></table>
-      <h3 class="enumeration"><a id="ppd_ui_e">ppd_ui_e</a></h3>
-        <p class="description">UI Types</p>
+      <h3 class="enumeration"><a id="ppd_ui_e"><span class="info">&#160;DEPRECATED&#160;</span>ppd_ui_e</a></h3>
+        <p class="description">UI Types </p>
       <h4 class="constants">Constants</h4>
       <table class="list"><tbody>
         <tr><th>PPD_UI_BOOLEAN </th>        <td class="description">True or False option</td></tr>

diff --git a/doc/help/cupspm.epub b/doc/help/cupspm.epub
index 58922235e281b916262a76ab20af195ffce0cba8..ccbc21d728ad03898750fdda41120892aa40af15 100644 (file)
Binary files a/doc/help/cupspm.epub and b/doc/help/cupspm.epub differ

diff --git a/doc/help/cupspm.html b/doc/help/cupspm.html
index 7761956cf38f4af2f7cc147741bdef2ae692a1df..982643b20a54fe17001e601e2e3747bf11cebf19 100644 (file)
--- a/doc/help/cupspm.html
+++ b/doc/help/cupspm.html
@@ -475,6 +475,8 @@ h3.title {
           <li><a href="#ipp_pstate_t">ipp_pstate_t</a></li>
           <li><a href="#ipp_quality_t">ipp_quality_t</a></li>
           <li><a href="#ipp_res_t">ipp_res_t</a></li>
+          <li><a href="#ipp_rstate_t">ipp_rstate_t</a></li>
+          <li><a href="#ipp_sstate_t">ipp_sstate_t</a></li>
           <li><a href="#ipp_state_t">ipp_state_t</a></li>
           <li><a href="#ipp_t">ipp_t</a></li>
         </ul></li>
@@ -502,6 +504,8 @@ h3.title {
           <li><a href="#ipp_pstate_e">ipp_pstate_e</a></li>
           <li><a href="#ipp_quality_e">ipp_quality_e</a></li>
           <li><a href="#ipp_res_e">ipp_res_e</a></li>
+          <li><a href="#ipp_rstate_e">ipp_rstate_e</a></li>
+          <li><a href="#ipp_sstate_e">ipp_sstate_e</a></li>
           <li><a href="#ipp_state_e">ipp_state_e</a></li>
           <li><a href="#ipp_status_e">ipp_status_e</a></li>
           <li><a href="#ipp_tag_e">ipp_tag_e</a></li>
@@ -5936,6 +5940,16 @@ typedef enum <a href="#ipp_quality_e">ipp_quality_e</a> ipp_quality_t;
         <p class="description">Resolution units</p>
       <p class="code">
 typedef enum <a href="#ipp_res_e">ipp_res_e</a> ipp_res_t;
+</p>
+      <h3 class="typedef"><a id="ipp_rstate_t">ipp_rstate_t</a></h3>
+        <p class="description">resource-state values</p>
+      <p class="code">
+typedef enum <a href="#ipp_rstate_e">ipp_rstate_e</a> ipp_rstate_t;
+</p>
+      <h3 class="typedef"><a id="ipp_sstate_t">ipp_sstate_t</a></h3>
+        <p class="description">system-state values</p>
+      <p class="code">
+typedef enum <a href="#ipp_sstate_e">ipp_sstate_e</a> ipp_sstate_t;
 </p>
       <h3 class="typedef"><a id="ipp_state_t">ipp_state_t</a></h3>
         <p class="description">ipp_t state values</p>
@@ -6445,6 +6459,24 @@ are server-oriented...</p>
       <table class="list"><tbody>
         <tr><th>IPP_RES_PER_CM </th>        <td class="description">Pixels per centimeter</td></tr>
         <tr><th>IPP_RES_PER_INCH </th>        <td class="description">Pixels per inch</td></tr>
+</tbody></table>
+      <h3 class="enumeration"><a id="ipp_rstate_e">ipp_rstate_e</a></h3>
+        <p class="description">resource-state values</p>
+      <h4 class="constants">Constants</h4>
+      <table class="list"><tbody>
+        <tr><th>IPP_RSTATE_ABORTED </th>        <td class="description">Resource has been aborted and is pending deletion.</td></tr>
+        <tr><th>IPP_RSTATE_AVAILABLE </th>        <td class="description">Resource is available for installation.</td></tr>
+        <tr><th>IPP_RSTATE_CANCELED </th>        <td class="description">Resource has been canceled and is pending deletion.</td></tr>
+        <tr><th>IPP_RSTATE_INSTALLED </th>        <td class="description">Resource is installed.</td></tr>
+        <tr><th>IPP_RSTATE_PENDING </th>        <td class="description">Resource is created but has no data yet.</td></tr>
+</tbody></table>
+      <h3 class="enumeration"><a id="ipp_sstate_e">ipp_sstate_e</a></h3>
+        <p class="description">system-state values</p>
+      <h4 class="constants">Constants</h4>
+      <table class="list"><tbody>
+        <tr><th>IPP_SSTATE_IDLE </th>        <td class="description">At least one printer is idle and none are processing a job.</td></tr>
+        <tr><th>IPP_SSTATE_PROCESSING </th>        <td class="description">At least one printer is processing a job.</td></tr>
+        <tr><th>IPP_SSTATE_STOPPED </th>        <td class="description">All printers are stopped.</td></tr>
 </tbody></table>
       <h3 class="enumeration"><a id="ipp_state_e">ipp_state_e</a></h3>
         <p class="description">ipp_t state values</p>

diff --git a/doc/help/options.html b/doc/help/options.html
index 044cdb612092d53992e4fee1d62920712bda01f1..9d612fcc978e5eede875edcda282e0e3c86529d7 100644 (file)
--- a/doc/help/options.html
+++ b/doc/help/options.html
@@ -546,24 +546,5 @@ lpr -o mirror filename
 <P>This is typically used when printing on T-shirt transfer
 media or sometimes on transparencies.</P>
 
-<H3><A NAME="RAW">Raw or Unfiltered Output</A></H3>
-
-<P>The <CODE>-o raw</CODE> option allows you to send files
-directly to a printer without filtering. This is sometimes
-required when printing from applications that provide their own
-"printer drivers" for your printer:</P>
-
-<PRE CLASS="command">
-lp -o raw filename
-lpr -o raw filename
-</PRE>
-
-<P>The <CODE>-l</CODE> option can also be used with the
-<B>lpr</B> command to send files directly to a printer:</P>
-
-<PRE CLASS="command">
-lpr -l filename
-</PRE>
-
 </BODY>
 </HTML>

diff --git a/doc/help/spec-ppd.html b/doc/help/spec-ppd.html
index 53f156bb77e8192b11d4f72713a8dc4aca82662f..4e2c29cf761ff79f547a9d51c0adbd40b0653d75 100644 (file)
--- a/doc/help/spec-ppd.html
+++ b/doc/help/spec-ppd.html
@@ -1882,20 +1882,7 @@ http://www.vendor.com/help"
 
 <p class='summary'>*cupsJobPassword: "format"</p>
 
-<p>This keyword defines the format of the "job-password" IPP attribute, if supported by the printer. The following format characters are supported:</p>
-
-<ul>
-       <li><code>1</code>: US ASCII digits.</li>
-       <li><code>A</code>: US ASCII letters.</li>
-       <li><code>C</code>: US ASCII letters, numbers, and punctuation.</li>
-       <li><code>.</code>: Any US ASCII printable character (0x20 to 0x7e).</li>
-       <li><code>N</code>: Any Unicode digit character.</li>
-       <li><code>U</code>: Any Unicode letter character.</li>
-       <li><code>*</code>: Any Unicode (utf-8) character.</li>
-</ul>
-
-<p>The format characters are repeated to indicate the length of the
-password string.  For example, "1111" indicated a 4-digit US ASCII PIN code.</p>
+<p>This keyword defines the format of the job-password IPP attribute, if supported by the printer. Currently the only supported format is "1111" indicating a 4-digit PIN code.</p>
 
 <p>Example:</p>
 
@@ -2189,7 +2176,7 @@ PPD file extensions was used. Currently it must be the string
 
 <h2 class='title'><a name='MACOSX'>macOS Attributes</a></h2>
 
-<h3><span class='info'>macOS 10.3</span><a name='APDialogExtension'>APDialogExtension</a></h3>
+<h3><span class='info'>Deprecated</span><a name='APDialogExtension'>APDialogExtension</a></h3>
 
 <p class='summary'>*APDialogExtension: "/Library/Printers/vendor/filename.plugin"</p>
 
@@ -2201,9 +2188,9 @@ plug-ins.</p>
 
 <blockquote><b>Note:</b>
 
-<p>Starting with macOS 10.5, each plug-in must be compiled "4-way fat"
-(32-bit and 64-bit for both PowerPC and Intel) with garbage collection enabled
-in order to be usable with all applications.</p>
+<p>Starting with macOS 10.12, system level security features prevent print
+dialog plug-ins from being loaded into applications that have enabled the
+library validation security feature.</p>
 
 </blockquote>
 

diff --git a/filter/spec-ppd.shtml b/filter/spec-ppd.shtml
index 6f84dbdabd28cfa667c8f4872970dc7b0dbe26dc..875126e745f046697fd06e6627c99c85ed1e72ab 100644 (file)
--- a/filter/spec-ppd.shtml
+++ b/filter/spec-ppd.shtml
@@ -1632,7 +1632,7 @@ PPD file extensions was used. Currently it must be the string
 
 <h2 class='title'><a name='MACOSX'>macOS Attributes</a></h2>
 
-<h3><span class='info'>macOS 10.3</span><a name='APDialogExtension'>APDialogExtension</a></h3>
+<h3><span class='info'>Deprecated</span><a name='APDialogExtension'>APDialogExtension</a></h3>
 
 <p class='summary'>*APDialogExtension: "/Library/Printers/vendor/filename.plugin"</p>
 
@@ -1644,9 +1644,9 @@ plug-ins.</p>
 
 <blockquote><b>Note:</b>
 
-<p>Starting with macOS 10.5, each plug-in must be compiled "4-way fat"
-(32-bit and 64-bit for both PowerPC and Intel) with garbage collection enabled
-in order to be usable with all applications.</p>
+<p>Starting with macOS 10.12, system level security features prevent print
+dialog plug-ins from being loaded into applications that have enabled the
+library validation security feature.</p>
 
 </blockquote>