[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  e0b924b Note that "keepalive" only applies to SMB1 connections.
      from  dc3ace6 Fix the waf build with the new "cleans up stale processes" test.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit e0b924b6d544dc243362fa856452590deddc5532
Author: Jeremy Allison <jra at samba.org>
Date:   Thu May 17 14:54:03 2012 -0700

    Note that "keepalive" only applies to SMB1 connections.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Fri May 18 02:59:34 CEST 2012 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/smbdotconf/tuning/keepalive.xml |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/tuning/keepalive.xml b/docs-xml/smbdotconf/tuning/keepalive.xml
index 0586365..5dba4f6 100644
--- a/docs-xml/smbdotconf/tuning/keepalive.xml
+++ b/docs-xml/smbdotconf/tuning/keepalive.xml
@@ -13,6 +13,9 @@
     <para>Keepalives should, in general, not be needed if the socket 
     has the SO_KEEPALIVE attribute set on it by default. (see <smbconfoption name="socket options"/>). 
 Basically you should only use this option if you strike difficulties.</para>
+
+    <para>Please note this option only applies to SMB1 client connections, and
+    has no effect on SMB2 clients.</para>
 </description>
 
 <value type="default">300</value>


-- 
Samba Shared Repository