Move ippeveprinter commands to CUPS_SERVERBIN/command.

diff --git a/CHANGES.md b/CHANGES.md
index ab789a548451b8a09fd3f481204ed69b706f331c..fd46d45e172791bc3f9c05fcb348d4e851daad10 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,12 @@
-CHANGES - 2.3b8 - 2019-05-02
-============================
+CHANGES - 2.3rc1 - 2019-05-03
+=============================
+
+
+Changes in CUPS v2.3rc1
+-----------------------
+
+- The `ippeveprinter` command now looks for print commands in the "command"
+  subdirectory.
 
 
 Changes in CUPS v2.3b8

diff --git a/doc/help/man-backend.html b/doc/help/man-backend.html
index b1a0385d5fb5edae666ff96a33228b479c11e1cc..953a26789a5ff9f0c8d16ab8f62b52b05529ff3e 100644 (file)
--- 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
-<a href="man-cups-snmp.html?TOPIC=Man+Pages"><b>cups-snmp</b>(8)</a>
+<b>cups-snmp</b>(8)
 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 ef6f3f45da96818577e674d3f0a21aabd56c6ff9..c02f6f1efec89b3e81487869468cfd7699b48392 100644 (file)
--- 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
-<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5).</a>
+<b>cupsd.conf</b>(5).
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
-<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5),</a>
+<b>cupsd.conf</b>(5),
 <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 da5126d60ce61f06618aa61f1af6b4ff65a22738..f30ec909e90e2705b338e098a2be20b8cba18a4f 100644 (file)
--- 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
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8)</a>
+<b>cupsd</b>(8)
 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>
-<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>cupsd</b>(8),
+<b>cupsd.conf</b>(5),
 <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 27a1b60da40f63d59d0ebf3a78b727edb2119aef..c567cbba7bb54b944ac3f7063cf1507656bb93f6 100644 (file)
--- 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,
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8).</a>
+<b>cupsd</b>(8).
 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
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8):</a>
+<b>cupsd</b>(8):
 <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),
-<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>cupsd</b>(8),
+<b>cupsd.conf</b>(5),
 <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 7283d7563cbfc815f6fcd829d5d5ac4de78b9c8a..ad0e68ed0c0831773ab92e0776d6cd6183b5ff37 100644 (file)
--- 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),
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
+<b>cupsd</b>(8),
 <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 fbd2dc4eb9f6d185c9bfa4693ed34a3d93e7c4ce..d61d8340fd70887262adf9fa6f9552c94db6a8f4 100644 (file)
--- 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 -
-<a href="man-cups-snmp.html?TOPIC=Man+Pages"><b>cups-snmp</b>(8).</a>
+<b>cups-snmp</b>(8).
 <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>
-<a href="man-cups-snmp.html?TOPIC=Man+Pages"><b>cups-snmp</b>(8),</a>
+<b>cups-snmp</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>
 Copyright &copy; 2007-2019 by Apple Inc.

diff --git a/doc/help/man-cups-snmp.html b/doc/help/man-cups-snmp.html
index 9ff2b9aeff73ab1b1fc8cbad6a00d745dbfdf619..c7c17f7f4fec732c53c12998e6e1c0997638c21a 100644 (file)
--- 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),
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
+<b>cupsd</b>(8),
 <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 769ffe64c7450dd44df282baa21828228c35072c..d75ddc5b06dff5005d61d446418cf8a8fbf589c6 100644 (file)
--- 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),
-<a href="man-client.conf.html?TOPIC=Man+Pages"><b>client.conf</b>(7),</a>
+<b>client.conf</b>(7),
 <b>cupsctl</b>(8),
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
+<b>cupsd</b>(8),
 <b>lp</b>(1),
 <b>lpadmin</b>(8),
 <b>lpinfo</b>(8),
-<a href="man-lpoptions.html?TOPIC=Man+Pages"><b>lpoptions</b>(1),</a>
+<b>lpoptions</b>(1),
 <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 897b0541e8b29bdabe5e035c4b2218e9053db0bd..c52125fc7f67526df9e6f12744ae90b2498d7bbe 100644 (file)
