commit d7f308f6d8b3583d8c97fa71cfb9b10f07ee5418
author Damien Miller <djm@mindrot.org> Sat Dec 24 14:55:16 2005 +1100
committer Damien Miller <djm@mindrot.org> Sat Dec 24 14:55:16 2005 +1100
tree 534548c52ae50776606206cc1a970c758465be0b
parent 1530f2431ce107abc29f1926badf84a28bb43b86

   - stevesk@cvs.openbsd.org 2005/12/21 22:44:26
     [sshd.8]
     clarify precedence of -p, Port, ListenAddress; ok and help jmc@

ssh.1

diff --git a/ssh.1 b/ssh.1
index 2cf2222..36abe68 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 @@
 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