[svn] GnuPG - r4952 - trunk/g10

[svn author dshaw]

Author: dshaw
Date: 2009-03-15 04:58:38 +0100 (Sun, 15 Mar 2009)
New Revision: 4952

Modified:
   trunk/g10/ChangeLog
   trunk/g10/gpg.c
   trunk/g10/gpgv.c
Log:
* gpg.c (my_strusage): gpg2 and gpgv2 (not gpg and gpgv).
* gpgv.c (my_strusage): Same.


Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2009-03-15 03:39:50 UTC (rev 4951)
+++ trunk/g10/ChangeLog	2009-03-15 03:58:38 UTC (rev 4952)
@@ -1,5 +1,8 @@
 2009-03-14  David Shaw  <dshaw at jabberwocky.com>
 
+	* 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  <wk at g10code.com>

Modified: trunk/g10/gpg.c
===================================================================
--- trunk/g10/gpg.c	2009-03-15 03:39:50 UTC (rev 4951)
+++ trunk/g10/gpg.c	2009-03-15 03:58:38 UTC (rev 4952)
@@ -800,7 +800,7 @@
   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 @@
 
       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;

Modified: trunk/g10/gpgv.c
===================================================================
--- trunk/g10/gpgv.c	2009-03-15 03:39:50 UTC (rev 4951)
+++ trunk/g10/gpgv.c	2009-03-15 03:58:38 UTC (rev 4952)
@@ -107,16 +107,16 @@
 
   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 <gnupg-bugs at gnu.org>.\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;