From 2909c66c504b0e527d6b032486ecfa8faffd3d07 Mon Sep 17 00:00:00 2001 From: msweet Date: Fri, 4 Apr 2014 21:28:49 +0000 Subject: [PATCH] Save work. git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11796 a1ca3aef-8c08-0410-bb20-df032aa958be --- doc/cups-printable.css | 12 + doc/cups.css | 14 +- doc/help/man-backend.html | 75 ++-- doc/help/man-cancel.html | 32 +- doc/help/man-classes.conf.html | 96 ++--- doc/help/man-client.conf.html | 36 +- doc/help/man-cups-config.html | 62 ++- doc/help/man-cups-deviced.html | 2 +- doc/help/man-cups-driverd.html | 33 +- doc/help/man-cups-files.conf.html | 142 +++---- doc/help/man-cups-lpd.html | 21 +- doc/help/man-cups-snmp.conf.html | 41 +- doc/help/man-cups-snmp.html | 2 +- doc/help/man-cups.html | 130 +++--- doc/help/man-cupsaccept.html | 22 +- doc/help/man-cupsaddsmb.html | 33 +- doc/help/man-cupsctl.html | 50 +-- doc/help/man-cupsd.conf.html | 602 ++++++++++----------------- doc/help/man-cupsd.html | 109 +++-- doc/help/man-cupsenable.html | 37 +- doc/help/man-cupsfilter.html | 76 ++-- doc/help/man-cupstestppd.html | 108 ++--- doc/help/man-filter.html | 167 +++----- doc/help/man-ippfind.html | 303 ++++++-------- doc/help/man-ipptool.html | 115 +++-- doc/help/man-ipptoolfile.html | 529 ++++++++++------------- doc/help/man-lp.html | 167 +++----- doc/help/man-lpadmin.html | 135 +++--- doc/help/man-lpc.html | 25 +- doc/help/man-lpinfo.html | 57 ++- doc/help/man-lpmove.html | 23 +- doc/help/man-lpoptions.html | 47 +-- doc/help/man-lpq.html | 32 +- doc/help/man-lpr.html | 73 ++-- doc/help/man-lprm.html | 24 +- doc/help/man-lpstat.html | 87 ++-- doc/help/man-mailto.conf.html | 27 +- doc/help/man-mime.convs.html | 2 +- doc/help/man-mime.types.html | 59 ++- doc/help/man-notifier.html | 99 ++--- doc/help/man-ppdcfile.html | 191 +++------ doc/help/man-ppdi.html | 2 +- doc/help/man-ppdmerge.html | 2 +- doc/help/man-printers.conf.html | 115 ++--- doc/help/man-subscriptions.conf.html | 62 ++- man/cups.man | 78 ++-- man/cupsd.conf.man.in | 4 +- man/cupsd.man.in | 91 +++- man/mantohtml.c | 128 +++++- 49 files changed, 1964 insertions(+), 2415 deletions(-) diff --git a/doc/cups-printable.css b/doc/cups-printable.css index e8472a777..262e625f4 100644 --- a/doc/cups-printable.css +++ b/doc/cups-printable.css @@ -30,6 +30,18 @@ P.example { margin-left: 36pt; } +DL.man DD { + margin-left: 5em; +} + +DL.man DT { + margin-left: 0; +} + +PRE.man { + margin: 0; +} + PRE.example { background: #eeeeee; border: dotted thin #999999; diff --git a/doc/cups.css b/doc/cups.css index 669f530cc..da6ac1594 100644 --- a/doc/cups.css +++ b/doc/cups.css @@ -133,6 +133,18 @@ P.example { margin-left: 36pt; } +DL.man DD { + margin-left: 5em; +} + +DL.man DT { + margin-left: 0; +} + +PRE.man { + margin: 0; +} + PRE.example { background: white; border: dotted thin #999999; @@ -612,7 +624,7 @@ div.body dd { margin-left: 0; } - PRE.command, PRE.example { + PRE.command, PRE.example, PRE.man { margin-left: 0; white-space: pre-wrap; } diff --git a/doc/help/man-backend.html b/doc/help/man-backend.html index 0c0173e6c..e60bc53b1 100644 --- a/doc/help/man-backend.html +++ b/doc/help/man-backend.html @@ -21,7 +21,7 @@ backend - cups backend transmission interfaces [ filename ] -
+
 
 #include <cups/cups.h>
 
@@ -67,7 +67,7 @@ function. The
 constant defines the file descriptor that should be monitored for incoming requests.
 
Device Discovery

 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"
@@ -80,19 +80,17 @@ function can be used to generate these lines and handle any necessary escaping o
 
The
 device-class
 field is one of the following values:
-
direct
-The device-uri refers to a specific direct-access device with no options, such as a parallel, USB, or SCSI device.
-

-
file
-The device-uri refers to a file on disk.
-

-
network
-The device-uri refers to a networked device and conforms to the general form for
-

+

+
direct
+
The device-uri refers to a specific direct-access device with no options, such as a parallel, USB, or SCSI device.
+
file
+
The device-uri refers to a file on disk.
+
network
+
The device-uri refers to a networked device and conforms to the general form for
 network URIs.
-
serial
-The device-uri refers to a serial device with configurable baud rate and other options. If the device-uri contains a baud value, it represents the maximum baud rate supported by the device.
-

+
serial
+
The device-uri refers to a serial device with configurable baud rate and other options. If the device-uri contains a baud value, it represents the maximum baud rate supported by the device.
+

 
The 
 scheme
 field provides the URI scheme that is supported by the backend. Backends should use this form only when the backend supports any URI using that scheme. The
@@ -114,33 +112,27 @@ field specifies the physical location of the device, which is often used to pre-
 Backends without world read and execute permissions are run as the root user. Otherwise, the backend is run using an unprivileged user account, typically "lp".
 
Exit Status

 The following exit codes are defined for backends:
-
CUPS_BACKEND_OK
-The print file was successfully transmitted to the device or remote server.
-

-
CUPS_BACKEND_FAILED
-

+

+
CUPS_BACKEND_OK
+
The print file was successfully transmitted to the device or remote server.
+
CUPS_BACKEND_FAILED
+


 The print file was not successfully transmitted to the device or remote server. The scheduler will respond to this by canceling the job, retrying the job, or stopping the queue depending on the state of the
-

 printer-error-policy
 attribute.
-
CUPS_BACKEND_AUTH_REQUIRED
-The print file was not successfully transmitted because valid authentication information is required. The scheduler will respond to this by holding the job and adding the 'cups-held-for-authentication' keyword to the "job-reasons" Job Description attribute.
-

-
CUPS_BACKEND_HOLD
-The print file was not successfully transmitted because it cannot be printed at this time. The scheduler will respond to this by holding the job.
-

-
CUPS_BACKEND_STOP
-The print file was not successfully transmitted because it cannot be printed at this time. The scheduler will respond to this by stopping the queue.
-

-
CUPS_BACKEND_CANCEL
-The print file was not successfully transmitted because one or more attributes are not supported or the job was canceled at the printer. The scheduler will respond to this by canceling the job.
-

-
CUPS_BACKEND_RETRY
-The print file was not successfully transmitted because of a temporary issue. The scheduler will retry the job at a future time - other jobs may print before this one.
-

-
CUPS_BACKEND_RETRY_CURRENT
-The print file was not successfully transmitted because of a temporary issue. The scheduler will retry the job immediately without allowing intervening jobs.
-

+
CUPS_BACKEND_AUTH_REQUIRED
+
The print file was not successfully transmitted because valid authentication information is required. The scheduler will respond to this by holding the job and adding the 'cups-held-for-authentication' keyword to the "job-reasons" Job Description attribute.
+
CUPS_BACKEND_HOLD
+
The print file was not successfully transmitted because it cannot be printed at this time. The scheduler will respond to this by holding the job.
+
CUPS_BACKEND_STOP
+
The print file was not successfully transmitted because it cannot be printed at this time. The scheduler will respond to this by stopping the queue.
+
CUPS_BACKEND_CANCEL
+
The print file was not successfully transmitted because one or more attributes are not supported or the job was canceled at the printer. The scheduler will respond to this by canceling the job.
+
CUPS_BACKEND_RETRY
+
The print file was not successfully transmitted because of a temporary issue. The scheduler will retry the job at a future time - other jobs may print before this one.
+
CUPS_BACKEND_RETRY_CURRENT
+
The print file was not successfully transmitted because of a temporary issue. 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
@@ -148,9 +140,10 @@ In addition to the environment variables listed in
 and
 filter(7),
 CUPS backends can expect the following environment variable:
-
DEVICE_URI
-The device URI associated with the printer.
-

+

+
DEVICE_URI
+
The device URI associated with the printer.
+

 
Files

 /etc/cups/cups-files.conf
 
Notes

diff --git a/doc/help/man-cancel.html b/doc/help/man-cancel.html
index 386348c8e..b21860e03 100644
--- a/doc/help/man-cancel.html
+++ b/doc/help/man-cancel.html
@@ -29,31 +29,27 @@ cancel - cancel jobs
 all jobs from the specified destination.
 
Options

 The following options are recognized by cancel:
-
-E
-

-

+

+
-E
+


 Forces encryption when connecting to the server.
-
-U username
-

-

+
-U username
+


 Specifies the username to use when connecting to the server.
-
-a
-

-

+
-a
+


 Cancel all jobs on the named destination, or all jobs on all
 destinations if none is provided.
-
-h hostname[:port]
-

-

+
-h hostname[:port]
+


 Chooses an alternate server.
-
-u username
-

-

+
-u username
+


 Cancels jobs owned by username.
-
-x
-

-

+
-x
+


 Deletes job data files in addition to canceling.
+

 
Compatibility

 Unlike the System V printing system, CUPS allows printer names to
 contain any printable character except SPACE, TAB, "/", or "#".
diff --git a/doc/help/man-classes.conf.html b/doc/help/man-classes.conf.html
index ad2017a2b..e5bf7b5ed 100644
--- a/doc/help/man-classes.conf.html
+++ b/doc/help/man-classes.conf.html
@@ -17,80 +17,62 @@ classes are added or deleted.
 
Each line in the file can be a configuration directive, a blank line,
 or a comment. Comment lines start with the # character.
 
Directives

-
<Class name> ... </Class>
-

-

+

+
<Class name> ... </Class>
+


 Defines a specific printer class.
-
<DefaultClass name> ... </Class>
-

-

+
<DefaultClass name> ... </Class>
+


 Defines a default printer class.
-
Accepting Yes
-

-
Accepting No
-

-

+
Accepting Yes
+
Accepting No
+


 Specifies whether the printer is accepting new jobs.
-
AllowUser [ user @group ... ]
-

-

+
AllowUser [ user @group ... ]
+


 Allows specific users and groups to print to the printer.
-
DenyUser [ user @group ... ]
-

-

+
DenyUser [ user @group ... ]
+


 Prevents specific users and groups from printing to the printer.
-
Info text
-

-

+
Info text
+


 Specifies human-readable text describing the printer.
-
JobSheets banner banner
-

-

+
JobSheets banner banner
+


 Specifies the banner pages to use for the printer.
-
KLimit number
-

-

+
KLimit number
+


 Specifies the job-k-limit value for the printer.
-
Location text
-

-

+
Location text
+


 Specifies human-readable text describing the location of the printer.
-
OpPolicy name
-

-

+
OpPolicy name
+


 Specifies the operation policy for the printer.
-
PageLimit number
-

-

+
PageLimit number
+


 Specifies the job-page-limit value for the printer.
-
Printer
-

-

+
Printer
+


 Specifies a printer that is a member of the printer class.
-
QuotaPeriod seconds
-

-

+
QuotaPeriod seconds
+


 Specifies the job-quota-period value for the printer.
-
Shared Yes
-

-
Shared No
-

-

+
Shared Yes
+
Shared No
+


 Specifies whether the printer is shared.
-
State idle
-

-
State stopped
-

-

+
State idle
+
State stopped
+


 Specifies the initial state of the printer (Idle or Stopped)
-
StateMessage text
-

-

+
StateMessage text
+


 Specifies the message associated with the state.
-
StateTime seconds
-

-

+
StateTime seconds
+


 Specifies the date/time associated with the state.
+

 
See Also

 cupsd(8), cupsd.conf(5), mime.convs(5),
 mime.types(5), printers.conf(5),
diff --git a/doc/help/man-client.conf.html b/doc/help/man-client.conf.html
index bfe9761b0..ec11b96f5 100644
--- a/doc/help/man-client.conf.html
+++ b/doc/help/man-client.conf.html
@@ -18,38 +18,32 @@ the # character.
 
Directives

 The following directives are understood by the client. Consult the
 on-line help for detailed descriptions:
-
Encryption IfRequested
-

-
Encryption Never
-

-
Encryption Required
-

-

+

+
Encryption IfRequested
+
Encryption Never
+
Encryption Required
+


 Specifies the level of encryption that is required for a particular
 location.
-
GSSServiceName name
-

-Specifies the Kerberos service name that is used for authentication, typically
+
GSSServiceName name
+
Specifies the Kerberos service name that is used for authentication, typically
 "host", "http", or "ipp". CUPS adds the remote hostname
 ("name@server.example.com") for you. The default name is
 "http".
-
ServerName hostname-or-ip-address[:port]
-

-
ServerName /domain/socket
-

-

+
ServerName hostname-or-ip-address[:port]
+
ServerName /domain/socket
+


 Specifies the address and optionally the port to use when connecting to the
 server. Note: Not supported on OS X 10.7 or later.
-
ServerName hostname-or-ip-address[:port]/version=1.1
-

-

+
ServerName hostname-or-ip-address[:port]/version=1.1
+


 Specifies the address and optionally the port to use when connecting to a
 server running CUPS 1.3.12 and earlier. Note: Not supported on OS X 10.7 or
 later.
-
User name
-

-

+
User name
+


 Specifies the default user name to use for requests.
+

 
See Also

 http://localhost:631/help
 
Copyright

diff --git a/doc/help/man-cups-config.html b/doc/help/man-cups-config.html
index 5275386ef..744789198 100644
--- a/doc/help/man-cups-config.html
+++ b/doc/help/man-cups-config.html
@@ -50,58 +50,48 @@ used by application developers to determine the necessary command-line
 options for the compiler and linker, as well as determining installation
 directories for filters, configuration files, and drivers.
 
Options

-
--api-version
-

-

+

+
--api-version
+


 Displays the current API version (major.minor).
-
--build
-

-

+
--build
+


 Displays a system-specific build number.
-
--cflags
-

-

+
--cflags
+


 Displays the necessary compiler options.
-
--datadir
-

-

+
--datadir
+


 Displays the default CUPS data directory.
-
--help
-

-

+
--help
+


 Displays the program usage message.
-
--image
-

-

+
--image
+


 When used with --libs, adds the CUPS imaging library to the
 list of displayed libraries.
-
--ldflags
-

-

+
--ldflags
+


 Displays the necessary linker options.
-
--libs
-

-

+
--libs
+


 Displays the necessary librarys to link to.
-
--serverbin
-

-

+
--serverbin
+


 Displays the default CUPS binary directory,
 where filters and backends are stored.
-
--serverroot
-

-

+
--serverroot
+


 Displays the default CUPS configuration file directory.
-
--static
-

-

+
--static
+


 When used with --libs, shows the static libraries instead
 of the default (shared) libraries.
-
--version
-

-

+
--version
+


 Displays the full version number of the CUPS installation
 (major.minor.patch).
+

 
See Also

 http://localhost:631/help
 
Copyright

diff --git a/doc/help/man-cups-deviced.html b/doc/help/man-cups-deviced.html
index b9aef85f5..ee042f768 100644
--- a/doc/help/man-cups-deviced.html
+++ b/doc/help/man-cups-deviced.html
@@ -11,7 +11,7 @@
 cups-deviced - cups device daemon
 
Synopsis

 cups-deviced
-request-id limit user-id options
+request-idlimituser-idoptions
 
Description

 cups-deviced polls the backends in
 /usr/lib/cups/backend or /usr/libexec/cups/backend (OS X) for a
diff --git a/doc/help/man-cups-driverd.html b/doc/help/man-cups-driverd.html
index 691547f66..5ae8ef5dc 100644
--- a/doc/help/man-cups-driverd.html
+++ b/doc/help/man-cups-driverd.html
@@ -16,7 +16,7 @@ cat
 

 cups-driverd
 list
-request_id limit options
+request_idlimitoptions
 
Description

 cups-driverd shows or lists PPD files. It is run in
 response to CUPS-Add-Modify-Printer or CUPS-Get-Devices requests.
@@ -44,14 +44,14 @@ next section.
 
Driver Programs

 Driver programs provide a  interface to dynamically-generated PPD
 files. The following arguments are currently defined:
-
drivername list
-

-

+

+
drivername list
+


 Lists the supported PPD files to stdout.
-
drivername cat ppdname
-

-

+
drivername cat ppdname
+


 Writes the named PPD file to stdout.
+

 
Driver programs MUST NOT query hardware or make other long-term operations that
 would delay the return of a driver list. See the NOTES section below for
 specific recommendations.
@@ -59,7 +59,7 @@ specific recommendations.
 When run with the single argument "list", the program must list
 the available PPD files it can generate to stdout using the
 following format:
-
+
     "drivername:ppdname" language "make" "make and model"
     "drivername:ppdname" language "make" "make and model" "1284 device id"
     "drivername:ppdname" language "make" "make and model" "1284 device id" "(PPD product)"
@@ -85,18 +85,17 @@ any output to stdout and report the error to stderr instead.
 
Driver Error Messages

 Error messages can be relayed back to cupsd by writing them
 to stderr. The following prefixes are recognized:
-
DEBUG: [drivername]
-

-

+

+
DEBUG: [drivername]
+


 Debugging messages
-
ERROR: [drivername]
-

-

+
ERROR: [drivername]
+


 Error messages
-
INFO: [drivername]
-

-

+
INFO: [drivername]
+


 Informational messages
+

 
Notes

 Due to performance considerations, driver programs have been officially
 deprecated and should not be used for new development. Currently only the
diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
index 1c2ecc121..f23cbdbd0 100644
--- a/doc/help/man-cups-files.conf.html
+++ b/doc/help/man-cups-files.conf.html
@@ -18,123 +18,93 @@ or a comment. Comment lines start with the # character.
 
Directives

 The following directives are understood by cupsd(8). Consult the
 on-line help for detailed descriptions:
-
AccessLog filename
-

-
AccessLog syslog
-

-

+

+
AccessLog filename
+
AccessLog syslog
+


 Defines the access log filename.
-
ConfigFilePerm mode
-

-

+
ConfigFilePerm mode
+


 Specifies the permissions for all configuration files that the scheduler
 writes.
-
DataDir path
-

-

+
DataDir path
+


 Specified the directory where data files can be found.
-
DocumentRoot directory
-

-

+
DocumentRoot directory
+


 Specifies the root directory for the internal web server documents.
-
ErrorLog filename
-

-
ErrorLog syslog
-

-

+
ErrorLog filename
+
ErrorLog syslog
+


 Specifies the error log filename.
-
FatalErrors none
-

-
FatalErrors all -kind [... -kind]
-

-
FatalErrors kind [... kind]
-

-

+
FatalErrors none
+
FatalErrors all -kind [... -kind]
+
FatalErrors kind [... kind]
+


 Specifies which errors are fatal, causing the scheduler to exit. "Kind" is
 "browse", "config", "listen", "log", or "permissions".
-
FileDevice Yes
-

-
FileDevice No
-

-

+
FileDevice Yes
+
FileDevice No
+


 Specifies whether the file pseudo-device can be used for new
 printer queues.
-
FontPath directory[:directory:...]
-

-

+
FontPath directory[:directory:...]
+


 Specifies the search path for fonts.
-
Group group-name-or-number
-

-

+
Group group-name-or-number
+


 Specifies the group name or ID that will be used when executing
 external programs.
-
LogFilePerm mode
-

-

+
LogFilePerm mode
+


 Specifies the permissions for all log files that the scheduler writes.
-
PageLog filename
-

-
PageLog syslog
-

-

+
PageLog filename
+
PageLog syslog
+


 Specifies the page log filename.
-
Printcap
-

-
Printcap filename
-

-

+
Printcap
+
Printcap filename
+


 Specifies the filename for a printcap file that is updated
 automatically with a list of available printers (needed for
 legacy applications); specifying Printcap with no filename
 disables printcap generation.
-
RemoteRoot user-name
-

-

+
RemoteRoot user-name
+


 Specifies the username that is associated with unauthenticated root
 accesses.
-
RequestRoot directory
-

-

+
RequestRoot directory
+


 Specifies the directory to store print jobs and other HTTP request
 data.
-
Sandboxing off
-

-
Sandboxing relaxed
-

-
Sandboxing strict
-

-Specifies the level of security sandboxing that is applied to print filters, backends, and other child processes of the scheduler. The default is "strict". (OS X only)
-
ServerBin directory
-

-

+
Sandboxing off
+
Sandboxing relaxed
+
Sandboxing strict
+
Specifies the level of security sandboxing that is applied to print filters, backends, and other child processes of the scheduler. The default is "strict". (OS X only)
+
ServerBin directory
+


 Specifies the directory where backends, CGIs, daemons, and filters may
 be found.
-
ServerKeychain path
-

-

+
ServerKeychain path
+


 Specifies the location of TLS certificates and private keys.
-
ServerRoot directory
-

-

+
ServerRoot directory
+


 Specifies the directory where the server configuration files can be found.
-
SyncOnClose Yes
-

-
SyncOnClose No
-

-Specifies whether the scheduler calls fsync(2) after writing configuration
+
SyncOnClose Yes
+
SyncOnClose No
+
Specifies whether the scheduler calls fsync(2) after writing configuration
 or state files. The default is No.
-
SystemGroup group-name [group-name ...]
-

-

+
SystemGroup group-name [group-name ...]
+


 Specifies the group(s) to use for System class authentication.
-
TempDir directory
-

-

+
TempDir directory
+


 Specifies the directory where temporary files are stored.
-
User user-name
-

-

+
User user-name
+


 Specifies the user name or ID that is used when running external programs.
+

 
See Also

 classes.conf(5), cupsd(8), cupsd.conf(5), mime.convs(5),
 mime.types(5), printers.conf(5),
diff --git a/doc/help/man-cups-lpd.html b/doc/help/man-cups-lpd.html
index 279ca5114..347a18c87 100644
--- a/doc/help/man-cups-lpd.html
+++ b/doc/help/man-cups-lpd.html
@@ -25,7 +25,7 @@ daemon but instead operates using the Internet "super-server"
 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
@@ -36,7 +36,7 @@ inetd.conf file.
 
If you are using the newer xinetd(8) daemon, create a file
 named /etc/xinetd.d/cups containing the following lines:
 

-
+
 
     service printer
     {
@@ -51,24 +51,23 @@ named /etc/xinetd.d/cups containing the following lines:
     }
 

 
Options

-
-h hostname[:port]
-

-

+

+
-h hostname[:port]
+


 Sets the CUPS server (and port) to use.
-
-n
-

-

+
-n
+


 Disables reverse address lookups; normally cups-lpd will
 try to discover the hostname of the client via a reverse DNS
 lookup.
-
-o name=value
-

-

+
-o name=value
+


 Inserts options for all print queues. Most often this is used to
 disable the "l" filter so that remote print jobs are filtered as
 needed for printing; the examples in the previous section set the
 "document-format" option to "application/octet-stream" which
 forces autodetection of the print file format.
+

 
Performance

 cups-lpd performs well with small numbers of clients and
 printers. However, since a new process is created for each
diff --git a/doc/help/man-cups-snmp.conf.html b/doc/help/man-cups-snmp.conf.html
index 8ce0b7dcf..6c7878704 100644
--- a/doc/help/man-cups-snmp.conf.html
+++ b/doc/help/man-cups-snmp.conf.html
@@ -21,45 +21,38 @@ apply only to the SNMP backend (cups-snmp(8)).
 
Directives

 The following directives are understood by the CUPS network backends. Consult
 the on-line help for detailed descriptions:
-
Address @IF(name)
-

-
Address @LOCAL
-

-
Address address
-

-

+

+
Address @IF(name)
+
Address @LOCAL
+
Address address
+


 Sends SNMP broadcast queries to the specified address(es). There is no default
 for the broadcast address.
-
Community name
-

-

+
Community name
+


 Specifies the community name to use. Only a single community name may be
 specified. The default community name is "public".
-
DebugLevel number
-

-

+
DebugLevel number
+


 Specifies the logging level from 0 (none) to 3 (everything). Typically only used
 for debugging (thus the name). The default debug level is 0.
-
DeviceURI "regular expression" device-uri [... device-uri]
-

-

+
DeviceURI "regular expression" device-uri [... device-uri]
+


 Specifies one or more device URIs that should be used for a given make and model
 string. The regular expression is used to match the detected make and model, and
 the device URI strings must be of the form "scheme://%s[:port]/[path]", where
 "%s" represents the detected address or hostname. There are no default device
 URI matching rules.
-
HostNameLookups on
-

-
HostNameLookups off
-

-

+
HostNameLookups on
+
HostNameLookups off
+


 Specifies whether the addresses of printers should be converted to hostnames or
 left as numeric IP addresses. The default is "off".
-
MaxRunTime seconds
-

-

+
MaxRunTime seconds
+


 Specifies the maximum number of seconds that the SNMP backend will scan the
 network for printers. The default is 120 seconds (2 minutes).
+

 
See Also

 cups-snmp(8),
 

diff --git a/doc/help/man-cups-snmp.html b/doc/help/man-cups-snmp.html
index aa80807b6..7d3aeedfa 100644
--- a/doc/help/man-cups-snmp.html
+++ b/doc/help/man-cups-snmp.html
@@ -16,7 +16,7 @@ snmp - cups snmp backend
 /usr/libexec/cups/backend/snmp
 ip-address-or-hostname
 

-lpinfo -v --include-schemes snmp
+lpinfo-v--include-schemessnmp
 
Description

 The CUPS SNMP backend provides legacy discovery and identification of network
 printers using SNMPv1. When used for discovery through the scheduler, the
diff --git a/doc/help/man-cups.html b/doc/help/man-cups.html
index f0f520d74..b3ee86cd2 100644
--- a/doc/help/man-cups.html
+++ b/doc/help/man-cups.html
@@ -30,13 +30,9 @@ gets a job for printing, it determines the best programs (filters, printer drive
 CUPS
 removes the job from the queue and moves on to any other jobs you have submitted. You can also be notified when the job is finished, or if there are any errors during printing, in several different ways.
 
Where Do I Begin?

-The easiest way to start is by using the
-CUPS
-web interface to configure your printer. Go to "http://localhost:631" and choose the Administration tab at the top of the page. Click/press on the Add Printer button and follow the prompts.
+The easiest way to start is by using the web interface to configure your printer. Go to "http://localhost:631" and choose the Administration tab at the top of the page. Click/press on the Add Printer button and follow the prompts.
 
When you are asked for a username and password, enter your login username and password or the "root" username and password.
-
After the printer is added,
-CUPS
-will ask you to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click on the Set Default Options button to save them. Some printers also support auto-configuration - click on the Query Printer for Default Options button to update the options automatically.
+
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)
@@ -49,75 +45,75 @@ Additionally, your operating system may include graphical user interfaces or aut
 The
 CUPS
 web site (http://www.CUPS.org) provides access to the
-CUPS
-user mailing list, additional documentation and resources, and a bug report database. Most vendors also provide online discussion forums to ask printing questions for your operating system of choice.
+cups
+and
+cups-devel
+mailing lists, additional documentation and resources, and a bug report database. Most vendors also provide online discussion forums to ask printing questions for your operating system of choice.
 
Environment

 CUPS
 commands use the following environment variables to override the default locations of files and so forth. For security reasons, these environment variables are ignored for setuid programs:
-
CUPS_SERVER
-

-The hostname/IP address and port number of the CUPS scheduler (hostname:port or ipaddress:port).
-
CUPS_ANYROOT
-

-Whether to allow any X.509 certificate root (Y or N).
-
CUPS_CACHEDIR
-

-The directory where semi-persistent cache files can be found.
-
CUPS_DATADIR
-

-The directory where data files can be found.
-
CUPS_ENCRYPTION
-

-The default level of encryption (Always, IfRequested, Never, Required).
-
CUPS_EXPIREDROOT
-

-Whether to allow expired X.509 certificate roots (Y or N).
-
CUPS_EXPIREDCERTS
-

-Whether to allow expired X.509 certificates (Y or N).
-
CUPS_GSSSERVICENAME
-

-The Kerberos service name used for authentication.
-
CUPS_SERVERBIN
-

-The directory where server helper programs, filters, backend, etc. can be found.
-
CUPS_SERVERROOT
-

-The root directory of the server.
-
CUPS_STATEDIR
-

-The directory where state files can be found.
-
CUPS_USER
-

-Specifies the name of the user for print requests.
-
HOME
-

-Specifies the home directory of the current user.
-
IPP_PORT
-

-Specifies the default port number for IPP requests.
-
LOCALEDIR
-

-Specifies the location of localization files.
-
LPDEST
-

-Specifies the default print queue (System V standard).
-
PRINTER
-

-Specifies the default print queue (Berkeley standard).
-
TMPDIR
-

-Specifies the location of temporary files.
+

+
CUPS_ANYROOT
+
Whether to allow any X.509 certificate root (Y or N).
+
CUPS_CACHEDIR
+
The directory where semi-persistent cache files can be found.
+
CUPS_DATADIR
+
The directory where data files can be found.
+
CUPS_ENCRYPTION
+
The default level of encryption (Always, IfRequested, Never, Required).
+
CUPS_EXPIREDROOT
+
Whether to allow expired X.509 certificate roots (Y or N).
+
CUPS_EXPIREDCERTS
+
Whether to allow expired X.509 certificates (Y or N).
+
CUPS_GSSSERVICENAME
+
The Kerberos service name used for authentication.
+
CUPS_SERVER
+
The hostname/IP address and port number of the CUPS scheduler (hostname:port or ipaddress:port).
+
CUPS_SERVERBIN
+
The directory where server helper programs, filters, backend, etc. can be found.
+
CUPS_SERVERROOT
+
The root directory of the server.
+
CUPS_STATEDIR
+
The directory where state files can be found.
+
CUPS_USER
+
Specifies the name of the user for print requests.
+
HOME
+
Specifies the home directory of the current user.
+
IPP_PORT
+
Specifies the default port number for IPP requests.
+
LOCALEDIR
+
Specifies the location of localization files.
+
LPDEST
+
Specifies the default print queue (System V standard).
+
PRINTER
+
Specifies the default print queue (Berkeley standard).
+
TMPDIR
+
Specifies the location of temporary files.
+

 
Files

-~/.cups/client.conf, ~/.cups/lpoptions
+
+~/.cups/client.conf
+~/.cups/lpoptions
+

 
Conforming To

 CUPS
 conforms to the Internet Printing Protocol version 2.1 and implements the Berkeley and System V UNIX print commands.
 
See Also

-cancel(1), client.conf(7), cupsctl(8), cupsd(8), lp(1), lpadmin(8), lpinfo(8), lpoptions(1), lpr(1), lprm(1), lpq(1), lpstat(1),
-http://localhost:631/help,
-http://www.CUPS.org,
-http://www.pwg.org/ipp
+cancel(1),
+client.conf(7),
+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),
+CUPS Web Site (http://www.CUPS.org),
+PWG Internet Printing Protocol Workgroup (http://www.pwg.org/ipp)
 
Copyright

 Copyright © 2007-2014 by Apple Inc.
 
diff --git a/doc/help/man-cupsaccept.html b/doc/help/man-cupsaccept.html
index bf2876ca1..8145e09d4 100644
--- a/doc/help/man-cupsaccept.html
+++ b/doc/help/man-cupsaccept.html
@@ -34,23 +34,21 @@ print jobs. If not specified the reason defaults to "Reason Unknown".
 
Options

 The following options are supported by both cupsaccept and
 cupsreject:
-
-E
-

-

+

+
-E
+


 Forces encryption when connecting to the server.
-
-U username
-

-

+
-U username
+


 Sets the username that is sent when connecting to the server.
-
-h hostname[:port]
-

-

+
-h hostname[:port]
+


 Chooses an alternate server.
-
-r "reason"
-

-

+
-r "reason"
+


 Sets the reason string that is shown for a printer that is
 rejecting jobs.
+

 
Compatibility

 Unlike the System V printing system, CUPS allows printer names to
 contain any printable character except SPACE, TAB, "/", or "#".
diff --git a/doc/help/man-cupsaddsmb.html b/doc/help/man-cupsaddsmb.html
index abe6439e0..2f9285d87 100644
--- a/doc/help/man-cupsaddsmb.html
+++ b/doc/help/man-cupsaddsmb.html
@@ -38,32 +38,29 @@ driver files described below.
 
 
Options

 cupsaddsmb supports the following options:
-
-H samba-server
-

-

+

+
-H samba-server
+


 Specifies the SAMBA server which defaults to the CUPS server.
-
-U samba-user[%samba-password]
-

-

+
-U samba-user[%samba-password]
+


 Specifies the SAMBA print admin username which defaults to your
 current username. If the username contains a percent (%)
 character, then the text following the percent is treated as the
 SAMBA password to use.
-
-a
-

-

+
-a
+


 Exports all known printers. Otherwise only the named printers are
 exported.
-
-h cups-server[:port]
-

-

+
-h cups-server[:port]
+


 Specifies a different CUPS server to use.
-
-v
-

-

+
-v
+


 Specifies that verbose information should be shown. This is
 useful for debugging SAMBA configuration problems.
 
+

 
Samba Configuration

 cupsaddsmb uses the new RPC-based printing support in
 SAMBA 2.2.x to provide printer drivers and PPD files to Windows
@@ -71,7 +68,7 @@ client machines. In order to use this functionality, you must
 first configure the SAMBA smb.conf(5) file to support
 printing through CUPS and provide a printer driver download
 share, as follows:
-
+
 
     [global]
 	load printers = yes
@@ -115,7 +112,7 @@ for Windows 2000 are identical.
 to the /usr/share/cups/drivers directory and the 64-bit
 drivers to the /usr/share/cups/drivers/x64 directory exactly
 as named below:
-
+
 
     [Windows 2000 and higher]
     ps5ui.dll
@@ -136,7 +133,7 @@ job-hold-until options.
 
Once you have installed the driver on a Windows system, copy the
 following files to the /usr/share/cups/drivers directory
 exactly as named below:
-
+
 
     [Windows 95, 98, and Me]
     ADFONTS.MFM
diff --git a/doc/help/man-cupsctl.html b/doc/help/man-cupsctl.html
index 5fd83d2b7..a15de3cc8 100644
--- a/doc/help/man-cupsctl.html
+++ b/doc/help/man-cupsctl.html
@@ -26,53 +26,47 @@ no changes are requested, the current configuration values are written to the
 standard output in the format "name=value", one per line.
 
Options

 The following options are recognized:
-
-E
-

-

+

+
-E
+


 Enables encryption on the connection to the scheduler.
-
-U username
-

-

+
-U username
+


 Specifies an alternate username to use when authenticating with the scheduler.
-
-h server[:port]
-

-

+
-h server[:port]
+


 Specifies the server address.
-
--[no-]debug-logging
-

-

+
--[no-]debug-logging
+


 Enables or disables debug logging in the error_log file.
-
--[no-]remote-admin
-

-

+
--[no-]remote-admin
+


 Enables or disables remote administration.
-
--[no-]remote-any
-

-

+
--[no-]remote-any
+


 Enables or disables printing from any address, e.g. the Internet.
-
--[no-]share-printers
-

-

+
--[no-]share-printers
+


 Enables or disables sharing of local printers with other computers.
-
--[no-]user-cancel-any
-

-

+
--[no-]user-cancel-any
+


 Allows or prevents users from canceling jobs owned by others.
+

 
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

diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
index 57ebcd933..c6c71fe62 100644
--- a/doc/help/man-cupsd.conf.html
+++ b/doc/help/man-cupsd.conf.html
@@ -14,424 +14,284 @@ The
 cupsd.conf
 file configures the CUPS scheduler,
 cupsd(8).
-It is normally located in the /etc/cups directory. Note: 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) instead in order to prevent certain types of privilege escalation attacks.
+It is normally located in the
+/etc/cups
+directory. Note: 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) instead in order to prevent certain types of privilege escalation attacks.
 
Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character. The configuration directives are intentionally similar to those used by the popular Apache web server software and are described below.
 
Top-level Directives

 The following directives are understood by
 cupsd(8).
 Consult the online help (http://localhost:631/help) for detailed descriptions:
-
AccessLogLevel config
-

-
AccessLogLevel actions
-

-
AccessLogLevel all
-

-Specifies the logging level for the AccessLog file.
-
AutoPurgeJobs Yes
-

-
AutoPurgeJobs No
-

-

+

+
AccessLogLevel config
+
AccessLogLevel actions
+
AccessLogLevel all
+
Specifies the logging level for the AccessLog file.
+
AutoPurgeJobs Yes
+
AutoPurgeJobs No
+


 Specifies whether to purge job history data automatically when
 it is no longer required for quotas.
-
BrowseLocalProtocols [
-

-All
+
BrowseLocalProtocols [
+
All
 ] [
 DNSSD
 ]
 Specifies the protocols to use for local printer sharing.
-
BrowseWebIF Yes
-

-
BrowseWebIF No
-

-

+
BrowseWebIF Yes
+
BrowseWebIF No
+


 Specifies whether the CUPS web interface is advertised via DNS-SD.
-
Browsing Yes
-

-
Browsing No
-

-

+
Browsing Yes
+
Browsing No
+


 Specifies whether or not shared printers should be advertised.
-
Classification banner
-

-

+
Classification banner
+


 Specifies the security classification of the server.
-
ClassifyOverride Yes
-

-
ClassifyOverride No
-

-

+
ClassifyOverride Yes
+
ClassifyOverride No
+


 Specifies whether to allow users to override the classification
 of individual print jobs.
-
DefaultAuthType Basic
-

-
DefaultAuthType Negotiate
-

-

+
DefaultAuthType Basic
+
DefaultAuthType Negotiate
+


 Specifies the default type of authentication to use.
-
DefaultEncryption Never
-

-
DefaultEncryption IfRequested
-

-
DefaultEncryption Required
-

-Specifies the type of encryption to use for authenticated requests.
-
DefaultLanguage locale
-

-Specifies the default language to use for text and web content.
-
DefaultPaperSize Auto
-

-
DefaultPaperSize None
-

-
DefaultPaperSize sizename
-

-Specifies the default paper size for new print queues. "Auto" uses a locale-
+
DefaultEncryption Never
+
DefaultEncryption IfRequested
+
DefaultEncryption Required
+
Specifies the type of encryption to use for authenticated requests.
+
DefaultLanguage locale
+
Specifies the default language to use for text and web content.
+
DefaultPaperSize Auto
+
DefaultPaperSize None
+
DefaultPaperSize sizename
+
Specifies the default paper size for new print queues. "Auto" uses a locale-
 specific default, while "None" specifies there is no default paper size.
-
DefaultPolicy policy-name
-

-Specifies the default access policy to use.
-
DefaultShared Yes
-

-
DefaultShared No
-

-Specifies whether local printers are shared by default.
-
DirtyCleanInterval seconds
-

-Specifies the delay for updating of configuration and state files. A value of 0
+
DefaultPolicy policy-name
+
Specifies the default access policy to use.
+
DefaultShared Yes
+
DefaultShared No
+
Specifies whether local printers are shared by default.
+
DirtyCleanInterval seconds
+
Specifies the delay for updating of configuration and state files. A value of 0
 causes the update to happen as soon as possible, typically within a few
 milliseconds.
-
FilterLimit limit
-

-Specifies the maximum cost of filters that are run concurrently.
-
FilterNice nice-value
-

-Specifies the scheduling priority ("nice" value) of filters that
+
FilterLimit limit
+
Specifies the maximum cost of filters that are run concurrently.
+
FilterNice nice-value
+
Specifies the scheduling priority ("nice" value) of filters that
 are run to print a job.
-
GSSServiceName name
-

-Specifies the service name when using Kerberos authentication. The default
+
GSSServiceName name
+
Specifies the service name when using Kerberos authentication. The default
 service name is "http".
-
HostNameLookups On
-

-
HostNameLookups Off
-

-
HostNameLookups Double
-

-Specifies whether or not to do reverse lookups on client addresses.
-
Include filename
-

-Includes the named file.
-
JobKillDelay seconds
-

-Specifies the number of seconds to wait before killing the filters and backend
+
HostNameLookups On
+
HostNameLookups Off
+
HostNameLookups Double
+
Specifies whether or not to do reverse lookups on client addresses.
+
Include filename
+
Includes the named file.
+
JobKillDelay seconds
+
Specifies the number of seconds to wait before killing the filters and backend
 associated with a canceled or held job.
-
JobRetryInterval seconds
-

-Specifies the interval between retries of jobs in seconds.
-
JobRetryLimit count
-

-Specifies the number of retries that are done for jobs.
-
KeepAlive Yes
-

-
KeepAlive No
-

-Specifies whether to support HTTP keep-alive connections.
-
KeepAliveTimeout seconds
-

-Specifies the amount of time that connections are kept alive.
-
<Limit operations> ... </Limit>
-

-Specifies the IPP operations that are being limited inside a policy.
-
<Limit methods> ... </Limit>
-

-
<LimitExcept methods> ... </LimitExcept>
-

-Specifies the HTTP methods that are being limited inside a location.
-
LimitRequestBody
-

-Specifies the maximum size of any print job request.
-
Listen ip-address:port
-

-
Listen *:port
-

-
Listen /path/to/domain/socket
-

-Listens to the specified address and port or domain socket path.
-
<Location /path> ... </Location>
-

-Specifies access control for the named location.
-
LogDebugHistory #-messages
-

-Specifies the number of debugging messages that are logged when an error
+
JobRetryInterval seconds
+
Specifies the interval between retries of jobs in seconds.
+
JobRetryLimit count
+
Specifies the number of retries that are done for jobs.
+
KeepAlive Yes
+
KeepAlive No
+
Specifies whether to support HTTP keep-alive connections.
+
KeepAliveTimeout seconds
+
Specifies the amount of time that connections are kept alive.
+
<Limit operations> ... </Limit>
+
Specifies the IPP operations that are being limited inside a policy.
+
<Limit methods> ... </Limit>
+
<LimitExcept methods> ... </LimitExcept>
+
Specifies the HTTP methods that are being limited inside a location.
+
LimitRequestBody
+
Specifies the maximum size of any print job request.
+
Listen ip-address:port
+
Listen *:port
+
Listen /path/to/domain/socket
+
Listens to the specified address and port or domain socket path.
+
<Location /path> ... </Location>
+
Specifies access control for the named location.
+
LogDebugHistory #-messages
+
Specifies the number of debugging messages that are logged when an error
 occurs in a print job.
-
LogLevel alert
-

-
LogLevel crit
-

-
LogLevel debug2
-

-
LogLevel debug
-

-
LogLevel emerg
-

-
LogLevel error
-

-
LogLevel info
-

-
LogLevel none
-

-
LogLevel notice
-

-
LogLevel warn
-

-Specifies the logging level for the ErrorLog file.
-
LogTimeFormat standard
-

-
LogTimeFormat usecs
-

-Specifies the format of the date and time in the log files.
-
MaxClients number
-

-Specifies the maximum number of simultaneous clients to support.
-
MaxClientsPerHost number
-

-Specifies the maximum number of simultaneous clients to support from a
+
LogLevel alert
+
LogLevel crit
+
LogLevel debug2
+
LogLevel debug
+
LogLevel emerg
+
LogLevel error
+
LogLevel info
+
LogLevel none
+
LogLevel notice
+
LogLevel warn
+
Specifies the logging level for the ErrorLog file.
+
LogTimeFormat standard
+
LogTimeFormat usecs
+
Specifies the format of the date and time in the log files.
+
MaxClients number
+
Specifies the maximum number of simultaneous clients to support.
+
MaxClientsPerHost number
+
Specifies the maximum number of simultaneous clients to support from a
 single address.
-
MaxCopies number
-

-Specifies the maximum number of copies that a user can print of each job.
-
MaxHoldTime seconds
-

-Specifies the maximum time a job may remain in the "indefinite" hold state
+
MaxCopies number
+
Specifies the maximum number of copies that a user can print of each job.
+
MaxHoldTime seconds
+
Specifies the maximum time a job may remain in the "indefinite" hold state
 before it is canceled. Set to 0 to disable cancellation of held jobs.
-
MaxJobs number
-

-Specifies the maximum number of simultaneous jobs to support.
-
MaxJobsPerPrinter number
-

-Specifies the maximum number of simultaneous jobs per printer to support.
-
MaxJobsPerUser number
-

-Specifies the maximum number of simultaneous jobs per user to support.
-
MaxJobTime seconds
-

-Specifies the maximum time a job may take to print before it is canceled. The
+
MaxJobs number
+
Specifies the maximum number of simultaneous jobs to support.
+
MaxJobsPerPrinter number
+
Specifies the maximum number of simultaneous jobs per printer to support.
+
MaxJobsPerUser number
+
Specifies the maximum number of simultaneous jobs per user to support.
+
MaxJobTime seconds
+
Specifies the maximum time a job may take to print before it is canceled. The
 default is 10800 seconds (3 hours). Set to 0 to disable cancellation of "stuck"
 jobs.
-
MaxLogSize number-bytes
-

-Specifies the maximum size of the log files before they are
+
MaxLogSize number-bytes
+
Specifies the maximum size of the log files before they are
 rotated (0 to disable rotation)
-
MaxRequestSize number-bytes
-

-Specifies the maximum request/file size in bytes (0 for no limit)
-
MultipleOperationTimeout seconds
-

-Specifies the maximum amount of time to allow between files in a multiple file
+
MaxRequestSize number-bytes
+
Specifies the maximum request/file size in bytes (0 for no limit)
+
MultipleOperationTimeout seconds
+
Specifies the maximum amount of time to allow between files in a multiple file
 print job.
-
PageLogFormat format string
-

-Specifies the format of page log lines.
-
PassEnv variable [... variable]
-

-Passes the specified environment variable(s) to child processes.
-
<Policy name> ... </Policy>
-

-Specifies access control for the named policy.
-
Port number
-

-Specifies a port number to listen to for HTTP requests.
-
PreserveJobFiles Yes
-

-
PreserveJobFiles No
-

-Specifies whether or not to preserve job files after they are printed.
-
PreserveJobHistory Yes
-

-
PreserveJobHistory No
-

-Specifies whether or not to preserve the job history after they are
+
PageLogFormat format string
+
Specifies the format of page log lines.
+
PassEnv variable [... variable]
+
Passes the specified environment variable(s) to child processes.
+
<Policy name> ... </Policy>
+
Specifies access control for the named policy.
+
Port number
+
Specifies a port number to listen to for HTTP requests.
+
PreserveJobFiles Yes
+
PreserveJobFiles No
+
Specifies whether or not to preserve job files after they are printed.
+
PreserveJobHistory Yes
+
PreserveJobHistory No
+
Specifies whether or not to preserve the job history after they are
 printed.
-
PrintcapFormat bsd
-

-
PrintcapFormat plist
-

-
PrintcapFormat solaris
-

-Specifies the format of the printcap file.
-
ReloadTimeout seconds
-

-Specifies the amount of time to wait for job completion before
+
PrintcapFormat bsd
+
PrintcapFormat plist
+
PrintcapFormat solaris
+
Specifies the format of the printcap file.
+
ReloadTimeout seconds
+
Specifies the amount of time to wait for job completion before
 restarting the scheduler.
-
RIPCache bytes
-

-Specifies the maximum amount of memory to use when converting images
+
RIPCache bytes
+
Specifies the maximum amount of memory to use when converting images
 and PostScript files to bitmaps for a printer.
-
Satisfy all
-

-
Satisfy any
-

-Specifies whether all or any limits set for a Location must be
+
Satisfy all
+
Satisfy any
+
Specifies whether all or any limits set for a Location must be
 satisfied to allow access.
-
ServerAdmin user@domain.com
-

-Specifies the email address of the server administrator.
-
ServerAlias hostname [... hostname]
-

-
ServerAlias *
-

-Specifies an alternate name that the server is known by. The special name "*"
+
ServerAdmin user@domain.com
+
Specifies the email address of the server administrator.
+
ServerAlias hostname [... hostname]
+
ServerAlias *
+
Specifies an alternate name that the server is known by. The special name "*"
 allows any name to be used.
-
ServerName hostname-or-ip-address
-

-Specifies the fully-qualified hostname of the server.
-
ServerTokens Full
-

-
ServerTokens Major
-

-
ServerTokens Minimal
-

-
ServerTokens Minor
-

-
ServerTokens None
-

-
ServerTokens OS
-

-
ServerTokens ProductOnly
-

-Specifies what information is included in the Server header of HTTP
+
ServerName hostname-or-ip-address
+
Specifies the fully-qualified hostname of the server.
+
ServerTokens Full
+
ServerTokens Major
+
ServerTokens Minimal
+
ServerTokens Minor
+
ServerTokens None
+
ServerTokens OS
+
ServerTokens ProductOnly
+
Specifies what information is included in the Server header of HTTP
 responses.
-
SetEnv variable value
-

-Set the specified environment variable to be passed to child processes.
-
SSLListen
-

-Listens on the specified address and port for encrypted connections.
-
SSLPort
-

-Listens on the specified port for encrypted connections.
-
StrictConformance Yes
-

-
StrictConformance No
-

-Specifies whether the scheduler requires clients to strictly adhere to the IPP
+
SetEnv variable value
+
Set the specified environment variable to be passed to child processes.
+
SSLListen
+
Listens on the specified address and port for encrypted connections.
+
SSLPort
+
Listens on the specified port for encrypted connections.
+
StrictConformance Yes
+
StrictConformance No
+
Specifies whether the scheduler requires clients to strictly adhere to the IPP
 specifications. The default is No.
-
Timeout seconds
-

-Specifies the HTTP request timeout in seconds.
-
WebInterface yes
-

-
WebInterface no
-

-Specifies whether the web interface is enabled.
+
Timeout seconds
+
Specifies the HTTP request timeout in seconds.
+
WebInterface yes
+
WebInterface no
+
Specifies whether the web interface is enabled.
+

 
Directives Valid Within Location And Limit Sections

 The following directives may be placed inside Location and Limit sections in the cupsd.conf file:
-
Allow all
-

-
Allow none
-

-
Allow host.domain.com
-

-
Allow *.domain.com
-

-
Allow ip-address
-

-
Allow ip-address/netmask
-

-
Allow ip-address/mm
-

-
Allow @IF(name)
-

-
Allow @LOCAL
-

-Allows access from the named hosts or addresses.
-
AuthType None
-

-
AuthType Basic
-

-
AuthType Negotiate
-

-Specifies the authentication type (None, Basic, or Negotiate)
-
Deny all
-

-
Deny none
-

-
Deny host.domain.com
-

-
Deny *.domain.com
-

-
Deny ip-address
-

-
Deny ip-address/netmask
-

-
Deny ip-address/mm
-

-
Deny @IF(name)
-

-
Deny @LOCAL
-

-Denies access to the named host or address.
-
Encryption IfRequested
-

-
Encryption Never
-

-
Encryption Required
-

-Specifies the level of encryption that is required for a particular
+

+
Allow all
+
Allow none
+
Allow host.domain.com
+
Allow *.domain.com
+
Allow ip-address
+
Allow ip-address/netmask
+
Allow ip-address/mm
+
Allow @IF(name)
+
Allow @LOCAL
+
Allows access from the named hosts or addresses.
+
AuthType None
+
AuthType Basic
+
AuthType Negotiate
+
Specifies the authentication type (None, Basic, or Negotiate)
+
Deny all
+
Deny none
+
Deny host.domain.com
+
Deny *.domain.com
+
Deny ip-address
+
Deny ip-address/netmask
+
Deny ip-address/mm
+
Deny @IF(name)
+
Deny @LOCAL
+
Denies access to the named host or address.
+
Encryption IfRequested
+
Encryption Never
+
Encryption Required
+
Specifies the level of encryption that is required for a particular
 location.
-
Order allow,deny
-

-
Order deny,allow
-

-Specifies the order of HTTP access control (allow,deny or deny,allow)
-
Require group group-name-list
-

-
Require user user-name-list
-

-
Require valid-user
-

-Specifies that user or group authentication is required.
+
Order allow,deny
+
Order deny,allow
+
Specifies the order of HTTP access control (allow,deny or deny,allow)
+
Require group group-name-list
+
Require user user-name-list
+
Require valid-user
+
Specifies that user or group authentication is required.
+

 
Directives Valid Within Policy Sections

 The following directives may be placed inside Policy sections in the cupsd.conf file:
-
JobPrivateAccess all
-

-
JobPrivateAccess default
-

-
JobPrivateAccess {user|@group|@ACL|@OWNER|@SYSTEM}+
-

-Specifies an access list for a job's private values. The "default" access list is "@OWNER @SYSTEM". "@ACL" maps to the printer's requesting-user-name-allowed or requesting-user-name-denied values.
-
JobPrivateValues all
-

-
JobPrivateValues default
-

-
JobPrivateValues none
-

-
JobPrivateValues attribute-name-1 [ ... attribute-name-N ]
-

-Specifies the list of job values to make private. The "default" values are "job-name", "job-originating-host-name", and "job-originating-user-name".
-
SubscriptionPrivateAccess all
-

-
SubscriptionPrivateAccess default
-

-
SubscriptionPrivateAccess {user|@group|@ACL|@OWNER|@SYSTEM}+
-

-Specifies an access list for a subscription's private values. The "default"
+

+
JobPrivateAccess all
+
JobPrivateAccess default
+
JobPrivateAccess {user|@group|@ACL|@OWNER|@SYSTEM}+
+
Specifies an access list for a job's private values. The "default" access list is "@OWNER @SYSTEM". "@ACL" maps to the printer's requesting-user-name-allowed or requesting-user-name-denied values.
+
JobPrivateValues all
+
JobPrivateValues default
+
JobPrivateValues none
+
JobPrivateValues attribute-name-1 [ ... attribute-name-N ]
+
Specifies the list of job values to make private. The "default" values are "job-name", "job-originating-host-name", and "job-originating-user-name".
+
SubscriptionPrivateAccess all
+
SubscriptionPrivateAccess default
+
SubscriptionPrivateAccess {user|@group|@ACL|@OWNER|@SYSTEM}+
+
Specifies an access list for a subscription's private values. The "default"
 access list is "@OWNER @SYSTEM". "@ACL" maps to the printer's
 requesting-user-name-allowed or requesting-user-name-denied values.
-
SubscriptionPrivateValues all
-

-
SubscriptionPrivateValues default
-

-
SubscriptionPrivateValues none
-

-
SubscriptionPrivateValues attribute-name-1 [ ... attribute-name-N ]
-

-Specifies the list of job values to make private. The "default" values are
+
SubscriptionPrivateValues all
+
SubscriptionPrivateValues default
+
SubscriptionPrivateValues none
+
SubscriptionPrivateValues attribute-name-1 [ ... attribute-name-N ]
+
Specifies the list of job values to make private. The "default" values are
 "notify-events", "notify-pull-method", "notify-recipient-uri",
 "notify-subscriber-user-name", and "notify-user-data".
+

 
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),
 http://localhost:631/help
 
Copyright

 Copyright © 2007-2014 by Apple Inc.
diff --git a/doc/help/man-cupsd.html b/doc/help/man-cupsd.html
index 687d6c176..b2cea2341 100644
--- a/doc/help/man-cupsd.html
+++ b/doc/help/man-cupsd.html
@@ -11,47 +11,104 @@
 cupsd - cups scheduler
 
Synopsis

 cupsd
-[ -c
+[
+-c
 config-file
-] [ -f ] [ -F ] [ -h ] [ -l ] [ -t ]
+] [ 
+-f
+] [
+-F
+] [
+-h
+] [
+-l
+] [
+-t
+]
 
Description

 cupsd
 is the scheduler for CUPS. It implements a printing system based upon the Internet Printing Protocol, version 2.1. If no options are specified on the command-line then the default configuration file
 /etc/cups/cupsd.conf
 will be used.
 
Options

-
-c config-file
-

-Uses the named configuration file.
-
-f
-

-Run
+

+
-c config-file
+
Uses the named configuration file.
+
-f
+
Run
 cupsd
 in the foreground; the default is to run in the background as a "daemon".
-
-F
-

-Run
+
-F
+
Run
 cupsd
 in the foreground but detach the process from the controlling terminal and current directory. This is useful for running
-cupsd from init(8).
-
-h
-

-Shows the program usage.
-
-l
-

-This option is passed to
+cupsd
+from
+init(8).
+
-h
+
Shows the program usage.
+
-l
+
This option is passed to
 cupsd
 when it is run from
-launchd(8).
-
-t
-

-Test the configuration file for syntax errors.
-
Compatibility

+launchd(8)
+or
+systemd(8).
+
-t
+
Test the configuration file for syntax errors.
+

+
Files

+
+/etc/cups/classes.conf
+/etc/cups/cups-files.conf
+/etc/cups/cupsd.conf
+/usr/share/cups/mime/mime.convs
+/usr/share/cups/mime/mime.types
+/etc/cups/printers.conf
+

+
Conforming To

+cupsd
+implements all of the required IPP/2.1 attributes and operations. It also implements several CUPS-specific administrative operations.
+
Examples

+Run
+cupsd
+in the background with the default configuration file:
+
+
+    cupsd
+
+

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

+Run
 cupsd
-implements all of the required IPP/2.1 attributes and operations. It also implements several CUPS-specific administration operations.
+in the foreground with a test configuration file called
+test.conf:
+
+
+    cupsd -f -c test.conf
+
+

 
See Also

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

 Copyright © 2007-2014 by Apple Inc.
 
diff --git a/doc/help/man-cupsenable.html b/doc/help/man-cupsenable.html
index 9a999949f..b3ff2ee2e 100644
--- a/doc/help/man-cupsenable.html
+++ b/doc/help/man-cupsenable.html
@@ -29,37 +29,32 @@ cupsdisable, cupsenable - stop/start printers and classes
 cupsenable starts the named printers or classes.
 
cupsdisable stops the named printers or classes.  The
 following options may be used:
-
-E
-

-

+

+
-E
+


 Forces encryption of the connection to the server.
-
-U username
-

-

+
-U username
+


 Uses the specified username when connecting to the server.
-
-c
-

-

+
-c
+


 Cancels all jobs on the named destination.
-
-h server[:port]
-

-

+
-h server[:port]
+


 Uses the specified server and port.
-
--hold
-

-

+
--hold
+


 Holds remaining jobs on the named printer.  Useful for allowing the current
 job to complete before performing maintenance.
-
-r "reason"
-

-

+
-r "reason"
+


 Sets the message associated with the stopped state. If no reason is specified
 then the message is set to "Reason Unknown".
-
--release
-

-

+
--release
+


 Releases pending jobs for printing. Use after running cupsdisable with
 the --hold option to resume printing.
+

 
Compatibility

 Unlike the System V printing system, CUPS allows printer names to
 contain any printable character except SPACE, TAB, "/", or "#".
diff --git a/doc/help/man-cupsfilter.html b/doc/help/man-cupsfilter.html
index 62daa981d..1dba5f622 100644
--- a/doc/help/man-cupsfilter.html
+++ b/doc/help/man-cupsfilter.html
@@ -39,48 +39,36 @@ is a front-end to the CUPS filter subsystem which allows you to convert a file t
 cupsfilter
 generates a PDF file. The converted file is sent to the standard output.
 
Options

-
--list-filters
-

-Do not actually run the filters, just print the filters used to stdout.
-
-D
-

-Delete the input file after conversion.
-
-U user
-

-Specifies the username passed to the filters. The default is the name of the current user.
-
-c config-file
-

-Uses the named cups-files.conf configuration file.
-
-d printer
-

-Uses information from the named printer.
-
-e
-

-Use every filter from the PPD file.
-
-i mime/type
-

-Specifies the source file type. The default file type is guessed using the filename and contents of the file.
-
-j job-id[,N]
-

-Converts document N from the specified job. If N is omitted, document 1 is converted.
-
-m mime/type
-

-Specifies the destination file type. The default file type is application/pdf. Use printer/foo to convert to the printer format defined by the filters in the PPD file.
-
-n copies
-

-Specifies the number of copies to generate.
-
-o name=value
-

-Specifies options to pass to the CUPS filters.
-
-p filename.ppd
-

-Specifies the PPD file to use.
-
-t title
-

-Specifies the document title.
-
-u
-

-Delete the PPD file after conversion.
+

+
--list-filters
+
Do not actually run the filters, just print the filters used to stdout.
+
-D
+
Delete the input file after conversion.
+
-U user
+
Specifies the username passed to the filters. The default is the name of the current user.
+
-c config-file
+
Uses the named cups-files.conf configuration file.
+
-d printer
+
Uses information from the named printer.
+
-e
+
Use every filter from the PPD file.
+
-i mime/type
+
Specifies the source file type. The default file type is guessed using the filename and contents of the file.
+
-j job-id[,N]
+
Converts document N from the specified job. If N is omitted, document 1 is converted.
+
-m mime/type
+
Specifies the destination file type. The default file type is application/pdf. Use printer/foo to convert to the printer format defined by the filters in the PPD file.
+
-n copies
+
Specifies the number of copies to generate.
+
-o name=value
+
Specifies options to pass to the CUPS filters.
+
-p filename.ppd
+
Specifies the PPD file to use.
+
-t title
+
Specifies the document title.
+
-u
+
Delete the PPD file after conversion.
+

 
Exit Status

 cupsfilter
 returns a non-zero exit status on any error.
@@ -97,11 +85,11 @@ Unlike when printing, filters run using the
 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), filter(7), mime.convs(7), mime.types(7),
+cups(1),cupsd.conf(5),filter(7),mime.convs(7),mime.types(7),
 http://localhost:631/help
 
Copyright

 Copyright © 2007-2014 by Apple Inc.
diff --git a/doc/help/man-cupstestppd.html b/doc/help/man-cupstestppd.html
index 40750a8cf..7cb74ac43 100644
--- a/doc/help/man-cupstestppd.html
+++ b/doc/help/man-cupstestppd.html
@@ -36,101 +36,85 @@ on the command-line. The second form tests the PPD file provided
 on the standard input.
 
Options

 cupstestppd supports the following options:
-
-I filename
-

-

+

+
-I filename
+


 Ignores all PCFileName warnings.
-
-I filters
-

-

+
-I filters
+


 Ignores all filter errors.
-
-I profiles
-

-

+
-I profiles
+


 Ignores all profile errors.
-
-R rootdir
-

-

+
-R rootdir
+


 Specifies an alternate root directory for the filter, pre-filter,
 and other support file checks.
-
-W constraints
-

-

+
-W constraints
+


 Report all UIConstraint errors as warnings.
-
-W defaults
-

-

+
-W defaults
+


 Except for size-related options, report all default option errors as warnings.
-
-W filters
-

-

+
-W filters
+


 Report all filter errors as warnings.
-
-W profiles
-

-

+
-W profiles
+


 Report all profile errors as warnings.
-
-W sizes
-

-

+
-W sizes
+


 Report all media size errors as warnings.
-
-W translations
-

-

+
-W translations
+


 Report all translation errors as warnings.
-
-W all
-

-

+
-W all
+


 Report all of the previous errors as warnings.
-
-W none
-

-

+
-W none
+


 Report all of the previous errors as errors.
-
-q
-

-

+
-q
+


 Specifies that no information should be displayed.
-
-r
-

-

+
-r
+


 Relaxes the PPD conformance requirements so that common
 whitespace, control character, and formatting problems are not
 treated as hard errors.
-
-v
-

-

+
-v
+


 Specifies that detailed conformance testing results should be
 displayed rather than the concise PASS/FAIL/ERROR status.
-
-vv
-

-

+
-vv
+


 Specifies that all information in the PPD file should be
 displayed in addition to the detailed conformance testing
 results.
+

 
The -q, -v, and -vv options are mutually exclusive.
 
Exit Status

 cupstestppd returns zero on success and non-zero on error. The
 error codes are as follows:
-
1
-

-

+

+
1
+


 Bad command-line arguments or missing PPD filename.
-
2
-

-

+
2
+


 Unable to open or read PPD file.
-
3
-

-

+
3
+


 The PPD file contains format errors that cannot be skipped.
-
4
-

-

+
4
+


 The PPD file does not conform to the Adobe PPD specification.
+

 
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
 
@@ -138,7 +122,7 @@ conform:
 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 '{}' \;
diff --git a/doc/help/man-filter.html b/doc/help/man-filter.html
index a930d9267..1ed2a9595 100644
--- a/doc/help/man-filter.html
+++ b/doc/help/man-filter.html
@@ -19,7 +19,7 @@ filter - cups file conversion filter interface
 [
 filename
 ]
-
+
 
 #include <cups/cups.h>
 
@@ -69,7 +69,7 @@ functions in the CUPS library to apply the options to the PPD defaults and map a
 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;
@@ -85,112 +85,83 @@ Options specified on the command-line determine the default values for the entir
 
Log Messages

 Messages sent to the standard error are generally stored in the printer's "printer-state-message" attribute and the current ErrorLog file.
 Each line begins with a standard prefix:
-
ALERT: message
-

-Sets the "printer-state-message" attribute and adds the specified message to the current ErrorLog using the "alert" log level.
-
ATTR: attribute=value [ ... attribute=value]
-

-Sets the named job or printer attribute(s). The following job attributes can be set: "job-media-progress". The following printer attributes can be set:
+

+
ALERT: message
+
Sets the "printer-state-message" attribute and adds the specified message to the current ErrorLog using the "alert" log level.
+
ATTR: attribute=value [ ... attribute=value]
+
Sets the named job or printer attribute(s). The following job attributes can be set: "job-media-progress". The following printer attributes can be set:
 "auth-info-required", "marker-colors", "marker-high-levels", "marker-levels",
 "marker-low-levels", "marker-message", "marker-names", "marker-types",
 "printer-alert", and "printer-alert-description".
-
CRIT: message
-

-Sets the "printer-state-message" attribute and adds the specified message to the current ErrorLog using the "critical" log level.
-
DEBUG: message
-

-Adds the specified message to the current ErrorLog using the "debug" log level.
+
CRIT: message
+
Sets the "printer-state-message" attribute and adds the specified message to the current ErrorLog using the "critical" log level.
+
DEBUG: message
+
Adds the specified message to the current ErrorLog using the "debug" log level.
 DEBUG messages are never stored in the "printer-state-message" attribute.
-
DEBUG2: message
-

-

+
DEBUG2: message
+


 Adds the specified message to the current ErrorLog using the "debug2" log level.
 DEBUG2 messages are never stored in the "printer-state-message" attribute.
-
EMERG: message
-

-Sets the "printer-state-message" attribute and adds the specified message to the current ErrorLog using the "emergency" log level.
-
ERROR: message
-

-Sets the "printer-state-message" attribute and adds the specified message to the current ErrorLog using the "error" log level.
-
INFO: message
-

-Sets the "printer-state-message" attribute. If the current LogLevel is set to "debug2", also adds the specified message to the current ErrorLog using the "info" log level.
-
NOTICE: message
-

-Sets the "printer-state-message" attribute and adds the specified message to the current ErrorLog using the "notice" log level.
-
PAGE: page-number #-copies
-

-
PAGE: total #-pages
-

-Adds an entry to the current PageLog. The first form adds #-copies to the "job-media-sheets-completed" attribute. The second form sets the "job-media-sheets-completed" attribute to #-pages.
-
PPD: Keyword=Value [ ... KeywordN=Value ]
-

-Sets the named keywords in the printer's PPD file. This is typically used to update default option keywords such as DefaultPageSize and the various installable options in the PPD file.
-
STATE: printer-state-reason [ ... printer-state-reason ]
-

-
STATE: + printer-state-reason [ ... printer-state-reason ]
-

-
STATE: - printer-state-reason [ ... printer-state-reason ]
-

-Sets, adds, or removes "printer-state-reason" keywords for the current queue. Typically this is used to indicate media, ink, and toner conditions on a printer.
-
WARNING: message
-

-Sets the "printer-state-message" attribute and adds the specified message to the current ErrorLog using the "warning" log level.
+
EMERG: message
+
Sets the "printer-state-message" attribute and adds the specified message to the current ErrorLog using the "emergency" log level.
+
ERROR: message
+
Sets the "printer-state-message" attribute and adds the specified message to the current ErrorLog using the "error" log level.
+
INFO: message
+
Sets the "printer-state-message" attribute. If the current LogLevel is set to "debug2", also adds the specified message to the current ErrorLog using the "info" log level.
+
NOTICE: message
+
Sets the "printer-state-message" attribute and adds the specified message to the current ErrorLog using the "notice" log level.
+
PAGE: page-number #-copies
+
PAGE: total #-pages
+
Adds an entry to the current PageLog. The first form adds #-copies to the "job-media-sheets-completed" attribute. The second form sets the "job-media-sheets-completed" attribute to #-pages.
+
PPD: Keyword=Value [ ... KeywordN=Value ]
+
Sets the named keywords in the printer's PPD file. This is typically used to update default option keywords such as DefaultPageSize and the various installable options in the PPD file.
+
STATE: printer-state-reason [ ... printer-state-reason ]
+
STATE: + printer-state-reason [ ... printer-state-reason ]
+
STATE: - printer-state-reason [ ... printer-state-reason ]
+
Sets, adds, or removes "printer-state-reason" keywords for the current queue. Typically this is used to indicate media, ink, and toner conditions on a printer.
+
WARNING: message
+
Sets the "printer-state-message" attribute and adds the specified message to the current ErrorLog using the "warning" log level.
+

 
Environment Variables

 The following environment variables are defined by the CUPS
 server when executing the filter:
-
CHARSET
-The default text character set, typically "utf-8".
-

-
CLASS
-When a job is submitted to a printer class, contains the name of the destination printer class. Otherwise this environment variable will not be set.
-

-
CONTENT_TYPE
-The MIME media type associated with the submitted job file, for example "application/postscript".
-

-
CUPS_CACHEDIR
-The directory where semi-persistent cache files can be found and stored.
-

-
CUPS_DATADIR
-The directory where data files can be found.
-

-
CUPS_FILETYPE
-The type of file being printed: "job-sheet" for a banner page and "document"
-

+

+
CHARSET
+
The default text character set, typically "utf-8".
+
CLASS
+
When a job is submitted to a printer class, contains the name of the destination printer class. Otherwise this environment variable will not be set.
+
CONTENT_TYPE
+
The MIME media type associated with the submitted job file, for example "application/postscript".
+
CUPS_CACHEDIR
+
The directory where semi-persistent cache files can be found and stored.
+
CUPS_DATADIR
+
The directory where data files can be found.
+
CUPS_FILETYPE
+
The type of file being printed: "job-sheet" for a banner page and "document"
 for a regular print file.
-
CUPS_MAX_MESSAGE
-The maximum size of a message sent to stderr, including any leading prefix and the trailing newline.
-

-
CUPS_SERVERROOT
-The root directory of the server.
-

-
FINAL_CONTENT_TYPE
-The MIME media type associated with the output destined for the printer, for example "application/vnd.cups-postscript".
-

-
LANG
-The default language locale (typically C or en).
-

-
PATH
-The standard execution path for external programs that may be run by the filter.
-

-
PPD
-The full pathname of the PostScript Printer Description (PPD) file for this printer.
-

-
PRINTER
-The name of the printer.
-

-
RIP_CACHE
-The recommended amount of memory to use for Raster Image Processors (RIPs).
-

-
SOFTWARE
-The name and version number of the server (typically CUPS/major.minor).
-

-
TZ
-The timezone of the server.
-

-
USER
-The user executing the filter, typically "lp" or "root"; consult the cups-files.conf file for the current setting.
-

+
CUPS_MAX_MESSAGE
+
The maximum size of a message sent to stderr, including any leading prefix and the trailing newline.
+
CUPS_SERVERROOT
+
The root directory of the server.
+
FINAL_CONTENT_TYPE
+
The MIME media type associated with the output destined for the printer, for example "application/vnd.cups-postscript".
+
LANG
+
The default language locale (typically C or en).
+
PATH
+
The standard execution path for external programs that may be run by the filter.
+
PPD
+
The full pathname of the PostScript Printer Description (PPD) file for this printer.
+
PRINTER
+
The name of the printer.
+
RIP_CACHE
+
The recommended amount of memory to use for Raster Image Processors (RIPs).
+
SOFTWARE
+
The name and version number of the server (typically CUPS/major.minor).
+
TZ
+
The timezone of the server.
+
USER
+
The user executing the filter, typically "lp" or "root"; consult the cups-files.conf file for the current setting.
+

 
Conforming To

 While the filter interface is compatible with System V interface
 scripts, it will only work with the System V interface script as the
diff --git a/doc/help/man-ippfind.html b/doc/help/man-ippfind.html
index ebe9518c8..666cfce55 100644
--- a/doc/help/man-ippfind.html
+++ b/doc/help/man-ippfind.html
@@ -27,207 +27,156 @@ ippfind - find internet printing protocol printers
 ippfind
 --version
 
Options

-
--help
-

-Show program help
-
--version
-

-Show program version
-
-4
-

-Use IPv4 when listing
-
-6
-

-Use IPv6 when listing
-
-T seconds
-

-Specify find timeout in seconds. If 1 or less, ippfind stops as soon as it thinks it has found everything. The default is 1 second.
-
-V version
-

-Specifies the IPP version when listing. Supported values are 1.1, 2.0, 2.1, and 2.2.
+

+
--help
+
Show program help
+
--version
+
Show program version
+
-4
+
Use IPv4 when listing
+
-6
+
Use IPv6 when listing
+
-T seconds
+
Specify find timeout in seconds. If 1 or less, ippfind stops as soon as it thinks it has found everything. The default is 1 second.
+
-V version
+
Specifies the IPP version when listing. Supported values are 1.1, 2.0, 2.1, and 2.2.
 
+

 
Description

 ippfind finds services registered with a DNS server or available through local devices. Its primary purpose is to find IPP printers and show their URIs, show their current status, or run commands. For example, 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 \;
 

 
 
Registration Types

 ippfind supports the following registration types:
-
_http._tcp
-

-HyperText Transport Protocol (HTTP, RFC 2616)
-
_https._tcp
-

-Secure HyperText Transport Protocol (HTTPS, RFC 2818)
-
_ipp._tcp
-

-Internet Printing Protocol (IPP, RFC 2911)
-
_ipps._tcp
-

-Secure Internet Printing Protocol (IPPS, draft)
-
_printer._tcp
-

-Line Printer Daemon (LPD, RFC 1179)
+

+
_http._tcp
+
HyperText Transport Protocol (HTTP, RFC 2616)
+
_https._tcp
+
Secure HyperText Transport Protocol (HTTPS, RFC 2818)
+
_ipp._tcp
+
Internet Printing Protocol (IPP, RFC 2911)
+
_ipps._tcp
+
Secure Internet Printing Protocol (IPPS, draft)
+
_printer._tcp
+
Line Printer Daemon (LPD, RFC 1179)
 
+

 
Expressions

 ippfind supports expressions much like the find(1) utility. However, unlike find, ippfind uses POSIX regular expressions instead of shell filename matching patterns. If --exec, -l, --ls, -p, --print, --print-name, -q, --quiet, -s, or -x is not specified, ippfind adds --print to print the service URI of anything it finds. The following expressions are supported:
-
-d regex
-

-
--domain regex
-

-True if the domain matches the given regular expression.
-
--false
-

-Always false.
-
-h regex
-

-
--host regex
-

-True is the hostname matches the given regular expression.
-
-l
-

-
--ls
-

-Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional find "-ls" output for HTTP URLs. The result is true if the URI is accessible, false otherwise.
-
--local
-

-True if the service is local to this computer.
-
-n regex
-

-
--name regex
-

-True if the service instance name matches the given regular expression.
-
--path regex
-

-True if the URI resource path matches the given regular expression.
-
-P number[-number]
-

-
--port number[-number]
-

-True if the port matches the given number or range.
-
-p
-

-
--print
-

-Prints the URI if the result of previous expressions is true. The result is always true.
-
-q
-

-
--quiet
-

-Quiet mode - just returns the exit codes below.
-
-r
-

-
--remote
-

-True if the service is not local to this computer.
-
-s
-

-
--print-name
-

-Prints the service instance name if the result of previous expressions is true. The result is always true.
-
--true
-

-Always true.
-
-t key
-

-
--txt key
-

-True if the TXT record contains the named key.
-
--txt-key regex
-

-True if the TXT record contains the named key and matches the given regular
+

+
-d regex
+
--domain regex
+
True if the domain matches the given regular expression.
+
--false
+
Always false.
+
-h regex
+
--host regex
+
True is the hostname matches the given regular expression.
+
-l
+
--ls
+
Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional find "-ls" output for HTTP URLs. The result is true if the URI is accessible, false otherwise.
+
--local
+
True if the service is local to this computer.
+
-n regex
+
--name regex
+
True if the service instance name matches the given regular expression.
+
--path regex
+
True if the URI resource path matches the given regular expression.
+
-P number[-number]
+
--port number[-number]
+
True if the port matches the given number or range.
+
-p
+
--print
+
Prints the URI if the result of previous expressions is true. The result is always true.
+
-q
+
--quiet
+
Quiet mode - just returns the exit codes below.
+
-r
+
--remote
+
True if the service is not local to this computer.
+
-s
+
--print-name
+
Prints the service instance name if the result of previous expressions is true. The result is always true.
+
--true
+
Always true.
+
-t key
+
--txt key
+
True if the TXT record contains the named key.
+
--txt-key regex
+
True if the TXT record contains the named key and matches the given regular
 expression.
-
-u regex
-

-
--uri regex
-

-True if the URI matches the given regular expression.
-
-x utility [argument ...] ;
-

-
--exec utility [argument ...] ;
-

-Executes the specified program if the current result is true. "{foo}" arguments are replaced with the corresponding value - see SUBSTITUTIONS below.
+
-u regex
+
--uri regex
+
True if the URI matches the given regular expression.
+
-x utility [argument ...] ;
+
--exec utility [argument ...] ;
+
Executes the specified program if the current result is true. "{foo}" arguments are replaced with the corresponding value - see SUBSTITUTIONS below.
+

 
Expressions may also contain modifiers:
-
( expression )
-

-Group the result of expressions.
-
! expression
-

-
--not expression
-

-Unary NOT of the expression.
-
expression expression
-

-
expression --and expression
-

-Logical AND of expressions.
-
expression --or expression
-

-Logical OR of expressions.
+

+
( expression )
+
Group the result of expressions.
+
! expression
+
--not expression
+
Unary NOT of the expression.
+
expression expression
+
expression --and expression
+
Logical AND of expressions.
+
expression --or expression
+
Logical OR of expressions.
 
+

 
Substitutions

 The substitutions for "{foo}" in -e and --exec are:
-
{}
-

-URI
-
{service_domain}
-

-Domain name, e.g., "example.com.", "local.", etc.
-
{service_hostname}
-

-Fully-qualified domain name, e.g., "printer.example.com.", "printer.local.", etc.
-
{service_name}
-

-Service instance name, e.g., "My Fine Printer".
-
{service_port}
-

-Port number for server, typically 631 for IPP and 80 for HTTP.
-
{service_regtype}
-

-DNS-SD registration type, e.g., "_ipp._tcp", "_http._tcp", etc.
-
{service_scheme}
-

-URI scheme for DNS-SD registration type, e.g., "ipp", "http", etc.
-
{service_uri}
-

-URI for service, e.g., "ipp://printer.local./ipp/print", "http://printer.local./", etc.
-
{txt_key}
-

-Value of TXT record key (lowercase).
+

+
{}
+
URI
+
{service_domain}
+
Domain name, e.g., "example.com.", "local.", etc.
+
{service_hostname}
+
Fully-qualified domain name, e.g., "printer.example.com.", "printer.local.", etc.
+
{service_name}
+
Service instance name, e.g., "My Fine Printer".
+
{service_port}
+
Port number for server, typically 631 for IPP and 80 for HTTP.
+
{service_regtype}
+
DNS-SD registration type, e.g., "_ipp._tcp", "_http._tcp", etc.
+
{service_scheme}
+
URI scheme for DNS-SD registration type, e.g., "ipp", "http", etc.
+
{service_uri}
+
URI for service, e.g., "ipp://printer.local./ipp/print", "http://printer.local./", etc.
+
{txt_key}
+
Value of TXT record key (lowercase).
 
+

 
Environment Variables

 When executing a program, ippfind sets the following environment variables for the matching service registration:
-
IPPFIND_SERVICE_DOMAIN
-

-Domain name, e.g., "example.com.", "local.", etc.
-
IPPFIND_SERVICE_HOSTNAME
-

-Fully-qualified domain name, e.g., "printer.example.com.", "printer.local.", etc.
-
IPPFIND_SERVICE_NAME
-

-Service instance name, e.g., "My Fine Printer".
-
IPPFIND_SERVICE_PORT
-

-Port number for server, typically 631 for IPP and 80 for HTTP.
-
IPPFIND_SERVICE_REGTYPE
-

-DNS-SD registration type, e.g., "_ipp._tcp", "_http._tcp", etc.
-
IPPFIND_SERVICE_SCHEME
-

-URI scheme for DNS-SD registration type, e.g., "ipp", "http", etc.
-
IPPFIND_SERVICE_URI
-

-URI for service, e.g., "ipp://printer.local./ipp/print", "http://printer.local./", etc.
-
IPPFIND_TXT_KEY
-

-Values of TXT record KEY (uppercase).
+

+
IPPFIND_SERVICE_DOMAIN
+
Domain name, e.g., "example.com.", "local.", etc.
+
IPPFIND_SERVICE_HOSTNAME
+
Fully-qualified domain name, e.g., "printer.example.com.", "printer.local.", etc.
+
IPPFIND_SERVICE_NAME
+
Service instance name, e.g., "My Fine Printer".
+
IPPFIND_SERVICE_PORT
+
Port number for server, typically 631 for IPP and 80 for HTTP.
+
IPPFIND_SERVICE_REGTYPE
+
DNS-SD registration type, e.g., "_ipp._tcp", "_http._tcp", etc.
+
IPPFIND_SERVICE_SCHEME
+
URI scheme for DNS-SD registration type, e.g., "ipp", "http", etc.
+
IPPFIND_SERVICE_URI
+
URI for service, e.g., "ipp://printer.local./ipp/print", "http://printer.local./", etc.
+
IPPFIND_TXT_KEY
+
Values of TXT record KEY (uppercase).
 
+

 
Exit Codes

 ippfind returns 0 if the result for all processed expressions is true, 1 if the result of any processed expression is false, 2 if browsing or any query or resolution failed, 3 if an undefined option or invalid expression was specified, and 4 if it ran out of memory.
 
diff --git a/doc/help/man-ipptool.html b/doc/help/man-ipptool.html
index 1bafb4832..1d9f1c303 100644
--- a/doc/help/man-ipptool.html
+++ b/doc/help/man-ipptool.html
@@ -28,94 +28,75 @@ ipptool - perform internet printing protocol requests
 URI
 filename
 [
-... filenameN
+...filenameN
 ]
 
Description

 ipptool sends IPP requests to the specified URI and tests and/or displays the results. Each named file defines one or more requests, including the expected response status, attributes, and values. Output is either a plain text, formatted text, CSV, or XML report on the standard output, with a non-zero exit status indicating that one or more tests have failed. The file format is described in ipptoolfile(5).
 
Options

 The following options are recognized by ipptool:
-
--help
-

-Shows program help.
-
--stop-after-include-error
-

-Tells ipptool to stop if an error occurs in an included file. Normally ipptool will continue with subsequent tests after the INCLUDE directive.
-
--version
-

-Shows the version of ipptool being used.
-
-4
-

-Specifies that ipptool must connect to the printer or server using IPv4.
-
-6
-

-Specifies that ipptool must connect to the printer or server using IPv6.
-
-C
-

-Specifies that requests should be sent using the HTTP/1.1 "Transfer-Encoding: chunked" header, which is required for conformance by all versions of IPP. The default is to use "Transfer-Encoding: chunked" for requests with attached files and "Content-Length:" for requests without attached files.
-
-E
-

-Forces TLS encryption when connecting to the server using the HTTP "Upgrade" header.
-
-I
-

-Specifies that ipptool will continue past errors.
-
-L
-

-Specifies that requests should be sent using the HTTP/1.0 "Content-Length:" header, which is required for conformance by all versions of IPP. The default is to use "Transfer-Encoding: chunked" for requests with attached files and "Content-Length:" for requests without attached files.
-
-S
-

-Forces (dedicated) SSL encryption when connecting to the server.
-
-T seconds
-

-Specifies a timeout for IPP requests in seconds.
-
-V version
-

-Specifies the default IPP version to use: 1.0, 1.1, 2.0, 2.1, or 2.2. If not specified, version 1.1 is used.
-
-X
-

-Specifies that XML (Apple plist) output is desired instead of the plain text report. This option is incompatible with the -i (interval) and -n (repeat-count) options.
-
-c
-

-Specifies that CSV (comma-separated values) output is desired instead of the plain text output.
-
-d name=value
-

-Defines the named variable.
-
-f filename
-

-Defines the default request filename for tests.
-
-i seconds
-

-Specifies that the (last) file should be repeated at the specified interval. This option is incompatible with the -X (XML plist output) option.
-
-l
-

-Specifies that plain text output is desired.
-
-n repeat-count
-

-Specifies that the (last) file should be repeated the specified number of times. This option is incompatible with the -X (XML plist output) option.
-
-t
-

-Specifies that CUPS test report output is desired instead of the plain text output.
-
-v
-

-Specifies that all request and response attributes should be output in CUPS test mode (-t). This is the default for XML output.
+

+
--help
+
Shows program help.
+
--stop-after-include-error
+
Tells ipptool to stop if an error occurs in an included file. Normally ipptool will continue with subsequent tests after the INCLUDE directive.
+
--version
+
Shows the version of ipptool being used.
+
-4
+
Specifies that ipptool must connect to the printer or server using IPv4.
+
-6
+
Specifies that ipptool must connect to the printer or server using IPv6.
+
-C
+
Specifies that requests should be sent using the HTTP/1.1 "Transfer-Encoding: chunked" header, which is required for conformance by all versions of IPP. The default is to use "Transfer-Encoding: chunked" for requests with attached files and "Content-Length:" for requests without attached files.
+
-E
+
Forces TLS encryption when connecting to the server using the HTTP "Upgrade" header.
+
-I
+
Specifies that ipptool will continue past errors.
+
-L
+
Specifies that requests should be sent using the HTTP/1.0 "Content-Length:" header, which is required for conformance by all versions of IPP. The default is to use "Transfer-Encoding: chunked" for requests with attached files and "Content-Length:" for requests without attached files.
+
-S
+
Forces (dedicated) SSL encryption when connecting to the server.
+
-T seconds
+
Specifies a timeout for IPP requests in seconds.
+
-V version
+
Specifies the default IPP version to use: 1.0, 1.1, 2.0, 2.1, or 2.2. If not specified, version 1.1 is used.
+
-X
+
Specifies that XML (Apple plist) output is desired instead of the plain text report. This option is incompatible with the -i (interval) and -n (repeat-count) options.
+
-c
+
Specifies that CSV (comma-separated values) output is desired instead of the plain text output.
+
-d name=value
+
Defines the named variable.
+
-f filename
+
Defines the default request filename for tests.
+
-i seconds
+
Specifies that the (last) file should be repeated at the specified interval. This option is incompatible with the -X (XML plist output) option.
+
-l
+
Specifies that plain text output is desired.
+
-n repeat-count
+
Specifies that the (last) file should be repeated the specified number of times. This option is incompatible with the -X (XML plist output) option.
+
-t
+
Specifies that CUPS test report output is desired instead of the plain text output.
+
-v
+
Specifies that all request and response attributes should be output in CUPS test mode (-t). This is the default for XML output.
+

 
Exit Code

 The ipptool program returns 0 if all tests were sucessful and 1 otherwise.
 
Compatibility

 The ipptool program is unique to CUPS.
 
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
 

 
Standard Files

 The following standard files are available:
-
+
 
     color.jpg
     create-printer-subscription.test
diff --git a/doc/help/man-ipptoolfile.html b/doc/help/man-ipptoolfile.html
index 612876df1..758b14bbf 100644
--- a/doc/help/man-ipptoolfile.html
+++ b/doc/help/man-ipptoolfile.html
@@ -12,7 +12,7 @@ ipptoolfile - ipptool file format
 
 
Description

 The 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
     {
@@ -61,339 +61,243 @@ The ipptool(1) program accepts free-form plain text files that describe o
 
 
Top-level Directives

 The following directives can be used outside of a test:
-
{ test }
-

-Defines a test.
-
DEFINE variable-name value
-

-Defines the named variable to the given value. This is equivalent to specifying
+

+
{ test }
+
Defines a test.
+
DEFINE variable-name value
+
Defines the named variable to the given value. This is equivalent to specifying
 "-d variable-name=value" on the ipptool command-line.
-
DEFINE-DEFAULT variable-name value
-

-Defines the named variable to the given value if it does not already have a
+
DEFINE-DEFAULT variable-name value
+
Defines the named variable to the given value if it does not already have a
 value.
-
FILE-ID "identifier"
-

-Specifies an identifier string for the current file.
-
IGNORE-ERRORS yes
-

-
IGNORE-ERRORS no
-

-Specifies whether, by default, ipptool will ignore errors and continue with
+
FILE-ID "identifier"
+
Specifies an identifier string for the current file.
+
IGNORE-ERRORS yes
+
IGNORE-ERRORS no
+
Specifies whether, by default, ipptool will ignore errors and continue with
 subsequent tests.
-
INCLUDE "filename"
-

-
INCLUDE <filename>
-

-Includes another test file. The first form includes a file relative to the
+
INCLUDE "filename"
+
INCLUDE <filename>
+
Includes another test file. The first form includes a file relative to the
 current test file, while the second form includes a file from the ipptool
 include directory.
-
INCLUDE-IF-DEFINED name "filename"
-

-
INCLUDE-IF-DEFINED name <filename>
-

-Includes another test file if the named variable is defined. The first form
+
INCLUDE-IF-DEFINED name "filename"
+
INCLUDE-IF-DEFINED name <filename>
+
Includes another test file if the named variable is defined. The first form
 includes a file relative to the current test file, while the second form
 includes a file from the ipptool include directory.
-
INCLUDE-IF-NOT-DEFINED name "filename"
-

-
INCLUDE-IF-NOT-DEFINED name <filename>
-

-Includes another test file if the named variable is not defined. The first form
+
INCLUDE-IF-NOT-DEFINED name "filename"
+
INCLUDE-IF-NOT-DEFINED name <filename>
+
Includes another test file if the named variable is not defined. The first form
 includes a file relative to the current test file, while the second form
 includes a file from the ipptool include directory.
-
SKIP-IF-DEFINED variable-name
-

-
SKIP-IF-NOT-DEFINED variable-name
-

-Specifies that the remainder of the test file should be skipped when the
+
SKIP-IF-DEFINED variable-name
+
SKIP-IF-NOT-DEFINED variable-name
+
Specifies that the remainder of the test file should be skipped when the
 variable is or is not defined.
-
STOP-AFTER-INCLUDE-ERROR no
-

-
STOP-AFTER-INCLUDE-ERROR yes
-

-Specifies whether tests will be stopped after an error in an included file.
-
TRANSFER auto
-

-Specifies that tests will, by default, use "Transfer-Encoding: chunked" for
+
STOP-AFTER-INCLUDE-ERROR no
+
STOP-AFTER-INCLUDE-ERROR yes
+
Specifies whether tests will be stopped after an error in an included file.
+
TRANSFER auto
+
Specifies that tests will, by default, use "Transfer-Encoding: chunked" for
 requests with attached files and "Content-Length:" for requests without attached
 files.
-
TRANSFER chunked
-

-Specifies that tests will, by default, use the HTTP/1.1 "Transfer-Encoding:
+
TRANSFER chunked
+
Specifies that tests will, by default, use the HTTP/1.1 "Transfer-Encoding:
 chunked" header. This is the default and is equivalent to specifying "-c" on the
 ipptool command-line. Support for chunked requests is required for
 conformance with all versions of IPP.
-
TRANSFER length
-

-Specifies that tests will, by default, use the HTTP/1.0 "Content-Length:"
+
TRANSFER length
+
Specifies that tests will, by default, use the HTTP/1.0 "Content-Length:"
 header. This is equivalent to specifying "-l" on the ipptool command-line.
 Support for content length requests is required for conformance with all
 versions of IPP.
-
VERSION 1.0
-

-
VERSION 1.1
-

-
VERSION 2.0
-

-
VERSION 2.1
-

-
VERSION 2.2
-

-Specifies the default IPP version number to use for the tests that follow.
+
VERSION 1.0
+
VERSION 1.1
+
VERSION 2.0
+
VERSION 2.1
+
VERSION 2.2
+
Specifies the default IPP version number to use for the tests that follow.
 
+

 
Test Directives

 The following directives are understood in a test:
-
ATTR tag attribute-name value(s)
-

-Adds an attribute to the test request. Values are separated by the comma (",")
+

+
ATTR tag attribute-name value(s)
+
Adds an attribute to the test request. Values are separated by the comma (",")
 character - escape commas using the "" character. Common attributes and values are listed in the IANA IPP registry - see references below.
-
ATTR collection attribute-name { MEMBER tag member-name value(s) ... } [ ... { ... } ]
-

-Adds a collection attribute to the test request. Member attributes follow the
+
ATTR collection attribute-name { MEMBER tag member-name value(s) ... } [ ... { ... } ]
+
Adds a collection attribute to the test request. Member attributes follow the
 same syntax as regular attributes and can themselves be nested collections.
 Multiple collection values can be supplied as needed.
-
COMPRESSION deflate
-

-
COMPRESSION gzip
-

-
COMPRESSION none
-

-

+
COMPRESSION deflate
+
COMPRESSION gzip
+
COMPRESSION none
+


 Uses the specified compression on the document data following the attributes in
 a Print-Job or Send-Document request.
-
DELAY seconds
-

-Specifies a delay before this test will be run.
-
DISPLAY attribute-name
-

-Specifies that value of the named attribute should be output as part of the
+
DELAY seconds
+
Specifies a delay before this test will be run.
+
DISPLAY attribute-name
+
Specifies that value of the named attribute should be output as part of the
 test report.
-
EXPECT attribute-name [ predicate(s) ]
-

-
EXPECT ?attribute-name predicate(s)
-

-
EXPECT !attribute-name
-

-Specifies that the response must/may/must not include the named attribute.
+
EXPECT attribute-name [ predicate(s) ]
+
EXPECT ?attribute-name predicate(s)
+
EXPECT !attribute-name
+
Specifies that the response must/may/must not include the named attribute.
 Additional requirements can be added as predicates - see the "EXPECT PREDICATES"
 section for more information on predicates.
-
FILE filename
-

-Specifies a file to include at the end of the request. This is typically used
+
FILE filename
+
Specifies a file to include at the end of the request. This is typically used
 when sending a test print file.
-
GROUP tag
-

-Specifies the group tag for subsequent attributes in the request.
-
IGNORE-ERRORS yes
-

-
IGNORE-ERRORS no
-

-Specifies whether ipptool will ignore errors and continue with subsequent
+
GROUP tag
+
Specifies the group tag for subsequent attributes in the request.
+
IGNORE-ERRORS yes
+
IGNORE-ERRORS no
+
Specifies whether ipptool will ignore errors and continue with subsequent
 tests.
-
NAME "literal string"
-

-Specifies the human-readable name of the test.
-
OPERATION operation-code
-

-Specifies the operation to be performed.
-
REQUEST-ID number
-

-
REQUEST-ID random
-

-Specifies the request-id value to use in the request, either an integer or the
+
NAME "literal string"
+
Specifies the human-readable name of the test.
+
OPERATION operation-code
+
Specifies the operation to be performed.
+
REQUEST-ID number
+
REQUEST-ID random
+
Specifies the request-id value to use in the request, either an integer or the
 word "random" to use a randomly generated value (the default).
-
RESOURCE path
-

-Specifies an alternate resource path that is used for the HTTP POST request.
+
RESOURCE path
+
Specifies an alternate resource path that is used for the HTTP POST request.
 The default is the resource from the URI provided to the ipptool program.
-
SKIP-IF-DEFINED variable-name
-

-
SKIP-IF-NOT-DEFINED variable-name
-

-Specifies that the current test should be skipped when the variable is or is not
+
SKIP-IF-DEFINED variable-name
+
SKIP-IF-NOT-DEFINED variable-name
+
Specifies that the current test should be skipped when the variable is or is not
 defined.
-
SKIP-PREVIOUS-ERROR yes
-

-
SKIP-PREVIOUS-ERROR no
-

-Specifies whether ipptool will skip the current test if the previous test
+
SKIP-PREVIOUS-ERROR yes
+
SKIP-PREVIOUS-ERROR no
+
Specifies whether ipptool will skip the current test if the previous test
 resulted in an error/failure.
-
STATUS status-code [ predicate ]
-

-Specifies an expected response status-code value. Additional requirements can be
+
STATUS status-code [ predicate ]
+
Specifies an expected response status-code value. Additional requirements can be
 added as predicates - see the "STATUS PREDICATES" section for more information
 on predicates.
-
TEST-ID "identifier"
-

-Specifies an identifier string for the current test.
-
TRANSFER auto
-

-Specifies that this test will use "Transfer-Encoding: chunked" if it has an
+
TEST-ID "identifier"
+
Specifies an identifier string for the current test.
+
TRANSFER auto
+
Specifies that this test will use "Transfer-Encoding: chunked" if it has an
 attached file or "Content-Length:" otherwise.
-
TRANSFER chunked
-

-Specifies that this test will use the HTTP/1.1 "Transfer-Encoding: chunked"
+
TRANSFER chunked
+
Specifies that this test will use the HTTP/1.1 "Transfer-Encoding: chunked"
 header.
-
TRANSFER length
-

-Specifies that this test will use the HTTP/1.0 "Content-Length:" header.
-
VERSION 1.0
-

-
VERSION 1.1
-

-
VERSION 2.0
-

-
VERSION 2.1
-

-
VERSION 2.2
-

-Specifies the IPP version number to use for this test.
+
TRANSFER length
+
Specifies that this test will use the HTTP/1.0 "Content-Length:" header.
+
VERSION 1.0
+
VERSION 1.1
+
VERSION 2.0
+
VERSION 2.1
+
VERSION 2.2
+
Specifies the IPP version number to use for this test.
 
+

 
Expect Predicates

 The following predicates are understood following the EXPECT test directive:
-
COUNT number
-

-Requires the EXPECT attribute to have the specified number of values.
-
DEFINE-MATCH variable-name
-

-Defines the variable to "1" when the EXPECT condition matches. A side-effect of
+

+
COUNT number
+
Requires the EXPECT attribute to have the specified number of values.
+
DEFINE-MATCH variable-name
+
Defines the variable to "1" when the EXPECT condition matches. A side-effect of
 this predicate is that this EXPECT will never fail a test.
-
DEFINE-NO-MATCH variable-name
-

-Defines the variable to "1" when the EXPECT condition does not match. A side-
+
DEFINE-NO-MATCH variable-name
+
Defines the variable to "1" when the EXPECT condition does not match. A side-
 effect of this predicate is that this EXPECT will never fail a test.
-
DEFINE-VALUE variable-name
-

-Defines the variable to the value of the attribute when the EXPECT condition
+
DEFINE-VALUE variable-name
+
Defines the variable to the value of the attribute when the EXPECT condition
 matches. A side-effect of this predicate is that this EXPECT will never fail a test.
-
IF-DEFINED variable-name
-

-Makes the EXPECT conditions apply only if the specified variable is defined.
-
IF-NOT-DEFINED variable-name
-

-Makes the EXPECT conditions apply only if the specified variable is not
+
IF-DEFINED variable-name
+
Makes the EXPECT conditions apply only if the specified variable is defined.
+
IF-NOT-DEFINED variable-name
+
Makes the EXPECT conditions apply only if the specified variable is not
 defined.
-
IN-GROUP tag
-

-Requires the EXPECT attribute to be in the specified group tag.
-
OF-TYPE tag[,tag,...]
-

-Requires the EXPECT attribute to use the specified value tag(s).
-
REPEAT-LIMIT number
-

-

+
IN-GROUP tag
+
Requires the EXPECT attribute to be in the specified group tag.
+
OF-TYPE tag[,tag,...]
+
Requires the EXPECT attribute to use the specified value tag(s).
+
REPEAT-LIMIT number
+


 Specifies the maximum number of times to repeat. The default value is 1000.
-
REPEAT-MATCH
-

-
REPEAT-NO-MATCH
-

-Specifies that the current test should be repeated when the EXPECT condition
+
REPEAT-MATCH
+
REPEAT-NO-MATCH
+
Specifies that the current test should be repeated when the EXPECT condition
 matches or does not match.
-
SAME-COUNT-AS attribute-name
-

-Requires the EXPECT attribute to have the same number of values as the specified
+
SAME-COUNT-AS attribute-name
+
Requires the EXPECT attribute to have the same number of values as the specified
 parallel attribute.
-
WITH-ALL-HOSTNAMES "literal string"
-

-
WITH-ALL-HOSTNAMES "/regular expression/"
-

-Requires that all URI values contain a matching hostname.
-
WITH-ALL-RESOURCES "literal string"
-

-
WITH-ALL-RESOURCES "/regular expression/"
-

-Requires that all URI values contain a matching resource (including leading /).
-
WITH-ALL-SCHEMES "literal string"
-

-
WITH-ALL-SCHEMES "/regular expression/"
-

-Requires that all URI values contain a matching scheme.
-
WITH-ALL-VALUES "literal string"
-

-Requires that all values of the EXPECT attribute match the literal string. Comparisons are case-sensitive.
-
WITH-ALL-VALUES <number
-

-
WITH-ALL-VALUES =number
-

-
WITH-ALL-VALUES >number
-

-
WITH-ALL-VALUES number[,number,...]
-

-Requires that all values of the EXPECT attribute match the number(s) or numeric comparison. When comparing rangeOfInteger values, the "<" and ">" operators only check the upper bound of the range.
-
WITH-ALL-VALUES "false"
-

-
WITH-ALL-VALUES "true"
-

-Requires that all values of the EXPECT attribute match the boolean value given.
-
WITH-ALL-VALUES "/regular expression/"
-

-Requires that all values of the EXPECT attribute match the regular expression, which must conform to the POSIX regular expression syntax. Comparisons are case-sensitive.
-
WITH-HOSTNAME "literal string"
-

-
WITH-HOSTNAME "/regular expression/"
-

-Requires that at least one URI value contains a matching hostname.
-
WITH-RESOURCE "literal string"
-

-
WITH-RESOURCE "/regular expression/"
-

-Requires that at least one URI value contains a matching resource (including leading /).
-
WITH-SCHEME "literal string"
-

-
WITH-SCHEME "/regular expression/"
-

-Requires that at least one URI value contains a matching scheme.
-
WITH-VALUE "literal string"
-

-Requires that at least one value of the EXPECT attribute matches the literal string. Comparisons are case-sensitive.
-
WITH-VALUE <number
-

-
WITH-VALUE =number
-

-
WITH-VALUE >number
-

-
WITH-VALUE number[,number,...]
-

-Requires that at least one value of the EXPECT attribute matches the number(s) or numeric comparison. When comparing rangeOfInteger values, the "<" and ">" operators only check the upper bound of the range.
-
WITH-VALUE "false"
-

-
WITH-VALUE "true"
-

-Requires that at least one value of the EXPECT attribute matches the boolean value given.
-
WITH-VALUE "/regular expression/"
-

-Requires that at least one value of the EXPECT attribute matches the regular expression, which must conform to the POSIX regular expression syntax. Comparisons are case-sensitive.
+
WITH-ALL-HOSTNAMES "literal string"
+
WITH-ALL-HOSTNAMES "/regular expression/"
+
Requires that all URI values contain a matching hostname.
+
WITH-ALL-RESOURCES "literal string"
+
WITH-ALL-RESOURCES "/regular expression/"
+
Requires that all URI values contain a matching resource (including leading /).
+
WITH-ALL-SCHEMES "literal string"
+
WITH-ALL-SCHEMES "/regular expression/"
+
Requires that all URI values contain a matching scheme.
+
WITH-ALL-VALUES "literal string"
+
Requires that all values of the EXPECT attribute match the literal string. Comparisons are case-sensitive.
+
WITH-ALL-VALUES <number
+
WITH-ALL-VALUES =number
+
WITH-ALL-VALUES >number
+
WITH-ALL-VALUES number[,number,...]
+
Requires that all values of the EXPECT attribute match the number(s) or numeric comparison. When comparing rangeOfInteger values, the "<" and ">" operators only check the upper bound of the range.
+
WITH-ALL-VALUES "false"
+
WITH-ALL-VALUES "true"
+
Requires that all values of the EXPECT attribute match the boolean value given.
+
WITH-ALL-VALUES "/regular expression/"
+
Requires that all values of the EXPECT attribute match the regular expression, which must conform to the POSIX regular expression syntax. Comparisons are case-sensitive.
+
WITH-HOSTNAME "literal string"
+
WITH-HOSTNAME "/regular expression/"
+
Requires that at least one URI value contains a matching hostname.
+
WITH-RESOURCE "literal string"
+
WITH-RESOURCE "/regular expression/"
+
Requires that at least one URI value contains a matching resource (including leading /).
+
WITH-SCHEME "literal string"
+
WITH-SCHEME "/regular expression/"
+
Requires that at least one URI value contains a matching scheme.
+
WITH-VALUE "literal string"
+
Requires that at least one value of the EXPECT attribute matches the literal string. Comparisons are case-sensitive.
+
WITH-VALUE <number
+
WITH-VALUE =number
+
WITH-VALUE >number
+
WITH-VALUE number[,number,...]
+
Requires that at least one value of the EXPECT attribute matches the number(s) or numeric comparison. When comparing rangeOfInteger values, the "<" and ">" operators only check the upper bound of the range.
+
WITH-VALUE "false"
+
WITH-VALUE "true"
+
Requires that at least one value of the EXPECT attribute matches the boolean value given.
+
WITH-VALUE "/regular expression/"
+
Requires that at least one value of the EXPECT attribute matches the regular expression, which must conform to the POSIX regular expression syntax. Comparisons are case-sensitive.
 
+

 
Status Predicates

 The following predicates are understood following the STATUS test directive:
-
DEFINE-MATCH variable-name
-

-Defines the variable to "1" when the STATUS matches. A side-effect of this predicate is that this STATUS will never fail a test.
-
DEFINE-NO-MATCH variable-name
-

-Defines the variable to "1" when the STATUS does not match. A side-effect of this predicate is that this STATUS will never fail a test.
-
IF-DEFINED variable-name
-

-Makes the STATUS apply only if the specified variable is defined.
-
IF-NOT-DEFINED variable-name
-

-Makes the STATUS apply only if the specified variable is not defined.
-
REPEAT-LIMIT number
-

-

+

+
DEFINE-MATCH variable-name
+
Defines the variable to "1" when the STATUS matches. A side-effect of this predicate is that this STATUS will never fail a test.
+
DEFINE-NO-MATCH variable-name
+
Defines the variable to "1" when the STATUS does not match. A side-effect of this predicate is that this STATUS will never fail a test.
+
IF-DEFINED variable-name
+
Makes the STATUS apply only if the specified variable is defined.
+
IF-NOT-DEFINED variable-name
+
Makes the STATUS apply only if the specified variable is not defined.
+
REPEAT-LIMIT number
+


 Specifies the maximum number of times to repeat. The default value is 1000.
-
REPEAT-MATCH
-

-
REPEAT-NO-MATCH
-

-Specifies that the current test should be repeated when the response status-code
+
REPEAT-MATCH
+
REPEAT-NO-MATCH
+
Specifies that the current test should be repeated when the response status-code
 matches or does not match the value specified by the STATUS directive.
 
+

 
Operation Codes

 Operation codes correspond to the hexadecimal numbers (0xHHHH) and names from
 RFC 2911 and other IPP extension specifications. Here is a complete list:
-
+
     Activate-Printer
     CUPS-Accept-Jobs
     CUPS-Add-Modify-Class
@@ -466,7 +370,7 @@ RFC 2911 and other IPP extension specifications. Here is a complete list:
 
Status Codes

 Status codes correspond to the hexadecimal numbers (0xHHHH) and names from RFC
 2911 and other IPP extension specifications. Here is a complete list:
-
+
     client-error-attributes-not-settable
     client-error-attributes-or-values-not-supported
     client-error-bad-request
@@ -521,7 +425,7 @@ Status codes correspond to the hexadecimal numbers (0xHHHH) and names from RFC
 
Tags

 Value and group tags correspond to the names from RFC 2911 and other IPP
 extension specifications. Here are the group tags:
-
+
     event-notification-attributes-tag
     job-attributes-tag
     operation-attributes-tag
@@ -530,7 +434,7 @@ extension specifications. Here are the group tags:
     unsupported-attributes-tag
 

 
Here are the value tags:
-
+
     admin-define
     boolean
     charset
@@ -563,50 +467,39 @@ The ipptool program maintains a list of variables that can be used in any
 literal string or attribute value by specifying "$variable-name". Aside from
 variables defined using the "-d" option or "DEFINE" directive, the following
 pre-defined variables are available:
-
$$
-

-Inserts a single "$" character.
-
$ENV[name]
-

-Inserts the value of the named environment variable, or an empty string if the
+

+
$$
+
Inserts a single "$" character.
+
$ENV[name]
+
Inserts the value of the named environment variable, or an empty string if the
 environment variable is not defined.
-
$filename
-

-Inserts the filename provided to ipptool with the "-f" option.
-
$hostname
-

-Inserts the hostname from the URI provided to ipptool.
-
$job-id
-

-Inserts the last job-id value returned in a test response or 0 if no job-id has
+
$filename
+
Inserts the filename provided to ipptool with the "-f" option.
+
$hostname
+
Inserts the hostname from the URI provided to ipptool.
+
$job-id
+
Inserts the last job-id value returned in a test response or 0 if no job-id has
 been seen.
-
$job-uri
-

-Inserts the last job-uri value returned in a test response or an empty string if
+
$job-uri
+
Inserts the last job-uri value returned in a test response or an empty string if
 no job-uri has been seen.
-
$scheme
-

-Inserts the scheme from the URI provided to ipptool.
-
$notify-subscription-id
-

-Inserts the last notify-subscription-id value returned in a test response or 0 if
+
$scheme
+
Inserts the scheme from the URI provided to ipptool.
+
$notify-subscription-id
+
Inserts the last notify-subscription-id value returned in a test response or 0 if
 no notify-subscription-id has been seen.
-
$port
-

-Inserts the port number from the URI provided to ipptool.
-
$resource
-

-Inserts the resource path from the URI provided to ipptool.
-
$uri
-

-Inserts the URI provided to ipptool.
-
$user
-

-Inserts the current user's login name.
-
$username
-

-Inserts the username from the URI provided to ipptool, if any.
+
$port
+
Inserts the port number from the URI provided to ipptool.
+
$resource
+
Inserts the resource path from the URI provided to ipptool.
+
$uri
+
Inserts the URI provided to ipptool.
+
$user
+
Inserts the current user's login name.
+
$username
+
Inserts the username from the URI provided to ipptool, if any.
 
+

 
See Also

 ipptool(1), RFC 2911,
 

diff --git a/doc/help/man-lp.html b/doc/help/man-lp.html
index a09a51b3a..7484763e9 100644
--- a/doc/help/man-lp.html
+++ b/doc/help/man-lp.html
@@ -63,164 +63,131 @@ the current default set using the lpoptions(1) command is used,
 followed by the default set using the lpadmin(8) command.
 
Options

 The following options are recognized by lp:
-
--
-

-

+

+
--
+


 Marks the end of options; use this to print a file whose name
 begins with a dash (-).
-
-E
-

-

+
-E
+


 Forces encryption when connecting to the server.
-
-U username
-

-

+
-U username
+


 Specifies the username to use when connecting to the server.
-
-c
-

-

+
-c
+


 This option is provided for backwards-compatibility only. On
 systems that support it, this option forces the print file to be
 copied to the spool directory before printing. In CUPS, print
 files are always sent to the scheduler via IPP which has the
 same effect.
-
-d destination
-

-

+
-d destination
+


 Prints files to the named printer.
-
-h hostname[:port]
-

-

+
-h hostname[:port]
+


 Chooses an alternate server.
-
-i job-id
-

-

+
-i job-id
+


 Specifies an existing job to modify.
-
-m
-

-

+
-m
+


 Sends an email when the job is completed.
-
-n copies
-

-

+
-n copies
+


 Sets the number of copies to print from 1 to 100.
-
-o "name=value [name=value ...]"
-

-

+
-o "name=value [name=value ...]"
+


 Sets one or more job options.
-
-q priority
-

-

+
-q priority
+


 Sets the job priority from 1 (lowest) to 100 (highest). The
 default priority is 50.
-
-s
-

-

+
-s
+


 Do not report the resulting job IDs (silent mode.)
-
-t "name"
-

-

+
-t "name"
+


 Sets the job name.
-
-H hh:mm
-

-
-H hold
-

-
-H immediate
-

-
-H restart
-

-
-H resume
-

-

+
-H hh:mm
+
-H hold
+
-H immediate
+
-H restart
+
-H resume
+


 Specifies when the job should be printed. A value of immediate will print
 the file immediately, a value of hold will hold the job indefinitely, and
 a UTC time value (HH:MM) will hold the job until the specified UTC (not local)
 time. Use a value of resume with the -i option to resume a held job.
 Use a value of restart with the -i option to restart
 a completed job.
-
-P page-list
-

-

+
-P page-list
+


 Specifies which pages to print in the document. The list can
 contain a list of numbers and ranges (#-#) separated by commas
 (e.g. 1,3-5,16). The page numbers refer to the output pages and
 not the document's original pages - options like "number-up" can
 affect the numbering of the pages.
+

 
Common Job Options

 Aside from the printer-specific options reported by the
 lpoptions(1) command, the following generic options are
 available:
-
-o media=size
-

-

+

+
-o media=size
+


 Sets the page size to size. Most printers support at least
 the size names "a4", "letter", and "legal".
-
-o landscape
-

-
-o orientation-requested=4
-

-

+
-o landscape
+
-o orientation-requested=4
+


 Prints the job in landscape (rotated 90 degrees).
-
-o sides=one-sided
-

-
-o sides=two-sided-long-edge
-

-
-o sides=two-sided-short-edge
-

-

+
-o sides=one-sided
+
-o sides=two-sided-long-edge
+
-o sides=two-sided-short-edge
+


 Prints on one or two sides of the paper. The value
 "two-sided-long-edge" is normally used when printing portrait
 (unrotated) pages, while "two-sided-short-edge" is used for
 landscape pages.
-
-o fit-to-page
-

-

+
-o fit-to-page
+


 Scales the print file to fit on the page.
-
-o number-up=2
-

-
-o number-up=4
-

-
-o number-up=6
-

-
-o number-up=9
-

-
-o number-up=16
-

-

+
-o number-up=2
+
-o number-up=4
+
-o number-up=6
+
-o number-up=9
+
-o number-up=16
+


 Prints multiple document pages on each output page.
-
-o cpi=N
-

-

+
-o cpi=N
+


 Sets the number of characters per inch to use when printing a
 text file. The default is 10.
-
-o lpi=N
-

-

+
-o lpi=N
+


 Sets the number of lines per inch to use when printing a text
 file. The default is 6.
-
-o page-bottom=N
-

-
-o page-left=N
-

-
-o page-right=N
-

-
-o page-top=N
-

-

+
-o page-bottom=N
+
-o page-left=N
+
-o page-right=N
+
-o page-top=N
+


 Sets the page margins when printing text files. The values are in
 points - there are 72 points to the inch.
+

 
Examples

 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 an image across 4 pages:
-
+
     lp -d bar -o scaling=200 filename
 

 
Print a text file with 12 characters per inch, 8 lines per inch, and
 a 1 inch left margin:
-
+
     lp -d bar -o cpi=12 -o lpi=8 -o page-left=72 filename
 

 
Compatibility

diff --git a/doc/help/man-lpadmin.html b/doc/help/man-lpadmin.html
index 39411ea8d..c07d54f2b 100644
--- a/doc/help/man-lpadmin.html
+++ b/doc/help/man-lpadmin.html
@@ -58,142 +58,115 @@ will be aborted.
 
Configuration Options

 The following options are recognized when configuring a printer
 queue:
-
-c class
-

-

+

+
-c class
+


 Adds the named printer to class.  If class does
 not exist it is created automatically.
-
-i interface
-

-

+
-i interface
+


 Sets a System V style interface script for the printer. This
 option cannot be specified with the -P option (PPD file)
 and is intended for providing support for legacy printer drivers.
-
-m model
-

-

+
-m model
+


 Sets a standard System V interface script or PPD file for the printer from the
 model directory or using one of the driver interfaces. Use the -m
 option with the lpinfo(8) command to get a list of supported models.
-
-o cupsIPPSupplies=true
-

-
-o cupsIPPSupplies=false
-

-

+
-o cupsIPPSupplies=true
+
-o cupsIPPSupplies=false
+


 Specifies whether IPP supply level values should be reported.
-
-o cupsSNMPSupplies=true
-

-
-o cupsSNMPSupplies=false
-

-

+
-o cupsSNMPSupplies=true
+
-o cupsSNMPSupplies=false
+


 Specifies whether SNMP supply level (RFC 3805) values should be reported.
-
-o job-k-limit=value
-

-

+
-o job-k-limit=value
+


 Sets the kilobyte limit for per-user quotas. The value is an
 integer number of kilobytes; one kilobyte is 1024 bytes.
-
-o job-page-limit=value
-

-

+
-o job-page-limit=value
+


 Sets the page limit for per-user quotas. The value is the integer
 number of pages that can be printed; double-sided pages are
 counted as two pages.
-
-o job-quota-period=value
-

-

+
-o job-quota-period=value
+


 Sets the accounting period for per-user quotas. The value is an
 integer number of seconds; 86,400 seconds are in one day.
-
-o job-sheets-default=banner
-

-
-o job-sheets-default=banner,banner
-

-

+
-o job-sheets-default=banner
+
-o job-sheets-default=banner,banner
+


 Sets the default banner page(s) to use for print jobs.
-
-o name=value
-

-

+
-o name=value
+


 Sets a PPD option for the printer. PPD options can be listed using the -l
 option with the lpoptions(1) command.
-
-o name-default=value
-

-

+
-o name-default=value
+


 Sets a default server-side option for the destination. Any print-time
 option can be defaulted, e.g. "-o cpi-default=17" to set the default
 "cpi" option value to 17.
-
-o port-monitor=name
-

-

+
-o port-monitor=name
+


 Sets the binary communications program to use when printing,
 "none", "bcp", or "tbcp". The default program is "none". The
 specified port monitor must be listed in the printer's PPD file.
-
-o printer-error-policy=name
-

-

+
-o printer-error-policy=name
+


 Sets the error policy to be used when the printer backend is
 unable to send the job to the printer. The name must be one of
 "abort-job", "retry-job", "retry-current-job", or "stop-printer". The default
 error policy is "stop-printer" for printers and "retry-current-job" for
 classes.
-
-o printer-is-shared=true/false
-

-

+
-o printer-is-shared=true/false
+


 Sets the destination to shared/published or unshared/unpublished.
 Shared/published destinations are publicly announced by the server
 on the LAN based on the browsing configuration in
 cupsd.conf, while unshared/unpublished destinations are not
 announced. The default value is "true".
-
-o printer-op-policy=name
-

-

+
-o printer-op-policy=name
+


 Sets the IPP operation policy associated with the destination. The
 name must be defined in the cupsd.conf in a Policy section.
 The default operation policy is "default".
-
-R name-default
-

-

+
-R name-default
+


 Deletes the named option from printer.
-
-r class
-

-

+
-r class
+


 Removes the named printer from class.  If the
 resulting class becomes empty it is removed.
-
-u allow:user,user,@group
-

-
-u deny:user,user,@group
-

-
-u allow:all
-

-
-u deny:none
-

-

+
-u allow:user,user,@group
+
-u deny:user,user,@group
+
-u allow:all
+
-u deny:none
+


 Sets user-level access control on a destination. Names starting with
 "@" are interpreted as UNIX groups. The latter two forms turn
 user-level access control off.
-
-v "device-uri"
-

-

+
-v "device-uri"
+


 Sets the device-uri attribute of the printer queue. Use the -v
 option with the lpinfo(8) command to get a list of supported device URIs
 and schemes.
-
-D "info"
-

-

+
-D "info"
+


 Provides a textual description of the destination.
-
-E
-

-

+
-E
+


 Enables the destination and accepts jobs; this is the same as running the
 cupsaccept(8) and cupsenable(8) programs on the destination.
-
-L "location"
-

-

+
-L "location"
+


 Provides a textual location of the destination.
-
-P ppd-file
-

-

+
-P ppd-file
+


 Specifies a PostScript Printer Description file to use with the
 printer. If specified, this option overrides the -i option
 (interface script).
+

 
Compatibility

 Unlike the System V printing system, CUPS allows printer names to
 contain any printable character except SPACE, TAB, "/", or "#".
diff --git a/doc/help/man-lpc.html b/doc/help/man-lpc.html
index 89cdd0099..3264d6976 100644
--- a/doc/help/man-lpc.html
+++ b/doc/help/man-lpc.html
@@ -25,24 +25,21 @@ display a prompt and accept commands from the standard input.
 
Commands

 The lpc program accepts a subset of commands accepted by
 the Berkeley lpc program of the same name:
-
exit
-

-

+

+
exit
+


 Exits the command interpreter.
-
help [command]
-

-
? [command]
-

-

+
help [command]
+
? [command]
+


 Displays a short help message.
-
quit
-

-

+
quit
+


 Exits the command interpreter.
-
status [queue]
-

-

+
status [queue]
+


 Displays the status of one or more printer or class queues.
+

 
Limitations

 Since lpc is geared towards the Berkeley printing system,
 it is impossible to use lpc to configure printer or class
diff --git a/doc/help/man-lpinfo.html b/doc/help/man-lpinfo.html
index b414f82b1..5dd9e22e7 100644
--- a/doc/help/man-lpinfo.html
+++ b/doc/help/man-lpinfo.html
@@ -48,54 +48,45 @@ drivers, while the second form (-v) lists the available
 devices.
 
Options

 lpinfo accepts the following options:
-
-E
-

-

+

+
-E
+


 Forces encryption when connecting to the server.
-
-U username
-

-

+
-U username
+


 Sets the username to use when connecting to the server.
-
-h server[:port]
-

-

+
-h server[:port]
+


 Selects an alternate server.
-
-l
-

-

+
-l
+


 Shows a "long" listing of devices or drivers.
-
--device-id device-id-string
-

-

+
--device-id device-id-string
+


 Specifies the IEEE-1284 device ID to match when listing drivers with the
 -m option.
-
--exclude-schemes scheme-list
-

-

+
--exclude-schemes scheme-list
+


 Specifies a comma-separated list of device or PPD schemes that should be
 excluded from the results. Static PPD files use the "file" scheme.
-
--include-schemes scheme-list
-

-

+
--include-schemes scheme-list
+


 Specifies a comma-separated list of device or PPD schemes that should be
 included in the results. Static PPD files use the "file" scheme.
-
--language locale
-

-

+
--language locale
+


 Specifies the language to match when listing drivers with the -m option.
-
--make-and-model name
-

-

+
--make-and-model name
+


 Specifies the make and model to match when listing drivers with the -m
 option.
-
--product name
-

-

+
--product name
+


 Specifies the product to match when listing drivers with the -m option.
-
--timeout seconds
-

-

+
--timeout seconds
+


 Specifies the timeout when listing devices with the -v option.
+

 
Compatibility

 The lpinfo command is unique to CUPS.
 
See Also

diff --git a/doc/help/man-lpmove.html b/doc/help/man-lpmove.html
index c0aa7e919..ad759d958 100644
--- a/doc/help/man-lpmove.html
+++ b/doc/help/man-lpmove.html
@@ -16,7 +16,7 @@ lpmove - move a job or all jobs to a new destination
 ] [ -U
 username
 ]
-job destination
+jobdestination
 

 lpmove
 [ -E ] [ -h
@@ -24,31 +24,30 @@ lpmove - move a job or all jobs to a new destination
 ] [ -U
 username
 ]
-source destination
+sourcedestination
 
Description

 lpmove moves the specified job or all jobs from
 source to destination. job can be the job ID
 number or the old destination and job ID:
 

-
+
 
      lpmove 123 newprinter
      lpmove oldprinter-123 newprinter
 

 
Options

 The lpmove command supports the following options:
-
-E
-

-

+

+
-E
+


 Forces encryption when connecting to the server.
-
-U username
-

-

+
-U username
+


 Specifies an alternate username.
-
-h server[:port]
-

-

+
-h server[:port]
+


 Specifies an alternate server.
+

 
See Also

 cancel(1), lp(1),
 

diff --git a/doc/help/man-lpoptions.html b/doc/help/man-lpoptions.html
index 312b02d02..464d5d68a 100644
--- a/doc/help/man-lpoptions.html
+++ b/doc/help/man-lpoptions.html
@@ -57,48 +57,41 @@ lpoptions - display or set printer options and defaults
 lpoptions displays or sets printer options and defaults.
 lpoptions shows the default printer options when run with no
 arguments. Other options include:
-
-E
-

-

+

+
-E
+


 Enables encryption when communicating with the CUPS server.
-
-U username
-

-

+
-U username
+


 Uses an alternate username.
-
-d destination[/instance]
-

-

+
-d destination[/instance]
+


 Sets the user default printer to destination. If instance
 is supplied then that particular instance is used. This option
 overrides the system default printer for the current user.
-
-h server[:port]
-

-

+
-h server[:port]
+


 Uses an alternate server.
-
-l
-

-

+
-l
+


 Lists the printer specific options and their current settings.
-
-o option[=value]
-

-

+
-o option[=value]
+


 Specifies a new option for the named destination.
-
-p destination[/instance]
-

-

+
-p destination[/instance]
+


 Sets the destination and instance, if specified, for any options
 that follow. If the named instance does not exist then it is
 created.
-
-r option
-

-

+
-r option
+


 Removes the specified option for the named destination.
-
-x destination[/instance]
-

-

+
-x destination[/instance]
+


 Removes the options for the named destination and instance, if
 specified. If the named instance does not exist then this does
 nothing.
+

 
If no options are specified using the -o option, then the
 current options for the named printer are reported on the
 standard output.
diff --git a/doc/help/man-lpq.html b/doc/help/man-lpq.html
index 26bd37eef..2f219626e 100644
--- a/doc/help/man-lpq.html
+++ b/doc/help/man-lpq.html
@@ -29,30 +29,26 @@ jobs in the queue until the queue is empty; the list of jobs is
 shown once every interval seconds.
 
Options

 lpq supports the following options:
-
-E
-

-

+

+
-E
+


 Forces encryption when connecting to the server.
-
-P destination[/instance]
-

-

+
-P destination[/instance]
+


 Specifies an alternate printer or class name.
-
-U username
-

-

+
-U username
+


 Specifies an alternate username.
-
-a
-

-

+
-a
+


 Reports jobs on all printers.
-
-h server[:port]
-

-

+
-h server[:port]
+


 Specifies an alternate server.
-
-l
-

-

+
-l
+


 Requests a more verbose (long) reporting format.
+

 
See Also

 cancel(1), lp(1), lpr(1), lprm(1),
 lpstat(1),
diff --git a/doc/help/man-lpr.html b/doc/help/man-lpr.html
index 3e3957652..d64c6bef6 100644
--- a/doc/help/man-lpr.html
+++ b/doc/help/man-lpr.html
@@ -38,69 +38,56 @@ the current default set using the lpoptions(1) command is used,
 followed by the default set using the lpadmin(8) command.
 
Options

 The following options are recognized by lpr:
-
-E
-

-

+

+
-E
+


 Forces encryption when connecting to the server.
-
-H server[:port]
-

-

+
-H server[:port]
+


 Specifies an alternate server.
-
-C "name"
-

-
-J "name"
-

-
-T "name"
-

-

+
-C "name"
+
-J "name"
+
-T "name"
+


 Sets the job name.
-
-P destination[/instance]
-

-

+
-P destination[/instance]
+


 Prints files to the named printer.
-
-U username
-

-

+
-U username
+


 Specifies an alternate username.
-
-# copies
-

-

+
-# copies
+


 Sets the number of copies to print from 1 to 100.
-
-h
-

-

+
-h
+


 Disables banner printing. This option is equivalent to "-o
 job-sheets=none".
-
-l
-

-

+
-l
+


 Specifies that the print file is already formatted for the
 destination and should be sent without filtering. This option is
 equivalent to "-o raw".
-
-m
-

-

+
-m
+


 Send an email on job completion.
-
-o option[=value]
-

-

+
-o option[=value]
+


 Sets a job option.
-
-p
-

-

+
-p
+


 Specifies that the print file should be formatted with a shaded
 header with the date, time, job name, and page number. This
 option is equivalent to "-o prettyprint" and is only useful when
 printing text files.
-
-q
-

-

+
-q
+


 Hold job for printing.
-
-r
-

-

+
-r
+


 Specifies that the named print files should be deleted after
 printing them.
+

 
Compatibility

 The "c", "d", "f", "g", "i", "n", "t", "v", and "w" options
 are not supported by CUPS and produce a warning message if used.
diff --git a/doc/help/man-lprm.html b/doc/help/man-lprm.html
index ec6335726..d5769182b 100644
--- a/doc/help/man-lprm.html
+++ b/doc/help/man-lprm.html
@@ -18,7 +18,7 @@ lprm - cancel print jobs
 ] [ -P
 destination[/instance]
 ] [ - ] [
-job ID(s)
+jobID(s)
 ]
 
Description

 lprm cancels print jobs that have been queued for printing.
@@ -28,22 +28,20 @@ numbers to cancel those jobs or use the - option to cancel
 all jobs.
 
Options

 The lprm command supports the following options:
-
-E
-

-

+

+
-E
+


 Forces encryption when connecting to the server.
-
-P destination[/instance]
-

-

+
-P destination[/instance]
+


 Specifies the destination printer or class.
-
-U username
-

-

+
-U username
+


 Specifies an alternate username.
-
-h server[:port]
-

-

+
-h server[:port]
+


 Specifies an alternate server.
+

 
Compatibility

 The CUPS version of lprm is compatible with the standard
 Berkeley lprm command.
diff --git a/doc/help/man-lpstat.html b/doc/help/man-lpstat.html
index 7012a9606..513d3c809 100644
--- a/doc/help/man-lpstat.html
+++ b/doc/help/man-lpstat.html
@@ -36,88 +36,73 @@ classes, jobs, and printers. When run with no arguments,
 lpstat will list jobs queued by the current user.
 
Options

 The lpstat command supports the following options:
-
-E
-

-

+

+
-E
+


 Forces encryption when connecting to the server.
-
-H
-

-

+
-H
+


 Shows the server hostname and port.
-
-R
-

-

+
-R
+


 Shows the ranking of print jobs.
-
-U username
-

-

+
-U username
+


 Specifies an alternate username.
-
-W which-jobs
-

-

+
-W which-jobs
+


 Specifies which jobs to show, completed or
 not-completed (the default). This option must appear
 before the -o option and/or any printer names, otherwise
 the default (not-completed) value will be used in the request to
 the scheduler.
-
-a [printer(s)]
-

-

+
-a [printer(s)]
+


 Shows the accepting state of printer queues. If no printers are
 specified then all printers are listed.
-
-c [class(es)]
-

-

+
-c [class(es)]
+


 Shows the printer classes and the printers that belong to them.
 If no classes are specified then all classes are listed.
-
-d
-

-

+
-d
+


 Shows the current default destination.
-
-h server[:port]
-

-

+
-h server[:port]
+


 Specifies an alternate server.
-
-l
-

-

+
-l
+


 Shows a long listing of printers, classes, or jobs.
-
-o [destination(s)]
-

-

+
-o [destination(s)]
+


 Shows the jobs queue on the specified destinations. If no destinations are
 specified all jobs are shown.
-
-p [printer(s)]
-

-

+
-p [printer(s)]
+


 Shows the printers and whether or not they are enabled for printing. If
 no printers are specified then all printers are listed.
-
-r
-

-

+
-r
+


 Shows whether the CUPS server is running.
-
-s
-

-

+
-s
+


 Shows a status summary, including the default destination, a
 list of classes and their member printers, and a list of printers and
 their associated devices. This is equivalent to using the "-d", "-c",
 and "-v" options.
-
-t
-

-

+
-t
+


 Shows all status information. This is equivalent to using the "-r",
 "-d", "-c", "-v", "-a", "-p", and "-o" options.
-
-u [user(s)]
-

-

+
-u [user(s)]
+


 Shows a list of print jobs queued by the specified users. If no users
 are specified, lists the jobs queued by the current user.
-
-v [printer(s)]
-

-

+
-v [printer(s)]
+


 Shows the printers and what device they are attached to. If no printers
 are specified then all printers are listed.
+

 
Compatibility

 Unlike the System V printing system, CUPS allows printer names to
 contain any printable character except SPACE, TAB, "/", and "#".
diff --git a/doc/help/man-mailto.conf.html b/doc/help/man-mailto.conf.html
index 0da8f9d76..93e1bee5f 100644
--- a/doc/help/man-mailto.conf.html
+++ b/doc/help/man-mailto.conf.html
@@ -15,32 +15,29 @@ email notification preferences for CUPS.
 
Each line in the file can be a configuration directive, a blank line,
 or a comment. Comment lines start with the # character.
 
Directives

-
Cc cc-address@domain.com
-

-

+

+
Cc cc-address@domain.com
+


 Specifies an additional recipient for all email notifications.
-
From from-address@domain.com
-

-

+
From from-address@domain.com
+


 Specifies the sender of email notifications.
-
Sendmail sendmail command and options
-

-

+
Sendmail sendmail command and options
+


 Specifies the sendmail command to use when sending email
 notifications. Only one Sendmail or SMTPServer line
 may be present in the mailto.conf file. If multiple lines
 are present, only the last one is used.
-
SMTPServer servername
-

-

+
SMTPServer servername
+


 Specifies a SMTP server to send email notifications to. Only one
 Sendmail or SMTPServer line may be present in the
 mailto.conf file. If multiple lines are present, only the
 last one is used.
-
Subject subject-prefix
-

-

+
Subject subject-prefix
+


 Specifies a prefix string for the subject line of an email notification.
+

 
See Also

 classes.conf(5), cupsd(8), cupsd.conf(5),
 mime.convs(5), mime.types(5), printers.conf(5),
diff --git a/doc/help/man-mime.convs.html b/doc/help/man-mime.convs.html
index a1eeca5a5..543764591 100644
--- a/doc/help/man-mime.convs.html
+++ b/doc/help/man-mime.convs.html
@@ -21,7 +21,7 @@ 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:
 

-
+
 
 super/type super/type cost filter
 application/postscript application/vnd.cups-raster 50 pstoraster
diff --git a/doc/help/man-mime.types.html b/doc/help/man-mime.types.html
index d40097fda..7772bd29f 100644
--- a/doc/help/man-mime.types.html
+++ b/doc/help/man-mime.types.html
@@ -20,7 +20,7 @@ start with the MIME type name and are optionally followed by a
 series of file recognition rules that are used to automatically
 identify print and web files:
 

-
+
 
     super/type rule [ ... ruleN]
 

@@ -33,51 +33,42 @@ logical AND and "," or whitespace for a logical OR, and negated using
 
Rules

 Rules take two forms - a filename extension by itself and functions with test
 values inside parenthesis. The following functions are available:
-
match("pattern")
-

-

+

+
match("pattern")
+


 Pattern match on filename
-
ascii(offset,length)
-

-

+
ascii(offset,length)
+


 True if bytes are valid printable ASCII (CR, NL, TAB, BS, 32-126)
-
printable(offset,length)
-

-

+
printable(offset,length)
+


 True if bytes are printable 8-bit chars (CR, NL, TAB, BS, 32-126, 128-254)
-
priority(number)
-

-

+
priority(number)
+


 Specifies the relative priority of this MIME type. The default priority is 100.
 Larger values have higher priority while smaller values have lower priority.
-
string(offset,"string")
-

-

+
string(offset,"string")
+


 True if bytes are identical to string
-
istring(offset,"string")
-

-

+
istring(offset,"string")
+


 True if a case-insensitive comparison of the bytes is identical
-
char(offset,value)
-

-

+
char(offset,value)
+


 True if byte is identical
-
short(offset,value)
-

-

+
short(offset,value)
+


 True if 16-bit integer is identical
-
int(offset,value)
-

-

+
int(offset,value)
+


 True if 32-bit integer is identical
-
locale("string")
-

-

+
locale("string")
+


 True if current locale matches string
-
contains(offset,range,"string")
-

-

+
contains(offset,range,"string")
+


 True if the range contains the string
+

 
String Constants

 String constants can be specified inside quotes ("") for strings
 containing whitespace and angle brackets (<>) for hexadecimal
diff --git a/doc/help/man-notifier.html b/doc/help/man-notifier.html
index 548677e94..01727e075 100644
--- a/doc/help/man-notifier.html
+++ b/doc/help/man-notifier.html
@@ -27,118 +27,103 @@ the first message or stay running until an error is seen.
 Messages sent to stderr are generally logged to the current ErrorLog.
 Each line begins with a standard prefix:
 
-
ALERT: message
-

-

+

+
ALERT: message
+


 Sets the printer-state-message attribute and adds the specified
 message to the current ErrorLog using the "alert" log level.
 
-
CRIT: message
-

-

+
CRIT: message
+


 Sets the printer-state-message attribute and adds the specified
 message to the current ErrorLog using the "critical" log level.
 
-
DEBUG: message
-

-

+
DEBUG: message
+


 Sets the printer-state-message attribute and adds the specified
 message to the current ErrorLog using the "debug" log level.
 
-
DEBUG2: message
-

-

+
DEBUG2: message
+


 Sets the printer-state-message attribute and adds the specified
 message to the current ErrorLog using the "debug2" log level.
 
-
EMERG: message
-

-

+
EMERG: message
+


 Sets the printer-state-message attribute and adds the specified
 message to the current ErrorLog using the "emergency" log level.
 
-
ERROR: message
-

-

+
ERROR: message
+


 Sets the printer-state-message attribute and adds the specified
 message to the current ErrorLog using the "error" log level.
 
-
INFO: message
-

-

+
INFO: message
+


 Sets the printer-state-message attribute. If the current LogLevel
 is set to "debug2", also adds the specified message to the
 current ErrorLog using the "info" log level.
 
-
NOTICE: message
-

-

+
NOTICE: message
+


 Sets the printer-state-message attribute and adds the specified
 message to the current ErrorLog using the "notice" log level.
 
-
WARNING: message
-

-

+
WARNING: message
+


 Sets the printer-state-message attribute and adds the specified
 message to the current ErrorLog using the "warning" log level.
 
+

 
Environment Variables

 The following environment variables are defined by the CUPS server when
 executing the notifier:
 
-
CHARSET
-

-

+

+
CHARSET
+


 The default text character set, typically utf-8.
 
-
CUPS_CACHEDIR
-

-

+
CUPS_CACHEDIR
+


 The directory for semi-persistent cache files can be found.
 
-
CUPS_DATADIR
-

-

+
CUPS_DATADIR
+


 The directory where data files can be found.
 
-
CUPS_FILETYPE
-

-

+
CUPS_FILETYPE
+


 The type of file being printed: "job-sheet" for a banner page and "document"
 for a regular print file.
 
-
CUPS_SERVERROOT
-

-

+
CUPS_SERVERROOT
+


 The root directory of the server.
 
-
LANG
-

-

+
LANG
+


 The default language locale (typically C or en).
 
-
PATH
-

-

+
PATH
+


 The standard execution path for external programs that may be run by
 the filter.
 
-
SOFTWARE
-

-

+
SOFTWARE
+


 The name and version number of the server (typically CUPS/1.2).
 
-
TZ
-

-

+
TZ
+


 The timezone of the server.
 
-
USER
-

-

+
USER
+


 The user executing the filter, typically "lp"; consult the cupsd.conf(5)
 file for the current setting.
 
+

 
See Also

 backend(7), cupsd(8), filter(7),
 

diff --git a/doc/help/man-ppdcfile.html b/doc/help/man-ppdcfile.html
index b0382278b..65e17cb3e 100644
--- a/doc/help/man-ppdcfile.html
+++ b/doc/help/man-ppdcfile.html
@@ -24,132 +24,71 @@ defined.
 
Directives may be placed anywhere on a line and are followed by
 one or more values. The following is a list of the available
 directives and the values they accept:
-
#define name value
-

-
#elif {name | value}
-

-
#else
-

-
#endif
-

-
#font name encoding "version" charset status
-

-
#if {name | value}
-

-
#include <filename>
-

-
#include "filename"
-

-
#media name width length
-

-
#media "name/text" width length
-

-
#po locale "filename.po"
-

-
Attribute name "" value
-

-
Attribute name keyword value
-

-
Attribute name "keyword/text" value
-

-
Choice name "code"
-

-
Choice "name/text" "code"
-

-
ColorDevice boolean-value
-

-
ColorModel name colorspace colororder compression
-

-
ColorModel "name/text" colorspace colororder compression
-

-
ColorProfile resolution/mediatype gamma density matrix
-

-
Copyright "text"
-

-
CustomMedia name width length left bottom right top "size-code" "region-code"
-

-
CustomMedia "name/text" width length left bottom right top "size-code" "region-code"
-

-
Cutter boolean-value
-

-
Darkness temperature name
-

-
Darkness temperature "name/text"
-

-
DriverType type
-

-
Duplex type
-

-
Filter mime-type cost program
-

-
Finishing name
-

-
Finishing "name/text"
-

-
Font *
-

-
Font name encoding "version" charset status
-

-
Group name
-

-
Group "name/text"
-

-
HWMargins left bottom right top
-

-
InputSlot position name
-

-
InputSlot position "name/text"
-

-
Installable name
-

-
Installable "name/text"
-

-
LocAttribute name "keyword/text" value
-

-
ManualCopies boolean-value
-

-
Manufacturer "name"
-

-
MaxSize width length
-

-
MediaSize name
-

-
MediaType type name
-

-
MediaType type "name/text"
-

-
MinSize width length
-

-
ModelName "name"
-

-
ModelNumber number
-

-
Option name type section order
-

-
Option "name/text" type section order
-

-
PCFileName "filename.ppd"
-

-
Resolution colorspace bits-per-color row-count row-feed row-step name
-

-
Resolution colorspace bits-per-color row-count row-feed row-step "name/text"
-

-
SimpleColorProfile resolution/mediatype density yellow-density red-density gamma red-adjust green-adjust blue-adjust
-

-
Throughput pages-per-minute
-

-
UIConstraints "*Option1 *Option2"
-

-
UIConstraints "*Option1 Choice1 *Option2"
-

-
UIConstraints "*Option1 *Option2 Choice2"
-

-
UIConstraints "*Option1 Choice1 *Option2 Choice2"
-

-
VariablePaperSize boolean-value
-

-
Version number
-

+

+
#define name value
+
#elif {name | value}
+
#else
+
#endif
+
#font name encoding "version" charset status
+
#if {name | value}
+
#include <filename>
+
#include "filename"
+
#media name width length
+
#media "name/text" width length
+
#po locale "filename.po"
+
Attribute name "" value
+
Attribute name keyword value
+
Attribute name "keyword/text" value
+
Choice name "code"
+
Choice "name/text" "code"
+
ColorDevice boolean-value
+
ColorModel name colorspace colororder compression
+
ColorModel "name/text" colorspace colororder compression
+
ColorProfile resolution/mediatype gamma density matrix
+
Copyright "text"
+
CustomMedia name width length left bottom right top "size-code" "region-code"
+
CustomMedia "name/text" width length left bottom right top "size-code" "region-code"
+
Cutter boolean-value
+
Darkness temperature name
+
Darkness temperature "name/text"
+
DriverType type
+
Duplex type
+
Filter mime-type cost program
+
Finishing name
+
Finishing "name/text"
+
Font *
+
Font name encoding "version" charset status
+
Group name
+
Group "name/text"
+
HWMargins left bottom right top
+
InputSlot position name
+
InputSlot position "name/text"
+
Installable name
+
Installable "name/text"
+
LocAttribute name "keyword/text" value
+
ManualCopies boolean-value
+
Manufacturer "name"
+
MaxSize width length
+
MediaSize name
+
MediaType type name
+
MediaType type "name/text"
+
MinSize width length
+
ModelName "name"
+
ModelNumber number
+
Option name type section order
+
Option "name/text" type section order
+
PCFileName "filename.ppd"
+
Resolution colorspace bits-per-color row-count row-feed row-step name
+
Resolution colorspace bits-per-color row-count row-feed row-step "name/text"
+
SimpleColorProfile resolution/mediatype density yellow-density red-density gamma red-adjust green-adjust blue-adjust
+
Throughput pages-per-minute
+
UIConstraints "*Option1 *Option2"
+
UIConstraints "*Option1 Choice1 *Option2"
+
UIConstraints "*Option1 *Option2 Choice2"
+
UIConstraints "*Option1 Choice1 *Option2 Choice2"
+
VariablePaperSize boolean-value
+
Version number
+

 
See Also

 ppdc(1), ppdhtml(1), ppdi(1), ppdmerge(1), ppdpo(1)
 

diff --git a/doc/help/man-ppdi.html b/doc/help/man-ppdi.html
index 1e326b911..a0b197bca 100644
--- a/doc/help/man-ppdi.html
+++ b/doc/help/man-ppdi.html
@@ -18,7 +18,7 @@ ppdi - import ppd files
 ]
 ppd-file
 [
-ppd-file2... ppd-fileN
+ppd-file2...ppd-fileN
 ]
 
