From: Jeremy Allison <jra@samba.org>
Date: Thu, 17 May 2012 21:54:03 +0000 (-0700)
Subject: Note that "keepalive" only applies to SMB1 connections.
X-Git-Tag: samba-4.0.0alpha21~85
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e0b924b6d544dc243362fa856452590deddc5532;p=thirdparty%2Fsamba.git

Note that "keepalive" only applies to SMB1 connections.

Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Fri May 18 02:59:34 CEST 2012 on sn-devel-104
---

diff --git a/docs-xml/smbdotconf/tuning/keepalive.xml b/docs-xml/smbdotconf/tuning/keepalive.xml
index 0586365512f..5dba4f6a28c 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>