diff --git a/g10/ChangeLog b/g10/ChangeLog index af3e58957..ba0d8eb2d 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,5 +1,8 @@ 2009-03-14 David Shaw + * gpg.c (my_strusage): gpg2 and gpgv2 (not gpg and gpgv). + * gpgv.c (my_strusage): Same. + * gpgv.c (my_strusage): Fix name of program in "Syntax" line. 2009-02-27 Werner Koch diff --git a/g10/gpg.c b/g10/gpg.c index a88b1ffc3..727c108d2 100644 --- a/g10/gpg.c +++ b/g10/gpg.c @@ -800,7 +800,7 @@ my_strusage( int level ) const char *p; switch( level ) { - case 11: p = "gpg (GnuPG)"; + case 11: p = "gpg2 (GnuPG)"; break; case 13: p = VERSION; break; case 17: p = PRINTABLE_OS_NAME; break; @@ -828,10 +828,10 @@ my_strusage( int level ) case 1: case 40: p = - _("Usage: gpg [options] [files] (-h for help)"); + _("Usage: gpg2 [options] [files] (-h for help)"); break; case 41: p = - _("Syntax: gpg [options] [files]\n" + _("Syntax: gpg2 [options] [files]\n" "sign, check, encrypt or decrypt\n" "default operation depends on the input data\n"); break; diff --git a/g10/gpgv.c b/g10/gpgv.c index 88baaabab..91d4e6af1 100644 --- a/g10/gpgv.c +++ b/g10/gpgv.c @@ -107,16 +107,16 @@ my_strusage( int level ) switch (level) { - case 11: p = "gpgv (GnuPG)"; + case 11: p = "gpgv2 (GnuPG)"; break; case 13: p = VERSION; break; case 17: p = PRINTABLE_OS_NAME; break; case 19: p = _("Please report bugs to .\n"); break; case 1: - case 40: p = _("Usage: gpgv [options] [files] (-h for help)"); + case 40: p = _("Usage: gpgv2 [options] [files] (-h for help)"); break; - case 41: p = _("Syntax: gpgv [options] [files]\n" + case 41: p = _("Syntax: gpgv2 [options] [files]\n" "Check signatures against known trusted keys\n"); break;