Description

 ppdi imports one or more PPD files into a PPD compiler source file.
diff --git a/doc/help/man-ppdmerge.html b/doc/help/man-ppdmerge.html
index 7dd7aab79..d9d4184f2 100644
--- a/doc/help/man-ppdmerge.html
+++ b/doc/help/man-ppdmerge.html
@@ -17,7 +17,7 @@ ppdmerge - merge ppd files
 ppd-file
 ppd-file2
 [
-... ppd-fileN
+...ppd-fileN
 ]
 
Description

 ppdmerge merges two or more PPD files into a single, multi-language
diff --git a/doc/help/man-printers.conf.html b/doc/help/man-printers.conf.html
index 7127c6a32..377b097a3 100644
--- a/doc/help/man-printers.conf.html
+++ b/doc/help/man-printers.conf.html
@@ -17,94 +17,71 @@ are added or deleted.
 
Each line in the file can be a configuration directive, a blank line,
 or a comment. Comment lines start with the # character.
 
Directives

-
<Printer name> ... </Printer>
-

-

+

+
<Printer name> ... </Printer>
+


 Defines a specific printer.
-
<DefaultPrinter name> ... </Printer>
-

-

+
<DefaultPrinter name> ... </Printer>
+


 Defines a default printer.
-
Accepting Yes
-

