diff options
| author | Didier Raboud <odyx@debian.org> | 2013-07-16 13:44:21 +0200 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2013-07-16 13:44:21 +0200 |
| commit | 3bbeb8a0d4f608995924ae6360556d4b589bdf4c (patch) | |
| tree | 0d44047572b0047d04b53b8415f2922c89edbd41 /doc | |
| parent | ea5667a811b20e235ce1975e763469edd1f7f0de (diff) | |
| download | cups-upstream/1.6.3.tar.gz | |
Imported Upstream version 1.6.3upstream/1.6.3
Diffstat (limited to 'doc')
30 files changed, 87 insertions, 168 deletions
diff --git a/doc/Makefile b/doc/Makefile index e599f759..ae010948 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 10752 2012-12-12 18:03:02Z mike $" +# "$Id: Makefile 7941 2008-09-16 00:46:13Z mike $" # # Documentation makefile for CUPS. # 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 22e4f30f..de95e672 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 10584 2012-08-29 19:52:16Z mike $" + "$Id: api-cups.header 7279 2008-01-31 01:50:44Z mike $" CUPS API header for CUPS. @@ -524,11 +524,11 @@ constants">cups_ptype_e</a></li> </ul></li> </ul> <!-- - "$Id: api-cups.html 10584 2012-08-29 19:52:16Z 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 @@ -708,7 +708,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> @@ -760,7 +760,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> @@ -824,7 +824,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) */ @@ -1025,7 +1025,7 @@ int cupsAddOption (<br> <h4 class="discussion">Discussion</h4> <p class="discussion">New option arrays can be initialized simply by passing 0 for the "num_options" parameter.</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsAdminCreateWindowsPPD">cupsAdminCreateWindowsPPD</a></h3> +<h3 class="function"><span class="info"> DEPRECATED </span><a name="cupsAdminCreateWindowsPPD">cupsAdminCreateWindowsPPD</a></h3> <p class="description">Create the Windows PPD file for a printer.</p> <p class="code"> char *cupsAdminCreateWindowsPPD (<br> @@ -1047,7 +1047,7 @@ char *cupsAdminCreateWindowsPPD (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">PPD file or NULL</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsAdminExportSamba">cupsAdminExportSamba</a></h3> +<h3 class="function"><span class="info"> DEPRECATED </span><a name="cupsAdminExportSamba">cupsAdminExportSamba</a></h3> <p class="description">Export a printer to Samba.</p> <p class="code"> int cupsAdminExportSamba (<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 d1ea823f..0e0591aa 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 10589 2012-08-30 23:01:44Z mike $" + "$Id: api-httpipp.header 7258 2008-01-28 00:15:05Z mike $" HTTP and IPP API header for CUPS. @@ -648,7 +648,7 @@ are server-oriented...">http_state_e</a></li> </ul></li> </ul> <!-- - "$Id: api-httpipp.html 10589 2012-08-30 23:01:44Z mike $" + "$Id: api-httpipp.shtml 7684 2008-06-23 16:47:38Z mike $" HTTP and IPP API introduction for CUPS. @@ -5023,6 +5023,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> 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/network.html b/doc/help/network.html index ebe1b5f9..e8c22194 100644 --- a/doc/help/network.html +++ b/doc/help/network.html @@ -94,10 +94,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> @@ -113,19 +113,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> @@ -195,8 +195,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> @@ -442,7 +442,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-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 index 33f60b62..3a291327 100644 --- a/doc/help/spec-browsing.html +++ b/doc/help/spec-browsing.html @@ -8,7 +8,7 @@ </head> <body> <!-- - "$Id: spec-browsing.html 10762 2012-12-13 20:28:30Z mike $" + "$Id$" CUPS Browse Protocol specification for CUPS. 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 21433684..75a927f1 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 10441 2012-04-30 20:59:09Z mike $" + "$Id$" PPD extension documentation for CUPS. @@ -971,7 +971,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> @@ -984,7 +984,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> @@ -1043,7 +1043,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> @@ -2253,7 +2253,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/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/ru/index.html.in b/doc/ru/index.html.in index fda6cbcd..d1300e12 100644 --- a/doc/ru/index.html.in +++ b/doc/ru/index.html.in @@ -101,106 +101,3 @@ HEIGHT="128" ALT="CUPS"></A></TD> </TABLE> </BODY> </HTML> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -<HTML> -<HEAD> - <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8"> - <TITLE>Начало - CUPS @CUPS_VERSION@@CUPS_REVISION@</TITLE> - <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups.css"> - <LINK REL="SHORTCUT ICON" HREF="/images/cups-icon.png" TYPE="image/png"> -</HEAD> -<BODY> -<TABLE CLASS="page" SUMMARY="{title}"> -<TR><TD CLASS="body"> -<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" SUMMARY=""> -<TR HEIGHT="36"> -<TD><A HREF="http://www.cups.org/" TARGET="_blank"><IMG -SRC="/images/left.gif" WIDTH="64" HEIGHT="36" BORDER="0" ALT=""></A></TD> -<TD CLASS="sel"><A HREF="/"> Начало </A></TD> -<TD CLASS="unsel"><A HREF="/admin"> Администрирование </A></TD> -<TD CLASS="unsel"><A HREF="/classes/"> Группы </A></TD> -<TD CLASS="unsel"><A HREF="/help/"> Справка </A></TD> -<TD CLASS="unsel"><A HREF="/jobs/"> Задания </A></TD> -<TD CLASS="unsel"><A HREF="/printers/"> Принтеры </A></TD> -<TD CLASS="unsel" WIDTH="100%"><FORM ACTION="/help/" METHOD="GET"><INPUT -TYPE="SEARCH" NAME="QUERY" SIZE="20" PLACEHOLDER="Search Help" -AUTOSAVE="org.cups.help" RESULTS="20"></FORM></TD> -<TD><IMG SRC="/images/right.gif" WIDTH="4" HEIGHT="36" ALT=""></TD> -</TR> -</TABLE> - -<TABLE CLASS="indent" SUMMARY=""> -<TR><TD STYLE="padding-right: 20px;"> - -<H1>CUPS @CUPS_VERSION@</H1> - -<P>CUPS — поддерживающая большинство стандартов, свободная подсистема печати, разрабатываемая компанией <A HREF="http://www.apple.com/">Apple Inc.</A> для операционной системы Mac OS<SUP>®</SUP> X и других UNIX<SUP>®</SUP>-подобных операционных систем.</P> - -</TD> -<TD><A HREF="http://www.cups.org/"><IMG SRC="images/cups-icon.png" WIDTH="128" -HEIGHT="128" ALT="CUPS"></A></TD> -</TR> -</TABLE> - -<TABLE CLASS="indent" SUMMARY=""> -<TR><TD VALIGN="top" STYLE="border-right: dotted thin #cccccc; padding-right: 20px;"> - -<H2>CUPS для пользователей</H2> - -<P><A HREF="help/overview.html">Введение в CUPS</A></P> - -<P><A HREF="help/options.html">Печать из командной строки</A></P> - -<P><A HREF="help/whatsnew.html">Что нового в CUPS 1.6</A></P> - -<P><A HREF="http://www.cups.org/newsgroups.php?gcups.general">Форум пользователей</A></P> - -</TD><TD VALIGN="top" STYLE="border-right: dotted thin #cccccc; padding-left: 20px; padding-right: 20px;"> - -<H2>CUPS для администраторов</H2> - -<P><A HREF="admin">Добавление принтеров и групп</A></P> - -<P><A HREF="help/policies.html">Управление доступом</A></P> - -<P><A HREF="help/accounting.html">Использование ресурсов</A></P> - -<P><A HREF="help/security.html">Безопасность системы</A></P> - -<P><A HREF="help/kerberos.html">Использование аутентификации Kerberos</A></P> - -<P><A HREF="help/network.html">Использование сетевых принтеров</A></P> - -<P><A HREF="help/ref-cupsd-conf.html">Справочник по cupsd.conf</A></P> - -<P><A HREF="http://www.cups.org/ppd.php">Поиск драйверов принтера</A></P> - -</TD><TD VALIGN="top" STYLE="padding-left: 20px;"> - -<H2>CUPS для разработчиков</H2> - -<P><A HREF="help/api-overview.html">Введение в разработку CUPS</A></P> - -<P><A HREF="help/api-cups.html">CUPS API</A></P> - -<P><A HREF="help/api-filter.html">Разработка фильтров и модулей</A></P> - -<P><A HREF="help/api-httpipp.html">API доступа по HTTP и IPP</A></P> - -<P><A HREF="help/api-ppd.html">PPD API</A></P> - -<P><A HREF="help/api-raster.html">Raster API</A></P> - -<P><A HREF="help/ref-ppdcfile.html">Справочник по компилятору PPD</A></P> - -<P><A HREF="http://www.cups.org/newsgroups.php?gcups.development">Форум разработчиков</A></P> - -</TD></TR> -</TABLE> - -</TD></TR> -<TR><TD> </TD></TR> -<TR><TD CLASS="trailer">CUPS а также логотип CUPS являются зарегистрированными торговыми марками <A HREF="http://www.apple.com">Apple Inc.</A> Авторские права на CUPS принадлежат (2007-2013) компании Apple Inc. Все права защищены.</TD></TR> -</TABLE> -</BODY> -</HTML> 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 + |
