diff --git a/CHANGES.md b/CHANGES.md
index b2a70d176..8e2a179f9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -34,7 +34,7 @@ Changes in CUPS v2.5b1 (TBA)
- Added support for specifying permissions with the `cupsFileOpen` API.
- Added new `cupsGetClock` API.
- Added new `cupsParseOptions2` API with "end" argument.
-- Updated documentation (Issue #984)
+- Updated documentation (Issue #984, Issue #1086)
- Updated the configure script to default to installing to /usr/local.
- Updated CUPS to require TLS support - OpenSSL, GNUTLS and LibreSSL are
supported.
diff --git a/doc/help/man-backend.html b/doc/help/man-backend.html
index a5eb12e04..81ba0318b 100644
--- a/doc/help/man-backend.html
+++ b/doc/help/man-backend.html
@@ -1,7 +1,7 @@
-
+
backend(7)
@@ -47,7 +47,7 @@ Synopsis
Description
Backends are a special type of
-filter(7)
+filter(7)
which is used to send print data to and discover different devices on the system.
@@ -179,10 +179,10 @@ Exit Status
Environment
In addition to the environment variables listed in
-cups(1)
+cups(1)
and
-filter(7),
+filter(7),
CUPS backends can expect the following environment variable:
@@ -203,24 +203,24 @@ Notes
Unless you are a developer and know what you are doing, please do not run backends directly.
Instead, use the
-lp(1)
+lp(1)
or
-lpr(1)
+lpr(1)
programs to send print jobs or
-lpinfo(8)
+lpinfo(8)
to query for available printers using the backend.
The one exception is the SNMP backend - see
-cups-snmp(8)
+cups-snmp(8)
for more information.
Notes
CUPS printer drivers and backends are deprecated and will no longer be supported in a future feature release of CUPS.
Printers that do not support IPP can be supported using applications such as
-ippeveprinter(1).
+ippeveprinter(1).
See Also
diff --git a/doc/help/man-cancel.html b/doc/help/man-cancel.html
index 8b00f9e99..b5002a0fc 100644
--- a/doc/help/man-cancel.html
+++ b/doc/help/man-cancel.html
@@ -1,7 +1,7 @@
-
+
cancel(1)
@@ -89,18 +89,18 @@ Notes
options require administrative access.
These restrictions are part of the operation policies defined in the
-cupsd.conf(5)
+cupsd.conf(5)
file for the "Cancel-Jobs" and "Cancel-My-Jobs" operations, respectively.
See Also
-cupsd.conf(5),
+cupsd.conf(5),
-lp(1),
+lp(1),
-lpmove(8),
+lpmove(8),
-lpstat(1),
+lpstat(1),
CUPS Online Help (http://localhost:631/help)
diff --git a/doc/help/man-classes.conf.html b/doc/help/man-classes.conf.html
index a95dc29db..7b725fa4a 100644
--- a/doc/help/man-classes.conf.html
+++ b/doc/help/man-classes.conf.html
@@ -1,7 +1,7 @@
-
+
classes.conf(5)
@@ -12,7 +12,7 @@ Name
Description
The classes.conf file defines the local printer classes that are available.
It is normally located in the /etc/cups directory and is maintained by the
-cupsd(8)
+cupsd(8)
program.
This file is not intended to be edited or managed manually.
@@ -21,17 +21,17 @@
Notes
The name, location, and format of this file are an implementation detail that will change in future releases of CUPS.
See Also
-cupsd(8),
+cupsd(8),
-cupsd.conf(5),
+cupsd.conf(5),
-mime.convs(5),
+mime.convs(5),
-mime.types(5),
+mime.types(5),
-printers.conf(5),
+printers.conf(5),
-subscriptions.conf(5),
+subscriptions.conf(5),
CUPS Online Help (http://localhost:631/help)
diff --git a/doc/help/man-client.conf.html b/doc/help/man-client.conf.html
index 1a72e3595..cfd19d37e 100644
--- a/doc/help/man-client.conf.html
+++ b/doc/help/man-client.conf.html
@@ -1,7 +1,7 @@
-
+
client.conf(5)
@@ -128,7 +128,7 @@ Notes
On Linux and other systems using GNU TLS, the /etc/cups/ssl/site.crl file, if present, provides a list of revoked X.509 certificates and is used when validating certificates.
See Also
-cups(1),
+cups(1),
default(1),
diff --git a/doc/help/man-cups-config.html b/doc/help/man-cups-config.html
index 0b5a922bd..b84282e20 100644
--- a/doc/help/man-cups-config.html
+++ b/doc/help/man-cups-config.html
@@ -1,7 +1,7 @@
-
+
cups-config(1)
@@ -112,7 +112,7 @@ Deprecated Options
Formerly used to add the CUPS imaging library to the list of libraries.
See Also
-cups(1),
+cups(1),
pkg-config(1),
diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
index 1ad6cc2d2..0ceca1316 100644
--- a/doc/help/man-cups-files.conf.html
+++ b/doc/help/man-cups-files.conf.html
@@ -1,7 +1,7 @@
-
+
cups-files.conf(5)
@@ -11,7 +11,7 @@ Name
Description
The cups-files.conf file configures the files and directories used by the CUPS scheduler,
-cupsd(8).
+cupsd(8).
It is normally located in the /etc/cups directory.
@@ -22,7 +22,7 @@ Description
Directives
The following directives are understood by
-cupsd(8):
+cupsd(8):
AccessLog
@@ -260,21 +260,21 @@
Notes
command is used instead.
See Also
-classes.conf(5),
+classes.conf(5),
-cups(1),
+cups(1),
-cupsd(8),
+cupsd(8),
-cupsd.conf(5),
+cupsd.conf(5),
-mime.convs(5),
+mime.convs(5),
-mime.types(5),
+mime.types(5),
-printers.conf(5),
+printers.conf(5),
-subscriptions.conf(5),
+subscriptions.conf(5),
CUPS Online Help (http://localhost:631/help)
diff --git a/doc/help/man-cups-lpd.html b/doc/help/man-cups-lpd.html
index 591925f50..caae0d05a 100644
--- a/doc/help/man-cups-lpd.html
+++ b/doc/help/man-cups-lpd.html
@@ -1,7 +1,7 @@
-
+
cups-lpd(8)
@@ -120,9 +120,9 @@ Example
service using the corresponding control program.
See Also
-cups(1),
+cups(1),
-cupsd(8),
+cupsd(8),
inetd(8),
diff --git a/doc/help/man-cups-snmp.conf.html b/doc/help/man-cups-snmp.conf.html
index 8a1c3c03c..0d7c11d15 100644
--- a/doc/help/man-cups-snmp.conf.html
+++ b/doc/help/man-cups-snmp.conf.html
@@ -1,7 +1,7 @@
-
+
snmp.conf(5)
@@ -16,7 +16,7 @@ Description
Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character.
The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend -
-cups-snmp(8).
+cups-snmp(8).
Directives
@@ -60,11 +60,11 @@ Directives
Notes
CUPS backends are deprecated and will no longer be supported in a future feature release of CUPS.
Printers that do not support IPP can be supported using applications such as
-ippeveprinter(1).
+ippeveprinter(1).
See Also
-cups-snmp(8),
+cups-snmp(8),
CUPS Online Help (http://localhost:631/help)
diff --git a/doc/help/man-cups-snmp.html b/doc/help/man-cups-snmp.html
index 58283672b..91b366732 100644
--- a/doc/help/man-cups-snmp.html
+++ b/doc/help/man-cups-snmp.html
@@ -1,7 +1,7 @@
-
+
cups-snmp(8)
@@ -30,7 +30,7 @@ Description
This can be used for programs that need to configure print queues where the user has supplied an address but nothing else.
In the second form, the SNMP backend is run indirectly using the
-lpinfo(8)
+lpinfo(8)
command.
The output provides all printers detected via SNMP on the configured
@@ -54,13 +54,13 @@
The CUPS SNMP backend uses the information from the Host, Printer, and Port Monitor MIBs along with some vendor private MIBs and intelligent port probes to determine the correct device URI and make and model for each printer.
See Also
-backend(7),
+backend(7),
-cups-snmp.conf(5),
+cups-snmp.conf(5),
-cupsd(8),
+cupsd(8),
-lpinfo(8),
+lpinfo(8),
CUPS Online Help (http://localhost:631/help)
diff --git a/doc/help/man-cups.html b/doc/help/man-cups.html
index 47fef9918..9660de8a6 100644
--- a/doc/help/man-cups.html
+++ b/doc/help/man-cups.html
@@ -1,7 +1,7 @@
-
+
cups(1)
@@ -44,10 +44,10 @@ Where Do I Begin?
Once you have added the printer, you can print to it from any application. You can also choose Print Test Page from the maintenance menu to print a simple test page and verify that everything is working properly.
You can also use the
-lpadmin(8)
+lpadmin(8)
and
-lpinfo(8)
+lpinfo(8)
commands to add printers to
CUPS.
@@ -129,33 +129,33 @@
Notes
CUPS printer drivers, backends, and PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
Printers that do not support IPP can be supported using applications such as
-ippeveprinter(1).
+ippeveprinter(1).
See Also
-cancel(1),
+cancel(1),
-client.conf(5),
+client.conf(5),
-cupsctl(8),
+cupsctl(8),
-cupsd(8),
+cupsd(8),
-lp(1),
+lp(1),
-lpadmin(8),
+lpadmin(8),
-lpinfo(8),
+lpinfo(8),
-lpoptions(1),
+lpoptions(1),
-lpr(1),
+lpr(1),
-lprm(1),
+lprm(1),
-lpq(1),
+lpq(1),
-lpstat(1),
+lpstat(1),
CUPS Online Help (http://localhost:631/help),
OpenPrinting CUPS Web Site (https://openprinting.github.io/cups),
diff --git a/doc/help/man-cupsaccept.html b/doc/help/man-cupsaccept.html
index 964ada4c0..6da1f3ba2 100644
--- a/doc/help/man-cupsaccept.html
+++ b/doc/help/man-cupsaccept.html
@@ -1,7 +1,7 @@
-
+
cupsaccept(8)
@@ -79,15 +79,15 @@
Finally, the CUPS versions may ask the user for an access password depending on the printing system configuration.
See Also
-cancel(1),
+cancel(1),
-cupsenable(8),
+cupsenable(8),
-lp(1),
+lp(1),
-lpadmin(8),
+lpadmin(8),
-lpstat(1),
+lpstat(1),
CUPS Online Help (http://localhost:631/help)
diff --git a/doc/help/man-cupsctl.html b/doc/help/man-cupsctl.html
index 4552469a5..ddd659e55 100644
--- a/doc/help/man-cupsctl.html
+++ b/doc/help/man-cupsctl.html
@@ -1,7 +1,7 @@
-
+
cupsctl(8)
@@ -94,9 +94,9 @@ Known Issues
You cannot set the Listen or Port directives using cupsctl.
See Also
-cupsd.conf(5),
+cupsd.conf(5),
-cupsd(8),
+cupsd(8),
CUPS Online Help (http://localhost:631/help)
diff --git a/doc/help/man-cupsd-helper.html b/doc/help/man-cupsd-helper.html
index fc1be2bb6..c1270769d 100644
--- a/doc/help/man-cupsd-helper.html
+++ b/doc/help/man-cupsd-helper.html
@@ -1,7 +1,7 @@
-
+
cupsd-helper(8)
@@ -45,10 +45,10 @@ Synopsis
Description
The cupsd-helper programs perform long-running operations on behalf of the scheduler,
-cupsd(8).
+cupsd(8).
The cups-deviced helper program runs each CUPS
-backend(7)
+backend(7)
with no arguments in order to discover the available printers.
@@ -77,27 +77,27 @@ Files
archives to further reduce their size.
Driver information files must conform to the format defined in
-ppdcfile(5).
+ppdcfile(5).
Notes
CUPS printer drivers, backends, and PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
Printers that do not support IPP can be supported using applications such as
-ippeveprinter(1).
+ippeveprinter(1).
See Also
-backend(7),
+backend(7),
-cups(1),
+cups(1),
-cupsd(8),
+cupsd(8),
-cupsd.conf(5),
+cupsd.conf(5),
-filter(7),
+filter(7),
-ppdcfile(5),
+ppdcfile(5),
CUPS Online Help (http://localhost:631/help)
diff --git a/doc/help/man-cupsd-logs.html b/doc/help/man-cupsd-logs.html
index 60bc279ad..416ecac25 100644
--- a/doc/help/man-cupsd-logs.html
+++ b/doc/help/man-cupsd-logs.html
@@ -1,7 +1,7 @@
-
+
cupsd-logs(5)
@@ -10,14 +10,14 @@ Name
cupsd-logs - cupsd log files (access_log, error_log, and page_log)
Description
-cupsd(8)
+cupsd(8)
normally maintains three log files: access_log to track requests that are submitted to the scheduler, error_log to track progress and errors, and page_log to track pages that are printed.
Configuration directives in
-cupsd.conf(5)
+cupsd.conf(5)
and
-cups-files.conf(5)
+cups-files.conf(5)
control what information is logged and where it is stored.
@@ -119,7 +119,7 @@ The error_log file lists messages from the scheduler - errors, warnings, etc. The LogLevel directive in the
-cupsd.conf(5)
+cupsd.conf(5)
file controls which messages are logged:
@@ -195,7 +195,7 @@ Page Log File Format
The PageLogFormat directive in the
-cupsd.conf(5)
+cupsd.conf(5)
file can be used to change this information.
@@ -222,11 +222,11 @@ Page Log File Format
The sides field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
See Also
-cupsd(8),
+cupsd(8),
-cupsd.conf(5),
+cupsd.conf(5),
-cups-files.conf(5),
+cups-files.conf(5),
CUPS Online Help (http://localhost:631/help)
diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
index 838b40b37..2019b7315 100644
--- a/doc/help/man-cupsd.conf.html
+++ b/doc/help/man-cupsd.conf.html
@@ -1,7 +1,7 @@
-
+
cupsd.conf(5)
@@ -13,7 +13,7 @@ Description
The
cupsd.conf
file configures the CUPS scheduler,
-cupsd(8).
+cupsd(8).
It is normally located in the
/etc/cups
@@ -25,7 +25,7 @@
Description
Top-Level Directives
The following top-level directives are understood by
-cupsd(8):
+cupsd(8):
AccessLogLevel config
@@ -156,7 +156,7 @@
Top-Level Directives
HostNameLookups Double
Specifies whether to do reverse lookups on connecting clients.
The "Double" setting causes
-cupsd(8)
+cupsd(8)
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.
@@ -167,18 +167,18 @@
Top-Level Directives
Specifies the length of time to wait before shutting down due to inactivity.
The default is "60" seconds.
Note: Only applicable when
-cupsd(8)
+cupsd(8)
is run on-demand (e.g., with -l).
JobKillDelay seconds
Specifies the number of seconds to wait before killing the filters and backend associated with a canceled or held job.
-The default is "30".
+The default is "300".
JobRetryInterval seconds
Specifies the interval between retries of jobs in seconds.
This is typically used for fax queues but can also be used with normal print queues whose error policy is "retry-job" or "retry-current-job".
-The default is "30".
+The default is "300".
JobRetryLimit count
Specifies the number of retries that are done for jobs.
@@ -433,7 +433,7 @@
Top-Level Directives
Http Method Names
The following HTTP methods are supported by
-cupsd(8):
+cupsd(8):
GET
@@ -453,7 +453,7 @@
Http Method Names
Ipp Operation Names
The following IPP operations are supported by
-cupsd(8):
+cupsd(8):
CUPS-Accept-Jobs
@@ -590,7 +590,7 @@
Ipp Operation Names
Location Paths
The following paths are commonly used when configuring
-cupsd(8):
+cupsd(8):
/
@@ -712,7 +712,7 @@
Require user {user-name|@group-name} ...
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
-cups-files.conf(5)
+cups-files.conf(5)
file.
The group name "@OWNER" corresponds to the owner of the resource, for example the person that submitted a print job.
@@ -741,7 +741,7 @@ Direct
"@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
-cups-files.conf(5)
+cups-files.conf(5)
file.
@@ -765,7 +765,7 @@ Direct
"@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
-cups-files.conf(5)
+cups-files.conf(5)
file.
@@ -827,7 +827,7 @@ Deprecated Directives
Notes
File, directory, and user configuration directives that used to be allowed in the cupsd.conf file are now stored in the
-cups-files.conf(5)
+cups-files.conf(5)
file instead in order to prevent certain types of privilege escalation attacks.
@@ -868,19 +868,19 @@ Examples
</Location>
See Also
-classes.conf(5),
+classes.conf(5),
-cups-files.conf(5),
+cups-files.conf(5),
-cupsd(8),
+cupsd(8),
-mime.convs(5),
+mime.convs(5),
-mime.types(5),
+mime.types(5),
-printers.conf(5),
+printers.conf(5),
-subscriptions.conf(5),
+subscriptions.conf(5),
CUPS Online Help (http://localhost:631/help)
diff --git a/doc/help/man-cupsd.html b/doc/help/man-cupsd.html
index 6fe2c3617..aaa807718 100644
--- a/doc/help/man-cupsd.html
+++ b/doc/help/man-cupsd.html
@@ -1,7 +1,7 @@
-
+
cupsd(8)
@@ -115,31 +115,31 @@ Examples
See Also
-backend(7),
+backend(7),
-classes.conf(5),
+classes.conf(5),
-cups(1),
+cups(1),
-cups-files.conf(5),
+cups-files.conf(5),
-cups-lpd(8),
+cups-lpd(8),
-cupsd.conf(5),
+cupsd.conf(5),
-cupsd-helper(8),
+cupsd-helper(8),
cupsd-logs(8),
-filter(7),
+filter(7),
launchd(8),
-mime.convs(5),
+mime.convs(5),
-mime.types(5),
+mime.types(5),
-printers.conf(5),
+printers.conf(5),
systemd(8),
diff --git a/doc/help/man-cupsenable.html b/doc/help/man-cupsenable.html
index 2142c3473..996d32d4a 100644
--- a/doc/help/man-cupsenable.html
+++ b/doc/help/man-cupsenable.html
@@ -1,7 +1,7 @@
-
+
cupsenable(8)
@@ -90,17 +90,17 @@
This differs from the System V versions which require the root user to execute these commands.
See Also
-cupsaccept(8),
+cupsaccept(8),
cupsreject(8),
-cancel(1),
+cancel(1),
-lp(1),
+lp(1),
-lpadmin(8),
+lpadmin(8),
-lpstat(1),
+lpstat(1),
CUPS Online Help (http://localhost:631/help)
diff --git a/doc/help/man-cupsfilter.html b/doc/help/man-cupsfilter.html
index 075d56003..f6773b440 100644
--- a/doc/help/man-cupsfilter.html
+++ b/doc/help/man-cupsfilter.html
@@ -1,7 +1,7 @@
-
+
cupsfilter(8)
@@ -112,7 +112,7 @@ Exit Status
Environment
All of the standard
-cups(1)
+cups(1)
environment variables affect the operation of
cupsfilter.
@@ -128,7 +128,7 @@
Files
Notes
CUPS printer drivers, filters, and backends are deprecated and will no longer be supported in a future feature release of CUPS.
Printers that do not support IPP can be supported using applications such as
-ippeveprinter(1).
+ippeveprinter(1).
Unlike when printing, filters run using the
@@ -142,9 +142,9 @@
Example
cupsfilter -m application/pdf -d myprinter -j 42 >preview.pdf
See Also
-cups(1),
+cups(1),
-cupsd.conf(5),
+cupsd.conf(5),
filter(7),
diff --git a/doc/help/man-cupstestppd.html b/doc/help/man-cupstestppd.html
index 201db603d..586ad907f 100644
--- a/doc/help/man-cupstestppd.html
+++ b/doc/help/man-cupstestppd.html
@@ -1,7 +1,7 @@
-
+
cupstestppd(1)
@@ -141,11 +141,11 @@ Examples
Notes
PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
Printers that do not support IPP can be supported using applications such as
-ippeveprinter(1).
+ippeveprinter(1).
See Also
-lpadmin(8),
+lpadmin(8),
CUPS Online Help (http://localhost:631/help),
Adobe PostScript Printer Description File Format Specification, Version 4.3.
diff --git a/doc/help/man-filter.html b/doc/help/man-filter.html
index f8f2ebc41..bc8a64719 100644
--- a/doc/help/man-filter.html
+++ b/doc/help/man-filter.html
@@ -1,7 +1,7 @@
-
+
filter(7)
@@ -209,27 +209,27 @@
Notes
CUPS printer drivers and backends are deprecated and will no longer be supported in a future feature release of CUPS.
Printers that do not support IPP can be supported using applications such as
-ippeveprinter(1).
+ippeveprinter(1).
CUPS filters are not meant to be run directly by the user.
Aside from the legacy System V interface issues (argv[0] is the printer name), CUPS filters also expect specific environment variables and file descriptors, and typically run in a user session that (on macOS) has additional restrictions that affect how it runs.
Unless you are a developer and know what you are doing, please do not run filters directly.
Instead, use the
-cupsfilter(8)
+cupsfilter(8)
program to use the appropriate filters to do the conversions you need.
See Also
-backend(7),
+backend(7),
-cups(1),
+cups(1),
-cups-files.conf(5),
+cups-files.conf(5),
-cupsd(8),
+cupsd(8),
-cupsfilter(8),
+cupsfilter(8),
CUPS Online Help (http://localhost:631/help)
diff --git a/doc/help/man-ippevepcl.html b/doc/help/man-ippevepcl.html
index 79df63733..a0f16afe2 100644
--- a/doc/help/man-ippevepcl.html
+++ b/doc/help/man-ippevepcl.html
@@ -1,7 +1,7 @@
-
+
ippevepcl/ps(7)
@@ -25,7 +25,7 @@ Description
and
ippeveps
are print commands for
-ippeveprinter(1).
+ippeveprinter(1).
As with all print commands, these commands read either the filename specified on the command-line or from the standard input.
Output is sent to the standard output.
diff --git a/doc/help/man-ippeveprinter.html b/doc/help/man-ippeveprinter.html
index 9fcabeef2..fe4ce0a5a 100644
--- a/doc/help/man-ippeveprinter.html
+++ b/doc/help/man-ippeveprinter.html
@@ -1,7 +1,7 @@
-
+
ippeveprinter(1)
@@ -145,7 +145,7 @@ Options
-a filename.conf
Load printer attributes from "filename.conf".
Attribute files can be created using the
-ipptool(1)
+ipptool(1)
command with the
--ippserver
@@ -157,11 +157,11 @@
Options
ippeveprinter
looks for the command in the "command" subdirectory of the CUPS binary directory, typically /usr/lib/cups/command or /usr/libexec/cups/command.
The
-cups-config(1)
+cups-config(1)
command can be used to discover the correct binary directory ("cups-config --serverbin").
In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory - see the
-cups(1)
+cups(1)
man page for more details.
@@ -289,7 +289,7 @@ Examples
ippeveprinter -c /usr/bin/file "My Cool Printer"
See Also
-ippevepcl(7),
+ippevepcl(7),
ippeveps(7),
diff --git a/doc/help/man-ippfind.html b/doc/help/man-ippfind.html
index 7894c680a..70394e1c6 100644
--- a/doc/help/man-ippfind.html
+++ b/doc/help/man-ippfind.html
@@ -1,7 +1,7 @@
-
+
ippfind(1)
@@ -263,7 +263,7 @@ Examples
-f onepage-letter.ps '{}' print-job.test \;
See Also
-ipptool(1)
+ipptool(1)
Copyright
diff --git a/doc/help/man-ipptool.html b/doc/help/man-ipptool.html
index 03503ed6e..340c632dc 100644
--- a/doc/help/man-ipptool.html
+++ b/doc/help/man-ipptool.html
@@ -1,7 +1,7 @@
-
+
ipptool(1)
@@ -90,7 +90,7 @@
The
testfile
format is described in
-ipptoolfile(5).
+ipptoolfile(5).
@@ -103,7 +103,7 @@
--ippfile FILENAME
Specifies that the test results should be written to the named IPP file.
These files can be used with programs like
-ippeveprinter(1).
+ippeveprinter(1).
--stop-after-include-error
@@ -295,7 +295,7 @@
ipp://localhost/printers/myprinter create-printer-subscription.test
-ipptoolfile(5),
+ipptoolfile(5),
IANA IPP Registry (https://www.iana.org/assignments/ipp-registrations),
PWG Internet Printing Protocol Workgroup (https://www.pwg.org/ipp),
diff --git a/doc/help/man-ipptoolfile.html b/doc/help/man-ipptoolfile.html
index 94b6f983b..52395a3b2 100644
--- a/doc/help/man-ipptoolfile.html
+++ b/doc/help/man-ipptoolfile.html
@@ -1,7 +1,7 @@
-
+
ipptoolfile(5)
@@ -11,7 +11,7 @@
The
-ipptool(1)
+ipptool(1)
program accepts free-form plain text files that describe one or more IPP requests.
Comments start with the "#" character and continue to the end of the line.
@@ -906,7 +906,7 @@
}
-ipptool(1)
+ipptool(1)
IANA IPP Registry (https://www.iana.org/assignments/ipp-registrations)
diff --git a/doc/help/man-lp.html b/doc/help/man-lp.html
index 37c59d184..f3aa5e745 100644
--- a/doc/help/man-lp.html
+++ b/doc/help/man-lp.html
@@ -1,7 +1,7 @@
-
+
lp(1)
@@ -88,10 +88,10 @@ Description
The Default Destination
CUPS provides many ways to set the default destination. The LPDEST and PRINTER environment variables are consulted first.
If neither are set, the current default set using the
-lpoptions(1)
+lpoptions(1)
command is used, followed by the default set using the
-lpadmin(8)
+lpadmin(8)
command.
@@ -162,7 +162,7 @@ Options
Common Job Options
Aside from the printer-specific options reported by the
-lpoptions(1)
+lpoptions(1)
command, the following generic options are available:
@@ -235,19 +235,19 @@ Examples
lp -d bar -o number-up=2 filename
See Also
-cancel(1),
+cancel(1),
-lpadmin(8),
+lpadmin(8),
-lpoptions(1),
+lpoptions(1),
-lpq(1),
+lpq(1),
-lpr(1),
+lpr(1),
-lprm(1),
+lprm(1),
-lpstat(1),
+lpstat(1),
CUPS Online Help (http://localhost:631/help)
diff --git a/doc/help/man-lpadmin.html b/doc/help/man-lpadmin.html
index d79d75a2b..4f19b191c 100644
--- a/doc/help/man-lpadmin.html
+++ b/doc/help/man-lpadmin.html
@@ -1,7 +1,7 @@
-
+
lpadmin(8)
@@ -59,13 +59,13 @@ Description
The first form of the command (-d) sets the scheduler's default printer or class to destination.
Subsequent print jobs submitted via the
-lp(1)
+lp(1)
or
-lpr(1)
+lpr(1)
commands will use this destination unless the user specifies otherwise with the
-lpoptions(1)
+lpoptions(1)
command.
@@ -84,7 +84,7 @@ Options
-m model
Sets a standard PPD file for the printer from the model directory or using one of the driver interfaces.
Use the -m option with the
-lpinfo(8)
+lpinfo(8)
command to get a list of supported models.
The model "raw" clears any existing PPD file and the model "everywhere" queries the printer referred to by the specified IPP device-uri.
@@ -120,7 +120,7 @@
Options
-o name=value
Sets a PPD option for the printer.
PPD options can be listed using the -l option with the
-lpoptions(1)
+lpoptions(1)
command.
@@ -173,7 +173,7 @@ Options
-v "device-uri"
Sets the device-uri attribute of the printer queue.
Use the -v option with the
-lpinfo(8)
+lpinfo(8)
command to get a list of supported device URIs and schemes.
@@ -183,10 +183,10 @@ Options
-E
When specified before the -d, -p, or -x options, forces the use of TLS encryption on the connection to the scheduler.
Otherwise, enables the destination and accepts jobs; this is the same as running the
-cupsaccept(8)
+cupsaccept(8)
and
-cupsenable(8)
+cupsenable(8)
programs on the destination.
@@ -215,7 +215,7 @@
Notes
CUPS printer drivers and backends are deprecated and will no longer be supported in a future feature release of CUPS.
Printers that do not support IPP can be supported using applications such as
-ippeveprinter(1).
+ippeveprinter(1).
The CUPS version of lpadmin does not support all of the System V or Solaris printing system configuration options.
@@ -236,13 +236,13 @@
Example
See Also
-cupsaccept(8),
+cupsaccept(8),
-cupsenable(8),
+cupsenable(8),
-lpinfo(8),
+lpinfo(8),
-lpoptions(1),
+lpoptions(1),
CUPS Online Help (http://localhost:631/help)
diff --git a/doc/help/man-lpc.html b/doc/help/man-lpc.html
index 32d954ff6..fd3e160d1 100644
--- a/doc/help/man-lpc.html
+++ b/doc/help/man-lpc.html
@@ -1,7 +1,7 @@
-
+
lpc(8)
@@ -44,26 +44,26 @@ Notes
Since lpc is geared towards the Berkeley printing system, it is impossible to use lpc to configure printer or class queues provided by CUPS.
To configure printer or class queues you must use the
-lpadmin(8)
+lpadmin(8)
command or another CUPS-compatible client with that functionality.
See Also
-cancel(1),
+cancel(1),
-cupsaccept(8),
+cupsaccept(8),
-cupsenable(8),
+cupsenable(8),
-lp(1),
+lp(1),
-lpadmin(8),
+lpadmin(8),
-lpr(1),
+lpr(1),
-lprm(1),
+lprm(1),
-lpstat(1),
+lpstat(1),
CUPS Online Help (http://localhost:631/help)
diff --git a/doc/help/man-lpinfo.html b/doc/help/man-lpinfo.html
index 61147f3ad..97f7b3c9f 100644
--- a/doc/help/man-lpinfo.html
+++ b/doc/help/man-lpinfo.html
@@ -1,7 +1,7 @@
-
+
lpinfo(8)
@@ -121,11 +121,11 @@ Examples
Notes
CUPS printer drivers and backends are deprecated and will no longer be supported in a future feature release of CUPS.
Printers that do not support IPP can be supported using applications such as
-ippeveprinter(1).
+ippeveprinter(1).
See Also
-lpadmin(8),
+lpadmin(8),
CUPS Online Help (http://localhost:631/help)
diff --git a/doc/help/man-lpmove.html b/doc/help/man-lpmove.html
index 261c30ffe..20ce44035 100644
--- a/doc/help/man-lpmove.html
+++ b/doc/help/man-lpmove.html
@@ -1,7 +1,7 @@
-
+
lpmove(8)
@@ -67,13 +67,13 @@ Examples
lpmove oldprinter newprinter
See Also
-cancel(1),
+cancel(1),
-lp(1),
+lp(1),
-lpr(1),
+lpr(1),
-lprm(1),
+lprm(1),
CUPS Online Help (http://localhost:631/help)
diff --git a/doc/help/man-lpoptions.html b/doc/help/man-lpoptions.html
index b3f9c73b7..99cc46817 100644
--- a/doc/help/man-lpoptions.html
+++ b/doc/help/man-lpoptions.html
@@ -1,7 +1,7 @@
-
+
lpoptions(1)
@@ -53,16 +53,16 @@ Synopsis
Description
lpoptions displays or sets printer options and defaults.
If no printer is specified using the -p option, the default printer is used as described in
-lp(1).
+lp(1).
If no -l, -o, or -r options are specified, the current options are reported on the standard output.
Options set with the lpoptions command are used by the
-lp(1)
+lp(1)
and
-lpr(1)
+lpr(1)
commands when submitting jobs.
@@ -94,7 +94,7 @@ Options
Sets the destination and instance, if specified, for any options that follow.
If the named instance does not exist then it is created.
Destinations can only be created using the
-lpadmin(8)
+lpadmin(8)
program.
@@ -105,7 +105,7 @@ Options
Removes the options for the named destination and instance, if specified.
If the named instance does not exist then this does nothing.
Destinations can only be removed using the
-lpadmin(8)
+lpadmin(8)
command.
@@ -127,15 +127,15 @@
The lpoptions command is unique to CUPS.
See Also
-cancel(1),
+cancel(1),
-lp(1),
+lp(1),
-lpadmin(8),
+lpadmin(8),
-lpr(1),
+lpr(1),
-lprm(1),
+lprm(1),
CUPS Online Help (http://localhost:631/help)
diff --git a/doc/help/man-lpq.html b/doc/help/man-lpq.html
index 113d9559f..fe9d78eba 100644
--- a/doc/help/man-lpq.html
+++ b/doc/help/man-lpq.html
@@ -1,7 +1,7 @@
-
+
lpq(1)
@@ -58,15 +58,15 @@ Options
Requests a more verbose (long) reporting format.
See Also
-cancel(1),
+cancel(1),
-lp(1),
+lp(1),
-lpr(1),
+lpr(1),
-lprm(1),
+lprm(1),
-lpstat(1),
+lpstat(1),
CUPS Online Help (http://localhost:631/help)
diff --git a/doc/help/man-lpr.html b/doc/help/man-lpr.html
index 81d30f165..c5f5b3548 100644
--- a/doc/help/man-lpr.html
+++ b/doc/help/man-lpr.html
@@ -1,7 +1,7 @@
-
+
lpr(1)
@@ -58,10 +58,10 @@ Description
The Default Destination
CUPS provides many ways to set the default destination. The LPDEST and PRINTER environment variables are consulted first.
If neither are set, the current default set using the
-lpoptions(1)
+lpoptions(1)
command is used, followed by the default set using the
-lpadmin(8)
+lpadmin(8)
command.
@@ -117,7 +117,7 @@ Options
Common Job Options
Aside from the printer-specific options reported by the
-lpoptions(1)
+lpoptions(1)
command, the following generic options are available:
@@ -187,19 +187,19 @@ Examples
lpr -P foo -o number-up=2 filename
See Also
-cancel(1),
+cancel(1),
-lp(1),
+lp(1),
-lpadmin(8),
+lpadmin(8),
-lpoptions(1),
+lpoptions(1),
-lpq(1),
+lpq(1),
-lprm(1),
+lprm(1),
-lpstat(1),
+lpstat(1),
CUPS Online Help (http://localhost:631/help)
diff --git a/doc/help/man-lprm.html b/doc/help/man-lprm.html
index 9015cd91d..a795d279e 100644
--- a/doc/help/man-lprm.html
+++ b/doc/help/man-lprm.html
@@ -1,7 +1,7 @@
-
+
lprm(1)
@@ -76,15 +76,15 @@ Examples
lprm -
See Also
-cancel(1),
+cancel(1),
-lp(1),
+lp(1),
-lpq(1),
+lpq(1),
-lpr(1),
+lpr(1),
-lpstat(1),
+lpstat(1),
CUPS Online Help (http://localhost:631/help)
diff --git a/doc/help/man-lpstat.html b/doc/help/man-lpstat.html
index dcaf501e7..79424f356 100644
--- a/doc/help/man-lpstat.html
+++ b/doc/help/man-lpstat.html
@@ -1,7 +1,7 @@
-
+
lpstat(1)
@@ -96,7 +96,7 @@ Options
-d
Shows the current default destination, either the
-lpoptions(1)
+lpoptions(1)
default (if set) or the scheduler default (otherwise).
@@ -155,15 +155,15 @@
The Solaris -f, -P, and -S options are silently ignored.
See Also
-cancel(1),
+cancel(1),
-lp(1),
+lp(1),
-lpq(1),
+lpq(1),
-lpr(1),
+lpr(1),
-lprm(1),
+lprm(1),
CUPS Online Help (http://localhost:631/help)
diff --git a/doc/help/man-mailto.conf.html b/doc/help/man-mailto.conf.html
index d5da0f1b8..30df52274 100644
--- a/doc/help/man-mailto.conf.html
+++ b/doc/help/man-mailto.conf.html
@@ -1,7 +1,7 @@
-
+
mailto.conf(5)
@@ -38,7 +38,7 @@ Directives
Specifies a prefix string for the subject line of an email notification.
See Also
-cupsd(8),
+cupsd(8),
CUPS Online Help (http://localhost:631/help)
diff --git a/doc/help/man-mime.convs.html b/doc/help/man-mime.convs.html
index b7451513c..229fb5231 100644
--- a/doc/help/man-mime.convs.html
+++ b/doc/help/man-mime.convs.html
@@ -1,7 +1,7 @@
-
+
mime.convs(5)
@@ -51,19 +51,19 @@ Examples
Notes
CUPS filters are deprecated and will no longer be supported in a future feature release of CUPS.
Printers that do not support IPP can be supported using applications such as
-ippeveprinter(1).
+ippeveprinter(1).
See Also
-cups-files.conf(5),
+cups-files.conf(5),
-cupsd.conf(5),
+cupsd.conf(5),
-cupsd(8),
+cupsd(8),
-cupsfilter(8),
+cupsfilter(8),
-mime.types(5),
+mime.types(5),
CUPS Online Help (http://localhost:631/help)
diff --git a/doc/help/man-mime.types.html b/doc/help/man-mime.types.html
index cc1917b03..bef269887 100644
--- a/doc/help/man-mime.types.html
+++ b/doc/help/man-mime.types.html
@@ -1,7 +1,7 @@
-
+
mime.types(5)
@@ -105,15 +105,15 @@ Examples
string(4,PwgRaster<00>) priority(150)
See Also
-cups-files.conf(5),
+cups-files.conf(5),
-cupsd.conf(5),
+cupsd.conf(5),
-cupsd(8),
+cupsd(8),
-cupsfilter(8),
+cupsfilter(8),
-mime.convs(5),
+mime.convs(5),
CUPS Online Help (http://localhost:631/help)
diff --git a/doc/help/man-notifier.html b/doc/help/man-notifier.html
index 4529d0348..b35e5ae98 100644
--- a/doc/help/man-notifier.html
+++ b/doc/help/man-notifier.html
@@ -1,7 +1,7 @@
-
+
notifier(7)
@@ -29,13 +29,13 @@ Description
functions and exit on error.
Notifiers are encouraged to exit after a suitable period of inactivity, however they may exit after reading the first message or stay running until an error is seen.
Notifiers inherit the environment and can use the logging mechanism documented in
-filter(7).
+filter(7).
See Also
-cupsd(8),
+cupsd(8),
-filter(7),
+filter(7),
CUPS Online Help (http://localhost:631/help)
diff --git a/doc/help/man-ppdc.html b/doc/help/man-ppdc.html
index 864d0b3ee..40a93422a 100644
--- a/doc/help/man-ppdc.html
+++ b/doc/help/man-ppdc.html
@@ -1,7 +1,7 @@
-
+
ppdc(1)
@@ -92,19 +92,19 @@ Options
Notes
PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
Printers that do not support IPP can be supported using applications such as
-ippeveprinter(1).
+ippeveprinter(1).
See Also
-ppdhtml(1),
+ppdhtml(1),
-ppdi(1),
+ppdi(1),
-ppdmerge(1),
+ppdmerge(1),
-ppdpo(1),
+ppdpo(1),
-ppdcfile(5),
+ppdcfile(5),
CUPS Online Help (http://localhost:631/help)
diff --git a/doc/help/man-ppdcfile.html b/doc/help/man-ppdcfile.html
index 1a42175a2..da7a1bd76 100644
--- a/doc/help/man-ppdcfile.html
+++ b/doc/help/man-ppdcfile.html
@@ -1,7 +1,7 @@
-
+
ppdcfile(5)
@@ -11,7 +11,7 @@ Name
Description
The CUPS PPD compiler reads meta files that contain descriptions of one or more PPD files to be generated by
-ppdc(1).
+ppdc(1).
This man page provides a quick reference to the supported keywords and should be used in conjunction with the online help for CUPS.
@@ -150,19 +150,19 @@ Description
Notes
PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
Printers that do not support IPP can be supported using applications such as
-ippeveprinter(1).
+ippeveprinter(1).
See Also
-ppdc(1),
+ppdc(1),
-ppdhtml(1),
+ppdhtml(1),
-ppdi(1),
+ppdi(1),
-ppdmerge(1),
+ppdmerge(1),
-ppdpo(1),
+ppdpo(1),
CUPS Online Help (http://localhost:631/help)
diff --git a/doc/help/man-ppdhtml.html b/doc/help/man-ppdhtml.html
index a876f19b3..267d346ce 100644
--- a/doc/help/man-ppdhtml.html
+++ b/doc/help/man-ppdhtml.html
@@ -1,7 +1,7 @@
-
+
ppdhtml(1)
@@ -37,19 +37,19 @@ Options
Notes
PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
Printers that do not support IPP can be supported using applications such as
-ippeveprinter(1).
+ippeveprinter(1).
See Also
-ppdc(1),
+ppdc(1),
-ppdcfile(5),
+ppdcfile(5),
-ppdi(1),
+ppdi(1),
-ppdmerge(1),
+ppdmerge(1),
-ppdpo(1),
+ppdpo(1),
CUPS Online Help (http://localhost:631/help)
diff --git a/doc/help/man-ppdi.html b/doc/help/man-ppdi.html
index 8a5fc939e..65bcf1fbe 100644
--- a/doc/help/man-ppdi.html
+++ b/doc/help/man-ppdi.html
@@ -1,7 +1,7 @@
-
+
ppdi(1)
@@ -44,19 +44,19 @@ Options
Notes
PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
Printers that do not support IPP can be supported using applications such as
-ippeveprinter(1).
+ippeveprinter(1).
See Also
-ppdc(1),
+ppdc(1),
-ppdhtml(1),
+ppdhtml(1),
-ppdmerge(1),
+ppdmerge(1),
-ppdpo(1),
+ppdpo(1),
-ppdcfile(5),
+ppdcfile(5),
CUPS Online Help (http://localhost:631/help)
diff --git a/doc/help/man-ppdmerge.html b/doc/help/man-ppdmerge.html
index f8b25073b..a9daa5a2e 100644
--- a/doc/help/man-ppdmerge.html
+++ b/doc/help/man-ppdmerge.html
@@ -1,7 +1,7 @@
-
+
ppdmerge(1)
@@ -37,22 +37,22 @@ Options
Notes
PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
Printers that do not support IPP can be supported using applications such as
-ippeveprinter(1).
+ippeveprinter(1).
ppdmerge does not check whether the merged PPD files are for the same device.
Merging of different device PPDs will yield unpredictable results.
See Also
-ppdc(1),
+ppdc(1),
-ppdhtml(1),
+ppdhtml(1),
-ppdi(1),
+ppdi(1),
-ppdpo(1),
+ppdpo(1),
-ppdcfile(5),
+ppdcfile(5),
CUPS Online Help (http://localhost:631/help)
diff --git a/doc/help/man-ppdpo.html b/doc/help/man-ppdpo.html
index 9b49abd8a..c887aeeec 100644
--- a/doc/help/man-ppdpo.html
+++ b/doc/help/man-ppdpo.html
@@ -1,7 +1,7 @@
-
+
ppdpo(1)
@@ -44,17 +44,17 @@ Options
Notes
PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
Printers that do not support IPP can be supported using applications such as
-ippeveprinter(1).
+ippeveprinter(1).
See Also
-ppdc(1),
+ppdc(1),
-ppdhtml(1),
+ppdhtml(1),
-ppdi(1),
+ppdi(1),
-ppdmerge(1),
+ppdmerge(1),
ppdcfile(5),
diff --git a/doc/help/man-printers.conf.html b/doc/help/man-printers.conf.html
index d6b0cd647..1fd7f1bfa 100644
--- a/doc/help/man-printers.conf.html
+++ b/doc/help/man-printers.conf.html
@@ -1,7 +1,7 @@
-
+
printers.conf(5)
@@ -11,7 +11,7 @@ Name
Description
The printers.conf file defines the local printers that are available. It is normally located in the /etc/cups directory and is maintained by the
-cupsd(8)
+cupsd(8)
program. This file is not intended to be edited or managed manually.
@@ -19,19 +19,19 @@ Notes
The name, location, and format of this file are an implementation detail that will change in future releases of CUPS.
See Also
-classes.conf(5),
+classes.conf(5),
-cups-files.conf(5),
+cups-files.conf(5),
-cupsd(8),
+cupsd(8),
-cupsd.conf(5),
+cupsd.conf(5),
-mime.convs(5),
+mime.convs(5),
-mime.types(5),
+mime.types(5),
-subscriptions.conf(5),
+subscriptions.conf(5),
CUPS Online Help (http://localhost:631/help)
diff --git a/doc/help/man-subscriptions.conf.html b/doc/help/man-subscriptions.conf.html
index a5c33737b..413ad6605 100644
--- a/doc/help/man-subscriptions.conf.html
+++ b/doc/help/man-subscriptions.conf.html
@@ -1,7 +1,7 @@
-
+
subscriptions.conf(5)
@@ -12,7 +12,7 @@ Name
Description
The subscriptions.conf file defines the local event notification subscriptions that are active.
It is normally located in the /etc/cups directory and is maintained by the
-cupsd(8)
+cupsd(8)
program.
This file is not intended to be edited or managed manually.
@@ -21,19 +21,19 @@
Notes
The name, location, and format of this file are an implementation detail that will change in future releases of CUPS.
See Also
-classes.conf(5),
+classes.conf(5),
-cups-files.conf(5),
+cups-files.conf(5),
-cupsd(8),
+cupsd(8),
-cupsd.conf(5),
+cupsd.conf(5),
-mime.convs(5),
+mime.convs(5),
-mime.types(5),
+mime.types(5),
-printers.conf(5),
+printers.conf(5),
CUPS Online Help (http://localhost:631/help)
diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
index fd5762dfd..c38a3e9a4 100644
--- a/man/cupsd.conf.5
+++ b/man/cupsd.conf.5
@@ -8,7 +8,7 @@
.\" Licensed under Apache License v2.0. See the file "LICENSE" for more
.\" information.
.\"
-.TH cupsd.conf 5 "CUPS" "2021-10-01" "OpenPrinting"
+.TH cupsd.conf 5 "CUPS" "2024-11-04" "OpenPrinting"
.SH NAME
cupsd.conf \- server configuration file for cups
.SH DESCRIPTION
@@ -187,13 +187,13 @@ is run on-demand (e.g., with \fB-l\fR).
.TP 5
\fBJobKillDelay \fIseconds\fR
Specifies the number of seconds to wait before killing the filters and backend associated with a canceled or held job.
-The default is "30".
+The default is "300".
.\"#JobRetryInterval
.TP 5
\fBJobRetryInterval \fIseconds\fR
Specifies the interval between retries of jobs in seconds.
This is typically used for fax queues but can also be used with normal print queues whose error policy is "retry-job" or "retry-current-job".
-The default is "30".
+The default is "300".
.\"#JobRetryLimit
.TP 5
\fBJobRetryLimit \fIcount\fR