-
Accepting No
-

-

+
Accepting Yes
+
Accepting No
+


 Specifies whether the printer is accepting new jobs.
-
AllowUser [ user @group ... ]
-

-

+
AllowUser [ user @group ... ]
+


 Allows specific users and groups to print to the printer.
-
DenyUser [ user @group ... ]
-

-

+
DenyUser [ user @group ... ]
+


 Prevents specific users and groups from printing to the printer.
-
DeviceURI uri
-

-

+
DeviceURI uri
+


 Specifies the device URI for a printer.
-
ErrorPolicy abort-job
-

-
ErrorPolicy retry-current-job
-

-
ErrorPolicy retry-job
-

-
ErrorPolicy stop-printer
-

-

+
ErrorPolicy abort-job
+
ErrorPolicy retry-current-job
+
ErrorPolicy retry-job
+
ErrorPolicy stop-printer
+


 Specifies the error policy for the printer.
-
Info text
-

-

+
Info text
+


 Specifies human-readable text describing the printer.
-
JobSheets banner banner
-

-

+
JobSheets banner banner
+


 Specifies the banner pages to use for the printer.
-
KLimit number
-

-

+
KLimit number
+


 Specifies the job-k-limit value for the printer.
-
Location text
-

-

+
Location text
+


 Specifies human-readable text describing the location of the printer.
