diff options
| author | Didier Raboud <odyx@debian.org> | 2014-01-02 23:03:44 +0100 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2014-01-02 23:03:44 +0100 |
| commit | d13746555c30d1d1bd617dcf64d5b92e319ae2b5 (patch) | |
| tree | ba335eb874926e0d4efebaccb46f2d5d390c7854 /man | |
| parent | 11884b3954f87fa67f02dca9169df32666b5363c (diff) | |
| download | cups-d13746555c30d1d1bd617dcf64d5b92e319ae2b5.tar.gz | |
Imported Upstream version 1.7.0~rc1upstream/1.7.0_rc1
Diffstat (limited to 'man')
49 files changed, 446 insertions, 182 deletions
diff --git a/man/Makefile b/man/Makefile index 960dde09..6074d0c3 100644 --- a/man/Makefile +++ b/man/Makefile @@ -1,9 +1,9 @@ # -# "$Id: Makefile 10709 2012-11-26 18:25:58Z mike $" +# "$Id: Makefile 11024 2013-06-06 23:11:13Z msweet $" # # Man page makefile for CUPS. # -# Copyright 2007-2012 by Apple Inc. +# Copyright 2007-2013 by Apple Inc. # Copyright 1993-2006 by Easy Software Products. # # These coded instructions, statements, and computer programs are the @@ -24,6 +24,7 @@ MAN1 = cancel.$(MAN1EXT) \ cups-config.$(MAN1EXT) \ cupstestdsc.$(MAN1EXT) \ cupstestppd.$(MAN1EXT) \ + $(IPPFIND_MAN) \ ipptool.$(MAN1EXT) \ lp.$(MAN1EXT) \ lpoptions.$(MAN1EXT) \ @@ -96,22 +97,6 @@ unittests: clean: $(RM) mantohtml mantohtml.o $(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8) - for file in $(MAN1); do \ - if test $$file != ipptool.$(MAN1EXT); then \ - $(RM) ../doc/help/man-`basename $$file .$(MAN1EXT)`.html; \ - fi \ - done - for file in $(MAN5); do \ - if test $$file != ipptoolfile.$(MAN5EXT); then \ - $(RM) ../doc/help/man-`basename $$file .$(MAN5EXT)`.html; \ - fi \ - done - for file in $(MAN7); do \ - $(RM) ../doc/help/man-`basename $$file .$(MAN7EXT)`.html; \ - done - for file in $(MAN8); do \ - $(RM) ../doc/help/man-`basename $$file .$(MAN8EXT)`.html; \ - done # @@ -237,5 +222,5 @@ mantohtml: mantohtml.o # -# End of "$Id: Makefile 10709 2012-11-26 18:25:58Z mike $". +# End of "$Id: Makefile 11024 2013-06-06 23:11:13Z msweet $". # diff --git a/man/backend.man b/man/backend.man index d5ac8cd9..a5fca5c0 100644 --- a/man/backend.man +++ b/man/backend.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: backend.man 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: backend.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" Backend man page for CUPS. .\" @@ -168,5 +168,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: backend.man 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: backend.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/cancel.man b/man/cancel.man index 38249735..17380fa0 100644 --- a/man/cancel.man +++ b/man/cancel.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: cancel.man 10831 2013-01-21 14:25:46Z mike $" +.\" "$Id: cancel.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" cancel man page for CUPS. .\" @@ -75,5 +75,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: cancel.man 10831 2013-01-21 14:25:46Z mike $". +.\" End of "$Id: cancel.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/classes.conf.man b/man/classes.conf.man index 0e28edab..2e93fc8f 100644 --- a/man/classes.conf.man +++ b/man/classes.conf.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: classes.conf.man 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: classes.conf.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" classes.conf man page for CUPS. .\" @@ -106,5 +106,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: classes.conf.man 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: classes.conf.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/client.conf.man.in b/man/client.conf.man.in index 9fbdb444..fd523698 100644 --- a/man/client.conf.man.in +++ b/man/client.conf.man.in @@ -1,5 +1,5 @@ .\" -.\" "$Id: client.conf.man.in 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: client.conf.man.in 11109 2013-07-08 21:15:13Z msweet $" .\" .\" client.conf man page for CUPS. .\" @@ -12,12 +12,12 @@ .\" 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" "23 April 2012" "Apple Inc." +.TH client.conf 5 "CUPS" "8 July 2013" "Apple Inc." .SH NAME client.conf \- client configuration file for cups .SH DESCRIPTION The \fIclient.conf\fR file configures the CUPS client and is -normally located in the \fI@CUPS_SERVERROOT@\fR or \fI~/.cups\fR +normally located in the \fI/etc/cups\fR or \fI~/.cups\fR directory. Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character. @@ -38,7 +38,7 @@ 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 -"@CUPS_DEFAULT_GSSSERVICENAME@". +"http". .TP 5 ServerName hostname-or-ip-address[:port] .TP 5 @@ -47,6 +47,12 @@ ServerName /domain/socket Specifies the address and optionally the port to use when connecting to the server. \fBNote: Not supported on OS X 10.7 or later.\fR .TP 5 +ServerName hostname-or-ip-address[:port]/version=1.1 +.br +Specifies the address and optionally the port to use when connecting to a +server running CUPS 1.3.12 and earlier. \fBNote: Not supported on OS X 10.7 or +later.\fR +.TP 5 User name .br Specifies the default user name to use for requests. @@ -55,5 +61,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: client.conf.man.in 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: client.conf.man.in 11109 2013-07-08 21:15:13Z msweet $". .\" diff --git a/man/cups-config.man b/man/cups-config.man index 8118675b..b75527db 100644 --- a/man/cups-config.man +++ b/man/cups-config.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: cups-config.man 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: cups-config.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" cups-config man page for CUPS. .\" @@ -113,5 +113,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: cups-config.man 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: cups-config.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/cups-deviced.man.in b/man/cups-deviced.man.in index 252b1687..1c75f68b 100644 --- a/man/cups-deviced.man.in +++ b/man/cups-deviced.man.in @@ -1,5 +1,5 @@ .\" -.\" "$Id: cups-deviced.man.in 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: cups-deviced.man.in 11109 2013-07-08 21:15:13Z msweet $" .\" .\" cups-deviced man page for CUPS. .\" @@ -12,7 +12,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-deviced 8 "CUPS" "16 June 2008" "Apple Inc." +.TH cups-deviced 8 "CUPS" "8 July 2013" "Apple Inc." .SH NAME cups-deviced \- cups device daemon .SH SYNOPSIS @@ -20,8 +20,8 @@ cups-deviced \- cups device daemon .I request-id limit user-id options .SH DESCRIPTION \fIcups-deviced\fR polls the backends in -\fI@CUPS_SERVERBIN@/backend\fR for a list of available devices. -It is run by \fIcupsd(8)\fR in response to a +\fI/usr/lib/cups/backend\fR or \fI/usr/libexec/cups/backend\fR (OS X) for a +list of available devices. It is run by \fIcupsd(8)\fR in response to a \fICUPS-Get-Devices\fR request. The output format is an IPP response message. The \fIrequest-id\fR argument is the request ID from the original IPP request, typically 1. The \fIlimit\fR @@ -40,5 +40,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: cups-deviced.man.in 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: cups-deviced.man.in 11109 2013-07-08 21:15:13Z msweet $". .\" diff --git a/man/cups-driverd.man.in b/man/cups-driverd.man.in index 8124a093..a3dd8d0e 100644 --- a/man/cups-driverd.man.in +++ b/man/cups-driverd.man.in @@ -1,5 +1,5 @@ .\" -.\" "$Id: cups-driverd.man.in 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: cups-driverd.man.in 11109 2013-07-08 21:15:13Z msweet $" .\" .\" cups-driverd man page for CUPS. .\" @@ -12,7 +12,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-driverd 8 "CUPS" "6 January 2011" "Apple Inc." +.TH cups-driverd 8 "CUPS" "8 July 2013" "Apple Inc." .SH NAME cups-driverd \- cups driver daemon .SH SYNOPSIS @@ -42,10 +42,10 @@ is a space-delimited list of attributes ("name=value name=value accordingly. .SH DRIVERS Drivers can be static PPD files under the -\fI@CUPS_DATADIR@/model\fR directory or programs under the -\fI@CUPS_SERVERBIN@/driver\fR directory. Static PPD files must -conform to the Adobe PPD File Format Specification version 4.3 -and may be compressed using the \fIgzip(1)\fR program. Driver +\fI/usr/share/cups/model\fR directory or programs under the +\fI/usr/lib/cups/driver\fR or \fI/usr/libexec/cups/driver\fR (OS X) directories. +Static PPD files must conform to the Adobe PPD File Format Specification version +4.3 and may be compressed using the \fIgzip(1)\fR program. Driver programs must implement the command-line interface shown in the next section. .SS DRIVER PROGRAMS @@ -118,5 +118,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: cups-driverd.man.in 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: cups-driverd.man.in 11109 2013-07-08 21:15:13Z msweet $". .\" diff --git a/man/cups-files.conf.man.in b/man/cups-files.conf.man.in index 2609821a..1c511c9f 100644 --- a/man/cups-files.conf.man.in +++ b/man/cups-files.conf.man.in @@ -1,5 +1,5 @@ .\" -.\" "$Id: cups-files.conf.man.in 10817 2013-01-16 17:41:13Z mike $" +.\" "$Id: cups-files.conf.man.in 11109 2013-07-08 21:15:13Z msweet $" .\" .\" cupsd.conf man page for CUPS. .\" @@ -12,13 +12,13 @@ .\" 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" "19 November 2012" "Apple Inc." +.TH cups-files.conf 5 "CUPS" "8 July 2013" "Apple Inc." .SH NAME cups-files.conf \- file and directory configuration file for cups .SH DESCRIPTION The \fIcups-files.conf\fR file configures the files and directories used by the CUPS scheduler, \fIcupsd(8)\fR. It is normally located in the -\fI@CUPS_SERVERROOT@\fR directory. +\fI/etc/cups\fR directory. .LP Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character. @@ -142,5 +142,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: cups-files.conf.man.in 10817 2013-01-16 17:41:13Z mike $". +.\" End of "$Id: cups-files.conf.man.in 11109 2013-07-08 21:15:13Z msweet $". .\" diff --git a/man/cups-lpd.man.in b/man/cups-lpd.man.in index 09969285..d1cb6178 100644 --- a/man/cups-lpd.man.in +++ b/man/cups-lpd.man.in @@ -1,5 +1,5 @@ .\" -.\" "$Id: cups-lpd.man.in 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: cups-lpd.man.in 11109 2013-07-08 21:15:13Z msweet $" .\" .\" cups-lpd man page for CUPS. .\" @@ -12,7 +12,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-lpd 8 "CUPS" "4 August 2008" "Apple Inc." +.TH cups-lpd 8 "CUPS" "8 July 2013" "Apple Inc." .SH NAME cups-lpd \- receive print jobs and report printer status to lpd clients .SH SYNOPSIS @@ -33,7 +33,7 @@ add the following line to the \fIinetd.conf\fR file to enable the .br .nf - printer stream tcp nowait lp @CUPS_SERVERBIN@/daemon/cups-lpd cups-lpd \\ + printer stream tcp nowait lp /usr/lib/cups/daemon/cups-lpd cups-lpd \\ -o document-format=application/octet-stream .fi .LP @@ -55,7 +55,7 @@ named \fI/etc/xinetd.d/cups\fR containing the following lines: user = lp group = sys passenv = - server = @CUPS_SERVERBIN@/daemon/cups-lpd + server = /usr/lib/cups/daemon/cups-lpd server_args = -o document-format=application/octet-stream } .fi @@ -120,5 +120,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: cups-lpd.man.in 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: cups-lpd.man.in 11109 2013-07-08 21:15:13Z msweet $". .\" diff --git a/man/cups-snmp.conf.man b/man/cups-snmp.conf.man index cdc2a411..261704fd 100644 --- a/man/cups-snmp.conf.man +++ b/man/cups-snmp.conf.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: cups-snmp.conf.man 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: cups-snmp.conf.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" snmp.conf man page for CUPS. .\" @@ -74,5 +74,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: cups-snmp.conf.man 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: cups-snmp.conf.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/cups-snmp.man.in b/man/cups-snmp.man.in index 964ee4ee..03ab2e07 100644 --- a/man/cups-snmp.man.in +++ b/man/cups-snmp.man.in @@ -1,5 +1,5 @@ .\" -.\" "$Id: cups-snmp.man.in 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: cups-snmp.man.in 11109 2013-07-08 21:15:13Z msweet $" .\" .\" SNMP backend man page for CUPS. .\" @@ -11,11 +11,14 @@ .\" 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-snmp 8 "CUPS" "23 April 2012" "Apple Inc." +.TH cups-snmp 8 "CUPS" "8 July 2013" "Apple Inc." .SH NAME snmp \- cups snmp backend .SH SYNOPSIS -.B @CUPS_SERVERBIN@/backend/snmp +.B /usr/lib/cups/backend/snmp +.I ip-address-or-hostname +.br +.B /usr/libexec/cups/backend/snmp .I ip-address-or-hostname .br .B lpinfo -v --include-schemes snmp @@ -41,7 +44,7 @@ The CUPS SNMP backend uses the information from the Host, Printer, and Port Monitor MIBs along with some vendor private MIBs and intelligent port probes to determine the correct device URI and make and model for each printer. .SH CONFIGURATION -The SNMP backend reads the @CUPS_SERVERROOT@/snmp.conf configuration file, if +The SNMP backend reads the /etc/cups/snmp.conf configuration file, if present, to set the default broadcast address, community name, and logging level. The configuration file is documented in \fIcups-snmp.conf(5)\fR. The DebugLevel value can be overridden using the CUPS_DEBUG_LEVEL environment @@ -55,5 +58,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: cups-snmp.man.in 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: cups-snmp.man.in 11109 2013-07-08 21:15:13Z msweet $". .\" diff --git a/man/cupsaccept.man b/man/cupsaccept.man index 4434f223..35f2cbfd 100644 --- a/man/cupsaccept.man +++ b/man/cupsaccept.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: cupsaccept.man 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: cupsaccept.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" accept/reject man page for CUPS. .\" @@ -75,5 +75,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: cupsaccept.man 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: cupsaccept.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/cupsaddsmb.man.in b/man/cupsaddsmb.man.in index 84a89a4f..a4d66243 100644 --- a/man/cupsaddsmb.man.in +++ b/man/cupsaddsmb.man.in @@ -1,5 +1,5 @@ .\" -.\" "$Id: cupsaddsmb.man.in 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: cupsaddsmb.man.in 11109 2013-07-08 21:15:13Z msweet $" .\" .\" cupsaddsmb man page for CUPS. .\" @@ -12,7 +12,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 cupsaddsmb 8 "CUPS" "25 July 2007" "Apple Inc." +.TH cupsaddsmb 8 "CUPS" "8 July 2013" "Apple Inc." .SH NAME cupsaddsmb \- export printers to samba for windows clients @@ -115,17 +115,14 @@ drivers and %WINDIR%\\SYSTEM32\\SPOOL\\DRIVERS\\X64\\3 folder for 64-bit drivers. .LP -The CUPS printer driver is preferred over the Microsoft driver -since it supports the page-label, job-billing, and -job-hold-until options fully on all printers. However, currently -only Windows 2000 and higher is supported by the Microsoft +However, currently only Windows 2000 and higher is supported by the Microsoft driver, so you will also need to get the Adobe driver to support Windows 95, 98, and Me clients. The Adobe and Microsoft drivers for Windows 2000 are identical. .LP Once you have extracted the driver files, copy the 32-bit drivers -to the \fI@CUPS_DATADIR@/drivers\fR directory and the 64-bit -drivers to the \fI@CUPS_DATADIR@/drivers/x64\fR directory exactly +to the \fI/usr/share/cups/drivers\fR directory and the 64-bit +drivers to the \fI/usr/share/cups/drivers/x64\fR directory exactly as named below: .nf @@ -140,39 +137,6 @@ as named below: you use the lowercase filenames shown above, otherwise \fIcupsaddsmb\fR will fail to export the drivers. -.SH CUPS POSTSCRIPT DRIVERS FOR WINDOWS -\fIcupsaddsmb\fR can use the CUPS v6 PostScript printer driver -for Windows, which is available for download from the CUPS web -site. -.LP -The CUPS printer driver is preferred over the Adobe and -Microsoft drivers since it supports the page-label, job-billing, -and job-hold-until options fully on all printers. However, -currently only Windows 2000 and higher is supported by the CUPS -driver, so you will also need to get the Adobe driver to support -Windows 95, 98, and Me clients. -.LP -Once you have extracted the driver files, copy the 32-bit drivers -to the \fI@CUPS_DATADIR@/drivers\fR directory and the 64-bit -drivers to the \fI@CUPS_DATADIR@/drivers/x64\fR directory exactly -as named below: -.nf - - [Windows 2000 and higher] - cups6.inf (from www.cups.org) - cups6.ini (from www.cups.org) - cupsps6.dll (from www.cups.org) - cupsui6.dll (from www.cups.org) - ps5ui.dll (from your Windows system) - pscript.hlp (from your Windows system) - pscript.ntf (from your Windows system) - pscript5.dll (from your Windows system) -.fi -.LP -\fBNote:\fR Unlike Windows, case is significant - make sure that -you use the lowercase filenames shown above, otherwise -\fIcupsaddsmb\fR will fail to export the drivers. - .SH ADOBE POSTSCRIPT DRIVERS FOR WINDOWS 95, 98, AND ME \fIcupsaddsmb\fR can use the Adobe PostScript printer driver for Windows 95, 98, and ME, which are available for download from the @@ -210,5 +174,5 @@ http://www.cups.org/windows/ .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: cupsaddsmb.man.in 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: cupsaddsmb.man.in 11109 2013-07-08 21:15:13Z msweet $". .\" diff --git a/man/cupsctl.man b/man/cupsctl.man index 546827f1..692d15a8 100644 --- a/man/cupsctl.man +++ b/man/cupsctl.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: cupsctl.man 10806 2013-01-11 21:50:03Z mike $" +.\" "$Id: cupsctl.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" cupsctl man page for CUPS. .\" @@ -93,5 +93,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: cupsctl.man 10806 2013-01-11 21:50:03Z mike $". +.\" End of "$Id: cupsctl.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in index 87467fb6..3435f393 100644 --- a/man/cupsd.conf.man.in +++ b/man/cupsd.conf.man.in @@ -1,5 +1,5 @@ .\" -.\" "$Id: cupsd.conf.man.in 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: cupsd.conf.man.in 11109 2013-07-08 21:15:13Z msweet $" .\" .\" cupsd.conf man page for CUPS. .\" @@ -12,12 +12,12 @@ .\" 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" "19 November 2012" "Apple Inc." +.TH cupsd.conf 5 "CUPS" "8 July 2013" "Apple Inc." .SH NAME cupsd.conf \- server configuration file for cups .SH DESCRIPTION The \fIcupsd.conf\fR file configures the CUPS scheduler, \fIcupsd(8)\fR. It -is normally located in the \fI@CUPS_SERVERROOT@\fR directory. \fBNote:\fR +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. @@ -192,7 +192,7 @@ are run to print a job. GSSServiceName name .br Specifies the service name when using Kerberos authentication. The default -service name is "@CUPS_DEFAULT_GSSSERVICENAME@". +service name is "http". .TP 5 HostNameLookups On .TP 5 @@ -521,5 +521,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: cupsd.conf.man.in 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: cupsd.conf.man.in 11109 2013-07-08 21:15:13Z msweet $". .\" diff --git a/man/cupsd.man.in b/man/cupsd.man.in index 7d6befba..6193de6b 100644 --- a/man/cupsd.man.in +++ b/man/cupsd.man.in @@ -1,5 +1,5 @@ .\" -.\" "$Id: cupsd.man.in 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: cupsd.man.in 11109 2013-07-08 21:15:13Z msweet $" .\" .\" cupsd man page for CUPS. .\" @@ -12,7 +12,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 8 "CUPS" "9 March 2009" "Apple Inc." +.TH cupsd 8 "CUPS" "8 July 2013" "Apple Inc." .SH NAME cupsd \- cups scheduler .SH SYNOPSIS @@ -24,7 +24,7 @@ cupsd \- cups scheduler \fIcupsd\fR 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 -\fI@CUPS_SERVERROOT@/cupsd.conf\fR will be used. +\fI/etc/cups/cupsd.conf\fR will be used. .SH OPTIONS .TP 5 -c config-file @@ -68,5 +68,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: cupsd.man.in 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: cupsd.man.in 11109 2013-07-08 21:15:13Z msweet $". .\" diff --git a/man/cupsenable.man b/man/cupsenable.man index 05bd3926..00d23eb2 100644 --- a/man/cupsenable.man +++ b/man/cupsenable.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: cupsenable.man 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: cupsenable.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" cupsenable/cupsdisable man page for CUPS. .\" @@ -89,5 +89,5 @@ http://localhost:631/help Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: cupsenable.man 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: cupsenable.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/cupsfilter.man b/man/cupsfilter.man index c2abab00..e88d62be 100644 --- a/man/cupsfilter.man +++ b/man/cupsfilter.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: cupsfilter.man 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: cupsfilter.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" cupsfilter man page for CUPS. .\" @@ -105,5 +105,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: cupsfilter.man 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: cupsfilter.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/cupstestdsc.man b/man/cupstestdsc.man index 04dc8484..dfc255ac 100644 --- a/man/cupstestdsc.man +++ b/man/cupstestdsc.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: cupstestdsc.man 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: cupstestdsc.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" cupstestdsc man page for CUPS. .\" @@ -46,5 +46,5 @@ Specification, Version 3.0. .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: cupstestdsc.man 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: cupstestdsc.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/cupstestppd.man b/man/cupstestppd.man index ed354800..6f0eecea 100644 --- a/man/cupstestppd.man +++ b/man/cupstestppd.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: cupstestppd.man 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: cupstestppd.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" cupstestppd man page for CUPS. .\" @@ -161,5 +161,5 @@ Adobe PostScript Printer Description File Format Specification, Version 4.3. .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: cupstestppd.man 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: cupstestppd.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/filter.man b/man/filter.man index a2236b46..29239eac 100644 --- a/man/filter.man +++ b/man/filter.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: filter.man 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: filter.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" filter man page for CUPS. .\" @@ -234,5 +234,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: filter.man 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: filter.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/ippfind.man b/man/ippfind.man new file mode 100644 index 00000000..ec2b5ce5 --- /dev/null +++ b/man/ippfind.man @@ -0,0 +1,247 @@ +.\" +.\" "$Id: ippfind.man 11027 2013-06-07 01:45:14Z msweet $" +.\" +.\" ippfind man page for CUPS. +.\" +.\" Copyright 2013 by Apple Inc. +.\" +.\" These coded instructions, statements, and computer programs are the +.\" property of Apple Inc. and are protected by Federal copyright +.\" law. Distribution and use rights are outlined in the file "LICENSE.txt" +.\" 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 ippfind 1 "CUPS" "6 June 2013" "Apple Inc." +.SH NAME +ippfind - find internet printing protocol printers +.SH SYNOPSIS +.B ippfind +[ +.I options +] regtype[,subtype][.domain.] ... [ +.I expression ... +] +.B ippfind +[ +.I options +] name[.regtype[.domain.]] ... [ +.I expression ... +] +.B ippfind +--help +.B ippfind +--version +.SH OPTIONS +.TP 5 +--help +Show program help +.TP 5 +--version +Show program version +.TP 5 +-4 +Use IPv4 when listing +.TP 5 +-6 +Use IPv6 when listing +.TP 5 +-T seconds +Specify find timeout in seconds. If 1 or less, \fIippfind\fR stops as soon as it thinks it has found everything. The default is 1 second. +.TP 5 +-V version +Specifies the IPP version when listing. Supported values are 1.1, 2.0, 2.1, and 2.2. + +.SH DESCRIPTION +\fIippfind\fR 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: +.nf + ippfind --ls +.fi +Similarly, to send a PostScript test page to every PostScript printer, run: +.nf + ippfind --txt-pdl application/postscript --exec ipptool \\ + -f onepage-letter.ps '{}' print-job.test \\; +.fi + +.SH REGISTRATION TYPES +\fIippfind\fR supports the following registration types: +.TP 5 +_http._tcp +HyperText Transport Protocol (HTTP, RFC 2616) +.TP 5 +_https._tcp +Secure HyperText Transport Protocol (HTTPS, RFC 2818) +.TP 5 +_ipp._tcp +Internet Printing Protocol (IPP, RFC 2911) +.TP 5 +_ipps._tcp +Secure Internet Printing Protocol (IPPS, draft) +.TP 5 +_printer._tcp +Line Printer Daemon (LPD, RFC 1179) + +.SH EXPRESSIONS +\fIippfind\fR supports expressions much like the \fIfind(1)\fR utility. However, unlike \fIfind\fR, \fIippfind\fR 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, \fIippfind\fR adds --print to print the service URI of anything it finds. The following expressions are supported: +.TP 5 +-d regex +.TP 5 +--domain regex +True if the domain matches the given regular expression. +.TP 5 +--false +Always false. +.TP 5 +-h regex +.TP 5 +--host regex +True is the hostname matches the given regular expression. +.TP 5 +-l +.TP 5 +--ls +Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "-ls" output for HTTP URLs. The result is true if the URI is accessible, false otherwise. +.TP 5 +--local +True if the service is local to this computer. +.TP 5 +-n regex +.TP 5 +--name regex +True if the service instance name matches the given regular expression. +.TP 5 +--path regex +True if the URI resource path matches the given regular expression. +.TP 5 +-P number[-number] +.TP 5 +--port number[-number] +True if the port matches the given number or range. +.TP 5 +-p +.TP 5 +--print +Prints the URI if the result of previous expressions is true. The result is always true. +.TP 5 +-q +.TP 5 +--quiet +Quiet mode - just returns the exit codes below. +.TP 5 +-r +.TP 5 +--remote +True if the service is not local to this computer. +.TP 5 +-s +.TP 5 +--print-name +Prints the service instance name if the result of previous expressions is true. The result is always true. +.TP 5 +--true +Always true. +.TP 5 +-t key +.TP 5 +--txt key +True if the TXT record contains the named key. +.TP 5 +--txt-\fIkey\fR regex +True if the TXT record contains the named key and matches the given regular +expression. +.TP 5 +-u regex +.TP 5 +--uri regex +True if the URI matches the given regular expression. +.TP 5 +-x utility [argument ...] ; +.TP 5 +--exec utility [argument ...] ; +Executes the specified program if the current result is true. "{foo}" arguments are replaced with the corresponding value - see SUBSTITUTIONS below. +.PP +Expressions may also contain modifiers: +.TP 5 +( expression ) +Group the result of expressions. +.TP 5 +! expression +.TP 5 +--not expression +Unary NOT of the expression. +.TP 5 +expression expression +.TP 5 +expression --and expression +Logical AND of expressions. +.TP 5 +expression --or expression +Logical OR of expressions. + +.SH SUBSTITUTIONS +The substitutions for "{foo}" in -e and --exec are: +.TP 5 +{} +URI +.TP 5 +{service_domain} +Domain name, e.g., "example.com.", "local.", etc. +.TP 5 +{service_hostname} +Fully-qualified domain name, e.g., "printer.example.com.", "printer.local.", etc. +.TP 5 +{service_name} +Service instance name, e.g., "My Fine Printer". +.TP 5 +{service_port} +Port number for server, typically 631 for IPP and 80 for HTTP. +.TP 5 +{service_regtype} +DNS-SD registration type, e.g., "_ipp._tcp", "_http._tcp", etc. +.TP 5 +{service_scheme} +URI scheme for DNS-SD registration type, e.g., "ipp", "http", etc. +.TP 5 +{service_uri} +URI for service, e.g., "ipp://printer.local./ipp/print", "http://printer.local./", etc. +.TP 5 +{txt_\fIkey\fR} +Value of TXT record \fIkey\fR (lowercase). + +.SH ENVIRONMENT VARIABLES +When executing a program, \fIippfind\fR sets the following environment variables for the matching service registration: +.TP 5 +IPPFIND_SERVICE_DOMAIN +Domain name, e.g., "example.com.", "local.", etc. +.TP 5 +IPPFIND_SERVICE_HOSTNAME +Fully-qualified domain name, e.g., "printer.example.com.", "printer.local.", etc. +.TP 5 +IPPFIND_SERVICE_NAME +Service instance name, e.g., "My Fine Printer". +.TP 5 +IPPFIND_SERVICE_PORT +Port number for server, typically 631 for IPP and 80 for HTTP. +.TP 5 +IPPFIND_SERVICE_REGTYPE +DNS-SD registration type, e.g., "_ipp._tcp", "_http._tcp", etc. +.TP 5 +IPPFIND_SERVICE_SCHEME +URI scheme for DNS-SD registration type, e.g., "ipp", "http", etc. +.TP 5 +IPPFIND_SERVICE_URI +URI for service, e.g., "ipp://printer.local./ipp/print", "http://printer.local./", etc. +.TP 5 +IPPFIND_TXT_\fIKEY\fR +Values of TXT record \fIKEY\fR (uppercase). + +.SH EXIT CODES +\fIippfind\fR 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. + +.SH SEE ALSO +\fIipptool(1)\fR + +.SH COPYRIGHT +Copyright 2013 by Apple Inc. +.\" +.\" End of "$Id: ippfind.man 11027 2013-06-07 01:45:14Z msweet $". +.\" diff --git a/man/ipptool.man b/man/ipptool.man index 1137f477..240c0445 100644 --- a/man/ipptool.man +++ b/man/ipptool.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: ipptool.man 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: ipptool.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" ipptool man page for CUPS. .\" @@ -11,11 +11,12 @@ .\" 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 ipptool 1 "CUPS" "9 November 2010" "Apple Inc." +.TH ipptool 1 "CUPS" "13 May 2013" "Apple Inc." .SH NAME ipptool - perform internet printing protocol requests .SH SYNOPSIS .B ipptool +[ --help ] [ --stop-after-include-error ] [ --version ] [ -4 ] [ -6 ] [ -C ] [ -E ] [ -I ] [ -L ] [ -S ] [ -T .I seconds ] [ -V @@ -39,6 +40,13 @@ ipptool - perform internet printing protocol requests .SH OPTIONS The following options are recognized by \fIipptool\fR: .TP 5 +--help +Shows program help. +--stop-after-include-error +Tells \fIipptool\fR to stop if an error occurs in an included file. Normally \fIipptool\fR will continue with subsequent tests after the INCLUDE directive. +--version +Shows the version of \fIipptool\fR being used. +.TP 5 -4 Specifies that \fIipptool\fR must connect to the printer or server using IPv4. .TP 5 @@ -92,6 +100,8 @@ Specifies that CUPS test report output is desired instead of the plain text outp .TP 5 -v Specifies that all request and response attributes should be output in CUPS test mode (\fI-t\fR). This is the default for XML output. +.SH EXIT CODE +The \fIipptool\fR program returns 0 if all tests were sucessful and 1 otherwise. .SH COMPATIBILITY The \fIipptool\fR program is unique to CUPS. .SH EXAMPLES @@ -116,21 +126,28 @@ The following standard files are available: document-letter.ps get-completed-jobs.test get-jobs.test + get-notifications.test get-printer-attributes.test + get-subscriptions.test gray.jpg ipp-1.1.test ipp-2.0.test ipp-2.1.test ipp-2.2.test + ipp-everywhere.test onepage-a4.pdf onepage-a4.ps onepage-letter.pdf onepage-letter.ps print-job.test + print-job-deflate.test + print-job-gzip.test testfile.jpg + testfile.pcl testfile.pdf testfile.ps testfile.txt + validate-job.test .fi .SH SEE ALSO \fIipptoolfile(5)\fR, @@ -139,5 +156,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: ipptool.man 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: ipptool.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/ipptoolfile.man b/man/ipptoolfile.man index 58892f6f..ed71842d 100644 --- a/man/ipptoolfile.man +++ b/man/ipptoolfile.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: ipptoolfile.man 10788 2013-01-10 16:51:07Z mike $" +.\" "$Id: ipptoolfile.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" ipptoolfile man page for CUPS. .\" @@ -11,7 +11,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 ipptoolfile 5 "CUPS" "10 January 2013" "Apple Inc." +.TH ipptoolfile 5 "CUPS" "13 May 2013" "Apple Inc." .SH NAME ipptoolfile \- ipptool file format @@ -78,6 +78,9 @@ DEFINE-DEFAULT variable-name value Defines the named variable to the given value if it does not already have a value. .TP 5 +FILE-ID "identifier" +Specifies an identifier string for the current file. +.TP 5 IGNORE-ERRORS yes .TP 5 IGNORE-ERRORS no @@ -111,6 +114,11 @@ 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. .TP 5 +STOP-AFTER-INCLUDE-ERROR no +.TP 5 +STOP-AFTER-INCLUDE-ERROR yes +Specifies whether tests will be stopped after an error in an included file. +.TP 5 TRANSFER auto Specifies that tests will, by default, use "Transfer-Encoding: chunked" for requests with attached files and "Content-Length:" for requests without attached @@ -222,6 +230,9 @@ Specifies an expected response status-code value. Additional requirements can be added as predicates - see the "STATUS PREDICATES" section for more information on predicates. .TP 5 +TEST-ID "identifier" +Specifies an identifier string for the current test. +.TP 5 TRANSFER auto Specifies that this test will use "Transfer-Encoding: chunked" if it has an attached file or "Content-Length:" otherwise. @@ -289,6 +300,21 @@ SAME-COUNT-AS attribute-name Requires the EXPECT attribute to have the same number of values as the specified parallel attribute. .TP 5 +WITH-ALL-HOSTNAMES "literal string" +.TP 5 +WITH-ALL-HOSTNAMES "/regular expression/" +Requires that all URI values contain a matching hostname. +.TP 5 +WITH-ALL-RESOURCES "literal string" +.TP 5 +WITH-ALL-RESOURCES "/regular expression/" +Requires that all URI values contain a matching resource (including leading /). +.TP 5 +WITH-ALL-SCHEMES "literal string" +.TP 5 +WITH-ALL-SCHEMES "/regular expression/" +Requires that all URI values contain a matching scheme. +.TP 5 WITH-ALL-VALUES "literal string" Requires that all values of the EXPECT attribute match the literal string. Comparisons are case-sensitive. .TP 5 @@ -309,6 +335,21 @@ 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. .TP 5 +WITH-HOSTNAME "literal string" +.TP 5 +WITH-HOSTNAME "/regular expression/" +Requires that at least one URI value contains a matching hostname. +.TP 5 +WITH-RESOURCE "literal string" +.TP 5 +WITH-RESOURCE "/regular expression/" +Requires that at least one URI value contains a matching resource (including leading /). +.TP 5 +WITH-SCHEME "literal string" +.TP 5 +WITH-SCHEME "/regular expression/" +Requires that at least one URI value contains a matching scheme. +.TP 5 WITH-VALUE "literal string" Requires that at least one value of the EXPECT attribute matches the literal string. Comparisons are case-sensitive. .TP 5 @@ -415,6 +456,7 @@ RFC 2911 and other IPP extension specifications. Here is a complete list: Resume-Printer Schedule-Job-After Send-Document + Send-Hardcopy-Document Send-Notifications Send-URI Set-Job-Attributes @@ -579,5 +621,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: ipptoolfile.man 10788 2013-01-10 16:51:07Z mike $". +.\" End of "$Id: ipptoolfile.man 11022 2013-06-06 22:14:09Z msweet $". .\" @@ -1,5 +1,5 @@ .\" -.\" "$Id: lp.man 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: lp.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" lp man page for CUPS. .\" @@ -248,5 +248,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: lp.man 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: lp.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/lpadmin.man b/man/lpadmin.man index 1625f639..7119934b 100644 --- a/man/lpadmin.man +++ b/man/lpadmin.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: lpadmin.man 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: lpadmin.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" lpadmin man page for CUPS. .\" @@ -223,5 +223,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: lpadmin.man 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: lpadmin.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/lpc.man b/man/lpc.man index 380eb277..bbee8074 100644 --- a/man/lpc.man +++ b/man/lpc.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: lpc.man 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: lpc.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" lpc man page for CUPS. .\" @@ -67,5 +67,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: lpc.man 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: lpc.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/lpinfo.man b/man/lpinfo.man index 2c5e608e..0521c3a0 100644 --- a/man/lpinfo.man +++ b/man/lpinfo.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: lpinfo.man 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: lpinfo.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" lpinfo man page for CUPS. .\" @@ -111,5 +111,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: lpinfo.man 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: lpinfo.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/lpmove.man b/man/lpmove.man index a2d983aa..e7819d1c 100644 --- a/man/lpmove.man +++ b/man/lpmove.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: lpmove.man 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: lpmove.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" lpmove man page for CUPS. .\" @@ -62,5 +62,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: lpmove.man 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: lpmove.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/lpoptions.man.in b/man/lpoptions.man.in index e4800fe5..88072f93 100644 --- a/man/lpoptions.man.in +++ b/man/lpoptions.man.in @@ -1,5 +1,5 @@ .\" -.\" "$Id: lpoptions.man.in 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: lpoptions.man.in 11109 2013-07-08 21:15:13Z msweet $" .\" .\" lpoptions man page for CUPS. .\" @@ -12,7 +12,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 lpoptions 1 "CUPS" "29 August 2008" "Apple Inc." +.TH lpoptions 1 "CUPS" "8 July 2013" "Apple Inc." .SH NAME lpoptions \- display or set printer options and defaults .SH SYNOPSIS @@ -115,14 +115,14 @@ Options set with the \fIlpoptions\fR command are used by the .SH ROOT ACCOUNT OPTIONS When run by the root user, \fIlpoptions\fR gets and sets default options and instances for \fIall users\fR in the -@CUPS_SERVERROOT@/lpoptions file. +/etc/cups/lpoptions file. .SH COMPATIBILITY The \fIlpoptions\fR command is unique to CUPS. .SH FILES ~/.cups/lpoptions - user defaults and instances created by non-root users. .br -@CUPS_SERVERROOT@/lpoptions - system-wide defaults and instances +/etc/cups/lpoptions - system-wide defaults and instances created by the root user. .SH SEE ALSO \fIcancel(1)\fR, \fIlp(1)\fR, \fIlpadmin(8)\fR, \fIlpr(1)\fR, @@ -131,5 +131,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: lpoptions.man.in 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: lpoptions.man.in 11109 2013-07-08 21:15:13Z msweet $". .\" diff --git a/man/lppasswd.man b/man/lppasswd.man index 7e434169..f21726d4 100644 --- a/man/lppasswd.man +++ b/man/lppasswd.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: lppasswd.man 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: lppasswd.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" lpadmin man page for CUPS. .\" @@ -64,5 +64,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: lppasswd.man 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: lppasswd.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/lpq.man b/man/lpq.man index 2dfeff34..d922b0ae 100644 --- a/man/lpq.man +++ b/man/lpq.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: lpq.man 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: lpq.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" lpq man page for CUPS. .\" @@ -68,5 +68,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: lpq.man 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: lpq.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/lpr.man b/man/lpr.man index 4bdb71db..2325f8ea 100644 --- a/man/lpr.man +++ b/man/lpr.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: lpr.man 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: lpr.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" lpr man page for CUPS. .\" @@ -118,5 +118,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: lpr.man 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: lpr.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/lprm.man b/man/lprm.man index 42b1d39e..33851fb6 100644 --- a/man/lprm.man +++ b/man/lprm.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: lprm.man 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: lprm.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" lprm man page for CUPS. .\" @@ -61,5 +61,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: lprm.man 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: lprm.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/lpstat.man b/man/lpstat.man index 3b4915b0..021be700 100644 --- a/man/lpstat.man +++ b/man/lpstat.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: lpstat.man 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: lpstat.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" lpstat man page for CUPS. .\" @@ -139,5 +139,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: lpstat.man 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: lpstat.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/mailto.conf.man b/man/mailto.conf.man index 6f865b90..a8dba768 100644 --- a/man/mailto.conf.man +++ b/man/mailto.conf.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: mailto.conf.man 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: mailto.conf.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" mailto.conf man page for CUPS. .\" @@ -56,5 +56,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: mailto.conf.man 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: mailto.conf.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/mantohtml.c b/man/mantohtml.c index d9b0acb4..512dda13 100644 --- a/man/mantohtml.c +++ b/man/mantohtml.c @@ -1,5 +1,5 @@ /* - * "$Id: mantohtml.c 9226 2010-08-06 12:15:50Z mike $" + * "$Id: mantohtml.c 10996 2013-05-29 11:51:34Z msweet $" * * Man page to HTML conversion program. * @@ -716,5 +716,5 @@ strmove(char *d, /* I - Destination */ /* - * End of "$Id: mantohtml.c 9226 2010-08-06 12:15:50Z mike $". + * End of "$Id: mantohtml.c 10996 2013-05-29 11:51:34Z msweet $". */ diff --git a/man/mime.convs.man b/man/mime.convs.man index c11ccebc..108f1df4 100644 --- a/man/mime.convs.man +++ b/man/mime.convs.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: mime.convs.man 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: mime.convs.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" mime.convs man page for CUPS. .\" @@ -42,5 +42,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: mime.convs.man 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: mime.convs.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/mime.types.man b/man/mime.types.man index 67b30a33..707da56f 100644 --- a/man/mime.types.man +++ b/man/mime.types.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: mime.types.man 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: mime.types.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" mime.types man page for CUPS. .\" @@ -111,5 +111,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: mime.types.man 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: mime.types.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/notifier.man b/man/notifier.man index 18321237..4ae3b07e 100644 --- a/man/notifier.man +++ b/man/notifier.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: notifier.man 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: notifier.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" notifier man page for CUPS. .\" @@ -153,5 +153,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: notifier.man 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: notifier.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/ppdc.man b/man/ppdc.man index ae1b322c..f489cd26 100644 --- a/man/ppdc.man +++ b/man/ppdc.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: ppdc.man 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: ppdc.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" ppdc man page for CUPS. .\" @@ -77,5 +77,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: ppdc.man 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: ppdc.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/ppdcfile.man b/man/ppdcfile.man index 39e18303..a3c9cd84 100644 --- a/man/ppdcfile.man +++ b/man/ppdcfile.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: ppdcfile.man 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: ppdcfile.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" ppdcfile man page for CUPS. .\" @@ -166,5 +166,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: ppdcfile.man 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: ppdcfile.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/ppdhtml.man b/man/ppdhtml.man index 41ede966..3e1e4dc5 100644 --- a/man/ppdhtml.man +++ b/man/ppdhtml.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: ppdhtml.man 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: ppdhtml.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" ppdhtml man page for CUPS. .\" @@ -42,5 +42,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: ppdhtml.man 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: ppdhtml.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/ppdi.man b/man/ppdi.man index f1bc65a5..f26f263a 100644 --- a/man/ppdi.man +++ b/man/ppdi.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: ppdi.man 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: ppdi.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" ppdi man page for CUPS. .\" @@ -42,5 +42,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: ppdi.man 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: ppdi.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/ppdmerge.man b/man/ppdmerge.man index d794b615..0a0c5182 100644 --- a/man/ppdmerge.man +++ b/man/ppdmerge.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: ppdmerge.man 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: ppdmerge.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" ppdmerge man page for CUPS. .\" @@ -43,5 +43,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: ppdmerge.man 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: ppdmerge.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/ppdpo.man b/man/ppdpo.man index e009ef7c..f2b0a2b1 100644 --- a/man/ppdpo.man +++ b/man/ppdpo.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: ppdpo.man 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: ppdpo.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" ppdpo man page for CUPS. .\" @@ -48,5 +48,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: ppdpo.man 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: ppdpo.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/printers.conf.man b/man/printers.conf.man index 918f6fde..1ab7876c 100644 --- a/man/printers.conf.man +++ b/man/printers.conf.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: printers.conf.man 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: printers.conf.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" printers.conf man page for CUPS. .\" @@ -120,5 +120,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: printers.conf.man 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: printers.conf.man 11022 2013-06-06 22:14:09Z msweet $". .\" diff --git a/man/subscriptions.conf.man b/man/subscriptions.conf.man index db74cad5..edb52ac1 100644 --- a/man/subscriptions.conf.man +++ b/man/subscriptions.conf.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: subscriptions.conf.man 10790 2013-01-10 16:58:01Z mike $" +.\" "$Id: subscriptions.conf.man 11022 2013-06-06 22:14:09Z msweet $" .\" .\" subscriptions.conf man page for CUPS. .\" @@ -85,5 +85,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: subscriptions.conf.man 10790 2013-01-10 16:58:01Z mike $". +.\" End of "$Id: subscriptions.conf.man 11022 2013-06-06 22:14:09Z msweet $". .\" |