1 files changed, 6 insertions, 3 deletions
diff --git a/ssh.1 b/ssh.1
index 9ed5a5662..4c5ab2157 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 $
+.\" $OpenBSD: ssh.1,v 1.372 2016/06/03 04:09:39 dtucker Exp $
-.Dd $Mdocdate: May 4 2016 $
+.Dd $Mdocdate: June 3 2016 $
 .Dt SSH 1
 .Os
 .Sh NAME
@@ -709,7 +709,10 @@ Implies
 .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

diff --git a/ssh.1 b/ssh.1 index 9ed5a5662..4c5ab2157 100644 --- a/ssh.1 +++ b/ssh.1
@@ -33,8 +33,8 @@
33	.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF	33	.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34	.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	34	.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35	.\"	35	.\"
36	.\" $OpenBSD: ssh.1,v 1.371 2016/05/04 12:21:53 markus Exp $	36	.\" $OpenBSD: ssh.1,v 1.372 2016/06/03 04:09:39 dtucker Exp $
37	.Dd $Mdocdate: May 4 2016 $	37	.Dd $Mdocdate: June 3 2016 $
38	.Dt SSH 1	38	.Dt SSH 1
39	.Os	39	.Os
40	.Sh NAME	40	.Sh NAME
@@ -709,7 +709,10 @@ Implies
709	.Fl T ,	709	.Fl T ,
710	.Cm ExitOnForwardFailure	710	.Cm ExitOnForwardFailure
711	and	711	and
712	.Cm ClearAllForwardings .	712	.Cm ClearAllForwardings
		713	although these can be overridden in the configuration file or
		714	.Fl o
		715	command line options.
713	.Pp	716	.Pp
714	.It Fl w Xo	717	.It Fl w Xo
715	.Ar local_tun Ns Op : Ns Ar remote_tun	718	.Ar local_tun Ns Op : Ns Ar remote_tun