Imported Upstream version 1.6.4upstream/1.6.4

49 files changed, 680 insertions, 739 deletions

diff --git a/man/Makefile b/man/Makefile
index 0e02143..c5d68a5 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -1,9 +1,9 @@
 #
-# "$Id: Makefile 9177 2010-06-22 21:21:37Z mike $"
+# "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $"
 #
 #   Man page makefile for CUPS.
 #
-#   Copyright 2007-2010 by Apple Inc.
+#   Copyright 2007-2012 by Apple Inc.
 #   Copyright 1993-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -39,6 +39,7 @@ MAN1	=	cancel.$(MAN1EXT) \
 		ppdpo.$(MAN1EXT)
 MAN5	=	classes.conf.$(MAN5EXT) \
 		client.conf.$(MAN5EXT) \
+		cups-files.conf.$(MAN5EXT) \
 		cups-snmp.conf.$(MAN5EXT) \
 		cupsd.conf.$(MAN5EXT) \
 		ipptoolfile.$(MAN5EXT) \
@@ -58,7 +59,7 @@ MAN8	=	cupsaccept.$(MAN8EXT) \
 		cups-deviced.$(MAN8EXT) \
 		cups-driverd.$(MAN8EXT) \
 		cups-lpd.$(MAN8EXT) \
-		cups-polld.$(MAN8EXT) \
+		cups-snmp.$(MAN8EXT) \
 		cupsd.$(MAN8EXT) \
 		cupsenable.$(MAN8EXT) \
 		lpadmin.$(MAN8EXT) \
@@ -96,10 +97,14 @@ clean:
 	$(RM) mantohtml mantohtml.o
 	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
 	for file in $(MAN1); do \
-		$(RM) ../doc/help/man-`basename $$file .$(MAN1EXT)`.html; \
+		if test $$file != ipptool.$(MAN1EXT); then \
+			$(RM) ../doc/help/man-`basename $$file .$(MAN1EXT)`.html; \
+		fi \
 	done
 	for file in $(MAN5); do \
-		$(RM) ../doc/help/man-`basename $$file .$(MAN5EXT)`.html; \
+		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; \
@@ -232,5 +237,5 @@ mantohtml:	mantohtml.o
 
 
 #
-# End of "$Id: Makefile 9177 2010-06-22 21:21:37Z mike $".
+# End of "$Id: Makefile 11173 2013-07-23 12:31:34Z msweet $".
 #
diff --git a/man/backend.man b/man/backend.man
index 644d85d..b97ab4a 100644
--- a/man/backend.man
+++ b/man/backend.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: backend.man 9693 2011-04-16 02:51:22Z mike $"
+.\" "$Id: backend.man 7810 2008-07-29 01:11:15Z mike $"
 .\"
 .\"   Backend man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -12,11 +12,10 @@
 .\"   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 backend 7 "CUPS" "15 April 2011" "Apple Inc."
+.TH backend 7 "CUPS" "23 April 2012" "Apple Inc."
 
 .SH NAME
 backend \- cups backend transmission interfaces
-
 .SH SYNOPSIS
 .B backend
 .br
@@ -24,34 +23,42 @@ backend \- cups backend transmission interfaces
 job user title num-copies options [
 .I filename
 ]
-
 .SH DESCRIPTION
-Backends are a special type of \fIfilter(7)\fR which is used to
-send print data to and discover different devices on the system.
-
+Backends are a special type of \fIfilter(7)\fR which is used to send print data
+to and discover different devices on the system.
 .LP
-Like filters, backends must be capable of reading from a filename
-on the command-line or from the standard input, copying the
-standard input to a temporary file as required by the physical
-interface.
-
+Like filters, backends must be capable of reading from a filename on the
+command-line or from the standard input, copying the standard input to a
+temporary file as required by the physical interface.
 .LP
 The command name (argv[0]) is set to the device URI of the destination printer.
 Starting with CUPS 1.1.22, any authentication information in argv[0] is removed,
 so backend developers are urged to use the DEVICE_URI environment variable
 whenever authentication information is required. The CUPS API includes a
 \fIcupsBackendDeviceURI\fR function for retrieving the correct device URI.
-
 .LP
 Back-channel data from the device should be relayed to the job
 filters by writing to file descriptor 3. The CUPS API includes
 the \fIcupsBackChannelWrite\fR function for this purpose.
