Author: jra
Date: 2006-04-17 22:35:57 +0000 (Mon, 17 Apr 2006)
New Revision: 936

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-docs&rev=936

Log:
Document default change from "yes" to "auto".
Jeremy.

Modified:
   trunk/smbdotconf/locking/strictlocking.xml


Changeset:
Modified: trunk/smbdotconf/locking/strictlocking.xml
===================================================================
--- trunk/smbdotconf/locking/strictlocking.xml  2006-04-03 10:08:54 UTC (rev 
935)
+++ trunk/smbdotconf/locking/strictlocking.xml  2006-04-17 22:35:57 UTC (rev 
936)
@@ -1,22 +1,29 @@
 <samba:parameter name="strict locking"
                  context="S"
-                                type="boolean"
+                                type="enum"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc";>
 <description>
        <para>
-       This is a boolean that controls the handling of file locking in the 
server. When this is set to <constant>yes</constant>,
+       This is an enumberated type that controls the handling of file locking 
in the server. When this is set to <constant>yes</constant>,
        the server will check every read and write access for file locks, and 
deny access if locks exist. This can be slow on 
        some systems.
        </para>
 
        <para>
+       When strict locking is set to Auto (the default), the server performs 
file lock checks only on non-oplocked files.
+       As most Windows redirectors perform file locking checks locally on 
oplocked files this is a good trade off for
+       inproved performance.
+       </para>
+
+       <para>
        When strict locking is disabled, the server performs file lock checks 
only when the client explicitly asks for them.
        </para>
 
        <para>
        Well-behaved clients always ask for lock checks when it is important.  
So in the vast majority of cases, 
+       <command moreinfo="none">strict locking = Auto</command> or
        <command moreinfo="none">strict locking = no</command> is acceptable.
        </para>
 </description>
-<value type="default">yes</value>
+<value type="default">Auto</value>
 </samba:parameter>

Reply via email to