summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorKevin Steves <stevesk@cvs.openbsd.org>2005-12-21 22:44:27 +0000
committerKevin Steves <stevesk@cvs.openbsd.org>2005-12-21 22:44:27 +0000
commit41dc073f35af9df74fe7f0bc6a6ee06be3d54368 (patch)
tree451fd8cb881f9a22e49e3b18c24866794fb0f8a8 /usr.bin
parent490df44086ca206a30c323364fee4514ef092e7b (diff)
clarify precedence of -p, Port, ListenAddress; ok and help jmc@
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/sshd.810
1 files changed, 7 insertions, 3 deletions
diff --git a/usr.bin/ssh/sshd.8 b/usr.bin/ssh/sshd.8
index 96441e8e66f..c9042d7d44e 100644
--- a/usr.bin/ssh/sshd.8
+++ b/usr.bin/ssh/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
@@ -263,8 +263,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.