-
OpPolicy name
-

-

+
OpPolicy name
+


 Specifies the operation policy for the printer.
-
PageLimit number
-

-

+
PageLimit number
+


 Specifies the job-page-limit value for the printer.
-
PortMonitor monitor
-

-

+
PortMonitor monitor
+


 Specifies the port monitor for a printer.
-
QuotaPeriod seconds
-

-

+
QuotaPeriod seconds
+


 Specifies the job-quota-period value for the printer.
-
Shared Yes
-

-
Shared No
-

-

+
Shared Yes
+
Shared No
+


 Specifies whether the printer is shared.
-
State idle
-

-
State stopped
-

-

+
State idle
+
State stopped
+


 Specifies the initial state of the printer (Idle or Stopped)
-
StateMessage text
-

-

+
StateMessage text
+


 Specifies the message associated with the state.
-
StateTime seconds
-

-

+
StateTime seconds
+


 Specifies the date/time associated with the state.
+

 
See Also

 classes.conf(5), cupsd(8), cupsd.conf(5),
 mime.convs(5), mime.types(5),
diff --git a/doc/help/man-subscriptions.conf.html b/doc/help/man-subscriptions.conf.html
index edd3267f1..da5e006fb 100644
--- a/doc/help/man-subscriptions.conf.html
+++ b/doc/help/man-subscriptions.conf.html
@@ -17,59 +17,49 @@ program when subscriptions are created, renewed, or cancelled.
 
