From a4c51874f34c93bfbbad5290891c368ac571c496 Mon Sep 17 00:00:00 2001 From: mike Date: Wed, 23 May 2012 22:39:50 +0000 Subject: [PATCH] Updated documentation and tools. git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10507 7a7537e8-13f0-0310-91df-b6672ffda945 --- Makefile | 4 ++-- cgi-bin/makedocset.c | 4 ++-- doc/help/api-cups.html | 18 ++++++++++++++++++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 4475683791..4629bfb997 100644 --- 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 5772828893..4aee5d9a41 100644 --- 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 diff --git a/doc/help/api-cups.html b/doc/help/api-cups.html index 8555764f9b..1cd0e50365 100644 --- a/doc/help/api-cups.html +++ b/doc/help/api-cups.html @@ -494,6 +494,7 @@ information ">cups_dinfo_t
  • cups_job_s
  • cups_option_s
  • cups_size_s
    • +
  • pollfd
  • Variables
    • cups_size_s cups_size_t;
      Top margin in hundredths of millimeters
      +

      pollfd

      +

      User data (unused)

      +

      struct pollfd *pollfds, unsigned int num_pollfds, int timeout, void *context) {
      +    _cups_dnssd_data_t *data;
      +    else if(val 0) data - got_data;
      +    void) timeout;
      +    int val;
      +};

      +

      Members

      +
      +
      data
      +
      Enumeration data
      +
      got_data
      +
      timeout
      +
      val
      +
      Return value
      +

      Variables

      CF_RETURNS_RETAINED

      Get the Apple language identifier associated with a -- 2.47.3