summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2003-09-10 01:14:37 +0000
committerGerald Carter <jerry@samba.org>2003-09-10 01:14:37 +0000
commit6f5133aa825572d5b4e12d9c23f8040259798660 (patch)
tree003723edf2e1e3d535463a8c3ed0ac1d6bc95960
parent9a9031ec729f1ce6bd18e95bd726d4200dfd9500 (diff)
downloadsamba-6f5133aa825572d5b4e12d9c23f8040259798660.tar.gz
samba-6f5133aa825572d5b4e12d9c23f8040259798660.tar.bz2
samba-6f5133aa825572d5b4e12d9c23f8040259798660.zip
merge from 3.0
(This used to be commit fa0d4ea150e0243958273168eaf9bf195e2c12e0)
-rw-r--r--docs/docbook/smbdotconf/locking/strictlocking.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/docbook/smbdotconf/locking/strictlocking.xml b/docs/docbook/smbdotconf/locking/strictlocking.xml
index 34c1c7fe5e..a13b4d52a1 100644
--- a/docs/docbook/smbdotconf/locking/strictlocking.xml
+++ b/docs/docbook/smbdotconf/locking/strictlocking.xml
@@ -3,15 +3,15 @@
xmlns:samba="http://samba.org/common">
<listitem>
<para>This is a boolean that controls the handling of
- file locking in the server. When this is set to <constant>yes</constant>
+ 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 <constant>no</constant> the server does file
+ <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
+ is important. So in the vast majority of cases, <command moreinfo="none">strict
locking = no</command> is preferable.</para>
<para>Default: <command moreinfo="none">strict locking = no</command></para>