From 7d1ded4972b7143edf1cc4d051cb90b858da1531 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Tue, 22 Jan 2002 23:09:41 +1100
Subject:    - stevesk@cvs.openbsd.org 2001/12/27 18:22:53      [sshd.8]     
 clarify -p; ok markus@

---
 ChangeLog | 5 ++++-
 sshd.8    | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f69f3c95a..4065ce5bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,9 @@
      [auth1.c authfile.c auth-rsa.c dh.c kexdh.c kexgex.c key.c rsa.c]
      [scard.c ssh-agent.c sshconnect1.c sshd.c ssh-dss.c]
      call fatal() for openssl allocation failures
+   - stevesk@cvs.openbsd.org 2001/12/27 18:22:53
+     [sshd.8]
+     clarify -p; ok markus@
 
 20020121
  - (djm) Rework ssh-rand-helper:
@@ -7186,4 +7189,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1733 2002/01/22 12:09:22 djm Exp $
+$Id: ChangeLog,v 1.1734 2002/01/22 12:09:41 djm Exp $
diff --git a/sshd.8 b/sshd.8
index dafdf9a8c..03f879bb6 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.157 2001/12/19 07:18:56 deraadt Exp $
+.\" $OpenBSD: sshd.8,v 1.158 2001/12/27 18:22:53 stevesk Exp $
 .Dd September 25, 1999
 .Dt SSHD 8
 .Os
@@ -245,6 +245,9 @@ command-line flag.
 .It Fl p Ar port
 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.
 .It Fl q
 Quiet mode.
 Nothing is sent to the system log.
-- 
cgit v1.2.3