Add DISPLAY-MATCH to ipptool.

HTML man page updates.

27 files changed, 161 insertions, 123 deletions

diff --git a/doc/help/man-backend.html b/doc/help/man-backend.html
index 953a26789..b1a0385d5 100644
--- a/doc/help/man-backend.html
+++ b/doc/help/man-backend.html
@@ -178,7 +178,7 @@ programs to send print jobs or
 <b>lpinfo</b>(8)
 to query for available printers using the backend.
 The one exception is the SNMP backend - see
-<b>cups-snmp</b>(8)
+<a href="man-cups-snmp.html?TOPIC=Man+Pages"><b>cups-snmp</b>(8)</a>
 for more information.
 <h2 class="title"><a name="NOTES">Notes</a></h2>
 CUPS printer drivers and backends are deprecated and will no longer be supported in a future feature release of CUPS.
diff --git a/doc/help/man-cancel.html b/doc/help/man-cancel.html
index c02f6f1ef..ef6f3f45d 100644
--- a/doc/help/man-cancel.html
+++ b/doc/help/man-cancel.html
@@ -75,9 +75,9 @@ Cancel all jobs:
 </pre>
 <h2 class="title"><a name="NOTES">Notes</a></h2>
 Administrators wishing to prevent unauthorized cancellation of jobs via the <i>-u</i> option should require authentication for Cancel-Jobs operations in
-<b>cupsd.conf</b>(5).
+<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5).</a>
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
-<b>cupsd.conf</b>(5),
+<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5),</a>
 <b>lp</b>(1),
 <b>lpmove</b>(8),
 <b>lpstat</b>(1),
diff --git a/doc/help/man-classes.conf.html b/doc/help/man-classes.conf.html
index f30ec909e..da5126d60 100644
--- a/doc/help/man-classes.conf.html
+++ b/doc/help/man-classes.conf.html
@@ -12,14 +12,14 @@ classes.conf - class configuration file for cups
 <h2 class="title"><a name="DESCRIPTION">Description</a></h2>
 The <b>classes.conf</b> file defines the local printer classes that are available.
 It is normally located in the <i>/etc/cups</i> directory and is maintained by the
-<b>cupsd</b>(8)
+<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8)</a>
 program.
 This file is not intended to be edited or managed manually.
 <h2 class="title"><a name="NOTES">Notes</a></h2>
 The name, location, and format of this file are an implementation detail that will change in future releases of CUPS.
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
-<b>cupsd</b>(8),
-<b>cupsd.conf</b>(5),
+<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
+<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5),</a>
 <b>mime.convs</b>(5),
 <b>mime.types</b>(5),
 <b>printers.conf</b>(5),
diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
index c567cbba7..27a1b60da 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
 <h2 class="title"><a name="DESCRIPTION">Description</a></h2>
 The <b>cups-files.conf</b> file configures the files and directories used by the CUPS scheduler,
-<b>cupsd</b>(8).
+<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8).</a>
 It is normally located in the <i>/etc/cups</i> directory.
 <p>Each line in the file can be a configuration directive, a blank line, or a comment.
 Configuration directives typically consist of a name and zero or more values separated by whitespace.
@@ -19,7 +19,7 @@ The configuration directive name and values are case-insensitive.
 Comment lines start with the # character.
 <h3><a name="DIRECTIVES">Directives</a></h3>
 The following directives are understood by
-<b>cupsd</b>(8):
+<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8):</a>
 <dl class="man">
 <dt><a name="AccessLog"></a><b>AccessLog</b>
 <dd style="margin-left: 5.0em"><dt><b>AccessLog </b><i>filename</i>
@@ -201,8 +201,8 @@ command is used instead.
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
 <b>classes.conf</b>(5),
 <b>cups</b>(1),
-<b>cupsd</b>(8),
-<b>cupsd.conf</b>(5),
+<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
+<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5),</a>
 <b>mime.convs</b>(5),
 <b>mime.types</b>(5),
 <b>printers.conf</b>(5),
diff --git a/doc/help/man-cups-lpd.html b/doc/help/man-cups-lpd.html
index ad0e68ed0..7283d7563 100644
--- a/doc/help/man-cups-lpd.html
+++ b/doc/help/man-cups-lpd.html
@@ -103,7 +103,7 @@ Simply enable the
 service using the corresponding control program.
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
 <b>cups</b>(1),
-<b>cupsd</b>(8),
+<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
 <b>inetconv</b>(1m),
 <b>inetd</b>(8),
 <b>launchd</b>(8),
diff --git a/doc/help/man-cups-snmp.conf.html b/doc/help/man-cups-snmp.conf.html
index d61d8340f..fbd2dc4eb 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 <i>/etc/cups</i> directory.
 Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character.
 <p>The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend -
-<b>cups-snmp</b>(8).
+<a href="man-cups-snmp.html?TOPIC=Man+Pages"><b>cups-snmp</b>(8).</a>
 <h2 class="title"><a name="DIRECTIVES">Directives</a></h2>
 The following directives are understood by the CUPS network backends:
 <dl class="man">
