summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkus@openbsd.org <markus@openbsd.org>2016-05-04 14:32:26 +0000
committerDamien Miller <djm@mindrot.org>2016-05-19 17:48:36 +1000
commit75e21688f523799c9e0cc6601d76a9c5ca79f787 (patch)
treec31b0c3d1685a0ddb93c7b093ab0b5c8bb869edb
parent1a75d14daf4b60db903e6103cf50e74e0cd0a76b (diff)
downloadopenssh-git-75e21688f523799c9e0cc6601d76a9c5ca79f787.tar.gz
upstream commit
add IdentityAgent; noticed & ok jmc@ Upstream-ID: 4ba9034b00a4cf1beae627f0728da897802df88a
-rw-r--r--scp.15
-rw-r--r--sftp.15
2 files changed, 6 insertions, 4 deletions
diff --git a/scp.1 b/scp.1
index 54ea352c..0141f0d9 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.68 2015/09/25 18:19:54 jmc Exp $
+.\" $OpenBSD: scp.1,v 1.69 2016/05/04 14:32:26 markus Exp $
.\"
-.Dd $Mdocdate: September 25 2015 $
+.Dd $Mdocdate: May 4 2016 $
.Dt SCP 1
.Os
.Sh NAME
@@ -155,6 +155,7 @@ For full details of the options listed below, and their possible values, see
.It HostKeyAlgorithms
.It HostKeyAlias
.It HostName
+.It IdentityAgent
.It IdentityFile
.It IdentitiesOnly
.It IPQoS
diff --git a/sftp.1 b/sftp.1
index edc5a85e..7caf476a 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.102 2015/09/25 18:19:54 jmc Exp $
+.\" $OpenBSD: sftp.1,v 1.103 2016/05/04 14:32:26 markus Exp $
.\"
.\" Copyright (c) 2001 Damien Miller. All rights reserved.
.\"
@@ -22,7 +22,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.
.\"
-.Dd $Mdocdate: September 25 2015 $
+.Dd $Mdocdate: May 4 2016 $
.Dt SFTP 1
.Os
.Sh NAME
@@ -220,6 +220,7 @@ For full details of the options listed below, and their possible values, see
.It HostKeyAlgorithms
.It HostKeyAlias
.It HostName
+.It IdentityAgent
.It IdentityFile
.It IdentitiesOnly
.It IPQoS