Updated documentation and tools.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10507 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/Makefile b/Makefile
index 44756837912f1106d07052ecfed9e3bc513978ff..4629bfb9976baa8b3dbf74d9ae9a49ecdb23da57 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -275,10 +275,10 @@ docset:   apihelp
                doc/help/api-*.tokens
        $(RM) doc/help/api-*.tokens
        echo Indexing docset...
-       /Developer/usr/bin/docsetutil index org.cups.docset
+       /Applications/Xcode.app/Contents/Developer/usr/bin/docsetutil index org.cups.docset
        echo Generating docset archive and feed...
        $(RM) org.cups.docset.atom
-       /Developer/usr/bin/docsetutil package --output org.cups.docset.xar \
+       /Applications/Xcode.app/Contents/Developer/usr/bin/docsetutil package --output org.cups.docset.xar \
                --atom org.cups.docset.atom \
                --download-url http://www.cups.org/org.cups.docset.xar \
                org.cups.docset

diff --git a/cgi-bin/makedocset.c b/cgi-bin/makedocset.c
index 5772828893ed481bb21018226669847669e50b7c..4aee5d9a41cc0c36e8c81d5dac6d5e0e75ddcc96 100644 (file)
--- a/cgi-bin/makedocset.c
+++ b/cgi-bin/makedocset.c
@@ -3,7 +3,7 @@
  *
  *   Xcode documentation set generator.
  *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -31,7 +31,7 @@
  * Include necessary headers...
  */
 
-#include "cgi.h"
+#include "cgi-private.h"
 #include <errno.h>
 
 

diff --git a/doc/help/api-cups.html b/doc/help/api-cups.html
index 8555764f9b9f70baee84fac2b72f5467bf0e01bd..1cd0e50365dfe066b50d616f4958785d375bda40 100644 (file)
--- a/doc/help/api-cups.html
+++ b/doc/help/api-cups.html
@@ -494,6 +494,7 @@ information ">cups_dinfo_t</a></li>
        <li><a href="#cups_job_s" title="Job">cups_job_s</a></li>
        <li><a href="#cups_option_s" title="Printer Options">cups_option_s</a></li>
        <li><a href="#cups_size_s" title="Media Size ">cups_size_s</a></li>
+       <li><a href="#pollfd" title="User data (unused)">pollfd</a></li>
 </ul></li>
 <li><a href="#VARIABLES">Variables</a><ul class="code">
        <li><a href="#CF_RETURNS_RETAINED" title="Get the Apple language identifier associated with a
@@ -2690,6 +2691,23 @@ typedef struct <a href="#cups_size_s">cups_size_s</a> cups_size_t;
 <dd class="description">Top margin in hundredths of
 millimeters</dd>
 </dl>
+<h3 class="struct"><a name="pollfd">pollfd</a></h3>
+<p class="description">User data (unused)</p>
+<p class="code">struct pollfd *pollfds, unsigned int num_pollfds, int timeout, void *context) {<br>
+&nbsp;&nbsp;&nbsp;&nbsp;_cups_dnssd_data_t *data;<br>
+&nbsp;&nbsp;&nbsp;&nbsp;else if(val 0) data - got_data;<br>
+&nbsp;&nbsp;&nbsp;&nbsp;void) timeout;<br>
+&nbsp;&nbsp;&nbsp;&nbsp;int val;<br>
+};</p>
+<h4 class="members">Members</h4>
+<dl>
+<dt>data </dt>
+<dd class="description">Enumeration data</dd>
+<dt>got_data </dt>
+<dt>timeout </dt>
+<dt>val </dt>
+<dd class="description">Return value</dd>
+</dl>
 <h2 class="title"><a name="VARIABLES">Variables</a></h2>
 <h3 class="variable"><a name="CF_RETURNS_RETAINED">CF_RETURNS_RETAINED</a></h3>
 <p class="description">Get the Apple language identifier associated with a