From owner-svn-src-all@FreeBSD.ORG  Fri Jan 14 13:35:55 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6AE4E1065697;
	Fri, 14 Jan 2011 13:35:55 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 59D4D8FC0C;
	Fri, 14 Jan 2011 13:35:55 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0EDZtXK089540;
	Fri, 14 Jan 2011 13:35:55 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0EDZtJ6089538;
	Fri, 14 Jan 2011 13:35:55 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201101141335.p0EDZtJ6089538@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Fri, 14 Jan 2011 13:35:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217402 - stable/7/share/man/man4
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Jan 2011 13:35:55 -0000

Author: bz
Date: Fri Jan 14 13:35:55 2011
New Revision: 217402
URL: http://svn.freebsd.org/changeset/base/217402

Log:
  MFC r217135:
  
    Clarify when we switch from keepidle to keepinvtl intervals if sending
    TCP keepalive probes is enabled.

Modified:
  stable/7/share/man/man4/tcp.4
Directory Properties:
  stable/7/share/man/man4/   (props changed)

Modified: stable/7/share/man/man4/tcp.4
==============================================================================
--- stable/7/share/man/man4/tcp.4	Fri Jan 14 13:34:56 2011	(r217401)
+++ stable/7/share/man/man4/tcp.4	Fri Jan 14 13:35:55 2011	(r217402)
@@ -32,7 +32,7 @@
 .\"     From: @(#)tcp.4	8.1 (Berkeley) 6/5/93
 .\" $FreeBSD$
 .\"
-.Dd February 28, 2007
+.Dd January 8, 2011
 .Dt TCP 4
 .Os
 .Sh NAME
@@ -289,7 +289,9 @@ Amount of time, in milliseconds, that th
 before keepalive probes (if enabled) are sent.
 .It Va keepintvl
 The interval, in milliseconds, between keepalive probes sent to remote
-machines.
+machines, when no response is received on a
+.Va keepidle
+probe.
 After
 .Dv TCPTV_KEEPCNT
 (default 8) probes are sent, with no response, the connection is dropped.