upstream commit

restore mistakenly deleted description of the
ConnectionAttempts option ok markus@

Upstream-ID: 943002b1b7c470caea3253ba7b7348c359de0348

diff --git a/scp.1 b/scp.1
index 9b5229ab17e69eeee86dfa934feb2379748ee82b..76ce3336127314365445630646af062c90e9e1ff 100644 (file)
--- a/scp.1
+++ b/scp.1
@@ -8,9 +8,9 @@
 .\"
 .\" Created: Sun May  7 00:14:37 1995 ylo
 .\"
-.\" $OpenBSD: scp.1,v 1.73 2017/05/02 13:44:51 jmc Exp $
+.\" $OpenBSD: scp.1,v 1.74 2017/05/03 21:49:18 naddy Exp $
 .\"
-.Dd $Mdocdate: May 2 2017 $
+.Dd $Mdocdate: May 3 2017 $
 .Dt SCP 1
 .Os
 .Sh NAME
@@ -130,6 +130,7 @@ For full details of the options listed below, and their possible values, see
 .It CheckHostIP
 .It Ciphers
 .It Compression
+.It ConnectionAttempts
 .It ConnectTimeout
 .It ControlMaster
 .It ControlPath

diff --git a/sftp.1 b/sftp.1
index 5dce807f62109fc64c006ffd980b172a326ee71c..c218376fbf0ccd0b337b7d49cd78685a68efa2bc 100644 (file)
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.109 2017/05/03 06:32:02 jmc Exp $
+.\" $OpenBSD: sftp.1,v 1.110 2017/05/03 21:49:18 naddy Exp $
 .\"
 .\" Copyright (c) 2001 Damien Miller.  All rights reserved.
 .\"
@@ -199,6 +199,7 @@ For full details of the options listed below, and their possible values, see
 .It CheckHostIP
 .It Ciphers
 .It Compression
+.It ConnectionAttempts
 .It ConnectTimeout
 .It ControlMaster
 .It ControlPath

diff --git a/ssh.1 b/ssh.1
index b9a85aff92b6db38f3249237180cb9e5b2b63ea3..1c5ad7417ed324d1f3c4a5d0b15e0a6ca3f77b2b 100644 (file)
--- a/ssh.1
+++ b/ssh.1
@@ -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.1,v 1.379 2017/05/03 06:32:02 jmc Exp $
+.\" $OpenBSD: ssh.1,v 1.380 2017/05/03 21:49:18 naddy Exp $
 .Dd $Mdocdate: May 3 2017 $
 .Dt SSH 1
 .Os
@@ -469,6 +469,7 @@ For full details of the options listed below, and their possible values, see
 .It Ciphers
 .It ClearAllForwardings
 .It Compression
+.It ConnectionAttempts
 .It ConnectTimeout
 .It ControlMaster
 .It ControlPath

diff --git a/ssh_config.5 b/ssh_config.5
index e8e51d2cbb68ae35e9fa9ee68d62b616a273f667..68fd028e5b2e0a05c11bfe550bb14cd4607ce27f 100644 (file)
--- 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.246 2017/05/03 21:08:09 naddy Exp $
+.\" $OpenBSD: ssh_config.5,v 1.247 2017/05/03 21:49:18 naddy Exp $
 .Dd $Mdocdate: May 3 2017 $
 .Dt SSH_CONFIG 5
 .Os
@@ -455,6 +455,11 @@ The argument must be
 or
 .Cm no
 (the default).
+.It Cm ConnectionAttempts
+Specifies the number of tries (one per second) to make before exiting.
+The argument must be an integer.
+This may be useful in scripts if the connection sometimes fails.
+The default is 1.
 .It Cm ConnectTimeout
 Specifies the timeout (in seconds) used when connecting to the
 SSH server, instead of using the default system TCP timeout.