Each line in the file can be a configuration directive, a blank line,
 or a comment. Comment lines start with the # character.
 
Directives

-
<Subscription NNN> ... </Subscription>
-

-

+

+
<Subscription NNN> ... </Subscription>
+


 Defines a subscription.
-
Events name [ ... name ]
-

-

+
Events name [ ... name ]
+


 Specifies the events that are subscribed.
-
ExpirationTime unix-time
-

-

+
ExpirationTime unix-time
+


 Specifies the expiration time of a subscription as a UNIX time
 value in seconds since January 1st, 1970.
-
Interval seconds
-

-

+
Interval seconds
+


 Specifies the preferred time interval for event notifications in
 seconds.
-
JobId job-id
-

-

+
JobId job-id
+


 Specifies the job ID associated with the subscription.
-
LeaseDuration seconds
-

-

+
LeaseDuration seconds
+


 Specifies the number of seconds that the subscription is valid
 for. If 0, the subscription does not expire.
-
NextEventId number
-

-

+
NextEventId number
+


 Specifies the next notify-sequence-number to use for the
 subscription.
-
NextSubscriptionId number
-

-

+
NextSubscriptionId number
+


 Specifies the next subscription-id to use.
-
Owner username
-

-

+
Owner username
+


 Specifies the user that owns the subscription.