--- 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>
-<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>cupsd.conf</b>(5),
+<b>cupsd</b>(8),
 <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 308a3a2367f9d3101b664b24a3ac0e53f7d54f94..e701445d66ff7fd544b05c500ef03979257b64fd 100644 (file)
--- 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,
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8).</a>
+<b>cupsd</b>(8).
 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),
-<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>cupsd</b>(8),
+<b>cupsd.conf</b>(5),
 <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 42d06faad7a91714eeda3ee2777f4530a2881c8f..11aac7a76d8a3d51e732727e8905a897b8a538fb 100644 (file)
--- 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>
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8)</a>
+<b>cupsd</b>(8)
 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
-<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5)</a>
+<b>cupsd.conf</b>(5)
 and
-<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5)</a>
+<b>cups-files.conf</b>(5)
 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
-<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5)</a>
+<b>cupsd.conf</b>(5)
 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
-<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5)</a>
+<b>cupsd.conf</b>(5)
 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>
-<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>
+<b>cupsd</b>(8),
+<b>cupsd.conf</b>(5),
+<b>cups-files.conf</b>(5),
 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 f889b866f4f4457841e97dcb0e2aa17dfe9a2e6d..10101dbbed178650083478e1493d7043ffa7e647 100644 (file)
--- 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,
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8).</a>
+<b>cupsd</b>(8).
 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
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8):</a>
+<b>cupsd</b>(8):
 <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
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8)</a>
+<b>cupsd</b>(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.
@@ -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
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8)</a>
+<b>cupsd</b>(8)
 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.
@@ -307,7 +307,7 @@ The default is "No".
 </dl>
 <h3><a name="HTTP_METHOD_NAMES">Http Method Names</a></h3>
 The following HTTP methods are supported by
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8):</a>
+<b>cupsd</b>(8):
 <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.
@@ -322,7 +322,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
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8):</a>
+<b>cupsd</b>(8):
 <dl class="man">
 <dt>CUPS-Accept-Jobs
 <dd style="margin-left: 5.0em">Allows a printer to accept new jobs.
@@ -415,7 +415,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
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8):</a>
+<b>cupsd</b>(8):
 <dl class="man">
 <dt>/
 <dd style="margin-left: 5.0em">The path for all get operations (get-printers, get-jobs, etc.)
@@ -491,7 +491,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
-<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5)</a>
+<b>cups-files.conf</b>(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.
@@ -514,7 +514,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
-<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5)</a>
+<b>cups-files.conf</b>(5)
 file.
 <dt><b>JobPrivateValues all</b>
 <dd style="margin-left: 5.0em"><dt><b>JobPrivateValues default</b>
@@ -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
-<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5)</a>
+<b>cups-files.conf</b>(5)
 file.
 <dt><b>SubscriptionPrivateValues all</b>
 <dd style="margin-left: 5.0em"><dt><b>SubscriptionPrivateValues default</b>
@@ -577,7 +577,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
-<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5)</a>
+<b>cups-files.conf</b>(5)
 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
@@ -609,8 +609,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),
-<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>cups-files.conf</b>(5),
+<b>cupsd</b>(8),
 <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 d99136a1bf9508e4c41bf98cc11d70610427ad74..5892071037f9df799040ff20eaa2878a3657f4c5 100644 (file)
--- 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),
-<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>cups-files.conf</b>(5),
+<b>cups-lpd</b>(8),
+<b>cupsd.conf</b>(5),
 <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 6e9d81d891d67cf61c3f5157410af8c15f9ba7e7..bce2134db18e77ca53708fa59eb725a70cdb744a 100644 (file)
--- 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),
-<a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5),</a>
+<b>cupsd.conf</b>(5),
 <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 c8070497befe5857c831210d48e8a33a6be2efa9..65d896b57c02d3fa3ee8d71312d0c5789c8d98a5 100644 (file)