@@ -51,7 +51,7 @@ CUPS backends are deprecated and will no longer be supported in a future feature
 Printers that do not support IPP can be supported using applications such as
 <b>ippeveprinter</b>(1).
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
-<b>cups-snmp</b>(8),
+<a href="man-cups-snmp.html?TOPIC=Man+Pages"><b>cups-snmp</b>(8),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2019 by Apple Inc.
diff --git a/doc/help/man-cups-snmp.html b/doc/help/man-cups-snmp.html
index c7c17f7f4..9ff2b9aef 100644
--- a/doc/help/man-cups-snmp.html
+++ b/doc/help/man-cups-snmp.html
@@ -47,7 +47,7 @@ The CUPS SNMP backend uses the information from the Host, Printer, and Port Moni
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
 <b>backend</b>(7),
 <b>cups-snmp.conf</b>(5),
-<b>cupsd</b>(8),
+<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
 <b>lpinfo</b>(8),
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
diff --git a/doc/help/man-cups.html b/doc/help/man-cups.html
index d75ddc5b0..769ffe64c 100644
--- a/doc/help/man-cups.html
+++ b/doc/help/man-cups.html
@@ -102,13 +102,13 @@ Printers that do not support IPP can be supported using applications such as
 <b>ippeveprinter</b>(1).
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
 <b>cancel</b>(1),
-<b>client.conf</b>(7),
+<a href="man-client.conf.html?TOPIC=Man+Pages"><b>client.conf</b>(7),</a>
 <b>cupsctl</b>(8),
-<b>cupsd</b>(8),
+<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
 <b>lp</b>(1),
 <b>lpadmin</b>(8),
 <b>lpinfo</b>(8),
-<b>lpoptions</b>(1),
+<a href="man-lpoptions.html?TOPIC=Man+Pages"><b>lpoptions</b>(1),</a>
 <b>lpr</b>(1),
 <b>lprm</b>(1),
 <b>lpq</b>(1),
diff --git a/doc/help/man-cupsctl.html b/doc/help/man-cupsctl.html
index c52125fc7..897b0541e 100644
--- a/doc/help/man-cupsctl.html
+++ b/doc/help/man-cupsctl.html
@@ -83,8 +83,8 @@ Disable printer sharing:
 <h2 class="title"><a name="KNOWN_ISSUES">Known Issues</a></h2>
 You cannot set the Listen or Port directives using <b>cupsctl</b>.
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
-<b>cupsd.conf</b>(5),
-<b>cupsd</b>(8),
+<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5),</a>
+<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
 <br>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
diff --git a/doc/help/man-cupsd-helper.html b/doc/help/man-cupsd-helper.html
index e701445d6..308a3a236 100644
--- a/doc/help/man-cupsd-helper.html
+++ b/doc/help/man-cupsd-helper.html
@@ -44,7 +44,7 @@ cupsd-helper - cupsd helper programs (deprecated)
 <i>argvN</i>
 <h2 class="title"><a name="DESCRIPTION">Description</a></h2>
 The <b>cupsd-helper</b> programs perform long-running operations on behalf of the scheduler,
-<b>cupsd</b>(8).
+<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8).</a>
 The <b>cups-deviced</b> helper program runs each CUPS
 <b>backend</b>(7)
 with no arguments in order to discover the available printers.
@@ -76,8 +76,8 @@ Printers that do not support IPP can be supported using applications such as
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
 <b>backend</b>(7),
 <b>cups</b>(1),
-<b>cupsd</b>(8),
-<b>cupsd.conf</b>(5),
+<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
+<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5),</a>
 <b>filter</b>(7),
 <b>ppdcfile</b>(5),
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
diff --git a/doc/help/man-cupsd-logs.html b/doc/help/man-cupsd-logs.html
index 11aac7a76..42d06faad 100644
--- a/doc/help/man-cupsd-logs.html
+++ b/doc/help/man-cupsd-logs.html
@@ -10,12 +10,12 @@
 <h2 class="title"><a name="NAME">Name</a></h2>
 cupsd-logs - cupsd log files (access_log, error_log, and page_log)
 <h2 class="title"><a name="DESCRIPTION">Description</a></h2>
-<b>cupsd</b>(8)
+<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8)</a>
 normally maintains three log files: <i>access_log</i> to track requests that are submitted to the scheduler, <i>error_log</i> to track progress and errors, and <i>page_log</i> to track pages that are printed.
 Configuration directives in
-<b>cupsd.conf</b>(5)
+<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5)</a>
 and
-<b>cups-files.conf</b>(5)
+<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5)</a>
 control what information is logged and where it is stored.
 <h3><a name="ACCESS_LOG_FILE_FORMAT">Access Log File Format</a></h3>
 The <i>access_log</i> file lists each HTTP resource that is accessed by a web browser or client.
@@ -93,7 +93,7 @@ For POST requests the bytes field contains the number of bytes of non-IPP data t
 <p>The <i>ipp-status</i> field contains either "-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
 <h3><a name="ERROR_LOG_FILE_FORMAT">Error Log File Format</a></h3>
 The <i>error_log</i> file lists messages from the scheduler - errors, warnings, etc. The LogLevel directive in the
-<b>cupsd.conf</b>(5)
+<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5)</a>
 file controls which messages are logged:
 <pre class="man">
 
