Skip to content

Commit

Permalink
Increase the MultipleOperationTimeOut default to 15 minutes, log an e…
Browse files Browse the repository at this point in the history
…rror if

the job submission times out (Issue #5570)
  • Loading branch information
michaelrsweet committed May 1, 2019
1 parent 87030af commit d6395c6
Show file tree
Hide file tree
Showing 28 changed files with 82 additions and 81 deletions.
3 changes: 2 additions & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CHANGES - 2.3b8 - 2019-04-18
CHANGES - 2.3b8 - 2019-05-01
============================


Expand All @@ -11,6 +11,7 @@ Changes in CUPS v2.3b8
- Fixed a performance regression with large PPDs (rdar:https://47040759)
- Fixed a memory reallocation bug in HTTP header value expansion
(rdar:https://problem/50000749)
- Timed out job submission now yields an error (Issue #5570)
- Restored minimal support for the `Emulators` keyword in PPD files to allow
old Samsung printer drivers to continue to work (Issue #5562)
- The scheduler did not encode octetString values like "job-password" correctly
Expand Down
2 changes: 1 addition & 1 deletion doc/help/man-backend.html
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ <h2 class="title"><a name="NOTES">Notes</a></h2>
<b>lpinfo</b>(8)
to query for available printers using the backend.
The one exception is the SNMP backend - see
<b>cups-snmp</b>(8)
<a href="man-cups-snmp.html?TOPIC=Man+Pages"><b>cups-snmp</b>(8)</a>
for more information.
<h2 class="title"><a name="NOTES">Notes</a></h2>
CUPS printer drivers and backends are deprecated and will no longer be supported in a future feature release of CUPS.
Expand Down
4 changes: 2 additions & 2 deletions doc/help/man-cancel.html
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ <h2 class="title"><a name="EXAMPLES">Examples</a></h2>
</pre>
<h2 class="title"><a name="NOTES">Notes</a></h2>
Administrators wishing to prevent unauthorized cancellation of jobs via the <i>-u</i> option should require authentication for Cancel-Jobs operations in
<b>cupsd.conf</b>(5).
<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5).</a>
<h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
<b>cupsd.conf</b>(5),
<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5),</a>
<b>lp</b>(1),
<b>lpmove</b>(8),
<b>lpstat</b>(1),
Expand Down
6 changes: 3 additions & 3 deletions doc/help/man-classes.conf.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ <h2 class="title"><a name="NAME">Name</a></h2>
<h2 class="title"><a name="DESCRIPTION">Description</a></h2>
The <b>classes.conf</b> file defines the local printer classes that are available.
It is normally located in the <i>/etc/cups</i> directory and is maintained by the
<b>cupsd</b>(8)
<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8)</a>
program.
This file is not intended to be edited or managed manually.
<h2 class="title"><a name="NOTES">Notes</a></h2>
The name, location, and format of this file are an implementation detail that will change in future releases of CUPS.
<h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
<b>cupsd</b>(8),
<b>cupsd.conf</b>(5),
<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5),</a>
<b>mime.convs</b>(5),
<b>mime.types</b>(5),
<b>printers.conf</b>(5),
Expand Down
8 changes: 4 additions & 4 deletions doc/help/man-cups-files.conf.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ <h2 class="title"><a name="NAME">Name</a></h2>
cups-files.conf - file and directory configuration file for cups
<h2 class="title"><a name="DESCRIPTION">Description</a></h2>
The <b>cups-files.conf</b> file configures the files and directories used by the CUPS scheduler,
<b>cupsd</b>(8).
<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8).</a>
It is normally located in the <i>/etc/cups</i> directory.
<p>Each line in the file can be a configuration directive, a blank line, or a comment.
Configuration directives typically consist of a name and zero or more values separated by whitespace.
The configuration directive name and values are case-insensitive.
Comment lines start with the # character.
<h3><a name="DIRECTIVES">Directives</a></h3>
The following directives are understood by
<b>cupsd</b>(8):
<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8):</a>
<dl class="man">
<dt><a name="AccessLog"></a><b>AccessLog</b>
<dd style="margin-left: 5.0em"><dt><b>AccessLog </b><i>filename</i>
Expand Down Expand Up @@ -201,8 +201,8 @@ <h2 class="title"><a name="NOTES">Notes</a></h2>
<h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
<b>classes.conf</b>(5),
<b>cups</b>(1),
<b>cupsd</b>(8),
<b>cupsd.conf</b>(5),
<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5),</a>
<b>mime.convs</b>(5),
<b>mime.types</b>(5),
<b>printers.conf</b>(5),
Expand Down
2 changes: 1 addition & 1 deletion doc/help/man-cups-lpd.html
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ <h2 class="title"><a name="EXAMPLE">Example</a></h2>
service using the corresponding control program.
<h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
<b>cups</b>(1),
<b>cupsd</b>(8),
<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
<b>inetconv</b>(1m),
<b>inetd</b>(8),
<b>launchd</b>(8),
Expand Down
4 changes: 2 additions & 2 deletions doc/help/man-cups-snmp.conf.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ <h2 class="title"><a name="DESCRIPTION">Description</a></h2>
file configures how the standard CUPS network backends (http, https, ipp, ipps, lpd, snmp, and socket) access printer information using SNMPv1 and is normally located in the <i>/etc/cups</i> directory.
Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character.
<p>The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend -
<b>cups-snmp</b>(8).
<a href="man-cups-snmp.html?TOPIC=Man+Pages"><b>cups-snmp</b>(8).</a>
<h2 class="title"><a name="DIRECTIVES">Directives</a></h2>
The following directives are understood by the CUPS network backends:
<dl class="man">
Expand Down Expand Up @@ -51,7 +51,7 @@ <h2 class="title"><a name="NOTES">Notes</a></h2>
Printers that do not support IPP can be supported using applications such as
<b>ippeveprinter</b>(1).
<h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
<b>cups-snmp</b>(8),
<a href="man-cups-snmp.html?TOPIC=Man+Pages"><b>cups-snmp</b>(8),</a>
CUPS Online Help (<a href="http:https://localhost:631/help">http:https://localhost:631/help</a>)
<h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
Copyright &copy; 2007-2019 by Apple Inc.
Expand Down
2 changes: 1 addition & 1 deletion doc/help/man-cups-snmp.html
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ <h2 class="title"><a name="CONFORMING_TO">Conforming To</a></h2>
<h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
<b>backend</b>(7),
<b>cups-snmp.conf</b>(5),
<b>cupsd</b>(8),
<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
<b>lpinfo</b>(8),
CUPS Online Help (<a href="http:https://localhost:631/help">http:https://localhost:631/help</a>)
<h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
Expand Down
6 changes: 3 additions & 3 deletions doc/help/man-cups.html
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,13 @@ <h2 class="title"><a name="NOTES">Notes</a></h2>
<b>ippeveprinter</b>(1).
<h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
<b>cancel</b>(1),
<b>client.conf</b>(7),
<a href="man-client.conf.html?TOPIC=Man+Pages"><b>client.conf</b>(7),</a>
<b>cupsctl</b>(8),
<b>cupsd</b>(8),
<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
<b>lp</b>(1),
<b>lpadmin</b>(8),
<b>lpinfo</b>(8),
<b>lpoptions</b>(1),
<a href="man-lpoptions.html?TOPIC=Man+Pages"><b>lpoptions</b>(1),</a>
<b>lpr</b>(1),
<b>lprm</b>(1),
<b>lpq</b>(1),
Expand Down
4 changes: 2 additions & 2 deletions doc/help/man-cupsctl.html
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ <h2 class="title"><a name="EXAMPLES">Examples</a></h2>
<h2 class="title"><a name="KNOWN_ISSUES">Known Issues</a></h2>
You cannot set the Listen or Port directives using <b>cupsctl</b>.
<h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
<b>cupsd.conf</b>(5),
<b>cupsd</b>(8),
<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5),</a>
<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
<br>
CUPS Online Help (<a href="http:https://localhost:631/help">http:https://localhost:631/help</a>)
<h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
Expand Down
6 changes: 3 additions & 3 deletions doc/help/man-cupsd-helper.html
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ <h2 class="title"><a name="SYNOPSIS">Synopsis</a></h2>
<i>argvN</i>
<h2 class="title"><a name="DESCRIPTION">Description</a></h2>
The <b>cupsd-helper</b> programs perform long-running operations on behalf of the scheduler,
<b>cupsd</b>(8).
<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8).</a>
The <b>cups-deviced</b> helper program runs each CUPS
<b>backend</b>(7)
with no arguments in order to discover the available printers.
Expand Down Expand Up @@ -76,8 +76,8 @@ <h2 class="title"><a name="NOTES">Notes</a></h2>
<h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
<b>backend</b>(7),
<b>cups</b>(1),
<b>cupsd</b>(8),
<b>cupsd.conf</b>(5),
<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5),</a>
<b>filter</b>(7),
<b>ppdcfile</b>(5),
CUPS Online Help (<a href="http:https://localhost:631/help">http:https://localhost:631/help</a>)
Expand Down
16 changes: 8 additions & 8 deletions doc/help/man-cupsd-logs.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ <h1 class="title">cupsd-logs(5)</h1>
<h2 class="title"><a name="NAME">Name</a></h2>
cupsd-logs - cupsd log files (access_log, error_log, and page_log)
<h2 class="title"><a name="DESCRIPTION">Description</a></h2>
<b>cupsd</b>(8)
<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8)</a>
normally maintains three log files: <i>access_log</i> to track requests that are submitted to the scheduler, <i>error_log</i> to track progress and errors, and <i>page_log</i> to track pages that are printed.
Configuration directives in
<b>cupsd.conf</b>(5)
<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5)</a>
and
<b>cups-files.conf</b>(5)
<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5)</a>
control what information is logged and where it is stored.
<h3><a name="ACCESS_LOG_FILE_FORMAT">Access Log File Format</a></h3>
The <i>access_log</i> file lists each HTTP resource that is accessed by a web browser or client.
Expand Down Expand Up @@ -93,7 +93,7 @@ <h3><a name="ACCESS_LOG_FILE_FORMAT">Access Log File Format</a></h3>
<p>The <i>ipp-status</i> field contains either "-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
<h3><a name="ERROR_LOG_FILE_FORMAT">Error Log File Format</a></h3>
The <i>error_log</i> file lists messages from the scheduler - errors, warnings, etc. The LogLevel directive in the
<b>cupsd.conf</b>(5)
<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5)</a>
file controls which messages are logged:
<pre class="man">

