diff options
author | Darren Tucker <dtucker@zip.com.au> | 2006-01-20 11:30:14 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2006-01-20 11:30:14 +1100 |
commit | 94299ec251c84fb07329f3322cd5d6390d70eb7d (patch) | |
tree | 92b327039420dbe7c0c898c53c6772de5abfc31a | |
parent | 4a8dc9e2974063b51da3c5c9e6732f64362a783a (diff) |
- jmc@cvs.openbsd.org 2006/01/15 17:37:05
[ssh.1]
correction from deraadt
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | ssh.1 | 4 |
2 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,9 @@ | |||
1 | 20060120 | ||
2 | - (dtucker) OpenBSD CVS Sync | ||
3 | - jmc@cvs.openbsd.org 2006/01/15 17:37:05 | ||
4 | [ssh.1] | ||
5 | correction from deraadt | ||
6 | |||
1 | 20060114 | 7 | 20060114 |
2 | - (djm) OpenBSD CVS Sync | 8 | - (djm) OpenBSD CVS Sync |
3 | - jmc@cvs.openbsd.org 2006/01/06 13:27:32 | 9 | - jmc@cvs.openbsd.org 2006/01/06 13:27:32 |
@@ -3705,4 +3711,4 @@ | |||
3705 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3711 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3706 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3712 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3707 | 3713 | ||
3708 | $Id: ChangeLog,v 1.4090 2006/01/13 23:10:31 djm Exp $ | 3714 | $Id: ChangeLog,v 1.4091 2006/01/20 00:30:14 dtucker Exp $ |
@@ -34,7 +34,7 @@ | |||
34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | .\" | 36 | .\" |
37 | .\" $OpenBSD: ssh.1,v 1.248 2006/01/12 22:34:12 jmc Exp $ | 37 | .\" $OpenBSD: ssh.1,v 1.249 2006/01/15 17:37:05 jmc Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSH 1 | 39 | .Dt SSH 1 |
40 | .Os | 40 | .Os |
@@ -643,7 +643,7 @@ The file format and configuration options are described in | |||
643 | exits with the exit status of the remote command or with 255 | 643 | exits with the exit status of the remote command or with 255 |
644 | if an error occurred. | 644 | if an error occurred. |
645 | .Sh AUTHENTICATION | 645 | .Sh AUTHENTICATION |
646 | The OpenSSH SSH client supports OpenSSH protocols 1 and 2. | 646 | The OpenSSH SSH client supports SSH protocols 1 and 2. |
647 | Protocol 2 is the default, with | 647 | Protocol 2 is the default, with |
648 | .Nm | 648 | .Nm |
649 | falling back to protocol 1 if it detects protocol 2 is unsupported. | 649 | falling back to protocol 1 if it detects protocol 2 is unsupported. |