From d7f308f6d8b3583d8c97fa71cfb9b10f07ee5418 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Sat, 24 Dec 2005 14:55:16 +1100
Subject:    - stevesk@cvs.openbsd.org 2005/12/21 22:44:26      [sshd.8]     
 clarify precedence of -p, Port, ListenAddress; ok and help jmc@

---
 ChangeLog |  5 ++++-
 ssh.1     |  7 ++++---
 sshd.8    | 10 +++++++---
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4fd581232..645feffc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,9 @@
      [ssh.1]
      -Y does X11 forwarding too;
      ok markus
+   - stevesk@cvs.openbsd.org 2005/12/21 22:44:26
+     [sshd.8]
+     clarify precedence of -p, Port, ListenAddress; ok and help jmc@
 
 20051220
  - (dtucker) OpenBSD CVS Sync
@@ -3525,4 +3528,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4045 2005/12/24 03:54:03 djm Exp $
+$Id: ChangeLog,v 1.4046 2005/12/24 03:55:16 djm Exp $
diff --git a/ssh.1 b/ssh.1
index 2cf222234..36abe684a 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
diff --git a/sshd.8 b/sshd.8
index 53eddcdfb..ee6e7d797 100644
--- a/sshd.8
+++ b/sshd.8
@@ -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: sshd.8,v 1.209 2005/12/06 22:38:28 reyk Exp $
+.\" $OpenBSD: sshd.8,v 1.210 2005/12/21 22:44:26 stevesk Exp $
 .Dd September 25, 1999
 .Dt SSHD 8
 .Os
@@ -288,8 +288,12 @@ For full details of the options, and their values, see
 Specifies the port on which the server listens for connections
 (default 22).
 Multiple port options are permitted.
-Ports specified in the configuration file are ignored when a
-command-line port is specified.
+Ports specified in the configuration file with the
+.Cm Port
+option are ignored when a command-line port is specified.
+Ports specified using the
+.Cm ListenAddress
+option override command-line ports.
 .It Fl q
 Quiet mode.
 Nothing is sent to the system log.
-- 
cgit v1.2.3