Load cups into easysw/current.

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

diff --git a/doc/help/ref-cupsd-conf.html b/doc/help/ref-cupsd-conf.html
index c3d78660181e00cfc997cfba48523716aa81b825..8e07d06200eb3b810414111742de3434eb89e7da 100644 (file)
--- a/doc/help/ref-cupsd-conf.html
+++ b/doc/help/ref-cupsd-conf.html
@@ -139,7 +139,10 @@ specifies a CIDR netmask, as shown in Table 1.</P>
 
 <P>The <CODE>@LOCAL</CODE> name will allow access from all local
 interfaces. The <CODE>@IF(name)</CODE> name will allow access
-from the named interface.</P>
+from the named interface. In both cases, CUPS only allows access
+from the network that the interface(s) are configured for -
+requests  arriving on the interface from a foreign network will
+<em>not</em> be accepted.</P>
 
 <P>The <CODE>Allow</CODE> directive must appear inside a <A
 HREF="#Location"><CODE>Location</CODE></A> or <A
@@ -233,6 +236,7 @@ HREF="#Require"><CODE>Require</CODE></A> directive instead.</P>
   AuthType Basic
   AuthType Digest
   AuthType BasicDigest
+  AuthType Negotiate
 &lt;/Location&gt;
 </PRE>
 
@@ -257,12 +261,15 @@ authentication to perform:</P>
        should be performed using the
        <VAR>/etc/cups/passwd.md5</VAR> file</LI>
 
+       <LI><CODE>Negotiate</CODE> - Kerberos authentication
+       should be performed</LI>
+
 </UL>
 
-<P>When using <CODE>Basic</CODE>, <CODE>Digest</CODE>, or
-<CODE>BasicDigest</CODE> authentication, clients connecting
-through the <CODE>localhost</CODE> interface can also
-authenticate using certificates.</P>
+<P>When using <CODE>Basic</CODE>, <CODE>Digest</CODE>,
+<CODE>BasicDigest</CODE>, or <CODE>Negotiate</CODE> authentication,
+clients connecting through the <CODE>localhost</CODE> interface can
+also authenticate using certificates.</P>
 
 <P>The <CODE>AuthType</CODE> directive must appear inside a <A
 HREF="#Location"><CODE>Location</CODE></A> or <A
@@ -353,7 +360,10 @@ or bit count.</P>
 
 <P>The <CODE>@LOCAL</CODE> name will allow browse data from all
 local interfaces. The <CODE>@IF(name)</CODE> name will allow
-browse data from the named interface.</P>
+browse data from the named interface. In both cases, CUPS only
+allows data from the network that the interface(s) are configured
+for - data arriving on the interface from a foreign network will
+<em>not</em> be allowed.</P>
 
 
 <H2 CLASS="title"><A NAME="BrowseDeny">BrowseDeny</A></H2>
@@ -388,7 +398,10 @@ or bit count.</P>
 
 <P>The <CODE>@LOCAL</CODE> name will block browse data from all
 local interfaces. The <CODE>@IF(name)</CODE> name will block
-browse data from the named interface.</P>
+browse data from the named interface. In both cases, CUPS only
+blocks data from the network that the interface(s) are configured
+for - data arriving on the interface from a foreign network will
+<em>not</em> be blocked.</P>
 
 
 <H2 CLASS="title"><A NAME="BrowseInterval">BrowseInterval</A></H2>
@@ -847,6 +860,7 @@ for data files.</P>
 DefaultAuthType Basic
 DefaultAuthType BasicDigest
 DefaultAuthType Digest
+DefaultAuthType Negotiate
 </PRE>
 
 <H3>Description</H3>
@@ -929,6 +943,22 @@ policy to use for IPP operation. The default is
 <CODE>default</CODE>.</P>
 
 
+<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.2</SPAN><A NAME="DefaultShared">DefaultShared</A></H2>
+
+<H3>Examples</H3>
+
+<PRE CLASS="command">
+DefaultShared yes
+DefaultShared no
+</PRE>
+
+<H3>Description</H3>
+
+<P>The <CODE>DefaultShared</CODE> directive specifies whether
+printers are shared (published) by default. The default is
+<CODE>yes</CODE>.</P>
+
+
 <H2 CLASS="title"><A NAME="Deny">Deny</A></H2>
 
 <H3>Examples</H3>
@@ -965,7 +995,10 @@ specifies a CIDR netmask, a shown in <A HREF="TABLE1">Table
 
 <P>The <CODE>@LOCAL</CODE> name will deny access from all local
 interfaces. The <CODE>@IF(name)</CODE> name will deny access from
-the named interface.</P>
+the named interface. In both cases, CUPS only denies access from
+the network that the interface(s) are configured for - requests
+arriving on the interface from a foreign network will
+<em>not</em> be denied.</P>
 
 <P>The <CODE>Deny</CODE> directive must appear inside a <A
 HREF="#Location"><CODE>Location</CODE></A> or <A
@@ -1156,6 +1189,20 @@ system-specific but is usually <CODE>lp</CODE> or
 <CODE>nobody</CODE>.</P>
 
 
+<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.3</SPAN><A NAME="GSSServiceName">GSSServiceName</A></H2>
+
+<H3>Examples</H3>
+
+<PRE CLASS="command">
+GSSServiceName IPP
+GSSServiceName HTTP
+</PRE>
+
+<H3>Description</H3>
+
+<P>The <CODE>GSSServiceName</CODE> directive specifies the Kerberos service name that is used when passing authorization tickets. The default name is <CODE>IPP</CODE>.</P>
+
+
 <H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.10</SPAN><A NAME="HideImplicitMembers">HideImplicitMembers</A></H2>
 
 <H3>Examples</H3>
@@ -1883,7 +1930,7 @@ are still pending or active then the new job will be
 rejected.</P>
 
 <P>Setting the maximum size to 0 disables this functionality. The
-default setting is 0.</P>
+default setting is 500.</P>
 
 
 <H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.7</SPAN><A NAME="MaxJobsPerPrinter">MaxJobsPerPrinter</A></H2>
@@ -2451,7 +2498,7 @@ encrypted connections.</P>
 <VAR>/etc/cups/ssl/server.crt</VAR>.</P>
 
 
-<H2 CLASS="title"><A NAME="ServerName"></A>ServerName</H2>
+<H2 CLASS="title"><A NAME="ServerName">ServerName</A></H2>
 
 <H3>Examples</H3>
 
@@ -2667,6 +2714,28 @@ to wait before an active HTTP or IPP request times out. The
 default timeout is 300 seconds.</P>
 
 
+<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.2</SPAN><A NAME="UseNetworkDefault">UseNetworkDefault</A></H2>
+
+<H3>Examples</H3>
+
+<PRE CLASS="command">
+UseNetworkDefault yes
+UseNetworkDefault no
+</PRE>
+
+<H3>Description</H3>
+
+<P>The <CODE>UseNetworkDefault</CODE> directive controls whether
+the client will use a network/remote printer as a default
+printer. If enabled, the default printer of a server is used as
+the default printer on a client. When multiple servers are
+advertising a default printer, the client's default printer is
+set to the first discovered printer, or to the implicit class for
+the same printer available from multiple servers.</P>
+
+<P>The default is <CODE>yes</CODE>.</P>
+
+
 <H2 CLASS="title"><A NAME="User">User</A></H2>
 
 <H3>Examples</H3>