upstream commit
Allow ExitOnForwardFailure and ClearAllForwardings to be
overridden when using ssh -W (but still default to yes in that case).
bz#2577, ok djm@.
Upstream-ID: 4b20c419e93ca11a861c81c284090cfabc8c54d4
diff --git a/ssh.1 b/ssh.1
index 9ed5a56..4c5ab21 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.371 2016/05/04 12:21:53 markus Exp $
-.Dd $Mdocdate: May 4 2016 $
+.\" $OpenBSD: ssh.1,v 1.372 2016/06/03 04:09:39 dtucker Exp $
+.Dd $Mdocdate: June 3 2016 $
.Dt SSH 1
.Os
.Sh NAME
@@ -709,7 +709,10 @@
.Fl T ,
.Cm ExitOnForwardFailure
and
-.Cm ClearAllForwardings .
+.Cm ClearAllForwardings
+although these can be overridden in the configuration file or
+.Fl o
+command line options.
.Pp
.It Fl w Xo
.Ar local_tun Ns Op : Ns Ar remote_tun