-
PrinterName printername
-

-

+
PrinterName printername
+


 Specifies the printer or class associated with the subscription.
-
Recipient uri
-

-

+
Recipient uri
+


 Specifies the notify-recipient-uri value for push-type notifications.
-
UserData hex-escaped-data
-

-

+
UserData hex-escaped-data
+


 Specifies user data to be included in event notifications. This
 is typically the "from" address in mailto: notifications.
+

 
See Also

 classes.conf(5), cupsd(8), cupsd.conf(5),
 mime.convs(5), mime.types(5), printers.conf(5)
diff --git a/man/cups.man b/man/cups.man
index 5c23eb00f..87845d058 100644
--- a/man/cups.man
+++ b/man/cups.man
@@ -39,15 +39,11 @@ When the print job is completely printed,
 .B CUPS
 removes the job from the queue and moves on to any other jobs you have submitted. You can also be notified when the job is finished, or if there are any errors during printing, in several different ways.
 .SS WHERE DO I BEGIN?
-The easiest way to start is by using the
-.B CUPS
-web interface to configure your printer. Go to "http://localhost:631" and choose the Administration tab at the top of the page. Click/press on the Add Printer button and follow the prompts.
+The easiest way to start is by using the web interface to configure your printer. Go to "http://localhost:631" and choose the Administration tab at the top of the page. Click/press on the Add Printer button and follow the prompts.
 .LP
 When you are asked for a username and password, enter your login username and password or the "root" username and password.
 .LP
