Load cups into easysw/current.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@279 a1ca3aef-8c08-0410-bb20-df032aa958be

6 files changed, 21 insertions, 13 deletions

diff --git a/man/Makefile b/man/Makefile
index 709e0ac7e..f60d35d7e 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 5728 2006-07-12 20:45:13Z mike $"
+# "$Id: Makefile 5727 2006-07-12 20:44:30Z mike $"
 #
 #   Man page makefile for the Common UNIX Printing System (CUPS).
 #
@@ -184,5 +184,5 @@ mantohtml:	mantohtml.o
 
 
 #
-# End of "$Id: Makefile 5728 2006-07-12 20:45:13Z mike $".
+# End of "$Id: Makefile 5727 2006-07-12 20:44:30Z mike $".
 #
diff --git a/man/classes.conf.man b/man/classes.conf.man
index 4df347ade..6cd391120 100644
--- a/man/classes.conf.man
+++ b/man/classes.conf.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: classes.conf.man 5970 2006-09-19 20:11:08Z mike $"
+.\" "$Id: classes.conf.man 5969 2006-09-19 20:09:24Z mike $"
 .\"
 .\"   classes.conf man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -123,5 +123,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: classes.conf.man 5970 2006-09-19 20:11:08Z mike $".
+.\" End of "$Id: classes.conf.man 5969 2006-09-19 20:09:24Z mike $".
 .\"
diff --git a/man/cupsaddsmb.man.in b/man/cupsaddsmb.man.in
index 9fd43137d..e1a1f08bb 100644
--- a/man/cupsaddsmb.man.in
+++ b/man/cupsaddsmb.man.in
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: cupsaddsmb.man.in 6049 2006-10-20 15:07:21Z mike $"
+.\" "$Id: cupsaddsmb.man.in 6047 2006-10-20 14:52:55Z mike $"
 .\"
 .\"   cupsaddsmb man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -215,5 +215,5 @@ http://www.cups.org/windows/
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: cupsaddsmb.man.in 6049 2006-10-20 15:07:21Z mike $".
+.\" End of "$Id: cupsaddsmb.man.in 6047 2006-10-20 14:52:55Z mike $".
 .\"
diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in
index f17a4dcb3..757f71a7c 100644
--- a/man/cupsd.conf.man.in
+++ b/man/cupsd.conf.man.in
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: cupsd.conf.man.in 5638 2006-06-06 20:08:13Z mike $"
+.\" "$Id: cupsd.conf.man.in 5919 2006-08-31 04:20:45Z mike $"
 .\"
 .\"   cupsd.conf man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -83,8 +83,10 @@ AuthType Basic
 AuthType BasicDigest
 .TP 5
 AuthType Digest
+.TP 5
+AuthType Kerberos
 .br
-Specifies the authentication type (None, Basic, BasicDigest, Digest)
+Specifies the authentication type (None, Basic, BasicDigest, Digest, Kerberos)
 .TP 5
 AutoPurgeJobs Yes
 .TP 5
@@ -220,6 +222,8 @@ DefaultAuthType Basic
 DefaultAuthType BasicDigest
 .TP 5
 DefaultAuthType Digest
+.TP 5
+DefaultAuthType Kerberos
 .br
 Specifies the default type of authentication to use.
 .TP 5
@@ -350,6 +354,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.
@@ -609,5 +617,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: cupsd.conf.man.in 5638 2006-06-06 20:08:13Z mike $".
+.\" End of "$Id: cupsd.conf.man.in 5919 2006-08-31 04:20:45Z mike $".
 .\"
diff --git a/man/lpadmin.man b/man/lpadmin.man
index 82677fcb6..d4e18c485 100644
--- a/man/lpadmin.man
+++ b/man/lpadmin.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: lpadmin.man 5970 2006-09-19 20:11:08Z mike $"
+.\" "$Id: lpadmin.man 5969 2006-09-19 20:09:24Z mike $"
 .\"
 .\"   lpadmin man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -205,5 +205,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: lpadmin.man 5970 2006-09-19 20:11:08Z mike $".
+.\" End of "$Id: lpadmin.man 5969 2006-09-19 20:09:24Z mike $".
 .\"
diff --git a/man/printers.conf.man b/man/printers.conf.man
index 0a0469247..7e1f12d27 100644
--- a/man/printers.conf.man
+++ b/man/printers.conf.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: printers.conf.man 5970 2006-09-19 20:11:08Z mike $"
+.\" "$Id: printers.conf.man 5969 2006-09-19 20:09:24Z mike $"
 .\"
 .\"   printers.conf man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -127,5 +127,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: printers.conf.man 5970 2006-09-19 20:11:08Z mike $".
+.\" End of "$Id: printers.conf.man 5969 2006-09-19 20:09:24Z mike $".
 .\"