diff options
author | naddy@openbsd.org <naddy@openbsd.org> | 2017-05-03 21:49:18 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-05-08 09:18:27 +1000 |
commit | 9a82e24b986e3e0dc70849dbb2c19aa6c707b37f (patch) | |
tree | d4ba73f06fa74192831fc7b75d172b66b51ebb44 /ssh_config.5 | |
parent | 768405fddf64ff83aa6ef701ebb3c1f82d98a2f3 (diff) |
upstream commit
restore mistakenly deleted description of the
ConnectionAttempts option ok markus@
Upstream-ID: 943002b1b7c470caea3253ba7b7348c359de0348
Diffstat (limited to 'ssh_config.5')
-rw-r--r-- | ssh_config.5 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index e8e51d2cb..68fd028e5 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.246 2017/05/03 21:08:09 naddy Exp $ | 36 | .\" $OpenBSD: ssh_config.5,v 1.247 2017/05/03 21:49:18 naddy Exp $ |
37 | .Dd $Mdocdate: May 3 2017 $ | 37 | .Dd $Mdocdate: May 3 2017 $ |
38 | .Dt SSH_CONFIG 5 | 38 | .Dt SSH_CONFIG 5 |
39 | .Os | 39 | .Os |
@@ -455,6 +455,11 @@ The argument must be | |||
455 | or | 455 | or |
456 | .Cm no | 456 | .Cm no |
457 | (the default). | 457 | (the default). |
458 | .It Cm ConnectionAttempts | ||
459 | Specifies the number of tries (one per second) to make before exiting. | ||
460 | The argument must be an integer. | ||
461 | This may be useful in scripts if the connection sometimes fails. | ||
462 | The default is 1. | ||
458 | .It Cm ConnectTimeout | 463 | .It Cm ConnectTimeout |
459 | Specifies the timeout (in seconds) used when connecting to the | 464 | Specifies the timeout (in seconds) used when connecting to the |
460 | SSH server, instead of using the default system TCP timeout. | 465 | SSH server, instead of using the default system TCP timeout. |