Merge changes from CUPS 1.6svn-r9968.

[thirdparty/cups.git] / man / printers.conf.man

diff --git a/man/printers.conf.man b/man/printers.conf.man
index 45dedb85a7b9cd56f56bf6febaed8ac8d73752af..b3fdce38362eda9731decfa3d3544bb679de4018 100644 (file)
--- a/man/printers.conf.man
+++ b/man/printers.conf.man
@@ -1,27 +1,18 @@
 .\"
-.\" "$Id: printers.conf.man 5099 2006-02-13 02:46:10Z mike $"
+.\" "$Id: printers.conf.man 7600 2008-05-20 21:06:23Z mike $"
 .\"
-.\"   printers.conf man page for the Common UNIX Printing System (CUPS).
+.\"   printers.conf 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 Easy Software Products 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 missing or damaged please contact Easy Software Products
-.\"   at:
+.\"   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/".
 .\"
-.\"       Attn: CUPS Licensing Information
-.\"       Easy Software Products
-.\"       44141 Airport View Drive, Suite 204
-.\"       Hollywood, Maryland 20636 USA
-.\"
-.\"       Voice: (301) 373-9600
-.\"       EMail: cups-info@cups.org
-.\"         WWW: http://www.cups.org
-.\"
-.TH printers.conf 5 "Common UNIX Printing System" "12 February 2006" "Easy Software Products"
+.TH printers.conf 5 "CUPS" "29 April 2009" "Apple Inc."
 .SH NAME
 printers.conf \- printer configuration file for cups
 .SH DESCRIPTION
@@ -60,7 +51,9 @@ DeviceURI uri
 .br
 Specifies the device URI for a printer.
 .TP 5
-ErrorPolicy cancel-job
+ErrorPolicy abort-job
+.TP 5
+ErrorPolicy retry-current-job
 .TP 5
 ErrorPolicy retry-job
 .TP 5
@@ -125,7 +118,7 @@ Specifies the date/time associated with the state.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
+Copyright 2007-2011 by Apple Inc.
 .\"
-.\" End of "$Id: printers.conf.man 5099 2006-02-13 02:46:10Z mike $".
+.\" End of "$Id: printers.conf.man 7600 2008-05-20 21:06:23Z mike $".
 .\"