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 | |
parent | 768405fddf64ff83aa6ef701ebb3c1f82d98a2f3 (diff) |
upstream commit
restore mistakenly deleted description of the
ConnectionAttempts option ok markus@
Upstream-ID: 943002b1b7c470caea3253ba7b7348c359de0348
-rw-r--r-- | scp.1 | 5 | ||||
-rw-r--r-- | sftp.1 | 3 | ||||
-rw-r--r-- | ssh.1 | 3 | ||||
-rw-r--r-- | ssh_config.5 | 7 |
4 files changed, 13 insertions, 5 deletions
@@ -8,9 +8,9 @@ | |||
8 | .\" | 8 | .\" |
9 | .\" Created: Sun May 7 00:14:37 1995 ylo | 9 | .\" Created: Sun May 7 00:14:37 1995 ylo |
10 | .\" | 10 | .\" |
11 | .\" $OpenBSD: scp.1,v 1.73 2017/05/02 13:44:51 jmc Exp $ | 11 | .\" $OpenBSD: scp.1,v 1.74 2017/05/03 21:49:18 naddy Exp $ |
12 | .\" | 12 | .\" |
13 | .Dd $Mdocdate: May 2 2017 $ | 13 | .Dd $Mdocdate: May 3 2017 $ |
14 | .Dt SCP 1 | 14 | .Dt SCP 1 |
15 | .Os | 15 | .Os |
16 | .Sh NAME | 16 | .Sh NAME |
@@ -130,6 +130,7 @@ For full details of the options listed below, and their possible values, see | |||
130 | .It CheckHostIP | 130 | .It CheckHostIP |
131 | .It Ciphers | 131 | .It Ciphers |
132 | .It Compression | 132 | .It Compression |
133 | .It ConnectionAttempts | ||
133 | .It ConnectTimeout | 134 | .It ConnectTimeout |
134 | .It ControlMaster | 135 | .It ControlMaster |
135 | .It ControlPath | 136 | .It ControlPath |
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: sftp.1,v 1.109 2017/05/03 06:32:02 jmc Exp $ | 1 | .\" $OpenBSD: sftp.1,v 1.110 2017/05/03 21:49:18 naddy Exp $ |
2 | .\" | 2 | .\" |
3 | .\" Copyright (c) 2001 Damien Miller. All rights reserved. | 3 | .\" Copyright (c) 2001 Damien Miller. All rights reserved. |
4 | .\" | 4 | .\" |
@@ -199,6 +199,7 @@ For full details of the options listed below, and their possible values, see | |||
199 | .It CheckHostIP | 199 | .It CheckHostIP |
200 | .It Ciphers | 200 | .It Ciphers |
201 | .It Compression | 201 | .It Compression |
202 | .It ConnectionAttempts | ||
202 | .It ConnectTimeout | 203 | .It ConnectTimeout |
203 | .It ControlMaster | 204 | .It ControlMaster |
204 | .It ControlPath | 205 | .It ControlPath |
@@ -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.1,v 1.379 2017/05/03 06:32:02 jmc Exp $ | 36 | .\" $OpenBSD: ssh.1,v 1.380 2017/05/03 21:49:18 naddy Exp $ |
37 | .Dd $Mdocdate: May 3 2017 $ | 37 | .Dd $Mdocdate: May 3 2017 $ |
38 | .Dt SSH 1 | 38 | .Dt SSH 1 |
39 | .Os | 39 | .Os |
@@ -469,6 +469,7 @@ For full details of the options listed below, and their possible values, see | |||
469 | .It Ciphers | 469 | .It Ciphers |
470 | .It ClearAllForwardings | 470 | .It ClearAllForwardings |
471 | .It Compression | 471 | .It Compression |
472 | .It ConnectionAttempts | ||
472 | .It ConnectTimeout | 473 | .It ConnectTimeout |
473 | .It ControlMaster | 474 | .It ControlMaster |
474 | .It ControlPath | 475 | .It ControlPath |
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. |