--- 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),
-<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>cups-files.conf</b>(5),
+<b>cupsd</b>(8),
 <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-ippeveprinter.html b/doc/help/man-ippeveprinter.html
index 7e4b0a94c0da060583b638128169e3093b92bcb9..ec25dabc0f65b686189a57d4566601eb7bfd518a 100644 (file)
--- a/doc/help/man-ippeveprinter.html
+++ b/doc/help/man-ippeveprinter.html
@@ -110,7 +110,7 @@ printer command ("-c ippeveps").
 <dd style="margin-left: 5.0em">Run the specified command for each document that is printed.
 If "command" is not an absolute path ("/path/to/command"),
 <b>ippeveprinter</b>
-looks for the command in the "ippeveprinter" subdirectory of the CUPS binary directory, typically /usr/lib/cups/ippeveprinter or /usr/libexec/cups/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
 <b>cups-config</b>(1)
 command can be used to discover the correct binary directory ("cups-config --serverbin").

diff --git a/doc/help/man-lp.html b/doc/help/man-lp.html
index 09b921fb3b0dc1fc1fd76b8f678ba6fbd513f787..ba221270fac206aec77d5a885f8be720a53667bf 100644 (file)
--- 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
-<a href="man-lpoptions.html?TOPIC=Man+Pages"><b>lpoptions</b>(1)</a>
+<b>lpoptions</b>(1)
 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
-<a href="man-lpoptions.html?TOPIC=Man+Pages"><b>lpoptions</b>(1)</a>
+<b>lpoptions</b>(1)
 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),
-<a href="man-lpoptions.html?TOPIC=Man+Pages"><b>lpoptions</b>(1),</a>
+<b>lpoptions</b>(1),
 <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 1ce68ab29e48baeb855c214c51df313ca3dfe7b4..755bf2fd9313c2252e188289ca2e82dcc6fbbcde 100644 (file)
--- 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
-<a href="man-lpoptions.html?TOPIC=Man+Pages"><b>lpoptions</b>(1)</a>
+<b>lpoptions</b>(1)
 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
-<a href="man-lpoptions.html?TOPIC=Man+Pages"><b>lpoptions</b>(1)</a>
+<b>lpoptions</b>(1)
 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),
-<a href="man-lpoptions.html?TOPIC=Man+Pages"><b>lpoptions</b>(1),</a>
+<b>lpoptions</b>(1),
 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 37970b408ecad4ddcbb289675adb5d55686f9c0c..c945ea9c82ab79cb577cba257a7dabc7bd795c59 100644 (file)
--- 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
-<a href="man-lpoptions.html?TOPIC=Man+Pages"><b>lpoptions</b>(1)</a>
+<b>lpoptions</b>(1)
 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
-<a href="man-lpoptions.html?TOPIC=Man+Pages"><b>lpoptions</b>(1)</a>
+<b>lpoptions</b>(1)
 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),
-<a href="man-lpoptions.html?TOPIC=Man+Pages"><b>lpoptions</b>(1),</a>
+<b>lpoptions</b>(1),
 <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 47dc7a45577a96c1cadac6e7675214adfeb2eda5..8f5b87cbbc43a7652381f87d952bba95ab6f3e18 100644 (file)
--- 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>
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
+<b>cupsd</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>
 Copyright &copy; 2007-2019 by Apple Inc.

diff --git a/doc/help/man-mime.convs.html b/doc/help/man-mime.convs.html
index 6afbc71a3c3cf9521b345d1e0b8300360e4b6261..e4d8813c8e160a30f012d1284023cb7f25a7a37b 100644 (file)
--- 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>
-<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>cups-files.conf</b>(5),
+<b>cupsd.conf</b>(5),
+<b>cupsd</b>(8),
 <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 28d166cacdb8f11ea392031be7dfb84a8f383239..cc4393ef81ff97603a07c818f364ff57491c3b7d 100644 (file)