-
+.SH WARNING
+CUPS backends are not generally design to be run directly by the user. Aside
+from the device URI issue (argv[0] and 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.
+.LP
+Unless you are a developer and know what you are doing, please do not run
+backends directly. Instead, use the \fIlp(1)\fR or \fIlpr(1)\fR programs to send
+a print job or \fIlpinfo(8)\fR program to query for available printers using the
+backend. The one exception is the SNMP backend - see \fIsnmpbackend(8)\fR for
+more information.
 .SH DEVICE DISCOVERY
-When run with no arguments, the backend should list the devices
-and schemes it supports or is advertising to stdout. The output
-consists of zero or more lines consisting of any of the following
-forms:
+When run with no arguments, the backend should list the devices and schemes it
+supports or is advertising to stdout. The output consists of zero or more lines
+consisting of any of the following forms:
 
 .nf
     device-class scheme "Unknown" "device-info"
@@ -59,138 +66,107 @@ forms:
     device-class device-uri "device-make-and-model" "device-info" "device-id"
     device-class device-uri "device-make-and-model" "device-info" "device-id" "device-location"
 .fi
-
 .LP
 The \fIdevice-class\fR field is one of the following values:
-
 .TP 5
 direct
 .br
-The device-uri refers to a specific direct-access device with no
-options, such as a parallel, USB, or SCSI device.
-
+The device-uri refers to a specific direct-access device with no options, such
+as a parallel, USB, or SCSI device.
 .TP 5
 file
 .br
 The device-uri refers to a file on disk.
-
 .TP 5
 network
 .br
-The device-uri refers to a networked device and conforms to the
-general form for network URIs.
-
+The device-uri refers to a networked device and conforms to the general form for
+network URIs.
 .TP 5
 serial
 .br
-The device-uri refers to a serial device with configurable baud
-rate and other options. If the device-uri contains a baud value,
-it represents the maximum baud rate supported by the device.
-
+The device-uri refers to a serial device with configurable baud rate and other
+options. If the device-uri contains a baud value, it represents the maximum baud
+rate supported by the device.
 .LP
-The \fIscheme\fR field provides the URI scheme that is supported
-by the backend. Backends should use this form only when the
-backend supports any URI using that scheme. The \fIdevice-uri\fR
-field specifies the full URI to use when communicating with the
-device.
-
+The \fIscheme\fR field provides the URI scheme that is supported by the backend.
+Backends should use this form only when the backend supports any URI using that
+scheme. The \fIdevice-uri\fR field specifies the full URI to use when
+communicating with the device.
 .LP
-The \fIdevice-make-and-model\fR field specifies the make and
-model of the device, e.g. "Acme Foojet 2000". If the make and
-model is not known, you must report "Unknown".
-
+The \fIdevice-make-and-model\fR field specifies the make and model of the
+device, e.g. "Example Foojet 2000". If the make and model is not known, you must
+report "Unknown".
 .LP
-The \fIdevice-info\fR field specifies additional information
-about the device. Typically this includes the make and model
-along with the port number or network address, e.g. "Acme Foojet
-2000 USB #1".
-
+The \fIdevice-info\fR field specifies additional information about the device.
+Typically this includes the make and model along with the port number or network
+address, e.g. "Example Foojet 2000 USB #1".
 .LP
-The optional \fIdevice-id\fR field specifies the IEEE-1284 device
-ID string for the device, which is used to select a matching
-driver.
-
+The optional \fIdevice-id\fR field specifies the IEEE-1284 device ID string for
+the device, which is used to select a matching driver.
 .LP
 The optional \fIdevice-location\fR field specifies the physical location of
 the device, which is often used to pre-populate the printer-location attribute
 when adding a printer.
-
 .SH PERMISSIONS
-Backends without world execute permissions are run as the root
-user. Otherwise, the backend is run using the unprivileged user
-account, typically "lp".
-
+Backends without world execute permissions are run as the root user. Otherwise,
+the backend is run using an unprivileged user account, typically "lp".
 .SH EXIT CODES
-The following exit codes are defined for backends; C API
-constants defined in the <cups/backend.h> header file are defined
-in parenthesis:
-
+The following exit codes are defined for backends; C API constants defined in
+the <cups/backend.h> header file are defined in parenthesis:
 .TP 5
 0 (CUPS_BACKEND_OK)
 .br
-The print file was successfully transmitted to the device or
-remote server.
-
+The print file was successfully transmitted to the device or remote server.
 .TP 5
 1 (CUPS_BACKEND_FAILED)
 .br
-The print file was not successfully transmitted to the device or
-remote server. The scheduler will respond to this by canceling
-the job, retrying the job, or stopping the queue depending on the
-state of the error-policy attribute.
-
+The print file was not successfully transmitted to the device or remote server.
+The scheduler will respond to this by canceling the job, retrying the job, or
+stopping the queue depending on the state of the error-policy attribute.
 .TP 5
 2 (CUPS_BACKEND_AUTH_REQUIRED)
 .br
-The print file was not successfully transmitted because valid
-authentication information is required. The scheduler will
-respond to this by holding the job and adding the
-authentication-required job-reasons keyword.
-
+The print file was not successfully transmitted because valid authentication
+information is required. The scheduler will respond to this by holding the job
+and adding the "cups-held-for-authentication" keyword to the "job-reasons"
+attribute.
 .TP 5
 3 (CUPS_BACKEND_HOLD)
 .br
-The print file was not successfully transmitted because it cannot
-be printed at this time. The scheduler will respond to this by
-holding the job.
-
+The print file was not successfully transmitted because it cannot be printed at
+this time. The scheduler will respond to this by holding the job.
 .TP 5
 4 (CUPS_BACKEND_STOP)
 .br
-The print file was not successfully transmitted because it cannot
-be printed at this time. The scheduler will respond to this by
-stopping the queue.
-
+The print file was not successfully transmitted because it cannot be printed at
+this time. The scheduler will respond to this by stopping the queue.
 .TP 5
 5 (CUPS_BACKEND_CANCEL)
 .br
-The print file was not successfully transmitted because one or
-more attributes are not supported. The scheduler will respond to
-this by canceling the job.
-
+The print file was not successfully transmitted because one or more attributes
+are not supported or the job was canceled at the printer. The scheduler will
+respond to this by canceling the job.
 .TP 5
 6 (CUPS_BACKEND_RETRY)
 .br
 The print file was not successfully transmitted because of a temporary issue.
 The scheduler will retry the job at a future time - other jobs may print before
 this one.
-
 .TP 5
 7 (CUPS_BACKEND_RETRY_CURRENT)
 .br
 The print file was not successfully transmitted because of a temporary issue.
 The scheduler will retry the job immediately without allowing intervening jobs.
-
 .PP
 All other exit code values are reserved.
-
 .SH SEE ALSO
-\fIcupsd(8)\fR, \fIcupsd.conf(5)\fR, \fIfilter(7)\fR,
+\fIcups-snmp(8)\fR, \fIcupsd(8)\fR, \fIcupsd.conf(5)\fR, \fIfilter(7)\fR,
+\fIlpinfo(8)\fR,
 .br
 http://localhost:631/help
-
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: backend.man 9693 2011-04-16 02:51:22Z mike $".
+.\" End of "$Id: backend.man 7810 2008-07-29 01:11:15Z mike $".
 .\"
diff --git a/man/cancel.man b/man/cancel.man
index eda61eb..5134d1f 100644
--- a/man/cancel.man
+++ b/man/cancel.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cancel.man 9771 2011-05-12 05:21:56Z mike $"
+.\" "$Id: cancel.man 7600 2008-05-20 21:06:23Z mike $"
 .\"
 .\"   cancel man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -69,7 +69,7 @@ Cancel-Jobs operations in \fIcupsd.conf(5)\fR.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: cancel.man 9771 2011-05-12 05:21:56Z mike $".
+.\" End of "$Id: cancel.man 7600 2008-05-20 21:06:23Z mike $".
 .\"
diff --git a/man/classes.conf.man b/man/classes.conf.man
index 0664442..8149d15 100644
--- a/man/classes.conf.man
+++ b/man/classes.conf.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: classes.conf.man 9771 2011-05-12 05:21:56Z mike $"
+.\" "$Id: classes.conf.man 7600 2008-05-20 21:06:23Z mike $"
 .\"
 .\"   classes.conf man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -104,7 +104,7 @@ Specifies the date/time associated with the state.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: classes.conf.man 9771 2011-05-12 05:21:56Z mike $".
+.\" End of "$Id: classes.conf.man 7600 2008-05-20 21:06:23Z mike $".
 .\"
diff --git a/man/client.conf.man.in b/man/client.conf.man.in
index 6e606b1..36b70d5 100644
--- a/man/client.conf.man.in
+++ b/man/client.conf.man.in
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: client.conf.man.in 9960 2011-09-02 22:37:14Z mike $"
+.\" "$Id: client.conf.man.in 11173 2013-07-23 12:31:34Z msweet $"
 .\"
 .\"   client.conf man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -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 client.conf 5 "CUPS" "2 September 2011" "Apple Inc."
+.TH client.conf 5 "CUPS" "25 June 2013" "Apple Inc."
 .SH NAME
 client.conf \- client configuration file for cups
 .SH DESCRIPTION
@@ -45,11 +45,21 @@ ServerName hostname-or-ip-address[:port]
 ServerName /domain/socket
 .br
 Specifies the address and optionally the port to use when connecting to the
-server. \fBNote: Not supported on Mac OS X 10.7 or later.\fR
+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.
 .SH SEE ALSO
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: client.conf.man.in 9960 2011-09-02 22:37:14Z mike $".
+.\" End of "$Id: client.conf.man.in 11173 2013-07-23 12:31:34Z msweet $".
 .\"
diff --git a/man/cups-config.man b/man/cups-config.man
index 577dd44..c13e935 100644
--- a/man/cups-config.man
+++ b/man/cups-config.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cups-config.man 9771 2011-05-12 05:21:56Z mike $"
+.\" "$Id: cups-config.man 7646 2008-06-16 17:26:20Z mike $"
 .\"
 .\"   cups-config man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -111,7 +111,7 @@ Displays the full version number of the CUPS installation
 .SH SEE ALSO
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: cups-config.man 9771 2011-05-12 05:21:56Z mike $".
+.\" End of "$Id: cups-config.man 7646 2008-06-16 17:26:20Z mike $".
 .\"
diff --git a/man/cups-deviced.man.in b/man/cups-deviced.man.in
index 19fec7d..8961882 100644
--- a/man/cups-deviced.man.in
+++ b/man/cups-deviced.man.in
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cups-deviced.man.in 9771 2011-05-12 05:21:56Z mike $"
+.\" "$Id: cups-deviced.man.in 11173 2013-07-23 12:31:34Z msweet $"
 .\"
 .\"   cups-deviced man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -38,7 +38,7 @@ backend(7), cupsd(8), cupsd.conf(5),
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: cups-deviced.man.in 9771 2011-05-12 05:21:56Z mike $".
+.\" End of "$Id: cups-deviced.man.in 11173 2013-07-23 12:31:34Z msweet $".
 .\"
diff --git a/man/cups-driverd.man.in b/man/cups-driverd.man.in
index e93ffa9..d40fa54 100644
--- a/man/cups-driverd.man.in
+++ b/man/cups-driverd.man.in
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cups-driverd.man.in 9419 2011-01-06 18:49:38Z mike $"
+.\" "$Id: cups-driverd.man.in 11173 2013-07-23 12:31:34Z msweet $"
 .\"
 .\"   cups-driverd man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -116,7 +116,7 @@ cupsd(8), cupsd.conf(5), cupstestppd(1), lpinfo(8),
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: cups-driverd.man.in 9419 2011-01-06 18:49:38Z mike $".
+.\" End of "$Id: cups-driverd.man.in 11173 2013-07-23 12:31:34Z msweet $".
 .\"
diff --git a/man/cups-files.conf.man.in b/man/cups-files.conf.man.in
new file mode 100644
index 0000000..559ea45
--- /dev/null
+++ b/man/cups-files.conf.man.in
@@ -0,0 +1,152 @@
+.\"
+.\" "$Id: cups-files.conf.man.in 11221 2013-08-06 16:16:01Z msweet $"
+.\"
+.\"   cupsd.conf man page for CUPS.
+.\"
+.\"   Copyright 2007-2013 by Apple Inc.
+.\"   Copyright 1997-2006 by Easy Software Products.
+.\"
+.\"   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 cups-files.conf 5 "CUPS" "26 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.
+.LP
+Each line in the file can be a configuration directive, a blank line,
+or a comment. Comment lines start with the # character.
+.SH DIRECTIVES
+The following directives are understood by \fIcupsd(8)\fR. Consult the
+on-line help for detailed descriptions:
+.TP 5
+AccessLog filename
+.TP 5
+AccessLog syslog
+.br
+Defines the access log filename.
+.TP 5
+ConfigFilePerm mode
+.br
+Specifies the permissions for all configuration files that the scheduler
+writes.
+.TP 5
+DataDir path
+.br
+Specified the directory where data files can be found.
+.TP 5
+DocumentRoot directory
+.br
+Specifies the root directory for the internal web server documents.
+.TP 5
+ErrorLog filename
+.TP 5
+ErrorLog syslog
+.br
+Specifies the error log filename.
+.TP 5
+FatalErrors none
+.TP 5
+FatalErrors all -kind [... -kind]
+.TP 5
+FatalErrors kind [... kind]
+.br
+Specifies which errors are fatal, causing the scheduler to exit. "Kind" is
+"browse", "config", "listen", "log", or "permissions".
+.TP 5
+FileDevice Yes
+.TP 5
+FileDevice No
+.br
+Specifies whether the file pseudo-device can be used for new
+printer queues.
+.TP 5
+FontPath directory[:directory:...]
+.br
+Specifies the search path for fonts.
+.TP 5
+Group group-name-or-number
+.br
+Specifies the group name or ID that will be used when executing
+external programs.
+.TP 5
+LogFilePerm mode
+.br
+Specifies the permissions for all log files that the scheduler writes.
+.TP 5
+PageLog filename
+.TP 5
+PageLog syslog
+.br
+Specifies the page log filename.
+.TP 5
+Printcap
+.TP 5
+Printcap filename
+.br
+Specifies the filename for a printcap file that is updated
+automatically with a list of available printers (needed for
+legacy applications); specifying Printcap with no filename
+disables printcap generation.
+.TP 5
+RemoteRoot user-name
+.br
+Specifies the username that is associated with unauthenticated root
+accesses.
+.TP 5
+RequestRoot directory
+.br
+Specifies the directory to store print jobs and other HTTP request
+data.
+.TP 5
+ServerBin directory
+.br
+Specifies the directory where backends, CGIs, daemons, and filters may
+be found.
+.TP 5
+ServerCertificate filename
+.br
+Specifies the encryption certificate to use.
+.TP 5
+ServerKey filename
+.br
+Specifies the encryption key to use.
+.TP 5
+ServerRoot directory
+.br
+Specifies the directory where the server configuration files can be found.
+.TP 5
+SyncOnClose Yes
+.TP 5
+SyncOnClose No
+Specifies whether the scheduler calls \fIfsync(2)\fR after writing configuration
+or state files. The default is No.
+.TP 5
+SystemGroup group-name [group-name ...]
+.br
+Specifies the group(s) to use for System class authentication.
+.TP 5
+TempDir directory
+.br
+Specifies the directory where temporary files are stored.
+.TP 5
+User user-name
+.br
+Specifies the user name or ID that is used when running external programs.
+.SH SEE ALSO
+\fIclasses.conf(5)\fR, \fIcupsd(8)\fR, \fIcupsd.conf(5)\fR, \fImime.convs(5)\fR,
+\fImime.types(5)\fR, \fIprinters.conf(5)\fR,
+\fIsubscriptions.conf(5)\fR,
+.br
+http://localhost:631/help
+.SH COPYRIGHT
+Copyright 2007-2013 by Apple Inc.
+.\"
+.\" End of "$Id: cups-files.conf.man.in 11221 2013-08-06 16:16:01Z msweet $".
+.\"
diff --git a/man/cups-lpd.man.in b/man/cups-lpd.man.in
index 2959c0a..e030b61 100644
--- a/man/cups-lpd.man.in
+++ b/man/cups-lpd.man.in
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cups-lpd.man.in 9771 2011-05-12 05:21:56Z mike $"
+.\" "$Id: cups-lpd.man.in 11173 2013-07-23 12:31:34Z msweet $"
 .\"
 .\"   cups-lpd man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -118,7 +118,7 @@ clients may be unreliable.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: cups-lpd.man.in 9771 2011-05-12 05:21:56Z mike $".
+.\" End of "$Id: cups-lpd.man.in 11173 2013-07-23 12:31:34Z msweet $".
 .\"
diff --git a/man/cups-polld.man b/man/cups-polld.man
deleted file mode 100644
index aee7068..0000000
--- a/man/cups-polld.man
+++ /dev/null
@@ -1,38 +0,0 @@
-.\"
-.\" "$Id: cups-polld.man 9771 2011-05-12 05:21:56Z mike $"
-.\"
-.\"   cups-polld man page for CUPS.
-.\"
-.\"   Copyright 2007-2011 by Apple Inc.
-.\"   Copyright 1997-2006 by Easy Software Products.
-.\"
-.\"   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 cups-polld 8 "CUPS" "12 February 2006" "Apple Inc."
-.SH NAME
-cups-polld \- cups printer polling daemon
-.SH SYNOPSIS
-.B cups-polld
-.I address ipp-port interval browse-port
-.SH DESCRIPTION
-\fIcups-polld\fR polls remote servers for a list of available
-printers and printer classes every \fIinterval\fR seconds.
-Printer and class information is then broadcast to the localhost
-interface (127.0.0.1) on the specified browse port for reception
-by \fIcupsd(8)\fR.
-.PP
-This program is started automatically by \fIcupsd\fR for every
-\fIBrowsePoll\fR directive found in the \fIcupsd.conf(5)\fR file.
-.SH SEE ALSO
-\fIcupsd(8)\fR, \fIcupsd.conf(5)\fR,
-.br
-http://localhost:631/help
-.SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
-.\"
-.\" End of "$Id: cups-polld.man 9771 2011-05-12 05:21:56Z mike $".
-.\"
diff --git a/man/cups-snmp.conf.man b/man/cups-snmp.conf.man
index 1c778bc..608a2b5 100644
--- a/man/cups-snmp.conf.man
+++ b/man/cups-snmp.conf.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cups-snmp.conf.man 9771 2011-05-12 05:21:56Z mike $"
+.\" "$Id: cups-snmp.conf.man 7600 2008-05-20 21:06:23Z mike $"
 .\"
 .\"   snmp.conf man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -12,24 +12,22 @@
 .\"   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 snmp.conf 5 "CUPS" "31 July 2006" "Apple Inc."
+.TH snmp.conf 5 "CUPS" "23 April 2012" "Apple Inc."
+
 .SH NAME
 snmp.conf \- snmp configuration file for cups
 .SH DESCRIPTION
-The \fIsnmp.conf\fR file configures the CUPS SNMP printer
-discovery backend and is  normally located in the \fI/etc/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.
+The \fIsnmp.conf\fR file configures how the standard CUPS network backends
+(http, https, ipp, ipps, lpd, snmp, and socket) access printer information using
+SNMPv1 and is normally located in the \fI/etc/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.
 .LP
-The SNMP backend uses the SNMPv1 protocol to discover network
-printers, collecting information from the Host MIB along with
-intelligent port probes to determine the correct device URI and
-make and model for each printer. Future versions of CUPS will
-likely support the new Port Monitor MIB as well.
+The Community and DebugLevel directives are used by all backends. The remainder
+apply only to the SNMP backend (\fIcups-snmp(8)\fR).
 .SH DIRECTIVES
-The following directives are understood by the SNMP backend.
-Consult the on-line help for detailed descriptions:
+The following directives are understood by the CUPS network backends. Consult
+the on-line help for detailed descriptions:
 .TP 5
 Address @IF(\fIname\fR)
 .TP 5
@@ -37,37 +35,44 @@ Address @LOCAL
 .TP 5
 Address \fIaddress\fR
 .br
-Sends SNMP broadcast queries to the specified address(es). The
-default address is "@LOCAL" which broadcasts to all LAN
-interfaces.
+Sends SNMP broadcast queries to the specified address(es). There is no default
+for the broadcast address.
 .TP 5
 Community \fIname\fR
 .br
-Specifies a SNMP community to query. The default community is
-"public".
+Specifies the community name to use. Only a single community name may be
+specified. The default community name is "public".
 .TP 5
-DebugLevel \fIN\fR
+DebugLevel number
 .br
-Sets the debug logging level to \fIN\fR; 0 disables debug
-logging, 1 enables basic logging, 2 displays SNMP values, and 3
-displays raw hex data.
+Specifies the logging level from 0 (none) to 3 (everything). Typically only used
+for debugging (thus the name). The default debug level is 0.
+.TP 5
+DeviceURI "regular expression" device-uri [... device-uri]
+.br
+Specifies one or more device URIs that should be used for a given make and model
+string. The regular expression is used to match the detected make and model, and
+the device URI strings must be of the form "scheme://%s[:port]/[path]", where
+"%s" represents the detected address or hostname. There are no default device
+URI matching rules.
 .TP 5
 HostNameLookups on
 .TP 5
 HostNameLookups off
 .br
-Specifies whether the addresses of printers should be converted
-to hostnames or left as numeric IP addresses. The default is
-"off".
+Specifies whether the addresses of printers should be converted to hostnames or
+left as numeric IP addresses. The default is "off".
 .TP 5
 MaxRunTime \fIseconds\fR
 .br
-Specifies the maximum number of seconds that the SNMP backend
-will scan the network for printers.
+Specifies the maximum number of seconds that the SNMP backend will scan the
+network for printers. The default is 120 seconds (2 minutes).
 .SH SEE ALSO
+cups-snmp(8),
+.br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: cups-snmp.conf.man 9771 2011-05-12 05:21:56Z mike $".
+.\" End of "$Id: cups-snmp.conf.man 7600 2008-05-20 21:06:23Z mike $".
 .\"
diff --git a/man/cups-snmp.man.in b/man/cups-snmp.man.in
new file mode 100644
index 0000000..797a038
--- /dev/null
+++ b/man/cups-snmp.man.in
@@ -0,0 +1,59 @@
+.\"
+.\" "$Id: cups-snmp.man.in 11173 2013-07-23 12:31:34Z msweet $"
+.\"
+.\"   SNMP backend man page for CUPS.
+.\"
+.\"   Copyright 2012-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 cups-snmp 8 "CUPS" "23 April 2012" "Apple Inc."
+.SH NAME
+snmp \- cups snmp backend
+.SH SYNOPSIS
+.B @CUPS_SERVERBIN@/backend/snmp
+.I ip-address-or-hostname
+.br
+.B lpinfo -v --include-schemes snmp
+.SH DESCRIPTION
+The CUPS SNMP backend provides legacy discovery and identification of network
+printers using SNMPv1. When used for discovery through the scheduler, the
+backend will list all printers that respond to a broadcast SNMPv1 query with the
+"public" community name. Additional queries are then sent to printers that
+respond in order to determine the correct device URI, make and model, and other
+information needed for printing.
+.LP
+In the first form, the SNMP backend is run directly by the user to look up the
+device URI and other information when you have an IP address or hostname. This
+can be used for programs that need to configure print queues where the user has
+supplied an address but nothing else.
+.LP
+In the second form, the SNMP backend is run indirectly using the \fIlpinfo(8)\fR
+command. The output provides all printers detected via SNMP on the configured
+broadcast addresses. \fBNote\fR: no broadcast addresses are configured by
+default.
+.SH MIBS
+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
+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
+variable and the MaxRunTime value can be overridden using the CUPS_MAX_RUN_TIME
+environment variable.
+.SH SEE ALSO
+\fIbackend(7)\fR, \fIcups-snmp.conf(5)\fR, \fIcupsd(8)\fR, \fIcupsd.conf(5)\fR,
+\fIfilter(7)\fR, \fIlpinfo(8)\fR,
+.br
+http://localhost:631/help
+.SH COPYRIGHT
+Copyright 2007-2013 by Apple Inc.
+.\"
+.\" End of "$Id: cups-snmp.man.in 11173 2013-07-23 12:31:34Z msweet $".
+.\"
diff --git a/man/cupsaccept.man b/man/cupsaccept.man
index 7c53d86..0c8ba03 100644
--- a/man/cupsaccept.man
+++ b/man/cupsaccept.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cupsaccept.man 9771 2011-05-12 05:21:56Z mike $"
+.\" "$Id: cupsaccept.man 7930 2008-09-10 22:25:54Z mike $"
 .\"
 .\"   accept/reject man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -73,7 +73,7 @@ require the root user to execute these commands.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: cupsaccept.man 9771 2011-05-12 05:21:56Z mike $".
+.\" End of "$Id: cupsaccept.man 7930 2008-09-10 22:25:54Z mike $".
 .\"
diff --git a/man/cupsaddsmb.man.in b/man/cupsaddsmb.man.in
index 98fce09..335cf68 100644
--- a/man/cupsaddsmb.man.in
+++ b/man/cupsaddsmb.man.in
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cupsaddsmb.man.in 9771 2011-05-12 05:21:56Z mike $"
+.\" "$Id: cupsaddsmb.man.in 11173 2013-07-23 12:31:34Z msweet $"
 .\"
 .\"   cupsaddsmb man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -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
@@ -204,11 +168,9 @@ Getting the full set of Windows driver files should be easier.
 .SH SEE ALSO
 \fIsmbd(8)\fR, \fIsmb.conf(5)\fR,
 http://localhost:631/help
-.br
-http://www.cups.org/windows/
 
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: cupsaddsmb.man.in 9771 2011-05-12 05:21:56Z mike $".
+.\" End of "$Id: cupsaddsmb.man.in 11173 2013-07-23 12:31:34Z msweet $".
 .\"
diff --git a/man/cupsctl.man b/man/cupsctl.man
index 411ada8..8dc01b0 100644
--- a/man/cupsctl.man
+++ b/man/cupsctl.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cupsctl.man 9457 2011-01-11 03:04:04Z mike $"
+.\" "$Id: cupsctl.man 7600 2008-05-20 21:06:23Z mike $"
 .\"
 .\"   cupsctl man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 2007 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -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 cupsctl 8 "CUPS" "10 January 2011" "Apple Inc."
+.TH cupsctl 8 "CUPS" "11 January 2013" "Apple Inc."
 .SH NAME
 cupsctl \- configure cupsd.conf options
 .SH SYNOPSIS
@@ -22,7 +22,7 @@ cupsctl \- configure cupsd.conf options
 ] [ -h
 .I server[:port]
 ] [ --[no-]debug-logging ] [ --[no-]remote-admin ] [ --[no-]remote-any ]
