* g10.c (main), keydb.c (keydb_add_resource, keydb_locate_writable):

Rename --default-keyring as --primary-keyring.  Stefan wins the naming
contest.

1 files changed, 3 insertions, 3 deletions

diff --git a/g10/g10.c b/g10/g10.c
index 3fa6547bf..2795cc9b7 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -141,7 +141,7 @@ enum cmd_and_opt_values { aNull = 0,
     oAnswerNo,
     oDefCertCheckLevel,
     oKeyring,
-    oDefaultKeyring,
+    oPrimaryKeyring,
     oSecretKeyring,
     oShowKeyring,
     oDefaultKey,
@@ -421,7 +421,7 @@ static ARGPARSE_OPTS opts[] = {
     { oAnswerYes, "yes",       0, N_("assume yes on most questions")},
     { oAnswerNo,  "no",        0, N_("assume no on most questions")},
     { oKeyring, "keyring"   ,2, N_("add this keyring to the list of keyrings")},
-    { oDefaultKeyring, "default-keyring",2, "@" },
+    { oPrimaryKeyring, "primary-keyring",2, "@" },
     { oSecretKeyring, "secret-keyring" ,2, N_("add this secret keyring to the list")},
     { oShowKeyring, "show-keyring", 0, N_("show which keyring a listed key is on")},
     { oDefaultKey, "default-key" ,2, N_("|NAME|use NAME as default secret key")},
@@ -1371,7 +1371,7 @@ main( int argc, char **argv )
 	  case oAnswerYes: opt.answer_yes = 1; break;
 	  case oAnswerNo: opt.answer_no = 1; break;
 	  case oKeyring: append_to_strlist( &nrings, pargs.r.ret_str); break;
-	  case oDefaultKeyring:
+	  case oPrimaryKeyring:
 	    sl=append_to_strlist( &nrings, pargs.r.ret_str);
 	    sl->flags=2;
 	    break;