diff options
Diffstat (limited to 'man')
49 files changed, 246 insertions, 360 deletions
diff --git a/man/Makefile b/man/Makefile index e01cf58..8e75e89 100644 --- a/man/Makefile +++ b/man/Makefile @@ -1,6 +1,4 @@ # -# "$Id: Makefile 12814 2015-07-30 15:03:33Z msweet $" -# # Man page makefile for CUPS. # # Copyright 2007-2015 by Apple Inc. @@ -225,8 +223,3 @@ mantohtml: mantohtml.o ../cups/$(LIBCUPSSTATIC) $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ mantohtml.o \ ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \ $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) - - -# -# End of "$Id: Makefile 12814 2015-07-30 15:03:33Z msweet $". -# diff --git a/man/backend.man b/man/backend.man index c744b11..e5bf2a3 100644 --- a/man/backend.man +++ b/man/backend.man @@ -1,6 +1,4 @@ .\" -.\" "$Id: backend.man 12854 2015-08-28 14:08:00Z msweet $" -.\" .\" Backend man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -176,7 +174,7 @@ CUPS backends are not generally design to be run directly by the user. Aside fro .I argv[0] and .B DEVICE_URI -environment variable contain the device URI), CUPS backends also expect specific environment variables and file descriptors, and typically run in a user session that (on OS X) has additional restrictions that affect how it runs. Backends can also be installed with restricted permissions (0500 or 0700) that tell the scheduler to run them as the "root" user instead of an unprivileged user (typically "lp") on the system. +environment variable contain the device URI), CUPS backends also expect specific environment variables and file descriptors, and typically run in a user session that (on macOS) has additional restrictions that affect how it runs. Backends can also be installed with restricted permissions (0500 or 0700) that tell the scheduler to run them as the "root" user instead of an unprivileged user (typically "lp") on the system. .LP Unless you are a developer and know what you are doing, please do not run backends directly. Instead, use the .BR lp (1) @@ -199,7 +197,4 @@ for more information. .br CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: backend.man 12854 2015-08-28 14:08:00Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/cancel.man b/man/cancel.man index 97c5b72..046e95c 100644 --- a/man/cancel.man +++ b/man/cancel.man @@ -1,6 +1,4 @@ .\" -.\" "$Id: cancel.man 12854 2015-08-28 14:08:00Z msweet $" -.\" .\" cancel man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -93,7 +91,4 @@ Administrators wishing to prevent unauthorized cancellation of jobs via the \fI\ .BR lpstat (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: cancel.man 12854 2015-08-28 14:08:00Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/classes.conf.man b/man/classes.conf.man index 9e4a113..7cded0c 100644 --- a/man/classes.conf.man +++ b/man/classes.conf.man @@ -1,6 +1,4 @@ .\" -.\" "$Id: classes.conf.man 12854 2015-08-28 14:08:00Z msweet $" -.\" .\" classes.conf man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -30,7 +28,4 @@ The name, location, and format of this file are an implementation detail that wi .BR subscriptions.conf (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: classes.conf.man 12854 2015-08-28 14:08:00Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/client.conf.man.in b/man/client.conf.man.in index ae6cdb0..8f5082a 100644 --- a/man/client.conf.man.in +++ b/man/client.conf.man.in @@ -1,9 +1,7 @@ .\" -.\" "$Id: client.conf.man.in 12645 2015-05-20 01:20:52Z msweet $" -.\" .\" client.conf man page for CUPS. .\" -.\" Copyright 2007-2015 by Apple Inc. +.\" Copyright 2007-2016 by Apple Inc. .\" Copyright 2006 by Easy Software Products. .\" .\" These coded instructions, statements, and computer programs are the @@ -12,15 +10,17 @@ .\" 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 client.conf 5 "CUPS" "19 May 2015" "Apple Inc." +.TH client.conf 5 "CUPS" "20 June 2016" "Apple Inc." .SH NAME -client.conf \- client configuration file for cups (deprecated) +client.conf \- client configuration file for cups .SH DESCRIPTION The \fBclient.conf\fR file configures the CUPS client and is normally located in the \fI/etc/cups\fR and/or \fI~/.cups\fR directories. Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character. .LP -\fBNote:\fR Starting with OS X 10.7, this file is only used by command-line and X11 applications plus the IPP backend. -The \fBServerName\fR directive is not supported on OS X at all. +\fBNote:\fR Starting with macOS 10.7, this file is only used by command-line and X11 applications plus the IPP backend. +The \fBServerName\fR directive is not supported on macOS at all. +Starting with macOS 10.12, all applications can access these settings in the \fI/Library/Preferences/org.cups.PrintingPrefs.plist\fR file instead. +See the NOTES section below for more information. .SS DIRECTIVES The following directives are understood by the client. Consult the online help for detailed descriptions: .TP 5 @@ -34,7 +34,7 @@ The default is "Yes". .TP 5 \fBAllowExpiredCerts No\fR Specifies whether to allow TLS with expired certificates. -The default is "Yes". +The default is "No". .TP 5 \fBEncryption IfRequested\fR .TP 5 @@ -51,7 +51,7 @@ CUPS adds the remote hostname ("name@server.example.com") for you. The default n .TP 5 \fBServerName \fI/domain/socket\fR Specifies the address and optionally the port to use when connecting to the server. -\fBNote: This directive it not supported on OS X 10.7 or later.\fR +\fBNote: This directive it not supported on macOS 10.7 or later.\fR .TP 5 \fBServerName \fIhostname-or-ip-address\fR[\fI:port\fR]\fB/version=1.1\fR Specifies the address and optionally the port to use when connecting to a server running CUPS 1.3.12 and earlier. @@ -66,6 +66,12 @@ The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are requi The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0. The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1. .TP 5 +\fBTrustOnFirstUse Yes\fR +.TP 5 +\fBTrustOnFirstUse No\fR +Specifies whether to trust new TLS certificates by default. +The default is "Yes". +.TP 5 \fBUser \fIname\fR Specifies the default user name to use for requests. .TP 5 @@ -75,12 +81,20 @@ Specifies the default user name to use for requests. Specifies whether to only allow TLS with certificates whose common name matches the hostname. The default is "No". .SH NOTES -The \fBclient.conf\fR file is deprecated and will no longer be supported in a future version of CUPS. +The \fBclient.conf\fR file is deprecated on macOS and will no longer be supported in a future version of CUPS. +Configuration settings can instead be viewed or changed using the +.BR defaults (1) +command: +.nf +defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption Required +defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse -bool NO + +defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption +.fi +On Linux and other systems using GNU TLS, the \fI/etc/cups/ssl/site.crl\fR file, if present, provides a list of revoked X.509 certificates and is used when validating certificates. .SH SEE ALSO .BR cups (1), +.BR default (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: client.conf.man.in 12645 2015-05-20 01:20:52Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/cups-config.man b/man/cups-config.man index 0cd37a6..f6ca444 100644 --- a/man/cups-config.man +++ b/man/cups-config.man @@ -1,6 +1,4 @@ .\" -.\" "$Id: cups-config.man 12854 2015-08-28 14:08:00Z msweet $" -.\" .\" cups-config man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -110,7 +108,4 @@ Compile a simple one-file CUPS filter: .BR cups (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: cups-config.man 12854 2015-08-28 14:08:00Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/cups-files.conf.man.in b/man/cups-files.conf.man.in index 8603754..df001fb 100644 --- a/man/cups-files.conf.man.in +++ b/man/cups-files.conf.man.in @@ -1,9 +1,7 @@ .\" -.\" "$Id: cups-files.conf.man.in 12699 2015-06-08 18:16:30Z msweet $" -.\" .\" cups-files.conf man page for CUPS. .\" -.\" Copyright 2007-2015 by Apple Inc. +.\" Copyright 2007-2016 by Apple Inc. .\" Copyright 1997-2006 by Easy Software Products. .\" .\" These coded instructions, statements, and computer programs are the @@ -12,7 +10,7 @@ .\" 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 cups-files.conf 5 "CUPS" "3 June 2015" "Apple Inc." +.TH cups-files.conf 5 "CUPS" "20 June 2016" "Apple Inc." .SH NAME cups\-files.conf \- file and directory configuration file for cups .SH DESCRIPTION @@ -51,7 +49,7 @@ The default is "/var/log/cups/access_log". .TP 5 \fBConfigFilePerm \fImode\fR Specifies the permissions for all configuration files that the scheduler writes. -The default is "0644" on OS X and "0640" on all other operating systems. +The default is "0644" on macOS and "0640" on all other operating systems. .LP \fBNote:\fR The permissions for the \fIprinters.conf\fR file are currently masked to only allow access from the scheduler user (typically root). This is done because printer device URIs sometimes contain sensitive authentication information that should not be generally known on the system. @@ -171,7 +169,7 @@ The default is "/var/spool/cups". \fBSandboxing strict\fR Specifies the level of security sandboxing that is applied to print filters, backends, and other child processes of the scheduler. The default is "strict". -This directive is currently only used/supported on OS X. +This directive is currently only used/supported on macOS. .\"#ServerBin .TP 5 \fBServerBin \fIdirectory\fR @@ -181,8 +179,8 @@ The default is "/usr/lib/cups" or "/usr/libexec/cups" depending on the platform. .TP 5 \fBServerKeychain \fIpath\fR Specifies the location of TLS certificates and private keys. -The default is "/Library/Keychains/System.keychain" on OS X and "/etc/cups/ssl" on all other operating systems. -OS X uses its keychain database to store certificates and keys while other platforms use separate files in the specified directory, *.crt for PEM-encoded certificates and *.key for PEM-encoded private keys. +The default is "/Library/Keychains/System.keychain" on macOS and "/etc/cups/ssl" on all other operating systems. +macOS uses its keychain database to store certificates and keys while other platforms use separate files in the specified directory, *.crt for PEM-encoded certificates and *.key for PEM-encoded private keys. .\"#ServerRoot .TP 5 \fBServerRoot \fIdirectory\fR @@ -223,7 +221,4 @@ The default is "lp". .BR subscriptions.conf (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: cups-files.conf.man.in 12699 2015-06-08 18:16:30Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/cups-lpd.man.in b/man/cups-lpd.man.in index 2b52fa6..42f2453 100644 --- a/man/cups-lpd.man.in +++ b/man/cups-lpd.man.in @@ -1,6 +1,4 @@ .\" -.\" "$Id: cups-lpd.man.in 12854 2015-08-28 14:08:00Z msweet $" -.\" .\" cups-lpd man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -120,7 +118,4 @@ service using the corresponding control program. CUPS Online Help (http://localhost:631/help), RFC 2569 .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: cups-lpd.man.in 12854 2015-08-28 14:08:00Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/cups-snmp.conf.man b/man/cups-snmp.conf.man index 07dfcfb..c1e3f33 100644 --- a/man/cups-snmp.conf.man +++ b/man/cups-snmp.conf.man @@ -1,6 +1,4 @@ .\" -.\" "$Id: cups-snmp.conf.man 12854 2015-08-28 14:08:00Z msweet $" -.\" .\" snmp.conf man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -63,7 +61,4 @@ The default is 120 seconds (2 minutes). .BR cups-snmp (8), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: cups-snmp.conf.man 12854 2015-08-28 14:08:00Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/cups-snmp.man.in b/man/cups-snmp.man.in index 1ab3025..e1a81cf 100644 --- a/man/cups-snmp.man.in +++ b/man/cups-snmp.man.in @@ -1,6 +1,4 @@ .\" -.\" "$Id: cups-snmp.man.in 12854 2015-08-28 14:08:00Z msweet $" -.\" .\" SNMP backend man page for CUPS. .\" .\" Copyright 2012-2014 by Apple Inc. @@ -55,7 +53,4 @@ The CUPS SNMP backend uses the information from the Host, Printer, and Port Moni .BR lpinfo (8), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: cups-snmp.man.in 12854 2015-08-28 14:08:00Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/cups.man b/man/cups.man index 02a9bac..dc8bbbb 100644 --- a/man/cups.man +++ b/man/cups.man @@ -1,6 +1,4 @@ .\" -.\" "$Id: cups.man 12854 2015-08-28 14:08:00Z msweet $" -.\" .\" cups (intro) man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -141,7 +139,4 @@ 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-2015 by Apple Inc. -.\" -.\" End of "$Id: cups.man 12854 2015-08-28 14:08:00Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/cupsaccept.man b/man/cupsaccept.man index 70385f8..448704e 100644 --- a/man/cupsaccept.man +++ b/man/cupsaccept.man @@ -1,6 +1,4 @@ .\" -.\" "$Id: cupsaccept.man 12854 2015-08-28 14:08:00Z msweet $" -.\" .\" accept/reject man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -88,7 +86,4 @@ Finally, the CUPS versions may ask the user for an access password depending on .br CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: cupsaccept.man 12854 2015-08-28 14:08:00Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/cupsaddsmb.man.in b/man/cupsaddsmb.man.in index 355c372..1291069 100644 --- a/man/cupsaddsmb.man.in +++ b/man/cupsaddsmb.man.in @@ -1,6 +1,4 @@ .\" -.\" "$Id: cupsaddsmb.man.in 12854 2015-08-28 14:08:00Z msweet $" -.\" .\" cupsaddsmb man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -125,7 +123,4 @@ This is useful for debugging SAMBA configuration problems. .BR smb.conf (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: cupsaddsmb.man.in 12854 2015-08-28 14:08:00Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/cupsctl.man b/man/cupsctl.man index 1c14d6e..2d4e4ac 100644 --- a/man/cupsctl.man +++ b/man/cupsctl.man @@ -1,6 +1,4 @@ .\" -.\" "$Id: cupsctl.man 12854 2015-08-28 14:08:00Z msweet $" -.\" .\" cupsctl man page for CUPS. .\" .\" Copyright 2007-2016 by Apple Inc. @@ -100,7 +98,4 @@ You cannot set the Listen or Port directives using \fBcupsctl\fR. .br CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: cupsctl.man 12854 2015-08-28 14:08:00Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/cupsd-helper.man b/man/cupsd-helper.man index 51bdc30..37bf6a9 100644 --- a/man/cupsd-helper.man +++ b/man/cupsd-helper.man @@ -1,6 +1,4 @@ .\" -.\" "$Id: cupsd-helper.man 12854 2015-08-28 14:08:00Z msweet $" -.\" .\" cupsd-helper man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -57,7 +55,7 @@ with no arguments in order to discover the available printers. .LP The \fBcups-driverd\fR helper program lists all available printer drivers, a subset of "matching" printer drivers, or a copy of a specific driver PPD file. .LP -The \fBcups-exec\fR helper program runs backends, filters, and other programs. On OS X these programs are run in a secure sandbox. +The \fBcups-exec\fR helper program runs backends, filters, and other programs. On macOS these programs are run in a secure sandbox. .SH FILES The \fBcups-driverd\fR program looks for PPD and driver information files in the following directories: .nf @@ -88,7 +86,4 @@ Driver information files must conform to the format defined in .BR ppdcfile (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: cupsd-helper.man 12854 2015-08-28 14:08:00Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/cupsd-logs.man b/man/cupsd-logs.man index 7dbb706..39030a3 100644 --- a/man/cupsd-logs.man +++ b/man/cupsd-logs.man @@ -1,6 +1,4 @@ .\" -.\" "$Id: cupsd-logs.man 12854 2015-08-28 14:08:00Z msweet $" -.\" .\" cupsd-logs man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -235,7 +233,4 @@ The \fIsides\fR field contains a copy of the sides attribute provided with the I .BR cups-files.conf (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: cupsd-logs.man 12854 2015-08-28 14:08:00Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in index 9d38954..d4b2f8c 100644 --- a/man/cupsd.conf.man.in +++ b/man/cupsd.conf.man.in @@ -1,9 +1,7 @@ .\" -.\" "$Id: cupsd.conf.man.in 12767 2015-06-30 15:57:39Z msweet $" -.\" .\" cupsd.conf man page for CUPS. .\" -.\" Copyright 2007-2015 by Apple Inc. +.\" Copyright 2007-2016 by Apple Inc. .\" Copyright 1997-2006 by Easy Software Products. .\" .\" These coded instructions, statements, and computer programs are the @@ -12,7 +10,7 @@ .\" 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.conf 5 "CUPS" "30 June 2015" "Apple Inc." +.TH cupsd.conf 5 "CUPS" "21 June 2016" "Apple Inc." .SH NAME cupsd.conf \- server configuration file for cups .SH DESCRIPTION @@ -193,6 +191,14 @@ to verify that the hostname resolved from the address matches one of the address Double lookups also prevent clients with unregistered addresses from connecting to your server. The default is "Off" to avoid the potential server performance problems with hostname lookups. Only set this option to "On" or "Double" if absolutely required. +.\"#IdleExitTimeout +.TP 5 +\fBIdleExitTimeout \fIseconds\fR +Specifies the length of time to wait before shutting down due to inactivity. +The default is "60" seconds. +Note: Only applicable when +.BR cupsd (8) +is run on-demand (e.g., with \fB-l\fR). .\"#JobKillDelay .TP 5 \fBJobKillDelay \fIseconds\fR @@ -780,6 +786,7 @@ The group name "@SYSTEM" corresponds to the list of groups defined by the System .BR cups-files.conf (5) file. The group name "@OWNER" corresponds to the owner of the resource, for example the person that submitted a print job. +Note: The 'root' user is not special and must be granted privileges like any other user account. .TP 5 \fBRequire valid-user\fR Specifies that any authenticated user is acceptable. @@ -870,7 +877,4 @@ Require authentication for accesses from outside the 10. network: .BR subscriptions.conf (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: cupsd.conf.man.in 12767 2015-06-30 15:57:39Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/cupsd.man.in b/man/cupsd.man.in index 73cf362..8db10ac 100644 --- a/man/cupsd.man.in +++ b/man/cupsd.man.in @@ -1,6 +1,4 @@ .\" -.\" "$Id: cupsd.man.in 13087 2016-02-12 18:53:24Z msweet $" -.\" .\" cupsd man page for CUPS. .\" .\" Copyright 2007-2016 by Apple Inc. @@ -129,6 +127,3 @@ in the foreground with a test configuration file called CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2007-2016 by Apple Inc. -.\" -.\" End of "$Id: cupsd.man.in 13087 2016-02-12 18:53:24Z msweet $". -.\" diff --git a/man/cupsenable.man b/man/cupsenable.man index c81f4fd..cf38791 100644 --- a/man/cupsenable.man +++ b/man/cupsenable.man @@ -1,6 +1,4 @@ .\" -.\" "$Id: cupsenable.man 12854 2015-08-28 14:08:00Z msweet $" -.\" .\" cupsenable/cupsdisable man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -99,8 +97,4 @@ This differs from the System V versions which require the root user to execute t .BR lpstat (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. - -.\" -.\" End of "$Id: cupsenable.man 12854 2015-08-28 14:08:00Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/cupsfilter.man b/man/cupsfilter.man index 321d030..6ab7328 100644 --- a/man/cupsfilter.man +++ b/man/cupsfilter.man @@ -1,6 +1,4 @@ .\" -.\" "$Id: cupsfilter.man 12854 2015-08-28 14:08:00Z msweet $" -.\" .\" cupsfilter man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -137,7 +135,4 @@ The following command will generate a PDF preview of job 42 for a printer named .BR mime.types (7), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: cupsfilter.man 12854 2015-08-28 14:08:00Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/cupstestdsc.man b/man/cupstestdsc.man index e6d7c66..27a8958 100644 --- a/man/cupstestdsc.man +++ b/man/cupstestdsc.man @@ -1,6 +1,4 @@ .\" -.\" "$Id: cupstestdsc.man 12854 2015-08-28 14:08:00Z msweet $" -.\" .\" cupstestdsc man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -45,7 +43,4 @@ CUPS Online Help (http://localhost:631/help), Adobe PostScript Language Document Structuring Conventions Specification, Version 3.0. .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: cupstestdsc.man 12854 2015-08-28 14:08:00Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/cupstestppd.man b/man/cupstestppd.man index cf5f550..940ff90 100644 --- a/man/cupstestppd.man +++ b/man/cupstestppd.man @@ -1,6 +1,4 @@ .\" -.\" "$Id: cupstestppd.man 12854 2015-08-28 14:08:00Z msweet $" -.\" .\" cupstestppd man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -145,7 +143,4 @@ The next command tests all PPD files under the current directory and print detai CUPS Online Help (http://localhost:631/help), Adobe PostScript Printer Description File Format Specification, Version 4.3. .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: cupstestppd.man 12854 2015-08-28 14:08:00Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/filter.man b/man/filter.man index 0d51e99..009e0c0 100644 --- a/man/filter.man +++ b/man/filter.man @@ -1,6 +1,4 @@ .\" -.\" "$Id: filter.man 12848 2015-08-26 18:51:57Z msweet $" -.\" .\" filter man page for CUPS. .\" .\" Copyright 2007-2015 by Apple Inc. @@ -12,7 +10,7 @@ .\" 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 filter 7 "CUPS" "26 August 2015" "Apple Inc." +.TH filter 7 "CUPS" "19 October 2015" "Apple Inc." .SH NAME filter \- cups file conversion filter interface .SH SYNOPSIS @@ -202,13 +200,10 @@ The timezone of the server. .B USER The user executing the filter, typically "lp" or "root"; consult the \fIcups-files.conf\fR file for the current setting. .SH 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 -only filter. Typically the interface script will be provided via the -\fIlpadmin(8)\fR command using the \fI-i\fR option. +While the filter interface is compatible with System V interface scripts, CUPS does not support System V interface scripts. .SH NOTES CUPS filters are not meant to be run directly by the user. -Aside from the legacy System V interface issues (\fIargv[0]\fR is the printer name), CUPS filters also expect specific environment variables and file descriptors, and typically run in a user session that (on OS X) has additional restrictions that affect how it runs. +Aside from the legacy System V interface issues (\fIargv[0]\fR is the printer name), CUPS filters also expect specific environment variables and file descriptors, and typically run in a user session that (on macOS) has additional restrictions that affect how it runs. Unless you are a developer and know what you are doing, please do not run filters directly. Instead, use the .BR cupsfilter (8) @@ -222,7 +217,4 @@ program to use the appropriate filters to do the conversions you need. .br CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: filter.man 12848 2015-08-26 18:51:57Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/ippfind.man b/man/ippfind.man index df05050..219c47d 100644 --- a/man/ippfind.man +++ b/man/ippfind.man @@ -1,6 +1,4 @@ .\" -.\" "$Id: ippfind.man 12854 2015-08-28 14:08:00Z msweet $" -.\" .\" ippfind man page for CUPS. .\" .\" Copyright 2013-2014 by Apple Inc. @@ -256,6 +254,3 @@ Similarly, to send a PostScript test page to every PostScript printer, run: .BR ipptool (1) .SH COPYRIGHT Copyright \[co] 2013-2015 by Apple Inc. -.\" -.\" End of "$Id: ippfind.man 12854 2015-08-28 14:08:00Z msweet $". -.\" diff --git a/man/ipptool.man b/man/ipptool.man index 6dee72c..08a8b03 100644 --- a/man/ipptool.man +++ b/man/ipptool.man @@ -1,6 +1,4 @@ .\" -.\" "$Id: ipptool.man 12848 2015-08-26 18:51:57Z msweet $" -.\" .\" ipptool man page for CUPS. .\" .\" Copyright 2010-2015 by Apple Inc. @@ -242,7 +240,4 @@ IANA IPP Registry (http://www.iana.org/assignments/ipp\-registrations), PWG Internet Printing Protocol Workgroup (http://www.pwg.org/ipp) RFC 2911 (http://tools.ietf.org/html/rfc2911), .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: ipptool.man 12848 2015-08-26 18:51:57Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/ipptoolfile.man b/man/ipptoolfile.man index f9c5c41..cdc9504 100644 --- a/man/ipptoolfile.man +++ b/man/ipptoolfile.man @@ -1,6 +1,4 @@ .\" -.\" "$Id: ipptoolfile.man 12487 2015-02-05 15:42:59Z msweet $" -.\" .\" ipptoolfile man page for CUPS. .\" .\" Copyright 2010-2014 by Apple Inc. @@ -619,7 +617,4 @@ IANA IPP Registry (http://www.iana.org/assignments/ipp-registrations), PWG Internet Printing Protocol Workgroup (http://www.pwg.org/ipp), RFC 2911 (http://tools.ietf.org/html/rfc3911) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: ipptoolfile.man 12487 2015-02-05 15:42:59Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. @@ -1,9 +1,7 @@ .\" -.\" "$Id: lp.man 12854 2015-08-28 14:08:00Z msweet $" -.\" .\" lp man page for CUPS. .\" -.\" Copyright 2007-2014 by Apple Inc. +.\" Copyright 2007-2016 by Apple Inc. .\" Copyright 1997-2006 by Easy Software Products. .\" .\" These coded instructions, statements, and computer programs are the @@ -12,7 +10,7 @@ .\" 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 lp 1 "CUPS" "11 June 2014" "Apple Inc." +.TH lp 1 "CUPS" "2 May 2016" "Apple Inc." .SH NAME lp \- print files .SH SYNOPSIS @@ -129,6 +127,7 @@ Sets the number of copies to print. .TP 5 \fB\-o "\fIname\fB=\fIvalue \fR[ ... \fIname\fB=\fIvalue \fR]\fB"\fR Sets one or more job options. +See "COMMON JOB OPTIONS" below. .TP 5 \fB\-q \fIpriority\fR Sets the job priority from 1 (lowest) to 100 (highest). @@ -163,11 +162,64 @@ Aside from the printer-specific options reported by the .BR lpoptions (1) command, the following generic options are available: .TP 5 +\fB\-o collate=true\fR +Prints collated copies. +.TP 5 +\fB\-o fit\-to\-page\fR +Scales the print file to fit on the page. +.TP 5 +\fB\-o job-hold-until=\fIwhen\fR +Holds the job until the specified local time. +"when" can be "indefinite" to hold the until released, "day-time" to print the job between 6am and 6pm local time, "night" to print the job between 6pm and 6am local time, "second-shift" to print the job between 4pm and 12am local time, "third-shift" to print the job between 12am and 8am local time, or "weekend" to print the job on Saturday or Sunday. +.TP 5 +\fB\-o job-hold-until=\fIhh:mm\fR +Holds the job until the specified time in hours and minutes UTC. +.TP 5 +\fB\-o job-priority=\fIpriority\fR +Set the priority to a value from 1 (lowest) to 100 (highest), which influences when a job is scheduled for printing. +The default priority is typically 50. +.TP 5 +\fB\-o job-sheets=\fIname\fR\fR +Prints a cover page (banner) with the document. +The "name" can be "classified", "confidential", "secret", "standard", "topsecret", or "unclassified". +.TP 5 +\fB\-o job-sheets=\fIstart-name,end-name\fR\fR +Prints cover pages (banners) with the document. +.TP 5 \fB\-o media=\fIsize\fR Sets the page size to \fIsize\fR. Most printers support at least the size names "a4", "letter", and "legal". .TP 5 +\fB\-o mirror\fR +Mirrors each page. +.TP 5 +\fB\-o number\-up=\fR{\fI2|4|6|9|16\fR} +Prints 2, 4, 6, 9, or 16 document (input) pages on each output page. +.TP 5 +\fB\-o number\-up\-layout=\fIlayout\fR +Specifies the layout of pages with the "number-up" option. +The "layout" string can be "btlr", "btrl", "lrbt", "lrtb", "rlbt", "rltb", "tblr", or "tbrl" - the first two letters determine the column order while the second two letters determine the row order. +"bt" is bottom-to-top, "lr" is left-to-right, "rl" is right-to-left, and "tb" is top-to-bottom. +.TP 5 \fB\-o orientation\-requested=4\fR -Prints the job in landscape (rotated 90 degrees). +Prints the job in landscape (rotated 90 degrees counter-clockwise). +.TP 5 +\fB\-o orientation\-requested=5\fR +Prints the job in landscape (rotated 90 degrees clockwise). +.TP 5 +\fB\-o orientation\-requested=6\fR +Prints the job in reverse portrait (rotated 180 degrees). +.TP 5 +\fB\-o outputorder=reverse\fR +Prints pages in reverse order. +.TP 5 +\fB\-o page\-border=\fIborder\fR +Prints a border around each document page. +"border" is "double", "double\-thick", "single", or "single\-thick". +.TP 5 +\fB\-o page\-ranges=\fIpage-list\fR +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. .TP 5 \fB\-o sides=one\-sided\fR Prints on one side of the paper. @@ -177,12 +229,6 @@ Prints on both sides of the paper for portrait output. .TP 5 \fB\-o sides=two\-sided\-short\-edge\fR Prints on both sides of the paper for landscape output. -.TP 5 -\fB\-o fit\-to\-page\fR -Scales the print file to fit on the page. -.TP 5 -\fB\-o number\-up=\fR{\fI2|4|6|9|16\fR} -Prints 2, 4, 6, 9, or 16 document (input) pages on each output page. .SH CONFORMING TO Unlike the System V printing system, CUPS allows printer names to contain any printable character except SPACE, TAB, "/", or "#". Also, printer and class names are \fInot\fR case-sensitive. @@ -216,7 +262,4 @@ Print a presentation document 2-up to a printer called "foo": .BR lpstat (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: lp.man 12854 2015-08-28 14:08:00Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/lpadmin.man b/man/lpadmin.man index 1790022..757e631 100644 --- a/man/lpadmin.man +++ b/man/lpadmin.man @@ -1,9 +1,7 @@ .\" -.\" "$Id: lpadmin.man 12513 2015-02-11 19:45:01Z msweet $" -.\" .\" lpadmin man page for CUPS. .\" -.\" Copyright 2007-2015 by Apple Inc. +.\" Copyright 2007-2016 by Apple Inc. .\" Copyright 1997-2006 by Easy Software Products. .\" .\" These coded instructions, statements, and computer programs are the @@ -12,7 +10,7 @@ .\" 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 lpadmin 8 "CUPS" "11 February 2015" "Apple Inc." +.TH lpadmin 8 "CUPS" "29 March 2016" "Apple Inc." .SH NAME lpadmin \- configure cups printers and classes .SH SYNOPSIS @@ -82,16 +80,17 @@ The following options are recognized when configuring a printer queue: Adds the named \fIprinter\fR to \fIclass\fR. If \fIclass\fR does not exist it is created automatically. .TP 5 -\fB\-i \fIinterface\fR -Sets a System V style interface script for the printer. -This option cannot be specified with the \fI-P\fR option (PPD file) and is intended for providing support for legacy printer drivers. +\fB\-i \fIppd-file\fR +.TP 5 +\fB\-P \fIppd-file\fR +Specifies a PostScript Printer Description (PPD) file to use with the printer. .TP 5 \fB\-m \fImodel\fR -Sets a standard System V interface script or PPD file for the printer from the \fImodel\fR directory or using one of the driver interfaces. +Sets a standard PPD file for the printer from the \fImodel\fR directory or using one of the driver interfaces. Use the \fI-m\fR option with the .BR lpinfo (8) command to get a list of supported models. -The model "raw" clears any existing interface script or PPD file and the model "everywhere" queries the printer referred to by the specified IPP \fIdevice-uri\fR. +The model "raw" clears any existing PPD file and the model "everywhere" queries the printer referred to by the specified IPP \fIdevice-uri\fR. .TP 5 \fB\-o cupsIPPSupplies=true\fR .TP 5 @@ -170,6 +169,7 @@ If the resulting class becomes empty it is removed. 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. +Note: The user 'root' is not granted special access - using "-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'. .TP 5 \fB\-v "\fIdevice-uri\fB"\fR Sets the \fIdevice-uri\fR attribute of the printer queue. @@ -189,10 +189,6 @@ programs on the destination. .TP 5 \fB\-L "\fIlocation\fB"\fR Provides a textual location of the destination. -.TP 5 -\fB\-P \fIppd-file\fR -Specifies a PostScript Printer Description file to use with the printer. -If specified, this option overrides the \fI-i\fR option (interface script). .SH CONFORMING TO Unlike the System V printing system, CUPS allows printer names to contain any printable character except SPACE, TAB, "/", or "#". Also, printer and class names are \fInot\fR case-sensitive. @@ -214,7 +210,4 @@ Create an IPP Everywhere print queue: .BR lpoptions (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: lpadmin.man 12513 2015-02-11 19:45:01Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/lpc.man b/man/lpc.man index 4286b01..d025dba 100644 --- a/man/lpc.man +++ b/man/lpc.man @@ -1,6 +1,4 @@ .\" -.\" "$Id: lpc.man 12854 2015-08-28 14:08:00Z msweet $" -.\" .\" lpc man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -58,7 +56,4 @@ command or another CUPS-compatible client with that functionality. .BR lpstat (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: lpc.man 12854 2015-08-28 14:08:00Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/lpinfo.man b/man/lpinfo.man index f8dc471..5f9d28b 100644 --- a/man/lpinfo.man +++ b/man/lpinfo.man @@ -1,6 +1,4 @@ .\" -.\" "$Id: lpinfo.man 12854 2015-08-28 14:08:00Z msweet $" -.\" .\" lpinfo man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -20,9 +18,6 @@ lpinfo \- show available devices or drivers [ .B \-E ] [ -.B \-U -.I username -] [ \fB\-h \fIserver\fR[\fB:\fIport\fR] ] [ .B \-l @@ -51,9 +46,6 @@ lpinfo \- show available devices or drivers [ .B \-E ] [ -.B \-U -.I username -] [ \fB\-h \fIserver\fR[\fB:\fIport\fR] ] [ .B \-l @@ -77,9 +69,6 @@ The first form (\fI-m\fR) lists the available drivers, while the second form (\f .B \-E Forces encryption when connecting to the server. .TP 5 -\fB\-U \fIusername\fR -Sets the username to use when connecting to the server. -.TP 5 \fB\-h \fIserver\fR[\fB:\fIport\fR] Selects an alternate server. .TP 5 @@ -132,7 +121,4 @@ List drivers matching "HP LaserJet": .BR lpadmin (8), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: lpinfo.man 12854 2015-08-28 14:08:00Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/lpmove.man b/man/lpmove.man index 2447410..2206c40 100644 --- a/man/lpmove.man +++ b/man/lpmove.man @@ -1,9 +1,7 @@ .\" -.\" "$Id: lpmove.man 12854 2015-08-28 14:08:00Z msweet $" -.\" .\" lpmove man page for CUPS. .\" -.\" Copyright 2007-2014 by Apple Inc. +.\" Copyright 2007-2016 by Apple Inc. .\" Copyright 1997-2006 by Easy Software Products. .\" .\" These coded instructions, statements, and computer programs are the @@ -12,7 +10,7 @@ .\" 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 lpmove 8 "CUPS" "12 June 2014" "Apple Inc." +.TH lpmove 8 "CUPS" "26 May 2016" "Apple Inc." .SH NAME lpmove \- move a job or all jobs to a new destination .SH SYNOPSIS @@ -76,7 +74,4 @@ Move all jobs from "oldprinter" to "newprinter": .br CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: lpmove.man 12854 2015-08-28 14:08:00Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/lpoptions.man.in b/man/lpoptions.man.in index c9377c3..bf5adcf 100644 --- a/man/lpoptions.man.in +++ b/man/lpoptions.man.in @@ -1,6 +1,4 @@ .\" -.\" "$Id: lpoptions.man.in 12854 2015-08-28 14:08:00Z msweet $" -.\" .\" lpoptions man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -135,7 +133,4 @@ The \fBlpoptions\fR command is unique to CUPS. .BR lprm (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: lpoptions.man.in 12854 2015-08-28 14:08:00Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/lpq.man b/man/lpq.man index 7f71720..df8788a 100644 --- a/man/lpq.man +++ b/man/lpq.man @@ -1,6 +1,4 @@ .\" -.\" "$Id: lpq.man 12854 2015-08-28 14:08:00Z msweet $" -.\" .\" lpq man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -66,7 +64,4 @@ Requests a more verbose (long) reporting format. .BR lpstat (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: lpq.man 12854 2015-08-28 14:08:00Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/lpr.man b/man/lpr.man index ac24e3d..553d059 100644 --- a/man/lpr.man +++ b/man/lpr.man @@ -1,9 +1,7 @@ .\" -.\" "$Id: lpr.man 12854 2015-08-28 14:08:00Z msweet $" -.\" .\" lpr man page for CUPS. .\" -.\" Copyright 2007-2013 by Apple Inc. +.\" Copyright 2007-2016 by Apple Inc. .\" Copyright 1997-2006 by Easy Software Products. .\" .\" These coded instructions, statements, and computer programs are the @@ -12,7 +10,7 @@ .\" 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 lpr 1 "CUPS" "11 June 2014" "Apple Inc." +.TH lpr 1 "CUPS" "2 May 2016" "Apple Inc." .SH NAME lpr \- print files .SH SYNOPSIS @@ -103,6 +101,7 @@ Send an email on job completion. .TP 5 \fB\-o \fIoption\fR[\fB=\fIvalue\fR] Sets a job option. +See "COMMON JOB OPTIONS" below. .TP 5 .B \-p Specifies that the print file should be formatted with a shaded header with the date, time, job name, and page number. @@ -113,6 +112,78 @@ Hold job for printing. .TP 5 .B \-r Specifies that the named print files should be deleted after submitting them. +.SS COMMON JOB OPTIONS +Aside from the printer-specific options reported by the +.BR lpoptions (1) +command, the following generic options are available: +.TP 5 +\fB\-o collate=true\fR +Prints collated copies. +.TP 5 +\fB\-o fit\-to\-page\fR +Scales the print file to fit on the page. +.TP 5 +\fB\-o job-hold-until=\fIwhen\fR +Holds the job until the specified local time. +"when" can be "indefinite" to hold the until released, "day-time" to print the job between 6am and 6pm local time, "night" to print the job between 6pm and 6am local time, "second-shift" to print the job between 4pm and 12am local time, "third-shift" to print the job between 12am and 8am local time, or "weekend" to print the job on Saturday or Sunday. +.TP 5 +\fB\-o job-hold-until=\fIhh:mm\fR +Holds the job until the specified time in hours and minutes UTC. +.TP 5 +\fB\-o job-priority=\fIpriority\fR +Set the priority to a value from 1 (lowest) to 100 (highest), which influences when a job is scheduled for printing. +The default priority is typically 50. +.TP 5 +\fB\-o job-sheets=\fIname\fR\fR +Prints a cover page (banner) with the document. +The "name" can be "classified", "confidential", "secret", "standard", "topsecret", or "unclassified". +.TP 5 +\fB\-o job-sheets=\fIstart-name,end-name\fR\fR +Prints cover pages (banners) with the document. +.TP 5 +\fB\-o media=\fIsize\fR +Sets the page size to \fIsize\fR. Most printers support at least the size names "a4", "letter", and "legal". +.TP 5 +\fB\-o mirror\fR +Mirrors each page. +.TP 5 +\fB\-o number\-up=\fR{\fI2|4|6|9|16\fR} +Prints 2, 4, 6, 9, or 16 document (input) pages on each output page. +.TP 5 +\fB\-o number\-up\-layout=\fIlayout\fR +Specifies the layout of pages with the "number-up" option. +The "layout" string can be "btlr", "btrl", "lrbt", "lrtb", "rlbt", "rltb", "tblr", or "tbrl" - the first two letters determine the column order while the second two letters determine the row order. +"bt" is bottom-to-top, "lr" is left-to-right, "rl" is right-to-left, and "tb" is top-to-bottom. +.TP 5 +\fB\-o orientation\-requested=4\fR +Prints the job in landscape (rotated 90 degrees counter-clockwise). +.TP 5 +\fB\-o orientation\-requested=5\fR +Prints the job in landscape (rotated 90 degrees clockwise). +.TP 5 +\fB\-o orientation\-requested=6\fR +Prints the job in reverse portrait (rotated 180 degrees). +.TP 5 +\fB\-o outputorder=reverse\fR +Prints pages in reverse order. +.TP 5 +\fB\-o page\-border=\fIborder\fR +Prints a border around each document page. +"border" is "double", "double\-thick", "single", or "single\-thick". +.TP 5 +\fB\-o page\-ranges=\fIpage-list\fR +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. +.TP 5 +\fB\-o sides=one\-sided\fR +Prints on one side of the paper. +.TP 5 +\fB\-o sides=two\-sided\-long\-edge\fR +Prints on both sides of the paper for portrait output. +.TP 5 +\fB\-o sides=two\-sided\-short\-edge\fR +Prints on both sides of the paper for landscape output. .SH NOTES The \fI\-c\fR, \fI\-d\fR, \fI\-f\fR, \fI\-g\fR, \fI\-i\fR, \fI\-n\fR, \fI\-t\fR, \fI\-v\fR, and \fI\-w\fR options are not supported by CUPS and produce a warning message if used. .SH EXAMPLES @@ -143,7 +214,4 @@ Print a presentation document 2-up to a printer called "foo": .BR lpstat (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: lpr.man 12854 2015-08-28 14:08:00Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/lprm.man b/man/lprm.man index c989394..0e96286 100644 --- a/man/lprm.man +++ b/man/lprm.man @@ -1,6 +1,4 @@ .\" -.\" "$Id: lprm.man 12854 2015-08-28 14:08:00Z msweet $" -.\" .\" lprm man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -84,7 +82,4 @@ Cancel all jobs: .BR lpstat (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: lprm.man 12854 2015-08-28 14:08:00Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/lpstat.man b/man/lpstat.man index d5d82c5..c86082b 100644 --- a/man/lpstat.man +++ b/man/lpstat.man @@ -1,6 +1,4 @@ .\" -.\" "$Id: lpstat.man 12854 2015-08-28 14:08:00Z msweet $" -.\" .\" lpstat man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -146,7 +144,4 @@ The Solaris \fI\-f\fR, \fI\-P\fR, and \fI\-S\fR options are silently ignored. .BR lprm (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: lpstat.man 12854 2015-08-28 14:08:00Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/mailto.conf.man b/man/mailto.conf.man index c2f3c85..36868c4 100644 --- a/man/mailto.conf.man +++ b/man/mailto.conf.man @@ -1,6 +1,4 @@ .\" -.\" "$Id: mailto.conf.man 12854 2015-08-28 14:08:00Z msweet $" -.\" .\" mailto.conf man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -46,7 +44,4 @@ Specifies a prefix string for the subject line of an email notification. .BR cupsd (8), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: mailto.conf.man 12854 2015-08-28 14:08:00Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/mantohtml.c b/man/mantohtml.c index 11ae93a..0f46848 100644 --- a/man/mantohtml.c +++ b/man/mantohtml.c @@ -1,6 +1,4 @@ /* - * "$Id: mantohtml.c 12362 2014-12-12 19:50:49Z msweet $" - * * Man page to HTML conversion program. * * Copyright 2007-2010, 2014 by Apple Inc. @@ -515,7 +513,7 @@ main(int argc, /* I - Number of command-line args */ float amount = 3.0; /* Indentation */ if (line[3]) - amount = atof(line + 4); + amount = (float)atof(line + 4); fputs(end_fonts[font], outfile); font = 0; @@ -561,7 +559,7 @@ main(int argc, /* I - Number of command-line args */ float amount = 3.0; /* Indentation */ if (line[3]) - amount = atof(line + 4); + amount = (float)atof(line + 4); fputs(end_fonts[font], outfile); font = 0; @@ -594,7 +592,7 @@ main(int argc, /* I - Number of command-line args */ float amount = 3.0; /* Indentation */ if (line[3]) - amount = atof(line + 4); + amount = (float)atof(line + 4); fputs(end_fonts[font], outfile); font = 0; @@ -682,7 +680,7 @@ main(int argc, /* I - Number of command-line args */ lineptr ++; if (isdigit(*lineptr & 255)) - amount = atof(lineptr); + amount = (float)atof(lineptr); if (newlist && list && strcmp(newlist, list)) { @@ -974,7 +972,8 @@ html_alternate(const char *s, /* I - String */ { if (*s == '\"') quote = !quote; - else if (*s == '\\' && s[1]) + + if (*s == '\\' && s[1]) { s ++; html_putc(*s++, fp); @@ -1218,8 +1217,3 @@ strmove(char *d, /* I - Destination */ *d = '\0'; } - - -/* - * End of "$Id: mantohtml.c 12362 2014-12-12 19:50:49Z msweet $". - */ diff --git a/man/mime.convs.man b/man/mime.convs.man index d5145ce..d120e5e 100644 --- a/man/mime.convs.man +++ b/man/mime.convs.man @@ -1,6 +1,4 @@ .\" -.\" "$Id: mime.convs.man 12848 2015-08-26 18:51:57Z msweet $" -.\" .\" mime.convs man page for CUPS. .\" .\" Copyright 2007-2015 by Apple Inc. @@ -44,7 +42,7 @@ Filenames are relative to the CUPS filter directory. .br \fI/usr/lib/cups/filter\fR - Typical CUPS filter directory. .br -\fI/usr/libexec/cups/filter\fR - CUPS filter directory on OS X. +\fI/usr/libexec/cups/filter\fR - CUPS filter directory on macOS. .SH EXAMPLES Define a filter that converts PostScript documents to CUPS Raster format: .nf @@ -60,7 +58,4 @@ Define a filter that converts PostScript documents to CUPS Raster format: .BR mime.types (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: mime.convs.man 12848 2015-08-26 18:51:57Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/mime.types.man b/man/mime.types.man index c3dd2f3..f902aaa 100644 --- a/man/mime.types.man +++ b/man/mime.types.man @@ -1,6 +1,4 @@ .\" -.\" "$Id: mime.types.man 12854 2015-08-28 14:08:00Z msweet $" -.\" .\" mime.types man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -110,7 +108,4 @@ Define two MIME media types for raster data, with one being a subset with higher .BR mime.convs (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: mime.types.man 12854 2015-08-28 14:08:00Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/notifier.man b/man/notifier.man index 3284f59..ed9d3cd 100644 --- a/man/notifier.man +++ b/man/notifier.man @@ -1,6 +1,4 @@ .\" -.\" "$Id: notifier.man 12854 2015-08-28 14:08:00Z msweet $" -.\" .\" notifier man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -38,7 +36,4 @@ Notifiers inherit the environment and can use the logging mechanism documented i .BR filter (7), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: notifier.man 12854 2015-08-28 14:08:00Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/ppdc.man b/man/ppdc.man index 20e96c4..b7fa530 100644 --- a/man/ppdc.man +++ b/man/ppdc.man @@ -1,6 +1,4 @@ .\" -.\" "$Id: ppdc.man 12854 2015-08-28 14:08:00Z msweet $" -.\" .\" ppdc man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -100,7 +98,4 @@ The default is to use the line feed character alone. .BR ppdcfile (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: ppdc.man 12854 2015-08-28 14:08:00Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/ppdcfile.man b/man/ppdcfile.man index 01e4965..1289a22 100644 --- a/man/ppdcfile.man +++ b/man/ppdcfile.man @@ -1,6 +1,4 @@ .\" -.\" "$Id: ppdcfile.man 13117 2016-03-07 18:36:16Z msweet $" -.\" .\" ppdcfile man page for CUPS. .\" .\" Copyright 2007-2016 by Apple Inc. @@ -159,7 +157,4 @@ Directives may be placed anywhere on a line and are followed by one or more valu .BR ppdpo (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: ppdcfile.man 13117 2016-03-07 18:36:16Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/ppdhtml.man b/man/ppdhtml.man index f5a9596..8e5832b 100644 --- a/man/ppdhtml.man +++ b/man/ppdhtml.man @@ -1,6 +1,4 @@ .\" -.\" "$Id: ppdhtml.man 12854 2015-08-28 14:08:00Z msweet $" -.\" .\" ppdhtml man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -45,7 +43,4 @@ Multiple \fI-I\fR options can be supplied to add additional directories. .BR ppdpo (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: ppdhtml.man 12854 2015-08-28 14:08:00Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/ppdi.man b/man/ppdi.man index db04476..4e09acc 100644 --- a/man/ppdi.man +++ b/man/ppdi.man @@ -1,6 +1,4 @@ .\" -.\" "$Id: ppdi.man 12854 2015-08-28 14:08:00Z msweet $" -.\" .\" ppdi man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -52,7 +50,4 @@ If no source file is specified, the filename \fIppdi.drv\fR is used. .BR ppdcfile (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: ppdi.man 12854 2015-08-28 14:08:00Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/ppdmerge.man b/man/ppdmerge.man index 71239ad..cb2cc95 100644 --- a/man/ppdmerge.man +++ b/man/ppdmerge.man @@ -1,6 +1,4 @@ .\" -.\" "$Id: ppdmerge.man 12854 2015-08-28 14:08:00Z msweet $" -.\" .\" ppdmerge man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -48,7 +46,4 @@ Merging of different device PPDs will yield unpredictable results. .BR ppdcfile (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: ppdmerge.man 12854 2015-08-28 14:08:00Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/ppdpo.man b/man/ppdpo.man index 6acf098..45d0d2a 100644 --- a/man/ppdpo.man +++ b/man/ppdpo.man @@ -1,6 +1,4 @@ .\" -.\" "$Id: ppdpo.man 12854 2015-08-28 14:08:00Z msweet $" -.\" .\" ppdpo man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -28,7 +26,7 @@ ppdpo \- ppd message catalog generator (deprecated) ] .I source-file .SH DESCRIPTION -\fBppdpo\fR extracts UI strings from PPDC source files and updates either a GNU gettext or OS X strings format message catalog source file for translation. +\fBppdpo\fR extracts UI strings from PPDC source files and updates either a GNU gettext or macOS strings format message catalog source file for translation. \fBThis program is deprecated and will be removed in a future release of CUPS.\fR .SH OPTIONS \fBppdpo\fR supports the following options: @@ -43,7 +41,7 @@ Multiple \fI-I\fR options can be supplied to add additional directories. .TP 5 \fB\-o \fIoutput-file\fR Specifies the output file. -The supported extensions are \fI.po\fR or \fI.po.gz\fR for GNU gettext format message catalogs and \fI.strings\fR for OS X strings files. +The supported extensions are \fI.po\fR or \fI.po.gz\fR for GNU gettext format message catalogs and \fI.strings\fR for macOS strings files. .SH SEE ALSO .BR ppdc (1), .BR ppdhtml (1), @@ -52,7 +50,4 @@ The supported extensions are \fI.po\fR or \fI.po.gz\fR for GNU gettext format me .BR ppdcfile(5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: ppdpo.man 12854 2015-08-28 14:08:00Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/printers.conf.man b/man/printers.conf.man index 9a3d148..30fff8d 100644 --- a/man/printers.conf.man +++ b/man/printers.conf.man @@ -1,6 +1,4 @@ .\" -.\" "$Id: printers.conf.man 12854 2015-08-28 14:08:00Z msweet $" -.\" .\" printers.conf man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -30,7 +28,4 @@ The name, location, and format of this file are an implementation detail that wi .BR subscriptions.conf (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: printers.conf.man 12854 2015-08-28 14:08:00Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. diff --git a/man/subscriptions.conf.man b/man/subscriptions.conf.man index 860c086..f23f51b 100644 --- a/man/subscriptions.conf.man +++ b/man/subscriptions.conf.man @@ -1,6 +1,4 @@ .\" -.\" "$Id: subscriptions.conf.man 12854 2015-08-28 14:08:00Z msweet $" -.\" .\" subscriptions.conf man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -30,7 +28,4 @@ The name, location, and format of this file are an implementation detail that wi .BR printers.conf (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id: subscriptions.conf.man 12854 2015-08-28 14:08:00Z msweet $". -.\" +Copyright \[co] 2007-2016 by Apple Inc. |