Imported Upstream version 1.5.0upstream/1.5.0

author: Didier Raboud <odyx@debian.org> 2012-10-25 20:57:13 +0200
committer: Didier Raboud <odyx@debian.org> 2012-10-25 20:57:13 +0200
commit: 49a2853988b074d087e82c51aec4f9fc052a057d (patch)
tree: c38ece96005bc33bd4e133fd0037f3428fdc039d /man
parent: a312f7e1ac68fb22275719f6208b670d9edd45b5 (diff)
download: cups-49a2853988b074d087e82c51aec4f9fc052a057d.tar.gz
47 files changed, 964 insertions, 225 deletions
diff --git a/man/Makefile b/man/Makefile
index 41f0dd9b..0e021433 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -1,9 +1,9 @@
 #
-# "$Id: Makefile 9181 2010-06-22 21:42:44Z mike $"
+# "$Id: Makefile 9177 2010-06-22 21:21:37Z mike $"
 #
-#   Man page makefile for the Common UNIX Printing System (CUPS).
+#   Man page makefile for CUPS.
 #
-#   Copyright 2007-2008 by Apple Inc.
+#   Copyright 2007-2010 by Apple Inc.
 #   Copyright 1993-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -24,6 +24,7 @@ MAN1	=	cancel.$(MAN1EXT) \
 		cups-config.$(MAN1EXT) \
 		cupstestdsc.$(MAN1EXT) \
 		cupstestppd.$(MAN1EXT) \
+		ipptool.$(MAN1EXT) \
 		lp.$(MAN1EXT) \
 		lpoptions.$(MAN1EXT) \
 		lppasswd.$(MAN1EXT) \
@@ -40,6 +41,7 @@ MAN5	=	classes.conf.$(MAN5EXT) \
 		client.conf.$(MAN5EXT) \
 		cups-snmp.conf.$(MAN5EXT) \
 		cupsd.conf.$(MAN5EXT) \
+		ipptoolfile.$(MAN5EXT) \
 		mailto.conf.$(MAN5EXT) \
 		mime.convs.$(MAN5EXT) \
 		mime.types.$(MAN5EXT) \
@@ -230,5 +232,5 @@ mantohtml:	mantohtml.o
 
 
 #
-# End of "$Id: Makefile 9181 2010-06-22 21:42:44Z mike $".
+# End of "$Id: Makefile 9177 2010-06-22 21:21:37Z mike $".
 #
diff --git a/man/backend.man b/man/backend.man
index 31642400..644d85dd 100644
--- a/man/backend.man
+++ b/man/backend.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: backend.man 8622 2009-05-13 16:28:43Z mike $"
+.\" "$Id: backend.man 9693 2011-04-16 02:51:22Z mike $"
 .\"
-.\"   Backend man page for the Common UNIX Printing System (CUPS).
+.\"   Backend man page for CUPS.
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2011 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 backend 7 "CUPS" "12 May 2009" "Apple Inc."
+.TH backend 7 "CUPS" "15 April 2011" "Apple Inc."
 
 .SH NAME
 backend \- cups backend transmission interfaces
@@ -168,6 +168,19 @@ 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.
 
+.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.
 
@@ -177,7 +190,7 @@ All other exit code values are reserved.
 http://localhost:631/help
 
 .SH COPYRIGHT
-Copyright 2007-2009 by Apple Inc.
+Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: backend.man 8622 2009-05-13 16:28:43Z mike $".
+.\" End of "$Id: backend.man 9693 2011-04-16 02:51:22Z mike $".
 .\"
diff --git a/man/cancel.man b/man/cancel.man
index 2086d0cc..eda61eb1 100644
--- a/man/cancel.man
+++ b/man/cancel.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cancel.man 8421 2009-03-09 21:59:55Z mike $"
+.\" "$Id: cancel.man 9771 2011-05-12 05:21:56Z mike $"
 .\"
