summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2018-02-10 09:03:55 +0000
committerDamien Miller <djm@cvs.openbsd.org>2018-02-10 09:03:55 +0000
commit51a97f481fd04195558704c8db38e5fb7bbabcef (patch)
tree4a16dfddd20a379c8d8acb4135da51f00e744952 /usr.bin
parentf597e33d9e476336d0df7f5880c28638ed8c1884 (diff)
Mention ServerAliveTimeout in context of TCPKeepAlives; prompted by
Christoph Anton Mitterer via github
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/ssh_config.55
1 files changed, 4 insertions, 1 deletions
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