-[ --[no-]remote-printers ] [ --[no-]share-printers ] [ --[no-]user-cancel-any ]
+[ --[no-]share-printers ] [ --[no-]user-cancel-any ]
 [
 .I name=value
 ]
@@ -57,11 +57,6 @@ Enables or disables remote administration.
 .br
 Enables or disables printing from any address, e.g. the Internet.
 .TP 5
---[no-]remote-printers
-.br
-Enables or disables the display of remote printers shared via the CUPS, LDAP,
-or SLP protocols.
-.TP 5
 --[no-]share-printers
 .br
 Enables or disables sharing of local printers with other computers.
@@ -87,12 +82,7 @@ Get the current debug logging state:
 .LP
 Disable printer sharing:
 .nf
-    cupsctl --no-shared-printers
-.fi
-.LP
-Enable printing using the file: pseudo-device:
-.nf
-    cupsctl FileDevice=Yes
+    cupsctl --no-share-printers
 .fi
 .SH KNOWN ISSUES
 You cannot set the Listen or Port directives using \fIcupsctl\fR.
@@ -101,7 +91,7 @@ You cannot set the Listen or Port directives using \fIcupsctl\fR.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: cupsctl.man 9457 2011-01-11 03:04:04Z mike $".
+.\" End of "$Id: cupsctl.man 7600 2008-05-20 21:06:23Z mike $".
 .\"
diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in
index c517f0b..c362d09 100644
--- a/man/cupsd.conf.man.in
+++ b/man/cupsd.conf.man.in
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cupsd.conf.man.in 9784 2011-05-18 21:33:35Z mike $"
+.\" "$Id: cupsd.conf.man.in 11173 2013-07-23 12:31:34Z msweet $"
 .\"
 .\"   cupsd.conf man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -12,12 +12,15 @@
 .\"   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" "18 May 2011" "Apple Inc."
+.TH cupsd.conf 5 "CUPS" "19 November 2012" "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.
+is normally located in the \fI@CUPS_SERVERROOT@\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.
 .LP
 Each line in the file can be a configuration directive, a blank line,
 or a comment. Comment lines start with the # character. The
@@ -27,12 +30,6 @@ popular Apache web server software and are described below.
 The following directives are understood by \fIcupsd(8)\fR. Consult the
 on-line help for detailed descriptions:
 .TP 5
-AccessLog filename
-.TP 5
-AccessLog syslog
-.br
-Defines the access log filename.
-.TP 5
 AccessLogLevel config
 .TP 5
 AccessLogLevel actions
@@ -61,20 +58,6 @@ Allow @LOCAL
 .br
 Allows access from the named hosts or addresses.
 .TP 5
-AuthClass User
-.TP 5
-AuthClass Group
-.TP 5
-AuthClass System
-.br
-Specifies the authentication class (User, Group, System) -
-\fBthis directive is deprecated\fR.
-.TP 5
-AuthGroupName group-name
-.br
-Specifies the authentication group - \fBthis directive is
-deprecated\fR.
-.TP 5
 AuthType None
 .TP 5
 AuthType Basic
@@ -94,121 +77,9 @@ AutoPurgeJobs No
 Specifies whether to purge job history data automatically when
 it is no longer required for quotas.
 .TP 5
-BrowseAddress ip-address
-.TP 5
-BrowseAddress @IF(name)
-.TP 5
-BrowseAddress @LOCAL
-.br
-Specifies a broadcast address for outgoing printer information packets.
-.TP 5
-BrowseAllow all
-.TP 5
-BrowseAllow none
-.TP 5
-BrowseAllow host.domain.com
-.TP 5
-BrowseAllow *.domain.com
-.TP 5
-BrowseAllow ip-address
-.TP 5
-BrowseAllow ip-address/netmask
-.TP 5
-BrowseAllow ip-address/mm
-.TP 5
-BrowseAllow @IF(name)
-.TP 5
-BrowseAllow @LOCAL
-.br
-Allows incoming printer information packets from the named host or address.
-.TP 5
-BrowseDeny all
-.TP 5
-BrowseDeny none
-.TP 5
-BrowseDeny host.domain.com
-.TP 5
-BrowseDeny *.domain.com
-.TP 5
-BrowseDeny ip-address
-.TP 5
-BrowseDeny ip-address/netmask
-.TP 5
-BrowseDeny ip-address/mm
-.TP 5
-BrowseDeny @IF(name)
-.TP 5
-BrowseDeny @LOCAL
-.br
-Denies incoming printer information packets from the named host or address.
-.TP 5
-BrowseInterval seconds
-.br
-Specifies the maximum interval between printer information broadcasts.
-.TP 5
-BrowseLDAPBindDN
-.br
-Specifies the LDAP domain name to use when registering printers.
-.TP 5
-BrowseLDAPCACertFile
-.br
-Specifies the SSL certificate authority file to use.
-.TP 5
-BrowseLDAPDN
-.br
-Specifies the LDAP domain name to use when discovering printers.
-.TP 5
-BrowseLDAPPassword
-.br
-Specifies the password to use when accessing the LDAP server.
-.TP 5
-BrowseLDAPServer
-.br
-Specifies the LDAP server to use.
-.TP 5
-BrowseOrder allow,deny
-.TP 5
-BrowseOrder deny,allow
-.br
-Specifies the order of printer information access control (allow,deny or deny,allow)
-.TP 5
-BrowsePoll host-or-ip-address
-.br
-Specifies a server to poll for printer information.
-.TP 5
-BrowsePort port
-.br
-Specifies the port to listen to for printer information packets.
-.TP 5
-BrowseProtocols [All] [CUPS] [DNSSD] [LDAP] [SLP]
-.br
-Specifies the protocols to use for printer browsing.
-.TP 5
-BrowseLocalProtocols [All] [CUPS] [DNSSD] [LDAP] [SLP]
-.br
-Specifies the protocols to use for local printer browsing.
-.TP 5
-BrowseRemoteProtocols [All] [CUPS] [DNSSD] [LDAP] [SLP]
-.br
-Specifies the protocols to use for remote printer browsing.
-.TP 5
-BrowseRelay from-address to-address
-.br
-Specifies that printer information packets should be relayed from one host or
-network to another.
-.TP 5
-BrowseShortNames Yes
-.TP 5
-BrowseShortNames No
-.br
-Specifies whether remote printers will use short names ("printer") or not
-("printer@server"). This option is ignored if more than one remote printer
-exists with the same name.
-.TP 5
-BrowseTimeout seconds
+BrowseLocalProtocols [All] [DNSSD]
 .br
-Specifies the maximum interval between printer information updates before
-remote printers will be removed from the list of available printers.
+Specifies the protocols to use for local printer sharing.
 .TP 5
 BrowseWebIF Yes
 .TP 5
@@ -220,7 +91,7 @@ Browsing Yes
 .TP 5
 Browsing No
 .br
-Specifies whether or not remote printer browsing should be enabled.
+Specifies whether or not shared printers should be advertised.
 .TP 5
 Classification banner
 .br
@@ -233,15 +104,6 @@ ClassifyOverride No
 Specifies whether to allow users to override the classification
 of individual print jobs.
 .TP 5
-ConfigFilePerm mode
-.br
-Specifies the permissions for all configuration files that the scheduler
-writes.
-.TP 5
-DataDir path
-.br
-Specified the directory where data files can be found.
-.TP 5
 DefaultAuthType Basic
 .TP 5
 DefaultAuthType BasicDigest
@@ -309,10 +171,6 @@ Specifies the delay for updating of configuration and state files. A value of 0
 causes the update to happen as soon as possible, typically within a few
 milliseconds.
 .TP 5
-DocumentRoot directory
-.br
-Specifies the root directory for the internal web server documents.
-.TP 5
 Encryption IfRequested
 .TP 5
 Encryption Never
@@ -322,28 +180,6 @@ Encryption Required
 Specifies the level of encryption that is required for a particular
 location.
 .TP 5
-ErrorLog filename
-.TP 5
-ErrorLog syslog
-.br
-Specifies the error log filename.
-.TP 5
-FatalErrors none
-.TP 5
-FatalErrors all -kind [... -kind]
-.TP 5
-FatalErrors kind [... kind]
-.br
-Specifies which errors are fatal, causing the scheduler to exit. "Kind" is
-"browse", "config", "listen", "log", or "permissions".
-.TP 5
-FileDevice Yes
-.TP 5
-FileDevice No
-.br
-Specifies whether the file pseudo-device can be used for new
-printer queues.
-.TP 5
 FilterLimit limit
 .br
 Specifies the maximum cost of filters that are run concurrently.
@@ -353,20 +189,10 @@ FilterNice nice-value
 Specifies the scheduling priority ("nice" value) of filters that
 are run to print a job.
 .TP 5
-FontPath directory[:directory:...]
+GSSServiceName name
 .br
-Specifies the search path for fonts.
-.TP 5
-Group group-name-or-number
-.br
-Specifies the group name or ID that will be used when executing
-external programs.
-.TP 5
-HideImplicitMembers Yes
-.TP 5
-HideImplicitMembers No
-.br
-Specifies whether to hide members of implicit classes.
+Specifies the service name when using Kerberos authentication. The default
+service name is "@CUPS_DEFAULT_GSSSERVICENAME@".
 .TP 5
 HostNameLookups On
 .TP 5
@@ -376,21 +202,6 @@ HostNameLookups Double
 .br
 Specifies whether or not to do reverse lookups on client addresses.
 .TP 5
-ImplicitAnyClasses Yes
-.TP 5
-ImplicitAnyClasses No
-.br
-Specifies whether or not to create implicit classes for local and
-remote printers, e.g. "AnyPrinter" from "Printer", "Printer@server1",
-and "Printer@server2".
-.TP 5
-ImplicitClasses Yes
-.TP 5
-ImplicitClasses No
-.br
-Specifies whether or not to create implicit classes from identical
-remote printers.
-.TP 5
 Include filename
 .br
 Includes the named file.
@@ -469,10 +280,6 @@ LogDebugHistory #-messages
 Specifies the number of debugging messages that are logged when an error
 occurs in a print job.
 .TP 5
-LogFilePerm mode
-.br
-Specifies the permissions for all log files that the scheduler writes.
-.TP 5
 LogLevel alert
 .TP 5
 LogLevel crit
@@ -514,6 +321,11 @@ MaxCopies number
 .br
 Specifies the maximum number of copies that a user can print of each job.
 .TP 5
+MaxHoldTime seconds
+.br
+Specifies the maximum time a job may remain in the "indefinite" hold state
+before it is canceled. Set to 0 to disable cancellation of held jobs.
+.TP 5
 MaxJobs number
 .br
 Specifies the maximum number of simultaneous jobs to support.
@@ -526,6 +338,12 @@ MaxJobsPerUser number
 .br
 Specifies the maximum number of simultaneous jobs per user to support.
 .TP 5
+MaxJobTime seconds
+.br
+Specifies the maximum time a job may take to print before it is canceled. The
+default is 10800 seconds (3 hours). Set to 0 to disable cancellation of "stuck"
+jobs.
+.TP 5
 MaxLogSize number-bytes
 .br
 Specifies the maximum size of the log files before they are
@@ -546,12 +364,6 @@ Order deny,allow
 .br
 Specifies the order of HTTP access control (allow,deny or deny,allow)
 .TP 5
-PageLog filename
-.TP 5
-PageLog syslog
-.br
-Specifies the page log filename.
-.TP 5
 PageLogFormat format string
 .br
 Specifies the format of page log lines.
@@ -581,15 +393,6 @@ PreserveJobHistory No
 Specifies whether or not to preserve the job history after they are
 printed.
 .TP 5
-Printcap
-.TP 5
-Printcap filename
-.br
-Specifies the filename for a printcap file that is updated
-automatically with a list of available printers (needed for
-legacy applications); specifying Printcap with no filename
-disables printcap generation.
-.TP 5
 PrintcapFormat bsd
 .TP 5
 PrintcapFormat plist
@@ -598,29 +401,11 @@ PrintcapFormat solaris
 .br
 Specifies the format of the printcap file.
 .TP 5