--- 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<00>) priority(150)
 </pre>
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
-<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>cups-files.conf</b>(5),
+<b>cupsd.conf</b>(5),
+<b>cupsd</b>(8),
 <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 27e051fdbb0c89e57104e152d562930c14dcddcd..d8d96d36ca7d6e3dc58293bcf3b60eb690832403 100644 (file)
--- 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>
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
+<b>cupsd</b>(8),
 <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 a2f8ba68eefce311fc1db2119dfdbd1fb5c8d683..4a3123ea56b834917ed88383315a4ff09bd710b2 100644 (file)
--- 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
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8)</a>
+<b>cupsd</b>(8)
 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),
-<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>cups-files.conf</b>(5),
+<b>cupsd</b>(8),
+<b>cupsd.conf</b>(5),
 <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 fb7ec0287fceecb65edf54a516f2d45325b14d34..325f2cd28ec60332a1adbbcc06866fb6e91cc325 100644 (file)
--- 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
-<a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8)</a>
+<b>cupsd</b>(8)
 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),
-<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>cups-files.conf</b>(5),
+<b>cupsd</b>(8),
+<b>cupsd.conf</b>(5),
 <b>mime.convs</b>(5),
 <b>mime.types</b>(5),
 <b>printers.conf</b>(5),

diff --git a/man/ippeveprinter.1 b/man/ippeveprinter.1
index 0fb4c2416e964e7498dbca6c8bf6ac9c6b6c8cf8..3165400f2a16668c6643394ff747f8fc1b340052 100644 (file)
--- a/man/ippeveprinter.1
+++ b/man/ippeveprinter.1
@@ -6,7 +6,7 @@
 .\" Licensed under Apache License v2.0.  See the file "LICENSE" for more
 .\" information.
 .\"
-.TH ippeveprinter 1 "CUPS" "24 April 2019" "Apple Inc."
+.TH ippeveprinter 1 "CUPS" "3 May 2019" "Apple Inc."
 .SH NAME
 ippeveprinter \- an ipp everywhere printer application for cups
 .SH SYNOPSIS
@@ -119,7 +119,7 @@ Specifies the maximum IPP version to report.
 Run the specified command for each document that is printed.
 If "command" is not an absolute path ("/path/to/command"),
 .B ippeveprinter
-looks for the command in the "ippeveprinter" subdirectory of the CUPS binary directory, typically /usr/lib/cups/ippeveprinter or /usr/libexec/cups/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
 .BR cups-config (1)
 command can be used to discover the correct binary directory ("cups-config --serverbin").

diff --git a/packaging/cups.list.in b/packaging/cups.list.in
index e2e7b69ede921252659d38aa21221809ced9fdf1..537c19450894f4c8994136d6357be372aa00520f 100644 (file)
--- a/packaging/cups.list.in
+++ b/packaging/cups.list.in
@@ -278,6 +278,9 @@ f 0555 root sys $SERVERBIN/cgi-bin/classes.cgi cgi-bin/classes.cgi
 f 0555 root sys $SERVERBIN/cgi-bin/help.cgi cgi-bin/help.cgi
 f 0555 root sys $SERVERBIN/cgi-bin/jobs.cgi cgi-bin/jobs.cgi
 f 0555 root sys $SERVERBIN/cgi-bin/printers.cgi cgi-bin/printers.cgi
+d 0755 root sys $SERVERBIN/command -
+f 0555 root sys $SERVERBIN/command/ippevepcl tools/ippevepcl
+f 0555 root sys $SERVERBIN/command/ippeveps tools/ippeveps
 d 0755 root sys $SERVERBIN/daemon -
 f 0555 root sys $SERVERBIN/daemon/cups-deviced scheduler/cups-deviced
 f 0555 root sys $SERVERBIN/daemon/cups-driverd scheduler/cups-driverd
@@ -291,9 +294,6 @@ l 0755 root sys $SERVERBIN/filter/rastertodymo rastertolabel
 f 0555 root sys $SERVERBIN/filter/rastertoepson filter/rastertoepson
 f 0555 root sys $SERVERBIN/filter/rastertohp filter/rastertohp
 f 0555 root sys $SERVERBIN/filter/rastertopwg filter/rastertopwg
