tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- stevesk@cvs.openbsd.org 2005/12/21 22:44:26 

[sshd.8]
     clarify precedence of -p, Port, ListenAddress; ok and help jmc@
This commit is contained in:
Damien Miller 2005-12-24 14:55:16 +11:00
parent 1530f2431c
commit d7f308f6d8
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -23,6 +23,9 @@
[ssh.1] [ssh.1]
-Y does X11 forwarding too; -Y does X11 forwarding too;
ok markus 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 20051220
- (dtucker) OpenBSD CVS Sync - (dtucker) OpenBSD CVS Sync
@ -3525,4 +3528,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (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 $

7
ssh.1
View File

@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" 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 .Dd September 25, 1999
.Dt SSH 1 .Dt SSH 1
.Os .Os
@ -851,9 +851,10 @@ If the
variable is set to variable is set to
.Dq yes .Dq yes
(or see the description of the (or see the description of the
.Fl X .Fl X ,
.Fl x ,
and and
.Fl x .Fl Y
options above) options above)
and the user is using X11 (the and the user is using X11 (the
.Ev DISPLAY .Ev DISPLAY

10
sshd.8
View File

@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" 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 .Dd September 25, 1999
.Dt SSHD 8 .Dt SSHD 8
.Os .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 Specifies the port on which the server listens for connections
(default 22). (default 22).
Multiple port options are permitted. Multiple port options are permitted.
Ports specified in the configuration file are ignored when a Ports specified in the configuration file with the
command-line port is specified. .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 .It Fl q
Quiet mode. Quiet mode.
Nothing is sent to the system log. Nothing is sent to the system log.