@@ -158,7 +158,7 @@ For example the entry for a two page job called "myjob" might look like:
 
 </pre>
 The PageLogFormat directive in the
-<b>cupsd.conf</b>(5)
+<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5)</a>
 file can be used to change this information.
 <p>The <i>printer</i> field contains the name of the printer that printed the page.
 If you send a job to a printer class, this field will contain the name of the printer that was assigned the job.
@@ -173,9 +173,9 @@ The format of this field is identical to the data-time field in the <i>access_lo
 <p>The <i>media</i> field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
 <p>The <i>sides</i> field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
-<b>cupsd</b>(8),
-<b>cupsd.conf</b>(5),
-<b>cups-files.conf</b>(5),
+<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
+<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5),</a>
+<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2019 by Apple Inc.
diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
index f1e519dab..6252546c5 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
 <i>cupsd.conf</i>
 file configures the CUPS scheduler,
-<b>cupsd</b>(8).
+<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8).</a>
 It is normally located in the
 <i>/etc/cups</i>
 directory.
@@ -23,7 +23,7 @@ The configuration directive name and values are case-insensitive.
 Comment lines start with the # character.
 <h3><a name="TOP_LEVEL_DIRECTIVES">Top-level Directives</a></h3>
 The following top-level directives are understood by
-<b>cupsd</b>(8):
+<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8):</a>
 <dl class="man">
 <dt><a name="AccessLogLevel"></a><b>AccessLogLevel config</b>
 <dd style="margin-left: 5.0em"><dt><b>AccessLogLevel actions</b>
@@ -119,7 +119,7 @@ The default service name is "http."
 <dd style="margin-left: 5.0em"><dt><b>HostNameLookups Double</b>
 <dd style="margin-left: 5.0em">Specifies whether to do reverse lookups on connecting clients.
 The "Double" setting causes
-<b>cupsd</b>(8)
+<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8)</a>
 to verify that the hostname resolved from the address matches one of the addresses returned for that hostname.
 Double lookups also prevent clients with unregistered addresses from connecting to your server.
 The default is "Off" to avoid the potential server performance problems with hostname lookups.
@@ -128,7 +128,7 @@ Only set this option to "On" or "Double" if absolutely required.
 <dd style="margin-left: 5.0em">Specifies the length of time to wait before shutting down due to inactivity.
 The default is "60" seconds.
 Note: Only applicable when
-<b>cupsd</b>(8)
+<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8)</a>
 is run on-demand (e.g., with <b>-l</b>).
 <dt><a name="JobKillDelay"></a><b>JobKillDelay </b><i>seconds</i>
 <dd style="margin-left: 5.0em">Specifies the number of seconds to wait before killing the filters and backend associated with a canceled or held job.
@@ -304,7 +304,7 @@ The default is "No".
 </dl>
 <h3><a name="HTTP_METHOD_NAMES">Http Method Names</a></h3>
 The following HTTP methods are supported by
-<b>cupsd</b>(8):
+<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8):</a>
 <dl class="man">
 <dt>GET
 <dd style="margin-left: 5.0em">Used by a client to download icons and other printer resources and to access the CUPS web interface.
@@ -319,7 +319,7 @@ The following HTTP methods are supported by
 </dl>
 <h3><a name="IPP_OPERATION_NAMES">Ipp Operation Names</a></h3>
 The following IPP operations are supported by
-<b>cupsd</b>(8):
+<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8):</a>
 <dl class="man">
 <dt>CUPS-Accept-Jobs
 <dd style="margin-left: 5.0em">Allows a printer to accept new jobs.
@@ -412,7 +412,7 @@ The following IPP operations are supported by
 </dl>
 <h3><a name="LOCATION_PATHS">Location Paths</a></h3>
 The following paths are commonly used when configuring
-<b>cupsd</b>(8):
+<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8):</a>
 <dl class="man">
 <dt>/
 <dd style="margin-left: 5.0em">The path for all get operations (get-printers, get-jobs, etc.)
@@ -492,7 +492,7 @@ The default value is "IfRequested".
 <dt><b>Require user {</b><i>user-name</i>|<b>@</b><i>group-name</i>} ...
 <dd style="margin-left: 5.0em">Specifies that an authenticated user must match one of the named users or be a member of one of the named groups.
 The group name "@SYSTEM" corresponds to the list of groups defined by the SystemGroup directive in the
-<b>cups-files.conf</b>(5)
+<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5)</a>
 file.
 The group name "@OWNER" corresponds to the owner of the resource, for example the person that submitted a print job.
 Note: The 'root' user is not special and must be granted privileges like any other user account.
@@ -515,7 +515,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
-<b>cups-files.conf</b>(5)
+<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5)</a>
 file.
 <dt><b>JobPrivateValues all</b>
 <dd style="margin-left: 5.0em"><dt><b>JobPrivateValues default</b>
@@ -531,7 +531,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
-<b>cups-files.conf</b>(5)
+<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5)</a>
 file.
 <dt><b>SubscriptionPrivateValues all</b>
 <dd style="margin-left: 5.0em"><dt><b>SubscriptionPrivateValues default</b>
