summaryrefslogtreecommitdiff
path: root/ssh.1
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2005-12-24 14:55:16 +1100
committerDamien Miller <djm@mindrot.org>2005-12-24 14:55:16 +1100
commitd7f308f6d8b3583d8c97fa71cfb9b10f07ee5418 (patch)
tree534548c52ae50776606206cc1a970c758465be0b /ssh.1
parent1530f2431ce107abc29f1926badf84a28bb43b86 (diff)
downloadopenssh-git-d7f308f6d8b3583d8c97fa71cfb9b10f07ee5418.tar.gz
- stevesk@cvs.openbsd.org 2005/12/21 22:44:26
[sshd.8] clarify precedence of -p, Port, ListenAddress; ok and help jmc@
Diffstat (limited to 'ssh.1')
-rw-r--r--ssh.17
1 files changed, 4 insertions, 3 deletions
diff --git a/ssh.1 b/ssh.1
index 2cf22223..36abe684 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.226 2005/12/21 11:57:25 jmc Exp $
+.\" $OpenBSD: ssh.1,v 1.227 2005/12/21 12:53:31 jmc Exp $
.Dd September 25, 1999
.Dt SSH 1
.Os
@@ -851,9 +851,10 @@ If the
variable is set to
.Dq yes
(or see the description of the
-.Fl X
+.Fl X ,
+.Fl x ,
and
-.Fl x
+.Fl Y
options above)
and the user is using X11 (the
.Ev DISPLAY