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

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

diff --git a/doc/help/ref-client-conf.html b/doc/help/ref-client-conf.html
index 0229b004004d7b397ce5c8401a033d834fdfd853..5b4e7e772c95bc5ae857d7148bee898fcacdb5d5 100644 (file)
--- a/doc/help/ref-client-conf.html
+++ b/doc/help/ref-client-conf.html
@@ -34,6 +34,20 @@ encryption settings for the client.</P>
 <P>The default setting is <VAR>IfRequested</VAR>.</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>http</CODE> for compatibility with Microsoft Windows.</P>
+
+
 <H2 CLASS="title"><A NAME="ServerName">ServerName</A></H2>
 
 <H3>Examples</H3>
@@ -52,5 +66,10 @@ ServerName foo.bar.com:8631
 
 <P>The default is to use the local server ("<VAR>localhost</VAR>") or domain socket, if so configured.</P>
 
+<BLOCKQUOTE><B>Note:</B>
+<P>Only one <CODE>ServerName</CODE> directive may appear. If multiple names are
+present, only the last one is used. This directive is not supported on Mac OS X 10.7 or later.</P>
+</BLOCKQUOTE>
+
 </BODY>
 </HTML>