-After the printer is added,
-.B CUPS
-will ask you to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click on the Set Default Options button to save them. Some printers also support auto-configuration - click on the Query Printer for Default Options button to update the options automatically.
+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.
 .LP
 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.
 .LP
@@ -62,75 +58,91 @@ Additionally, your operating system may include graphical user interfaces or aut
 The
 .B CUPS
 web site (http://www.CUPS.org) provides access to the
-.B CUPS
-user mailing list, additional documentation and resources, and a bug report database. Most vendors also provide online discussion forums to ask printing questions for your operating system of choice.
+.I cups
+and
+.I cups-devel
+mailing lists, additional documentation and resources, and a bug report database. Most vendors also provide online discussion forums to ask printing questions for your operating system of choice.
 .SH ENVIRONMENT
 .B CUPS
 commands use the following environment variables to override the default locations of files and so forth. For security reasons, these environment variables are ignored for setuid programs:
 .TP 5
-CUPS_SERVER
-The hostname/IP address and port number of the CUPS scheduler (hostname:port or ipaddress:port).
-.TP 5
-CUPS_ANYROOT
+.B CUPS_ANYROOT
 Whether to allow any X.509 certificate root (Y or N).
 .TP 5
-CUPS_CACHEDIR
+.B CUPS_CACHEDIR
 The directory where semi-persistent cache files can be found.
 .TP 5
-CUPS_DATADIR
+.B CUPS_DATADIR
 The directory where data files can be found.
 .TP 5
-CUPS_ENCRYPTION
+.B CUPS_ENCRYPTION
 The default level of encryption (Always, IfRequested, Never, Required).
 .TP 5
-CUPS_EXPIREDROOT
+.B CUPS_EXPIREDROOT
 Whether to allow expired X.509 certificate roots (Y or N).
 .TP 5
-CUPS_EXPIREDCERTS
+.B CUPS_EXPIREDCERTS
 Whether to allow expired X.509 certificates (Y or N).
 .TP 5
-CUPS_GSSSERVICENAME
+.B CUPS_GSSSERVICENAME
 The Kerberos service name used for authentication.
 .TP 5
-CUPS_SERVERBIN
+.B CUPS_SERVER
+The hostname/IP address and port number of the CUPS scheduler (hostname:port or ipaddress:port).
+.TP 5
+.B CUPS_SERVERBIN
 The directory where server helper programs, filters, backend, etc. can be found.
 .TP 5
-CUPS_SERVERROOT
+.B CUPS_SERVERROOT
 The root directory of the server.
 .TP 5
-CUPS_STATEDIR
+.B CUPS_STATEDIR
 The directory where state files can be found.
 .TP 5
-CUPS_USER
+.B CUPS_USER
 Specifies the name of the user for print requests.
 .TP 5
-HOME
+.B HOME
 Specifies the home directory of the current user.
 .TP 5
-IPP_PORT
+.B IPP_PORT
 Specifies the default port number for IPP requests.
 .TP 5
-LOCALEDIR
+.B LOCALEDIR
 Specifies the location of localization files.
 .TP 5
-LPDEST
+.B LPDEST
 Specifies the default print queue (System V standard).
 .TP 5
-PRINTER
+.B PRINTER
 Specifies the default print queue (Berkeley standard).
 .TP 5
-TMPDIR
+.B TMPDIR
 Specifies the location of temporary files.
 .SH FILES
-~/.cups/client.conf, ~/.cups/lpoptions
+.nf
+.I ~/.cups/client.conf
+.I ~/.cups/lpoptions
+.fi
 .SH CONFORMING TO
 .B CUPS
 conforms to the Internet Printing Protocol version 2.1 and implements the Berkeley and System V UNIX print commands.
 .SH SEE ALSO
-.BR cancel (1), client.conf (7), cupsctl (8), cupsd (8), lp (1), lpadmin (8), lpinfo (8), lpoptions (1), lpr (1), lprm (1), lpq (1), lpstat (1),
-http://localhost:631/help,
-http://www.CUPS.org,
-http://www.pwg.org/ipp
+.BR cancel (1),
+.BR client.conf (7),
+.BR cupsctl (8),
+.BR cupsd (8),
+.BR lp (1),
+.BR lpadmin (8),
+.BR lpinfo (8),
+.BR lpoptions (1),
+.BR lpr (1),
+.BR lprm (1),
+.BR lpq (1),
+.BR lpstat (1),
+CUPS Online Help (http://localhost:631/help),
+CUPS Web Site (http://www.CUPS.org),
+PWG Internet Printing Protocol Workgroup (http://www.pwg.org/ipp)
 .SH COPYRIGHT
 Copyright \[co] 2007-2014 by Apple Inc.
 .\"
diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in
index 363482eac..40fe9bdc1 100644
--- a/man/cupsd.conf.man.in
+++ b/man/cupsd.conf.man.in
@@ -20,7 +20,9 @@ The
 .I cupsd.conf
 file configures the CUPS scheduler,
 .BR cupsd (8).
-It is normally located in the \fI/etc/cups\fR directory. \fBNote:\fR File, directory, and user configuration directives that used to be allowed in the \fIcupsd.conf\fR file are now stored in the \fIcups-files.conf(5)\fR instead in order to prevent certain types of privilege escalation attacks.
+It is normally located in the
+.I /etc/cups
+directory. \fBNote:\fR File, directory, and user configuration directives that used to be allowed in the \fIcupsd.conf\fR file are now stored in the \fIcups-files.conf(5)\fR instead in order to prevent certain types of privilege escalation attacks.
 .LP
 Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character. The configuration directives are intentionally similar to those used by the popular Apache web server software and are described below.
 .SH TOP-LEVEL DIRECTIVES
diff --git a/man/cupsd.man.in b/man/cupsd.man.in
index 55b4dd737..58c09393c 100644
--- a/man/cupsd.man.in
+++ b/man/cupsd.man.in
@@ -12,14 +12,25 @@
 .\" which should have been included with this file.  If this file is
 .\" file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.TH cupsd 8 "CUPS" "4 March 2014" "Apple Inc."
+.TH cupsd 8 "CUPS" "3 April 2014" "Apple Inc."
 .SH NAME
 cupsd \- cups scheduler
 .SH SYNOPSIS
 .B cupsd
-[ -c
+[
+.B \-c
 .I config-file
-] [ -f ] [ -F ] [ -h ] [ -l ] [ -t ]
+] [ 
+.B \-f
+] [
+.B \-F
+] [
+.B \-h
+] [
+.B -l
+] [
+.B -t
+]
 .SH DESCRIPTION
 .B cupsd
 is the scheduler for CUPS. It implements a printing system based upon the Internet Printing Protocol, version 2.1. If no options are specified on the command-line then the default configuration file
@@ -27,37 +38,87 @@ is the scheduler for CUPS. It implements a printing system based upon the Intern
 will be used.
 .SH OPTIONS
 .TP 5
--c config-file
+.BI \-c \ config-file
 Uses the named configuration file.
 .TP 5
--f
+.B \-f
 Run
 .B cupsd
 in the foreground; the default is to run in the background as a "daemon".
 .TP 5
--F
+.B \-F
 Run
 .B cupsd
 in the foreground but detach the process from the controlling terminal and current directory. This is useful for running
-.BR cupsd from init (8).
+.B cupsd
+from
+.BR init (8).
 .TP 5
--h
+.B \-h
 Shows the program usage.
 .TP 5
--l
+.B \-l
 This option is passed to
 .B cupsd
 when it is run from
-.BR launchd (8).
+.BR launchd (8)
+or
+.BR systemd (8).
 .TP 5
--t
+.B \-t
 Test the configuration file for syntax errors.
-.SH COMPATIBILITY
+.SH FILES
+.nf
+.I /etc/cups/classes.conf
+.I /etc/cups/cups-files.conf
+.I /etc/cups/cupsd.conf
+.I /usr/share/cups/mime/mime.convs
+.I /usr/share/cups/mime/mime.types
+.I /etc/cups/printers.conf
+.fi
+.SH CONFORMING TO
+.B cupsd
+implements all of the required IPP/2.1 attributes and operations. It also implements several CUPS-specific administrative operations.
+.SH EXAMPLES
+Run
+.B cupsd
+in the background with the default configuration file:
+.nf
+
+    cupsd
+
+.fi
+Test a configuration file called
+.IR test.conf :
+.nf
+
+    cupsd \-t \-c test.conf
+
+.fi
+Run
 .B cupsd
-implements all of the required IPP/2.1 attributes and operations. It also implements several CUPS-specific administration operations.
+in the foreground with a test configuration file called
+.IR test.conf :
+.nf
+
+    cupsd \-f \-c test.conf
+
+.fi
 .SH SEE ALSO
-.BR backend (7), classes.conf (5), cups-deviced (8), cups-driverd (8), cups-lpd (8), cupsd.conf (5), filter (7), launchd (8), mime.convs (5), mime.types (5), printers.conf (5),
-http://localhost:631/help
+.BR backend (7),
+.BR classes.conf (5),
+.BR cups (1),
+.BR cups-deviced (8),
+.BR cups-driverd (8),
+.BR cups-lpd (8),
+.BR cupsd.conf (5),
+.BR filter (7),
+.BR launchd (8),
+.BR mime.convs (5),
+.BR mime.types (5),
+.BR printers.conf (5),
+.BR systemd (8),
+CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2014 by Apple Inc.
 .\"
diff --git a/man/mantohtml.c b/man/mantohtml.c
index 9a49a9bdb..7c7f38972 100644
--- a/man/mantohtml.c
+++ b/man/mantohtml.c
@@ -53,7 +53,8 @@ main(int  argc,				/* I - Number of command-line args */
 		*outfile;		/* Output file */
   char		line[1024],		/* Line from file */
 		*lineptr,		/* Pointer into line */
-		name[1024];		/* Man page name */
+		name[1024],		/* Man page name */
+		ddpost[256];		/* Tagged list post markup */
   int		section = -1,		/* Man page section */
 		pre = 0,		/* Preformatted */
 		font = 0,		/* Current font */
@@ -218,6 +219,12 @@ main(int  argc,				/* I - Number of command-line args */
 	font = 0;
 
         html_alternate(line + 3, "b", "b", outfile);
+
+	if (post)
+	{
+	  fputs(post, outfile);
+	  post = NULL;
+	}
       }
       else if (!strncmp(line, ".I ", 3))
       {
@@ -229,6 +236,12 @@ main(int  argc,				/* I - Number of command-line args */
 	font = 0;
 
         html_alternate(line + 3, "i", "i", outfile);
+
+	if (post)
+	{
+	  fputs(post, outfile);
+	  post = NULL;
+	}
       }
       else if (!strncmp(line, ".BI ", 4))
       {
@@ -240,6 +253,12 @@ main(int  argc,				/* I - Number of command-line args */
 	font = 0;
 
         html_alternate(line + 4, "b", "i", outfile);
+
+	if (post)
+	{
+	  fputs(post, outfile);
+	  post = NULL;
+	}
       }
       else if (!strncmp(line, ".BR ", 4))
       {
@@ -251,6 +270,12 @@ main(int  argc,				/* I - Number of command-line args */
 	font = 0;
 
         html_alternate(line + 4, "b", NULL, outfile);
+
+	if (post)
+	{
+	  fputs(post, outfile);
+	  post = NULL;
+	}
       }
       else if (!strncmp(line, ".IB ", 4))
       {
@@ -262,6 +287,12 @@ main(int  argc,				/* I - Number of command-line args */
 	font = 0;
 
         html_alternate(line + 4, "i", "b", outfile);
+
+	if (post)
+	{
+	  fputs(post, outfile);
+	  post = NULL;
+	}
       }
       else if (!strncmp(line, ".IR ", 4))
       {
@@ -273,6 +304,12 @@ main(int  argc,				/* I - Number of command-line args */
 	font = 0;
 
         html_alternate(line + 4, "i", NULL, outfile);
+
+	if (post)
+	{
+	  fputs(post, outfile);
+	  post = NULL;
+	}
       }
       else if (!strncmp(line, ".RB ", 4))
       {
@@ -284,6 +321,12 @@ main(int  argc,				/* I - Number of command-line args */
 	font = 0;
 
         html_alternate(line + 4, NULL, "b", outfile);
+
+	if (post)
+	{
+	  fputs(post, outfile);
+	  post = NULL;
+	}
       }
       else if (!strncmp(line, ".RI ", 4))
       {
@@ -295,6 +338,12 @@ main(int  argc,				/* I - Number of command-line args */
 	font = 0;
 
         html_alternate(line + 4, NULL, "i", outfile);
+
+	if (post)
+	{
+	  fputs(post, outfile);
+	  post = NULL;
+	}
       }
       else if (!strncmp(line, ".SB ", 4))
       {
@@ -306,6 +355,12 @@ main(int  argc,				/* I - Number of command-line args */
 	font = 0;
 
         html_alternate(line + 4, "small", "b", outfile);
+
+	if (post)
+	{
+	  fputs(post, outfile);
+	  post = NULL;
+	}
       }
       else if (!strncmp(line, ".SM ", 4))
       {
@@ -317,6 +372,12 @@ main(int  argc,				/* I - Number of command-line args */
 	font = 0;
 
         html_alternate(line + 4, "small", "small", outfile);
+
+	if (post)
+	{
+	  fputs(post, outfile);
+	  post = NULL;
+	}
       }
       else if (!strcmp(line, ".LP") || !strcmp(line, ".PP") || !strcmp(line, ".P"))
       {
@@ -368,14 +429,12 @@ main(int  argc,				/* I - Number of command-line args */
 
         fputs("\n", outfile);
       }
-      else if (!strcmp(line, ".HP") || !strncmp(line, ".HP ", 4) ||
-               !strcmp(line, ".TP") || !strncmp(line, ".TP ", 4))
+      else if (!strcmp(line, ".HP") || !strncmp(line, ".HP ", 4))
       {
        /*
-        * Hanging paragraph/tagged list...
+        * Hanging paragraph...
         *
         * .HP i
-        * .TP i
 	*/
 
 	float amount = 3.0;		/* Indentation */
@@ -397,6 +456,38 @@ main(int  argc,				/* I - Number of command-line args */
         if (line[1] == 'T')
           post = "
\n";
       }
+      else if (!strcmp(line, ".TP") || !strncmp(line, ".TP ", 4))
+      {
+       /*
+        * Tagged list...
+        *
+        * .TP i
+	*/
+
+	float amount = 3.0;		/* Indentation */
+
+        if (line[3])
+          amount = atof(line + 4);
+
+	fputs(end_fonts[font], outfile);
+	font = 0;
+
+        if (list && strcmp(list, "dl"))
+        {
+          fprintf(outfile, "\n", list);
+          list = NULL;
+        }
+
+        if (!list)
+        {
+          fputs("
\n", outfile);
+          list = "dl";
+        }
+
+        fputs("
", outfile);
+        snprintf(ddpost, sizeof(ddpost), "
", amount);
+	post = ddpost;
+      }
       else if (!strncmp(line, ".IP ", 4))
       {
        /*
@@ -511,7 +602,7 @@ main(int  argc,				/* I - Number of command-line args */
         * Ignore unused commands...
 	*/
       }
-      else if (!strncmp(line, ".Vb", 3) || !strncmp(line, ".nf", 3))
+      else if (!strncmp(line, ".Vb", 3) || !strncmp(line, ".nf", 3) || !strncmp(line, ".EX", 3))
       {
        /*
         * Start preformatted...
@@ -527,9 +618,9 @@ main(int  argc,				/* I - Number of command-line args */
 	}
 
         pre = 1;
-	fputs("
\n", outfile);
+	fputs("
\n", outfile);
       }
-      else if (!strncmp(line, ".Ve", 3) || !strncmp(line, ".fi", 3))
+      else if (!strncmp(line, ".Ve", 3) || !strncmp(line, ".fi", 3) || !strncmp(line, ".EE", 3))
       {
        /*
         * End preformatted...
@@ -763,9 +854,6 @@ html_alternate(const char *s,		/* I - String */
 
     while (isspace(*s & 255))
       s ++;
-
-    if (*s && *s != '(' && *s != '.' && *s != ',')
-      putc(' ', fp);
   }
 
   putc('\n', fp);
@@ -869,6 +957,24 @@ html_fputs(const char *s,		/* I  - String */
               break;
         }
       }
+      else if (*s == '(')
+      {
+        if (!strncmp(s, "(em", 3))
+        {
+          fputs("—", fp);
+          s += 3;
+        }
+        else if (!strncmp(s, "(en", 3))
+        {
+          fputs("–", fp);
+          s += 3;
+        }
+        else
+        {
+          putc(*s, fp);
+          s ++;
+        }
+      }
       else if (*s == '[')
       {
        /*
-- 
2.39.2