@@ -578,7 +578,7 @@ The default is "128m".
 </dl>
 <h2 class="title"><a name="NOTES">Notes</a></h2>
 File, directory, and user configuration directives that used to be allowed in the <b>cupsd.conf</b> file are now stored in the
-<b>cups-files.conf</b>(5)
+<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5)</a>
 file instead in order to prevent certain types of privilege escalation attacks.
 <p>The scheduler MUST be restarted manually after making changes to the <b>cupsd.conf</b> file.
 On Linux this is typically done using the
@@ -613,8 +613,8 @@ Require authentication for accesses from outside the 10. network:
 </pre>
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
 <b>classes.conf</b>(5),
-<b>cups-files.conf</b>(5),
-<b>cupsd</b>(8),
+<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5),</a>
+<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
 <b>mime.convs</b>(5),
 <b>mime.types</b>(5),
 <b>printers.conf</b>(5),
diff --git a/doc/help/man-cupsd.html b/doc/help/man-cupsd.html
index 589207103..d99136a1b 100644
--- a/doc/help/man-cupsd.html
+++ b/doc/help/man-cupsd.html
@@ -104,9 +104,9 @@ in the foreground with a test configuration file called
 <b>backend</b>(7),
 <b>classes.conf</b>(5),
 <b>cups</b>(1),
-<b>cups-files.conf</b>(5),
-<b>cups-lpd</b>(8),
-<b>cupsd.conf</b>(5),
+<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5),</a>
+<a href="man-cups-lpd.html?TOPIC=Man+Pages"><b>cups-lpd</b>(8),</a>
+<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5),</a>
 <b>cupsd-helper</b>(8),
 <b>cupsd-logs</b>(8),
 <b>filter</b>(7),
diff --git a/doc/help/man-cupsfilter.html b/doc/help/man-cupsfilter.html
index bce2134db..6e9d81d89 100644
--- a/doc/help/man-cupsfilter.html
+++ b/doc/help/man-cupsfilter.html
@@ -117,7 +117,7 @@ The following command will generate a PDF preview of job 42 for a printer named
 </pre>
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
 <b>cups</b>(1),
-<b>cupsd.conf</b>(5),
+<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5),</a>
 <b>filter(7),</b>
 <b>mime.convs</b>(7),
 <b>mime.types</b>(7),
diff --git a/doc/help/man-filter.html b/doc/help/man-filter.html
index 65d896b57..c8070497b 100644
--- a/doc/help/man-filter.html
+++ b/doc/help/man-filter.html
@@ -177,8 +177,8 @@ program to use the appropriate filters to do the conversions you need.
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
 <b>backend</b>(7),
 <b>cups</b>(1),
-<b>cups-files.conf</b>(5),
-<b>cupsd</b>(8),
+<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5),</a>
+<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
 <b>cupsfilter</b>(8),
 <br>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
diff --git a/doc/help/man-ipptoolfile.html b/doc/help/man-ipptoolfile.html
index 64f800295..95d4a5660 100644
--- a/doc/help/man-ipptoolfile.html
+++ b/doc/help/man-ipptoolfile.html
@@ -222,11 +222,16 @@ The following predicates are understood following the <b>EXPECT</b> test directi
 <dt><b>COUNT </b><i>number</i>
 <dd style="margin-left: 5.0em">Requires the <b>EXPECT</b> attribute to have the specified number of values.
 <dt><b>DEFINE-MATCH </b><i>variable-name</i>
-<dd style="margin-left: 5.0em">Defines the variable to "1" when the <b>EXPECT</b> condition matches. A side-effect of this predicate is that this <b>EXPECT</b> will never fail a test.
+<dd style="margin-left: 5.0em">Defines the variable to "1" when the <b>EXPECT</b> condition matches.
+A side-effect of this predicate is that this <b>EXPECT</b> will never fail a test.
 <dt><b>DEFINE-NO-MATCH </b><i>variable-name</i>
-<dd style="margin-left: 5.0em">Defines the variable to "1" when the <b>EXPECT</b> condition does not match. A side-effect of this predicate is that this <b>EXPECT</b> will never fail a test.
+<dd style="margin-left: 5.0em">Defines the variable to "1" when the <b>EXPECT</b> condition does not match.
+A side-effect of this predicate is that this <b>EXPECT</b> will never fail a test.
 <dt><b>DEFINE-VALUE </b><i>variable-name</i>
-<dd style="margin-left: 5.0em">Defines the variable to the value of the attribute when the <b>EXPECT</b> condition matches. A side-effect of this predicate is that this <b>EXPECT</b> will never fail a test.
+<dd style="margin-left: 5.0em">Defines the variable to the value of the attribute when the <b>EXPECT</b> condition matches.
+A side-effect of this predicate is that this <b>EXPECT</b> will never fail a test.
+<dt><b>DISPLAY-MATCH </b><i>"message"</i>
+<dd style="margin-left: 5.0em">Displays the specified message when the <b>EXPECT</b> condition matches.
 <dt><b>IF-DEFINED </b><i>variable-name</i>
 <dd style="margin-left: 5.0em">Makes the <b>EXPECT</b> conditions apply only if the specified variable is defined.
 <dt><b>IF-NOT-DEFINED </b><i>variable-name</i>
