From dd86620394677ae51db1f9edbed8236d82da2b3d Mon Sep 17 00:00:00 2001
From: djm <djm@openbsd.org>
Date: Sat, 10 Feb 2018 09:03:54 +0000
Subject: [PATCH] Mention ServerAliveTimeout in context of TCPKeepAlives;
 prompted by Christoph Anton Mitterer via github

---
 usr.bin/ssh/ssh_config.5 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usr.bin/ssh/ssh_config.5 b/usr.bin/ssh/ssh_config.5
index 77450080cc4..27c649fab26 100644
--- a/usr.bin/ssh/ssh_config.5
+++ b/usr.bin/ssh/ssh_config.5
@@ -33,7 +33,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh_config.5,v 1.264 2018/02/10 06:40:28 djm Exp $
+.\" $OpenBSD: ssh_config.5,v 1.265 2018/02/10 09:03:54 djm Exp $
 .Dd $Mdocdate: February 10 2018 $
 .Dt SSH_CONFIG 5
 .Os
@@ -1507,6 +1507,9 @@ This is important in scripts, and many users want it too.
 .Pp
 To disable TCP keepalive messages, the value should be set to
 .Cm no .
+See also
+.Cm ServerAliveInterval
+for protocol-level keepalives.
 .It Cm Tunnel
 Request
 .Xr tun 4
-- 
2.20.1