summaryrefslogtreecommitdiff
path: root/scp.1
diff options
context:
space:
mode:
authornaddy@openbsd.org <naddy@openbsd.org>2017-05-03 21:49:18 +0000
committerDamien Miller <djm@mindrot.org>2017-05-08 09:18:27 +1000
commit9a82e24b986e3e0dc70849dbb2c19aa6c707b37f (patch)
treed4ba73f06fa74192831fc7b75d172b66b51ebb44 /scp.1
parent768405fddf64ff83aa6ef701ebb3c1f82d98a2f3 (diff)
downloadopenssh-git-9a82e24b986e3e0dc70849dbb2c19aa6c707b37f.tar.gz
upstream commit
restore mistakenly deleted description of the ConnectionAttempts option ok markus@ Upstream-ID: 943002b1b7c470caea3253ba7b7348c359de0348
Diffstat (limited to 'scp.1')
-rw-r--r--scp.15
1 files changed, 3 insertions, 2 deletions
diff --git a/scp.1 b/scp.1
index 9b5229ab..76ce3336 100644
--- 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