diff --git a/doc/help/man-lp.html b/doc/help/man-lp.html
index ba221270f..09b921fb3 100644
--- a/doc/help/man-lp.html
+++ b/doc/help/man-lp.html
@@ -86,7 +86,7 @@ Use a filename of "-" to force printing from the standard input.
 <h3><a name="THE_DEFAULT_DESTINATION">The Default Destination</a></h3>
 CUPS provides many ways to set the default destination. The <b>LPDEST</b> and <b>PRINTER</b> environment variables are consulted first.
 If neither are set, the current default set using the
-<b>lpoptions</b>(1)
+<a href="man-lpoptions.html?TOPIC=Man+Pages"><b>lpoptions</b>(1)</a>
 command is used, followed by the default set using the
 <b>lpadmin</b>(8)
 command.
@@ -138,7 +138,7 @@ The page numbers refer to the output pages and not the document's original pages
 </dl>
 <h3><a name="COMMON_JOB_OPTIONS">Common Job Options</a></h3>
 Aside from the printer-specific options reported by the
-<b>lpoptions</b>(1)
+<a href="man-lpoptions.html?TOPIC=Man+Pages"><b>lpoptions</b>(1)</a>
 command, the following generic options are available:
 <dl class="man">
 <dt><b>-o job-sheets=</b><i>name</i>
@@ -190,7 +190,7 @@ Print a presentation document 2-up to a printer called "bar":
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
 <b>cancel</b>(1),
 <b>lpadmin</b>(8),
-<b>lpoptions</b>(1),
+<a href="man-lpoptions.html?TOPIC=Man+Pages"><b>lpoptions</b>(1),</a>
 <b>lpq</b>(1),
 <b>lpr</b>(1),
 <b>lprm</b>(1),
diff --git a/doc/help/man-lpadmin.html b/doc/help/man-lpadmin.html
index 755bf2fd9..1ce68ab29 100644
--- a/doc/help/man-lpadmin.html
+++ b/doc/help/man-lpadmin.html
@@ -60,7 +60,7 @@ Subsequent print jobs submitted via the
 or
 <b>lpr</b>(1)
 commands will use this destination unless the user specifies otherwise with the
-<b>lpoptions</b>(1)
+<a href="man-lpoptions.html?TOPIC=Man+Pages"><b>lpoptions</b>(1)</a>
 command.
 <p>The second form of the command (<i>-p</i>) configures the named printer or class.  The additional options are described below.
 <p>The third form of the command (<i>-x</i>) deletes the printer or class <i>destination</i>.
@@ -99,7 +99,7 @@ The value is an integer number of seconds; 86,400 seconds are in one day.
 <dt><b>-o </b><i>name</i><b>=</b><i>value</i>
 <dd style="margin-left: 5.0em">Sets a PPD option for the printer.
 PPD options can be listed using the <i>-l</i> option with the
-<b>lpoptions</b>(1)
+<a href="man-lpoptions.html?TOPIC=Man+Pages"><b>lpoptions</b>(1)</a>
 command.
 <dt><b>-o </b><i>name</i><b>-default=</b><i>value</i>
 <dd style="margin-left: 5.0em">Sets a default server-side option for the destination.
@@ -189,7 +189,7 @@ Create an IPP Everywhere print queue:
 <b>cupsaccept</b>(8),
 <b>cupsenable</b>(8),
 <b>lpinfo</b>(8),
-<b>lpoptions</b>(1),
+<a href="man-lpoptions.html?TOPIC=Man+Pages"><b>lpoptions</b>(1),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2019 by Apple Inc.
diff --git a/doc/help/man-lpr.html b/doc/help/man-lpr.html
index c945ea9c8..37970b408 100644
--- a/doc/help/man-lpr.html
+++ b/doc/help/man-lpr.html
@@ -56,7 +56,7 @@ If no files are listed on the command-line, <b>lpr</b> reads the print file from
 <h3><a name="THE_DEFAULT_DESTINATION">The Default Destination</a></h3>
 CUPS provides many ways to set the default destination. The <b>LPDEST</b> and <b>PRINTER</b> environment variables are consulted first.
 If neither are set, the current default set using the
-<b>lpoptions</b>(1)
+<a href="man-lpoptions.html?TOPIC=Man+Pages"><b>lpoptions</b>(1)</a>
 command is used, followed by the default set using the
 <b>lpadmin</b>(8)
 command.
@@ -97,7 +97,7 @@ This option is equivalent to <i>-o prettyprint</i> and is only useful when print
 </dl>
 <h3><a name="COMMON_JOB_OPTIONS">Common Job Options</a></h3>
 Aside from the printer-specific options reported by the
-<b>lpoptions</b>(1)
+<a href="man-lpoptions.html?TOPIC=Man+Pages"><b>lpoptions</b>(1)</a>
 command, the following generic options are available:
 <dl class="man">
 <dt><b>-o job-sheets=</b><i>name</i>
@@ -148,7 +148,7 @@ Print a presentation document 2-up to a printer called "foo":
 <b>cancel</b>(1),
 <b>lp</b>(1),
 <b>lpadmin</b>(8),
