From: msweet Date: Wed, 3 Jul 2013 14:26:55 +0000 (+0000) Subject: Fix HTML errors in documentation (using swish-e to validate HTML...) X-Git-Tag: release-1.7rc1~17 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7374e9e5d4b19190bbe1e464e84cac290ceab054;p=thirdparty%2Fcups.git Fix HTML errors in documentation (using swish-e to validate HTML...) git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11087 a1ca3aef-8c08-0410-bb20-df032aa958be --- diff --git a/cups/api-cups.shtml b/cups/api-cups.shtml index e60d03d757..caa96b9533 100644 --- a/cups/api-cups.shtml +++ b/cups/api-cups.shtml @@ -3,7 +3,7 @@ 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 @@ -183,7 +183,7 @@ int num_options = 0; cups_option_t *options = NULL; cups_dest_t *dest; -for (i = 0; i < dest->num_options; i ++) +for (i = 0; i < dest->num_options; i ++) num_options = cupsAddOption(dest->options[i].name, dest->options[i].value, num_options, &options); @@ -235,7 +235,7 @@ job_id = cupsPrintFiles(dest->name, 3, files, "Tes

Finally, the cupsCreateJob function creates a new job with no files in it. Files are added using the -cupsStartDocument, +cupsStartDocument, cupsWriteRequestData, and cupsFinishDocument functions. The following example creates a job with 10 text files for printing:

@@ -299,7 +299,7 @@ int num_jobs; cups_job_t *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) */ diff --git a/cups/api-filter.shtml b/cups/api-filter.shtml index e95c8d08f1..3f912ba864 100644 --- a/cups/api-filter.shtml +++ b/cups/api-filter.shtml @@ -3,7 +3,7 @@ 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 @@ -488,7 +488,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.

- +

Reporting Supply Levels