-PrintcapGUI
-.TP 5
-PrintcapGUI gui-program-filename
-.br
-Specifies whether to generate option panel definition files on
-some operating systems. When provided with no program filename,
-disables option panel definition files.
-.TP 5
 ReloadTimeout seconds
 .br
 Specifies the amount of time to wait for job completion before
 restarting the scheduler.
 .TP 5
-RemoteRoot user-name
-.br
-Specifies the username that is associated with unauthenticated root
-accesses.
-.TP 5
-RequestRoot directory
-.br
-Specifies the directory to store print jobs and other HTTP request
-data.
-.TP 5
 Require group group-name-list
 .TP 5
 Require user user-name-list
@@ -652,27 +437,10 @@ ServerAlias *
 Specifies an alternate name that the server is known by. The special name "*"
 allows any name to be used.
 .TP 5
-ServerBin directory
-.br
-Specifies the directory where backends, CGIs, daemons, and filters may
-be found.
-.TP 5
-ServerCertificate filename
-.br
-Specifies the encryption certificate to use.
-.TP 5
-ServerKey filename
-.br
-Specifies the encryption key to use.
-.TP 5
 ServerName hostname-or-ip-address
 .br
 Specifies the fully-qualified hostname of the server.
 .TP 5
-ServerRoot directory
-.br
-Specifies the directory where the server configuration files can be found.
-.TP 5
 ServerTokens Full
 .TP 5
 ServerTokens Major
@@ -708,6 +476,13 @@ SSLPort
 .br
 Listens on the specified port for encrypted connections.
 .TP 5
+StrictConformance Yes
+.TP 5
+StrictConformance No
+.br
+Specifies whether the scheduler requires clients to strictly adhere to the IPP
+specifications. The default is No.
+.TP 5
 SubscriptionPrivateAccess all
 .TP 5
 SubscriptionPrivateAccess default
@@ -729,34 +504,22 @@ Specifies the list of job values to make private. The "default" values are
 "notify-events", "notify-pull-method", "notify-recipient-uri",
 "notify-subscriber-user-name", and "notify-user-data".
 .TP 5
-SystemGroup group-name [group-name ...]
-.br
-Specifies the group(s) to use for System class authentication.
-.TP 5
-TempDir directory
-.br
-Specifies the directory where temporary files are stored.
-.TP 5
 Timeout seconds
 .br
 Specifies the HTTP request timeout in seconds.
 .TP 5
-User user-name
-.br
-Specifies the user name or ID that is used when running external programs.
-.TP 5
 WebInterface yes
 .TP 5
 WebInterface no
 Specifies whether the web interface is enabled.
 .SH SEE ALSO
-\fIclasses.conf(5)\fR, \fIcupsd(8)\fR, \fImime.convs(5)\fR,
-\fImime.types(5)\fR, \fIprinters.conf(5)\fR,
+\fIclasses.conf(5)\fR, \fIcups-files.conf(5)\fR, \fIcupsd(8)\fR,
+\fImime.convs(5)\fR, \fImime.types(5)\fR, \fIprinters.conf(5)\fR,
 \fIsubscriptions.conf(5)\fR,
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: cupsd.conf.man.in 9784 2011-05-18 21:33:35Z mike $".
+.\" End of "$Id: cupsd.conf.man.in 11173 2013-07-23 12:31:34Z msweet $".
 .\"
diff --git a/man/cupsd.man.in b/man/cupsd.man.in
index 820afd8..69bdc23 100644
--- a/man/cupsd.man.in
+++ b/man/cupsd.man.in
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cupsd.man.in 9771 2011-05-12 05:21:56Z mike $"
+.\" "$Id: cupsd.man.in 11173 2013-07-23 12:31:34Z msweet $"
 .\"
 .\"   cupsd man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -66,7 +66,7 @@ operations.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: cupsd.man.in 9771 2011-05-12 05:21:56Z mike $".
+.\" End of "$Id: cupsd.man.in 11173 2013-07-23 12:31:34Z msweet $".
 .\"
diff --git a/man/cupsenable.man b/man/cupsenable.man
index 0552f42..482a1e3 100644
--- a/man/cupsenable.man
+++ b/man/cupsenable.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cupsenable.man 9771 2011-05-12 05:21:56Z mike $"
+.\" "$Id: cupsenable.man 7600 2008-05-20 21:06:23Z mike $"
 .\"
 .\"   cupsenable/cupsdisable man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -86,8 +86,8 @@ require the root user to execute these commands.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 
 .\"
-.\" End of "$Id: cupsenable.man 9771 2011-05-12 05:21:56Z mike $".
+.\" End of "$Id: cupsenable.man 7600 2008-05-20 21:06:23Z mike $".
 .\"
diff --git a/man/cupsfilter.man b/man/cupsfilter.man
index 7aa9c83..5a67e4d 100644
--- a/man/cupsfilter.man
+++ b/man/cupsfilter.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cupsfilter.man 9030 2010-03-05 03:55:56Z mike $"
+.\" "$Id: cupsfilter.man 7936 2008-09-11 03:12:59Z mike $"
 .\"
 .\"   cupsfilter man page for CUPS.
 .\"
-.\"   Copyright 2007-2010 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
 .\"   property of Apple Inc. and are protected by Federal copyright
@@ -11,18 +11,22 @@
 .\"   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 cupsfilter 8 "CUPS" "4 March 2010" "Apple Inc."
+.TH cupsfilter 8 "CUPS" "20 June 2012" "Apple Inc."
 .SH NAME
 cupsfilter \- convert a file to another format using cups filters
 .SH SYNOPSIS
 .B cupsfilter
-[ -c
+[ -D ] [ -U
+.I user
+] [ -c
 .I config-file
-] [ -d 
+] [ -d
 .I printer
-] [ -e ] -j
+] [ -e ] [ -i
+.I mime/type
+] [ -j
 .I job-id[,N]
-[ -m
+] [ -m
 .I mime/type
 ] [ -n
 .I copies
@@ -32,7 +36,7 @@ cupsfilter \- convert a file to another format using cups filters
 .I filename.ppd
 ] [ -t
 .I title
-]
+] [ -u ]
 .I filename
 .SH DESCRIPTION
 \fIcupsfilter\fR is a front-end to the CUPS filter subsystem which allows you
@@ -40,6 +44,14 @@ to convert a file to a specific format, just as if you had printed the file
 through CUPS. By default, \fIcupsfilter\fR generates a PDF file.
 .SH OPTIONS
 .TP 5
+-D
+.br
+Delete the input file after conversion.
+.TP 5
+-U user
+.br
+Specifies the username passed to the filters. The default is the name of the current user.
+.TP 5
 -c config-file
 .br
 Uses the named cupsd.conf configuration file.
@@ -51,6 +63,11 @@ Uses information from the named printer.
 .br
 Use every filter from the PPD file.
 .TP 5
+-i mime/type
+.br
+Specifies the source file type. The default file type is guessed using the
+filename and contents of the file.
+.TP 5
 -j job-id[,N]
 .br
 Converts document N from the specified job. If N is omitted, document 1 is
@@ -77,15 +94,16 @@ Specifies the PPD file to use.
 -t title
 .br
 Specifies the document title.
-.SH KNOWN ISSUES
-\fIcupsfilter\fR currently does not use the filters defined in the PPD file.
-This will be addressed in a future CUPS release.
+.TP 5
+-u
+.br
+Delete the PPD file after conversion.
 .SH SEE ALSO
 \fIcupsd.conf(5)\fR
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2010 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: cupsfilter.man 9030 2010-03-05 03:55:56Z mike $".
+.\" End of "$Id: cupsfilter.man 7936 2008-09-11 03:12:59Z mike $".
 .\"
diff --git a/man/cupstestdsc.man b/man/cupstestdsc.man
index 781c5ef..ec08797 100644
--- a/man/cupstestdsc.man
+++ b/man/cupstestdsc.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cupstestdsc.man 9771 2011-05-12 05:21:56Z mike $"
+.\" "$Id: cupstestdsc.man 7600 2008-05-20 21:06:23Z mike $"
 .\"
 .\"   cupstestdsc man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -44,7 +44,7 @@ http://localhost:631/help
 Adobe PostScript Language Document Structuring Conventions
 Specification, Version 3.0.
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: cupstestdsc.man 9771 2011-05-12 05:21:56Z mike $".
+.\" End of "$Id: cupstestdsc.man 7600 2008-05-20 21:06:23Z mike $".
 .\"
diff --git a/man/cupstestppd.man b/man/cupstestppd.man
index 042f4c2..2d66116 100644
--- a/man/cupstestppd.man
+++ b/man/cupstestppd.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cupstestppd.man 9771 2011-05-12 05:21:56Z mike $"
+.\" "$Id: cupstestppd.man 7600 2008-05-20 21:06:23Z mike $"
 .\"
 .\"   cupstestppd man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -159,7 +159,7 @@ http://localhost:631/help
 .br
 Adobe PostScript Printer Description File Format Specification, Version 4.3.
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: cupstestppd.man 9771 2011-05-12 05:21:56Z mike $".
+.\" End of "$Id: cupstestppd.man 7600 2008-05-20 21:06:23Z mike $".
 .\"
diff --git a/man/filter.man b/man/filter.man
index eef66ba..9a79dbd 100644
--- a/man/filter.man
+++ b/man/filter.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: filter.man 9771 2011-05-12 05:21:56Z mike $"
+.\" "$Id: filter.man 7600 2008-05-20 21:06:23Z mike $"
 .\"
 .\"   filter man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2007 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -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 filter 7 "CUPS" "13 May 2009" "Apple Inc."
+.TH filter 7 "CUPS" "18 May 2012" "Apple Inc."
 .SH NAME
 filter \- cups file conversion filter interface
 .SH SYNOPSIS
@@ -33,7 +33,14 @@ standard output.
 .LP
 The command name (argv[0]) is set to the name of the destination printer but is
 also available in the PRINTER environment variable.
