=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh.1,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- src/usr.bin/ssh/ssh.1 2001/05/04 14:21:55 1.109 +++ src/usr.bin/ssh/ssh.1 2001/05/15 22:04:01 1.110 @@ -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.109 2001/05/04 14:21:55 stevesk Exp $ +.\" $OpenBSD: ssh.1,v 1.110 2001/05/15 22:04:01 deraadt Exp $ .Dd September 25, 1999 .Dt SSH 1 .Os @@ -304,7 +304,16 @@ .Pp .Ss X11 and TCP forwarding .Pp -If the user is using X11 (the +If the +.Cm ForwardX11 +variable is set to +.Dq yes +(or, see the description of the +.Fl X +and +.Fl x +options described later) +and the user is using X11 (the .Ev DISPLAY environment variable is set), the connection to the X11 display is automatically forwarded to the remote side in such a way that any X11