From: Michael Sweet <michael.r.sweet@gmail.com>
Date: Wed, 11 May 2016 18:47:04 +0000 (-0400)
Subject: Add reference to IANA registry for printer-state-reasons values.
X-Git-Tag: v2.2b1~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d7608ec3ae35fe59cb0e65002e93f1c36fa0957;p=thirdparty%2Fcups.git

Add reference to IANA registry for printer-state-reasons values.
---

diff --git a/CHANGES.txt b/CHANGES.txt
index 2f8b105e93..ecc1e2e1d5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-CHANGES.txt - 2.2b1 - 2016-05-02
+CHANGES.txt - 2.2b1 - 2016-05-11
 --------------------------------
 
 CHANGES IN CUPS V2.2b1
@@ -29,4 +29,4 @@ CHANGES IN CUPS V2.2b1
 	  (<rdar://problem/20221502>)
 	- Localization fixes (<rdar://problem/25292403>,
 	  <rdar://problem/25461517>, Issue #4796)
-	- Documentation changes (Issue #4781)
+	- Documentation changes (Issue #4624, Issue #4781)
diff --git a/cups/api-filter.shtml b/cups/api-filter.shtml
index d61b140f38..ed24604087 100644
--- a/cups/api-filter.shtml
+++ b/cups/api-filter.shtml
@@ -1,7 +1,7 @@
 <!--
   Filter and backend programming introduction for CUPS.
 
-  Copyright 2007-2014 by Apple Inc.
+  Copyright 2007-2016 by Apple Inc.
   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 
   These coded instructions, statements, and computer programs are the
@@ -285,7 +285,7 @@ prefix strings:</p>
 	<dd>Sets or clears printer-state-reason keywords for the current queue.
 	Typically this is used to indicate persistent media, ink, toner, and
 	configuration conditions or errors on a printer.
-	<a href='#TABLE2'>Table 2</a> lists the standard state keywords -
+	<a href='#TABLE2'>Table 2</a> lists some of the standard "printer-state-reasons" keywords from the <a href="http://www.iana.org/assignments/ipp-registrations/ipp-registrations.xhtml#ipp-registrations-4">IANA IPP Registry</a> -
 	use vendor-prefixed ("com.example.foo") keywords for custom states. See
 	<a href="#MANAGING_STATE">Managing Printer State in a Filter</a> for more
 	information.
diff --git a/doc/help/api-array.html b/doc/help/api-array.html
index f1e367ce68..1c1decb903 100644
--- a/doc/help/api-array.html
+++ b/doc/help/api-array.html
@@ -5,7 +5,7 @@
 	<title>Array API	</title>
 	<meta name="keywords" content="Programming">
 	<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-	<meta name="creator" content="Mini-XML v2.7">
+	<meta name="creator" content="Mini-XML v2.8">
 <style type="text/css"><!--
 BODY {
   font-family: lucida grande, geneva, helvetica, arial, sans-serif;
diff --git a/doc/help/api-cups.html b/doc/help/api-cups.html
index 648ad04c1f..3e685a3ce0 100644
--- a/doc/help/api-cups.html
+++ b/doc/help/api-cups.html
@@ -5,7 +5,7 @@
 	<title>CUPS API	</title>
 	<meta name="keywords" content="Programming">
 	<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-	<meta name="creator" content="Mini-XML v2.7">
+	<meta name="creator" content="Mini-XML v2.8">
 <style type="text/css"><!--
 BODY {
   font-family: lucida grande, geneva, helvetica, arial, sans-serif;
@@ -518,8 +518,6 @@ attributes.">pwgInitSize</a></li>
 	<li><a href="#cups_dest_cb_t" title="Destination enumeration callback
 ">cups_dest_cb_t</a></li>
 	<li><a href="#cups_dest_t" title="Destination">cups_dest_t</a></li>
-	<li><a href="#cups_device_cb_t" title="Device callback
-">cups_device_cb_t</a></li>
 	<li><a href="#cups_dinfo_t" title="Destination capability and status
 information ">cups_dinfo_t</a></li>
 	<li><a href="#cups_job_t" title="Job">cups_job_t</a></li>
@@ -3336,12 +3334,6 @@ typedef int (*cups_dest_cb_t)(void *user_data, unsigned flags, <a href="#cups_de
 <p class="code">
 typedef struct <a href="#cups_dest_s">cups_dest_s</a> cups_dest_t;
 </p>
-<h3 class="typedef"><span class="info">&nbsp;CUPS 1.4/OS X 10.6&nbsp;</span><a name="cups_device_cb_t">cups_device_cb_t</a></h3>
-<p class="description">Device callback
-</p>
-<p class="code">
-typedef void (*cups_device_cb_t)(const char *device_class, const char *device_id, const char *device_info, const char *device_make_and_model, const char *device_uri, const char *device_location, void *user_data);
-</p>
 <h3 class="typedef"><span class="info">&nbsp;CUPS 1.6/OS X 10.8&nbsp;</span><a name="cups_dinfo_t">cups_dinfo_t</a></h3>
 <p class="description">Destination capability and status
 information </p>
diff --git a/doc/help/api-filedir.html b/doc/help/api-filedir.html
index a3d517e965..fcc2cdf824 100644
--- a/doc/help/api-filedir.html
+++ b/doc/help/api-filedir.html
@@ -5,7 +5,7 @@
 	<title>File and Directory APIs	</title>
 	<meta name="keywords" content="Programming">
 	<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-	<meta name="creator" content="Mini-XML v2.7">
+	<meta name="creator" content="Mini-XML v2.8">
 <style type="text/css"><!--
 BODY {
   font-family: lucida grande, geneva, helvetica, arial, sans-serif;
diff --git a/doc/help/api-filter.html b/doc/help/api-filter.html
index ec59df70d5..0dfd129b9b 100644
--- a/doc/help/api-filter.html
+++ b/doc/help/api-filter.html
@@ -5,7 +5,7 @@
 	<title>Filter and Backend Programming	</title>
 	<meta name="keywords" content="Programming">
 	<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-	<meta name="creator" content="Mini-XML v2.7">
+	<meta name="creator" content="Mini-XML v2.8">
 <style type="text/css"><!--
 BODY {
   font-family: lucida grande, geneva, helvetica, arial, sans-serif;
@@ -439,7 +439,7 @@ div.contents ul.subcontents li {
 <!--
   Filter and backend programming introduction for CUPS.
 
-  Copyright 2007-2014 by Apple Inc.
+  Copyright 2007-2016 by Apple Inc.
   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 
   These coded instructions, statements, and computer programs are the
@@ -723,7 +723,7 @@ prefix strings:</p>
 	<dd>Sets or clears printer-state-reason keywords for the current queue.
 	Typically this is used to indicate persistent media, ink, toner, and
 	configuration conditions or errors on a printer.
-	<a href='#TABLE2'>Table 2</a> lists the standard state keywords -
+	<a href='#TABLE2'>Table 2</a> lists some of the standard "printer-state-reasons" keywords from the <a href="http://www.iana.org/assignments/ipp-registrations/ipp-registrations.xhtml#ipp-registrations-4">IANA IPP Registry</a> -
 	use vendor-prefixed ("com.example.foo") keywords for custom states. See
 	<a href="#MANAGING_STATE">Managing Printer State in a Filter</a> for more
 	information.
diff --git a/doc/help/api-httpipp.html b/doc/help/api-httpipp.html
index faefc02bc3..991663bd31 100644
--- a/doc/help/api-httpipp.html
+++ b/doc/help/api-httpipp.html
@@ -5,7 +5,7 @@
 	<title>HTTP and IPP APIs	</title>
 	<meta name="keywords" content="Programming">
 	<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-	<meta name="creator" content="Mini-XML v2.7">
+	<meta name="creator" content="Mini-XML v2.8">
 <style type="text/css"><!--
 BODY {
   font-family: lucida grande, geneva, helvetica, arial, sans-serif;
diff --git a/doc/help/api-overview.html b/doc/help/api-overview.html
index 685dc57786..1d9bb1f705 100644
--- a/doc/help/api-overview.html
+++ b/doc/help/api-overview.html
@@ -5,7 +5,7 @@
 	<title>Introduction to CUPS Programming	</title>
 	<meta name="keywords" content="Programming">
 	<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-	<meta name="creator" content="Mini-XML v2.7">
+	<meta name="creator" content="Mini-XML v2.8">
 <style type="text/css"><!--
 BODY {
   font-family: lucida grande, geneva, helvetica, arial, sans-serif;
diff --git a/doc/help/api-ppd.html b/doc/help/api-ppd.html
index 2b35702f8b..ee57da5aaf 100644
--- a/doc/help/api-ppd.html
+++ b/doc/help/api-ppd.html
@@ -5,7 +5,7 @@
 	<title>PPD API (DEPRECATED)	</title>
 	<meta name="keywords" content="Programming">
 	<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-	<meta name="creator" content="Mini-XML v2.7">
+	<meta name="creator" content="Mini-XML v2.8">
 <style type="text/css"><!--
 BODY {
   font-family: lucida grande, geneva, helvetica, arial, sans-serif;
diff --git a/doc/help/api-raster.html b/doc/help/api-raster.html
index 19038d41ce..7dfcf57c59 100644
--- a/doc/help/api-raster.html
+++ b/doc/help/api-raster.html
@@ -5,7 +5,7 @@
 	<title>Raster API	</title>
 	<meta name="keywords" content="Programming">
 	<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-	<meta name="creator" content="Mini-XML v2.7">
+	<meta name="creator" content="Mini-XML v2.8">
 <style type="text/css"><!--
 BODY {
   font-family: lucida grande, geneva, helvetica, arial, sans-serif;
diff --git a/doc/help/postscript-driver.html b/doc/help/postscript-driver.html
index 36a5e19fb4..065d8824a6 100644
--- a/doc/help/postscript-driver.html
+++ b/doc/help/postscript-driver.html
@@ -5,7 +5,7 @@
 	<title>Developing PostScript Printer Drivers	</title>
 	<meta name="keywords" content="Programming">
 	<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-	<meta name="creator" content="Mini-XML v2.7">
+	<meta name="creator" content="Mini-XML v2.8">
 <style type="text/css"><!--
 BODY {
   font-family: lucida grande, geneva, helvetica, arial, sans-serif;
diff --git a/doc/help/ppd-compiler.html b/doc/help/ppd-compiler.html
index 9e601f8425..7cfa2f7650 100644
--- a/doc/help/ppd-compiler.html
+++ b/doc/help/ppd-compiler.html
@@ -5,7 +5,7 @@
 	<title>Introduction to the PPD Compiler	</title>
 	<meta name="keywords" content="Programming">
 	<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-	<meta name="creator" content="Mini-XML v2.7">
+	<meta name="creator" content="Mini-XML v2.8">
 <style type="text/css"><!--
 BODY {
   font-family: lucida grande, geneva, helvetica, arial, sans-serif;
diff --git a/doc/help/raster-driver.html b/doc/help/raster-driver.html
index a44a16b094..69e9214452 100644
--- a/doc/help/raster-driver.html
+++ b/doc/help/raster-driver.html
@@ -5,7 +5,7 @@
 	<title>Developing Raster Printer Drivers	</title>
 	<meta name="keywords" content="Programming">
 	<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-	<meta name="creator" content="Mini-XML v2.7">
+	<meta name="creator" content="Mini-XML v2.8">
 <style type="text/css"><!--
 BODY {
   font-family: lucida grande, geneva, helvetica, arial, sans-serif;
diff --git a/doc/help/spec-ppd.html b/doc/help/spec-ppd.html
index b8e3fe83cb..4f6c641ff8 100644
--- a/doc/help/spec-ppd.html
+++ b/doc/help/spec-ppd.html
@@ -5,7 +5,7 @@
 	<title>CUPS PPD Extensions	</title>
 	<meta name="keywords" content="Specifications">
 	<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-	<meta name="creator" content="Mini-XML v2.7">
+	<meta name="creator" content="Mini-XML v2.8">
 <style type="text/css"><!--
 BODY {
   font-family: lucida grande, geneva, helvetica, arial, sans-serif;