-
+.SH WARNING
+CUPS filters are not meant to be run directly by the user. Aside from the legacy
+System V interface issues (argv[0] 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. Unless you are a developer and know what you are doing, please do not run
+filters directly. Instead, use the \fIcupsfilter(8)\fR program to use the
+appropriate filters to do the conversions you need.
 .SH OPTIONS
 Options passed on the command-line typically do not include the default choices
 the printer's PPD file. In addition, some options may be specified in multiple
@@ -48,67 +55,59 @@ Raster filters should use option choices set through the raster page header, as
 those reflect the options in effect for a given page. Options specified on the
 command-line determine the default values for the entire job, which can be
 overridden on a per-page basis.
-
 .SH LOG MESSAGES
 Messages sent to stderr are generally logged to
 printer-state-message attribute and the current \fIErrorLog\fR.
 Each line begins with a standard prefix:
-
 .TP 5
 ALERT: message
 .br
 Sets the printer-state-message attribute and adds the specified
 message to the current \fIErrorLog\fR using the "alert" log level.
-
 .TP 5
 ATTR: attribute=value [attribute=value]
 .br
-Sets the named job attribute(s). Typically this will be used to
-set the job-remote-id attribute.
-
+Sets the named job or printer attribute(s). The following job attributes can be
+set: "job-media-progress". The following printer attributes can be set:
+"auth-info-required", "marker-colors", "marker-high-levels", "marker-levels",
+"marker-low-levels", "marker-message", "marker-names", "marker-types",
+"printer-alert", and "printer-alert-description".
 .TP 5
 CRIT: message
 .br
 Sets the printer-state-message attribute and adds the specified
 message to the current \fIErrorLog\fR using the "critical" log level.
-
 .TP 5
 DEBUG: message
 .br
 Sets the printer-state-message attribute and adds the specified
 message to the current \fIErrorLog\fR using the "debug" log level.
-
 .TP 5
 DEBUG2: message
 .br
 Sets the printer-state-message attribute and adds the specified
 message to the current \fIErrorLog\fR using the "debug2" log level.
-
 .TP 5
 EMERG: message
 .br
 Sets the printer-state-message attribute and adds the specified
 message to the current \fIErrorLog\fR using the "emergency" log level.
-
 .TP 5
 ERROR: message
 .br
 Sets the printer-state-message attribute and adds the specified
 message to the current \fIErrorLog\fR using the "error" log level.
-
 .TP 5
 INFO: message
 .br
 Sets the printer-state-message attribute. If the current \fILogLevel\fR
 is set to "debug2", also adds the specified message to the
 current \fIErrorLog\fR using the "info" log level.
-
 .TP 5
 NOTICE: message
 .br
 Sets the printer-state-message attribute and adds the specified
 message to the current \fIErrorLog\fR using the "notice" log level.
-
 .TP 5
 PAGE: page-number #-copies
 .TP 5
@@ -117,14 +116,12 @@ PAGE: total #-pages
 Adds an entry to the current \fIPageLog\fR. The first form adds
 #-copies to the job-media-sheets-completed attribute. The second
 form sets the job-media-sheets-completed attribute to #-pages.
-
 .TP 5
 PPD: Keyword=Value ... KeywordN=Value
 .br
 Sets the named keywords in the printer's PPD file. This is typically
 used to update default option keywords such as DefaultPageSize and
 the various installable options in the PPD file.
-
 .TP 5
 STATE: printer-state-reason [printer-state-reason ...]
 .TP 5
@@ -135,122 +132,107 @@ STATE: - printer-state-reason [printer-state-reason ...]
 Sets, adds, or removes printer-state-reason keywords to the
 current queue. Typically this is used to indicate media, ink, and
 toner conditions on a printer.
-
 .TP 5
 WARNING: message
 .br
 Sets the printer-state-message attribute and adds the specified
 message to the current \fIErrorLog\fR using the "warning" log level.
-
 .SH ENVIRONMENT VARIABLES
 The following environment variables are defined by the CUPS
 server when executing the filter:
-
 .TP 5
 CHARSET
 .br
 The default text character set, typically utf-8.
-
 .TP 5
 CLASS
 .br
 When a job is submitted to a printer class, contains the name of
 the destination printer class. Otherwise this environment
 variable will not be set.
-
 .TP 5
 CONTENT_TYPE
 .br
 The MIME type associated with the file (e.g.
 application/postscript).
-
 .TP 5
 CUPS_CACHEDIR
 .br
 The directory for semi-persistent cache files can be found.
-
 .TP 5
 CUPS_DATADIR
 .br
 The directory where data files can be found.
-
 .TP 5
 CUPS_FILETYPE
 .br
 The type of file being printed: "job-sheet" for a banner page and "document"
 for a regular print file.
-
+.TP 5
+CUPS_MAX_MESSAGE
+.br
+The maximum size of a message sent to stderr, including any leading prefix and
+the trailing newline.
 .TP 5
 CUPS_SERVERROOT
 .br
 The root directory of the server.
-
 .TP 5
 DEVICE_URI
 .br
 The device-uri associated with the printer.
-
 .TP 5
 FINAL_CONTENT_TYPE
 .br
 The MIME type associated with the printer (e.g.
 application/vnd.cups-postscript).
-
 .TP 5
 LANG
 .br
 The default language locale (typically C or en).
-
 .TP 5
 PATH
 .br
 The standard execution path for external programs that may be run by
 the filter.
-
 .TP 5
 PPD
 .br
 The full pathname of the PostScript Printer Description (PPD)
 file for this printer.
-
 .TP 5
 PRINTER
 .br
 The name of the printer.
-
 .TP 5
 RIP_CACHE
 .br
 The recommended amount of memory to use for Raster Image
 Processors (RIPs).
-
 .TP 5
 SOFTWARE
 .br
 The name and version number of the server (typically CUPS/1.2).
-
 .TP 5
 TZ
 .br
 The timezone of the server.
-
 .TP 5
 USER
 .br
 The user executing the filter, typically "lp" or "root"; consult the
 \fIcupsd.conf(5)\fR file for the current setting.
-
 .SH COMPATIBILITY
 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.
 .SH SEE ALSO
-\fIbackend(7)\fR, \fIcupsd(8)\fR,
+\fIbackend(7)\fR, \fIcupsd(8)\fR, \fIcupsfilter(8)\fR,
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: filter.man 9771 2011-05-12 05:21:56Z mike $".
+.\" End of "$Id: filter.man 7600 2008-05-20 21:06:23Z mike $".
 .\"
diff --git a/man/ipptool.man b/man/ipptool.man
index 6cf8450..16b1276 100644
--- a/man/ipptool.man
+++ b/man/ipptool.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: ipptool.man 9354 2010-11-10 06:48:19Z mike $"
+.\" "$Id$"
 .\"
 .\"   ipptool man page for CUPS.
 .\"
-.\"   Copyright 2010 by Apple Inc.
+.\"   Copyright 2010-2013 by Apple Inc.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
 .\"   property of Apple Inc. and are protected by Federal copyright
@@ -108,12 +108,25 @@ Send email notifications to "user@example.com" when "myprinter" changes:
 .SH STANDARD FILES
 The following standard files are available:
 .nf
+    color.jpg
     create-printer-subscription.test
+    document-a4.pdf
+    document-a4.ps
+    document-letter.pdf
+    document-letter.ps
     get-completed-jobs.test
     get-jobs.test
+    get-printer-attributes.test
+    gray.jpg
     ipp-1.1.test
     ipp-2.0.test
     ipp-2.1.test
+    ipp-2.2.test
+    onepage-a4.pdf
+    onepage-a4.ps
+    onepage-letter.pdf
+    onepage-letter.ps
+    print-job.test
     testfile.jpg
     testfile.pdf
     testfile.ps
@@ -124,7 +137,7 @@ The following standard files are available:
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2010 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: ipptool.man 9354 2010-11-10 06:48:19Z mike $".
+.\" End of "$Id$".
 .\"
diff --git a/man/ipptoolfile.man b/man/ipptoolfile.man
index 8a5d58e..a82e739 100644
--- a/man/ipptoolfile.man
+++ b/man/ipptoolfile.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: ipptoolfile.man 10023 2011-09-28 16:21:15Z mike $"
+.\" "$Id$"
 .\"
 .\"   ipptoolfile man page for CUPS.
 .\"
-.\"   Copyright 2010-2011 by Apple Inc.
+.\"   Copyright 2010-2013 by Apple Inc.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
 .\"   property of Apple Inc. and are protected by Federal copyright
@@ -11,12 +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 ipptoolfile 5 "CUPS" "28 September 2011" "Apple Inc."
+.TH ipptoolfile 5 "CUPS" "10 January 2013" "Apple Inc."
 .SH NAME
 ipptoolfile \- ipptool file format
 
 .SH DESCRIPTION
-The \fIipptool(1)\fR program accepts free-form plain text files that describe one or more IPP requests. Comments start with the "#" character and continue to the end of the line. Each request is enclosed by curley braces, for example:
+The \fIipptool(1)\fR program accepts free-form plain text files that describe one or more IPP requests. Comments start with the "#" character and continue to the end of the line. Each request is enclosed by curly braces, for example:
 .nf
 
     # This is a comment
@@ -266,6 +266,10 @@ Requires the EXPECT attribute to be in the specified group tag.
 OF-TYPE tag[,tag,...]
 Requires the EXPECT attribute to use the specified value tag(s).
 .TP 5
+REPEAT-LIMIT number
+.br
+Specifies the maximum number of times to repeat. The default value is 1000.
+.TP 5
 REPEAT-MATCH
 .TP 5
 REPEAT-NO-MATCH
@@ -276,24 +280,65 @@ 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-VALUES "literal string"
+Requires that all values of the EXPECT attribute match the literal string. Comparisons are case-sensitive.
+.TP 5
+WITH-ALL-VALUES <number
+.TP 5
+WITH-ALL-VALUES =number
+.TP 5
+WITH-ALL-VALUES >number
+.TP 5
+WITH-ALL-VALUES number[,number,...]
+Requires that all values of the EXPECT attribute match the number(s) or numeric comparison. When comparing rangeOfInteger values, the "<" and ">" operators only check the upper bound of the range.
+.TP 5
+WITH-ALL-VALUES "false"
+.TP 5
+WITH-ALL-VALUES "true"
+Requires that all values of the EXPECT attribute match the boolean value given.
+.TP 5
+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-VALUE "literal string"
-Requires at least one value of the EXPECT attribute to match the literal string.
-Comparisons are case-sensitive.
+Requires that at least one value of the EXPECT attribute matches the literal string. Comparisons are case-sensitive.
+.TP 5
+WITH-VALUE <number
+.TP 5
+WITH-VALUE =number
+.TP 5
+WITH-VALUE >number
+.TP 5
+WITH-VALUE number[,number,...]
+Requires that at least one value of the EXPECT attribute matches the number(s) or numeric comparison. When comparing rangeOfInteger values, the "<" and ">" operators only check the upper bound of the range.
+.TP 5
+WITH-VALUE "false"
+.TP 5
+WITH-VALUE "true"
+Requires that at least one value of the EXPECT attribute matches the boolean value given.
 .TP 5
 WITH-VALUE "/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.
+Requires that at least one value of the EXPECT attribute matches the regular expression, which must conform to the POSIX regular expression syntax. Comparisons are case-sensitive.
 
 .SH STATUS PREDICATES
 The following predicates are understood following the STATUS test directive:
 .TP 5
+DEFINE-MATCH variable-name
+Defines the variable to "1" when the STATUS matches. A side-effect of this predicate is that this STATUS will never fail a test.
+.TP 5
+DEFINE-NO-MATCH variable-name
+Defines the variable to "1" when the STATUS does not match. A side-effect of this predicate is that this STATUS will never fail a test.
+.TP 5
 IF-DEFINED variable-name
 Makes the STATUS apply only if the specified variable is defined.
 .TP 5
 IF-NOT-DEFINED variable-name
 Makes the STATUS apply only if the specified variable is not defined.
 .TP 5
+REPEAT-LIMIT number
+.br
+Specifies the maximum number of times to repeat. The default value is 1000.
+.TP 5
 REPEAT-MATCH
 .TP 5
 REPEAT-NO-MATCH
@@ -343,6 +388,7 @@ RFC 2911 and other IPP extension specifications. Here is a complete list:
     Get-Subscriptions
     Hold-Job
     Hold-New-Jobs
+    Identify-Printer
     Pause-Printer
     Pause-Printer-After-Current-Job
     Print-Job
@@ -367,6 +413,7 @@ RFC 2911 and other IPP extension specifications. Here is a complete list:
     Shutdown-Printer
     Startup-Printer
     Suspend-Current-Job
+    Validate-Document
     Validate-Job
 .fi
 
@@ -384,6 +431,10 @@ Status codes correspond to the hexadecimal numbers (0xHHHH) and names from RFC
     client-error-document-access-error
     client-error-document-format-error
     client-error-document-format-not-supported
+    client-error-document-password-error
+    client-error-document-permission-error
+    client-error-document-security-error
+    client-error-document-unprintable-error
     client-error-forbidden
     client-error-gone
     client-error-ignored-all-notifications
@@ -493,7 +544,7 @@ $scheme
 Inserts the scheme from the URI provided to \fIipptool\fR.
 .TP 5
 $notify-subscription-id
-Inserts the last notify-subscription-id value returnd in a test response or 0 if
+Inserts the last notify-subscription-id value returned in a test response or 0 if
 no notify-subscription-id has been seen.
 .TP 5
 $port
@@ -517,7 +568,7 @@ Inserts the username from the URI provided to \fIipptool\fR, if any.
 http://localhost:631/help
 
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: ipptoolfile.man 10023 2011-09-28 16:21:15Z mike $".
+.\" End of "$Id$".
 .\"
diff --git a/man/lp.man b/man/lp.man
index b4ebea9..9846624 100644
--- a/man/lp.man
+++ b/man/lp.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: lp.man 10042 2011-10-03 17:32:43Z mike $"
+.\" "$Id: lp.man 7889 2008-08-29 22:03:35Z mike $"
 .\"
 .\"   lp man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -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 lp 1 "CUPS" "3 October 2011" "Apple Inc."
+.TH lp 1 "CUPS" "16 July 2012" "Apple Inc."
 .SH NAME
 lp - print files
 .SH SYNOPSIS
@@ -179,7 +179,7 @@ Prints on one or two sides of the paper. The value
 (unrotated) pages, while "two-sided-short-edge" is used for
 landscape pages.
 .TP 5
--o fitplot
+-o fit-to-page
 .br
 Scales the print file to fit on the page.
 .TP 5
@@ -195,12 +195,6 @@ Scales the print file to fit on the page.
 .br
 Prints multiple document pages on each output page.
 .TP 5
--o scaling=number
-.br
-Scales image files to use up to \fInumber\fR percent of the page.
-Values greater than 100 cause the image file to be printed across
-multiple pages.
-.TP 5
 -o cpi=N
 .br
 Sets the number of characters per inch to use when printing a
@@ -252,7 +246,7 @@ is highest priority).
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: lp.man 10042 2011-10-03 17:32:43Z mike $".
+.\" End of "$Id: lp.man 7889 2008-08-29 22:03:35Z mike $".
 .\"