@@ -613,7 +613,7 @@ datalen = sizeof(data) - 1; status = cupsSideChannelDoRequest(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-cups.html b/doc/help/api-cups.html index d5635c6f3c..b355e108bc 100644 --- a/doc/help/api-cups.html +++ b/doc/help/api-cups.html @@ -551,7 +551,7 @@ constants">cups_ptype_e 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; cups_option_t *options = NULL; cups_dest_t *dest; -for (i = 0; i < dest->num_options; i ++) +for (i = 0; i < dest->num_options; i ++) num_options = cupsAddOption(dest->options[i].name, dest->options[i].value, num_options, &options); @@ -783,7 +783,7 @@ job_id = cupsPrintFiles(dest->name, 3, files, "Tes

Finally, the cupsCreateJob function creates a new job with no files in it. Files are added using the -cupsStartDocument, +cupsStartDocument, cupsWriteRequestData, and cupsFinishDocument functions. The following example creates a job with 10 text files for printing:

@@ -847,7 +847,7 @@ int num_jobs; cups_job_t *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) */ diff --git a/doc/help/api-filter.html b/doc/help/api-filter.html index 5888e4cd82..5428058792 100644 --- a/doc/help/api-filter.html +++ b/doc/help/api-filter.html @@ -430,7 +430,7 @@ div.contents ul.subcontents li { 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.

- +

Reporting Supply Levels

@@ -1040,7 +1040,7 @@ datalen = sizeof(data) - 1; status = cupsSideChannelDoRequest(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-raster.html b/doc/help/api-raster.html index 706d1eb027..f2dade43cd 100644 --- a/doc/help/api-raster.html +++ b/doc/help/api-raster.html @@ -438,7 +438,7 @@ page header structure.">cupsRasterWriteHeader2 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.

cupsRasterInterpretPPD supports a subset of the PostScript language. -Currently only the [, ], <<, >>, {, +Currently only the [, ], <<, >>, {, }, cleartomark, copy, dup, index, pop, roll, setpagedevice, and stopped operators are supported. diff --git a/doc/help/network.html b/doc/help/network.html index ef9fbefbeb..21112f693f 100644 --- a/doc/help/network.html +++ b/doc/help/network.html @@ -88,10 +88,10 @@ page on the device.

 socket://ip-address-or-hostname
 socket://ip-address-or-hostname/?option=value
-socket://ip-address-or-hostname/?option=value&option=value
+socket://ip-address-or-hostname/?option=value&option=value
 socket://ip-address-or-hostname:port-number
 socket://ip-address-or-hostname:port-number/?option=value
-socket://ip-address-or-hostname:port-number/?option=value&option=value
+socket://ip-address-or-hostname:port-number/?option=value&option=value

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.

@@ -107,19 +107,19 @@ socket://ip-address-or-hostname:port-number/?option=value&option=v 
 http://ip-address-or-hostname:port-number/resource
 http://ip-address-or-hostname:port-number/resource?option=value
-http://ip-address-or-hostname:port-number/resource?option=value&option=value
+http://ip-address-or-hostname:port-number/resource?option=value&option=value
 ipp://ip-address-or-hostname/resource
 ipp://ip-address-or-hostname/resource?option=value
-ipp://ip-address-or-hostname/resource?option=value&option=value
+ipp://ip-address-or-hostname/resource?option=value&option=value
 ipp://ip-address-or-hostname:port-number/resource
 ipp://ip-address-or-hostname:port-number/resource?option=value
-ipp://ip-address-or-hostname:port-number/resource?option=value&option=value
+ipp://ip-address-or-hostname:port-number/resource?option=value&option=value
 ipps://ip-address-or-hostname/resource
 ipps://ip-address-or-hostname/resource?option=value
-ipps://ip-address-or-hostname/resource?option=value&option=value
+ipps://ip-address-or-hostname/resource?option=value&option=value
 ipps://ip-address-or-hostname:port-number/resource
 ipps://ip-address-or-hostname:port-number/resource?option=value
-ipps://ip-address-or-hostname:port-number/resource?option=value&option=value
+ipps://ip-address-or-hostname:port-number/resource?option=value&option=value

The ipp backend supports many options, which are summarized in Table 2.

@@ -189,8 +189,8 @@ lpd://ip-address-or-hostname/queue lpd://username@ip-address-or-hostname/queue lpd://ip-address-or-hostname/queue?option=value lpd://username@ip-address-or-hostname/queue?option=value -lpd://ip-address-or-hostname/queue?option=value&option=value -lpd://username@ip-address-or-hostname/queue?option=value&option=value +lpd://ip-address-or-hostname/queue?option=value&option=value +lpd://username@ip-address-or-hostname/queue?option=value&option=value

Table 3 summarizes the options supported by the lpd backend.

@@ -436,7 +436,7 @@ CUPS_DEBUG_LEVEL=2 /usr/lib/cups/backend/snmp 2>&1 | tee snmp.log

For C shell (/bin/csh) and TCsh (/bin/tcsh), use the following command instead:

-(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

On MacOS X you'll find the SNMP backend in /usr/libexec/cups/backend instead:

diff --git a/doc/help/ref-subscriptions-conf.html b/doc/help/ref-subscriptions-conf.html index d4f4defc33..06cfc72c41 100644 --- a/doc/help/ref-subscriptions-conf.html +++ b/doc/help/ref-subscriptions-conf.html @@ -196,7 +196,7 @@ HREF="#Subscription">Subscription section.

 <Subscription NNN>
   ...
-  LeaseDuration 
+  LeaseDuration
 </Subscription>
@@ -335,17 +335,17 @@ unique (to the server) number starting at 1.

 <Subscription NNN>
   ...
-  UserData mailto:bar<40>domain.com
+  UserData mailto:bar<40>example.com
 </Subscription>

Description

The UserData directive specifies the -notify-user-data value, which is normally the "from" +notify-user-data value, which is normally the "to" address used in mailto notifications. Binary values are introduced by encoding the bytes as hexadecimal values inside -angle brackets, e.g. "<1234>".

+angle brackets, e.g. "<1234>".

The UserData directive must appear inside a Subscription section.

diff --git a/doc/help/security.html b/doc/help/security.html index c86151d176..3bd5642536 100644 --- a/doc/help/security.html +++ b/doc/help/security.html @@ -48,7 +48,7 @@ authentication:

middle" and replay attacks from the same client.

Recommendation: Enable encryption to hide the - username and password information.

+ username and password information.

  • Local certificate authentication passes 128-bit "certificates" that identify an authenticated user. @@ -65,7 +65,7 @@ authentication:

    socket.

    Recommendation: Ensure that unauthorized users - are not added to the system group(s).

    • + are not added to the system group(s).

    diff --git a/doc/help/spec-ppd.html b/doc/help/spec-ppd.html index d68b67c3f3..5853ede5fa 100644 --- a/doc/help/spec-ppd.html +++ b/doc/help/spec-ppd.html @@ -975,7 +975,7 @@ option value is "1234" then CUPS will output the string "@PJL SET PASSCODE=1234"

    The resulting dictionary sets the page device attributes that are sent to your raster driver in the page header.

    -

    Custom Page Size Code

    +

    Custom Page Size Code

    There are many possible implementations of the CustomPageSize code. For CUPS raster drivers, the following code is recommended:

    @@ -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" -

    Supported PostScript Operators

    +

    Supported PostScript Operators

    CUPS supports the following PostScript operators in addition to the usual PostScript number, string (literal and hex-encoded), boolean, null, and name values:

    @@ -1047,7 +1047,7 @@ PRE B { -

    Supported Page Device Attributes

    +

    Supported Page Device Attributes

    Table 2 shows the supported page device attributes along with PostScript code examples.

    @@ -2327,7 +2327,7 @@ the device.