upstream commit

Mention ServerAliveTimeout in context of TCPKeepAlives;
prompted by Christoph Anton Mitterer via github

OpenBSD-Commit-ID: f0cf1b5bd3f1fbf41d71c88d75d93afc1c880ca2

1 files changed, 4 insertions, 1 deletions

diff --git a/ssh_config.5 b/ssh_config.5
index 77450080c..27c649fab 100644
--- a/ssh_config.5
+++ b/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