- djm@cvs.openbsd.org 2011/04/13 04:02:48

     [ssh-keygen.1]
     improve wording; bz#1861

2 files changed, 7 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index fe3bf96db..2a83c16d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -49,6 +49,9 @@
    - djm@cvs.openbsd.org 2011/04/12 05:32:49
      [sshd.c]
      exit with 0 status on SIGTERM; bz#1879
+   - djm@cvs.openbsd.org 2011/04/13 04:02:48
+     [ssh-keygen.1]
+     improve wording; bz#1861
 
 20110221
  - (dtucker) [contrib/cygwin/ssh-host-config] From Corinna: revamp of the
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index c9fec0403..51a152eef 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: ssh-keygen.1,v 1.104 2011/03/24 15:29:30 jmc Exp $
+.\"     $OpenBSD: ssh-keygen.1,v 1.105 2011/04/13 04:02:48 djm Exp $
 .\"
 .\" Author: Tatu Ylonen <ylo@cs.hut.fi>
 .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -35,7 +35,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.
 .\"
-.Dd $Mdocdate: March 24 2011 $
+.Dd $Mdocdate: April 13 2011 $
 .Dt SSH-KEYGEN 1
 .Os
 .Sh NAME
@@ -175,9 +175,8 @@ The passphrase can be changed later by using the
 option.
 .Pp
 There is no way to recover a lost passphrase.
-If the passphrase is
-lost or forgotten, a new key must be generated and copied to the
-corresponding public key to other machines.
+If the passphrase is lost or forgotten, a new key must be generated
+and the corresponding public key copied to other machines.
 .Pp
 For RSA1 keys,
 there is also a comment field in the key file that is only for