merge from 3.0

(This used to be commit fa0d4ea150e0243958273168eaf9bf195e2c12e0)

diff --git a/docs/docbook/smbdotconf/locking/strictlocking.xml b/docs/docbook/smbdotconf/locking/strictlocking.xml
index 34c1c7fe5e2bb0199a3aeca32721e060e5c6d3ec..a13b4d52a1cae65ef2bf3dc3d3d2eb724c694402 100644 (file)
--- 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>