diff options
| author | Didier Raboud <odyx@debian.org> | 2014-01-02 23:03:44 +0100 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2014-01-02 23:03:44 +0100 |
| commit | d13746555c30d1d1bd617dcf64d5b92e319ae2b5 (patch) | |
| tree | ba335eb874926e0d4efebaccb46f2d5d390c7854 /doc | |
| parent | 11884b3954f87fa67f02dca9169df32666b5363c (diff) | |
| download | cups-d13746555c30d1d1bd617dcf64d5b92e319ae2b5.tar.gz | |
Imported Upstream version 1.7.0~rc1upstream/1.7.0_rc1
Diffstat (limited to 'doc')
42 files changed, 629 insertions, 386 deletions
diff --git a/doc/Makefile b/doc/Makefile index 6ebeae94..0db512cc 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 10763 2012-12-13 20:29:45Z mike $" +# "$Id: Makefile 11109 2013-07-08 21:15:13Z msweet $" # # Documentation makefile for CUPS. # @@ -125,7 +125,6 @@ HELPFILES = \ help/spec-ppd.html \ help/spec-raster.html \ help/spec-stp.html \ - help/standard.html \ help/translation.html \ help/whatsnew.html diff --git a/doc/help/api-array.html b/doc/help/api-array.html index 7211fd8a..0c1998ee 100644 --- a/doc/help/api-array.html +++ b/doc/help/api-array.html @@ -341,7 +341,7 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: api-array.html 10424 2012-04-23 17:26:57Z mike $" + "$Id: api-array.header 7266 2008-01-29 02:15:29Z mike $" Array API header for CUPS. @@ -413,7 +413,7 @@ div.contents ul.subcontents li { </ul></li> </ul> <!-- - "$Id: api-array.html 10424 2012-04-23 17:26:57Z mike $" + "$Id: api-array.shtml 7616 2008-05-28 00:34:13Z mike $" Array API introduction for CUPS. diff --git a/doc/help/api-cgi.html b/doc/help/api-cgi.html index 5c07e58a..82c740a8 100644 --- a/doc/help/api-cgi.html +++ b/doc/help/api-cgi.html @@ -341,7 +341,7 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: api-cgi.html 9740 2011-05-04 06:26:22Z mike $" + "$Id: api-array.header 8087 2008-10-27 21:37:05Z mike $" CGI API header for CUPS. @@ -437,7 +437,7 @@ by the template file.">cgiGetAttributes</a></li> </ul></li> </ul> <!-- - "$Id: api-cgi.html 9740 2011-05-04 06:26:22Z mike $" + "$Id: api-array.shtml 7616 2008-05-28 00:34:13Z mike $" CGI API introduction for CUPS. diff --git a/doc/help/api-cups.html b/doc/help/api-cups.html index 3f4f48b0..b355e108 100644 --- a/doc/help/api-cups.html +++ b/doc/help/api-cups.html @@ -341,7 +341,7 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: api-cups.html 10909 2013-03-14 18:45:49Z mike $" + "$Id: api-cups.header 7279 2008-01-31 01:50:44Z mike $" CUPS API header for CUPS. @@ -547,11 +547,11 @@ constants">cups_ptype_e</a></li> </ul></li> </ul> <!-- - "$Id: api-cups.html 10909 2013-03-14 18:45:49Z mike $" + "$Id: api-cups.shtml 7337 2008-02-22 04:44:04Z mike $" API introduction for CUPS. - Copyright 2007-2011 by Apple Inc. + Copyright 2007-2013 by Apple Inc. Copyright 1997-2006 by Easy Software Products, all rights reserved. These coded instructions, statements, and computer programs are the @@ -731,7 +731,7 @@ int num_options = 0; <a href='#cups_option_t'>cups_option_t</a> *options = NULL; <a href='#cups_dest_t'>cups_dest_t</a> *dest; -for (i = 0; i < dest->num_options; i ++) +for (i = 0; i < dest->num_options; i ++) num_options = <a href='#cupsAddOption'>cupsAddOption</a>(dest->options[i].name, dest->options[i].value, num_options, &options); </pre> @@ -783,7 +783,7 @@ job_id = <a href='#cupsPrintFiles'>cupsPrintFiles</a>(dest->name, 3, files, "Tes <p>Finally, the <a href='#cupsCreateJob'><code>cupsCreateJob</code></a> function creates a new job with no files in it. Files are added using the -<a href='#cupsStartDocument'><code>cupsStartDocument</code></a>, +<a href='#cupsStartDocument'><code>cupsStartDocument</code></a>, <a href='api-httpipp.html#cupsWriteRequestData'><code>cupsWriteRequestData</code></a>, and <a href='#cupsFinishDocument'><code>cupsFinishDocument</code></a> functions. The following example creates a job with 10 text files for printing:</p> @@ -847,7 +847,7 @@ int num_jobs; <a href='#cups_job_t'>cups_job_t</a> *jobs; int i; ipp_jstate_t job_state = IPP_JOB_PENDING; - + while (job_state < IPP_JOB_STOPPED) { /* Get my jobs (1) with any state (-1) */ @@ -1629,7 +1629,7 @@ Enumeration happens on the current thread and does not return until all destinations have been enumerated or the block returns 0. </p> -<h3 class="function"><span class="info"> CUPS 1.7 </span><a name="cupsFindDestDefault">cupsFindDestDefault</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="cupsFindDestDefault">cupsFindDestDefault</a></h3> <p class="description">Find the default value(s) for the given option.</p> <p class="code"> ipp_attribute_t *cupsFindDestDefault (<br> @@ -1659,7 +1659,7 @@ ipp_attribute_t *cupsFindDestDefault (<br> functions to inspect the default value(s) as needed. </p> -<h3 class="function"><span class="info"> CUPS 1.7 </span><a name="cupsFindDestReady">cupsFindDestReady</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="cupsFindDestReady">cupsFindDestReady</a></h3> <p class="description">Find the default value(s) for the given option.</p> <p class="code"> ipp_attribute_t *cupsFindDestReady (<br> @@ -1689,7 +1689,7 @@ ipp_attribute_t *cupsFindDestReady (<br> functions to inspect the default value(s) as needed. </p> -<h3 class="function"><span class="info"> CUPS 1.7 </span><a name="cupsFindDestSupported">cupsFindDestSupported</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="cupsFindDestSupported">cupsFindDestSupported</a></h3> <p class="description">Find the default value(s) for the given option.</p> <p class="code"> ipp_attribute_t *cupsFindDestSupported (<br> @@ -1893,7 +1893,7 @@ not support the lpoptions-defined default printer. <h4 class="discussion">Discussion</h4> <p class="discussion">Use the <a href="#cupsGetDests"><code>cupsGetDests</code></a> or <a href="#cupsGetDests2"><code>cupsGetDests2</code></a> functions to get a list of supported destinations for the current user.</p> -<h3 class="function"><span class="info"> CUPS 1.7 </span><a name="cupsGetDestMediaByIndex">cupsGetDestMediaByIndex</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="cupsGetDestMediaByIndex">cupsGetDestMediaByIndex</a></h3> <p class="description">Get a media name, dimension, and margins for a specific size.</p> <p class="code"> @@ -2021,7 +2021,7 @@ The matching result (if any) is returned in the "cups_size_t" structur Returns 1 when there is a match and 0 if there is not a match. </p> -<h3 class="function"><span class="info"> CUPS 1.7 </span><a name="cupsGetDestMediaCount">cupsGetDestMediaCount</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="cupsGetDestMediaCount">cupsGetDestMediaCount</a></h3> <p class="description">Get the number of sizes supported by a destination.</p> <p class="code"> @@ -2050,7 +2050,7 @@ counted. For example, passing <code>CUPS_MEDIA_FLAGS_BORDERLESS</code> will ret the number of borderless sizes. </p> -<h3 class="function"><span class="info"> CUPS 1.7 </span><a name="cupsGetDestMediaDefault">cupsGetDestMediaDefault</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="cupsGetDestMediaDefault">cupsGetDestMediaDefault</a></h3> <p class="description">Get the default size for a destination.</p> <p class="code"> int cupsGetDestMediaDefault (<br> @@ -3019,7 +3019,7 @@ void cupsSetUser (<br> Note: The current user name is tracked separately for each thread in a program. Multi-threaded programs that override the user name need to do so in each thread for the same user name to be used.</p> -<h3 class="function"><span class="info"> CUPS 1.7 </span><a name="cupsSetUserAgent">cupsSetUserAgent</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="cupsSetUserAgent">cupsSetUserAgent</a></h3> <p class="description">Set the default HTTP User-Agent string.</p> <p class="code"> void cupsSetUserAgent (<br> @@ -3192,13 +3192,13 @@ const char *cupsUser (void);</p> program. Multi-threaded programs that override the user name with the <a href="#cupsSetUser"><code>cupsSetUser</code></a> function need to do so in each thread for the same user name to be used.</p> -<h3 class="function"><span class="info"> CUPS 1.7 </span><a name="cupsUserAgent">cupsUserAgent</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="cupsUserAgent">cupsUserAgent</a></h3> <p class="description">Return the default HTTP User-Agent string.</p> <p class="code"> const char *cupsUserAgent (void);</p> <h4 class="returnvalue">Return Value</h4> <p class="description">User-Agent string</p> -<h3 class="function"><span class="info"> CUPS 1.7 </span><a name="pwgFormatSizeName">pwgFormatSizeName</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="pwgFormatSizeName">pwgFormatSizeName</a></h3> <p class="description">Generate a PWG self-describing media size name.</p> <p class="code"> int pwgFormatSizeName (<br> @@ -3246,7 +3246,7 @@ units string is <code>NULL</code>, otherwise inches ("in") or millimet are used. </p> -<h3 class="function"><span class="info"> CUPS 1.7 </span><a name="pwgInitSize">pwgInitSize</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="pwgInitSize">pwgInitSize</a></h3> <p class="description">Initialize a pwg_size_t structure using IPP Job Template attributes.</p> <p class="code"> @@ -3276,7 +3276,7 @@ member attribute was specified in the "media-col" Job Template attribu otherwise it is initialized to 0. </p> -<h3 class="function"><span class="info"> CUPS 1.7 </span><a name="pwgMediaForLegacy">pwgMediaForLegacy</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="pwgMediaForLegacy">pwgMediaForLegacy</a></h3> <p class="description">Find a PWG media size by ISO/IPP legacy name.</p> <p class="code"> <a href="#pwg_media_t">pwg_media_t</a> *pwgMediaForLegacy (<br> @@ -3294,7 +3294,7 @@ otherwise it is initialized to 0. "iso-a4" or "na-letter". </p> -<h3 class="function"><span class="info"> CUPS 1.7 </span><a name="pwgMediaForPPD">pwgMediaForPPD</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="pwgMediaForPPD">pwgMediaForPPD</a></h3> <p class="description">Find a PWG media size by Adobe PPD name.</p> <p class="code"> <a href="#pwg_media_t">pwg_media_t</a> *pwgMediaForPPD (<br> @@ -3318,7 +3318,7 @@ thread. Custom names can be of the form "Custom.WIDTHxLENGTH[units]" "WIDTHxLENGTH[units]". </p> -<h3 class="function"><span class="info"> CUPS 1.7 </span><a name="pwgMediaForPWG">pwgMediaForPWG</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="pwgMediaForPWG">pwgMediaForPWG</a></h3> <p class="description">Find a PWG media size by 5101.1 self-describing name.</p> <p class="code"> <a href="#pwg_media_t">pwg_media_t</a> *pwgMediaForPWG (<br> @@ -3340,7 +3340,7 @@ thread-local storage and is overwritten by each call to the function in the thread. </p> -<h3 class="function"><span class="info"> CUPS 1.7 </span><a name="pwgMediaForSize">pwgMediaForSize</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="pwgMediaForSize">pwgMediaForSize</a></h3> <p class="description">Get the PWG media size for the given dimensions.</p> <p class="code"> <a href="#pwg_media_t">pwg_media_t</a> *pwgMediaForSize (<br> diff --git a/doc/help/api-driver.html b/doc/help/api-driver.html index 1a3ee3ae..d0e4a55e 100644 --- a/doc/help/api-driver.html +++ b/doc/help/api-driver.html @@ -341,7 +341,7 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: api-driver.html 9740 2011-05-04 06:26:22Z mike $" + "$Id$" Driver API header for CUPS. @@ -430,7 +430,7 @@ media, and resolution.">cupsFindAttr</a></li> </ul></li> </ul> <!-- - "$Id: api-driver.html 9740 2011-05-04 06:26:22Z mike $" + "$Id$" Driver API introduction for CUPS. diff --git a/doc/help/api-filedir.html b/doc/help/api-filedir.html index 8d31c7f4..fc7b72a4 100644 --- a/doc/help/api-filedir.html +++ b/doc/help/api-filedir.html @@ -341,7 +341,7 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: api-filedir.html 10424 2012-04-23 17:26:57Z mike $" + "$Id: api-filedir.header 7279 2008-01-31 01:50:44Z mike $" File and Directory API header for CUPS. @@ -424,7 +424,7 @@ file.">cupsFileRewind</a></li> </ul></li> </ul> <!-- - "$Id: api-filedir.html 10424 2012-04-23 17:26:57Z mike $" + "$Id: api-filedir.shtml 7279 2008-01-31 01:50:44Z mike $" File and directory API introduction for CUPS. diff --git a/doc/help/api-filter.html b/doc/help/api-filter.html index 9433c655..54280587 100644 --- a/doc/help/api-filter.html +++ b/doc/help/api-filter.html @@ -341,7 +341,7 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: api-filter.html 10424 2012-04-23 17:26:57Z mike $" + "$Id: api-filter.header 7616 2008-05-28 00:34:13Z mike $" Filter and backend programming header for CUPS. @@ -426,11 +426,11 @@ div.contents ul.subcontents li { </ul></li> </ul> <!-- - "$Id: api-filter.html 10424 2012-04-23 17:26:57Z mike $" + "$Id: api-filter.shtml 7677 2008-06-19 23:22:19Z mike $" Filter and backend programming introduction for CUPS. - Copyright 2007-2012 by Apple Inc. + Copyright 2007-2013 by Apple Inc. Copyright 1997-2006 by Easy Software Products, all rights reserved. These coded instructions, statements, and computer programs are the @@ -915,7 +915,7 @@ from localizing the vendor-prefixed keyword in the PPD file - otherwise both the generic and vendor-specific keyword will be shown in the user interface.</p> -</blockquote></dd> +</blockquote> <h4><a name="REPORTING_SUPPLIES">Reporting Supply Levels</a></h4> @@ -1040,7 +1040,7 @@ datalen = sizeof(data) - 1; status = <a href="#cupsSideChannelDoRequest">cupsSideChannelDoRequest</a>(CUPS_SC_CMD_GET_DEVICE_ID, data, &datalen, 1.0); /* Use the returned value if OK was returned and the length is non-zero */ -if (status == CUPS_SC_STATUS_OK && datalen > 0) +if (status == CUPS_SC_STATUS_OK && datalen > 0) data[datalen] = '\0'; else data[0] = '\0'; diff --git a/doc/help/api-httpipp.html b/doc/help/api-httpipp.html index ddd9a81e..f6f117b5 100644 --- a/doc/help/api-httpipp.html +++ b/doc/help/api-httpipp.html @@ -341,7 +341,7 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: api-httpipp.html 10922 2013-03-20 18:14:10Z mike $" + "$Id: api-httpipp.header 7258 2008-01-28 00:15:05Z mike $" HTTP and IPP API header for CUPS. @@ -676,7 +676,7 @@ are server-oriented...">http_state_e</a></li> </ul></li> </ul> <!-- - "$Id: api-httpipp.html 10922 2013-03-20 18:14:10Z mike $" + "$Id: api-httpipp.shtml 7684 2008-06-23 16:47:38Z mike $" HTTP and IPP API introduction for CUPS. @@ -1401,7 +1401,7 @@ http_status_t cupsWriteRequestData (<br> after <a href="#cupsStartDocument"><code>cupsStartDocument</code></a> to provide a document file. </p> -<h3 class="function"><span class="info"> CUPS 1.7 </span><a name="httpAcceptConnection">httpAcceptConnection</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="httpAcceptConnection">httpAcceptConnection</a></h3> <p class="description">Accept a new HTTP client connection from the specified listening socket.</p> <p class="code"> @@ -1484,7 +1484,7 @@ int httpAddrLength (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Length in bytes</p> -<h3 class="function"><span class="info"> CUPS 1.7 </span><a name="httpAddrListen">httpAddrListen</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="httpAddrListen">httpAddrListen</a></h3> <p class="description">Create a listening socket bound to the specified address and port.</p> <p class="code"> @@ -1533,7 +1533,7 @@ char *httpAddrLookup (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Host name</p> -<h3 class="function"><span class="info"> CUPS 1.7 </span><a name="httpAddrPort">httpAddrPort</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="httpAddrPort">httpAddrPort</a></h3> <p class="description">Get the port number associated with an address.</p> <p class="code"> int httpAddrPort (<br> @@ -1653,7 +1653,7 @@ this function in place of traditional string functions whenever you need to create a URI string. </p> -<h3 class="function"><span class="info"> CUPS 1.7 </span><a name="httpAssembleUUID">httpAssembleUUID</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="httpAssembleUUID">httpAssembleUUID</a></h3> <p class="description">Assemble a name-based UUID URN conforming to RFC 4122.</p> <p class="code"> char *httpAssembleUUID (<br> @@ -1769,7 +1769,7 @@ void httpClose (<br> <p class="discussion">This function is deprecated - use <a href="#httpConnect2"><code>httpConnect2</code></a> instead. </p> -<h3 class="function"><span class="info"> CUPS 1.7 </span><a name="httpConnect2">httpConnect2</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="httpConnect2">httpConnect2</a></h3> <p class="description">Connect to a HTTP server.</p> <p class="code"> <a href="#http_t">http_t</a> *httpConnect2 (<br> @@ -2056,7 +2056,7 @@ int httpGetBlocking (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">1 if blocking, 0 if non-blocking</p> -<h3 class="function"><span class="info"> CUPS 1.7 </span><a name="httpGetContentEncoding">httpGetContentEncoding</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="httpGetContentEncoding">httpGetContentEncoding</a></h3> <p class="description">Get a common content encoding, if any, between the client and server.</p> <p class="code"> @@ -2137,7 +2137,7 @@ time_t httpGetDateTime (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">UNIX time</p> -<h3 class="function"><span class="info"> CUPS 1.7 </span><a name="httpGetExpect">httpGetExpect</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="httpGetExpect">httpGetExpect</a></h3> <p class="description">Get the value of the Expect header, if any.</p> <p class="code"> http_status_t httpGetExpect (<br> @@ -2466,7 +2466,7 @@ int httpOptions (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Status of call (0 = success)</p> -<h3 class="function"><span class="info"> CUPS 1.7 </span><a name="httpPeek">httpPeek</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="httpPeek">httpPeek</a></h3> <p class="description">Peek at data from a HTTP connection.</p> <p class="code"> ssize_t httpPeek (<br> @@ -2568,7 +2568,7 @@ ssize_t httpRead2 (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Number of bytes read</p> -<h3 class="function"><span class="info"> CUPS 1.7 </span><a name="httpReadRequest">httpReadRequest</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="httpReadRequest">httpReadRequest</a></h3> <p class="description">Read a HTTP request from a connection.</p> <p class="code"> <a href="#http_state_t">http_state_t</a> httpReadRequest (<br> @@ -2799,7 +2799,7 @@ int httpSetCredentials (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Status of call (0 = success)</p> -<h3 class="function"><span class="info"> CUPS 1.7 </span><a name="httpSetDefaultField">httpSetDefaultField</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="httpSetDefaultField">httpSetDefaultField</a></h3> <p class="description">Set the default value of an HTTP header.</p> <p class="code"> void httpSetDefaultField (<br> @@ -3002,7 +3002,7 @@ ssize_t httpWrite2 (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Number of bytes written</p> -<h3 class="function"><span class="info"> CUPS 1.7 </span><a name="httpWriteResponse">httpWriteResponse</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="httpWriteResponse">httpWriteResponse</a></h3> <p class="description">Write a HTTP response to a client connection.</p> <p class="code"> int httpWriteResponse (<br> @@ -3548,7 +3548,7 @@ Supported string values include charset (<code>IPP_TAG_CHARSET</code>), keyword <br> The <code>language</code> parameter must be non-<code>NULL</code> for nameWithLanguage and textWithLanguage string values and must be <code>NULL</code> for all other string values.</p> -<h3 class="function"><span class="info"> CUPS 1.7 </span><a name="ippAddStringf">ippAddStringf</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="ippAddStringf">ippAddStringf</a></h3> <p class="description">Add a formatted string to an IPP message.</p> <p class="code"> <a href="#ipp_attribute_t">ipp_attribute_t</a> *ippAddStringf (<br> @@ -3607,7 +3607,7 @@ needed. The formatted string is truncated as needed to the maximum length of the corresponding value type. </p> -<h3 class="function"><span class="info"> CUPS 1.7 </span><a name="ippAddStringfv">ippAddStringfv</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="ippAddStringfv">ippAddStringfv</a></h3> <p class="description">Add a formatted string to an IPP message.</p> <p class="code"> <a href="#ipp_attribute_t">ipp_attribute_t</a> *ippAddStringfv (<br> @@ -3741,7 +3741,7 @@ trailing nul. The buffer pointer can be NULL to get the required length, just like (v)snprintf. </p> -<h3 class="function"><span class="info"> CUPS 1.7 </span><a name="ippContainsInteger">ippContainsInteger</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="ippContainsInteger">ippContainsInteger</a></h3> <p class="description">Determine whether an attribute contains the specified value or is within the list of ranges.</p> <p class="code"> @@ -3764,7 +3764,7 @@ enum value, or the value falls within one of the rangeOfInteger values for the attribute. </p> -<h3 class="function"><span class="info"> CUPS 1.7 </span><a name="ippContainsString">ippContainsString</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="ippContainsString">ippContainsString</a></h3> <p class="description">Determine whether an attribute contains the specified string value.</p> <p class="code"> @@ -3849,7 +3849,7 @@ attributes that are copied - the function must return 1 to copy the attribute or itself. </p> -<h3 class="function"><span class="info"> CUPS 1.7 </span><a name="ippCreateRequestedArray">ippCreateRequestedArray</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="ippCreateRequestedArray">ippCreateRequestedArray</a></h3> <p class="description">Create a CUPS array of attribute names from the given requested-attributes attribute.</p> <p class="code"> @@ -4180,7 +4180,7 @@ const char *ippGetName (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Attribute name or <code>NULL</code> for separators</p> -<h3 class="function"><span class="info"> CUPS 1.7 </span><a name="ippGetOctetString">ippGetOctetString</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="ippGetOctetString">ippGetOctetString</a></h3> <p class="description">Get an octetString value from an IPP attribute.</p> <p class="code"> void *ippGetOctetString (<br> @@ -4397,7 +4397,7 @@ attributes-natural-language attributes added. The attributes-natural-language value is derived from the current locale. </p> -<h3 class="function"><span class="info"> CUPS 1.7 </span><a name="ippNewResponse">ippNewResponse</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="ippNewResponse">ippNewResponse</a></h3> <p class="description">Allocate a new IPP response message.</p> <p class="code"> <a href="#ipp_t">ipp_t</a> *ippNewResponse (<br> @@ -4707,7 +4707,7 @@ the <a href="#ippNew"><code>ippNew</code></a>, <a href="#ippNewRequest"><code>ip The <code>attr</code> parameter may be modified as a result of setting the value. </p> -<h3 class="function"><span class="info"> CUPS 1.7 </span><a name="ippSetOctetString">ippSetOctetString</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="ippSetOctetString">ippSetOctetString</a></h3> <p class="description">Set an octetString value in an IPP attribute.</p> <p class="code"> int ippSetOctetString (<br> @@ -4939,7 +4939,7 @@ The <code>element</code> parameter specifies which value to set from 0 to <a href="#ippGetCount(attr)"><code>ippGetCount(attr)</code></a>. </p> -<h3 class="function"><span class="info"> CUPS 1.7 </span><a name="ippSetStringf">ippSetStringf</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="ippSetStringf">ippSetStringf</a></h3> <p class="description">Set a formatted string value of an attribute.</p> <p class="code"> int ippSetStringf (<br> @@ -4979,7 +4979,7 @@ needed. The formatted string is truncated as needed to the maximum length of the corresponding value type. </p> -<h3 class="function"><span class="info"> CUPS 1.7 </span><a name="ippSetStringfv">ippSetStringfv</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="ippSetStringfv">ippSetStringfv</a></h3> <p class="description">Set a formatted string value of an attribute.</p> <p class="code"> int ippSetStringfv (<br> @@ -5130,7 +5130,7 @@ const <a href="#ipp_uchar_t">ipp_uchar_t</a> *ippTimeToDate (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">RFC-1903 date/time data</p> -<h3 class="function"><span class="info"> CUPS 1.7 </span><a name="ippValidateAttribute">ippValidateAttribute</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="ippValidateAttribute">ippValidateAttribute</a></h3> <p class="description">Validate the contents of an attribute.</p> <p class="code"> int ippValidateAttribute (<br> @@ -5149,7 +5149,7 @@ value tag. 1 is returned if the attribute is valid, 0 otherwise. On failure, cupsLastErrorString() is set to a human-readable message. </p> -<h3 class="function"><span class="info"> CUPS 1.7 </span><a name="ippValidateAttributes">ippValidateAttributes</a></h3> +<h3 class="function"><span class="info"> CUPS 1.7/OS X 10.9 </span><a name="ippValidateAttributes">ippValidateAttributes</a></h3> <p class="description">Validate all attributes in an IPP message.</p> <p class="code"> int ippValidateAttributes (<br> @@ -5483,13 +5483,13 @@ with a hostname. </p> <p class="description">HTTP field names</p> <h4 class="constants">Constants</h4> <dl> -<dt>HTTP_FIELD_ACCEPT_ENCODING <span class="info"> CUPS 1.7 </span></dt> +<dt>HTTP_FIELD_ACCEPT_ENCODING <span class="info"> CUPS 1.7/OS X 10.9 </span></dt> <dd class="description">Accepting-Encoding field </dd> <dt>HTTP_FIELD_ACCEPT_LANGUAGE </dt> <dd class="description">Accept-Language field</dd> <dt>HTTP_FIELD_ACCEPT_RANGES </dt> <dd class="description">Accept-Ranges field</dd> -<dt>HTTP_FIELD_ALLOW <span class="info"> CUPS 1.7 </span></dt> +<dt>HTTP_FIELD_ALLOW <span class="info"> CUPS 1.7/OS X 10.9 </span></dt> <dd class="description">Allow field </dd> <dt>HTTP_FIELD_AUTHORIZATION </dt> <dd class="description">Authorization field</dd> @@ -5535,7 +5535,7 @@ with a hostname. </p> <dd class="description">Referer field</dd> <dt>HTTP_FIELD_RETRY_AFTER </dt> <dd class="description">Retry-After field</dd> -<dt>HTTP_FIELD_SERVER <span class="info"> CUPS 1.7 </span></dt> +<dt>HTTP_FIELD_SERVER <span class="info"> CUPS 1.7/OS X 10.9 </span></dt> <dd class="description">Server field </dd> <dt>HTTP_FIELD_TRANSFER_ENCODING </dt> <dd class="description">Transfer-Encoding field</dd> @@ -5590,9 +5590,9 @@ are server-oriented...</p> <dd class="description">Command complete, sending status</dd> <dt>HTTP_STATE_TRACE </dt> <dd class="description">TRACE command, waiting for blank line</dd> -<dt>HTTP_STATE_UNKNOWN_METHOD <span class="info"> CUPS 1.7 </span></dt> +<dt>HTTP_STATE_UNKNOWN_METHOD <span class="info"> CUPS 1.7/OS X 10.9 </span></dt> <dd class="description">Unknown request method, waiting for blank line </dd> -<dt>HTTP_STATE_UNKNOWN_VERSION <span class="info"> CUPS 1.7 </span></dt> +<dt>HTTP_STATE_UNKNOWN_VERSION <span class="info"> CUPS 1.7/OS X 10.9 </span></dt> <dd class="description">Unknown request method, waiting for blank line </dd> <dt>HTTP_STATE_WAITING </dt> <dd class="description">Waiting for command</dd> @@ -5637,7 +5637,7 @@ are server-oriented...</p> <dd class="description">Document has moved temporarily</dd> <dt>HTTP_STATUS_MULTIPLE_CHOICES </dt> <dd class="description">Multiple files match request</dd> -<dt>HTTP_STATUS_NONE <span class="info"> CUPS 1.7 </span></dt> +<dt>HTTP_STATUS_NONE <span class="info"> CUPS 1.7/OS X 10.9 </span></dt> <dd class="description">No Expect value </dd> <dt>HTTP_STATUS_NOT_ACCEPTABLE </dt> <dd class="description">Not Acceptable</dd> @@ -5706,6 +5706,8 @@ are server-oriented...</p> <dd class="description">En/decode the query portion</dd> <dt>HTTP_URI_CODING_RESOURCE </dt> <dd class="description">En/decode the resource portion</dd> +<dt>HTTP_URI_CODING_RFC6874 </dt> +<dd class="description">Use RFC 6874 address format</dd> <dt>HTTP_URI_CODING_USERNAME </dt> <dd class="description">En/decode the username portion</dd> </dl> @@ -5850,12 +5852,66 @@ are server-oriented...</p> <dd class="description">Stitch along top edge</dd> <dt>IPP_FINISHINGS_FOLD </dt> <dd class="description">Fold (any type)</dd> +<dt>IPP_FINISHINGS_FOLD_ACCORDIAN </dt> +<dd class="description">Accordian-fold the paper vertically into four sections</dd> +<dt>IPP_FINISHINGS_FOLD_DOUBLE_GATE </dt> +<dd class="description">Fold the top and bottom quarters of the paper towards the midline, then fold in half vertically</dd> +<dt>IPP_FINISHINGS_FOLD_GATE </dt> +<dd class="description">Fold the top and bottom quarters of the paper towards the midline</dd> +<dt>IPP_FINISHINGS_FOLD_HALF </dt> +<dd class="description">Fold the paper in half vertically</dd> +<dt>IPP_FINISHINGS_FOLD_HALF_Z </dt> +<dd class="description">Fold the paper in half horizontally, then Z-fold the paper vertically</dd> +<dt>IPP_FINISHINGS_FOLD_LEFT_GATE </dt> +<dd class="description">Fold the top quarter of the paper towards the midline</dd> +<dt>IPP_FINISHINGS_FOLD_LETTER </dt> +<dd class="description">Fold the paper into three sections vertically; sometimes also known as a C fold</dd> +<dt>IPP_FINISHINGS_FOLD_PARALLEL </dt> +<dd class="description">Fold the paper in half vertically two times, yielding four sections</dd> +<dt>IPP_FINISHINGS_FOLD_POSTER </dt> +<dd class="description">Fold the paper in half horizontally and vertically; sometimes also called a cross fold</dd> +<dt>IPP_FINISHINGS_FOLD_RIGHT_GATE </dt> +<dd class="description">Fold the bottom quarter of the paper towards the midline</dd> +<dt>IPP_FINISHINGS_FOLD_Z </dt> +<dd class="description">Fold the paper vertically into three sections, forming a Z</dd> <dt>IPP_FINISHINGS_JOG_OFFSET </dt> <dd class="description">Offset for binding (any type)</dd> <dt>IPP_FINISHINGS_NONE </dt> <dd class="description">No finishing</dd> <dt>IPP_FINISHINGS_PUNCH </dt> <dd class="description">Punch (any location/count)</dd> +<dt>IPP_FINISHINGS_PUNCH_BOTTOM_LEFT </dt> +<dd class="description">Punch 1 hole bottom left</dd> +<dt>IPP_FINISHINGS_PUNCH_BOTTOM_RIGHT </dt> +<dd class="description">Punch 1 hole bottom right</dd> +<dt>IPP_FINISHINGS_PUNCH_DUAL_BOTTOM </dt> +<dd class="description">Punch 2 holes bottom edge</dd> +<dt>IPP_FINISHINGS_PUNCH_DUAL_LEFT </dt> +<dd class="description">Punch 2 holes left side</dd> +<dt>IPP_FINISHINGS_PUNCH_DUAL_RIGHT </dt> +<dd class="description">Punch 2 holes right side</dd> +<dt>IPP_FINISHINGS_PUNCH_DUAL_TOP </dt> +<dd class="description">Punch 2 holes top edge</dd> +<dt>IPP_FINISHINGS_PUNCH_QUAD_BOTTOM </dt> +<dd class="description">Punch 4 holes bottom edge</dd> +<dt>IPP_FINISHINGS_PUNCH_QUAD_LEFT </dt> +<dd class="description">Punch 4 holes left side</dd> +<dt>IPP_FINISHINGS_PUNCH_QUAD_RIGHT </dt> +<dd class="description">Punch 4 holes right side</dd> +<dt>IPP_FINISHINGS_PUNCH_QUAD_TOP </dt> +<dd class="description">Punch 4 holes top edge</dd> +<dt>IPP_FINISHINGS_PUNCH_TOP_LEFT </dt> +<dd class="description">Punch 1 hole top left</dd> +<dt>IPP_FINISHINGS_PUNCH_TOP_RIGHT </dt> +<dd class="description">Punch 1 hole top right</dd> +<dt>IPP_FINISHINGS_PUNCH_TRIPLE_BOTTOM </dt> +<dd class="description">Punch 3 holes bottom edge</dd> +<dt>IPP_FINISHINGS_PUNCH_TRIPLE_LEFT </dt> +<dd class="description">Punch 3 holes left side</dd> +<dt>IPP_FINISHINGS_PUNCH_TRIPLE_RIGHT </dt> +<dd class="description">Punch 3 holes right side</dd> +<dt>IPP_FINISHINGS_PUNCH_TRIPLE_TOP </dt> +<dd class="description">Punch 3 holes top edge</dd> <dt>IPP_FINISHINGS_SADDLE_STITCH </dt> <dd class="description">Staple interior</dd> <dt>IPP_FINISHINGS_STAPLE </dt> @@ -5988,8 +6044,6 @@ are server-oriented...</p> <dd class="description">Get subscription attributes </dd> <dt>IPP_OP_HOLD_JOB </dt> <dd class="description">Hold a job for printing</dd> -<dt>IPP_OP_IDENTIFY_PRINTER </dt> -<dd class="description">Identify-Printer (proposed IPP JPS3)</dd> <dt>IPP_OP_PAUSE_PRINTER </dt> <dd class="description">Stop a printer</dd> <dt>IPP_OP_PRINT_JOB </dt> @@ -6010,8 +6064,6 @@ are server-oriented...</p> <dd class="description">Add a file to a job</dd> <dt>IPP_OP_SET_JOB_ATTRIBUTES </dt> <dd class="description">Set job attributes</dd> -<dt>IPP_OP_VALIDATE_DOCUMENT </dt> -<dd class="description">Validate-Document (proposed IPP JPS3)</dd> <dt>IPP_OP_VALIDATE_JOB </dt> <dd class="description">Validate job options</dd> </dl> @@ -6098,13 +6150,13 @@ are server-oriented...</p> <dd class="description">client-error-compression-not-supported</dd> <dt>IPP_STATUS_ERROR_CONFLICTING </dt> <dd class="description">client-error-conflicting-attributes</dd> -<dt>IPP_STATUS_ERROR_CUPS_ACCOUNT_AUTHORIZATION_FAILED <span class="info"> CUPS 1.7 </span></dt> +<dt>IPP_STATUS_ERROR_CUPS_ACCOUNT_AUTHORIZATION_FAILED <span class="info"> CUPS 1.7/OS X 10.9 </span></dt> <dd class="description">cups-error-account-authorization-failed </dd> -<dt>IPP_STATUS_ERROR_CUPS_ACCOUNT_CLOSED <span class="info"> CUPS 1.7 </span></dt> +<dt>IPP_STATUS_ERROR_CUPS_ACCOUNT_CLOSED <span class="info"> CUPS 1.7/OS X 10.9 </span></dt> <dd class="description">cups-error-account-closed </dd> -<dt>IPP_STATUS_ERROR_CUPS_ACCOUNT_INFO_NEEDED <span class="info"> CUPS 1.7 </span></dt> +<dt>IPP_STATUS_ERROR_CUPS_ACCOUNT_INFO_NEEDED <span class="info"> CUPS 1.7/OS X 10.9 </span></dt> <dd class="description">cups-error-account-info-needed </dd> -<dt>IPP_STATUS_ERROR_CUPS_ACCOUNT_LIMIT_REACHED <span class="info"> CUPS 1.7 </span></dt> +<dt>IPP_STATUS_ERROR_CUPS_ACCOUNT_LIMIT_REACHED <span class="info"> CUPS 1.7/OS X 10.9 </span></dt> <dd class="description">cups-error-account-limit-reached </dd> <dt>IPP_STATUS_ERROR_CUPS_AUTHENTICATION_CANCELED <span class="info"> CUPS 1.5/OS X 10.7 </span></dt> <dd class="description">cups-authentication-canceled - Authentication canceled by user </dd> diff --git a/doc/help/api-mime.html b/doc/help/api-mime.html index c2733764..22699278 100644 --- a/doc/help/api-mime.html +++ b/doc/help/api-mime.html @@ -341,7 +341,7 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: api-mime.html 9772 2011-05-12 05:46:30Z mike $" + "$Id: api-array.header 8087 2008-10-27 21:37:05Z mike $" MIME API header for CUPS. @@ -412,7 +412,7 @@ including file size.">mimeFilter2</a></li> </ul></li> </ul> <!-- - "$Id: api-mime.html 9772 2011-05-12 05:46:30Z mike $" + "$Id: api-array.shtml 7616 2008-05-28 00:34:13Z mike $" MIME API introduction for CUPS. diff --git a/doc/help/api-overview.html b/doc/help/api-overview.html index 278df7ca..a310f6e1 100644 --- a/doc/help/api-overview.html +++ b/doc/help/api-overview.html @@ -341,7 +341,7 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: api-overview.html 9772 2011-05-12 05:46:30Z mike $" + "$Id: api-cups.header 7279 2008-01-31 01:50:44Z mike $" Introduction to CUPS programming header for CUPS. @@ -403,7 +403,7 @@ div.contents ul.subcontents li { <li><a href="#WHERETOGO">Where to Go Next</a></li> </ul> <!-- - "$Id: api-overview.html 9772 2011-05-12 05:46:30Z mike $" + "$Id: api-cups.header 7279 2008-01-31 01:50:44Z mike $" Introduction to CUPS programming content for CUPS. diff --git a/doc/help/api-ppd.html b/doc/help/api-ppd.html index 1be3ed13..6530d4b9 100644 --- a/doc/help/api-ppd.html +++ b/doc/help/api-ppd.html @@ -341,7 +341,7 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: api-ppd.html 10441 2012-04-30 20:59:09Z mike $" + "$Id: api-ppd.header 7616 2008-05-28 00:34:13Z mike $" PPD API header for CUPS. @@ -486,7 +486,7 @@ conflicts.">ppdMarkOption</a></li> </ul></li> </ul> <!-- - "$Id: api-ppd.html 10441 2012-04-30 20:59:09Z mike $" + "$Id: api-ppd.shtml 7616 2008-05-28 00:34:13Z mike $" PPD API introduction for CUPS. diff --git a/doc/help/api-ppdc.html b/doc/help/api-ppdc.html index 25ccef40..484288e6 100644 --- a/doc/help/api-ppdc.html +++ b/doc/help/api-ppdc.html @@ -341,7 +341,7 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: api-ppdc.html 10356 2012-03-16 16:03:10Z mike $" + "$Id: api-array.header 8087 2008-10-27 21:37:05Z mike $" PPD Compiler API header for CUPS. @@ -414,7 +414,7 @@ div.contents ul.subcontents li { </ul></li> </ul> <!-- - "$Id: api-ppdc.html 10356 2012-03-16 16:03:10Z mike $" + "$Id: api-array.shtml 7616 2008-05-28 00:34:13Z mike $" PPD Compiler API introduction for CUPS. diff --git a/doc/help/api-raster.html b/doc/help/api-raster.html index 4a77da3c..f2dade43 100644 --- a/doc/help/api-raster.html +++ b/doc/help/api-raster.html @@ -341,7 +341,7 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: api-raster.html 10424 2012-04-23 17:26:57Z mike $" + "$Id$" Raster API documentation for CUPS. @@ -434,11 +434,11 @@ page header structure.">cupsRasterWriteHeader2</a></li> </ul></li> </ul> <!-- - "$Id: api-raster.html 10424 2012-04-23 17:26:57Z mike $" + "$Id$" Raster API introduction for CUPS. - Copyright 2007-2012 by Apple Inc. + Copyright 2007-2013 by Apple Inc. Copyright 1997-2006 by Easy Software Products, all rights reserved. These coded instructions, statements, and computer programs are the @@ -653,7 +653,7 @@ requested attributes cannot be supported.<br> <br> <code>cupsRasterInterpretPPD</code> supports a subset of the PostScript language. -Currently only the <code>[</code>, <code>]</code>, <code><<</code>, <code>>></code>, <code>{</code>, +Currently only the <code>[</code>, <code>]</code>, <code><<</code>, <code>>></code>, <code>{</code>, <code>}</code>, <code>cleartomark</code>, <code>copy</code>, <code>dup</code>, <code>index</code>, <code>pop</code>, <code>roll</code>, <code>setpagedevice</code>, and <code>stopped</code> operators are supported. diff --git a/doc/help/man-client.conf.html b/doc/help/man-client.conf.html index ee932446..a18e8dca 100644 --- a/doc/help/man-client.conf.html +++ b/doc/help/man-client.conf.html @@ -36,7 +36,7 @@ location. <dd>Specifies the Kerberos service name that is used for authentication, typically "host", "http", or "ipp". CUPS adds the remote hostname ("name@server.example.com") for you. The default name is -"host". +"http". </dd> <dt>ServerName hostname-or-ip-address[:port] </dt> @@ -47,6 +47,13 @@ location. <dd>Specifies the address and optionally the port to use when connecting to the server. <b>Note: Not supported on OS X 10.7 or later.</b> </dd> +<dt>ServerName hostname-or-ip-address[:port]/version=1.1 +</dt> +<dd></dd> +<dd>Specifies the address and optionally the port to use when connecting to a +server running CUPS 1.3.12 and earlier. <b>Note: Not supported on OS X 10.7 or +later.</b> +</dd> <dt>User name </dt> <dd></dd> diff --git a/doc/help/man-cups-deviced.html b/doc/help/man-cups-deviced.html index 1940f642..df252508 100644 --- a/doc/help/man-cups-deviced.html +++ b/doc/help/man-cups-deviced.html @@ -14,8 +14,8 @@ cups-deviced - cups device daemon </b><i>request-id limit user-id options </i><h2 class="title"><a name="DESCRIPTION">Description</a></h2> <i>cups-deviced</i> polls the backends in -<i>/usr/lib/cups/backend</i> for a list of available devices. -It is run by <a href='man-cupsd.html?TOPIC=Man+Pages'>cupsd(8)</a> in response to a +<i>/usr/lib/cups/backend</i> or <i>/usr/libexec/cups/backend</i> (OS X) for a +list of available devices. It is run by <a href='man-cupsd.html?TOPIC=Man+Pages'>cupsd(8)</a> in response to a <i>CUPS-Get-Devices</i> request. The output format is an IPP response message. The <i>request-id</i> argument is the request ID from the original IPP request, typically 1. The <i>limit</i> diff --git a/doc/help/man-cups-driverd.html b/doc/help/man-cups-driverd.html index e161435b..0fc9183a 100644 --- a/doc/help/man-cups-driverd.html +++ b/doc/help/man-cups-driverd.html @@ -36,9 +36,9 @@ accordingly. <h2 class="title"><a name="DRIVERS">Drivers</a></h2> Drivers can be static PPD files under the <i>/usr/share/cups/model</i> directory or programs under the -<i>/usr/lib/cups/driver</i> directory. Static PPD files must -conform to the Adobe PPD File Format Specification version 4.3 -and may be compressed using the <i>gzip(1)</i> program. Driver +<i>/usr/lib/cups/driver</i> or <i>/usr/libexec/cups/driver</i> (OS X) directories. +Static PPD files must conform to the Adobe PPD File Format Specification version +4.3 and may be compressed using the <i>gzip(1)</i> program. Driver programs must implement the command-line interface shown in the next section. <h3><a name="DRIVER_PROGRAMS">Driver Programs</a></h3> diff --git a/doc/help/man-cups-snmp.html b/doc/help/man-cups-snmp.html index 9b80a8f7..d3d1a6a7 100644 --- a/doc/help/man-cups-snmp.html +++ b/doc/help/man-cups-snmp.html @@ -13,6 +13,9 @@ snmp - cups snmp backend <b>/usr/lib/cups/backend/snmp </b><i>ip-address-or-hostname </i><br> +<b>/usr/libexec/cups/backend/snmp +</b><i>ip-address-or-hostname +</i><br> <b>lpinfo -v --include-schemes snmp </b><h2 class="title"><a name="DESCRIPTION">Description</a></h2> The CUPS SNMP backend provides legacy discovery and identification of network diff --git a/doc/help/man-cupsaddsmb.html b/doc/help/man-cupsaddsmb.html index 37349460..0bb0ddcd 100644 --- a/doc/help/man-cupsaddsmb.html +++ b/doc/help/man-cupsaddsmb.html @@ -114,10 +114,7 @@ Windows 2000 or higher in the drivers and %WINDIR%\SYSTEM32\SPOOL\DRIVERS\X64\3 folder for 64-bit drivers. -<p>The CUPS printer driver is preferred over the Microsoft driver -since it supports the page-label, job-billing, and -job-hold-until options fully on all printers. However, currently -only Windows 2000 and higher is supported by the Microsoft +<p>However, currently only Windows 2000 and higher is supported by the Microsoft driver, so you will also need to get the Adobe driver to support Windows 95, 98, and Me clients. The Adobe and Microsoft drivers for Windows 2000 are identical. @@ -137,36 +134,6 @@ as named below: you use the lowercase filenames shown above, otherwise <i>cupsaddsmb</i> will fail to export the drivers. -<h2 class="title"><a name="CUPS_POSTSCRIPT_DRIVERS_FOR_WINDOWS">Cups Postscript Drivers For Windows</a></h2> -<i>cupsaddsmb</i> can use the CUPS v6 PostScript printer driver -for Windows, which is available for download from the CUPS web -site. -<p>The CUPS printer driver is preferred over the Adobe and -Microsoft drivers since it supports the page-label, job-billing, -and job-hold-until options fully on all printers. However, -currently only Windows 2000 and higher is supported by the CUPS -driver, so you will also need to get the Adobe driver to support -Windows 95, 98, and Me clients. -<p>Once you have extracted the driver files, copy the 32-bit drivers -to the <i>/usr/share/cups/drivers</i> directory and the 64-bit -drivers to the <i>/usr/share/cups/drivers/x64</i> directory exactly -as named below: -<pre> - - [Windows 2000 and higher] - cups6.inf (from www.cups.org) - cups6.ini (from www.cups.org) - cupsps6.dll (from www.cups.org) - cupsui6.dll (from www.cups.org) - ps5ui.dll (from your Windows system) - pscript.hlp (from your Windows system) - pscript.ntf (from your Windows system) - pscript5.dll (from your Windows system) -</pre> -<p><b>Note:</b> Unlike Windows, case is significant - make sure that -you use the lowercase filenames shown above, otherwise -<i>cupsaddsmb</i> will fail to export the drivers. - <h2 class="title"><a name="ADOBE_POSTSCRIPT_DRIVERS_FOR_WINDOWS_95,_98,_AND_ME">Adobe Postscript Drivers For Windows 95, 98, And Me</a></h2> <i>cupsaddsmb</i> can use the Adobe PostScript printer driver for Windows 95, 98, and ME, which are available for download from the diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html index 995fda2d..227ccfe2 100644 --- a/doc/help/man-cupsd.conf.html +++ b/doc/help/man-cupsd.conf.html @@ -242,7 +242,7 @@ are run to print a job. </dt> <dd></dd> <dd>Specifies the service name when using Kerberos authentication. The default -service name is "host". +service name is "http". </dd> <dt>HostNameLookups On </dt> diff --git a/doc/help/man-ippfind.html b/doc/help/man-ippfind.html new file mode 100644 index 00000000..e614ad4d --- /dev/null +++ b/doc/help/man-ippfind.html @@ -0,0 +1,316 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<html> +<!-- SECTION: Man Pages --> +<head> + <link rel="stylesheet" type="text/css" href="../cups-printable.css"> + <title>ippfind(1)</title> +</head> +<body> +<h1 class="title">ippfind(1)</h1> +<h2 class="title"><a name="NAME">Name</a></h2> +ippfind - find internet printing protocol printers +<h2 class="title"><a name="SYNOPSIS">Synopsis</a></h2> +<b>ippfind +</b>[ +<i>options +</i>] regtype[,subtype][.domain.] ... [ +<i>expression ... +</i>] +<b>ippfind +</b>[ +<i>options +</i>] name[.regtype[.domain.]] ... [ +<i>expression ... +</i>] +<b>ippfind +</b>--help +<b>ippfind +</b>--version +<h2 class="title"><a name="OPTIONS">Options</a></h2> +<dl> +<dt>--help +</dt> +<dd>Show program help +</dd> +<dt>--version +</dt> +<dd>Show program version +</dd> +<dt>-4 +</dt> +<dd>Use IPv4 when listing +</dd> +<dt>-6 +</dt> +<dd>Use IPv6 when listing +</dd> +<dt>-T seconds +</dt> +<dd>Specify find timeout in seconds. If 1 or less, <i>ippfind</i> stops as soon as it thinks it has found everything. The default is 1 second. +</dd> +<dt>-V version +</dt> +<dd>Specifies the IPP version when listing. Supported values are 1.1, 2.0, 2.1, and 2.2. + +</dd> +</dl> +<h2 class="title"><a name="DESCRIPTION">Description</a></h2> +<i>ippfind</i> finds services registered with a DNS server or available through local devices. Its primary purpose is to find IPP printers and show their URIs, show their current status, or run commands. For example, to show the status of all registered IPP printers on your network, run: +<pre> + ippfind --ls +</pre> +Similarly, to send a PostScript test page to every PostScript printer, run: +<pre> + ippfind --txt-pdl application/postscript --exec ipptool \ + -f onepage-letter.ps '{}' print-job.test \; +</pre> + +<h2 class="title"><a name="REGISTRATION_TYPES">Registration Types</a></h2> +<i>ippfind</i> supports the following registration types: +<dl> +<dt>_http._tcp +</dt> +<dd>HyperText Transport Protocol (HTTP, RFC 2616) +</dd> +<dt>_https._tcp +</dt> +<dd>Secure HyperText Transport Protocol (HTTPS, RFC 2818) +</dd> +<dt>_ipp._tcp +</dt> +<dd>Internet Printing Protocol (IPP, RFC 2911) +</dd> +<dt>_ipps._tcp +</dt> +<dd>Secure Internet Printing Protocol (IPPS, draft) +</dd> +<dt>_printer._tcp +</dt> +<dd>Line Printer Daemon (LPD, RFC 1179) + +</dd> +</dl> +<h2 class="title"><a name="EXPRESSIONS">Expressions</a></h2> +<i>ippfind</i> supports expressions much like the <i>find(1)</i> utility. However, unlike <i>find</i>, <i>ippfind</i> uses POSIX regular expressions instead of shell filename matching patterns. If --exec, -l, --ls, -p, --print, --print-name, -q, --quiet, -s, or -x is not specified, <i>ippfind</i> adds --print to print the service URI of anything it finds. The following expressions are supported: +<dl> +<dt>-d regex +</dt> +<dd></dd> +<dt>--domain regex +</dt> +<dd>True if the domain matches the given regular expression. +</dd> +<dt>--false +</dt> +<dd>Always false. +</dd> +<dt>-h regex +</dt> +<dd></dd> +<dt>--host regex +</dt> +<dd>True is the hostname matches the given regular expression. +</dd> +<dt>-l +</dt> +<dd></dd> +<dt>--ls +</dt> +<dd>Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional <i>find</i> "-ls" output for HTTP URLs. The result is true if the URI is accessible, false otherwise. +</dd> +<dt>--local +</dt> +<dd>True if the service is local to this computer. +</dd> +<dt>-n regex +</dt> +<dd></dd> +<dt>--name regex +</dt> +<dd>True if the service instance name matches the given regular expression. +</dd> +<dt>--path regex +</dt> +<dd>True if the URI resource path matches the given regular expression. +</dd> +<dt>-P number[-number] +</dt> +<dd></dd> +<dt>--port number[-number] +</dt> +<dd>True if the port matches the given number or range. +</dd> +<dt>-p +</dt> +<dd></dd> +<dt>--print +</dt> +<dd>Prints the URI if the result of previous expressions is true. The result is always true. +</dd> +<dt>-q +</dt> +<dd></dd> +<dt>--quiet +</dt> +<dd>Quiet mode - just returns the exit codes below. +</dd> +<dt>-r +</dt> +<dd></dd> +<dt>--remote +</dt> +<dd>True if the service is not local to this computer. +</dd> +<dt>-s +</dt> +<dd></dd> +<dt>--print-name +</dt> +<dd>Prints the service instance name if the result of previous expressions is true. The result is always true. +</dd> +<dt>--true +</dt> +<dd>Always true. +</dd> +<dt>-t key +</dt> +<dd></dd> +<dt>--txt key +</dt> +<dd>True if the TXT record contains the named key. +</dd> +<dt>--txt-<i>key</i> regex +</dt> +<dd>True if the TXT record contains the named key and matches the given regular +expression. +</dd> +<dt>-u regex +</dt> +<dd></dd> +<dt>--uri regex +</dt> +<dd>True if the URI matches the given regular expression. +</dd> +<dt>-x utility [argument ...] ; +</dt> +<dd></dd> +<dt>--exec utility [argument ...] ; +</dt> +<dd>Executes the specified program if the current result is true. "{foo}" arguments are replaced with the corresponding value - see SUBSTITUTIONS below. +</dd> +</dl> +<p>Expressions may also contain modifiers: +<dl> +<dt>( expression ) +</dt> +<dd>Group the result of expressions. +</dd> +<dt>! expression +</dt> +<dd></dd> +<dt>--not expression +</dt> +<dd>Unary NOT of the expression. +</dd> +<dt>expression expression +</dt> +<dd></dd> +<dt>expression --and expression +</dt> +<dd>Logical AND of expressions. +</dd> +<dt>expression --or expression +</dt> +<dd>Logical OR of expressions. + +</dd> +</dl> +<h2 class="title"><a name="SUBSTITUTIONS">Substitutions</a></h2> +The substitutions for "{foo}" in -e and --exec are: +<dl> +<dt>{} +</dt> +<dd>URI +</dd> +<dt>{service_domain} +</dt> +<dd>Domain name, e.g., "example.com.", "local.", etc. +</dd> +<dt>{service_hostname} +</dt> +<dd>Fully-qualified domain name, e.g., "printer.example.com.", "printer.local.", etc. +</dd> +<dt>{service_name} +</dt> +<dd>Service instance name, e.g., "My Fine Printer". +</dd> +<dt>{service_port} +</dt> +<dd>Port number for server, typically 631 for IPP and 80 for HTTP. +</dd> +<dt>{service_regtype} +</dt> +<dd>DNS-SD registration type, e.g., "_ipp._tcp", "_http._tcp", etc. +</dd> +<dt>{service_scheme} +</dt> +<dd>URI scheme for DNS-SD registration type, e.g., "ipp", "http", etc. +</dd> +<dt>{service_uri} +</dt> +<dd>URI for service, e.g., "ipp://printer.local./ipp/print", "<a href='http://printer.local./",'>http://printer.local./",</a> etc. +</dd> +<dt>{txt_<i>key</i>} +</dt> +<dd>Value of TXT record <i>key</i> (lowercase). + +</dd> +</dl> +<h2 class="title"><a name="ENVIRONMENT_VARIABLES">Environment Variables</a></h2> +When executing a program, <i>ippfind</i> sets the following environment variables for the matching service registration: +<dl> +<dt>IPPFIND_SERVICE_DOMAIN +</dt> +<dd>Domain name, e.g., "example.com.", "local.", etc. +</dd> +<dt>IPPFIND_SERVICE_HOSTNAME +</dt> +<dd>Fully-qualified domain name, e.g., "printer.example.com.", "printer.local.", etc. +</dd> +<dt>IPPFIND_SERVICE_NAME +</dt> +<dd>Service instance name, e.g., "My Fine Printer". +</dd> +<dt>IPPFIND_SERVICE_PORT +</dt> +<dd>Port number for server, typically 631 for IPP and 80 for HTTP. +</dd> +<dt>IPPFIND_SERVICE_REGTYPE +</dt> +<dd>DNS-SD registration type, e.g., "_ipp._tcp", "_http._tcp", etc. +</dd> +<dt>IPPFIND_SERVICE_SCHEME +</dt> +<dd>URI scheme for DNS-SD registration type, e.g., "ipp", "http", etc. +</dd> +<dt>IPPFIND_SERVICE_URI +</dt> +<dd>URI for service, e.g., "ipp://printer.local./ipp/print", "<a href='http://printer.local./",'>http://printer.local./",</a> etc. +</dd> +<dt>IPPFIND_TXT_<i>KEY</i> +</dt> +<dd>Values of TXT record <i>KEY</i> (uppercase). + +</dd> +</dl> +<h2 class="title"><a name="EXIT_CODES">Exit Codes</a></h2> +<i>ippfind</i> returns 0 if the result for all processed expressions is true, 1 if the result of any processed expression is false, 2 if browsing or any query or resolution failed, 3 if an undefined option or invalid expression was specified, and 4 if it ran out of memory. + +<h2 class="title"><a name="SEE_ALSO">See Also</a></h2> +<a href='man-ipptool.html?TOPIC=Man+Pages'>ipptool(1)</a> + +<h2 class="title"><a name="COPYRIGHT">Copyright</a></h2> +Copyright 2013 by Apple Inc. + +</body> +</html> diff --git a/doc/help/man-ipptool.html b/doc/help/man-ipptool.html index 189613a9..486080c6 100644 --- a/doc/help/man-ipptool.html +++ b/doc/help/man-ipptool.html @@ -11,7 +11,8 @@ ipptool - perform internet printing protocol requests <h2 class="title"><a name="SYNOPSIS">Synopsis</a></h2> <b>ipptool -</b>[ -4 ] [ -6 ] [ -C ] [ -E ] [ -I ] [ -L ] [ -S ] [ -T +</b>[ --help ] [ --stop-after-include-error ] [ --version ] +[ -4 ] [ -6 ] [ -C ] [ -E ] [ -I ] [ -L ] [ -S ] [ -T <i>seconds </i>] [ -V <i>version @@ -34,6 +35,14 @@ ipptool - perform internet printing protocol requests <h2 class="title"><a name="OPTIONS">Options</a></h2> The following options are recognized by <i>ipptool</i>: <dl> +<dt>--help +</dt> +<dd>Shows program help. +--stop-after-include-error +Tells <i>ipptool</i> to stop if an error occurs in an included file. Normally <i>ipptool</i> will continue with subsequent tests after the INCLUDE directive. +--version +Shows the version of <i>ipptool</i> being used. +</dd> <dt>-4 </dt> <dd>Specifies that <i>ipptool</i> must connect to the printer or server using IPv4. @@ -107,6 +116,8 @@ The following options are recognized by <i>ipptool</i>: <dd>Specifies that all request and response attributes should be output in CUPS test mode (<i>-t</i>). This is the default for XML output. </dd> </dl> +<h2 class="title"><a name="EXIT_CODE">Exit Code</a></h2> +The <i>ipptool</i> program returns 0 if all tests were sucessful and 1 otherwise. <h2 class="title"><a name="COMPATIBILITY">Compatibility</a></h2> The <i>ipptool</i> program is unique to CUPS. <h2 class="title"><a name="EXAMPLES">Examples</a></h2> @@ -130,21 +141,28 @@ The following standard files are available: document-letter.ps get-completed-jobs.test get-jobs.test + get-notifications.test get-printer-attributes.test + get-subscriptions.test gray.jpg ipp-1.1.test ipp-2.0.test ipp-2.1.test ipp-2.2.test + ipp-everywhere.test onepage-a4.pdf onepage-a4.ps onepage-letter.pdf onepage-letter.ps print-job.test + print-job-deflate.test + print-job-gzip.test testfile.jpg + testfile.pcl testfile.pdf testfile.ps testfile.txt + validate-job.test </pre> <h2 class="title"><a name="SEE_ALSO">See Also</a></h2> <a href='man-ipptoolfile.html?TOPIC=Man+Pages'>ipptoolfile(5)</a>, diff --git a/doc/help/man-ipptoolfile.html b/doc/help/man-ipptoolfile.html index 7011a973..1ce4f195 100644 --- a/doc/help/man-ipptoolfile.html +++ b/doc/help/man-ipptoolfile.html @@ -76,6 +76,10 @@ The following directives can be used outside of a test: <dd>Defines the named variable to the given value if it does not already have a value. </dd> +<dt>FILE-ID "identifier" +</dt> +<dd>Specifies an identifier string for the current file. +</dd> <dt>IGNORE-ERRORS yes </dt> <dd></dd> @@ -119,6 +123,13 @@ includes a file from the <i>ipptool</i> include directory. <dd>Specifies that the remainder of the test file should be skipped when the variable is or is not defined. </dd> +<dt>STOP-AFTER-INCLUDE-ERROR no +</dt> +<dd></dd> +<dt>STOP-AFTER-INCLUDE-ERROR yes +</dt> +<dd>Specifies whether tests will be stopped after an error in an included file. +</dd> <dt>TRANSFER auto </dt> <dd>Specifies that tests will, by default, use "Transfer-Encoding: chunked" for @@ -264,6 +275,10 @@ resulted in an error/failure. added as predicates - see the "STATUS PREDICATES" section for more information on predicates. </dd> +<dt>TEST-ID "identifier" +</dt> +<dd>Specifies an identifier string for the current test. +</dd> <dt>TRANSFER auto </dt> <dd>Specifies that this test will use "Transfer-Encoding: chunked" if it has an @@ -353,6 +368,27 @@ matches or does not match. <dd>Requires the EXPECT attribute to have the same number of values as the specified parallel attribute. </dd> +<dt>WITH-ALL-HOSTNAMES "literal string" +</dt> +<dd></dd> +<dt>WITH-ALL-HOSTNAMES "/regular expression/" +</dt> +<dd>Requires that all URI values contain a matching hostname. +</dd> +<dt>WITH-ALL-RESOURCES "literal string" +</dt> +<dd></dd> +<dt>WITH-ALL-RESOURCES "/regular expression/" +</dt> +<dd>Requires that all URI values contain a matching resource (including leading /). +</dd> +<dt>WITH-ALL-SCHEMES "literal string" +</dt> +<dd></dd> +<dt>WITH-ALL-SCHEMES "/regular expression/" +</dt> +<dd>Requires that all URI values contain a matching scheme. +</dd> <dt>WITH-ALL-VALUES "literal string" </dt> <dd>Requires that all values of the EXPECT attribute match the literal string. Comparisons are case-sensitive. @@ -381,6 +417,27 @@ parallel attribute. </dt> <dd>Requires that all values of the EXPECT attribute match the regular expression, which must conform to the POSIX regular expression syntax. Comparisons are case-sensitive. </dd> +<dt>WITH-HOSTNAME "literal string" +</dt> +<dd></dd> +<dt>WITH-HOSTNAME "/regular expression/" +</dt> +<dd>Requires that at least one URI value contains a matching hostname. +</dd> +<dt>WITH-RESOURCE "literal string" +</dt> +<dd></dd> +<dt>WITH-RESOURCE "/regular expression/" +</dt> +<dd>Requires that at least one URI value contains a matching resource (including leading /). +</dd> +<dt>WITH-SCHEME "literal string" +</dt> +<dd></dd> +<dt>WITH-SCHEME "/regular expression/" +</dt> +<dd>Requires that at least one URI value contains a matching scheme. +</dd> <dt>WITH-VALUE "literal string" </dt> <dd>Requires that at least one value of the EXPECT attribute matches the literal string. Comparisons are case-sensitive. @@ -506,6 +563,7 @@ RFC 2911 and other IPP extension specifications. Here is a complete list: Resume-Printer Schedule-Job-After Send-Document + Send-Hardcopy-Document Send-Notifications Send-URI Set-Job-Attributes diff --git a/doc/help/network.html b/doc/help/network.html index ef9fbefb..21112f69 100644 --- a/doc/help/network.html +++ b/doc/help/network.html @@ -88,10 +88,10 @@ page on the device.</P> <PRE> socket://<i>ip-address-or-hostname</i> socket://<i>ip-address-or-hostname</i>/?option=value -socket://<i>ip-address-or-hostname</i>/?option=value&option=value +socket://<i>ip-address-or-hostname</i>/?option=value&option=value socket://<i>ip-address-or-hostname</i>:<i>port-number</i> socket://<i>ip-address-or-hostname</i>:<i>port-number</i>/?option=value -socket://<i>ip-address-or-hostname</i>:<i>port-number</i>/?option=value&option=value +socket://<i>ip-address-or-hostname</i>:<i>port-number</i>/?option=value&option=value </PRE> <P>The "contimeout" option controls the number of seconds that the backend will wait to obtain a connection to the printer. The default is 1 week.</P> @@ -107,19 +107,19 @@ socket://<i>ip-address-or-hostname</i>:<i>port-number</i>/?option=value&option=v <PRE> http://<i>ip-address-or-hostname</i>:<i>port-number</i>/<i>resource</i> http://<i>ip-address-or-hostname</i>:<i>port-number</i>/<i>resource</i>?<i>option=value</i> -http://<i>ip-address-or-hostname</i>:<i>port-number</i>/<i>resource</i>?<i>option=value&option=value</i> +http://<i>ip-address-or-hostname</i>:<i>port-number</i>/<i>resource</i>?<i>option=value&option=value</i> ipp://<i>ip-address-or-hostname</i>/<i>resource</i> ipp://<i>ip-address-or-hostname</i>/<i>resource</i>?<i>option=value</i> -ipp://<i>ip-address-or-hostname</i>/<i>resource</i>?<i>option=value&option=value</i> +ipp://<i>ip-address-or-hostname</i>/<i>resource</i>?<i>option=value&option=value</i> ipp://<i>ip-address-or-hostname</i>:<i>port-number</i>/<i>resource</i> ipp://<i>ip-address-or-hostname</i>:<i>port-number</i>/<i>resource</i>?<i>option=value</i> -ipp://<i>ip-address-or-hostname</i>:<i>port-number</i>/<i>resource</i>?<i>option=value&option=value</i> +ipp://<i>ip-address-or-hostname</i>:<i>port-number</i>/<i>resource</i>?<i>option=value&option=value</i> ipps://<i>ip-address-or-hostname</i>/<i>resource</i> ipps://<i>ip-address-or-hostname</i>/<i>resource</i>?<i>option=value</i> -ipps://<i>ip-address-or-hostname</i>/<i>resource</i>?<i>option=value&option=value</i> +ipps://<i>ip-address-or-hostname</i>/<i>resource</i>?<i>option=value&option=value</i> ipps://<i>ip-address-or-hostname</i>:<i>port-number</i>/<i>resource</i> ipps://<i>ip-address-or-hostname</i>:<i>port-number</i>/<i>resource</i>?<i>option=value</i> -ipps://<i>ip-address-or-hostname</i>:<i>port-number</i>/<i>resource</i>?<i>option=value&option=value</i> +ipps://<i>ip-address-or-hostname</i>:<i>port-number</i>/<i>resource</i>?<i>option=value&option=value</i> </PRE> <P>The <tt>ipp</tt> backend supports many options, which are summarized in <A HREF="#TABLE2">Table 2</A>.</P> @@ -189,8 +189,8 @@ lpd://<i>ip-address-or-hostname</i>/<i>queue</i> lpd://<i>username@ip-address-or-hostname</i>/<i>queue</i> lpd://<i>ip-address-or-hostname</i>/<i>queue</i>?<i>option=value</i> lpd://<i>username@ip-address-or-hostname</i>/<i>queue</i>?<i>option=value</i> -lpd://<i>ip-address-or-hostname</i>/<i>queue</i>?<i>option=value&option=value</i> -lpd://<i>username@ip-address-or-hostname</i>/<i>queue</i>?<i>option=value&option=value</i> +lpd://<i>ip-address-or-hostname</i>/<i>queue</i>?<i>option=value&option=value</i> +lpd://<i>username@ip-address-or-hostname</i>/<i>queue</i>?<i>option=value&option=value</i> </PRE> <P><A HREF="#TABLE3">Table 3</A> summarizes the options supported by the <tt>lpd</tt> backend.</P> @@ -436,7 +436,7 @@ CUPS_DEBUG_LEVEL=2 /usr/lib/cups/backend/snmp 2>&1 | tee snmp.log <P>For C shell (/bin/csh) and TCsh (/bin/tcsh), use the following command instead:</P> <PRE CLASS="command"> -(setenv CUPS_DEBUG_LEVEL 2; /usr/lib/cups/backend/snmp) |& tee snmp.log +(setenv CUPS_DEBUG_LEVEL 2; /usr/lib/cups/backend/snmp) |& tee snmp.log </PRE> <P>On MacOS X you'll find the SNMP backend in /usr/libexec/cups/backend instead:</P> diff --git a/doc/help/postscript-driver.html b/doc/help/postscript-driver.html index 4f35374d..fde5890b 100644 --- a/doc/help/postscript-driver.html +++ b/doc/help/postscript-driver.html @@ -341,7 +341,7 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: postscript-driver.html 10424 2012-04-23 17:26:57Z mike $" + "$Id$" PostScript printer driver documentation for CUPS. diff --git a/doc/help/ppd-compiler.html b/doc/help/ppd-compiler.html index 576c9187..27decdbb 100644 --- a/doc/help/ppd-compiler.html +++ b/doc/help/ppd-compiler.html @@ -341,7 +341,7 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: ppd-compiler.html 10424 2012-04-23 17:26:57Z mike $" + "$Id$" PPD compiler documentation for CUPS. diff --git a/doc/help/raster-driver.html b/doc/help/raster-driver.html index 259ea184..0399f057 100644 --- a/doc/help/raster-driver.html +++ b/doc/help/raster-driver.html @@ -341,7 +341,7 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: raster-driver.html 10424 2012-04-23 17:26:57Z mike $" + "$Id$" Raster printer driver documentation for CUPS. diff --git a/doc/help/ref-client-conf.html b/doc/help/ref-client-conf.html index f17d5407..03d1ea04 100644 --- a/doc/help/ref-client-conf.html +++ b/doc/help/ref-client-conf.html @@ -56,6 +56,8 @@ GSSServiceName ipp ServerName foo.bar.com ServerName 11.22.33.44 ServerName foo.bar.com:8631 +<SPAN CLASS="info">CUPS 1.6</SPAN>ServerName foo.bar.com/version=1.1 +<SPAN CLASS="info">CUPS 1.6</SPAN>ServerName foo.bar.com:8631/version=1.1 </PRE> <H3>Description</H3> @@ -64,6 +66,8 @@ ServerName foo.bar.com:8631 <P>The default port number is 631 but can be overridden by adding a colon followed by the desired port number to the value.</P> +<P>By default, CUPS 1.6 and later use IPP/2.0 to communicate with the server. Add "/version=1.1" to force IPP/1.1 which is required for CUPS 1.3.12 and earlier.</P> + <P>The default is to use the local server ("<VAR>localhost</VAR>") or domain socket, if so configured.</P> <BLOCKQUOTE><B>Note:</B> diff --git a/doc/help/ref-cups-files-conf.html.in b/doc/help/ref-cups-files-conf.html.in index fa922cb2..171950c5 100644 --- a/doc/help/ref-cups-files-conf.html.in +++ b/doc/help/ref-cups-files-conf.html.in @@ -37,7 +37,7 @@ server activity.</P> information to the system log instead of a plain file.</P> <P>The default access log file is -<VAR>@CUPS_LOGDIR@/access_log</VAR>.</P> +<VAR>/var/log/access_log</VAR>.</P> <H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.15</SPAN><A NAME="ConfigFilePerm">ConfigFilePerm</A></H2> @@ -51,7 +51,7 @@ ConfigFilePerm 0640 <H3>Description</H3> -<P>The <CODE>ConfigFilePerm</CODE> directive specifies the permissions to use when the scheduler writes configuration and cache files, typically in response to IPP or HTTP requests. The default is @CUPS_CONFIG_FILE_PERM@.</P> +<P>The <CODE>ConfigFilePerm</CODE> directive specifies the permissions to use when the scheduler writes configuration and cache files, typically in response to IPP or HTTP requests. The default is 644 on OS X and 640 on all other operating systems.</P> <BLOCKQUOTE><B>Note:</B> @@ -89,13 +89,13 @@ DocumentRoot /foo/bar/doc/cups of web content for the HTTP server in CUPS. If an absolute path is not specified then it is assumed to be relative to the <A HREF="#ServerRoot"><CODE>ServerRoot</CODE></A> directory. The -default directory is <VAR>@CUPS_DOCROOT@</VAR>.</P> +default directory is <VAR>/usr/share/doc/cups</VAR>.</P> <P>Documents are first looked up in a sub-directory for the primary language requested by the client (e.g. -<VAR>@CUPS_DOCROOT@/fr/...</VAR>) and then directly under +<VAR>/usr/share/doc/cups/fr/...</VAR>) and then directly under the <CODE>DocumentRoot</CODE> directory (e.g. -<VAR>@CUPS_DOCROOT@/...</VAR>), so it is possible to +<VAR>/usr/share/doc/cups/...</VAR>), so it is possible to localize the web content by providing subdirectories for each language needed.</P> @@ -116,7 +116,7 @@ ErrorLog syslog log file. If the filename is not absolute then it is assumed to be relative to the <A HREF="#ServerRoot"><CODE>ServerRoot</CODE></A> directory. The -default error log file is <VAR>@CUPS_LOGDIR@/error_log</VAR>.</P> +default error log file is <VAR>/var/log/cups/error_log</VAR>.</P> <P>The server name can be included in the filename by using <CODE>%s</CODE> in the name.</P> @@ -172,7 +172,7 @@ errors are fatal. The following kinds of errors are currently recognized:</P> <P>Multiple errors can be listed, and the form "-kind" can be used with <CODE>all</CODE> to remove specific kinds of errors. The default setting is -<CODE>@CUPS_FATAL_ERRORS@</CODE>.</P> +<CODE>config</CODE>.</P> <H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.18</SPAN><A NAME="FileDevice">FileDevice</A></H2> @@ -255,7 +255,7 @@ LogFilePerm 0600 <P>The <CODE>LogFilePerm</CODE> directive specifies the permissions to use when writing log files. The default -is @CUPS_LOG_FILE_PERM@.</P> +is 644.</P> <H2 CLASS="title"><A NAME="PageLog">PageLog</A></H2> @@ -274,7 +274,7 @@ PageLog syslog log file. If the filename is not absolute then it is assumed to be relative to the <A HREF="#ServerRoot"><CODE>ServerRoot</CODE></A> directory. The -default page log file is <VAR>@CUPS_LOGDIR@/page_log</VAR>.</P> +default page log file is <VAR>/var/log/cups/page_log</VAR>.</P> <P>The server name can be included in the filename by using <CODE>%s</CODE> in the name.</P> @@ -296,17 +296,9 @@ Printcap /Library/Preferences/org.cups.printers.plist <H3>Description</H3> -<P>The <CODE>Printcap</CODE> directive controls whether or not a -printcap file is automatically generated and updated with a list -of available printers. If specified with no value, then no -printcap file will be generated. The default is to generate a -file named <VAR>@CUPS_DEFAULT_PRINTCAP@</VAR>.</P> +<P>The <CODE>Printcap</CODE> directive controls whether or not a printcap file is automatically generated and updated with a list of available printers. If specified with no value, then no printcap file will be generated. The default is to generate a file named <VAR>/Library/Preferences.org.cups.printers.plist</VAR> on OS X and <VAR>/etc/printcap</VAR> on all other operating systems.</P> -<P>When a filename is specified (e.g. <VAR>@CUPS_DEFAULT_PRINTCAP@</VAR>), -the printcap file is written whenever a printer is added or -removed. The printcap file can then be used by applications that -are hardcoded to look at the printcap file for the available -printers.</P> +<P>When a filename is specified (e.g. <VAR>/etc/printcap</VAR>), the printcap file is written whenever a printer is added or removed. The printcap file can then be used by applications that are hardcoded to look at the printcap file for the available printers.</P> <H2 CLASS="title"><A NAME="PrintcapFormat">PrintcapFormat</A></H2> @@ -359,7 +351,7 @@ RequestRoot /foo/bar/spool/cups incoming IPP requests and HTML forms. If an absolute path is not provided then it is assumed to be relative to the <A HREF="#ServerRoot"><CODE>ServerRoot</CODE></A> directory. The -default request directory is <VAR>@CUPS_REQUESTS@</VAR>.</P> +default request directory is <VAR>/var/spool/cups</VAR>.</P> <H2 CLASS="title"><A NAME="ServerBin">ServerBin</A></H2> @@ -451,10 +443,7 @@ SystemGroup root lpadmin <H3>Description</H3> -<P>The <CODE>SystemGroup</CODE> directive specifies the system -administration group for <CODE>System</CODE> authentication. -Multiple groups can be listed, separated with spaces. The default -group list is <CODE>@CUPS_SYSTEM_GROUPS@</CODE>.</P> +<P>The <CODE>SystemGroup</CODE> directive specifies the system administration group for <CODE>System</CODE> authentication. Multiple groups can be listed, separated with spaces. The default group list is <CODE>admin</CODE> on OS X and <CODE>lpadmin</CODE>, <CODE>root</CODE>, <CODE>sys</CODE>, and/or <CODE>system</CODE> on other operating systems.</P> <H2 CLASS="title"><A NAME="TempDir">TempDir</A></H2> @@ -470,7 +459,7 @@ TempDir /foo/bar/tmp <P>The <CODE>TempDir</CODE> directive specifies an absolute path for the directory to use for temporary files. The default -directory is <VAR>@CUPS_REQUESTS@/tmp</VAR>.</P> +directory is <VAR>/var/spool/cups/tmp</VAR>.</P> <P>Temporary directories must be world-writable and should have the "sticky" permission bit enabled so that other users cannot @@ -483,6 +472,10 @@ an appropriate temporary directory called <KBD>chmod a+rwxt /foo/bar/tmp</KBD> </PRE> +<BLOCKQUOTE><B>Note:</B> + +<P>The <CODE>TempDir</CODE> cannot be pointed at a standard system temporary directory such as <VAR>/tmp</VAR> or <VAR>/var/tmp</VAR> for security reasons.</P></BLOCKQUOTE> + <H2 CLASS="title"><A NAME="User">User</A></H2> @@ -495,9 +488,7 @@ User guest <H3>Description</H3> -<P>The <CODE>User</CODE> directive specifies the UNIX user that -filter and CGI programs run as. The default user is -<CODE>@CUPS_USER@</CODE>.</P> +<P>The <CODE>User</CODE> directive specifies the UNIX user that filter and CGI programs run as. The default user is <CODE>_lp</CODE>, <CODE>lp</CODE>, or <CODE>nobody</CODE> (whichever is found first).</P> <BLOCKQUOTE><B>Note:</B> diff --git a/doc/help/ref-cupsd-conf.html.in b/doc/help/ref-cupsd-conf.html.in index 43ca20b6..dc9ee70c 100644 --- a/doc/help/ref-cupsd-conf.html.in +++ b/doc/help/ref-cupsd-conf.html.in @@ -247,10 +247,7 @@ BrowseLocalProtocols dnssd <H3>Description</H3> -<P>The <CODE>BrowseLocalProtocols</CODE> directive specifies the -protocols to use when advertising local shared printers on the -network. Multiple protocols can be specified by separating them -with spaces. The default is "<CODE>@CUPS_BROWSE_LOCAL_PROTOCOLS@</CODE>".</P> +<P>The <CODE>BrowseLocalProtocols</CODE> directive specifies the protocols to use when advertising local shared printers on the network. Multiple protocols can be specified by separating them with spaces. The default is "<CODE>dnssd</CODE>" on systems that support Bonjour and "<CODE>none</CODE>" on all others.</P> <H2 CLASS="title"><A NAME="BrowseWebIF">BrowseWebIF</A></H2> @@ -280,9 +277,7 @@ Browsing Off <H3>Description</H3> -<P>The <CODE>Browsing</CODE> directive controls whether or not -printer sharing is enabled. The default setting is -<CODE>@CUPS_BROWSING@</CODE>.</P> +<P>The <CODE>Browsing</CODE> directive controls whether or not printer sharing is enabled. The default setting is <CODE>On</CODE>.</P> <H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.7</SPAN><A NAME="Classification">Classification</A></H2> @@ -430,15 +425,13 @@ and other job operations.</P> <H3>Examples</H3> <PRE CLASS="command"> -DefaultShared yes -DefaultShared no +DefaultShared Yes +DefaultShared No </PRE> <H3>Description</H3> -<P>The <CODE>DefaultShared</CODE> directive specifies whether -printers are shared (published) by default. The default is -<CODE>@CUPS_DEFAULT_SHARED@</CODE>.</P> +<P>The <CODE>DefaultShared</CODE> directive specifies whether printers are shared (published) by default. The default is <CODE>Yes</CODE>.</P> <H2 CLASS="title"><A NAME="Deny">Deny</A></H2> @@ -628,7 +621,7 @@ GSSServiceName ipp <H3>Description</H3> -<P>The <CODE>GSSServiceName</CODE> directive sets the Kerberos service name to use. The default is <CODE>@CUPS_DEFAULT_GSSSERVICE_NAME@</CODE> for compatibility with Microsoft Windows.</P> +<P>The <CODE>GSSServiceName</CODE> directive sets the Kerberos service name to use. The default is <CODE>http</CODE> for compatibility with Microsoft Windows.</P> <H2 CLASS="title"><A NAME="HostNameLookups">HostNameLookups</A></H2> @@ -2150,13 +2143,13 @@ to wait before an active HTTP or IPP request times out in seconds (no suffix), m <H3>Examples</H3> <PRE CLASS="command"> -WebInterface yes -WebInterface no +WebInterface Yes +WebInterface No </PRE> <H3>Description</H3> -<P>The <CODE>WebInterface</CODE> directive specifies whether the web interface is enabled. The default value is <CODE>@CUPS_WEBIF@</CODE>.</P> +<P>The <CODE>WebInterface</CODE> directive specifies whether the web interface is enabled. The default value is <CODE>No</CODE> on OS X and <CODE>Yes</CODE> on all other operating systems.</P> </BODY> </HTML> diff --git a/doc/help/ref-subscriptions-conf.html b/doc/help/ref-subscriptions-conf.html index d4f4defc..06cfc72c 100644 --- a/doc/help/ref-subscriptions-conf.html +++ b/doc/help/ref-subscriptions-conf.html @@ -196,7 +196,7 @@ HREF="#Subscription"><CODE>Subscription</CODE></A> section.</P> <PRE CLASS="command"> <Subscription NNN> ... - LeaseDuration + LeaseDuration </Subscription> </PRE> @@ -335,17 +335,17 @@ unique (to the server) number starting at 1.</P> <PRE CLASS="command"> <Subscription NNN> ... - UserData mailto:bar<40>domain.com + UserData mailto:bar<40>example.com </Subscription> </PRE> <H3>Description</H3> <P>The <CODE>UserData</CODE> directive specifies the -<CODE>notify-user-data</CODE> value, which is normally the "from" +<CODE>notify-user-data</CODE> value, which is normally the "to" address used in <CODE>mailto</CODE> notifications. Binary values are introduced by encoding the bytes as hexadecimal values inside -angle brackets, e.g. "<1234>".</P> +angle brackets, e.g. "<1234>".</P> <P>The <CODE>UserData</CODE> directive must appear inside a <A HREF="#Subscription"><CODE>Subscription</CODE></A> section.</P> diff --git a/doc/help/security.html b/doc/help/security.html index c86151d1..3bd56425 100644 --- a/doc/help/security.html +++ b/doc/help/security.html @@ -48,7 +48,7 @@ authentication:</P> middle" and replay attacks from the same client.</P> <P><B>Recommendation:</B> Enable encryption to hide the - username and password information.</P></LI></LI> + username and password information.</P></LI> <LI>Local certificate authentication passes 128-bit "certificates" that identify an authenticated user. @@ -65,7 +65,7 @@ authentication:</P> socket.</P> <P><B>Recommendation:</B> Ensure that unauthorized users - are not added to the system group(s).</P></LI></LI> + are not added to the system group(s).</P></LI> </OL> diff --git a/doc/help/spec-banner.html b/doc/help/spec-banner.html index 2d22d9e8..65b09613 100644 --- a/doc/help/spec-banner.html +++ b/doc/help/spec-banner.html @@ -8,7 +8,7 @@ </head> <body> <!-- - "$Id: spec-banner.html 9727 2011-04-28 21:20:12Z mike $" + "$Id$" Banner file format specification for CUPS. diff --git a/doc/help/spec-browsing.html b/doc/help/spec-browsing.html new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/doc/help/spec-browsing.html diff --git a/doc/help/spec-command.html b/doc/help/spec-command.html index af201cb5..06093574 100644 --- a/doc/help/spec-command.html +++ b/doc/help/spec-command.html @@ -8,7 +8,7 @@ </head> <body> <!-- - "$Id: spec-command.html 9727 2011-04-28 21:20:12Z mike $" + "$Id$" CUPS command file format specification for CUPS. diff --git a/doc/help/spec-ipp.html b/doc/help/spec-ipp.html index 27b8fca2..e06270c1 100644 --- a/doc/help/spec-ipp.html +++ b/doc/help/spec-ipp.html @@ -8,7 +8,7 @@ </head> <body> <!-- - "$Id: spec-ipp.html 10424 2012-04-23 17:26:57Z mike $" + "$Id$" CUPS IPP specification for CUPS. diff --git a/doc/help/spec-postscript.html b/doc/help/spec-postscript.html index 8a84273c..110c5a3c 100644 --- a/doc/help/spec-postscript.html +++ b/doc/help/spec-postscript.html @@ -8,7 +8,7 @@ </head> <body> <!-- - "$Id: spec-postscript.html 10424 2012-04-23 17:26:57Z mike $" + "$Id$" CUPS PostScript file specification for CUPS. diff --git a/doc/help/spec-ppd.html b/doc/help/spec-ppd.html index b368b51f..5853ede5 100644 --- a/doc/help/spec-ppd.html +++ b/doc/help/spec-ppd.html @@ -341,7 +341,7 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: spec-ppd.html 10587 2012-08-30 20:22:22Z mike $" + "$Id$" PPD extension documentation for CUPS. @@ -975,7 +975,7 @@ option value is "1234" then CUPS will output the string "@PJL SET PASSCODE=1234" <p>The resulting dictionary sets the page device attributes that are sent to your raster driver in the page header.</p> -<h3>Custom Page Size Code</a></h3> +<h3>Custom Page Size Code</h3> <p>There are many possible implementations of the <tt>CustomPageSize</tt> code. For CUPS raster drivers, the following code is recommended:</p> @@ -988,7 +988,7 @@ option value is "1234" then CUPS will output the string "@PJL SET PASSCODE=1234" *CustomPageSize True: "pop pop pop <</PageSize[5 -2 roll]/ImagingBBox null>>setpagedevice" </pre> -<h3>Supported PostScript Operators</a></h3> +<h3>Supported PostScript Operators</h3> <p>CUPS supports the following PostScript operators in addition to the usual PostScript number, string (literal and hex-encoded), boolean, null, and name values:</p> @@ -1047,7 +1047,7 @@ PRE B { </blockquote> -<h3>Supported Page Device Attributes</a></h3> +<h3>Supported Page Device Attributes</h3> <p>Table 2 shows the supported page device attributes along with PostScript code examples.</p> @@ -1711,7 +1711,7 @@ http://www.vendor.com/help" </pre> -<h3><span class='info'>CUPS 1.7</span><a name='cupsJobAccountId'>cupsJobAccountId</a></h3> +<h3><span class='info'>CUPS 1.7/OS X 10.9</span><a name='cupsJobAccountId'>cupsJobAccountId</a></h3> <p class='summary'>*cupsJobAccountId: boolean</p> @@ -1725,7 +1725,7 @@ http://www.vendor.com/help" </pre> -<h3><span class='info'>CUPS 1.7</span><a name='cupsJobAccountingUserId'>cupsJobAccountingUserId</a></h3> +<h3><span class='info'>CUPS 1.7/OS X 10.9</span><a name='cupsJobAccountingUserId'>cupsJobAccountingUserId</a></h3> <p class='summary'>*cupsJobAccountingUserId: boolean</p> @@ -1739,7 +1739,7 @@ http://www.vendor.com/help" </pre> -<h3><span class='info'>CUPS 1.7</span><a name='cupsJobPassword'>cupsJobPassword</a></h3> +<h3><span class='info'>CUPS 1.7/OS X 10.9</span><a name='cupsJobPassword'>cupsJobPassword</a></h3> <p class='summary'>*cupsJobPassword: "format"</p> @@ -1769,7 +1769,7 @@ list of locale names ("en", "en_US", "fr_CA", etc.)</p> </pre> -<h3><span class='info'>CUPS 1.7</span><a name='cupsMandatory'>cupsMandatory</a></h3> +<h3><span class='info'>CUPS 1.7/OS X 10.9</span><a name='cupsMandatory'>cupsMandatory</a></h3> <p class='summary'>*cupsMandatory: "attribute1 attribute2 ... attributeN"</p> @@ -2327,7 +2327,7 @@ the device.</p> <ul> - <li>Added <a href="#cupsPageSizeCategory"><tt>cupsPageSizeCategory</tt></a> keyword (originally defined in CUPS 1.4).</li> + <li>Added <a href="#cupsPageSizeCategory"><tt>cupsPageSizeCategory</tt></a> keyword (originally defined in CUPS 1.4).</li> <li>Added <a href="#cupsMaxCopies"><tt>cupsMaxCopies</tt></a> keyword.</li> diff --git a/doc/help/standard.html.in b/doc/help/standard.html.in deleted file mode 100644 index f957fe24..00000000 --- a/doc/help/standard.html.in +++ /dev/null @@ -1,181 +0,0 @@ -<HTML> -<!-- SECTION: Getting Started --> -<HEAD> - <TITLE>Standard Configuration</TITLE> - <LINK REL="STYLESHEET" TYPE="text/css" HREF="../cups-printable.css"> -</HEAD> -<BODY> - -<H1 CLASS="title">Standard Configuration</H1> - -<P>This document describes the standard configuration for this CUPS -server.</P> - -<BLOCKQUOTE><B>Note:</B> - -<!-- Packagers: Change the following statement and the following sections - if you make any changes to the standard CUPS distribution that are - not automatically updated by the configure script. --> -<P>This file reflects the standard CUPS configuration as distributed -by Apple Inc, the developer of CUPS.</P> - -</BLOCKQUOTE> - - -<H2 CLASS="title"><A NAME="CUPSD">cupsd Configuration</A></H2> - -<P><CODE>cupsd(8)</CODE> is configured by default to show -printers shared by other systems and only allow local access to -the system and its printers. Administration operations require -Basic authentication with membership in the group -"@CUPS_GROUP@".</P> - -<P>Connections are accepted via domain socket -(<VAR>@CUPS_DEFAULT_DOMAINSOCKET@</VAR>) or "localhost" -(127.0.0.1).</P> - -<H3><A NAME="SETTINGS">Settings</A></H3> - -<DIV CLASS="table"><TABLE SUMMARY="Default Values"> -<CAPTION>Table 1: Default Values</CAPTION> -<TR> - <TH>Directive</TH> - <TH>Value</TH> -</TR> -<TR> - <TD><CODE><A HREF="ref-cupsd-conf.html#Browsing">Browsing</A></CODE></TD> - <TD><CODE>@CUPS_BROWSING@</CODE></TD> -</TR> -<TR> - <TD><CODE><A HREF="ref-cupsd-conf.html#BrowseLocalProtocols">BrowseLocalProtocols</A></CODE></TD> - <TD><CODE>@CUPS_BROWSE_LOCAL_PROTOCOLS@</CODE></TD> -</TR> -<TR> - <TD><CODE><A HREF="ref-cupsd-conf.html#BrowseRemoteProtocols">BrowseRemoteProtocols</A></CODE></TD> - <TD><CODE>@CUPS_BROWSE_REMOTE_PROTOCOLS@</CODE></TD> -</TR> -<TR> - <TD><CODE><A HREF="ref-cupsd-conf.html#BrowseShortNames">BrowseShortNames</A></CODE></TD> - <TD><CODE>@CUPS_BROWSE_SHORT_NAMES@</CODE></TD> -</TR> -<TR> - <TD><CODE><A HREF="ref-cupsd-conf.html#ConfigFilePerm">ConfigFilePerm</A></CODE></TD> - <TD><CODE>@CUPS_CONFIG_FILE_PERM@</CODE></TD> -</TR> -<TR> - <TD><CODE><A HREF="ref-cupsd-conf.html#DefaultShared">DefaultShared</A></CODE></TD> - <TD><CODE>@CUPS_DEFAULT_SHARED@</CODE></TD> -</TR> -<TR> - <TD><CODE><A HREF="ref-cupsd-conf.html#ImplicitClasses">ImplicitClasses</A></CODE></TD> - <TD><CODE>@CUPS_IMPLICIT_CLASSES@</CODE></TD> -</TR> -<TR> - <TD><CODE><A HREF="ref-cupsd-conf.html#LogFilePerm">LogFilePerm</A></CODE></TD> - <TD><CODE>@CUPS_LOG_FILE_PERM@</CODE></TD> -</TR> -<TR> - <TD><CODE><A HREF="ref-cupsd-conf.html#MaxCopies">MaxCopies</A></CODE></TD> - <TD><CODE>@CUPS_MAX_COPIES@</CODE></TD> -</TR> -<TR> - <TD><CODE><A HREF="ref-cupsd-conf.html#UseNetworkDefault">UseNetworkDefault</A></CODE></TD> - <TD><CODE>@CUPS_USE_NETWORK_DEFAULT@</CODE></TD> -</TR> -</TABLE></DIV> - - -<H2 CLASS="title"><A NAME="DIRECTORIES">Directories</A></H2> - -<DIV CLASS="table"><TABLE SUMMARY="Directories"> -<CAPTION>Table 2: Directories</CAPTION> -<TR> - <TH>Directory</TH> - <TH>Purpose</TH> -</TR> -<TR> - <TD><VAR>@CUPS_SERVERROOT@</VAR></TD> - <TD>The location of configuration files such as - <VAR>printers.conf</VAR>. Overridden by the <A - HREF="ref-cupsd-conf.html#ServerRoot"><CODE>ServerRoot</CODE></A> - directive in <VAR>cupsd.conf</VAR>.</TD> -</TR> -<TR> - <TD><VAR>@bindir@</VAR></TD> - <TD>The location of user programs.</TD> -</TR> -<TR> - <TD><VAR>@includedir@</VAR></TD> - <TD>The location of CUPS include files.</TD> -</TR> -<TR> - <TD><VAR>@libdir@</VAR></TD> - <TD>The location of CUPS library files.</TD> -</TR> -<TR> - <TD><VAR>@CUPS_SERVERBIN@</VAR></TD> - <TD>The location of server programs such as backends and - filters. Overridden by the <A - HREF="ref-cupsd-conf.html#ServerBin"><CODE>ServerBin</CODE></A> - directive in <VAR>cupsd.conf</VAR>.</TD> -</TR> -<TR> - <TD><VAR>@sbindir@</VAR></TD> - <TD>The location of administrator programs.</TD> -</TR> -<TR> - <TD><VAR>@CUPS_DATADIR@</VAR></TD> - <TD>The location of data files such as fonts. Overridden - by the <A - HREF="ref-cupsd-conf.html#DataDir"><CODE>DataDir</CODE></A> - directive in <VAR>cupsd.conf</VAR>.</TD> -</TR> -<TR> - <TD><VAR>@CUPS_DOCROOT@</VAR></TD> - <TD>The location of documentation files. Overridden by - the <A - HREF="ref-cupsd-conf.html#DocumentRoot"><CODE>DocumentRoot</CODE></A> - directive in <VAR>cupsd.conf</VAR>.</TD> -</TR> -<TR> - <TD><VAR>@CUPS_LOCALEDIR@</VAR></TD> - <TD>The location of localization files.</TD> -</TR> -<TR> - <TD><VAR>@CUPS_CACHEDIR@</VAR></TD> - <TD>The location of cache files such as - <VAR>ppds.dat</VAR> and <VAR>remote.cache</VAR>. - Overridden by the <A - HREF="ref-cupsd-conf.html#CacheDir"><CODE>CacheDir</CODE></A> - directive in <VAR>cupsd.conf</VAR>.</TD> -</TR> -<TR> - <TD><VAR>@CUPS_LOGDIR@</VAR></TD> - <TD>The location of the <VAR>access_log</VAR>, - <VAR>error_log</VAR>, and <VAR>page_log</VAR> files. - Overridden by the <A - HREF="ref-cupsd-conf.html#AccessLog"><CODE>AccessLog</CODE></A>, - <A - HREF="ref-cupsd-conf.html#ErrorLog"><CODE>ErrorLog</CODE></A>, - <A - HREF="ref-cupsd-conf.html#PageLog"><CODE>PageLog</CODE></A>, - directive in <VAR>cupsd.conf</VAR>.</TD> -</TR> -<TR> - <TD><VAR>@CUPS_STATEDIR@</VAR></TD> - <TD>The location of the domain socket file and state data - such as authentication certificates. Overridden by the <A - HREF="ref-cupsd-conf.html#StateDir"><CODE>StateDir</CODE></A> - directive in <VAR>cupsd.conf</VAR>.</TD> -</TR> -<TR> - <TD><VAR>@CUPS_REQUESTS@</VAR></TD> - <TD>The location of spooled print jobs. Overridden by the - <A - HREF="ref-cupsd-conf.html#RequestRoot"><CODE>RequestRoot</CODE></A> - directive in <VAR>cupsd.conf</VAR>.</TD> -</TR> -</TABLE></DIV> - -</BODY> -</HTML> diff --git a/doc/help/whatsnew.html b/doc/help/whatsnew.html index 2bfc86fd..24e630e5 100644 --- a/doc/help/whatsnew.html +++ b/doc/help/whatsnew.html @@ -8,7 +8,7 @@ <H1 CLASS="title">What's New in CUPS 1.7</H1> -<P>This page provides a high-level outline of these changes. If you have never used CUPS before, read the <A HREF="overview.html">"Overview of CUPS"</A> document instead.</P> +<P>This page provides a high-level outline of the changes in CUPS 1.7. If you have never used CUPS before, read the <A HREF="overview.html">"Overview of CUPS"</A> document instead.</P> <P>CUPS 1.7 is primarily a "polish" release. Users will appreciate improved support for paid, PIN, and release printing, as well as expanded support for printers conforming to the <a href="http://www.pwg.org/ipp/everywhere.html">IPP Everywhere</a> specification. Full support for this functionality depends on additional software from your operating system vendor.</p> diff --git a/doc/images/color-wheel.png b/doc/images/color-wheel.png Binary files differindex 301e3fd5..f55e69f8 100644 --- a/doc/images/color-wheel.png +++ b/doc/images/color-wheel.png diff --git a/doc/images/generic.png b/doc/images/generic.png Binary files differdeleted file mode 100644 index 2abe9de9..00000000 --- a/doc/images/generic.png +++ /dev/null diff --git a/doc/swish-e.config b/doc/swish-e.config new file mode 100644 index 00000000..662f9839 --- /dev/null +++ b/doc/swish-e.config @@ -0,0 +1,16 @@ +# Where to get things +IndexDir doc + +# Where to put things +IndexFile doc/swish-e.index + +# Ignore image and index files +FileRules filename contains .gif +FileRules filename contains .gz +FileRules filename contains .jpg +FileRules filename contains .png +FileRules filename contains .svg +FileRules filename contains swish-e +FileRules filename contains .tokens +FileRules filename is Makefile + |
