Merge changes from CUPS 1.6svn-r10188, including changes for <rdar://problem/10127258...

[thirdparty/cups.git] / doc / help / ref-cupsd-conf.html.in

diff --git a/doc/help/ref-cupsd-conf.html.in b/doc/help/ref-cupsd-conf.html.in
index 36f694a3245b23bf3a261b6a65937d093951c2da..b2027c93c0b274c67b92aadc9714cc9d699b1216 100644 (file)
--- a/doc/help/ref-cupsd-conf.html.in
+++ b/doc/help/ref-cupsd-conf.html.in
@@ -914,6 +914,20 @@ system-specific but is usually <CODE>lp</CODE> or
 <CODE>nobody</CODE>.</P>
 
 
+<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.6</SPAN><A NAME="GSSServiceName">GSSServiceName</A></H2>
+
+<H3>Examples</H3>
+
+<PRE CLASS="command">
+GSSServiceName http
+GSSServiceName ipp
+</PRE>
+
+<H3>Description</H3>
+
+<P>The <CODE>GSSServiceName</CODE> directive sets the Kerberos service name to use. The default is <CODE>@CUPS_DEFAULT_GSSSERVICE_NAME@</CODE> for compatibility with Microsoft Windows.</P>
+
+
 <H2 CLASS="title"><A NAME="HostNameLookups">HostNameLookups</A></H2>
 
 <H3>Examples</H3>
@@ -1724,6 +1738,25 @@ active jobs is completed, stopped, aborted, or canceled.</P>
 default setting is 0.</P>
 
 
+<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.6</SPAN><A NAME="MaxJobTime">MaxJobTime</A></H2>
+
+<H3>Examples</H3>
+
+<PRE CLASS="command">
+MaxJobTime 10800
+MaxJobTime 0
+</PRE>
+
+<H3>Description</H3>
+
+<P>The <CODE>MaxJobTime</CODE> directive controls the maximum number of
+seconds allowed for a job to complete printing before it is considered "stuck".
+The job is canceled automatically if it takes longer than the specified number of seconds to complete.</P>
+
+<p>Setting the maximum time to 0 disables this functionality. The default
+setting is 10800 seconds (3 hours).</P>
+
+
 <H2 CLASS="title"><A NAME="MaxLogSize">MaxLogSize</A></H2>
 
 <H3>Examples</H3>