diff --git a/man/lpadmin.man b/man/lpadmin.man
index c388f03..0ec81b0 100644
--- a/man/lpadmin.man
+++ b/man/lpadmin.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: lpadmin.man 9762 2011-05-11 05:30:50Z mike $"
+.\" "$Id: lpadmin.man 7600 2008-05-20 21:06:23Z mike $"
 .\"
 .\"   lpadmin man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -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 lpadmin 8 "CUPS" "10 May 2011" "Apple Inc."
+.TH lpadmin 8 "CUPS" "16 July 2012" "Apple Inc."
 .SH NAME
 lpadmin \- configure cups printers and classes
 .SH SYNOPSIS
@@ -182,10 +182,9 @@ user-level access control off.
 .TP 5
 -v "device-uri"
 .br
-Sets the \fIdevice-uri\fR attribute of the printer queue.  If
-\fIdevice-uri\fR is a filename it is automatically converted to
-the form \fIfile:///file/name\fR. Use the \fI-v\fR option with the
-\fIlpinfo(8)\fR command to get a list of supported device URIs and schemes.
+Sets the \fIdevice-uri\fR attribute of the printer queue. Use the \fI-v\fR
+option with the \fIlpinfo(8)\fR command to get a list of supported device URIs
+and schemes.
 .TP 5
 -D "info"
 .br
@@ -222,7 +221,7 @@ System V or Solaris printing system configuration options.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: lpadmin.man 9762 2011-05-11 05:30:50Z mike $".
+.\" End of "$Id: lpadmin.man 7600 2008-05-20 21:06:23Z mike $".
 .\"
diff --git a/man/lpc.man b/man/lpc.man
index 8e5c710..8d5245c 100644
--- a/man/lpc.man
+++ b/man/lpc.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: lpc.man 9771 2011-05-12 05:21:56Z mike $"
+.\" "$Id: lpc.man 7600 2008-05-20 21:06:23Z mike $"
 .\"
 .\"   lpc man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -65,7 +65,7 @@ standard Berkeley or LPRng commands.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: lpc.man 9771 2011-05-12 05:21:56Z mike $".
+.\" End of "$Id: lpc.man 7600 2008-05-20 21:06:23Z mike $".
 .\"
diff --git a/man/lpinfo.man b/man/lpinfo.man
index 42bda48..e45a7f3 100644
--- a/man/lpinfo.man
+++ b/man/lpinfo.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: lpinfo.man 9771 2011-05-12 05:21:56Z mike $"
+.\" "$Id: lpinfo.man 7600 2008-05-20 21:06:23Z mike $"
 .\"
 .\"   lpinfo man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -109,7 +109,7 @@ The \fIlpinfo\fR command is unique to CUPS.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: lpinfo.man 9771 2011-05-12 05:21:56Z mike $".
+.\" End of "$Id: lpinfo.man 7600 2008-05-20 21:06:23Z mike $".
 .\"
diff --git a/man/lpmove.man b/man/lpmove.man
index b5688f4..23ea098 100644
--- a/man/lpmove.man
+++ b/man/lpmove.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: lpmove.man 9771 2011-05-12 05:21:56Z mike $"
+.\" "$Id: lpmove.man 7600 2008-05-20 21:06:23Z mike $"
 .\"
 .\"   lpmove man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -60,7 +60,7 @@ Specifies an alternate server.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: lpmove.man 9771 2011-05-12 05:21:56Z mike $".
+.\" End of "$Id: lpmove.man 7600 2008-05-20 21:06:23Z mike $".
 .\"
diff --git a/man/lpoptions.man.in b/man/lpoptions.man.in
index 7e5f07e..343d20d 100644
--- a/man/lpoptions.man.in
+++ b/man/lpoptions.man.in
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: lpoptions.man.in 9771 2011-05-12 05:21:56Z mike $"
+.\" "$Id: lpoptions.man.in 11173 2013-07-23 12:31:34Z msweet $"
 .\"
 .\"   lpoptions man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -129,7 +129,7 @@ created by the root user.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: lpoptions.man.in 9771 2011-05-12 05:21:56Z mike $".
+.\" End of "$Id: lpoptions.man.in 11173 2013-07-23 12:31:34Z msweet $".
 .\"
diff --git a/man/lppasswd.man b/man/lppasswd.man
index 87ade67..1edb0d8 100644
--- a/man/lppasswd.man
+++ b/man/lppasswd.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: lppasswd.man 9771 2011-05-12 05:21:56Z mike $"
+.\" "$Id: lppasswd.man 7600 2008-05-20 21:06:23Z mike $"
 .\"
 .\"   lpadmin man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -62,7 +62,7 @@ accounts managed by PAM instead.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: lppasswd.man 9771 2011-05-12 05:21:56Z mike $".
+.\" End of "$Id: lppasswd.man 7600 2008-05-20 21:06:23Z mike $".
 .\"
diff --git a/man/lpq.man b/man/lpq.man
index 502d45a..97630e9 100644
--- a/man/lpq.man
+++ b/man/lpq.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: lpq.man 9771 2011-05-12 05:21:56Z mike $"
+.\" "$Id: lpq.man 7646 2008-06-16 17:26:20Z mike $"
 .\"
 .\"   lpq man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -66,7 +66,7 @@ Requests a more verbose (long) reporting format.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: lpq.man 9771 2011-05-12 05:21:56Z mike $".
+.\" End of "$Id: lpq.man 7646 2008-06-16 17:26:20Z mike $".
 .\"
diff --git a/man/lpr.man b/man/lpr.man
index b60a265..c6392c7 100644
--- a/man/lpr.man
+++ b/man/lpr.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: lpr.man 9771 2011-05-12 05:21:56Z mike $"
+.\" "$Id: lpr.man 7889 2008-08-29 22:03:35Z mike $"
 .\"
 .\"   lpr man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -116,7 +116,7 @@ are not supported by CUPS and produce a warning message if used.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: lpr.man 9771 2011-05-12 05:21:56Z mike $".
+.\" End of "$Id: lpr.man 7889 2008-08-29 22:03:35Z mike $".
 .\"
diff --git a/man/lprm.man b/man/lprm.man
index d64ac03..3d3f30f 100644
--- a/man/lprm.man
+++ b/man/lprm.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: lprm.man 9771 2011-05-12 05:21:56Z mike $"
+.\" "$Id: lprm.man 7600 2008-05-20 21:06:23Z mike $"
 .\"
 .\"   lprm man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -59,7 +59,7 @@ Berkeley \fIlprm\fR command.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: lprm.man 9771 2011-05-12 05:21:56Z mike $".
+.\" End of "$Id: lprm.man 7600 2008-05-20 21:06:23Z mike $".
 .\"
diff --git a/man/lpstat.man b/man/lpstat.man
index c51c44a..37c39d7 100644
--- a/man/lpstat.man
+++ b/man/lpstat.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: lpstat.man 9771 2011-05-12 05:21:56Z mike $"
+.\" "$Id: lpstat.man 7921 2008-09-10 15:42:24Z mike $"
 .\"
 .\"   lpstat man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -137,7 +137,7 @@ The Solaris "-f", "-P", and "-S" options are silently ignored.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: lpstat.man 9771 2011-05-12 05:21:56Z mike $".
+.\" End of "$Id: lpstat.man 7921 2008-09-10 15:42:24Z mike $".
 .\"
diff --git a/man/mailto.conf.man b/man/mailto.conf.man
index 7f9e30d..aa60386 100644
--- a/man/mailto.conf.man
+++ b/man/mailto.conf.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: mailto.conf.man 9771 2011-05-12 05:21:56Z mike $"
+.\" "$Id: mailto.conf.man 7600 2008-05-20 21:06:23Z mike $"
 .\"
 .\"   mailto.conf man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -54,7 +54,7 @@ Specifies a prefix string for the subject line of an email notification.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: mailto.conf.man 9771 2011-05-12 05:21:56Z mike $".
