From: Michael R Sweet Date: Mon, 20 Sep 2021 12:02:42 +0000 (-0400) Subject: Fix the generated HTML man pages and mantohtml utility (Issue #256) X-Git-Tag: v2.4b1~49 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4cdcda5143b9173e24a65a0cd39a658100728086;p=thirdparty%2Fcups.git Fix the generated HTML man pages and mantohtml utility (Issue #256) Also update the ipptool/ipptoolfile man pages with current operations, status codes, and tags. --- diff --git a/doc/cups-printable.css b/doc/cups-printable.css index 8bb87f873a..746d6da8fe 100644 --- a/doc/cups-printable.css +++ b/doc/cups-printable.css @@ -31,9 +31,7 @@ blockquote ol li { } pre.command, pre.example { - background: #eee; - margin: 0 36pt; - padding: 10px; + padding: 10px 20px; } p.compact { @@ -53,10 +51,6 @@ dl.man dt { margin-left: 0; } -pre.man { - margin: 0; -} - pre.command em, pre.example em { font-family: lucida grande, geneva, helvetica, arial, sans-serif; } @@ -358,9 +352,10 @@ blockquote { } p code, li code, p.code, pre, ul.code li { background: rgba(127,127,127,0.1); - border: thin dotted gray; + border-left: thin dotted gray; font-family: monospace; hyphens: manual; + margin: 18pt 0; -webkit-hyphens: manual; page-break-inside: avoid; } diff --git a/doc/cups.css b/doc/cups.css index 6f7ec08377..d91d8949a2 100644 --- a/doc/cups.css +++ b/doc/cups.css @@ -141,9 +141,7 @@ blockquote ol li { } pre.command, pre.example { - background: #eee; - margin: 0 36pt; - padding: 10px; + padding: 10px 20px; } p.example { @@ -594,10 +592,10 @@ blockquote { } p code, li code, p.code, pre, ul.code li { background: rgba(127,127,127,0.1); - border: thin dotted gray; + border-left: thin dotted gray; font-family: monospace; - font-size: 90%; hyphens: manual; + margin: 18pt 0; -webkit-hyphens: manual; page-break-inside: avoid; } diff --git a/doc/help/man-backend.html b/doc/help/man-backend.html index ac17a48d01..a9a8375dee 100644 --- a/doc/help/man-backend.html +++ b/doc/help/man-backend.html @@ -22,7 +22,6 @@ backend - cups backend transmission interfaces filename ] 
-
 #include <cups/cups.h>
 
 const char *cupsBackendDeviceURI(char **argv);
@@ -47,7 +46,7 @@ backend - cups backend transmission interfaces

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.

Like filters, backends must be capable of reading from a filename on the command-line or from the standard input, copying the standard input to a temporary file as required by the physical interface.

The command name (argv[0]) is set to the device URI of the destination printer. @@ -70,7 +69,6 @@ constant defines the file descriptor that should be monitored for incoming reque When run with no arguments, the backend should list the devices and schemes it supports or is advertising to the standard output. The output consists of zero or more lines consisting of any of the following forms: 

-
     device-class scheme "Unknown" "device-info"
     device-class device-uri "device-make-and-model" "device-info"
     device-class device-uri "device-make-and-model" "device-info" "device-id"
@@ -151,9 +149,9 @@ The scheduler will retry the job immediately without allowing intervening jobs.
 
All other exit code values are reserved.
 
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:
 

 
DEVICE_URI
@@ -171,19 +169,19 @@ environment variable contain the device URI), CUPS backends also expect specific
 Backends can also be installed with restricted permissions (0500 or 0700) that tell the scheduler to run them as the "root" user instead of an unprivileged user (typically "lp") on the system.
 
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

 cups(1),
 cups-files.conf(5),
diff --git a/doc/help/man-cancel.html b/doc/help/man-cancel.html
index 63a1dbe186..7d7efca400 100644
--- a/doc/help/man-cancel.html
+++ b/doc/help/man-cancel.html
@@ -58,29 +58,26 @@ Unlike the System V printing system, CUPS allows printer names to contain any pr
 
Examples

 Cancel the current print job:
 
-
     cancel
 
 

 Cancel job "myprinter-42":
 
-
     cancel myprinter-42
 
 

 Cancel all jobs:
 
-
     cancel -a
 

 
Notes

 Administrators wishing to prevent unauthorized cancellation of jobs via the -u option should require authentication for Cancel-Jobs operations in
-cupsd.conf(5).
+cupsd.conf(5).
 
See Also