-<b>lpoptions</b>(1),
+<a href="man-lpoptions.html?TOPIC=Man+Pages"><b>lpoptions</b>(1),</a>
 <b>lpq</b>(1),
 <b>lprm</b>(1),
 <b>lpstat</b>(1),
diff --git a/doc/help/man-mailto.conf.html b/doc/help/man-mailto.conf.html
index 8f5b87cbb..47dc7a455 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.
 <dd style="margin-left: 5.0em">Specifies a prefix string for the subject line of an email notification.
 </dl>
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
-<b>cupsd</b>(8),
+<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright &copy; 2007-2019 by Apple Inc.
diff --git a/doc/help/man-mime.convs.html b/doc/help/man-mime.convs.html
index e4d8813c8..6afbc71a3 100644
--- a/doc/help/man-mime.convs.html
+++ b/doc/help/man-mime.convs.html
@@ -46,9 +46,9 @@ CUPS filters are deprecated and will no longer be supported in a future feature
 Printers that do not support IPP can be supported using applications such as
 <b>ippeveprinter</b>(1).
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
-<b>cups-files.conf</b>(5),
-<b>cupsd.conf</b>(5),
-<b>cupsd</b>(8),
+<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5),</a>
+<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5),</a>
+<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
 <b>cupsfilter</b>(8),
 <b>mime.types</b>(5),
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
diff --git a/doc/help/man-mime.types.html b/doc/help/man-mime.types.html
index cc4393ef8..28d166cac 100644
--- a/doc/help/man-mime.types.html
+++ b/doc/help/man-mime.types.html
@@ -84,9 +84,9 @@ Define two MIME media types for raster data, with one being a subset with higher
                                   string(4,PwgRaster&lt;00>) priority(150)
 </pre>
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
-<b>cups-files.conf</b>(5),
-<b>cupsd.conf</b>(5),
-<b>cupsd</b>(8),
+<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5),</a>
+<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5),</a>
+<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
 <b>cupsfilter</b>(8),
 <b>mime.convs</b>(5),
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
diff --git a/doc/help/man-notifier.html b/doc/help/man-notifier.html
index d8d96d36c..27e051fdb 100644
--- a/doc/help/man-notifier.html
+++ b/doc/help/man-notifier.html
@@ -27,7 +27,7 @@ Notifiers are encouraged to exit after a suitable period of inactivity, however
 Notifiers inherit the environment and can use the logging mechanism documented in
 <b>filter</b>(7).
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
-<b>cupsd</b>(8),
+<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
 <b>filter</b>(7),
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
diff --git a/doc/help/man-printers.conf.html b/doc/help/man-printers.conf.html
index 4a3123ea5..a2f8ba68e 100644
--- a/doc/help/man-printers.conf.html
+++ b/doc/help/man-printers.conf.html
@@ -11,15 +11,15 @@
 printers.conf - printer configuration file for cups
 <h2 class="title"><a name="DESCRIPTION">Description</a></h2>
 The <b>printers.conf</b> file defines the local printers that are available. It is normally located in the <i>/etc/cups</i> directory and is maintained by the
-<b>cupsd</b>(8)
+<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8)</a>
 program. This file is not intended to be edited or managed manually.
 <h2 class="title"><a name="NOTES">Notes</a></h2>
 The name, location, and format of this file are an implementation detail that will change in future releases of CUPS.
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
 <b>classes.conf</b>(5),
-<b>cups-files.conf</b>(5),
-<b>cupsd</b>(8),
-<b>cupsd.conf</b>(5),
+<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5),</a>
+<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
+<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5),</a>
 <b>mime.convs</b>(5),
 <b>mime.types</b>(5),
 <b>subscriptions.conf</b>(5),
diff --git a/doc/help/man-subscriptions.conf.html b/doc/help/man-subscriptions.conf.html
index 325f2cd28..fb7ec0287 100644
--- a/doc/help/man-subscriptions.conf.html
+++ b/doc/help/man-subscriptions.conf.html
@@ -12,16 +12,16 @@ subscriptions.conf - subscription configuration file for cups
 <h2 class="title"><a name="DESCRIPTION">Description</a></h2>
 The <b>subscriptions.conf</b> file defines the local event notification subscriptions that are active.
 It is normally located in the <i>/etc/cups</i> directory and is maintained by the
-<b>cupsd</b>(8)
+<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8)</a>
 program.
 This file is not intended to be edited or managed manually.
 <h2 class="title"><a name="NOTES">Notes</a></h2>
 The name, location, and format of this file are an implementation detail that will change in future releases of CUPS.
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
 <b>classes.conf</b>(5),
-<b>cups-files.conf</b>(5),
-<b>cupsd</b>(8),
-<b>cupsd.conf</b>(5),
+<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5),</a>
+<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
+<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5),</a>
 <b>mime.convs</b>(5),
 <b>mime.types</b>(5),
 <b>printers.conf</b>(5),
diff --git a/man/ipptoolfile.5 b/man/ipptoolfile.5
index a4ffd635c..b4b08c056 100644
--- a/man/ipptoolfile.5
+++ b/man/ipptoolfile.5
@@ -6,7 +6,7 @@
 .\" Licensed under Apache License v2.0.  See the file "LICENSE" for more
 .\" information.
 .\"