-d 0755 root sys $SERVERBIN/ippeveprinter -
-f 0555 root sys $SERVERBIN/ippeveprinter/ippevepcl tools/ippevepcl
-f 0555 root sys $SERVERBIN/ippeveprinter/ippeveps tools/ippeveps
 d 0755 root sys $SERVERBIN/notifier -
 f 0555 root sys $SERVERBIN/notifier/mailto notifier/mailto
 

diff --git a/packaging/cups.spec.in b/packaging/cups.spec.in
index 93867f2c53146faedad1b4831763ae01db8a0789..d37103c4f5177119c9ae645d64e4c6a3ef490250 100644 (file)
--- a/packaging/cups.spec.in
+++ b/packaging/cups.spec.in
@@ -236,6 +236,8 @@ rm -rf $RPM_BUILD_ROOT
 /usr/lib/cups/backend/usb
 %dir /usr/lib/cups/cgi-bin
 /usr/lib/cups/cgi-bin/*
+%dir /usr/lib/cups/command
+/usr/lib/cups/command/*
 %dir /usr/lib/cups/daemon
 /usr/lib/cups/daemon/cups-deviced
 /usr/lib/cups/daemon/cups-driverd
@@ -243,8 +245,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/lib/cups/driver
 %dir /usr/lib/cups/filter
 /usr/lib/cups/filter/*
-%dir /usr/lib/cups/ippeveprinter
-/usr/lib/cups/ippeveprinter/*
 %dir /usr/lib/cups/monitor
 /usr/lib/cups/monitor/*
 %dir /usr/lib/cups/notifier

diff --git a/tools/Makefile b/tools/Makefile
index 43ba6884786498c7dfeca6783422ed51f0052a75..479f2ba9f3ba0997e03630bf5ff22a07ae17388e 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -89,10 +89,10 @@ install-exec:
        for file in $(IPPTOOLS); do \
                $(INSTALL_BIN) $$file $(BINDIR); \
        done
-       echo Installing printer commands in $(SERVERBIN)/ippeveprinter...
-       $(INSTALL_DIR) -m 755 $(SERVERBIN)/ippeveprinter
+       echo Installing printer commands in $(SERVERBIN)/command...
+       $(INSTALL_DIR) -m 755 $(SERVERBIN)/command
        for file in $(IPPEVECOMMANDS); do \
-               $(INSTALL_BIN) $$file $(SERVERBIN)/ippeveprinter; \
+               $(INSTALL_BIN) $$file $(SERVERBIN)/command; \
        done
        if test "x$(SYMROOT)" != "x"; then \
                $(INSTALL_DIR) $(SYMROOT); \
@@ -127,9 +127,9 @@ uninstall:
                $(RM) $(BINDIR)/$$file; \
        done
        -$(RMDIR) $(BINDIR)
-       echo Uninstalling print commands from $(SERVERBIN)/ippeveprinter...
+       echo Uninstalling print commands from $(SERVERBIN)/command...
        for file in $(IPPEVECOMMANDS); do \
-               $(RM) $(SERVERBIN)/ippeveprinter/$$file; \
+               $(RM) $(SERVERBIN)/command/$$file; \
        done
        -$(RMDIR) $(SERVERBIN)/ippeveprinter
 

diff --git a/tools/ippeveprinter.c b/tools/ippeveprinter.c
index 1ec874b55c9acbf54e0fde2e70ec1ddfaf3cdaf9..4f6f0cf9bb96752756abcb4592d9b596956d974a 100644 (file)
--- a/tools/ippeveprinter.c
+++ b/tools/ippeveprinter.c
@@ -1403,7 +1403,7 @@ create_printer(
     }
     else
     {
-      snprintf(path, sizeof(path), "%s/ippeveprinter/%s", cg->cups_serverbin, command);
+      snprintf(path, sizeof(path), "%s/command/%s", cg->cups_serverbin, command);
 
       if (access(command, X_OK))
       {