From: msweet Date: Wed, 26 Aug 2015 18:51:57 +0000 (+0000) Subject: Documentation updates (STR #4691, STR #4693) X-Git-Tag: v2.2b1~203 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd3fdd2c595564be3b3900316267188b988f6aa9;p=thirdparty%2Fcups.git Documentation updates (STR #4691, STR #4693) git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12848 a1ca3aef-8c08-0410-bb20-df032aa958be --- diff --git a/CHANGES.txt b/CHANGES.txt index 70c5c58511..40ea992f25 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -11,6 +11,7 @@ CHANGES IN CUPS V2.1.0 messages when 8 were expected (STR #4684) - The new PDF file type rule did not work (STR #4692) - Fixed some configure script issues (STR #4694, STR #4695) + - Documentation updates (STR #4691, STR #4693) CHANGES IN CUPS V2.1rc1 diff --git a/cups/http.c b/cups/http.c index f82bb0b868..fe8b9aa86b 100644 --- a/cups/http.c +++ b/cups/http.c @@ -898,7 +898,7 @@ httpGetContentEncoding(http_t *http) /* I - HTTP connection */ */ const char * /* O - Cookie data or NULL */ -httpGetCookie(http_t *http) /* I - HTTP connecion */ +httpGetCookie(http_t *http) /* I - HTTP connection */ { return (http ? http->cookie : NULL); } diff --git a/cups/http.h b/cups/http.h index 1154606315..4f72c678cc 100644 --- a/cups/http.h +++ b/cups/http.h @@ -246,7 +246,7 @@ typedef enum http_status_e /**** HTTP status codes ****/ HTTP_STATUS_NOT_AUTHORITATIVE, /* Information isn't authoritative */ HTTP_STATUS_NO_CONTENT, /* Successful command, no new data */ HTTP_STATUS_RESET_CONTENT, /* Content was reset/recreated */ - HTTP_STATUS_PARTIAL_CONTENT, /* Only a partial file was recieved/sent */ + HTTP_STATUS_PARTIAL_CONTENT, /* Only a partial file was received/sent */ HTTP_STATUS_MULTIPLE_CHOICES = 300, /* Multiple files match request */ HTTP_STATUS_MOVED_PERMANENTLY, /* Document has moved permanently */ diff --git a/cups/ppd.c b/cups/ppd.c index 504e269326..6547a2c060 100644 --- a/cups/ppd.c +++ b/cups/ppd.c @@ -283,7 +283,7 @@ ppdClose(ppd_file_t *ppd) /* I - PPD file record */ /* - * 'ppdErrorString()' - Returns the text assocated with a status. + * 'ppdErrorString()' - Returns the text associated with a status. * * @since CUPS 1.1.19/OS X 10.3@ */ diff --git a/doc/help/accounting.html b/doc/help/accounting.html index d25d5019a0..ea37a556dd 100644 --- a/doc/help/accounting.html +++ b/doc/help/accounting.html @@ -26,7 +26,7 @@ options determine whether and how quotas are enforced for a printer. The job-quota-period option determines the time interval for quota tracking. The interval is expressed in seconds, so a day is 86,400, a week is 604,800, and a month is 2,592,000 seconds. The -job-k-limit option specifies the job size limit in killobytes. The +job-k-limit option specifies the job size limit in kilobytes. The job-page-limit option specifies the number of pages limit.

For quotas to be enforced, the period and at least one of the limits diff --git a/doc/help/api-array.html b/doc/help/api-array.html index cd93e87fb2..220c0f1cb0 100644 --- a/doc/help/api-array.html +++ b/doc/help/api-array.html @@ -5,7 +5,7 @@ Array API - +