-.TH ipptoolfile 5 "CUPS" "5 April 2021" "Apple Inc."
+.TH ipptoolfile 5 "CUPS" "12 May 2021" "Apple Inc."
 .SH NAME
 ipptoolfile \- ipptool file format
 .SH DESCRIPTION
@@ -281,13 +281,19 @@ The following predicates are understood following the \fBEXPECT\fR test directiv
 Requires the \fBEXPECT\fR attribute to have the specified number of values.
 .TP 5
 \fBDEFINE\-MATCH \fIvariable-name\fR
-Defines the variable to "1" when the \fBEXPECT\fR condition matches. A side-effect of this predicate is that this \fBEXPECT\fR will never fail a test.
+Defines the variable to "1" when the \fBEXPECT\fR condition matches.
+A side-effect of this predicate is that this \fBEXPECT\fR will never fail a test.
 .TP 5
 \fBDEFINE\-NO\-MATCH \fIvariable-name\fR
-Defines the variable to "1" when the \fBEXPECT\fR condition does not match. A side-effect of this predicate is that this \fBEXPECT\fR will never fail a test.
+Defines the variable to "1" when the \fBEXPECT\fR condition does not match.
+A side-effect of this predicate is that this \fBEXPECT\fR will never fail a test.
 .TP 5
 \fBDEFINE\-VALUE \fIvariable-name\fR
-Defines the variable to the value of the attribute when the \fBEXPECT\fR condition matches. A side-effect of this predicate is that this \fBEXPECT\fR will never fail a test.
+Defines the variable to the value of the attribute when the \fBEXPECT\fR condition matches.
+A side-effect of this predicate is that this \fBEXPECT\fR will never fail a test.
+.TP 5
+\fBDISPLAY\-MATCH \fI"message"\fR
+Displays the specified message when the \fBEXPECT\fR condition matches.
 .TP 5
 \fBIF\-DEFINED \fIvariable-name\fR
 Makes the \fBEXPECT\fR conditions apply only if the specified variable is defined.
diff --git a/tools/ipptool.c b/tools/ipptool.c
index 49374761d..e89fb5bca 100644
--- a/tools/ipptool.c
+++ b/tools/ipptool.c
@@ -85,7 +85,8 @@ typedef struct ipptool_expect_s		/**** Expected attribute info ****/
 		*with_value_from,	/* Attribute must have one of the values in this attribute */
 		*define_match,		/* Variable to define on match */
 		*define_no_match,	/* Variable to define on no-match */
-		*define_value;		/* Variable to define with value */
+		*define_value,		/* Variable to define with value */
+		*display_match;		/* Message to display on a match */
   int		repeat_limit,		/* Maximum number of times to repeat */
 		repeat_match,		/* Repeat test on match */
 		repeat_no_match,	/* Repeat test on no match */
@@ -1074,6 +1075,9 @@ do_monitor_printer_state(
 	break;
       }
 
+      if (found && expect->display_match && (data->output == IPPTOOL_OUTPUT_TEST || (data->output == IPPTOOL_OUTPUT_PLIST && data->outfile != cupsFileStdout())))
+	cupsFilePrintf(cupsFileStdout(), "CONT]\n\n%s\n\n    %-68.68s [", expect->display_match, data->name);
+
       if (found && expect->define_match)
       {
 	_ippVarsSet(data->vars, expect->define_match, "1");
@@ -1847,6 +1851,9 @@ do_test(_ipp_file_t    *f,		/* I - IPP data file */
 	    }
 	  }
 
+	  if (found && expect->display_match && (data->output == IPPTOOL_OUTPUT_TEST || (data->output == IPPTOOL_OUTPUT_PLIST && data->outfile != cupsFileStdout())))
+	    cupsFilePrintf(cupsFileStdout(), "\n%s\n\n", expect->display_match);
+
 	  if (found && expect->define_match)
 	    _ippVarsSet(data->vars, expect->define_match, "1");
 
