From f2f6c315a920a256937e1b6a3702757f3195a592 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Wed, 21 Aug 2013 02:44:58 +1000
Subject:    - jmc@cvs.openbsd.org 2013/08/20 06:56:07      [ssh.1
 ssh_config.5]      some proxyusefdpass tweaks;

---
 ChangeLog    | 3 +++
 ssh.1        | 5 +++--
 ssh_config.5 | 6 +++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6b0afa72..e39f68a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -58,6 +58,9 @@
      rather than have to shuffle data back and forth and enables ssh to use
      getpeername, etc. to obtain address information just like it does with
      regular directly-connected sockets. ok markus@
+   - jmc@cvs.openbsd.org 2013/08/20 06:56:07
+     [ssh.1 ssh_config.5]
+     some proxyusefdpass tweaks;
 
 20130808
  - (dtucker) [regress/Makefile regress/test-exec.sh] Don't try to use test -nt
diff --git a/ssh.1 b/ssh.1
index 09c9dbcb..22765401 100644
--- a/ssh.1
+++ b/ssh.1
@@ -33,8 +33,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh.1,v 1.335 2013/08/14 08:39:27 jmc Exp $
-.Dd $Mdocdate: August 14 2013 $
+.\" $OpenBSD: ssh.1,v 1.336 2013/08/20 06:56:07 jmc Exp $
+.Dd $Mdocdate: August 20 2013 $
 .Dt SSH 1
 .Os
 .Sh NAME
@@ -465,6 +465,7 @@ For full details of the options listed below, and their possible values, see
 .It PreferredAuthentications
 .It Protocol
 .It ProxyCommand
+.It ProxyUseFdpass
 .It PubkeyAuthentication
 .It RekeyLimit
 .It RemoteForward
diff --git a/ssh_config.5 b/ssh_config.5
index e89d694c..9ddd6b8a 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,7 +33,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.
 .\"
-.\" $OpenBSD: ssh_config.5,v 1.167 2013/08/20 00:11:38 djm Exp $
+.\" $OpenBSD: ssh_config.5,v 1.168 2013/08/20 06:56:07 jmc Exp $
 .Dd $Mdocdate: August 20 2013 $
 .Dt SSH_CONFIG 5
 .Os
@@ -938,10 +938,10 @@ For example, the following directive would connect via an HTTP proxy at
 ProxyCommand /usr/bin/nc -X connect -x 192.0.2.0:8080 %h %p
 .Ed
 .It Cm ProxyUseFdpass
-Specifies that the a
+Specifies that
 .Cm ProxyCommand
 will pass a connected file descriptor back to
-.Nm ssh
+.Xr ssh 1
 instead of continuing to execute and pass data.
 The default is
 .Dq no .
-- 
cgit v1.2.3