diff options
Diffstat (limited to 'ssh_config.5')
-rw-r--r-- | ssh_config.5 | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index 15b36f273..d0ea33918 100644 --- a/ssh_config.5 +++ b/ssh_config.5 | |||
@@ -364,9 +364,10 @@ identities will be tried in sequence. | |||
364 | Specifies whether the system should send TCP keepalive messages to the | 364 | Specifies whether the system should send TCP keepalive messages to the |
365 | other side. | 365 | other side. |
366 | If they are sent, death of the connection or crash of one | 366 | If they are sent, death of the connection or crash of one |
367 | of the machines will be properly noticed. This option only uses TCP | 367 | of the machines will be properly noticed. |
368 | keepalives (as opposed to using ssh level keepalives), so takes a long | 368 | This option only uses TCP keepalives (as opposed to using ssh level |
369 | time to notice when the connection dies. As such, you probably want | 369 | keepalives), so takes a long time to notice when the connection dies. |
370 | As such, you probably want | ||
370 | the | 371 | the |
371 | .Cm ProtocolKeepAlives | 372 | .Cm ProtocolKeepAlives |
372 | option as well. | 373 | option as well. |
@@ -471,9 +472,10 @@ tries version 2 and falls back to version 1 | |||
471 | if version 2 is not available. | 472 | if version 2 is not available. |
472 | .It Cm ProtocolKeepAlives | 473 | .It Cm ProtocolKeepAlives |
473 | Specifies the interval in seconds at which IGNORE packets will be sent to | 474 | Specifies the interval in seconds at which IGNORE packets will be sent to |
474 | the server during idle periods. Use this option in scripts to detect | 475 | the server during idle periods. |
475 | when the network fails. The argument must be an integer. The default | 476 | Use this option in scripts to detect when the network fails. |
476 | is 0 (disabled), or 300 if the | 477 | The argument must be an integer. |
478 | The default is 0 (disabled), or 300 if the | ||
477 | .Cm BatchMode | 479 | .Cm BatchMode |
478 | option is set. | 480 | option is set. |
479 | .It Cm ProxyCommand | 481 | .It Cm ProxyCommand |
@@ -571,13 +573,16 @@ Note that this option applies to protocol version 1 only. | |||
571 | Normally, | 573 | Normally, |
572 | .Nm ssh | 574 | .Nm ssh |
573 | blocks indefinitely whilst waiting to receive the ssh banner and other | 575 | blocks indefinitely whilst waiting to receive the ssh banner and other |
574 | setup protocol from the server, during the session setup. This can cause | 576 | setup protocol from the server, during the session setup. |
577 | This can cause | ||
575 | .Nm ssh | 578 | .Nm ssh |
576 | to hang under certain circumstances. If this option is set, | 579 | to hang under certain circumstances. |
580 | If this option is set, | ||
577 | .Nm ssh | 581 | .Nm ssh |
578 | will give up if no data from the server is received for the specified | 582 | will give up if no data from the server is received for the specified |
579 | number of seconds. The argument must be an integer. The default is 0 | 583 | number of seconds. |
580 | (disabled), or 300 if | 584 | The argument must be an integer. |
585 | The default is 0 (disabled), or 300 if | ||
581 | .Cm BatchMode | 586 | .Cm BatchMode |
582 | is set. | 587 | is set. |
583 | .It Cm SmartcardDevice | 588 | .It Cm SmartcardDevice |