Expand Down Expand Up @@ -158,7 +158,7 @@ <h3><a name="PAGE_LOG_FILE_FORMAT">Page Log File Format</a></h3>

</pre>
The PageLogFormat directive in the
<b>cupsd.conf</b>(5)
<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5)</a>
file can be used to change this information.
<p>The <i>printer</i> field contains the name of the printer that printed the page.
If you send a job to a printer class, this field will contain the name of the printer that was assigned the job.
Expand All @@ -173,9 +173,9 @@ <h3><a name="PAGE_LOG_FILE_FORMAT">Page Log File Format</a></h3>
<p>The <i>media</i> field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
<p>The <i>sides</i> field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
<h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
<b>cupsd</b>(8),
<b>cupsd.conf</b>(5),
<b>cups-files.conf</b>(5),
<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5),</a>
<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5),</a>
CUPS Online Help (<a href="http:https://localhost:631/help">http:https://localhost:631/help</a>)
<h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
Copyright &copy; 2007-2019 by Apple Inc.
Expand Down
28 changes: 14 additions & 14 deletions doc/help/man-cupsd.conf.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ <h2 class="title"><a name="DESCRIPTION">Description</a></h2>
The
<i>cupsd.conf</i>
file configures the CUPS scheduler,
<b>cupsd</b>(8).
<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8).</a>
It is normally located in the
<i>/etc/cups</i>
directory.
Expand All @@ -23,7 +23,7 @@ <h2 class="title"><a name="DESCRIPTION">Description</a></h2>
Comment lines start with the # character.
<h3><a name="TOP_LEVEL_DIRECTIVES">Top-level Directives</a></h3>
The following top-level directives are understood by
<b>cupsd</b>(8):
<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8):</a>
<dl class="man">
<dt><a name="AccessLogLevel"></a><b>AccessLogLevel config</b>
<dd style="margin-left: 5.0em"><dt><b>AccessLogLevel actions</b>
Expand Down Expand Up @@ -119,7 +119,7 @@ <h3><a name="TOP_LEVEL_DIRECTIVES">Top-level Directives</a></h3>
<dd style="margin-left: 5.0em"><dt><b>HostNameLookups Double</b>
<dd style="margin-left: 5.0em">Specifies whether to do reverse lookups on connecting clients.
The "Double" setting causes
<b>cupsd</b>(8)
<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8)</a>
to verify that the hostname resolved from the address matches one of the addresses returned for that hostname.
Double lookups also prevent clients with unregistered addresses from connecting to your server.
The default is "Off" to avoid the potential server performance problems with hostname lookups.
Expand All @@ -128,7 +128,7 @@ <h3><a name="TOP_LEVEL_DIRECTIVES">Top-level Directives</a></h3>
<dd style="margin-left: 5.0em">Specifies the length of time to wait before shutting down due to inactivity.
The default is "60" seconds.
Note: Only applicable when
<b>cupsd</b>(8)
<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8)</a>
is run on-demand (e.g., with <b>-l</b>).
<dt><a name="JobKillDelay"></a><b>JobKillDelay </b><i>seconds</i>
<dd style="margin-left: 5.0em">Specifies the number of seconds to wait before killing the filters and backend associated with a canceled or held job.
Expand Down Expand Up @@ -223,7 +223,7 @@ <h3><a name="TOP_LEVEL_DIRECTIVES">Top-level Directives</a></h3>
The default is "1048576" (1MB).
<dt><a name="MultipleOperationTimeout"></a><b>MultipleOperationTimeout </b><i>seconds</i>
<dd style="margin-left: 5.0em">Specifies the maximum amount of time to allow between files in a multiple file print job.
The default is "300" (5 minutes).
The default is "900" (15 minutes).
<dt><a name="Policy"></a><b>&lt;Policy </b><i>name</i><b>> </b>... <b>&lt;/Policy></b>
<dd style="margin-left: 5.0em">Specifies access control for the named policy.
<dt><a name="Port"></a><b>Port </b><i>number</i>
Expand Down Expand Up @@ -307,7 +307,7 @@ <h3><a name="TOP_LEVEL_DIRECTIVES">Top-level Directives</a></h3>
</dl>
<h3><a name="HTTP_METHOD_NAMES">Http Method Names</a></h3>
The following HTTP methods are supported by
<b>cupsd</b>(8):
<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8):</a>
<dl class="man">
<dt>GET
<dd style="margin-left: 5.0em">Used by a client to download icons and other printer resources and to access the CUPS web interface.
Expand All @@ -322,7 +322,7 @@ <h3><a name="HTTP_METHOD_NAMES">Http Method Names</a></h3>
</dl>
<h3><a name="IPP_OPERATION_NAMES">Ipp Operation Names</a></h3>
The following IPP operations are supported by
<b>cupsd</b>(8):
<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8):</a>
<dl class="man">
<dt>CUPS-Accept-Jobs
<dd style="margin-left: 5.0em">Allows a printer to accept new jobs.
Expand Down Expand Up @@ -415,7 +415,7 @@ <h3><a name="IPP_OPERATION_NAMES">Ipp Operation Names</a></h3>
</dl>
<h3><a name="LOCATION_PATHS">Location Paths</a></h3>
The following paths are commonly used when configuring
<b>cupsd</b>(8):
<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8):</a>
<dl class="man">
<dt>/
<dd style="margin-left: 5.0em">The path for all get operations (get-printers, get-jobs, etc.)
Expand Down Expand Up @@ -491,7 +491,7 @@ <h3><a name="DIRECTIVES_VALID_WITHIN_LOCATION_AND_LIMIT_SECTIONS">Directives Val
<dt><b>Require user {</b><i>user-name</i>|<b>@</b><i>group-name</i>} ...
<dd style="margin-left: 5.0em">Specifies that an authenticated user must match one of the named users or be a member of one of the named groups.
The group name "@SYSTEM" corresponds to the list of groups defined by the SystemGroup directive in the
<b>cups-files.conf</b>(5)
<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5)</a>
file.
The group name "@OWNER" corresponds to the owner of the resource, for example the person that submitted a print job.
Note: The 'root' user is not special and must be granted privileges like any other user account.
Expand All @@ -514,7 +514,7 @@ <h3><a name="DIRECTIVES_VALID_WITHIN_POLICY_SECTIONS">Directives Valid Within Po
"@ACL" maps to the printer's requesting-user-name-allowed or requesting-user-name-denied values.
"@OWNER" maps to the job's owner.
"@SYSTEM" maps to the groups listed for the SystemGroup directive in the
<b>cups-files.conf</b>(5)
<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5)</a>
file.
<dt><b>JobPrivateValues all</b>
<dd style="margin-left: 5.0em"><dt><b>JobPrivateValues default</b>
Expand All @@ -530,7 +530,7 @@ <h3><a name="DIRECTIVES_VALID_WITHIN_POLICY_SECTIONS">Directives Valid Within Po
"@ACL" maps to the printer's requesting-user-name-allowed or requesting-user-name-denied values.
"@OWNER" maps to the job's owner.
"@SYSTEM" maps to the groups listed for the SystemGroup directive in the
<b>cups-files.conf</b>(5)
<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5)</a>
file.
<dt><b>SubscriptionPrivateValues all</b>
<dd style="margin-left: 5.0em"><dt><b>SubscriptionPrivateValues default</b>
Expand Down Expand Up @@ -577,7 +577,7 @@ <h3><a name="DEPRECATED_DIRECTIVES">Deprecated Directives</a></h3>
</dl>
<h2 class="title"><a name="NOTES">Notes</a></h2>
File, directory, and user configuration directives that used to be allowed in the <b>cupsd.conf</b> file are now stored in the
<b>cups-files.conf</b>(5)
<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5)</a>
file instead in order to prevent certain types of privilege escalation attacks.
<p>The scheduler MUST be restarted manually after making changes to the <b>cupsd.conf</b> file.
On Linux this is typically done using the
Expand Down Expand Up @@ -609,8 +609,8 @@ <h2 class="title"><a name="EXAMPLES">Examples</a></h2>
</pre>
<h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
<b>classes.conf</b>(5),
<b>cups-files.conf</b>(5),
<b>cupsd</b>(8),
<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5),</a>
<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
<b>mime.convs</b>(5),
<b>mime.types</b>(5),
<b>printers.conf</b>(5),
Expand Down
6 changes: 3 additions & 3 deletions doc/help/man-cupsd.html
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
<b>backend</b>(7),
<b>classes.conf</b>(5),
<b>cups</b>(1),
<b>cups-files.conf</b>(5),
<b>cups-lpd</b>(8),
<b>cupsd.conf</b>(5),
<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5),</a>
<a href="man-cups-lpd.html?TOPIC=Man+Pages"><b>cups-lpd</b>(8),</a>
<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5),</a>
<b>cupsd-helper</b>(8),
<b>cupsd-logs</b>(8),
<b>filter</b>(7),
Expand Down
2 changes: 1 addition & 1 deletion doc/help/man-cupsfilter.html
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ <h2 class="title"><a name="EXAMPLE">Example</a></h2>
</pre>
<h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
<b>cups</b>(1),
<b>cupsd.conf</b>(5),
<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5),</a>
<b>filter(7),</b>
<b>mime.convs</b>(7),
<b>mime.types</b>(7),
Expand Down
4 changes: 2 additions & 2 deletions doc/help/man-filter.html
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,8 @@ <h2 class="title"><a name="NOTES">Notes</a></h2>
<h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
<b>backend</b>(7),
<b>cups</b>(1),
<b>cups-files.conf</b>(5),
<b>cupsd</b>(8),
<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5),</a>
<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
<b>cupsfilter</b>(8),
<br>
CUPS Online Help (<a href="http:https://localhost:631/help">http:https://localhost:631/help</a>)
Expand Down
6 changes: 3 additions & 3 deletions doc/help/man-lp.html
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ <h2 class="title"><a name="DESCRIPTION">Description</a></h2>
<h3><a name="THE_DEFAULT_DESTINATION">The Default Destination</a></h3>
CUPS provides many ways to set the default destination. The <b>LPDEST</b> and <b>PRINTER</b> environment variables are consulted first.
If neither are set, the current default set using the
<b>lpoptions</b>(1)
<a href="man-lpoptions.html?TOPIC=Man+Pages"><b>lpoptions</b>(1)</a>
command is used, followed by the default set using the
<b>lpadmin</b>(8)
command.
Expand Down Expand Up @@ -138,7 +138,7 @@ <h2 class="title"><a name="OPTIONS">Options</a></h2>
</dl>
<h3><a name="COMMON_JOB_OPTIONS">Common Job Options</a></h3>
Aside from the printer-specific options reported by the
<b>lpoptions</b>(1)
<a href="man-lpoptions.html?TOPIC=Man+Pages"><b>lpoptions</b>(1)</a>
command, the following generic options are available:
<dl class="man">
<dt><b>-o job-sheets=</b><i>name</i>
Expand Down Expand Up @@ -190,7 +190,7 @@ <h2 class="title"><a name="EXAMPLES">Examples</a></h2>
<h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
<b>cancel</b>(1),
<b>lpadmin</b>(8),
<b>lpoptions</b>(1),
<a href="man-lpoptions.html?TOPIC=Man+Pages"><b>lpoptions</b>(1),</a>
<b>lpq</b>(1),
<b>lpr</b>(1),
<b>lprm</b>(1),
Expand Down

0 comments on commit d6395c6

Please sign in to comment.