diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2005-06-05 15:46:09 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2005-06-05 15:46:09 +0000 |
| commit | aa49c9264c97095f0d273288be7cb0b4b06658ab (patch) | |
| tree | 7d41ca8690f59b7463bd4d5fefde78dac8a00e60 /crypto/openssh/ssh.1 | |
| parent | 6dbd30e786949c7c1f38b2513970ef79d11bf413 (diff) | |
| download | src-aa49c9264c97095f0d273288be7cb0b4b06658ab.tar.gz src-aa49c9264c97095f0d273288be7cb0b4b06658ab.zip | |
Resolve conflicts.
Notes
Notes:
svn path=/head/; revision=147005
Diffstat (limited to 'crypto/openssh/ssh.1')
| -rw-r--r-- | crypto/openssh/ssh.1 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/crypto/openssh/ssh.1 b/crypto/openssh/ssh.1 index 4e5dbf1f1bf7..296a32650b98 100644 --- a/crypto/openssh/ssh.1 +++ b/crypto/openssh/ssh.1 @@ -341,7 +341,6 @@ The user should not manually set .Ev DISPLAY . Forwarding of X11 connections can be configured on the command line or in configuration files. -Take note that X11 forwarding can represent a security hazard. .Pp The .Ev DISPLAY |