diff options
author | djm@openbsd.org <djm@openbsd.org> | 2018-02-10 09:03:54 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-02-10 20:06:42 +1100 |
commit | a7c38215d564bf98e8e9eb40c1079e3adf686f15 (patch) | |
tree | b3e284b2ddf66bb340a7572ada5d15df292ba0c2 | |
parent | 62562ceae61e4f7cf896566592bb840216e71061 (diff) |
upstream commit
Mention ServerAliveTimeout in context of TCPKeepAlives;
prompted by Christoph Anton Mitterer via github
OpenBSD-Commit-ID: f0cf1b5bd3f1fbf41d71c88d75d93afc1c880ca2
-rw-r--r-- | ssh_config.5 | 5 |
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 @@ | |||
33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
35 | .\" | 35 | .\" |
36 | .\" $OpenBSD: ssh_config.5,v 1.264 2018/02/10 06:40:28 djm Exp $ | 36 | .\" $OpenBSD: ssh_config.5,v 1.265 2018/02/10 09:03:54 djm Exp $ |
37 | .Dd $Mdocdate: February 10 2018 $ | 37 | .Dd $Mdocdate: February 10 2018 $ |
38 | .Dt SSH_CONFIG 5 | 38 | .Dt SSH_CONFIG 5 |
39 | .Os | 39 | .Os |
@@ -1507,6 +1507,9 @@ This is important in scripts, and many users want it too. | |||
1507 | .Pp | 1507 | .Pp |
1508 | To disable TCP keepalive messages, the value should be set to | 1508 | To disable TCP keepalive messages, the value should be set to |
1509 | .Cm no . | 1509 | .Cm no . |
1510 | See also | ||
1511 | .Cm ServerAliveInterval | ||
1512 | for protocol-level keepalives. | ||
1510 | .It Cm Tunnel | 1513 | .It Cm Tunnel |
1511 | Request | 1514 | Request |
1512 | .Xr tun 4 | 1515 | .Xr tun 4 |