[openssh-commits] [openssh] 03/04: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 75e21688f523799c9e0cc6601d76a9c5ca79f787
Author: markus at openbsd.org <markus at openbsd.org>
Date:   Wed May 4 14:32:26 2016 +0000

    upstream commit
    
    add IdentityAgent; noticed & ok jmc@
    
    Upstream-ID: 4ba9034b00a4cf1beae627f0728da897802df88a
---
 scp.1  | 5 +++--
 sftp.1 | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/scp.1 b/scp.1
index 54ea352..0141f0d 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 edc5a85..7caf476 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

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.