mirrors/openssh
0
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-11-23 18:23:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

upstream commit

Browse Source 
restore mistakenly deleted description of the
ConnectionAttempts option ok markus@

Upstream-ID: 943002b1b7c470caea3253ba7b7348c359de0348
This commit is contained in:
naddy@openbsd.org 2017-05-03 21:49:18 +00:00 committed by Damien Miller
parent 768405fddf
commit 9a82e24b98
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scp.1
View File

@ -8,9 +8,9 @@
.\" .\"
.\" Created: Sun May 7 00:14:37 1995 ylo .\" 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 .Dt SCP 1
.Os .Os
.Sh NAME .Sh NAME
@ -130,6 +130,7 @@ For full details of the options listed below, and their possible values, see
.It CheckHostIP .It CheckHostIP
.It Ciphers .It Ciphers
.It Compression .It Compression
.It ConnectionAttempts
.It ConnectTimeout .It ConnectTimeout
.It ControlMaster .It ControlMaster
.It ControlPath .It ControlPath

3
sftp.1
View File

@ -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. .\" 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 CheckHostIP
.It Ciphers .It Ciphers
.It Compression .It Compression
.It ConnectionAttempts
.It ConnectTimeout .It ConnectTimeout
.It ControlMaster .It ControlMaster
.It ControlPath .It ControlPath

3
ssh.1
View File

@ -33,7 +33,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" 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 $ .Dd $Mdocdate: May 3 2017 $
.Dt SSH 1 .Dt SSH 1
.Os .Os
@ -469,6 +469,7 @@ For full details of the options listed below, and their possible values, see
.It Ciphers .It Ciphers
.It ClearAllForwardings .It ClearAllForwardings
.It Compression .It Compression
.It ConnectionAttempts
.It ConnectTimeout .It ConnectTimeout
.It ControlMaster .It ControlMaster
.It ControlPath .It ControlPath

7
ssh_config.5
View File

@ -33,7 +33,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" 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 $ .Dd $Mdocdate: May 3 2017 $
.Dt SSH_CONFIG 5 .Dt SSH_CONFIG 5
.Os .Os
@ -455,6 +455,11 @@ The argument must be
or or
.Cm no .Cm no
(the default). (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 .It Cm ConnectTimeout
Specifies the timeout (in seconds) used when connecting to the Specifies the timeout (in seconds) used when connecting to the
SSH server, instead of using the default system TCP timeout. SSH server, instead of using the default system TCP timeout.