@@ -2115,36 +2122,25 @@ do_test(_ipp_file_t    *f,		/* I - IPP data file */
 
   for (i = 0; i < data->num_statuses; i ++)
   {
-    if (data->statuses[i].if_defined)
-      free(data->statuses[i].if_defined);
-    if (data->statuses[i].if_not_defined)
-      free(data->statuses[i].if_not_defined);
-    if (data->statuses[i].define_match)
-      free(data->statuses[i].define_match);
-    if (data->statuses[i].define_no_match)
-      free(data->statuses[i].define_no_match);
+    free(data->statuses[i].if_defined);
+    free(data->statuses[i].if_not_defined);
+    free(data->statuses[i].define_match);
+    free(data->statuses[i].define_no_match);
   }
   data->num_statuses = 0;
 
   for (i = data->num_expects, expect = data->expects; i > 0; i --, expect ++)
   {
     free(expect->name);
-    if (expect->of_type)
-      free(expect->of_type);
-    if (expect->same_count_as)
-      free(expect->same_count_as);
-    if (expect->if_defined)
-      free(expect->if_defined);
-    if (expect->if_not_defined)
-      free(expect->if_not_defined);
-    if (expect->with_value)
-      free(expect->with_value);
-    if (expect->define_match)
-      free(expect->define_match);
-    if (expect->define_no_match)
-      free(expect->define_no_match);
-    if (expect->define_value)
-      free(expect->define_value);
+    free(expect->of_type);
+    free(expect->same_count_as);
+    free(expect->if_defined);
+    free(expect->if_not_defined);
+    free(expect->with_value);
+    free(expect->define_match);
+    free(expect->define_no_match);
+    free(expect->define_value);
+    free(expect->display_match);
   }
   data->num_expects = 0;
 
@@ -2158,22 +2154,15 @@ do_test(_ipp_file_t    *f,		/* I - IPP data file */
   for (i = data->num_monitor_expects, expect = data->monitor_expects; i > 0; i --, expect ++)
   {
     free(expect->name);
-    if (expect->of_type)
-      free(expect->of_type);
-    if (expect->same_count_as)
-      free(expect->same_count_as);
-    if (expect->if_defined)
-      free(expect->if_defined);
-    if (expect->if_not_defined)
-      free(expect->if_not_defined);
-    if (expect->with_value)
-      free(expect->with_value);
-    if (expect->define_match)
-      free(expect->define_match);
-    if (expect->define_no_match)
-      free(expect->define_no_match);
-    if (expect->define_value)
-      free(expect->define_value);
+    free(expect->of_type);
+    free(expect->same_count_as);
+    free(expect->if_defined);
+    free(expect->if_not_defined);
+    free(expect->with_value);
+    free(expect->define_match);
+    free(expect->define_no_match);
+    free(expect->define_value);
+    free(expect->display_match);
   }
   data->num_monitor_expects = 0;
 
@@ -2705,6 +2694,7 @@ parse_monitor_printer_state(
 	_cups_strcasecmp(token, "DEFINE-MATCH") &&
 	_cups_strcasecmp(token, "DEFINE-NO-MATCH") &&
 	_cups_strcasecmp(token, "DEFINE-VALUE") &&
+	_cups_strcasecmp(token, "DISPLAY-MATCH") &&
 	_cups_strcasecmp(token, "IF-DEFINED") &&
 	_cups_strcasecmp(token, "IF-NOT-DEFINED") &&
 	_cups_strcasecmp(token, "IN-GROUP") &&
@@ -2832,6 +2822,24 @@ parse_monitor_printer_state(
 	return (0);
       }
     }
+    else if (!_cups_strcasecmp(token, "DISPLAY-MATCH"))
+    {
+      if (!_ippFileReadToken(f, temp, sizeof(temp)))
+      {
+	print_fatal_error(data, "Missing DISPLAY-MATCH message on line %d of \"%s\".", f->linenum, f->filename);
+	return (0);
+      }
+
+      if (data->last_expect)
+      {
+	data->last_expect->display_match = strdup(temp);
+      }
+      else
+      {
+	print_fatal_error(data, "DISPLAY-MATCH without a preceding EXPECT on line %d of \"%s\".", f->linenum, f->filename);
+	return (0);
+      }
+    }
     else if (!_cups_strcasecmp(token, "DELAY"))
     {
      /*
@@ -3130,7 +3138,7 @@ pause_message(const char *message)	/* I - Message */
   * Display the prompt...
   */
 
-  cupsFilePrintf(cupsFileStdout(), "%s\n---- PRESS ANY KEY ----", message);
+  cupsFilePrintf(cupsFileStdout(), "\n%s\n\n---- PRESS ANY KEY ----", message);
 
 #ifdef _WIN32
  /*
@@ -3935,6 +3943,7 @@ token_cb(_ipp_file_t    *f,		/* I - IPP file data */
 	_cups_strcasecmp(token, "DEFINE-MATCH") &&
 	_cups_strcasecmp(token, "DEFINE-NO-MATCH") &&
 	_cups_strcasecmp(token, "DEFINE-VALUE") &&
+	_cups_strcasecmp(token, "DISPLAY-MATCH") &&
 	_cups_strcasecmp(token, "IF-DEFINED") &&
 	_cups_strcasecmp(token, "IF-NOT-DEFINED") &&
 	_cups_strcasecmp(token, "IN-GROUP") &&
@@ -4576,6 +4585,24 @@ token_cb(_ipp_file_t    *f,		/* I - IPP file data */
 	return (0);
       }
     }
+    else if (!_cups_strcasecmp(token, "DISPLAY-MATCH"))
+    {
+      if (!_ippFileReadToken(f, temp, sizeof(temp)))
+      {
+	print_fatal_error(data, "Missing DISPLAY-MATCH mesaage on line %d of \"%s\".", f->linenum, f->filename);
+	return (0);
+      }
+
+      if (data->last_expect)
+      {
+	data->last_expect->display_match = strdup(temp);
+      }
+      else
+      {
+	print_fatal_error(data, "DISPLAY-MATCH without a preceding EXPECT on line %d of \"%s\".", f->linenum, f->filename);
+	return (0);
+      }
+    }
     else if (!_cups_strcasecmp(token, "OF-TYPE"))
     {
       if (!_ippFileReadToken(f, temp, sizeof(temp)))