-cupsd.conf(5),
-lp(1),
-lpmove(8),
-lpstat(1),
+cupsd.conf(5),
+lp(1),
+lpmove(8),
+lpstat(1),
 CUPS Online Help (http://localhost:631/help)
 
Copyright

 Copyright © 2021 by OpenPrinting.
diff --git a/doc/help/man-classes.conf.html b/doc/help/man-classes.conf.html
index 44ca1a3cc4..15ff6eba36 100644
--- a/doc/help/man-classes.conf.html
+++ b/doc/help/man-classes.conf.html
@@ -12,18 +12,18 @@ classes.conf - class configuration file for cups
 
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.
 
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.conf(5),
-mime.convs(5),
-mime.types(5),
-printers.conf(5),
-subscriptions.conf(5),
+cupsd(8),
+cupsd.conf(5),
+mime.convs(5),
+mime.types(5),
+printers.conf(5),
+subscriptions.conf(5),
 CUPS Online Help (http://localhost:631/help)
 
Copyright

 Copyright © 2021 by OpenPrinting.
diff --git a/doc/help/man-client.conf.html b/doc/help/man-client.conf.html
index f07f4d6566..406476b0ba 100644
--- a/doc/help/man-client.conf.html
+++ b/doc/help/man-client.conf.html
@@ -98,7 +98,7 @@ defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption
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), CUPS Online Help (http://localhost:631/help)

Copyright

diff --git a/doc/help/man-cups-config.html b/doc/help/man-cups-config.html index 71b441c631..3fa15cae15 100644 --- a/doc/help/man-cups-config.html +++ b/doc/help/man-cups-config.html @@ -82,13 +82,11 @@ The cups-config command accepts the following command-line options:

Examples

Show the currently installed version of CUPS: 
-
     cups-config --version
Compile a simple one-file CUPS filter: 
-
     cc `cups-config --cflags --ldflags` -o filter filter.c \
         `cups-config --libs`
@@ -99,7 +97,7 @@ The following options are deprecated but continue to work for backwards compatib
Formerly used to add the CUPS imaging library to the list of libraries.

See Also

-cups(1), +cups(1), pkg-config(1), CUPS Online Help (http://localhost:631/help)

Copyright

diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html index 2adcb229ef..6ec36bd347 100644 --- a/doc/help/man-cups-files.conf.html +++ b/doc/help/man-cups-files.conf.html @@ -11,7 +11,7 @@ cups-files.conf - file and directory configuration file for cups

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.

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. @@ -19,7 +19,7 @@ The configuration directive name and values are case-insensitive. Comment lines start with the # character.

Directives

The following directives are understood by -cupsd(8): +cupsd(8):
AccessLog
AccessLog filename @@ -31,7 +31,6 @@ The value "stderr" causes log entries to be sent to the standard error file when The value "syslog" causes log entries to be sent to the system log daemon. The server name may be included in filenames using the string "%s", for example: 
-
     AccessLog /var/log/cups/%s-access_log
@@ -67,7 +66,6 @@ The value "stderr" causes log entries to be sent to the standard error file when The value "syslog" causes log entries to be sent to the system log daemon. The server name may be included in filenames using the string "%s", for example: 
-
     ErrorLog /var/log/cups/%s-error_log
@@ -114,7 +112,6 @@ The value "syslog" causes log entries to be sent to the system log daemon. Specifying a blank filename disables page log generation. The server name may be included in filenames using the string "%s", for example: 
-
     PageLog /var/log/cups/%s-page_log
@@ -192,14 +189,14 @@ command, while on macOS the launchctl(8) command is used instead.

See Also

-classes.conf(5), -cups(1), -cupsd(8), -cupsd.conf(5), -mime.convs(5), -mime.types(5), -printers.conf(5), -subscriptions.conf(5), +classes.conf(5), +cups(1), +cupsd(8), +cupsd.conf(5), +mime.convs(5), +mime.types(5), +printers.conf(5), +subscriptions.conf(5), CUPS Online Help (http://localhost:631/help)

Copyright

Copyright © 2020-2021 by OpenPrinting. diff --git a/doc/help/man-cups-lpd.html b/doc/help/man-cups-lpd.html index 0e7db18637..a8abcb6359 100644 --- a/doc/help/man-cups-lpd.html +++ b/doc/help/man-cups-lpd.html @@ -85,7 +85,6 @@ add the following line to the inetd.conf file to enable the cups-lpd mini-server: 
-
     printer stream tcp nowait lp /usr/lib/cups/daemon/cups-lpd cups-lpd \
         -o document-format=application/octet-stream
 
@@ -99,12 +98,12 @@ Simply enable the
 cups-lpd
 service using the corresponding control program.
 
See Also

-cups(1),
-cupsd(8),
+cups(1),
+cupsd(8),
 inetd(8),
 launchd(8),
 xinetd(8),
-CUPS Online Help (http://localhost:631/help),
+CUPS Online Help (http://localhost:631/help),
 RFC 2569
 
Copyright

 Copyright © 2020-2021 by OpenPrinting.
diff --git a/doc/help/man-cups-snmp.conf.html b/doc/help/man-cups-snmp.conf.html
index 0007727395..33ed0cb2a7 100644
--- a/doc/help/man-cups-snmp.conf.html
+++ b/doc/help/man-cups-snmp.conf.html
@@ -15,7 +15,7 @@ The
 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 /etc/cups directory.
 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

 The following directives are understood by the CUPS network backends:
 

@@ -49,9 +49,9 @@ The default is 120 seconds (2 minutes).
 
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)
 
Copyright

 Copyright © 2021 by OpenPrinting.
diff --git a/doc/help/man-cups-snmp.html b/doc/help/man-cups-snmp.html
index 6cbd4d1f75..177aee1599 100644
--- a/doc/help/man-cups-snmp.html
+++ b/doc/help/man-cups-snmp.html
@@ -27,7 +27,7 @@ Additional queries are then sent to printers that respond in order to determine
 
In the first form, the SNMP backend is run directly by the user to look up the device URI and other information when you have an IP address or hostname.
 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
 broadcast addresses.
@@ -45,10 +45,10 @@ version of CUPS.
 
Conforming To

 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),
-cups-snmp.conf(5),
-cupsd(8),
-lpinfo(8),
+backend(7),
+cups-snmp.conf(5),
+cupsd(8),
+lpinfo(8),
 CUPS Online Help (http://localhost:631/help)
 
Copyright

 Copyright © 2021 by OpenPrinting.
diff --git a/doc/help/man-cups.html b/doc/help/man-cups.html
index 90ee86d253..5de0afe98f 100644
--- a/doc/help/man-cups.html
+++ b/doc/help/man-cups.html
@@ -35,9 +35,9 @@ The easiest way to start is by using the web interface to configure your printer
 
After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration - click/press on the Query Printer for Default Options button to update the options automatically.
 
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.
 Additionally, your operating system may include graphical user interfaces or automatically create printer queues when you connect a printer to your computer.
@@ -99,22 +99,22 @@ conforms to the Internet Printing Protocol version 2.1 and implements the Berkel
 
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),
-client.conf(5),
-cupsctl(8),
-cupsd(8),
-lp(1),
-lpadmin(8),
-lpinfo(8),
-lpoptions(1),
-lpr(1),
-lprm(1),
-lpq(1),
-lpstat(1),
-CUPS Online Help (http://localhost:631/help),
-OpenPrinting CUPS Web Site (https://openprinting.github.io/cups),
+cancel(1),
+client.conf(5),
+cupsctl(8),
+cupsd(8),
+lp(1),
+lpadmin(8),
+lpinfo(8),
+lpoptions(1),
+lpr(1),
+lprm(1),
+lpq(1),
+lpstat(1),
+CUPS Online Help (http://localhost:631/help),
+OpenPrinting CUPS Web Site (https://openprinting.github.io/cups),
 PWG Internet Printing Protocol Workgroup (http://www.pwg.org/ipp)
 
Copyright

 Copyright © 2021 by OpenPrinting.
diff --git a/doc/help/man-cupsaccept.html b/doc/help/man-cupsaccept.html
index b0237c7870..8746a8a5c2 100644
--- a/doc/help/man-cupsaccept.html
+++ b/doc/help/man-cupsaccept.html
@@ -70,11 +70,11 @@ Unlike the System V printing system, CUPS allows printer names to contain any pr
 Also, printer and class names are not case-sensitive.
 
Finally, the CUPS versions may ask the user for an access password depending on the printing system configuration.
 
See Also

-cancel(1),
-cupsenable(8),
-lp(1),
-lpadmin(8),
-lpstat(1),
+cancel(1),
+cupsenable(8),
+lp(1),
+lpadmin(8),
+lpstat(1),
 

 CUPS Online Help (http://localhost:631/help)
 
Copyright

diff --git a/doc/help/man-cupsctl.html b/doc/help/man-cupsctl.html
index 88c7f60c0e..bcd26ff696 100644
--- a/doc/help/man-cupsctl.html
+++ b/doc/help/man-cupsctl.html
@@ -59,32 +59,28 @@ The following options are recognized:
 
Examples

 Display the current settings:
 
-
     cupsctl
 
 

 Enable debug logging:
 
-
     cupsctl --debug-logging
 
 

 Get the current debug logging state:
 
-
     cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'
 
 

 Disable printer sharing:
 
-
     cupsctl --no-share-printers
 

 
Known Issues

 You cannot set the Listen or Port directives using cupsctl.
 
See Also

-cupsd.conf(5),
-cupsd(8),
+cupsd.conf(5),
+cupsd(8),
 

 CUPS Online Help (http://localhost:631/help)
 
Copyright

diff --git a/doc/help/man-cupsd-helper.html b/doc/help/man-cupsd-helper.html
index 242d112f9a..9db1349068 100644
--- a/doc/help/man-cupsd-helper.html
+++ b/doc/help/man-cupsd-helper.html
@@ -44,16 +44,15 @@ cupsd-helper - cupsd helper programs (deprecated)
 argvN
 
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.
 
The cups-driverd helper program lists all available printer drivers, a subset of "matching" printer drivers, or a copy of a specific driver PPD file.
 
The cups-exec helper program runs backends, filters, and other programs. On macOS these programs are run in a secure sandbox.
 
Files

 The cups-driverd program looks for PPD and driver information files in the following directories:
 
-
     /Library/Printers
     /opt/share/ppd
     /System/Library/Printers
@@ -68,18 +67,18 @@ program or placed in compressed
 tar(1)
 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),
-cups(1),
-cupsd(8),
-cupsd.conf(5),
-filter(7),
-ppdcfile(5),
+backend(7),
+cups(1),
+cupsd(8),
+cupsd.conf(5),
+filter(7),
+ppdcfile(5),
 CUPS Online Help (http://localhost:631/help)
 
Copyright

 Copyright © 2021 by OpenPrinting.
diff --git a/doc/help/man-cupsd-logs.html b/doc/help/man-cupsd-logs.html
index 2532cd7d17..86341737d8 100644
--- a/doc/help/man-cupsd-logs.html
+++ b/doc/help/man-cupsd-logs.html
@@ -10,25 +10,23 @@
 
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.
 
Access Log File Format

 The access_log file lists each HTTP resource that is accessed by a web browser or client.
 Each line is in an extended version of the so-called "Common Log Format" used by many web servers and web reporting tools:
 
-
     host group user date-time "method resource version" status bytes
       ipp-operation ipp-status
 
 

 For example:
 
-
     10.0.1.2 - - [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
       CUPS-Get-Printers successful-ok-ignored-or-substituted-attributes
     localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
@@ -93,16 +91,14 @@ For POST requests the bytes field contains the number of bytes of non-IPP data t
 
The ipp-status field contains either "-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
 
Error Log File Format

 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:
 
-
     level date-time message
 
 

 For example:
 
-
     I [20/May/1999:19:18:28 +0000] [Job 1] Queued on 'DeskJet' by 'mike'.
     D [20/May/1999:19:18:28 +0000] [Job 1] argv[0]="DeskJet"
     D [20/May/1999:19:18:28 +0000] [Job 1] argv[1]="1"
@@ -145,20 +141,18 @@ Messages from job filters are prefixed with "[Job NNN]" where "NNN" is the job I
 The page_log file lists the total number of pages (sheets) that are printed.
 By default, each line contains the following information:
 
-
     printer user job-id date-time total num-sheets job-billing
       job-originating-host-name job-name media sides
 
 

 For example the entry for a two page job called "myjob" might look like:
 
-
     DeskJet root 1 [20/May/1999:19:21:06 +0000] total 2 acme-123
       localhost myjob na_letter_8.5x11in one-sided
 
 

 The PageLogFormat directive in the
-cupsd.conf(5)
+cupsd.conf(5)
 file can be used to change this information.
 
The printer 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.
@@ -173,9 +167,9 @@ The format of this field is identical to the data-time field in the access_lo
 
The media 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.
 
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.conf(5),
-cups-files.conf(5),
+cupsd(8),
+cupsd.conf(5),
+cups-files.conf(5),
 CUPS Online Help (http://localhost:631/help)
 
Copyright

 Copyright © 2021 by OpenPrinting.
diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
index c60dc36038..8f077e8427 100644
--- a/doc/help/man-cupsd.conf.html
+++ b/doc/help/man-cupsd.conf.html
@@ -13,7 +13,7 @@ cupsd.conf - server configuration file for cups
 The
 cupsd.conf
 file configures the CUPS scheduler,
-cupsd(8).
+cupsd(8).
 It is normally located in the
 /etc/cups
 directory.
@@ -23,7 +23,7 @@ The configuration directive name and values are case-insensitive.
 Comment lines start with the # character.
 
Top-level Directives

 The following top-level directives are understood by
-cupsd(8):
+cupsd(8):
 

 
AccessLogLevel config
 
AccessLogLevel actions
@@ -116,7 +116,7 @@ The default is 0.
 
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.
 The default is "Off" to avoid the potential server performance problems with hostname lookups.
@@ -125,7 +125,7 @@ Only set this option to "On" or "Double" if absolutely required.
 
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.
@@ -320,7 +320,7 @@ The default is "No".
 

 
Http Method Names

 The following HTTP methods are supported by
-cupsd(8):
+cupsd(8):
 

 
GET
 
Used by a client to download icons and other printer resources and to access the CUPS web interface.
@@ -335,7 +335,7 @@ The following HTTP methods are supported by
 

 
Ipp Operation Names

 The following IPP operations are supported by
-cupsd(8):
+cupsd(8):
 

 
CUPS-Accept-Jobs
 
Allows a printer to accept new jobs.
@@ -428,7 +428,7 @@ The following IPP operations are supported by
 

 
Location Paths

 The following paths are commonly used when configuring
-cupsd(8):
+cupsd(8):
 

 
/
 
The path for all get operations (get-printers, get-jobs, etc.)
@@ -507,7 +507,7 @@ The default value is "IfRequested".
 
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.
 Note: The 'root' user is not special and must be granted privileges like any other user account.
@@ -530,7 +530,7 @@ The "default" access list is "@OWNER @SYSTEM".
 "@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.
 
JobPrivateValues all
 
JobPrivateValues default
@@ -546,7 +546,7 @@ The "default" access list is "@OWNER @SYSTEM".
 "@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.
 
SubscriptionPrivateValues all
 
SubscriptionPrivateValues default
@@ -580,7 +580,6 @@ The default service name is "http."
 Sequences beginning with percent (%) characters are replaced with the corresponding information, while all other characters are copied literally.
 The following percent sequences are recognized:
 
-
     "%%" inserts a single percent character.
     "%{name}" inserts the value of the specified IPP attribute.
     "%C" inserts the number of copies for the current page.
@@ -597,7 +596,7 @@ Use "%{job-impressions-completed}" to insert the number of pages (sides) that we
 

 
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.
 
The scheduler MUST be restarted manually after making changes to the cupsd.conf file.
 On Linux this is typically done using the
@@ -613,7 +612,6 @@ The cupsd.conf file format is based on the Apache HTTP Server configurati
 
Examples

 Log everything with a maximum log file size of 32 megabytes:
 
-
     AccessLogLevel all
     LogLevel debug2
     MaxLogSize 32m
@@ -621,7 +619,6 @@ Log everything with a maximum log file size of 32 megabytes:
 

 Require authentication for accesses from outside the 10. network:
 
-
     <Location />
     Order allow,deny
     Allow from 10./8
@@ -631,13 +628,13 @@ Require authentication for accesses from outside the 10. network:
     </Location>
 

 
See Also

-classes.conf(5),
-cups-files.conf(5),
-cupsd(8),
-mime.convs(5),
-mime.types(5),
-printers.conf(5),
-subscriptions.conf(5),
+classes.conf(5),
+cups-files.conf(5),
+cupsd(8),
+mime.convs(5),
+mime.types(5),
+printers.conf(5),
+subscriptions.conf(5),
 CUPS Online Help (http://localhost:631/help)
 
Copyright

 Copyright © 2020-2021 by OpenPrinting.
diff --git a/doc/help/man-cupsd.html b/doc/help/man-cupsd.html
index cd09bc0705..a9039c1f27 100644
--- a/doc/help/man-cupsd.html
+++ b/doc/help/man-cupsd.html
@@ -80,14 +80,12 @@ Run
 cupsd
 in the background with the default configuration file:
 
-
     cupsd
 
 

 Test a configuration file called
 test.conf:
 
-
     cupsd -t -c test.conf
 
 

@@ -96,24 +94,23 @@ Run
 in the foreground with a test configuration file called
 test.conf:
 
-
     cupsd -f -c test.conf
 
 

 
See Also

-backend(7),
-classes.conf(5),
-cups(1),
-cups-files.conf(5),
-cups-lpd(8),
-cupsd.conf(5),
-cupsd-helper(8),
+backend(7),
+classes.conf(5),
+cups(1),
+cups-files.conf(5),
+cups-lpd(8),
+cupsd.conf(5),
+cupsd-helper(8),
 cupsd-logs(8),
-filter(7),
+filter(7),
 launchd(8),
-mime.convs(5),
-mime.types(5),
-printers.conf(5),
+mime.convs(5),
+mime.types(5),
+printers.conf(5),
 systemd(8),
 CUPS Online Help (http://localhost:631/help)
 
Copyright

diff --git a/doc/help/man-cupsenable.html b/doc/help/man-cupsenable.html
index b3962efbbf..9055d363de 100644
--- a/doc/help/man-cupsenable.html
+++ b/doc/help/man-cupsenable.html
@@ -78,12 +78,12 @@ build-in commands of the same names.
 
The CUPS versions of disable and enable may ask the user for an access password depending on the printing system configuration.
 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),
-lp(1),
-lpadmin(8),
-lpstat(1),
+cancel(1),
+lp(1),
+lpadmin(8),
+lpstat(1),
 CUPS Online Help (http://localhost:631/help)
 
Copyright

 Copyright © 2021 by OpenPrinting.
diff --git a/doc/help/man-cupsfilter.html b/doc/help/man-cupsfilter.html
index 741d44ab72..b4e75e68ca 100644
--- a/doc/help/man-cupsfilter.html
+++ b/doc/help/man-cupsfilter.html
@@ -92,7 +92,7 @@ generates a PDF file. The converted file is sent to the standard output.
 returns a non-zero exit status on any error.
 
Environment

 All of the standard
-cups(1)
+cups(1)
 environment variables affect the operation of
 cupsfilter.
 
Files

@@ -105,19 +105,18 @@ environment variables affect the operation of
 
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
 cupsfilter
 command use the current user and security session. This may result in different output or unexpected behavior.
 
Example

 The following command will generate a PDF preview of job 42 for a printer named "myprinter" and save it to a file named "preview.pdf":
 
-
     cupsfilter -m application/pdf -d myprinter -j 42 >preview.pdf
 

 
See Also

-cups(1),
-cupsd.conf(5),
+cups(1),
+cupsd.conf(5),
 filter(7),
 mime.convs(7),
 mime.types(7),
diff --git a/doc/help/man-cupstestppd.html b/doc/help/man-cupstestppd.html
index c31b617a41..419c78a71f 100644
--- a/doc/help/man-cupstestppd.html
+++ b/doc/help/man-cupstestppd.html
@@ -106,23 +106,21 @@ The error codes are as follows:
 
Examples

 The following command will test all PPD files under the current directory and print the names of each file that does not conform:
 
-
     find . -name \*.ppd \! -exec cupstestppd -q '{}' \; -print
 
 

 The next command tests all PPD files under the current directory and print detailed conformance testing results for the files that do not conform:
 
-
     find . -name \*.ppd \! -exec cupstestppd -q '{}' \; \
         -exec cupstestppd -v '{}' \;
 

 
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),
-CUPS Online Help (http://localhost:631/help),
+lpadmin(8),
+CUPS Online Help (http://localhost:631/help),
 Adobe PostScript Printer Description File Format Specification, Version 4.3.
 
Copyright

 Copyright © 2021 by OpenPrinting.
diff --git a/doc/help/man-filter.html b/doc/help/man-filter.html
index fede9c8c65..d8d2e4ceef 100644
--- a/doc/help/man-filter.html
+++ b/doc/help/man-filter.html
@@ -20,7 +20,6 @@ filter - cups file conversion filter interface
 filename
 ]
 
-
 #include <cups/cups.h>
 
 ssize_t cupsBackChannelRead(char *buffer, size_t bytes,
@@ -70,7 +69,6 @@ Use
 ppdFindMarkedChoice()
 to get the user-selected choice for a PPD option. For example, a filter might use the following code to determine the current value of the Duplex PPD option:
 
-
     ppd_file_t *ppd = ppdOpenFile(getenv("PPD"));
     cups_option_t *options = NULL;
     int num_options = cupsParseOptions(argv[5], 0, &options);
@@ -167,19 +165,19 @@ While the filter interface is compatible with System V interface scripts, CUPS d
 
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),
-cups(1),
-cups-files.conf(5),
-cupsd(8),
-cupsfilter(8),
+backend(7),
+cups(1),
+cups-files.conf(5),
+cupsd(8),
+cupsfilter(8),
 

 CUPS Online Help (http://localhost:631/help)
 
Copyright

diff --git a/doc/help/man-ippevepcl.html b/doc/help/man-ippevepcl.html
index e2e5451b1b..3058e9197a 100644
--- a/doc/help/man-ippevepcl.html
+++ b/doc/help/man-ippevepcl.html
@@ -24,7 +24,7 @@ ippevepcl/ps - pcl and postscript print commands for ippeveprinter
 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.
 Status and progress messages are sent to the standard error.
diff --git a/doc/help/man-ippeveprinter.html b/doc/help/man-ippeveprinter.html
index 6f9ddcf8ab..154202e15c 100644
--- a/doc/help/man-ippeveprinter.html
+++ b/doc/help/man-ippeveprinter.html
@@ -130,10 +130,10 @@ If "command" is not an absolute path ("/path/to/command"),
 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.
 
-d spool-directory
 
Specifies the directory that will hold the print files.
@@ -222,18 +222,16 @@ Run
 ippeveprinter
 with a service name of My Cool Printer:
 
-
     ippeveprinter "My Cool Printer"
 

 
Run the
 file(1)
 command whenever a job is sent to the server:
 
-
     ippeveprinter -c /usr/bin/file "My Cool Printer"
 

 
See Also

-ippevepcl(7),
+ippevepcl(7),
 ippeveps(7),
 PWG Internet Printing Protocol Workgroup (http://www.pwg.org/ipp)
 
Copyright

diff --git a/doc/help/man-ippfind.html b/doc/help/man-ippfind.html
index 230cb9ce17..f70bfb06ae 100644
--- a/doc/help/man-ippfind.html
+++ b/doc/help/man-ippfind.html
@@ -188,18 +188,16 @@ When executing a program, ippfind sets the following environment variable
 
Examples

 To show the status of all registered IPP printers on your network, run:
 
-
     ippfind --ls
 
 

 Similarly, to send a PostScript test page to every PostScript printer, run:
 
-
     ippfind --txt-pdl application/postscript --exec ipptool
       -f onepage-letter.ps '{}' print-job.test \;
 

 
See Also

-ipptool(1)
+ipptool(1)
 
Copyright

 Copyright © 2021 by OpenPrinting.
 
diff --git a/doc/help/man-ipptool.html b/doc/help/man-ipptool.html
index 5ada9ceb2d..e75f0b6769 100644
--- a/doc/help/man-ipptool.html
+++ b/doc/help/man-ipptool.html
@@ -84,7 +84,7 @@ Output is either a plain text, formatted text, CSV, or XML report on the standar
 The
 testfile
 format is described in
-ipptoolfile(5).
+ipptoolfile(5).
 
Options

 The following options are recognized by
 ipptool:
@@ -172,36 +172,36 @@ program returns 0 if all tests were successful and 1 otherwise.
 
Files

 The following standard files are available:
 
-color.jpg
-create-printer-subscription.test
-document-a4.pdf
-document-a4.ps
-document-letter.pdf
-document-letter.ps
-get-completed-jobs.test
-get-jobs.test
-get-notifications.test
-get-printer-attributes.test
-get-subscriptions.test
-gray.jpg
-ipp-1.1.test
-ipp-2.0.test
-ipp-2.1.test
-ipp-2.2.test
-ipp-everywhere.test
-onepage-a4.pdf
-onepage-a4.ps
-onepage-letter.pdf
-onepage-letter.ps
-print-job.test
-print-job-deflate.test
-print-job-gzip.test
-testfile.jpg
-testfile.pcl
-testfile.pdf
-testfile.ps
-testfile.txt
-validate-job.test
+    color.jpg
+    create-printer-subscription.test
+    document-a4.pdf
+    document-a4.ps
+    document-letter.pdf
+    document-letter.ps
+    get-completed-jobs.test
+    get-jobs.test
+    get-notifications.test
+    get-printer-attributes.test
+    get-subscriptions.test
+    gray.jpg
+    ipp-1.1.test
+    ipp-2.0.test
+    ipp-2.1.test
+    ipp-2.2.test
+    ipp-everywhere.test
+    onepage-a4.pdf
+    onepage-a4.ps
+    onepage-letter.pdf
+    onepage-letter.ps
+    print-job.test
+    print-job-deflate.test
+    print-job-gzip.test
+    testfile.jpg
+    testfile.pcl
+    testfile.pdf
+    testfile.ps
+    testfile.txt
+    validate-job.test
 

 
Conforming To

 The
@@ -210,20 +210,18 @@ program is unique to CUPS and conforms to the Internet Printing Protocol up to v
 
Examples

 Get a list of completed jobs for "myprinter":
 
-
     ipptool ipp://localhost/printers/myprinter get-completed-jobs.test
 

 
Send email notifications to "user@example.com" when "myprinter" changes:
 
-
     ipptool -d recipient=mailto:user@example.com \
         ipp://localhost/printers/myprinter create-printer-subscription.test
 

 
See Also

-ipptoolfile(5),
-IANA IPP Registry (https://www.iana.org/assignments/ipp\-registrations),
+ipptoolfile(5),
+IANA IPP Registry (https://www.iana.org/assignments/ipp-registrations),
 PWG Internet Printing Protocol Workgroup (https://www.pwg.org/ipp)
-RFC 8011 (https://datatracker.ietf.org/doc/html/rfc8011),
+RFC 8011 (https://datatracker.ietf.org/doc/html/rfc8011),
 
Copyright

 Copyright © 2021 by OpenPrinting.
 
diff --git a/doc/help/man-ipptoolfile.html b/doc/help/man-ipptoolfile.html
index 412429fc71..c37bd539a6 100644
--- a/doc/help/man-ipptoolfile.html
+++ b/doc/help/man-ipptoolfile.html
@@ -11,12 +11,11 @@
 ipptoolfile - ipptool file format
 
Description

 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.
 Each request is enclosed by curly braces, for example:
 
-
     # This is a comment
     {
       # The name of the test
@@ -325,12 +324,32 @@ Specifies the maximum number of times to repeat. The default value is 1000.
 Operation codes correspond to the hexadecimal numbers (0xHHHH) and names from RFC 8011 and other IPP extension specifications. Here is a complete list of names supported by
 ipptool(8):
 
-
+    Acknowledge-Document
+    Acknowledge-Identify-Printer
+    Acknowledge-Job
     Activate-Printer
+    Add-Document-Images
+    Allocate-Printer-Resources
+    Cancel-Current-Job
+    Cancel-Job
+    Cancel-Jobs
+    Cancel-My-Jobs
+    Cancel-Resource
+    Cancel-Subscription
+    Close-Job
+    Create-Job
+    Create-Job-Subscriptions
+    Create-Printer
+    Create-Printer-Subscriptions
+    Create-Resource
+    Create-Resource-Subscriptions
+    Create-System-Subscriptions
+    CUPS-Accept-Jobs
     CUPS-Accept-Jobs
     CUPS-Add-Modify-Class
     CUPS-Add-Modify-Printer
     CUPS-Authenticate-Job
+    CUPS-Create-Local-Printer
     CUPS-Delete-Class
     CUPS-Delete-Printer
     CUPS-Get-Classes
@@ -343,54 +362,74 @@ Operation codes correspond to the hexadecimal numbers (0xHHHH) and names from RF
     CUPS-Move-Job
     CUPS-Reject-Jobs
     CUPS-Set-Default
-    Cancel-Current-Job
-    Cancel-Job
-    Cancel-Jobs
-    Cancel-My-Jobs
-    Cancel-Subscription
-    Close-Job
-    Create-Job
-    Create-Job-Subscriptions
-    Create-Printer-Subscriptions
     Deactivate-Printer
+    Deallocate-Printer-Resources
+    Delete-Printer
+    Deregister-Output-Device
+    Disable-All-Printers
     Disable-Printer
+    Enable-All-Printers
     Enable-Printer
+    Fetch-Document
+    Fetch-Job
     Get-Job-Attributes
     Get-Jobs
+    Get-Next-Document-Data
     Get-Notifications
+    Get-Output-Device-Attributes
     Get-Printer-Attributes
     Get-Printer-Support-Files
     Get-Printer-Supported-Values
+    Get-Printers
     Get-Subscription-Attributes
     Get-Subscriptions
+    Get-System-Attributes
+    Get-System-Supported-Values
     Hold-Job
     Hold-New-Jobs
     Identify-Printer
+    Install-Resource
+    Pause-All-Printers
+    Pause-All-Printers-After-Current-Job
     Pause-Printer
     Pause-Printer-After-Current-Job
     Print-Job
     Print-URI
     Promote-Job
     Purge-Jobs
+    Register-Output-Device
     Release-Held-New-Jobs
     Release-Job
     Renew-Subscription
     Reprocess-Job
     Restart-Job
     Restart-Printer
+    Restart-System
     Resubmit-Job
+    Resume-All-Printers
     Resume-Job
     Resume-Printer
     Schedule-Job-After
     Send-Document
     Send-Hardcopy-Document
     Send-Notifications
+    Send-Resource-Data
     Send-URI
     Set-Job-Attributes
     Set-Printer-Attributes
+    Set-Resource-Attributes
+    Set-System-Attributes
+    Shutdown-All-Printers
+    Shutdown-One-Printer
     Shutdown-Printer
+    Startup-All-Printers
+    Startup-One-Printer
     Startup-Printer
     Suspend-Current-Job
+    Update-Active-Jobs
+    Update-Document-Status
+    Update-Job-Status
+    Update-Output-Device-Attributes
     Validate-Document
     Validate-Job
 

@@ -398,7 +437,6 @@ Operation codes correspond to the hexadecimal numbers (0xHHHH) and names from RF
 Status codes correspond to the hexadecimal numbers (0xHHHH) and names from RFC 8011 and other IPP extension specifications. Here is a complete list of the names supported by
 ipptool(8):
 
-
     client-error-account-authorization-failed
     client-error-account-closed
     client-error-account-info-needed
@@ -423,6 +461,7 @@ Status codes correspond to the hexadecimal numbers (0xHHHH) and names from RFC 8
     client-error-ignored-all-subscriptions
     client-error-not-authenticated
     client-error-not-authorized
+    client-error-not-fetchable
     client-error-not-found
     client-error-not-possible
     client-error-print-support-file-not-found
@@ -460,39 +499,37 @@ Status codes correspond to the hexadecimal numbers (0xHHHH) and names from RFC 8
 
Tags

 Value and group tags correspond to the names from RFC 8011 and other IPP extension specifications. Here are the group tags:
 
-
     document-attributes-tag
     event-notification-attributes-tag
-    job-attributes-tag
-    operation-attributes-tag
-    printer-attributes-tag
+    job | job-attributes-tag
+    operation | operation-attributes-tag
+    printer | printer-attributes-tag
+    resource-attributes-tag
     subscription-attributes-tag
+    system-attributes-tag
     unsupported-attributes-tag
 

 
Here are the value tags:
 
-
     admin-define
     boolean
     charset
-    collection
+    collection | begCollection
     dateTime
     default
     delete-attribute
     enum
     integer
     keyword
-    mimeMediaType
-    nameWithLanguage
-    nameWithoutLanguage
-    naturalLanguage
+    language | naturalLanguage
+    mimetype | mimeMediaType
+    name | nameWithLanguage | nameWithoutLanguage
     no-value
     not-settable
     octetString
     rangeOfInteger
     resolution
-    textWithLanguage
-    textWithoutLanguage
+    text | textWithLanguage | textWithoutLanguage
     unknown
     unsupported
     uri
@@ -548,9 +585,9 @@ if any.
 
Inserts the current user's login name.
 

 
See Also

-ipptool(1),
-IANA IPP Registry (https://www.iana.org/assignments/ipp-registrations),
-PWG Internet Printing Protocol Workgroup (https://www.pwg.org/ipp),
+ipptool(1),
+IANA IPP Registry (https://www.iana.org/assignments/ipp-registrations),
+PWG Internet Printing Protocol Workgroup (https://www.pwg.org/ipp),
 RFC 8011 (https://datatracker.ietf.org/doc/html/rfc8011)
 
Copyright

 Copyright © 2021 by OpenPrinting.
diff --git a/doc/help/man-lp.html b/doc/help/man-lp.html
index 6165a63d07..d20b8e8ee4 100644
--- a/doc/help/man-lp.html
+++ b/doc/help/man-lp.html
@@ -86,9 +86,9 @@ Use a filename of "-" to force printing from the standard input.
 
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.
 
Options

 The following options are recognized by lp:
@@ -138,7 +138,7 @@ The page numbers refer to the output pages and not the document's original pages

Common Job Options

Aside from the printer-specific options reported by the -lpoptions(1) +lpoptions(1) command, the following generic options are available:
-o job-sheets=name @@ -172,29 +172,26 @@ Also, printer and class names are not case-sensitive.

Examples

Print two copies of a document to the default printer: 
-
     lp -n 2 filename
Print a double-sided legal document to a printer called "foo": 
-
     lp -d foo -o media=legal -o sides=two-sided-long-edge filename
Print a presentation document 2-up to a printer called "bar": 
-
     lp -d bar -o number-up=2 filename

See Also

-cancel(1), -lpadmin(8), -lpoptions(1), -lpq(1), -lpr(1), -lprm(1), -lpstat(1), +cancel(1), +lpadmin(8), +lpoptions(1), +lpq(1), +lpr(1), +lprm(1), +lpstat(1), CUPS Online Help (http://localhost:631/help)

Copyright

Copyright © 2021 by OpenPrinting. diff --git a/doc/help/man-lpadmin.html b/doc/help/man-lpadmin.html index 1ad3b60cbd..816081daf4 100644 --- a/doc/help/man-lpadmin.html +++ b/doc/help/man-lpadmin.html @@ -56,11 +56,11 @@ It can also be used to set the server default printer or class.

When specified before the -d, -p, or -x options, the -E option forces encryption when connecting to the server.

The first form of the command (-d) sets the 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.

The second form of the command (-p) configures the named printer or class. The additional options are described below.

The third form of the command (-x) deletes the printer or class destination. @@ -74,7 +74,7 @@ If class does not exist it is created automatically.

-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. Note: Models other than "everywhere" are deprecated and will not be supported in a future version of CUPS. @@ -99,7 +99,7 @@ The value is an integer number of seconds; 86,400 seconds are in one day.
-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.
-o name-default=value
Sets a default server-side option for the destination. @@ -138,16 +138,16 @@ Note: The user 'root' is not granted special access - using "-u allow:foo,bar" w
-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.
-D "info"
Provides a textual description of the destination.
-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.
-L "location"
Provides a textual location of the destination. @@ -171,7 +171,7 @@ This differs from the System V version which requires the root user to execute t

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.

Interface scripts are not supported for security reasons.

The double meaning of the -E option is an unfortunate historical oddity. @@ -181,15 +181,14 @@ These files should not be edited directly and are an implementation detail of CU

Example

Create an IPP Everywhere print queue: 
-
     lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m everywhere

See Also

-cupsaccept(8), -cupsenable(8), -lpinfo(8), -lpoptions(1), +cupsaccept(8), +cupsenable(8), +lpinfo(8), +lpoptions(1), CUPS Online Help (http://localhost:631/help)

Copyright

Copyright © 2021 by OpenPrinting. diff --git a/doc/help/man-lpc.html b/doc/help/man-lpc.html index e2aef0c3a9..a12f239e7e 100644 --- a/doc/help/man-lpc.html +++ b/doc/help/man-lpc.html @@ -36,17 +36,17 @@ The lpc program accepts a subset of commands accepted by the Berkeley This program is deprecated and will be removed in a future feature release of CUPS.

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), -cupsaccept(8), -cupsenable(8), -lp(1), -lpadmin(8), -lpr(1), -lprm(1), -lpstat(1), +cancel(1), +cupsaccept(8), +cupsenable(8), +lp(1), +lpadmin(8), +lpr(1), +lprm(1), +lpstat(1), CUPS Online Help (http://localhost:631/help)

Copyright

Copyright © 2021 by OpenPrinting. diff --git a/doc/help/man-lpinfo.html b/doc/help/man-lpinfo.html index ca32670577..f17c4adb7c 100644 --- a/doc/help/man-lpinfo.html +++ b/doc/help/man-lpinfo.html @@ -90,27 +90,24 @@ The lpinfo command is unique to CUPS.

Examples

List all devices: 
-
     lpinfo -v
List all drivers: 
-
     lpinfo -m
List drivers matching "HP LaserJet": 
-
     lpinfo --make-and-model "HP LaserJet" -m

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)

Copyright

Copyright © 2021 by OpenPrinting. diff --git a/doc/help/man-lpmove.html b/doc/help/man-lpmove.html index cb50dc1dc6..25064a6bcc 100644 --- a/doc/help/man-lpmove.html +++ b/doc/help/man-lpmove.html @@ -48,7 +48,6 @@ The lpmove command supports the following options:

Examples

Move job 123 from "oldprinter" to "newprinter": 
-
     lpmove 123 newprinter
 
             or
@@ -58,14 +57,13 @@ Move job 123 from "oldprinter" to "newprinter":
Move all jobs from "oldprinter" to "newprinter": 
-
     lpmove oldprinter newprinter

See Also

-cancel(1), -lp(1), -lpr(1), -lprm(1), +cancel(1), +lp(1), +lpr(1), +lprm(1),
CUPS Online Help (http://localhost:631/help)

Copyright

diff --git a/doc/help/man-lpoptions.html b/doc/help/man-lpoptions.html index 21211f4b26..ada6bdac8d 100644 --- a/doc/help/man-lpoptions.html +++ b/doc/help/man-lpoptions.html @@ -52,12 +52,12 @@ lpoptions - display or set printer options and defaults

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.

When run by the root user, lpoptions gets and sets default options and instances for all users in the /etc/cups/lpoptions file. Otherwise, the per-user defaults are managed in the ~/.cups/lpoptions file. @@ -80,7 +80,7 @@ This option overrides the system default printer for the current user.

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.
-r option
Removes the specified option from the named destination. @@ -88,7 +88,7 @@ program.
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.

Files

@@ -98,11 +98,11 @@ command.

Conforming To

The lpoptions command is unique to CUPS.

See Also

-cancel(1), -lp(1), -lpadmin(8), -lpr(1), -lprm(1), +cancel(1), +lp(1), +lpadmin(8), +lpr(1), +lprm(1), CUPS Online Help (http://localhost:631/help)

Copyright

Copyright © 2021 by OpenPrinting. diff --git a/doc/help/man-lpq.html b/doc/help/man-lpq.html index c6bc8d6a58..a11a22d0ff 100644 --- a/doc/help/man-lpq.html +++ b/doc/help/man-lpq.html @@ -48,11 +48,11 @@ Jobs queued on the default destination will be shown if no printer or class is s
Requests a more verbose (long) reporting format.

See Also

-cancel(1), -lp(1), -lpr(1), -lprm(1), -lpstat(1), +cancel(1), +lp(1), +lpr(1), +lprm(1), +lpstat(1), CUPS Online Help (http://localhost:631/help)

Copyright

Copyright © 2021 by OpenPrinting. diff --git a/doc/help/man-lpr.html b/doc/help/man-lpr.html index d2e4251f1b..6629cc4f58 100644 --- a/doc/help/man-lpr.html +++ b/doc/help/man-lpr.html @@ -56,9 +56,9 @@ If no files are listed on the command-line, lpr reads the print file from

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.

Options

The following options are recognized by lpr: @@ -97,7 +97,7 @@ This option is equivalent to -o prettyprint and is only useful when print

Common Job Options

Aside from the printer-specific options reported by the -lpoptions(1) +lpoptions(1) command, the following generic options are available:
-o job-sheets=name @@ -129,29 +129,26 @@ The -c, -d, -f, -g, -i, -n, -t,

Examples

Print two copies of a document to the default printer: 
-
     lpr -# 2 filename
Print a double-sided legal document to a printer called "foo": 
-
     lpr -P foo -o media=legal -o sides=two-sided-long-edge filename
Print a presentation document 2-up to a printer called "foo": 
-
     lpr -P foo -o number-up=2 filename

See Also

-cancel(1), -lp(1), -lpadmin(8), -lpoptions(1), -lpq(1), -lprm(1), -lpstat(1), +cancel(1), +lp(1), +lpadmin(8), +lpoptions(1), +lpq(1), +lprm(1), +lpstat(1), CUPS Online Help (http://localhost:631/help)

Copyright

Copyright © 2021 by OpenPrinting. diff --git a/doc/help/man-lprm.html b/doc/help/man-lprm.html index a05617bc47..fc78eda626 100644 --- a/doc/help/man-lprm.html +++ b/doc/help/man-lprm.html @@ -53,27 +53,24 @@ is compatible with the standard Berkeley command of the same name.

Examples

Cancel the current job on the default printer: 
-
     lprm
Cancel job 1234: 
-
     lprm 1234
Cancel all jobs: 
-
     lprm -

See Also

-cancel(1), -lp(1), -lpq(1), -lpr(1), -lpstat(1), +cancel(1), +lp(1), +lpq(1), +lpr(1), +lpstat(1), CUPS Online Help (http://localhost:631/help)

Copyright

Copyright © 2021 by OpenPrinting. diff --git a/doc/help/man-lpstat.html b/doc/help/man-lpstat.html index 1f4e563309..b83deba09e 100644 --- a/doc/help/man-lpstat.html +++ b/doc/help/man-lpstat.html @@ -120,11 +120,11 @@ Also, printer and class names are not case-sensitive.

The -h, -e, -E, -U, and -W options are unique to CUPS.

The Solaris -f, -P, and -S options are silently ignored.

See Also

-cancel(1), -lp(1), -lpq(1), -lpr(1), -lprm(1), +cancel(1), +lp(1), +lpq(1), +lpr(1), +lprm(1), CUPS Online Help (http://localhost:631/help)

Copyright

Copyright © 2021 by OpenPrinting. diff --git a/doc/help/man-mailto.conf.html b/doc/help/man-mailto.conf.html index 5bde313ced..308452581d 100644 --- a/doc/help/man-mailto.conf.html +++ b/doc/help/man-mailto.conf.html @@ -33,7 +33,7 @@ If multiple lines are present, only the last one is used.
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)

Copyright

Copyright © 2021 by OpenPrinting. diff --git a/doc/help/man-mime.convs.html b/doc/help/man-mime.convs.html index 614eb71ad2..0b199d9bb9 100644 --- a/doc/help/man-mime.convs.html +++ b/doc/help/man-mime.convs.html @@ -18,7 +18,6 @@ line. Comment lines start with the # character. Filter lines specify the source and destination MIME types along with a relative cost associated with the filter and the filter to run: 
-
     source/type destination/type cost filter
@@ -37,20 +36,19 @@ Filenames are relative to the CUPS filter directory.

Examples

Define a filter that converts PostScript documents to CUPS Raster format: 
-
     application/vnd.cups-postscript application/vnd.cups-raster 50 pstoraster

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), -cupsd.conf(5), -cupsd(8), -cupsfilter(8), -mime.types(5), +cups-files.conf(5), +cupsd.conf(5), +cupsd(8), +cupsfilter(8), +mime.types(5), CUPS Online Help (http://localhost:631/help)

Copyright

Copyright © 2021 by OpenPrinting. diff --git a/doc/help/man-mime.types.html b/doc/help/man-mime.types.html index f9c7eb1321..40cd4e6a8a 100644 --- a/doc/help/man-mime.types.html +++ b/doc/help/man-mime.types.html @@ -16,13 +16,11 @@ The mime.types file defines the recognized file types. Comment lines start with the # character. Rule lines start with the MIME media type and are optionally followed by a series of file recognition rules: 
-
     mime/type [ rule ... rule ]
Rules can be extended over multiple lines using the backslash character (\): 
-
     mime/type [ really-really-really-long-rule ... \
       rule ]
 
@@ -75,7 +73,6 @@ However, if "text/foo" also defines a higher priority than "text/bar", "text/foo
 
Examples

 Define two MIME media types for raster data, with one being a subset with higher priority:
 
-
     application/vnd.cups-raster  string(0,"RaSt") string(0,"tSaR") \
                                   string(0,"RaS2") string(0,"2SaR") \
                                   string(0,"RaS3") string(0,"3SaR")
@@ -84,11 +81,11 @@ Define two MIME media types for raster data, with one being a subset with higher
                                   string(4,PwgRaster<00>) priority(150)
 

 
See Also

-cups-files.conf(5),
-cupsd.conf(5),
-cupsd(8),
-cupsfilter(8),
-mime.convs(5),
+cups-files.conf(5),
+cupsd.conf(5),
+cupsd(8),
+cupsfilter(8),
+mime.convs(5),
 CUPS Online Help (http://localhost:631/help)
 
Copyright

 Copyright © 2021 by OpenPrinting.
diff --git a/doc/help/man-notifier.html b/doc/help/man-notifier.html
index 5a1a3641e7..a522fffbe5 100644
--- a/doc/help/man-notifier.html
+++ b/doc/help/man-notifier.html
@@ -25,10 +25,10 @@ and
 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),
-filter(7),
+cupsd(8),
+filter(7),
 CUPS Online Help (http://localhost:631/help)
 
Copyright

 Copyright © 2021 by OpenPrinting.
diff --git a/doc/help/man-ppdc.html b/doc/help/man-ppdc.html
index 715a55876a..a1155782fc 100644
--- a/doc/help/man-ppdc.html
+++ b/doc/help/man-ppdc.html
@@ -80,13 +80,13 @@ The default is to use the line feed character alone.
 
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),
-ppdi(1),
-ppdmerge(1),
-ppdpo(1),
-ppdcfile(5),
+ppdhtml(1),
+ppdi(1),
+ppdmerge(1),
+ppdpo(1),
+ppdcfile(5),
 CUPS Online Help (http://localhost:631/help)
 
Copyright

 Copyright © 2021 by OpenPrinting.
diff --git a/doc/help/man-ppdcfile.html b/doc/help/man-ppdcfile.html
index 8f92c0a6d8..044641ac76 100644
--- a/doc/help/man-ppdcfile.html
+++ b/doc/help/man-ppdcfile.html
@@ -11,7 +11,7 @@
 ppdcfile - cups ppd compiler source file format (deprecated)
 
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.
 
The source file format is plain ASCII text that can be edited using your favorite text editor. Comments are supported using the C (/* ... */) and C++ (// ...) comment mechanisms.
 
Printer driver information can be grouped and shared using curly braces ({ ... }); PPD files are written when a close brace or end-of-file is seen and a PCFileName directive has been defined.
@@ -84,13 +84,13 @@ This man page provides a quick reference to the supported keywords and should be
 
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),
-ppdhtml(1),
-ppdi(1),
-ppdmerge(1),
-ppdpo(1),
+ppdc(1),
+ppdhtml(1),
+ppdi(1),
+ppdmerge(1),
+ppdpo(1),
 CUPS Online Help (http://localhost:631/help)
 
Copyright

 Copyright © 2021 by OpenPrinting.
diff --git a/doc/help/man-ppdhtml.html b/doc/help/man-ppdhtml.html
index 499ddb31e6..020bc8a560 100644
--- a/doc/help/man-ppdhtml.html
+++ b/doc/help/man-ppdhtml.html
@@ -34,13 +34,13 @@ Multiple -I options can be supplied to add additional directories.
 
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),
-ppdcfile(5),
-ppdi(1),
-ppdmerge(1),
-ppdpo(1),
+ppdc(1),
+ppdcfile(5),
+ppdi(1),
+ppdmerge(1),
+ppdpo(1),
 CUPS Online Help (http://localhost:631/help)
 
Copyright

 Copyright © 2021 by OpenPrinting.
diff --git a/doc/help/man-ppdi.html b/doc/help/man-ppdi.html
index 46033506f3..64294408fe 100644
--- a/doc/help/man-ppdi.html
+++ b/doc/help/man-ppdi.html
@@ -41,13 +41,13 @@ If no source file is specified, the filename ppdi.drv is used.
 
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),
-ppdhtml(1),
-ppdmerge(1),
-ppdpo(1),
-ppdcfile(5),
+ppdc(1),
+ppdhtml(1),
+ppdmerge(1),
+ppdpo(1),
+ppdcfile(5),
 CUPS Online Help (http://localhost:631/help)
 
Copyright

 Copyright © 2021 by OpenPrinting.
diff --git a/doc/help/man-ppdmerge.html b/doc/help/man-ppdmerge.html
index 2b39cb88b2..d567de873b 100644
--- a/doc/help/man-ppdmerge.html
+++ b/doc/help/man-ppdmerge.html
@@ -35,15 +35,15 @@ If the output file already exists, it is silently overwritten.
 
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),
-ppdhtml(1),
-ppdi(1),
-ppdpo(1),
-ppdcfile(5),
+ppdc(1),
+ppdhtml(1),
+ppdi(1),
+ppdpo(1),
+ppdcfile(5),
 CUPS Online Help (http://localhost:631/help)
 
Copyright

 Copyright © 2021 by OpenPrinting.
diff --git a/doc/help/man-ppdpo.html b/doc/help/man-ppdpo.html
index 92602a9364..240f93c0b0 100644
--- a/doc/help/man-ppdpo.html
+++ b/doc/help/man-ppdpo.html
@@ -40,12 +40,12 @@ The supported extensions are .po or .po.gz for GNU gettext format
 
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),
-ppdhtml(1),
-ppdi(1),
-ppdmerge(1),
+ppdc(1),
+ppdhtml(1),
+ppdi(1),
+ppdmerge(1),
 ppdcfile(5),
 CUPS Online Help (http://localhost:631/help)
 
Copyright

diff --git a/doc/help/man-printers.conf.html b/doc/help/man-printers.conf.html
index f2b96d7102..f96cb1ba53 100644
--- a/doc/help/man-printers.conf.html
+++ b/doc/help/man-printers.conf.html
@@ -11,18 +11,18 @@
 printers.conf - printer configuration file for cups
 
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.
 
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),
-cups-files.conf(5),
-cupsd(8),
-cupsd.conf(5),
-mime.convs(5),
-mime.types(5),
-subscriptions.conf(5),
+classes.conf(5),
+cups-files.conf(5),
+cupsd(8),
+cupsd.conf(5),
+mime.convs(5),
+mime.types(5),
+subscriptions.conf(5),
 CUPS Online Help (http://localhost:631/help)
 
Copyright

 Copyright © 2021 by OpenPrinting.
diff --git a/doc/help/man-subscriptions.conf.html b/doc/help/man-subscriptions.conf.html
index 2caeab1200..763762d508 100644
--- a/doc/help/man-subscriptions.conf.html
+++ b/doc/help/man-subscriptions.conf.html
@@ -12,19 +12,19 @@ subscriptions.conf - subscription configuration file for cups
 
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.
 
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),
-cups-files.conf(5),
-cupsd(8),
-cupsd.conf(5),
-mime.convs(5),
-mime.types(5),
-printers.conf(5),
+classes.conf(5),
+cups-files.conf(5),
+cupsd(8),
+cupsd.conf(5),
+mime.convs(5),
+mime.types(5),
+printers.conf(5),
 CUPS Online Help (http://localhost:631/help)
 
Copyright

 Copyright © 2021 by OpenPrinting.
diff --git a/man/ipptool.1 b/man/ipptool.1
index aefd070b1d..2d178b6b2b 100644
--- a/man/ipptool.1
+++ b/man/ipptool.1
@@ -7,7 +7,7 @@
 .\" Licensed under Apache License v2.0.  See the file "LICENSE" for more
 .\" information.
 .\"
-.TH ipptool 1 "CUPS" "2021-09-17" "OpenPrinting"
+.TH ipptool 1 "CUPS" "2021-09-20" "OpenPrinting"
 .SH NAME
 ipptool \- perform internet printing protocol requests
 .SH SYNOPSIS
@@ -196,36 +196,37 @@ program returns 0 if all tests were successful and 1 otherwise.
 .SH FILES
 The following standard files are available:
 .nf
-.I color.jpg
-.I create\-printer\-subscription.test
-.I document\-a4.pdf
-.I document\-a4.ps
-.I document\-letter.pdf
-.I document\-letter.ps
-.I get\-completed\-jobs.test
-.I get\-jobs.test
-.I get\-notifications.test
-.I get\-printer\-attributes.test
-.I get\-subscriptions.test
-.I gray.jpg
-.I ipp\-1.1.test
-.I ipp\-2.0.test
-.I ipp\-2.1.test
-.I ipp\-2.2.test
-.I ipp\-everywhere.test
-.I onepage\-a4.pdf
-.I onepage\-a4.ps
-.I onepage\-letter.pdf
-.I onepage\-letter.ps
-.I print\-job.test
-.I print\-job\-deflate.test
-.I print\-job\-gzip.test
-.I testfile.jpg
-.I testfile.pcl
-.I testfile.pdf
-.I testfile.ps
-.I testfile.txt
-.I validate\-job.test
+
+    color.jpg
+    create\-printer\-subscription.test
+    document\-a4.pdf
+    document\-a4.ps
+    document\-letter.pdf
+    document\-letter.ps
+    get\-completed\-jobs.test
+    get\-jobs.test
+    get\-notifications.test
+    get\-printer\-attributes.test
+    get\-subscriptions.test
+    gray.jpg
+    ipp\-1.1.test
+    ipp\-2.0.test
+    ipp\-2.1.test
+    ipp\-2.2.test
+    ipp\-everywhere.test
+    onepage\-a4.pdf
+    onepage\-a4.ps
+    onepage\-letter.pdf
+    onepage\-letter.ps
+    print\-job.test
+    print\-job\-deflate.test
+    print\-job\-gzip.test
+    testfile.jpg
+    testfile.pcl
+    testfile.pdf
+    testfile.ps
+    testfile.txt
+    validate\-job.test
 .fi
 .SH CONFORMING TO
 The
diff --git a/man/ipptoolfile.5 b/man/ipptoolfile.5
index dbbe418c6b..d0f1f2df61 100644
--- a/man/ipptoolfile.5
+++ b/man/ipptoolfile.5
@@ -7,7 +7,7 @@
 .\" Licensed under Apache License v2.0.  See the file "LICENSE" for more
 .\" information.
 .\"
-.TH ipptoolfile 5 "CUPS" "2021-09-17" "OpenPrinting"
+.TH ipptoolfile 5 "CUPS" "2021-09-20" "OpenPrinting"
 .SH NAME
 ipptoolfile \- ipptool file format
 .SH DESCRIPTION
@@ -433,11 +433,32 @@ Operation codes correspond to the hexadecimal numbers (0xHHHH) and names from RF
 .BR ipptool (8):
 .nf
 
+    Acknowledge\-Document
+    Acknowledge\-Identify\-Printer
+    Acknowledge\-Job
     Activate\-Printer
+    Add\-Document\-Images
+    Allocate\-Printer\-Resources
+    Cancel\-Current\-Job
+    Cancel\-Job
+    Cancel\-Jobs
+    Cancel\-My\-Jobs
+    Cancel\-Resource
+    Cancel\-Subscription
+    Close\-Job
+    Create\-Job
+    Create\-Job\-Subscriptions
+    Create\-Printer
+    Create\-Printer\-Subscriptions
+    Create\-Resource
+    Create\-Resource\-Subscriptions
+    Create\-System\-Subscriptions
+    CUPS\-Accept\-Jobs
     CUPS\-Accept\-Jobs
     CUPS\-Add\-Modify\-Class
     CUPS\-Add\-Modify\-Printer
     CUPS\-Authenticate\-Job
+    CUPS\-Create\-Local\-Printer
     CUPS\-Delete\-Class
     CUPS\-Delete\-Printer
     CUPS\-Get\-Classes
@@ -450,54 +471,74 @@ Operation codes correspond to the hexadecimal numbers (0xHHHH) and names from RF
     CUPS\-Move\-Job
     CUPS\-Reject\-Jobs
     CUPS\-Set\-Default
-    Cancel\-Current\-Job
-    Cancel\-Job
-    Cancel\-Jobs
-    Cancel\-My\-Jobs
-    Cancel\-Subscription
-    Close\-Job
-    Create\-Job
-    Create\-Job\-Subscriptions
-    Create\-Printer\-Subscriptions
     Deactivate\-Printer
+    Deallocate\-Printer\-Resources
+    Delete\-Printer
+    Deregister\-Output\-Device
+    Disable\-All\-Printers
     Disable\-Printer
+    Enable\-All\-Printers
     Enable\-Printer
+    Fetch\-Document
+    Fetch\-Job
     Get\-Job\-Attributes
     Get\-Jobs
+    Get\-Next\-Document\-Data
     Get\-Notifications
+    Get\-Output\-Device\-Attributes
     Get\-Printer\-Attributes
     Get\-Printer\-Support\-Files
     Get\-Printer\-Supported\-Values
+    Get\-Printers
     Get\-Subscription\-Attributes
     Get\-Subscriptions
+    Get\-System\-Attributes
+    Get\-System\-Supported\-Values
     Hold\-Job
     Hold\-New\-Jobs
     Identify\-Printer
+    Install\-Resource
+    Pause\-All\-Printers
+    Pause\-All\-Printers\-After\-Current\-Job
     Pause\-Printer
     Pause\-Printer\-After\-Current\-Job
     Print\-Job
     Print\-URI
     Promote\-Job
     Purge\-Jobs
+    Register\-Output\-Device
     Release\-Held\-New\-Jobs
     Release\-Job
     Renew\-Subscription
     Reprocess\-Job
     Restart\-Job
     Restart\-Printer
+    Restart\-System
     Resubmit\-Job
+    Resume\-All\-Printers
     Resume\-Job
     Resume\-Printer
     Schedule\-Job\-After
     Send\-Document
     Send\-Hardcopy\-Document
     Send\-Notifications
+    Send\-Resource\-Data
     Send\-URI
     Set\-Job\-Attributes
     Set\-Printer\-Attributes
+    Set\-Resource\-Attributes
+    Set\-System\-Attributes
+    Shutdown\-All\-Printers
+    Shutdown\-One\-Printer
     Shutdown\-Printer
+    Startup\-All\-Printers
+    Startup\-One\-Printer
     Startup\-Printer
     Suspend\-Current\-Job
+    Update\-Active\-Jobs
+    Update\-Document\-Status
+    Update\-Job\-Status
+    Update\-Output\-Device\-Attributes
     Validate\-Document
     Validate\-Job
 .fi
@@ -530,6 +571,7 @@ Status codes correspond to the hexadecimal numbers (0xHHHH) and names from RFC 8
     client\-error\-ignored\-all\-subscriptions
     client\-error\-not\-authenticated
     client\-error\-not\-authorized
+    client\-error\-not\-fetchable
     client\-error\-not\-found
     client\-error\-not\-possible
     client\-error\-print\-support\-file\-not\-found
@@ -570,10 +612,12 @@ Value and group tags correspond to the names from RFC 8011 and other IPP extensi
 
     document\-attributes\-tag
     event\-notification\-attributes\-tag
-    job\-attributes\-tag
-    operation\-attributes\-tag
-    printer\-attributes\-tag
+    job | job\-attributes\-tag
+    operation | operation\-attributes\-tag
+    printer | printer\-attributes\-tag
+    resource\-attributes\-tag
     subscription\-attributes\-tag
+    system\-attributes\-tag
     unsupported\-attributes\-tag
 .fi
 .LP
@@ -583,24 +627,22 @@ Here are the value tags:
     admin\-define
     boolean
     charset
-    collection
+    collection | begCollection
     dateTime
     default
     delete\-attribute
     enum
     integer
     keyword
-    mimeMediaType
-    nameWithLanguage
-    nameWithoutLanguage
-    naturalLanguage
+    language | naturalLanguage
+    mimetype | mimeMediaType
+    name | nameWithLanguage | nameWithoutLanguage
     no\-value
     not\-settable
     octetString
     rangeOfInteger
     resolution
-    textWithLanguage
-    textWithoutLanguage
+    text | textWithLanguage | textWithoutLanguage
     unknown
     unsupported
     uri
diff --git a/man/mantohtml.c b/man/mantohtml.c
index 2a9353a9f7..0c9c8837c9 100644
--- a/man/mantohtml.c
+++ b/man/mantohtml.c
@@ -850,6 +850,13 @@ main(int  argc,				/* I - Number of command-line args */
       * Process man page text...
       */
 
+      if (pre == 1)
+      {
+        pre ++;
+        if (!line[0])
+          continue;			// Skip initial blank line
+      }
+      
       html_fputs(line, &font, outfile);
       putc('\n', outfile);
 
@@ -932,27 +939,20 @@ html_alternate(const char *s,		/* I - String */
 
       if (isalnum(*s & 255) && *next == '(')
       {
-       /*
-	* See if the man file is available locally...
-	*/
-
-	char	name[1024],		/* Name */
-		manfile[1024],		/* Man page filename */
-		manurl[1024];		/* Man page URL */
+        // "name (section)" - see if the man file is available locally...
+	char	name[1024],		// Name
+		manfile[1024],		// Man page filename
+		manurl[1024];		// Man page URL
 
         strlcpy(name, s, sizeof(name));
         if ((size_t)(end - s) < sizeof(name))
           name[end - s] = '\0';
 
-        snprintf(manfile, sizeof(manfile), "%s.man", name);
 	snprintf(manurl, sizeof(manurl), "man-%s.html?TOPIC=Man+Pages", name);
-
+	snprintf(manfile, sizeof(manfile), "%s.%d", name, atoi(next + 1));
 	if (!access(manfile, 0))
 	{
-	 /*
-	  * Local man page, do a link...
-	  */
-
+	  // Local man page, do a link...
 	  fprintf(fp, "", manurl);
 	  link = 1;
 	}
@@ -1164,21 +1164,31 @@ html_fputs(const char *s,		/* I  - String */
       * Embed URL...
       */
 
-      char temp[1024];			/* Temporary string */
-      const char *end = s + 6;		/* End of URL */
-
-      while (*end && !isspace(*end & 255))
-	end ++;
-
-      if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
-        end --;
+      char	temp[1024],		// Temporary string
+		*tempptr;		// Pointer into temporary string
 
-      strlcpy(temp, s, sizeof(temp));
-      if ((size_t)(end -s) < sizeof(temp))
-        temp[end - s] = '\0';
+      for (tempptr = temp; *s && !isspace(*s & 255) && tempptr < (temp + sizeof(temp) - 1); s ++)
+      {
+        if (strchr(",.)", *s) && strchr(",. \n\r\t", s[1]))
+        {
+          // End of URL
+          break;
+        }
+        else if (*s == '\\' && s[1])
+        {
+          // Escaped character
+          s ++;
+          *tempptr++ = *s;
+        }
+        else
+        {
+          // Regular character...
+          *tempptr++ = *s;
+        }
+      }
 
+      *tempptr = '\0';
       fprintf(fp, "%s", temp, temp);
-      s = end;
     }
     else
       html_putc(*s++ & 255, fp);