+.\" End of "$Id: mailto.conf.man 7600 2008-05-20 21:06:23Z mike $".
 .\"
diff --git a/man/mantohtml.c b/man/mantohtml.c
index d9b0acb..8974d20 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 11173 2013-07-23 12:31: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 11173 2013-07-23 12:31:34Z msweet $".
  */
diff --git a/man/mime.convs.man b/man/mime.convs.man
index d55cad4..311353a 100644
--- a/man/mime.convs.man
+++ b/man/mime.convs.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: mime.convs.man 9771 2011-05-12 05:21:56Z mike $"
+.\" "$Id: mime.convs.man 7600 2008-05-20 21:06:23Z mike $"
 .\"
 .\"   mime.convs man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -40,7 +40,7 @@ application/postscript application/vnd.cups-raster 50 pstoraster
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: mime.convs.man 9771 2011-05-12 05:21:56Z mike $".
+.\" End of "$Id: mime.convs.man 7600 2008-05-20 21:06:23Z mike $".
 .\"
diff --git a/man/mime.types.man b/man/mime.types.man
index 9c69566..bf1dd9b 100644
--- a/man/mime.types.man
+++ b/man/mime.types.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: mime.types.man 9771 2011-05-12 05:21:56Z mike $"
+.\" "$Id: mime.types.man 7670 2008-06-17 22:42:08Z mike $"
 .\"
 .\"   mime.types man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -109,7 +109,7 @@ higher priority than "text/bar", "text/foo" will be chosen instead.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: mime.types.man 9771 2011-05-12 05:21:56Z mike $".
+.\" End of "$Id: mime.types.man 7670 2008-06-17 22:42:08Z mike $".
 .\"
diff --git a/man/notifier.man b/man/notifier.man
index 498dfd5..4112878 100644
--- a/man/notifier.man
+++ b/man/notifier.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: notifier.man 8999 2010-02-24 01:01:04Z mike $"
+.\" "$Id$"
 .\"
 .\"   notifier man page for CUPS.
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2007 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -151,7 +151,7 @@ file for the current setting.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2009 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: notifier.man 8999 2010-02-24 01:01:04Z mike $".
+.\" End of "$Id$".
 .\"
diff --git a/man/ppdc.man b/man/ppdc.man
index b613d42..933e7d1 100644
--- a/man/ppdc.man
+++ b/man/ppdc.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: ppdc.man 9771 2011-05-12 05:21:56Z mike $"
+.\" "$Id: ppdc.man 7600 2008-05-20 21:06:23Z mike $"
 .\"
 .\"   ppdc man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2007 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -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 ppdc 1 "CUPS" "10 October 2008" "Apple Inc."
+.TH ppdc 1 "CUPS" "15 February 2012" "Apple Inc."
 .SH NAME
 ppdc \- cups ppd compiler
 .SH SYNOPSIS
@@ -31,7 +31,8 @@ ppdc \- cups ppd compiler
 .I source-file
 .SH DESCRIPTION
 \fIppdc\fR compiles PPDC source files into one or more PPD
-files.
+files. \fBThis program is deprecated and will be removed in a future release of
+CUPS.\fR
 .PP
 The \fI-D\fR option sets the named variable for use in the
 source file. It is equivalent to using the #define directive
@@ -74,7 +75,7 @@ ppdhtml(1), ppdi(1), ppdmerge(1), ppdpo(1), ppdcfile(5)
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: ppdc.man 9771 2011-05-12 05:21:56Z mike $".
+.\" End of "$Id: ppdc.man 7600 2008-05-20 21:06:23Z mike $".
 .\"
diff --git a/man/ppdcfile.man b/man/ppdcfile.man
index fbd6358..a7a56a8 100644
--- a/man/ppdcfile.man
+++ b/man/ppdcfile.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: ppdcfile.man 9771 2011-05-12 05:21:56Z mike $"
+.\" "$Id: ppdcfile.man 7607 2008-05-21 01:06:23Z mike $"
 .\"
 .\"   ppdcfile man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2007 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -12,22 +12,21 @@
 .\"   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 ppdcfile 5 "CUPS" "20 May 2008" "Apple Inc."
+.TH ppdcfile 5 "CUPS" "3 December 2012" "Apple Inc."
 .SH NAME
 ppdcfile \- cups ppd compiler source file format
 .SH DESCRIPTION
 The CUPS PPD compiler reads meta files that contain descriptions
 of one or more PPD files to be generated by \fIppdc\fR. This man
 page provides a quick reference to the supported keywords and
-should be used in conjuction with the Common UNIX Printing System
-Developers Manual.
+should be used in conjunction with the online help for CUPS.
 .PP
 The source file format is plain ASCII text that can be edited
 using your favorite text editor. Comments are supported using
 the C (/* ... */) and C++ (// ...) comment mechanisms.
 .PP
 Printer driver information can be grouped and shared using
-curley braces ({ ... }); PPD files are written when a close
+curly braces ({ ... }); PPD files are written when a close
 brace or end-of-file is seen and a PCFileName directive has been
 defined.
 .PP
@@ -165,7 +164,7 @@ ppdc(1), ppdhtml(1), ppdi(1), ppdmerge(1), ppdpo(1)
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: ppdcfile.man 9771 2011-05-12 05:21:56Z mike $".
+.\" End of "$Id: ppdcfile.man 7607 2008-05-21 01:06:23Z mike $".
 .\"
diff --git a/man/ppdhtml.man b/man/ppdhtml.man
index bebf4e1..78df7d3 100644
--- a/man/ppdhtml.man
+++ b/man/ppdhtml.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: ppdhtml.man 9771 2011-05-12 05:21:56Z mike $"
+.\" "$Id: ppdhtml.man 7600 2008-05-20 21:06:23Z mike $"
 .\"
 .\"   ppdhtml man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2007 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -40,7 +40,7 @@ ppdc(1), ppdcfile(5), ppdi(1), ppdmerge(1), ppdpo(1)
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: ppdhtml.man 9771 2011-05-12 05:21:56Z mike $".
+.\" End of "$Id: ppdhtml.man 7600 2008-05-20 21:06:23Z mike $".
 .\"
diff --git a/man/ppdi.man b/man/ppdi.man
index 610d91c..38658e0 100644
--- a/man/ppdi.man
+++ b/man/ppdi.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: ppdi.man 9771 2011-05-12 05:21:56Z mike $"
+.\" "$Id: ppdi.man 7600 2008-05-20 21:06:23Z mike $"
 .\"
 .\"   ppdi man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2007 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -40,7 +40,7 @@ ppdc(1), ppdhtml(1), ppdmerge(1), ppdpo(1), ppdcfile(5)
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: ppdi.man 9771 2011-05-12 05:21:56Z mike $".
+.\" End of "$Id: ppdi.man 7600 2008-05-20 21:06:23Z mike $".
 .\"
diff --git a/man/ppdmerge.man b/man/ppdmerge.man
index 90fee82..397314e 100644
--- a/man/ppdmerge.man
+++ b/man/ppdmerge.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: ppdmerge.man 9771 2011-05-12 05:21:56Z mike $"
+.\" "$Id: ppdmerge.man 7600 2008-05-20 21:06:23Z mike $"
 .\"
 .\"   ppdmerge man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2007 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -41,7 +41,7 @@ cupsprofile(1), ppdc(1), ppdhtml(1), ppdi(1), ppdpo(1), ppdcfile(5)
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: ppdmerge.man 9771 2011-05-12 05:21:56Z mike $".
+.\" End of "$Id: ppdmerge.man 7600 2008-05-20 21:06:23Z mike $".
 .\"
diff --git a/man/ppdpo.man b/man/ppdpo.man
index a3f9ac9..c6378bc 100644
--- a/man/ppdpo.man
+++ b/man/ppdpo.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: ppdpo.man 9771 2011-05-12 05:21:56Z mike $"
+.\" "$Id: ppdpo.man 7600 2008-05-20 21:06:23Z mike $"
 .\"
 .\"   ppdpo man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2007 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -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 ppdpo 1 "CUPS" "10 October 2008" "Apple Inc."
+.TH ppdpo 1 "CUPS" "23 April 2012" "Apple Inc."
 .SH NAME
 ppdpo \- ppd message catalog generator
 .SH SYNOPSIS
@@ -27,7 +27,7 @@ ppdpo \- ppd message catalog generator
 .I source-file
 .SH DESCRIPTION
 \fIppdpo\fR extracts UI strings from PPDC source files and updates either
-a GNU gettext or Mac OS X strings format message catalog source file for
+a GNU gettext or OS X strings format message catalog source file for
 translation.
 .PP
 The \fI-D\fR option sets the named variable for use in the
@@ -40,13 +40,13 @@ directories.
 .PP
 The \fI-o\fR option specifies the output file. The supported extensions are
 ".po" or ".po.gz" for GNU gettext format message catalogs and ".strings" for
-Mac OS X strings files.
+OS X strings files.
 .SH SEE ALSO
 ppdc(1), ppdhtml(1), ppdi(1), ppdmerge(1), ppdcfile(5)
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: ppdpo.man 9771 2011-05-12 05:21:56Z mike $".
+.\" End of "$Id: ppdpo.man 7600 2008-05-20 21:06:23Z mike $".
 .\"
diff --git a/man/printers.conf.man b/man/printers.conf.man
index abda49b..6d8609f 100644
--- a/man/printers.conf.man
+++ b/man/printers.conf.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: printers.conf.man 9771 2011-05-12 05:21:56Z mike $"
+.\" "$Id: printers.conf.man 7600 2008-05-20 21:06:23Z mike $"
 .\"
 .\"   printers.conf man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -118,7 +118,7 @@ Specifies the date/time associated with the state.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: printers.conf.man 9771 2011-05-12 05:21:56Z mike $".
+.\" End of "$Id: printers.conf.man 7600 2008-05-20 21:06:23Z mike $".
 .\"
diff --git a/man/subscriptions.conf.man b/man/subscriptions.conf.man
index 4ff851c..5531c6a 100644
--- a/man/subscriptions.conf.man
+++ b/man/subscriptions.conf.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: subscriptions.conf.man 9771 2011-05-12 05:21:56Z mike $"
+.\" "$Id: subscriptions.conf.man 7600 2008-05-20 21:06:23Z mike $"
 .\"
 .\"   subscriptions.conf man page for CUPS.
 .\"
-.\"   Copyright 2007-2011 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -83,7 +83,7 @@ is typically the "from" address in mailto: notifications.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2011 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: subscriptions.conf.man 9771 2011-05-12 05:21:56Z mike $".
+.\" End of "$Id: subscriptions.conf.man 7600 2008-05-20 21:06:23Z mike $".
 .\"