RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-02-17 06:16:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

- OpenBSD CVS Sync

Browse Source 
- jmc@cvs.openbsd.org 2004/06/26 09:03:21
     [ssh.1]
     - remove double word
     - rearrange .Bk to keep SYNOPSIS nice
     - -M before -m in options description
This commit is contained in:
Damien Miller 2004-06-30 22:37:57 +10:00
parent 59e06026d7
commit 5d1ecebcb5
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,6 +1,12 @@
20040630 20040630
- (dtucker) [auth-pam.c] Check for buggy PAM modules that return a NULL - (dtucker) [auth-pam.c] Check for buggy PAM modules that return a NULL
appdata_ptr to the conversation function. ok djm@ appdata_ptr to the conversation function. ok djm@
- (djm) OpenBSD CVS Sync
- jmc@cvs.openbsd.org 2004/06/26 09:03:21
[ssh.1]
- remove double word
- rearrange .Bk to keep SYNOPSIS nice
- -M before -m in options description
20040627 20040627
- (tim) update README files. - (tim) update README files.
@ -1447,4 +1453,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.3458 2004/06/30 10:34:31 dtucker Exp $ $Id: ChangeLog,v 1.3459 2004/06/30 12:37:57 djm Exp $

20
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.192 2004/06/18 10:55:43 markus Exp $ .\" $OpenBSD: ssh.1,v 1.193 2004/06/26 09:03:21 jmc Exp $
.Dd September 25, 1999 .Dd September 25, 1999
.Dt SSH 1 .Dt SSH 1
.Os .Os
@ -46,11 +46,11 @@
.Op Fl 1246AaCfgkMNnqsTtVvXxY .Op Fl 1246AaCfgkMNnqsTtVvXxY
.Op Fl b Ar bind_address .Op Fl b Ar bind_address
.Op Fl c Ar cipher_spec .Op Fl c Ar cipher_spec
.Bk -words
.Op Fl D Ar port .Op Fl D Ar port
.Op Fl e Ar escape_char .Op Fl e Ar escape_char
.Op Fl F Ar configfile .Op Fl F Ar configfile
.Op Fl i Ar identity_file .Op Fl i Ar identity_file
.Bk -words
.Oo Fl L Xo .Oo Fl L Xo
.Sm off .Sm off
.Ar port : .Ar port :
@ -599,13 +599,6 @@ IPv6 addresses can be specified with an alternative syntax:
.It Fl l Ar login_name .It Fl l Ar login_name
Specifies the user to log in as on the remote machine. Specifies the user to log in as on the remote machine.
This also may be specified on a per-host basis in the configuration file. This also may be specified on a per-host basis in the configuration file.
.It Fl m Ar mac_spec
Additionally, for protocol version 2 a comma-separated list of MAC
(message authentication code) algorithms can
be specified in order of preference.
See the
.Cm MACs
keyword for more information.
.It Fl M .It Fl M
Places the Places the
.Nm .Nm
@ -617,6 +610,13 @@ Refer to the description of
in in
.Xr ssh_config 5 .Xr ssh_config 5
for details. for details.
.It Fl m Ar mac_spec
Additionally, for protocol version 2 a comma-separated list of MAC
(message authentication code) algorithms can
be specified in order of preference.
See the
.Cm MACs
keyword for more information.
.It Fl N .It Fl N
Do not execute a remote command. Do not execute a remote command.
This is useful for just forwarding ports This is useful for just forwarding ports
@ -739,7 +739,7 @@ IPv6 addresses can be specified with an alternative syntax:
.Xc .Xc
.Sm on .Sm on
.It Fl S Ar ctl .It Fl S Ar ctl
Specifies the location of a control socket for for connection sharing. Specifies the location of a control socket for connection sharing.
Refer to the description of Refer to the description of
.Cm ControlPath .Cm ControlPath
and and