Merge changes from CUPS 1.4svn-r7582.

[thirdparty/cups.git] / man / cupsd.conf.man.in

diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in
index d34c94b40a4ff1d6fcfeef4b95d39abd9177b722..19d747fb17823503505b442b8b640d138cc3749d 100644 (file)
--- a/man/cupsd.conf.man.in
+++ b/man/cupsd.conf.man.in
@@ -1,27 +1,18 @@
 .\"
-.\" "$Id$"
+.\" "$Id: cupsd.conf.man.in 7002 2007-10-01 23:07:37Z mike $"
 .\"
 .\"   cupsd.conf man page for the Common UNIX Printing System (CUPS).
 .\"
+.\"   Copyright 2007-2008 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 cupsd.conf 5 "Common UNIX Printing System" "6 June 2006" "Easy Software Products"
+.TH cupsd.conf 5 "Common UNIX Printing System" "15 May 2008" "Apple Inc."
 .SH NAME
 cupsd.conf \- server configuration file for cups
 .SH DESCRIPTION
@@ -83,8 +74,10 @@ AuthType Basic
 AuthType BasicDigest
 .TP 5
 AuthType Digest
+.TP 5
+AuthType Negotiate
 .br
-Specifies the authentication type (None, Basic, BasicDigest, Digest)
+Specifies the authentication type (None, Basic, BasicDigest, Digest, Negotiate)
 .TP 5
 AutoPurgeJobs Yes
 .TP 5
@@ -220,6 +213,8 @@ DefaultAuthType Basic
 DefaultAuthType BasicDigest
 .TP 5
 DefaultAuthType Digest
+.TP 5
+DefaultAuthType Negotiate
 .br
 Specifies the default type of authentication to use.
 .TP 5
@@ -235,6 +230,12 @@ DefaultPolicy policy-name
 .br
 Specifies the default access policy to use.
 .TP 5
+DefaultShared Yes
+.TP 5
+DefaultShared No
+.br
+Specifies whether local printers are shared by default.
+.TP 5
 Deny all
 .TP 5
 Deny none
@@ -350,6 +351,10 @@ KeepAliveTimeout seconds
 .br
 Specifies the amount of time that connections are kept alive.
 .TP 5
+Krb5Keytab filename
+.br
+Overrides the Kerberos key tab location.
+.TP 5
 <Limit operations> ... </Limit>
 .br
 Specifies the IPP operations that are being limited inside a policy.
@@ -448,6 +453,10 @@ PageLog syslog
 .br
 Specifies the page log filename.
 .TP 5
+PageLogFormat format string
+.br
+Specifies the format of page log lines.
+.TP 5
 PassEnv variable [... variable]
 .br
 Passes the specified environment variable(s) to child processes.
@@ -607,7 +616,7 @@ Specifies the user name or ID that is used when running external programs.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
+Copyright 2007-2008 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: cupsd.conf.man.in 7002 2007-10-01 23:07:37Z mike $".
 .\"