summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--sftp.110
-rw-r--r--ssh-add.14
-rw-r--r--ssh-keygen.14
4 files changed, 14 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 6c9b3c4e5..2fd3e7b5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@
4 Suggested by Jason Mader <jason@ncac.gwu.edu> 4 Suggested by Jason Mader <jason@ncac.gwu.edu>
5 - (bal) White Space and #ifdef sync with OpenBSD 5 - (bal) White Space and #ifdef sync with OpenBSD
6 - (bal) Add 'seed_rng()' to ssh-add.c 6 - (bal) Add 'seed_rng()' to ssh-add.c
7 - OpenBSD CVS Sync
8 - stevesk@cvs.openbsd.org 2001/05/05 13:42:52
9 [sftp.1 ssh-add.1 ssh-keygen.1]
10 typos, grammar
7 11
820010505 1220010505
9 - OpenBSD CVS Sync 13 - OpenBSD CVS Sync
@@ -5349,4 +5353,4 @@
5349 - Wrote replacements for strlcpy and mkdtemp 5353 - Wrote replacements for strlcpy and mkdtemp
5350 - Released 1.0pre1 5354 - Released 1.0pre1
5351 5355
5352$Id: ChangeLog,v 1.1202 2001/05/06 02:57:20 mouring Exp $ 5356$Id: ChangeLog,v 1.1203 2001/05/06 03:01:02 mouring Exp $
diff --git a/sftp.1 b/sftp.1
index b482996ed..756123628 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: sftp.1,v 1.17 2001/04/22 13:32:27 markus Exp $ 1.\" $OpenBSD: sftp.1,v 1.18 2001/05/05 13:42:51 stevesk Exp $
2.\" 2.\"
3.\" Copyright (c) 2001 Damien Miller. All rights reserved. 3.\" Copyright (c) 2001 Damien Miller. All rights reserved.
4.\" 4.\"
@@ -49,12 +49,12 @@ It may also use many features of ssh, such as public key authentication and
49compression. 49compression.
50.Nm 50.Nm
51connects and logs into the specified 51connects and logs into the specified
52.Ar hostname , 52.Ar host ,
53then enters an interactive command mode. 53then enters an interactive command mode.
54.Pp 54.Pp
55The second usage format will fetch files automaticly if a non-interactive 55The second usage format will retrieve files automatically if a non-interactive
56authentication is used, else it do so after an interactive authentication 56authentication method is used; otherwise it will do so after
57is used. 57successful interactive authentication.
58.Pp 58.Pp
59The last usage format allows the sftp client to start in a remote directory. 59The last usage format allows the sftp client to start in a remote directory.
60.Pp 60.Pp
diff --git a/ssh-add.1 b/ssh-add.1
index d7725c6e3..2bcbe0eeb 100644
--- a/ssh-add.1
+++ b/ssh-add.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-add.1,v 1.24 2001/04/10 09:13:21 itojun Exp $ 1.\" $OpenBSD: ssh-add.1,v 1.25 2001/05/05 13:42:52 stevesk Exp $
2.\" 2.\"
3.\" -*- nroff -*- 3.\" -*- nroff -*-
4.\" 4.\"
@@ -57,7 +57,7 @@ Alternative file names can be given on the command line.
57If any file requires a passphrase, 57If any file requires a passphrase,
58.Nm 58.Nm
59asks for the passphrase from the user. 59asks for the passphrase from the user.
60The Passphrase it is read from the user's tty. 60The passphrase is read from the user's tty.
61.Nm 61.Nm
62retries the last passphrase if multiple identity files are given. 62retries the last passphrase if multiple identity files are given.
63.Pp 63.Pp
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 371fc5fe4..f85357c7a 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keygen.1,v 1.40 2001/04/23 21:57:07 markus Exp $ 1.\" $OpenBSD: ssh-keygen.1,v 1.41 2001/05/05 13:42:52 stevesk Exp $
2.\" 2.\"
3.\" -*- nroff -*- 3.\" -*- nroff -*-
4.\" 4.\"
@@ -143,7 +143,7 @@ The default is 1024 bits.
143.It Fl c 143.It Fl c
144Requests changing the comment in the private and public key files. 144Requests changing the comment in the private and public key files.
145The program will prompt for the file containing the private keys, for 145The program will prompt for the file containing the private keys, for
146passphrase if the key has one, and for the new comment. 146the passphrase if the key has one, and for the new comment.
147.It Fl e 147.It Fl e
148This option will read a private or public OpenSSH key file and 148This option will read a private or public OpenSSH key file and
149print the key in a 149print the key in a