- naddy@cvs.openbsd.org 2014/02/05 20:13:25

     [ssh-keygen.1 ssh-keygen.c]
     tweak synopsis: calling ssh-keygen without any arguments is fine; ok jmc@
     while here, fix ordering in usage(); requested by jmc@

diff --git a/ChangeLog b/ChangeLog
index 6289bfe280a55defc8159ad48cf5aa9394f18282..cdb5ca4de14eb31d322dfacc032b5bd2c64b176c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+20140207
+ - OpenBSD CVS Sync
+   - naddy@cvs.openbsd.org 2014/02/05 20:13:25
+     [ssh-keygen.1 ssh-keygen.c]
+     tweak synopsis: calling ssh-keygen without any arguments is fine; ok jmc@
+     while here, fix ordering in usage(); requested by jmc@
+
 20140206
  - (dtucker) [openbsd-compat/bsd-poll.c] Don't bother checking for non-NULL
    before freeing since free(NULL) is a no-op.  ok djm.

diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 0e0ed989f9aecf611ab650f9b330150be3e52712..12e00d416ec7c1283ff584f0ee9b1738790cc53e 100644 (file)
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: ssh-keygen.1,v 1.119 2013/12/21 07:10:47 tedu Exp $
+.\"    $OpenBSD: ssh-keygen.1,v 1.120 2014/02/05 20:13:25 naddy 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: December 21 2013 $
+.Dd $Mdocdate: February 5 2014 $
 .Dt SSH-KEYGEN 1
 .Os
 .Sh NAME
@@ -46,7 +46,7 @@
 .Nm ssh-keygen
 .Op Fl q
 .Op Fl b Ar bits
-.Fl t Ar type
+.Op Fl t Ar type
 .Op Fl N Ar new_passphrase
 .Op Fl C Ar comment
 .Op Fl f Ar output_keyfile

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 9f031094510a4e4ef82612a3d7fb811e0bc2fe37..2a316bcea0badbe63979eceaf5769448afa58249 100644 (file)
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.240 2014/02/02 03:44:31 djm Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.241 2014/02/05 20:13:25 naddy Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2196,8 +2196,8 @@ usage(void)
        fprintf(stderr, "  -v          Verbose.\n");
        fprintf(stderr, "  -W gen      Generator to use for generating DH-GEX moduli.\n");
        fprintf(stderr, "  -y          Read private key file and print public key.\n");
-       fprintf(stderr, "  -z serial   Specify a serial number.\n");
        fprintf(stderr, "  -Z cipher   Specify a cipher for new private key format.\n");
+       fprintf(stderr, "  -z serial   Specify a serial number.\n");
 
        exit(1);
 }