]> git.ipfire.org Git - thirdparty/cups.git/commitdiff
Update documentation.
authorMichael R Sweet <michael.r.sweet@gmail.com>
Thu, 22 Mar 2018 13:50:29 +0000 (09:50 -0400)
committerMichael R Sweet <michael.r.sweet@gmail.com>
Thu, 22 Mar 2018 13:50:29 +0000 (09:50 -0400)
doc/help/cupspm.epub
doc/help/cupspm.html
doc/help/spec-ppd.html

index 331d9be1d76624b394eef68d80159dfad0a1baf4..cbffada46d22aef0e6e7ec1f1f75a045f2ee4274 100644 (file)
Binary files a/doc/help/cupspm.epub and b/doc/help/cupspm.epub differ
index ba52cad6a634e2617b2cd624d7016b4f2efb177c..4d4e5fe7881ac9c241fcaa5c499c6fc74c706a70 100644 (file)
@@ -6125,12 +6125,12 @@ are server-oriented...</p>
         <tr><th>HTTP_STATUS_ERROR </th>        <td class="description">An error response from httpXxxx()</td></tr>
         <tr><th>HTTP_STATUS_EXPECTATION_FAILED </th>        <td class="description">The expectation given in an Expect header field was not met</td></tr>
         <tr><th>HTTP_STATUS_FORBIDDEN </th>        <td class="description">Forbidden to access this URI</td></tr>
+        <tr><th>HTTP_STATUS_FOUND </th>        <td class="description">Document was found at a different URI</td></tr>
         <tr><th>HTTP_STATUS_GATEWAY_TIMEOUT </th>        <td class="description">Gateway connection timed out</td></tr>
         <tr><th>HTTP_STATUS_GONE </th>        <td class="description">Server has gone away</td></tr>
         <tr><th>HTTP_STATUS_LENGTH_REQUIRED </th>        <td class="description">A content length or encoding is required</td></tr>
         <tr><th>HTTP_STATUS_METHOD_NOT_ALLOWED </th>        <td class="description">Method is not allowed</td></tr>
         <tr><th>HTTP_STATUS_MOVED_PERMANENTLY </th>        <td class="description">Document has moved permanently</td></tr>
-        <tr><th>HTTP_STATUS_MOVED_TEMPORARILY </th>        <td class="description">Document has moved temporarily</td></tr>
         <tr><th>HTTP_STATUS_MULTIPLE_CHOICES </th>        <td class="description">Multiple files match request</td></tr>
         <tr><th>HTTP_STATUS_NONE <span class="info">&#160;CUPS 1.7/macOS 10.9&#160;</span></th>        <td class="description">No Expect value </td></tr>
         <tr><th>HTTP_STATUS_NOT_ACCEPTABLE </th>        <td class="description">Not Acceptable</td></tr>
@@ -6149,10 +6149,11 @@ are server-oriented...</p>
         <tr><th>HTTP_STATUS_REQUEST_TIMEOUT </th>        <td class="description">Request timed out</td></tr>
         <tr><th>HTTP_STATUS_REQUEST_TOO_LARGE </th>        <td class="description">Request entity too large</td></tr>
         <tr><th>HTTP_STATUS_RESET_CONTENT </th>        <td class="description">Content was reset/recreated</td></tr>
-        <tr><th>HTTP_STATUS_SEE_OTHER </th>        <td class="description">See this other link...</td></tr>
+        <tr><th>HTTP_STATUS_SEE_OTHER </th>        <td class="description">See this other link</td></tr>
         <tr><th>HTTP_STATUS_SERVER_ERROR </th>        <td class="description">Internal server error</td></tr>
         <tr><th>HTTP_STATUS_SERVICE_UNAVAILABLE </th>        <td class="description">Service is unavailable</td></tr>
         <tr><th>HTTP_STATUS_SWITCHING_PROTOCOLS </th>        <td class="description">HTTP upgrade to TLS/SSL</td></tr>
+        <tr><th>HTTP_STATUS_TEMPORARY_REDIRECT </th>        <td class="description">Temporary redirection</td></tr>
         <tr><th>HTTP_STATUS_UNAUTHORIZED </th>        <td class="description">Unauthorized to access host</td></tr>
         <tr><th>HTTP_STATUS_UNSUPPORTED_MEDIATYPE </th>        <td class="description">The requested media type is unsupported</td></tr>
         <tr><th>HTTP_STATUS_UPGRADE_REQUIRED </th>        <td class="description">Upgrade to SSL/TLS required</td></tr>
index 3b7c783629ef167ce2667956d216af63b23982d0..06f5769a844d773850643b0f13b545c161ace322 100644 (file)
@@ -1758,20 +1758,7 @@ http://www.vendor.com/help"
 
 <p class='summary'>*cupsJobPassword: "format"</p>
 
-<p>This keyword defines the format of the "job-password" IPP attribute, if supported by the printer. The following format characters are supported:</p>
-
-<ul>
-       <li><code>1</code>: US ASCII digits.</li>
-       <li><code>A</code>: US ASCII letters.</li>
-       <li><code>C</code>: US ASCII letters, numbers, and punctuation.</li>
-       <li><code>.</code>: Any US ASCII printable character (0x20 to 0x7e).</li>
-       <li><code>N</code>: Any Unicode digit character.</li>
-       <li><code>U</code>: Any Unicode letter character.</li>
-       <li><code>*</code>: Any Unicode (utf-8) character.</li>
-</ul>
-
-<p>The format characters are repeated to indicate the length of the
-password string.  For example, "1111" indicated a 4-digit US ASCII PIN code.</p>
+<p>This keyword defines the format of the job-password IPP attribute, if supported by the printer. Currently the only supported format is "1111" indicating a 4-digit PIN code.</p>
 
 <p>Example:</p>