diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2012-01-19 16:53:50 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2012-01-19 16:53:50 +0000 |
| commit | dcb445bcf3e9ec2efd56550263052aca70beb08e (patch) | |
| tree | 9a0d2260f2bbfdc8a6aa561c138baca1a58f8228 /man | |
| parent | 9c80ffa289171a48b10cbda2098289ed0c7b96cc (diff) | |
| download | cups-dcb445bcf3e9ec2efd56550263052aca70beb08e.tar.gz | |
Merge changes from CUPS 1.6svn-r10188, including changes for <rdar://problem/10127258> CUPS 1.6: New printer/printing APIs
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3618 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'man')
| -rw-r--r-- | man/Makefile | 8 | ||||
| -rw-r--r-- | man/cupsd.conf.man.in | 15 |
2 files changed, 19 insertions, 4 deletions
diff --git a/man/Makefile b/man/Makefile index 0d3c2edff..a903ed5fc 100644 --- a/man/Makefile +++ b/man/Makefile @@ -96,10 +96,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; \ diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in index aec9905d1..d1d27cca4 100644 --- a/man/cupsd.conf.man.in +++ b/man/cupsd.conf.man.in @@ -3,7 +3,7 @@ .\" .\" cupsd.conf man page for CUPS. .\" -.\" Copyright 2007-2011 by Apple Inc. +.\" Copyright 2007-2012 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" "3 November 2011" "Apple Inc." +.TH cupsd.conf 5 "CUPS" "6 January 2012" "Apple Inc." .SH NAME cupsd.conf \- server configuration file for cups .SH DESCRIPTION @@ -250,6 +250,11 @@ Group group-name-or-number Specifies the group name or ID that will be used when executing external programs. .TP 5 +GSSServiceName name +.br +Specifies the service name when using Kerberos authentication. The default +service name is "@CUPS_DEFAULT_GSSSERVICENAME@". +.TP 5 HostNameLookups On .TP 5 HostNameLookups Off @@ -393,6 +398,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 |