1 files changed, 5 insertions, 2 deletions
diff --git a/ssh.1 b/ssh.1
index 2ba7fa6fd..107841533 100644
--- a/ssh.1
+++ b/ssh.1
@@ -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.1,v 1.177 2003/10/08 08:27:36 jmc Exp $
+.\" $OpenBSD: ssh.1,v 1.178 2003/10/11 08:24:08 markus Exp $
 .Dd September 25, 1999
 .Dt SSH 1
 .Os
@@ -43,7 +43,7 @@
 .Nd OpenSSH SSH client (remote login program)
 .Sh SYNOPSIS
 .Nm ssh
-.Op Fl 1246AaCfgkNnqsTtVvXx
+.Op Fl 1246AaCfgkNnqsTtVvXxY
 .Op Fl b Ar bind_address
 .Op Fl c Ar cipher_spec
 .Op Fl D Ar port
@@ -624,6 +624,7 @@ For full details of the options listed below, and their possible values, see
 .It EscapeChar
 .It ForwardAgent
 .It ForwardX11
+.It ForwardX11Trusted
 .It GatewayPorts
 .It GlobalKnownHostsFile
 .It GSSAPIAuthentication
@@ -732,6 +733,8 @@ can access the local X11 display through the forwarded connection.
 An attacker may then be able to perform activities such as keystroke monitoring.
 .It Fl x
 Disables X11 forwarding.
+.It Fl Y
+Enables trusted X11 forwarding.
 .El
 .Sh CONFIGURATION FILES
 .Nm

diff --git a/ssh.1 b/ssh.1 index 2ba7fa6fd..107841533 100644 --- a/ssh.1 +++ b/ssh.1
@@ -34,7 +34,7 @@
34	.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF	34	.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35	.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	35	.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36	.\"	36	.\"
37	.\" $OpenBSD: ssh.1,v 1.177 2003/10/08 08:27:36 jmc Exp $	37	.\" $OpenBSD: ssh.1,v 1.178 2003/10/11 08:24:08 markus Exp $
38	.Dd September 25, 1999	38	.Dd September 25, 1999
39	.Dt SSH 1	39	.Dt SSH 1
40	.Os	40	.Os
@@ -43,7 +43,7 @@
43	.Nd OpenSSH SSH client (remote login program)	43	.Nd OpenSSH SSH client (remote login program)
44	.Sh SYNOPSIS	44	.Sh SYNOPSIS
45	.Nm ssh	45	.Nm ssh
46	.Op Fl 1246AaCfgkNnqsTtVvXx	46	.Op Fl 1246AaCfgkNnqsTtVvXxY
47	.Op Fl b Ar bind_address	47	.Op Fl b Ar bind_address
48	.Op Fl c Ar cipher_spec	48	.Op Fl c Ar cipher_spec
49	.Op Fl D Ar port	49	.Op Fl D Ar port
@@ -624,6 +624,7 @@ For full details of the options listed below, and their possible values, see
624	.It EscapeChar	624	.It EscapeChar
625	.It ForwardAgent	625	.It ForwardAgent
626	.It ForwardX11	626	.It ForwardX11
		627	.It ForwardX11Trusted
627	.It GatewayPorts	628	.It GatewayPorts
628	.It GlobalKnownHostsFile	629	.It GlobalKnownHostsFile
629	.It GSSAPIAuthentication	630	.It GSSAPIAuthentication
@@ -732,6 +733,8 @@ can access the local X11 display through the forwarded connection.
732	An attacker may then be able to perform activities such as keystroke monitoring.	733	An attacker may then be able to perform activities such as keystroke monitoring.
733	.It Fl x	734	.It Fl x
734	Disables X11 forwarding.	735	Disables X11 forwarding.
		736	.It Fl Y
		737	Enables trusted X11 forwarding.
735	.El	738	.El
736	.Sh CONFIGURATION FILES	739	.Sh CONFIGURATION FILES
737	.Nm	740	.Nm