-.\"   cancel man page for the Common UNIX Printing System (CUPS).
+.\"   cancel man page for CUPS.
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2011 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -21,7 +21,7 @@ cancel - cancel jobs
 .I username
 ] [ -a ] [ -h
 .I hostname[:port]
-] [ -u 
+] [ -u
 .I username
 ] [
 .I id
@@ -69,7 +69,7 @@ Cancel-Jobs operations in \fIcupsd.conf(5)\fR.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2009 by Apple Inc.
+Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: cancel.man 8421 2009-03-09 21:59:55Z mike $".
+.\" End of "$Id: cancel.man 9771 2011-05-12 05:21:56Z mike $".
 .\"
diff --git a/man/classes.conf.man b/man/classes.conf.man
index db8e83a7..0664442d 100644
--- a/man/classes.conf.man
+++ b/man/classes.conf.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: classes.conf.man 8581 2009-04-29 22:54:48Z mike $"
+.\" "$Id: classes.conf.man 9771 2011-05-12 05:21:56Z mike $"
 .\"
-.\"   classes.conf man page for the Common UNIX Printing System (CUPS).
+.\"   classes.conf man page for CUPS.
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2011 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-2009 by Apple Inc.
+Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: classes.conf.man 8581 2009-04-29 22:54:48Z mike $".
+.\" End of "$Id: classes.conf.man 9771 2011-05-12 05:21:56Z mike $".
 .\"
diff --git a/man/client.conf.man.in b/man/client.conf.man.in
index 874bf117..488f7aca 100644
--- a/man/client.conf.man.in
+++ b/man/client.conf.man.in
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: client.conf.man.in 8421 2009-03-09 21:59:55Z mike $"
+.\" "$Id: client.conf.man.in 9655 2011-03-28 23:52:32Z mike $"
 .\"
-.\"   client.conf man page for the Common UNIX Printing System (CUPS).
+.\"   client.conf man page for CUPS.
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2011 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" "25 February 2006" "Apple Inc."
+.TH client.conf 5 "CUPS" "28 March 2011" "Apple Inc."
 .SH NAME
 client.conf \- client configuration file for cups
 .SH DESCRIPTION
@@ -34,16 +34,22 @@ Encryption Required
 Specifies the level of encryption that is required for a particular
 location.
 .TP 5
+GSSServiceName name
+Specifies the Kerberos service name that is used for authentication, typically
+"host", "http", or "ipp". CUPS adds the remote hostname
+("name@server.example.com") for you. The default name is
+"@CUPS_DEFAULT_GSSSERVICENAME@".
+.TP 5
 ServerName hostname-or-ip-address[:port]
 .TP 5
 ServerName /domain/socket
 .br
-Specifies the address and optionally the port to use when
-connecting to the server
+Specifies the address and optionally the port to use when connecting to the
+server.
 .SH SEE ALSO
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2009 by Apple Inc.
+Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: client.conf.man.in 8421 2009-03-09 21:59:55Z mike $".
+.\" End of "$Id: client.conf.man.in 9655 2011-03-28 23:52:32Z mike $".
 .\"
diff --git a/man/cups-config.man b/man/cups-config.man
index f5e83dd9..577dd44f 100644
--- a/man/cups-config.man
+++ b/man/cups-config.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cups-config.man 8421 2009-03-09 21:59:55Z mike $"
+.\" "$Id: cups-config.man 9771 2011-05-12 05:21:56Z mike $"
 .\"
-.\"   cups-config man page for the Common UNIX Printing System (CUPS).
+.\"   cups-config man page for CUPS.
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2011 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-2009 by Apple Inc.
+Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: cups-config.man 8421 2009-03-09 21:59:55Z mike $".
+.\" End of "$Id: cups-config.man 9771 2011-05-12 05:21:56Z mike $".
 .\"
diff --git a/man/cups-deviced.man.in b/man/cups-deviced.man.in
index 52e88c95..19fec7dd 100644
--- a/man/cups-deviced.man.in
+++ b/man/cups-deviced.man.in
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cups-deviced.man.in 8421 2009-03-09 21:59:55Z mike $"
+.\" "$Id: cups-deviced.man.in 9771 2011-05-12 05:21:56Z mike $"
 .\"
-.\"   cups-deviced man page for the Common UNIX Printing System (CUPS).
+.\"   cups-deviced man page for CUPS.
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2011 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-2009 by Apple Inc.
+Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: cups-deviced.man.in 8421 2009-03-09 21:59:55Z mike $".
+.\" End of "$Id: cups-deviced.man.in 9771 2011-05-12 05:21:56Z mike $".
 .\"
diff --git a/man/cups-driverd.man.in b/man/cups-driverd.man.in
index f0408415..e93ffa91 100644
--- a/man/cups-driverd.man.in
+++ b/man/cups-driverd.man.in
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: cups-driverd.man.in 9426 2011-01-06 22:48:42Z mike $"
+.\" "$Id: cups-driverd.man.in 9419 2011-01-06 18:49:38Z mike $"
 .\"
 .\"   cups-driverd man page for CUPS.
 .\"
@@ -118,5 +118,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: cups-driverd.man.in 9426 2011-01-06 22:48:42Z mike $".
+.\" End of "$Id: cups-driverd.man.in 9419 2011-01-06 18:49:38Z mike $".
 .\"
diff --git a/man/cups-lpd.man.in b/man/cups-lpd.man.in
index dc239f7e..2959c0ae 100644
--- a/man/cups-lpd.man.in
+++ b/man/cups-lpd.man.in
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cups-lpd.man.in 8421 2009-03-09 21:59:55Z mike $"
+.\" "$Id: cups-lpd.man.in 9771 2011-05-12 05:21:56Z mike $"
 .\"
-.\"   cups-lpd man page for the Common UNIX Printing System (CUPS).
+.\"   cups-lpd man page for CUPS.
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2011 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-2009 by Apple Inc.
+Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: cups-lpd.man.in 8421 2009-03-09 21:59:55Z mike $".
+.\" End of "$Id: cups-lpd.man.in 9771 2011-05-12 05:21:56Z mike $".
 .\"
diff --git a/man/cups-polld.man b/man/cups-polld.man
index 0d40b5f1..aee70687 100644
--- a/man/cups-polld.man
+++ b/man/cups-polld.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cups-polld.man 8421 2009-03-09 21:59:55Z mike $"
+.\" "$Id: cups-polld.man 9771 2011-05-12 05:21:56Z mike $"
 .\"
-.\"   cups-polld man page for the Common UNIX Printing System (CUPS).
+.\"   cups-polld man page for CUPS.
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2011 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -32,7 +32,7 @@ This program is started automatically by \fIcupsd\fR for every
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2009 by Apple Inc.
+Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: cups-polld.man 8421 2009-03-09 21:59:55Z mike $".
+.\" 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 706f1ce8..1c778bc8 100644
--- a/man/cups-snmp.conf.man
+++ b/man/cups-snmp.conf.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cups-snmp.conf.man 8421 2009-03-09 21:59:55Z mike $"
+.\" "$Id: cups-snmp.conf.man 9771 2011-05-12 05:21:56Z mike $"
 .\"
-.\"   snmp.conf man page for the Common UNIX Printing System (CUPS).
+.\"   snmp.conf man page for CUPS.
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2011 by Apple Inc.
 .\"   Copyright 2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -67,7 +67,7 @@ will scan the network for printers.
 .SH SEE ALSO
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2009 by Apple Inc.
+Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: cups-snmp.conf.man 8421 2009-03-09 21:59:55Z mike $".
+.\" End of "$Id: cups-snmp.conf.man 9771 2011-05-12 05:21:56Z mike $".
 .\"
diff --git a/man/cupsaccept.man b/man/cupsaccept.man
index 50523faa..7c53d862 100644
--- a/man/cupsaccept.man
+++ b/man/cupsaccept.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cupsaccept.man 8421 2009-03-09 21:59:55Z mike $"
+.\" "$Id: cupsaccept.man 9771 2011-05-12 05:21:56Z mike $"
 .\"
-.\"   accept/reject man page for the Common UNIX Printing System (CUPS).
+.\"   accept/reject man page for CUPS.
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2011 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-2009 by Apple Inc.
+Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: cupsaccept.man 8421 2009-03-09 21:59:55Z mike $".
+.\" End of "$Id: cupsaccept.man 9771 2011-05-12 05:21:56Z mike $".
 .\"
diff --git a/man/cupsaddsmb.man.in b/man/cupsaddsmb.man.in
index c91d1428..98fce094 100644
--- a/man/cupsaddsmb.man.in
+++ b/man/cupsaddsmb.man.in
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cupsaddsmb.man.in 8421 2009-03-09 21:59:55Z mike $"
+.\" "$Id: cupsaddsmb.man.in 9771 2011-05-12 05:21:56Z mike $"
 .\"
-.\"   cupsaddsmb man page for the Common UNIX Printing System (CUPS).
+.\"   cupsaddsmb man page for CUPS.
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2011 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -208,7 +208,7 @@ http://localhost:631/help
 http://www.cups.org/windows/
 
 .SH COPYRIGHT
-Copyright 2007-2009 by Apple Inc.
+Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: cupsaddsmb.man.in 8421 2009-03-09 21:59:55Z mike $".
+.\" End of "$Id: cupsaddsmb.man.in 9771 2011-05-12 05:21:56Z mike $".
 .\"
diff --git a/man/cupsctl.man b/man/cupsctl.man
index 87464336..411ada83 100644
--- a/man/cupsctl.man
+++ b/man/cupsctl.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: cupsctl.man 9470 2011-01-11 07:05:58Z mike $"
+.\" "$Id: cupsctl.man 9457 2011-01-11 03:04:04Z mike $"
 .\"
 .\"   cupsctl man page for CUPS.
 .\"
@@ -103,5 +103,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: cupsctl.man 9470 2011-01-11 07:05:58Z mike $".
+.\" End of "$Id: cupsctl.man 9457 2011-01-11 03:04:04Z mike $".
 .\"
diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in
index 5356d3e4..c517f0b2 100644
--- a/man/cupsd.conf.man.in
+++ b/man/cupsd.conf.man.in
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cupsd.conf.man.in 9120 2010-04-23 18:56:34Z mike $"
+.\" "$Id: cupsd.conf.man.in 9784 2011-05-18 21:33:35Z mike $"
 .\"
-.\"   cupsd.conf man page for the Common UNIX Printing System (CUPS).
+.\"   cupsd.conf man page for CUPS.
 .\"
-.\"   Copyright 2007-2010 by Apple Inc.
+.\"   Copyright 2007-2011 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 cupsd.conf 5 "CUPS" "28 January 2010" "Apple Inc."
+.TH cupsd.conf 5 "CUPS" "18 May 2011" "Apple Inc."
 .SH NAME
 cupsd.conf \- server configuration file for cups
 .SH DESCRIPTION
@@ -400,6 +400,26 @@ JobKillDelay seconds
 Specifies the number of seconds to wait before killing the filters and backend
 associated with a canceled or held job.
 .TP 5
+JobPrivateAccess all
+.TP 5
+JobPrivateAccess default
+.TP 5
+JobPrivateAccess {user|@group|@ACL|@OWNER|@SYSTEM}+
+.br
+Specifies an access list for a job's private values. The "default" access list
+is "@OWNER @SYSTEM". "@ACL" maps to the printer's requesting-user-name-allowed
+or requesting-user-name-denied values.
+.TP 5
+JobPrivateValues all
+.TP 5
+JobPrivateValues default
+.TP 5
+JobPrivateValues none
+.TP 5
+JobPrivateValues attribute-name-1 [ ... attribute-name-N ]
+Specifies the list of job values to make private. The "default" values are
+"job-name", "job-originating-host-name", and "job-originating-user-name".
+.TP 5
 JobRetryInterval seconds
 .br
 Specifies the interval between retries of jobs in seconds.
@@ -625,7 +645,9 @@ ServerAdmin user@domain.com
 .br
 Specifies the email address of the server administrator.
 .TP 5
-ServerAlias hostname
+ServerAlias hostname [... hostname]
+.TP 5
+ServerAlias *
 .br
 Specifies an alternate name that the server is known by. The special name "*"
 allows any name to be used.
@@ -686,6 +708,27 @@ SSLPort
 .br
 Listens on the specified port for encrypted connections.
 .TP 5
+SubscriptionPrivateAccess all
+.TP 5
+SubscriptionPrivateAccess default
+.TP 5
+SubscriptionPrivateAccess {user|@group|@ACL|@OWNER|@SYSTEM}+
+.br
+Specifies an access list for a subscription's private values. The "default"
+access list is "@OWNER @SYSTEM". "@ACL" maps to the printer's
+requesting-user-name-allowed or requesting-user-name-denied values.
+.TP 5
+SubscriptionPrivateValues all
+.TP 5
+SubscriptionPrivateValues default
+.TP 5
+SubscriptionPrivateValues none
+.TP 5
+SubscriptionPrivateValues attribute-name-1 [ ... attribute-name-N ]
+Specifies the list of job values to make private. The "default" values are
+"notify-events", "notify-pull-method", "notify-recipient-uri",
+"notify-subscriber-user-name", and "notify-user-data".
+.TP 5
 SystemGroup group-name [group-name ...]
 .br
 Specifies the group(s) to use for System class authentication.
@@ -701,6 +744,11 @@ Specifies the HTTP request timeout in seconds.
 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,
@@ -708,7 +756,7 @@ Specifies the user name or ID that is used when running external programs.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2009 by Apple Inc.
+Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: cupsd.conf.man.in 9120 2010-04-23 18:56:34Z mike $".
+.\" End of "$Id: cupsd.conf.man.in 9784 2011-05-18 21:33:35Z mike $".
 .\"
diff --git a/man/cupsd.man.in b/man/cupsd.man.in
index acb5f846..820afd88 100644
--- a/man/cupsd.man.in
+++ b/man/cupsd.man.in
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cupsd.man.in 8421 2009-03-09 21:59:55Z mike $"
+.\" "$Id: cupsd.man.in 9771 2011-05-12 05:21:56Z mike $"
 .\"
-.\"   cupsd man page for the Common UNIX Printing System (CUPS).
+.\"   cupsd man page for CUPS.
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2011 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-2009 by Apple Inc.
+Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: cupsd.man.in 8421 2009-03-09 21:59:55Z mike $".
+.\" End of "$Id: cupsd.man.in 9771 2011-05-12 05:21:56Z mike $".
 .\"
diff --git a/man/cupsenable.man b/man/cupsenable.man
index 24a59728..0552f427 100644
--- a/man/cupsenable.man
+++ b/man/cupsenable.man
@@ -1,10 +1,9 @@
 .\"
-.\" "$Id: cupsenable.man 8421 2009-03-09 21:59:55Z mike $"
+.\" "$Id: cupsenable.man 9771 2011-05-12 05:21:56Z mike $"
 .\"
-.\"   cupsenable/cupsdisable man page for the Common UNIX Printing System
-.\"   (CUPS).
+.\"   cupsenable/cupsdisable man page for CUPS.
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2011 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -87,8 +86,8 @@ require the root user to execute these commands.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2009 by Apple Inc.
+Copyright 2007-2011 by Apple Inc.
 
 .\"
-.\" End of "$Id: cupsenable.man 8421 2009-03-09 21:59:55Z mike $".
+.\" End of "$Id: cupsenable.man 9771 2011-05-12 05:21:56Z mike $".
 .\"
diff --git a/man/cupsfilter.man b/man/cupsfilter.man
index 4b199f9f..7aa9c83e 100644
--- a/man/cupsfilter.man
+++ b/man/cupsfilter.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cupsfilter.man 8421 2009-03-09 21:59:55Z mike $"
+.\" "$Id: cupsfilter.man 9030 2010-03-05 03:55:56Z mike $"
 .\"
-.\"   cupsfilter man page for the Common UNIX Printing System (CUPS).
+.\"   cupsfilter man page for CUPS.
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2010 by Apple Inc.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
 .\"   property of Apple Inc. and are protected by Federal copyright
@@ -11,13 +11,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 cupsfilter 8 "CUPS" "26 February 2009" "Apple Inc."
+.TH cupsfilter 8 "CUPS" "4 March 2010" "Apple Inc."
 .SH NAME
 cupsfilter \- convert a file to another format using cups filters
 .SH SYNOPSIS
 .B cupsfilter
 [ -c
 .I config-file
+] [ -d 
+.I printer
 ] [ -e ] -j
 .I job-id[,N]
 [ -m
@@ -42,6 +44,9 @@ through CUPS. By default, \fIcupsfilter\fR generates a PDF file.
 .br
 Uses the named cupsd.conf configuration file.
 .TP 5
+-d printer
+Uses information from the named printer.
+.TP 5
 -e
 .br
 Use every filter from the PPD file.
@@ -80,7 +85,7 @@ This will be addressed in a future CUPS release.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2009 by Apple Inc.
+Copyright 2007-2010 by Apple Inc.
 .\"
-.\" End of "$Id: cupsfilter.man 8421 2009-03-09 21:59:55Z mike $".
+.\" End of "$Id: cupsfilter.man 9030 2010-03-05 03:55:56Z mike $".
 .\"
diff --git a/man/cupstestdsc.man b/man/cupstestdsc.man
index cbfbd25f..781c5efe 100644
--- a/man/cupstestdsc.man
+++ b/man/cupstestdsc.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cupstestdsc.man 8421 2009-03-09 21:59:55Z mike $"
+.\" "$Id: cupstestdsc.man 9771 2011-05-12 05:21:56Z mike $"
 .\"
-.\"   cupstestdsc man page for the Common UNIX Printing System (CUPS).
+.\"   cupstestdsc man page for CUPS.
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2011 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-2009 by Apple Inc.
+Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: cupstestdsc.man 8421 2009-03-09 21:59:55Z mike $".
+.\" End of "$Id: cupstestdsc.man 9771 2011-05-12 05:21:56Z mike $".
 .\"
diff --git a/man/cupstestppd.man b/man/cupstestppd.man
index f580e18e..042f4c29 100644
--- a/man/cupstestppd.man
+++ b/man/cupstestppd.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cupstestppd.man 9120 2010-04-23 18:56:34Z mike $"
+.\" "$Id: cupstestppd.man 9771 2011-05-12 05:21:56Z mike $"
 .\"
-.\"   cupstestppd man page for the Common UNIX Printing System (CUPS).
+.\"   cupstestppd man page for CUPS.
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2011 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-2009 by Apple Inc.
+Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: cupstestppd.man 9120 2010-04-23 18:56:34Z mike $".
+.\" End of "$Id: cupstestppd.man 9771 2011-05-12 05:21:56Z mike $".
 .\"
diff --git a/man/filter.man b/man/filter.man
index f3c41289..eef66bab 100644
--- a/man/filter.man
+++ b/man/filter.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: filter.man 8622 2009-05-13 16:28:43Z mike $"
+.\" "$Id: filter.man 9771 2011-05-12 05:21:56Z mike $"
 .\"
-.\"   filter man page for the Common UNIX Printing System (CUPS).
+.\"   filter man page for CUPS.
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2011 by Apple Inc.
 .\"   Copyright 1997-2007 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -250,7 +250,7 @@ only filter.  Typically the interface script will be provided via the
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2009 by Apple Inc.
+Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: filter.man 8622 2009-05-13 16:28:43Z mike $".
+.\" End of "$Id: filter.man 9771 2011-05-12 05:21:56Z mike $".
 .\"
diff --git a/man/ipptool.man b/man/ipptool.man
new file mode 100644
index 00000000..6cf84509
--- /dev/null
+++ b/man/ipptool.man
@@ -0,0 +1,130 @@
+.\"
+.\" "$Id: ipptool.man 9354 2010-11-10 06:48:19Z mike $"
+.\"
+.\"   ipptool man page for CUPS.
+.\"
+.\"   Copyright 2010 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 ipptool 1 "CUPS" "9 November 2010" "Apple Inc."
+.SH NAME
+ipptool - perform internet printing protocol requests
+.SH SYNOPSIS
+.B ipptool
+[ -4 ] [ -6 ] [ -C ] [ -E ] [ -I ] [ -L ] [ -S ] [ -T
+.I seconds
+] [ -V
+.I version
+] [ -X ] [ -c ] [ -d
+.I name=value
+] [ -f
+.I filename
+] [ -i
+.I seconds
+] [ -n
+.I repeat-count
+] [ -q ] [ -t ] [ -v ]
+.I URI
+.I filename
+[
+.I ... filenameN
+]
+.SH DESCRIPTION
+\fIipptool\fR sends IPP requests to the specified URI and tests and/or displays the results. Each named file defines one or more requests, including the expected response status, attributes, and values. Output is either a plain text, formatted text, CSV, or XML report on the standard output, with a non-zero exit status indicating that one or more tests have failed. The file format is described in \fIipptoolfile(5)\fR.
+.SH OPTIONS
+The following options are recognized by \fIipptool\fR:
+.TP 5
+-4
+Specifies that \fIipptool\fR must connect to the printer or server using IPv4.
+.TP 5
+-6
+Specifies that \fIipptool\fR must connect to the printer or server using IPv6.
+.TP 5
+-C
+Specifies that requests should be sent using the HTTP/1.1 "Transfer-Encoding: chunked" header, which is required for conformance by all versions of IPP. The default is to use "Transfer-Encoding: chunked" for requests with attached files and "Content-Length:" for requests without attached files.
+.TP 5
+-E
+Forces TLS encryption when connecting to the server using the HTTP "Upgrade" header.
+.TP 5
+-I
+Specifies that \fIipptool\fR will continue past errors.
+.TP 5
+-L
+Specifies that requests should be sent using the HTTP/1.0 "Content-Length:" header, which is required for conformance by all versions of IPP. The default is to use "Transfer-Encoding: chunked" for requests with attached files and "Content-Length:" for requests without attached files.
+.TP 5
+-S
+Forces (dedicated) SSL encryption when connecting to the server.
+.TP 5
+-T seconds
+Specifies a timeout for IPP requests in seconds.
+.TP 5
+-V version
+Specifies the default IPP version to use: 1.0, 1.1, 2.0, 2.1, or 2.2. If not specified, version 1.1 is used.
+.TP 5
+-X
+Specifies that XML (Apple plist) output is desired instead of the plain text report. This option is incompatible with the \fI-i\fR (interval) and \fI-n\fR (repeat-count) options.
+.TP 5
+-c
+Specifies that CSV (comma-separated values) output is desired instead of the plain text output.
+.TP 5
+-d name=value
+Defines the named variable.
+.TP 5
+-f filename
+Defines the default request filename for tests.
+.TP 5
+-i seconds
+Specifies that the (last) file should be repeated at the specified interval. This option is incompatible with the \fI-X\fR (XML plist output) option.
+.TP 5
+-l
+Specifies that plain text output is desired.
+.TP 5
+-n repeat-count
+Specifies that the (last) file should be repeated the specified number of times. This option is incompatible with the \fI-X\fR (XML plist output) option.
+.TP 5
+-t
+Specifies that CUPS test report output is desired instead of the plain text output.
+.TP 5
+-v
+Specifies that all request and response attributes should be output in CUPS test mode (\fI-t\fR). This is the default for XML output.
+.SH COMPATIBILITY
+The \fIipptool\fR program is unique to CUPS.
+.SH EXAMPLES
+Get a list of completed jobs for "myprinter":
+.nf
+    ipptool ipp://localhost/printers/myprinter get-completed-jobs.test
+.fi
+.LP
+Send email notifications to "user@example.com" when "myprinter" changes:
+.nf
+    ipptool -d recipient=mailto:user@example.com \
+        ipp://localhost/printers/myprinter create-printer-subscription.test
+.fi
+.SH STANDARD FILES
+The following standard files are available:
+.nf
+    create-printer-subscription.test
+    get-completed-jobs.test
+    get-jobs.test
+    ipp-1.1.test
+    ipp-2.0.test
+    ipp-2.1.test
+    testfile.jpg
+    testfile.pdf
+    testfile.ps
+    testfile.txt
+.fi
+.SH SEE ALSO
+\fIipptoolfile(5)\fR,
+.br
+http://localhost:631/help
+.SH COPYRIGHT
+Copyright 2007-2010 by Apple Inc.
+.\"
+.\" End of "$Id: ipptool.man 9354 2010-11-10 06:48:19Z mike $".
+.\"
diff --git a/man/ipptoolfile.man b/man/ipptoolfile.man
new file mode 100644
index 00000000..4abb2f50
--- /dev/null
+++ b/man/ipptoolfile.man
@@ -0,0 +1,511 @@
+.\"
+.\" "$Id: ipptoolfile.man 9769 2011-05-12 04:24:17Z mike $"
+.\"
+.\"   ipptoolfile man page for CUPS.
+.\"
+.\"   Copyright 2010-2011 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 ipptoolfile 5 "CUPS" "11 May 2011" "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:
+.nf
+
+    # This is a comment
+    {
+      # The name of the test
+      NAME "Print PostScript Job"
+
+      # The request to send
+      OPERATION Print-Job
+      GROUP operation-attributes-tag
+      ATTR charset attributes-charset utf-8
+      ATTR language attributes-natural-language en
+      ATTR uri printer-uri $uri
+      ATTR name requesting-user-name $user
+      FILE testfile.ps
+
+      # The response to expect
+      STATUS successful-ok
+      EXPECT attributes-charset OF-TYPE charset
+      EXPECT attributes-natural-language OF-TYPE naturalLanguage
+      EXPECT job-id OF-TYPE integer
+      EXPECT job-uri OF-TYPE uri
+    }
+    {
+      # The name of the test
+      NAME "Get Attributes of PostScript Job"
+
+      # The request to send
+      OPERATION Get-Job-Attributes
+      GROUP operation-attributes-tag
+      ATTR charset attributes-charset utf-8
+      ATTR language attributes-natural-language en
+      ATTR uri printer-uri $uri
+      ATTR integer job-id $job-id
+      ATTR name requesting-user-name $user
+
+      # The response to expect
+      STATUS successful-ok
+      EXPECT attributes-charset OF-TYPE charset
+      EXPECT attributes-natural-language OF-TYPE naturalLanguage
+      EXPECT job-id OF-TYPE integer
+      EXPECT job-uri OF-TYPE uri
+      EXPECT job-state OF-TYPE enum
+      EXPECT job-originating-user-name OF-TYPE name WITH-VALUE "$user"
+    }
+.fi
+
+.SH TOP-LEVEL DIRECTIVES
+The following directives can be used outside of a test:
+.TP 5
+{ test }
+Defines a test.
+.TP 5
+DEFINE variable-name value
+Defines the named variable to the given value. This is equivalent to specifying
+"-d variable-name=value" on the \fIipptool\fR command-line.
+.TP 5
+DEFINE-DEFAULT variable-name value
+Defines the named variable to the given value if it does not already have a
+value.
+.TP 5
+IGNORE-ERRORS yes
+.TP 5
+IGNORE-ERRORS no
+Specifies whether, by default, \fIipptool\fR will ignore errors and continue with
+subsequent tests.
+.TP 5
+INCLUDE "filename"
+.TP 5
+INCLUDE <filename>
+Includes another test file. The first form includes a file relative to the
+current test file, while the second form includes a file from the \fIipptool\fR
+include directory.
+.TP 5
+INCLUDE-IF-DEFINED name "filename"
+.TP 5
+INCLUDE-IF-DEFINED name <filename>
+Includes another test file if the named variable is defined. The first form
+includes a file relative to the current test file, while the second form
+includes a file from the \fIipptool\fR include directory.
+.TP 5
+INCLUDE-IF-NOT-DEFINED name "filename"
+.TP 5
+INCLUDE-IF-NOT-DEFINED name <filename>
+Includes another test file if the named variable is not defined. The first form
+includes a file relative to the current test file, while the second form
+includes a file from the \fIipptool\fR include directory.
+.TP 5
+SKIP-IF-DEFINED variable-name
+.TP 5
+SKIP-IF-NOT-DEFINED variable-name
+Specifies that the remainder of the test file should be skipped when the
+variable is or is not defined.
+.TP 5
+TRANSFER auto
+Specifies that tests will, by default, use "Transfer-Encoding: chunked" for
+requests with attached files and "Content-Length:" for requests without attached
+files.
+.TP 5
+TRANSFER chunked
+Specifies that tests will, by default, use the HTTP/1.1 "Transfer-Encoding:
+chunked" header. This is the default and is equivalent to specifying "-c" on the
+\fIipptool\fR command-line. Support for chunked requests is required for
+conformance with all versions of IPP.
+.TP 5
+TRANSFER length
+Specifies that tests will, by default, use the HTTP/1.0 "Content-Length:"
+header. This is equivalent to specifying "-l" on the \fIipptool\fR command-line.
+Support for content length requests is required for conformance with all
+versions of IPP.
+.TP 5
+VERSION 1.0
+.TP 5
+VERSION 1.1
+.TP 5
+VERSION 2.0
+.TP 5
+VERSION 2.1
+.TP 5
+VERSION 2.2
+Specifies the default IPP version number to use for the tests that follow.
+
+.SH TEST DIRECTIVES
+The following directives are understood in a test:
+.TP 5
+ATTR tag attribute-name value(s)
+Adds an attribute to the test request. Values are separated by the comma (",")
+character - escape commas using the "\" character.
+.TP 5
+ATTR collection attribute-name { MEMBER tag member-name value(s) ... } [ ... { ... } ]
+Adds a collection attribute to the test request. Member attributes follow the
+same syntax as regular attributes and can themselves be nested collections.
+Multiple collection values can be supplied as needed.
+.TP 5
+DELAY seconds
+Specifies a delay before this test will be run.
+.TP 5
+DISPLAY attribute-name
+Specifies that value of the named attribute should be output as part of the
+test report.
+.TP 5
+EXPECT attribute-name [ predicate(s) ]
+.TP 5
+EXPECT ?attribute-name predicate(s)
+.TP 5
+EXPECT !attribute-name
+Specifies that the response must/may/must not include the named attribute.
+Additional requirements can be added as predicates - see the "EXPECT PREDICATES"
+section for more information on predicates.
+.TP 5
+FILE filename
+Specifies a file to include at the end of the request. This is typically used
+when sending a test print file.
+.TP 5
+GROUP tag
+Specifies the group tag for subsequent attributes in the request.
+.TP 5
+IGNORE-ERRORS yes
+.TP 5
+IGNORE-ERRORS no
+Specifies whether \fIipptool\fR will ignore errors and continue with subsequent
+tests.
+.TP 5
+NAME "literal string"
+Specifies the human-readable name of the test.
+.TP 5
+OPERATION operation-code
+Specifies the operation to be performed.
+.TP 5
+REQUEST-ID number
+.TP 5
+REQUEST-ID random
+Specifies the request-id value to use in the request, either an integer or the
+word "random" to use a randomly generated value (the default).
+.TP 5
+RESOURCE path
+Specifies an alternate resource path that is used for the HTTP POST request.
+The default is the resource from the URI provided to the \fIipptool\fR program.
+.TP 5
+SKIP-IF-DEFINED variable-name
+.TP 5
+SKIP-IF-NOT-DEFINED variable-name
+Specifies that the current test should be skipped when the variable is or is not
+defined.
+.TP 5
+SKIP-PREVIOUS-ERROR yes
+.TP 5
+SKIP-PREVIOUS-ERROR no
+Specifies whether \fIipptool\fR will skip the current test if the previous test
+resulted in an error/failure.
+.TP 5
+STATUS status-code [ predicate ]
+Specifies an expected response status-code value. Additional requirements can be
+added as predicates - see the "STATUS PREDICATES" section for more information
+on predicates.
+.TP 5
+TRANSFER auto
+Specifies that this test will use "Transfer-Encoding: chunked" if it has an
+attached file or "Content-Length:" otherwise.
+.TP 5
+TRANSFER chunked
+Specifies that this test will use the HTTP/1.1 "Transfer-Encoding: chunked"
+header.
+.TP 5
+TRANSFER length
+Specifies that this test will use the HTTP/1.0 "Content-Length:" header.
+.TP 5
+VERSION 1.0
+.TP 5
+VERSION 1.1
+.TP 5
+VERSION 2.0
+.TP 5
+VERSION 2.1
+.TP 5
+VERSION 2.2
+Specifies the IPP version number to use for this test.
+
+.SH EXPECT PREDICATES
+The following predicates are understood following the EXPECT test directive:
+.TP 5
+COUNT number
+Requires the EXPECT attribute to have the specified number of values.
+.TP 5
+DEFINE-MATCH variable-name
+Defines the variable to "1" when the EXPECT condition matches. A side-effect of
+this predicate is that this EXPECT will never fail a test.
+.TP 5
+DEFINE-NO-MATCH variable-name
+Defines the variable to "1" when the EXPECT condition does not match. A side-
+effect of this predicate is that this EXPECT will never fail a test.
+.TP 5
+DEFINE-VALUE variable-name
+Defines the variable to the value of the attribute when the EXPECT condition
+matches.
+.TP 5
+IF-DEFINED variable-name
+Makes the EXPECT conditions apply only if the specified variable is defined.
+.TP 5
+IF-NOT-DEFINED variable-name
+Makes the EXPECT conditions apply only if the specified variable is not
+defined.
+.TP 5
+IN-GROUP tag
+Requires the EXPECT attribute to be in the specified group tag.
+.TP 5
+OF-TYPE tag[,tag,...]
+Requires the EXPECT attribute to use the specified value tag(s).
+.TP 5
+SAME-COUNT-AS attribute-name
+Requires the EXPECT attribute to have the same number of values as the specified
+parallel attribute.
+.TP 5
+WITH-VALUE "literal string"
+Requires at least one value of the EXPECT attribute to match the literal string.
+Comparisons are case-sensitive.
+.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.
+
+.SH STATUS PREDICATES
+The following predicates are understood following the STATUS test directive:
+.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.
+
+.SH OPERATION CODES
+Operation codes correspond to the hexadecimal numbers (0xHHHH) and names from
+RFC 2911 and other IPP extension specifications. Here is a complete list:
+.nf
+    Activate-Printer
+    CUPS-Accept-Jobs
+    CUPS-Add-Modify-Class
+    CUPS-Add-Modify-Printer
+    CUPS-Authenticate-Job
+    CUPS-Delete-Class
+    CUPS-Delete-Printer
+    CUPS-Get-Classes
+    CUPS-Get-Default
+    CUPS-Get-Devices
+    CUPS-Get-Document
+    CUPS-Get-PPD
+    CUPS-Get-PPDs
+    CUPS-Get-Printers
+    CUPS-Move-Job
+    CUPS-Reject-Jobs
+    CUPS-Set-Default
+    Cancel-Current-Job
+    Cancel-Job
+    Cancel-Jobs
+    Cancel-My-Jobs
+    Cancel-Subscription
+    Close-Job
+    Create-Job
+    Create-Job-Subscription
+    Create-Printer-Subscription
+    Deactivate-Printer
+    Disable-Printer
+    Enable-Printer
+    Get-Job-Attributes
+    Get-Jobs
+    Get-Notifications
+    Get-Printer-Attributes
+    Get-Printer-Support-Files
+    Get-Printer-Supported-Values
+    Get-Subscription-Attributes
+    Get-Subscriptions
+    Hold-Job
+    Hold-New-Jobs
+    Pause-Printer
+    Pause-Printer-After-Current-Job
+    Print-Job
+    Print-URI
+    Promote-Job
+    Purge-Jobs
+    Release-Held-New-Jobs
+    Release-Job
+    Renew-Subscription
+    Reprocess-Job
+    Restart-Job
+    Restart-Printer
+    Resubmit-Job
+    Resume-Job
+    Resume-Printer
+    Schedule-Job-After
+    Send-Document
+    Send-Notifications
+    Send-URI
+    Set-Job-Attributes
+    Set-Printer-Attributes
+    Shutdown-Printer
+    Startup-Printer
+    Suspend-Current-Job
+    Validate-Job
+.fi
+
+.SH STATUS CODES
+Status codes correspond to the hexadecimal numbers (0xHHHH) and names from RFC
+2911 and other IPP extension specifications. Here is a complete list:
+.nf
+    client-error-attributes-not-settable
+    client-error-attributes-or-values-not-supported
+    client-error-bad-request
+    client-error-charset-not-supported
+    client-error-compression-error
+    client-error-compression-not-supported
+    client-error-conflicting-attributes
+    client-error-document-access-error
+    client-error-document-format-error
+    client-error-document-format-not-supported
+    client-error-forbidden
+    client-error-gone
+    client-error-ignored-all-notifications
+    client-error-ignored-all-subscriptions
+    client-error-not-authenticated
+    client-error-not-authorized
+    client-error-not-found
+    client-error-not-possible
+    client-error-print-support-file-not-found
+    client-error-request-entity-too-large
+    client-error-request-value-too-long
+    client-error-timeout
+    client-error-too-many-subscriptions
+    client-error-uri-scheme-not-supported
+    cups-see-other
+    redirection-other-site
+    server-error-busy
+    server-error-device-error
+    server-error-internal-error
+    server-error-job-canceled
+    server-error-multiple-document-jobs-not-supported
+    server-error-not-accepting-jobs
+    server-error-operation-not-supported
+    server-error-printer-is-deactivated
+    server-error-service-unavailable
+    server-error-temporary-error
+    server-error-version-not-supported
+    successful-ok
+    successful-ok-but-cancel-subscription
+    successful-ok-conflicting-attributes
+    successful-ok-events-complete
+    successful-ok-ignored-notifications
+    successful-ok-ignored-or-substituted-attributes
+    successful-ok-ignored-subscriptions
+    successful-ok-too-many-events
+.fi
+
+.SH TAGS
+Value and group tags correspond to the names from RFC 2911 and other IPP
+extension specifications. Here are the group tags:
+.nf
+    event-notification-attributes-tag
+    job-attributes-tag
+    operation-attributes-tag
+    printer-attributes-tag
+    subscription-attributes-tag
+    unsupported-attributes-tag
+.fi
+.LP
+Here are the value tags:
+.nf
+    admin-define
+    boolean
+    charset
+    collection
+    dateTime
+    default
+    delete-attribute
+    enum
+    integer
+    keyword
+    mimeMediaType
+    nameWithLanguage
+    nameWithoutLanguage
+    naturalLanguage
+    no-value
+    not-settable
+    octetString
+    rangeOfInteger
+    resolution
+    textWithLanguage
+    textWithoutLanguage
+    unknown
+    unsupported
+    uri
+    uriScheme
+.fi
+
+.SH VARIABLES
+The \fIipptool\fR program maintains a list of variables that can be used in any
+literal string or attribute value by specifying "$variable-name". Aside from
+variables defined using the "-d" option or "DEFINE" directive, the following
+pre-defined variables are available:
+.TP 5
+$$
+Inserts a single "$" character.
+.TP 5
+$ENV[name]
+Inserts the value of the named environment variable, or an empty string if the
+environment variable is not defined.
+.TP 5
+$filename
+Inserts the filename provided to \fIipptool\fR with the "-f" option.
+.TP 5
+$hostname
+Inserts the hostname from the URI provided to \fIipptool\fR.
+.TP 5
+$job-id
+Inserts the last job-id value returned in a test response or 0 if no job-id has
+been seen.
+.TP 5
+$job-uri
+Inserts the last job-uri value returned in a test response or an empty string if
+no job-uri has been seen.
+.TP 5
+$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
+no notify-subscription-id has been seen.
+.TP 5
+$port
+Inserts the port number from the URI provided to \fIipptool\fR.
+.TP 5
+$resource
+Inserts the resource path from the URI provided to \fIipptool\fR.
+.TP 5
+$uri
+Inserts the URI provided to \fIipptool\fR.
+.TP 5
+$user
+Inserts the current user's login name.
+.TP 5
+$username
+Inserts the username from the URI provided to \fIipptool\fR, if any.
+
+.SH SEE ALSO
+\fIipptool(1)\fR,
+.br
+http://localhost:631/help
+
+.SH COPYRIGHT
+Copyright 2007-2011 by Apple Inc.
+.\"
+.\" End of "$Id: ipptoolfile.man 9769 2011-05-12 04:24:17Z mike $".
+.\"
diff --git a/man/lp.man b/man/lp.man
index b541db9c..c19c3cd8 100644
--- a/man/lp.man
+++ b/man/lp.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: lp.man 9665 2011-03-31 18:54:19Z mike $"
+.\" "$Id: lp.man 9664 2011-03-31 18:53:52Z mike $"
 .\"
 .\"   lp man page for CUPS.
 .\"
@@ -258,5 +258,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: lp.man 9665 2011-03-31 18:54:19Z mike $".
+.\" End of "$Id: lp.man 9664 2011-03-31 18:53:52Z mike $".
 .\"
diff --git a/man/lpadmin.man b/man/lpadmin.man
index 0926259e..c388f03b 100644
--- a/man/lpadmin.man
+++ b/man/lpadmin.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: lpadmin.man 9473 2011-01-11 16:28:51Z mike $"
+.\" "$Id: lpadmin.man 9762 2011-05-11 05:30:50Z mike $"
 .\"
 .\"   lpadmin man page for CUPS.
 .\"
@@ -12,7 +12,7 @@
 .\"   which should have been included with this file.  If this file is
 .\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.TH lpadmin 8 "CUPS" "7 January 2011" "Apple Inc."
+.TH lpadmin 8 "CUPS" "10 May 2011" "Apple Inc."
 .SH NAME
 lpadmin \- configure cups printers and classes
 .SH SYNOPSIS
@@ -30,7 +30,11 @@ lpadmin \- configure cups printers and classes
 ] [ -h
 .I server[:port]
 ] -p
-.I destination option(s)
+.I destination
+[ -R
+.I name-default
+]
+.I option(s)
 .br
 .B lpadmin
 [ -E ] [-U
@@ -82,6 +86,18 @@ Sets a standard System V interface script or PPD file for the printer from the
 \fImodel\fR directory or using one of the driver interfaces. Use the \fI-m\fR
 option with the \fIlpinfo(8)\fR command to get a list of supported models.
 .TP 5
+-o cupsIPPSupplies=true
+.TP 5
+-o cupsIPPSupplies=false
+.br
+Specifies whether IPP supply level values should be reported.
+.TP 5
+-o cupsSNMPSupplies=true
+.TP 5
+-o cupsSNMPSupplies=false
+.br
+Specifies whether SNMP supply level (RFC 3805) values should be reported.
+.TP 5
 -o job-k-limit=value
 .br
 Sets the kilobyte limit for per-user quotas. The value is an
@@ -123,8 +139,8 @@ specified port monitor must be listed in the printer's PPD file.
 .TP 5
 -o printer-error-policy=name
 .br
-Sets the error policy to be used when the printer backend is 
-unable to send the job to the printer. The name must be one of 
+Sets the error policy to be used when the printer backend is
+unable to send the job to the printer. The name must be one of
 "abort-job", "retry-job", "retry-current-job", or "stop-printer". The default
 error policy is "stop-printer" for printers and "retry-current-job" for
 classes.
@@ -143,6 +159,10 @@ Sets the IPP operation policy associated with the destination. The
 name must be defined in the \fBcupsd.conf\fR in a Policy section.
 The default operation policy is "default".
 .TP 5
+-R name-default
+.br
+Deletes the named option from \fIprinter\fR.
+.TP 5
 -r class
 .br
 Removes the named \fIprinter\fR from \fIclass\fR.  If the
@@ -204,5 +224,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: lpadmin.man 9473 2011-01-11 16:28:51Z mike $".
+.\" End of "$Id: lpadmin.man 9762 2011-05-11 05:30:50Z mike $".
 .\"
diff --git a/man/lpc.man b/man/lpc.man
index 22a60505..8e5c7101 100644
--- a/man/lpc.man
+++ b/man/lpc.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: lpc.man 8421 2009-03-09 21:59:55Z mike $"
+.\" "$Id: lpc.man 9771 2011-05-12 05:21:56Z mike $"
 .\"
-.\"   lpc man page for the Common UNIX Printing System (CUPS).
+.\"   lpc man page for CUPS.
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2011 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-2009 by Apple Inc.
+Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: lpc.man 8421 2009-03-09 21:59:55Z mike $".
+.\" End of "$Id: lpc.man 9771 2011-05-12 05:21:56Z mike $".
 .\"
diff --git a/man/lpinfo.man b/man/lpinfo.man
index 8606579c..42bda480 100644
--- a/man/lpinfo.man
+++ b/man/lpinfo.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: lpinfo.man 8421 2009-03-09 21:59:55Z mike $"
+.\" "$Id: lpinfo.man 9771 2011-05-12 05:21:56Z mike $"
 .\"
-.\"   lpinfo man page for the Common UNIX Printing System (CUPS).
+.\"   lpinfo man page for CUPS.
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2011 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-2009 by Apple Inc.
+Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: lpinfo.man 8421 2009-03-09 21:59:55Z mike $".
+.\" End of "$Id: lpinfo.man 9771 2011-05-12 05:21:56Z mike $".
 .\"
diff --git a/man/lpmove.man b/man/lpmove.man
index 635cedea..b5688f41 100644
--- a/man/lpmove.man
+++ b/man/lpmove.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: lpmove.man 8421 2009-03-09 21:59:55Z mike $"
+.\" "$Id: lpmove.man 9771 2011-05-12 05:21:56Z mike $"
 .\"
-.\"   lpmove man page for the Common UNIX Printing System (CUPS).
+.\"   lpmove man page for CUPS.
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2011 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-2009 by Apple Inc.
+Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: lpmove.man 8421 2009-03-09 21:59:55Z mike $".
+.\" End of "$Id: lpmove.man 9771 2011-05-12 05:21:56Z mike $".
 .\"
diff --git a/man/lpoptions.man.in b/man/lpoptions.man.in
index acfbef6e..7e5f07e6 100644
--- a/man/lpoptions.man.in
+++ b/man/lpoptions.man.in
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: lpoptions.man.in 8421 2009-03-09 21:59:55Z mike $"
+.\" "$Id: lpoptions.man.in 9771 2011-05-12 05:21:56Z mike $"
 .\"
-.\"   lpoptions man page for the Common UNIX Printing System (CUPS).
+.\"   lpoptions man page for CUPS.
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2011 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-2009 by Apple Inc.
+Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: lpoptions.man.in 8421 2009-03-09 21:59:55Z mike $".
+.\" End of "$Id: lpoptions.man.in 9771 2011-05-12 05:21:56Z mike $".
 .\"
diff --git a/man/lppasswd.man b/man/lppasswd.man
index 7c0ce980..87ade67b 100644
--- a/man/lppasswd.man
+++ b/man/lppasswd.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: lppasswd.man 8421 2009-03-09 21:59:55Z mike $"
+.\" "$Id: lppasswd.man 9771 2011-05-12 05:21:56Z mike $"
 .\"
-.\"   lpadmin man page for the Common UNIX Printing System (CUPS).
+.\"   lpadmin man page for CUPS.
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2011 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-2009 by Apple Inc.
+Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: lppasswd.man 8421 2009-03-09 21:59:55Z mike $".
+.\" End of "$Id: lppasswd.man 9771 2011-05-12 05:21:56Z mike $".
 .\"
diff --git a/man/lpq.man b/man/lpq.man
index ce5f0927..502d45a0 100644
--- a/man/lpq.man
+++ b/man/lpq.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: lpq.man 8421 2009-03-09 21:59:55Z mike $"
+.\" "$Id: lpq.man 9771 2011-05-12 05:21:56Z mike $"
 .\"
-.\"   lpq man page for the Common UNIX Printing System (CUPS).
+.\"   lpq man page for CUPS.
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2011 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-2009 by Apple Inc.
+Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: lpq.man 8421 2009-03-09 21:59:55Z mike $".
+.\" End of "$Id: lpq.man 9771 2011-05-12 05:21:56Z mike $".
 .\"
diff --git a/man/lpr.man b/man/lpr.man
index ab8c4ae1..b60a265e 100644
--- a/man/lpr.man
+++ b/man/lpr.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: lpr.man 8421 2009-03-09 21:59:55Z mike $"
+.\" "$Id: lpr.man 9771 2011-05-12 05:21:56Z mike $"
 .\"
-.\"   lpr man page for the Common UNIX Printing System (CUPS).
+.\"   lpr man page for CUPS.
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2011 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-2009 by Apple Inc.
+Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: lpr.man 8421 2009-03-09 21:59:55Z mike $".
+.\" End of "$Id: lpr.man 9771 2011-05-12 05:21:56Z mike $".
 .\"
diff --git a/man/lprm.man b/man/lprm.man
index 62a3bef5..d64ac03d 100644
--- a/man/lprm.man
+++ b/man/lprm.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: lprm.man 8801 2009-08-29 06:05:14Z mike $"
+.\" "$Id: lprm.man 9771 2011-05-12 05:21:56Z mike $"
 .\"
-.\"   lprm man page for the Common UNIX Printing System (CUPS).
+.\"   lprm man page for CUPS.
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2011 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-2009 by Apple Inc.
+Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: lprm.man 8801 2009-08-29 06:05:14Z mike $".
+.\" End of "$Id: lprm.man 9771 2011-05-12 05:21:56Z mike $".
 .\"
diff --git a/man/lpstat.man b/man/lpstat.man
index 0b8511c7..c51c44ad 100644
--- a/man/lpstat.man
+++ b/man/lpstat.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: lpstat.man 8421 2009-03-09 21:59:55Z mike $"
+.\" "$Id: lpstat.man 9771 2011-05-12 05:21:56Z mike $"
 .\"
-.\"   lpstat man page for the Common UNIX Printing System (CUPS).
+.\"   lpstat man page for CUPS.
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2011 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-2009 by Apple Inc.
+Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: lpstat.man 8421 2009-03-09 21:59:55Z mike $".
+.\" End of "$Id: lpstat.man 9771 2011-05-12 05:21:56Z mike $".
 .\"
diff --git a/man/mailto.conf.man b/man/mailto.conf.man
index 8c62284e..7f9e30d5 100644
--- a/man/mailto.conf.man
+++ b/man/mailto.conf.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: mailto.conf.man 8421 2009-03-09 21:59:55Z mike $"
+.\" "$Id: mailto.conf.man 9771 2011-05-12 05:21:56Z mike $"
 .\"
-.\"   mailto.conf man page for the Common UNIX Printing System (CUPS).
+.\"   mailto.conf man page for CUPS.
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2011 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-2009 by Apple Inc.
+Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: mailto.conf.man 8421 2009-03-09 21:59:55Z mike $".
+.\" End of "$Id: mailto.conf.man 9771 2011-05-12 05:21:56Z mike $".
 .\"
diff --git a/man/mantohtml.c b/man/mantohtml.c
index 57d74bcf..d9b0acb4 100644
--- a/man/mantohtml.c
+++ b/man/mantohtml.c
@@ -1,9 +1,9 @@
 /*
- * "$Id: mantohtml.c 8621 2009-05-12 22:57:26Z mike $"
+ * "$Id: mantohtml.c 9226 2010-08-06 12:15:50Z mike $"
  *
  *   Man page to HTML conversion program.
  *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 2004-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -23,8 +23,7 @@
  * Include necessary headers.
  */
 
-#include <cups/string.h>
-#include <stdlib.h>
+#include <cups/string-private.h>
 #include <unistd.h>
 
 
@@ -282,7 +281,7 @@ main(int  argc,				/* I - Number of command-line args */
         * Grab line break...
 	*/
 
-        if (list == 1)
+	if (list == 1)
 	{
 	  fputs("</dt>\n<dd>", outfile);
 	  list = 2;
@@ -403,7 +402,7 @@ main(int  argc,				/* I - Number of command-line args */
         * Process the text as if it was in-line...
 	*/
 
-        post = "\n<br />\n<br />";
+        post = "\n<br>\n<br>";
         goto process_text;
       }
       else if (!strncmp(line, ".\\}", 3))
@@ -637,6 +636,12 @@ process_text:
         fputs(post, outfile);
 	post = NULL;
       }
+
+      if (list == 1)
+      {
+	fputs("</dt>\n<dd>", outfile);
+	list = 2;
+      }
     }
   }
 
@@ -711,5 +716,5 @@ strmove(char       *d,			/* I - Destination */
 
 
 /*
- * End of "$Id: mantohtml.c 8621 2009-05-12 22:57:26Z mike $".
+ * End of "$Id: mantohtml.c 9226 2010-08-06 12:15:50Z mike $".
  */
diff --git a/man/mime.convs.man b/man/mime.convs.man
index e3670eb9..d55cad47 100644
--- a/man/mime.convs.man
+++ b/man/mime.convs.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: mime.convs.man 8421 2009-03-09 21:59:55Z mike $"
+.\" "$Id: mime.convs.man 9771 2011-05-12 05:21:56Z mike $"
 .\"
-.\"   mime.convs man page for the Common UNIX Printing System (CUPS).
+.\"   mime.convs man page for CUPS.
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2011 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-2009 by Apple Inc.
+Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: mime.convs.man 8421 2009-03-09 21:59:55Z mike $".
+.\" End of "$Id: mime.convs.man 9771 2011-05-12 05:21:56Z mike $".
 .\"
diff --git a/man/mime.types.man b/man/mime.types.man
index b45e80a7..9c695660 100644
--- a/man/mime.types.man
+++ b/man/mime.types.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: mime.types.man 8652 2009-05-16 23:48:35Z mike $"
+.\" "$Id: mime.types.man 9771 2011-05-12 05:21:56Z mike $"
 .\"
-.\"   mime.types man page for the Common UNIX Printing System (CUPS).
+.\"   mime.types man page for CUPS.
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2011 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-2009 by Apple Inc.
+Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: mime.types.man 8652 2009-05-16 23:48:35Z mike $".
+.\" End of "$Id: mime.types.man 9771 2011-05-12 05:21:56Z mike $".
 .\"
diff --git a/man/notifier.man b/man/notifier.man
index d2cd149e..498dfd59 100644
--- a/man/notifier.man
+++ b/man/notifier.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: notifier.man 8999 2010-02-24 01:01:04Z mike $"
 .\"
 .\"   notifier man page for CUPS.
 .\"
@@ -153,5 +153,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 2007-2009 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: notifier.man 8999 2010-02-24 01:01:04Z mike $".
 .\"
diff --git a/man/ppdc.man b/man/ppdc.man
index 98f1c06f..b613d429 100644
--- a/man/ppdc.man
+++ b/man/ppdc.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: ppdc.man 8421 2009-03-09 21:59:55Z mike $"
+.\" "$Id: ppdc.man 9771 2011-05-12 05:21:56Z mike $"
 .\"
-.\"   ppdc man page for the Common UNIX Printing System.
+.\"   ppdc man page for CUPS.
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2011 by Apple Inc.
 .\"   Copyright 1997-2007 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -74,7 +74,7 @@ ppdhtml(1), ppdi(1), ppdmerge(1), ppdpo(1), ppdcfile(5)
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2009 by Apple Inc.
+Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: ppdc.man 8421 2009-03-09 21:59:55Z mike $".
+.\" End of "$Id: ppdc.man 9771 2011-05-12 05:21:56Z mike $".
 .\"
diff --git a/man/ppdcfile.man b/man/ppdcfile.man
index ec5db8d0..fbd63586 100644
--- a/man/ppdcfile.man
+++ b/man/ppdcfile.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: ppdcfile.man 8421 2009-03-09 21:59:55Z mike $"
+.\" "$Id: ppdcfile.man 9771 2011-05-12 05:21:56Z mike $"
 .\"
-.\"   ppdcfile man page for the Common UNIX Printing System.
+.\"   ppdcfile man page for CUPS.
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2011 by Apple Inc.
 .\"   Copyright 1997-2007 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -165,7 +165,7 @@ ppdc(1), ppdhtml(1), ppdi(1), ppdmerge(1), ppdpo(1)
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2009 by Apple Inc.
+Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: ppdcfile.man 8421 2009-03-09 21:59:55Z mike $".
+.\" End of "$Id: ppdcfile.man 9771 2011-05-12 05:21:56Z mike $".
 .\"
diff --git a/man/ppdhtml.man b/man/ppdhtml.man
index 34c9e70c..bebf4e1e 100644
--- a/man/ppdhtml.man
+++ b/man/ppdhtml.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: ppdhtml.man 8421 2009-03-09 21:59:55Z mike $"
+.\" "$Id: ppdhtml.man 9771 2011-05-12 05:21:56Z mike $"
 .\"
-.\"   ppdhtml man page for the Common UNIX Printing System.
+.\"   ppdhtml man page for CUPS.
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2011 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-2009 by Apple Inc.
+Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: ppdhtml.man 8421 2009-03-09 21:59:55Z mike $".
+.\" End of "$Id: ppdhtml.man 9771 2011-05-12 05:21:56Z mike $".
 .\"
diff --git a/man/ppdi.man b/man/ppdi.man
index 95a5225d..610d91cd 100644
--- a/man/ppdi.man
+++ b/man/ppdi.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: ppdi.man 8421 2009-03-09 21:59:55Z mike $"
+.\" "$Id: ppdi.man 9771 2011-05-12 05:21:56Z mike $"
 .\"
-.\"   ppdi man page for the Common UNIX Printing System.
+.\"   ppdi man page for CUPS.
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2011 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-2009 by Apple Inc.
+Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: ppdi.man 8421 2009-03-09 21:59:55Z mike $".
+.\" End of "$Id: ppdi.man 9771 2011-05-12 05:21:56Z mike $".
 .\"
diff --git a/man/ppdmerge.man b/man/ppdmerge.man
index 701fca1f..90fee820 100644
--- a/man/ppdmerge.man
+++ b/man/ppdmerge.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: ppdmerge.man 8421 2009-03-09 21:59:55Z mike $"
+.\" "$Id: ppdmerge.man 9771 2011-05-12 05:21:56Z mike $"
 .\"
-.\"   ppdmerge man page for the Common UNIX Printing System.
+.\"   ppdmerge man page for CUPS.
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2011 by Apple Inc.
 .\"   Copyright 1997-2007 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -31,7 +31,7 @@ PPD file.
 .PP
 The \fI-o\fR option specifies the PPD file to create. If not specified,
 the merged PPD file is written to the standard output. If the output file
-already exists, the new 
+already exists, the new
 .SH NOTES
 \fIppdmerge\fR does not check whether the merged PPD files are for the
 same device. Merging of different device PPDs will yield unpredictable
@@ -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-2009 by Apple Inc.
+Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: ppdmerge.man 8421 2009-03-09 21:59:55Z mike $".
+.\" End of "$Id: ppdmerge.man 9771 2011-05-12 05:21:56Z mike $".
 .\"
diff --git a/man/ppdpo.man b/man/ppdpo.man
index 8c3b1793..a3f9ac9b 100644
--- a/man/ppdpo.man
+++ b/man/ppdpo.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: ppdpo.man 8421 2009-03-09 21:59:55Z mike $"
+.\" "$Id: ppdpo.man 9771 2011-05-12 05:21:56Z mike $"
 .\"
-.\"   ppdpo man page for the Common UNIX Printing System.
+.\"   ppdpo man page for CUPS.
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2011 by Apple Inc.
 .\"   Copyright 1997-2007 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -46,7 +46,7 @@ ppdc(1), ppdhtml(1), ppdi(1), ppdmerge(1), ppdcfile(5)
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2009 by Apple Inc.
+Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: ppdpo.man 8421 2009-03-09 21:59:55Z mike $".
+.\" End of "$Id: ppdpo.man 9771 2011-05-12 05:21:56Z mike $".
 .\"
diff --git a/man/printers.conf.man b/man/printers.conf.man
index 54f7886e..abda49b2 100644
--- a/man/printers.conf.man
+++ b/man/printers.conf.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: printers.conf.man 8581 2009-04-29 22:54:48Z mike $"
+.\" "$Id: printers.conf.man 9771 2011-05-12 05:21:56Z mike $"
 .\"
-.\"   printers.conf man page for the Common UNIX Printing System (CUPS).
+.\"   printers.conf man page for CUPS.
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2011 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-2009 by Apple Inc.
+Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: printers.conf.man 8581 2009-04-29 22:54:48Z mike $".
+.\" End of "$Id: printers.conf.man 9771 2011-05-12 05:21:56Z mike $".
 .\"
diff --git a/man/subscriptions.conf.man b/man/subscriptions.conf.man
index 75f89334..4ff851cb 100644
--- a/man/subscriptions.conf.man
+++ b/man/subscriptions.conf.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: subscriptions.conf.man 8421 2009-03-09 21:59:55Z mike $"
+.\" "$Id: subscriptions.conf.man 9771 2011-05-12 05:21:56Z mike $"
 .\"
-.\"   subscriptions.conf man page for the Common UNIX Printing System (CUPS).
+.\"   subscriptions.conf man page for CUPS.
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2011 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-2009 by Apple Inc.
+Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: subscriptions.conf.man 8421 2009-03-09 21:59:55Z mike $".
+.\" End of "$Id: subscriptions.conf.man 9771 2011-05-12 05:21:56Z mike $".
 .\"
author	Didier Raboud <odyx@debian.org>	2012-10-25 20:57:13 +0200
committer	Didier Raboud <odyx@debian.org>	2012-10-25 20:57:13 +0200
commit	49a2853988b074d087e82c51aec4f9fc052a057d (patch)
tree	c38ece96005bc33bd4e133fd0037f3428fdc039d /man
parent	a312f7e1ac68fb22275719f6208b670d9edd45b5 (diff)
download	cups-49a2853988b074d087e82c51aec4f9fc052a057d.tar.gz