- stevesk@cvs.openbsd.org 2007/08/15 12:13:41

     [ssh_config.5]
     tun device forwarding now honours ExitOnForwardFailure; ok markus@

diff --git a/ChangeLog b/ChangeLog
index 924202e51c7af52b56297e80bbd9b85c16c826a9..4a4a594c0aadc7ac58303e6bd8a8ecfc840e0d39 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
    - markus@cvs.openbsd.org 2007/08/15 08:16:49
      [version.h]
      openssh 4.7
+   - stevesk@cvs.openbsd.org 2007/08/15 12:13:41
+     [ssh_config.5]
+     tun device forwarding now honours ExitOnForwardFailure; ok markus@
  - (dtucker) [openbsd-compat/bsd-cray.c] Remove debug from signal handler.
    ok djm@
  - (dtucker) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec

diff --git a/ssh_config.5 b/ssh_config.5
index b03d8b8b70c3bf79684abad38f3b566ebab8c5a2..772778e4c8e5c781c56949372d14802a988a8a97 100644 (file)
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -34,7 +34,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.101 2007/06/08 07:43:46 jmc Exp $
+.\" $OpenBSD: ssh_config.5,v 1.102 2007/08/15 12:13:41 stevesk Exp $
 .Dd $Mdocdate$
 .Dt SSH_CONFIG 5
 .Os
@@ -387,7 +387,7 @@ data).
 Specifies whether
 .Xr ssh 1
 should terminate the connection if it cannot set up all requested
-dynamic, local, and remote port forwardings.
+dynamic, tunnel, local, and remote port forwardings.
 The argument must be
 .Dq yes
 or