summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2006-01-20 11:30:14 +1100
committerDarren Tucker <dtucker@zip.com.au>2006-01-20 11:30:14 +1100
commit94299ec251c84fb07329f3322cd5d6390d70eb7d (patch)
tree92b327039420dbe7c0c898c53c6772de5abfc31a
parent4a8dc9e2974063b51da3c5c9e6732f64362a783a (diff)
- jmc@cvs.openbsd.org 2006/01/15 17:37:05
[ssh.1] correction from deraadt
-rw-r--r--ChangeLog8
-rw-r--r--ssh.14
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 8cb8fd13..d550404a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20060120
+ - (dtucker) OpenBSD CVS Sync
+ - jmc@cvs.openbsd.org 2006/01/15 17:37:05
+ [ssh.1]
+ correction from deraadt
+
20060114
- (djm) OpenBSD CVS Sync
- jmc@cvs.openbsd.org 2006/01/06 13:27:32
@@ -3705,4 +3711,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.4090 2006/01/13 23:10:31 djm Exp $
+$Id: ChangeLog,v 1.4091 2006/01/20 00:30:14 dtucker Exp $
diff --git a/ssh.1 b/ssh.1
index 59694822..59ec74b3 100644
--- a/ssh.1
+++ b/ssh.1
@@ -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: ssh.1,v 1.248 2006/01/12 22:34:12 jmc Exp $
+.\" $OpenBSD: ssh.1,v 1.249 2006/01/15 17:37:05 jmc Exp $
.Dd September 25, 1999
.Dt SSH 1
.Os
@@ -643,7 +643,7 @@ The file format and configuration options are described in
exits with the exit status of the remote command or with 255
if an error occurred.
.Sh AUTHENTICATION
-The OpenSSH SSH client supports OpenSSH protocols 1 and 2.
+The OpenSSH SSH client supports SSH protocols 1 and 2.
Protocol 2 is the default, with
.Nm
falling back to protocol 1 if it detects protocol 2 is unsupported.