* keyedit.c (keyedit_menu, menu_clean): Simplify clean options to just

"clean", and add "minimize".

* import.c (parse_import_options): Make help text match the export
versions of the options.

* options.h, export.c (parse_export_options, do_export_stream): Reduce
clean options to two: clean and minimize.

* trustdb.h, trustdb.c (clean_one_uid): New function that joins uid
and sig cleaning into one for a simple API outside trustdb.

1 files changed, 4 insertions, 6 deletions

diff --git a/g10/import.c b/g10/import.c
index 52118ec7a..30e47a2e4 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -102,18 +102,16 @@ parse_import_options(char *str,unsigned int *options,int noisy)
       {"merge-only",IMPORT_MERGE_ONLY,NULL,
        N_("only accept updates to existing keys")},
       {"import-clean",IMPORT_CLEAN,NULL,
-       N_("remove unusable user IDs and signatures after import")},
-      {"import-clean-sigs",0,NULL,NULL},
-      {"import-clean-uids",0,NULL,NULL},
+       N_("remove unusable parts from key after import")},
       {"import-minimal",IMPORT_MINIMAL|IMPORT_CLEAN,NULL,
-       N_("remove unusable user IDs and all signatures after import")},
-      /* Alias */
-      {"import-minimize",IMPORT_MINIMAL|IMPORT_CLEAN,NULL,NULL},
+       N_("remove as much as possible from key after import")},
       /* Aliases for backward compatibility */
       {"allow-local-sigs",IMPORT_LOCAL_SIGS,NULL,NULL},
       {"repair-hkp-subkey-bug",IMPORT_REPAIR_PKS_SUBKEY_BUG,NULL,NULL},
       /* dummy */
       {"import-unusable-sigs",0,NULL,NULL},
+      {"import-clean-sigs",0,NULL,NULL},
+      {"import-clean-uids",0,NULL,NULL},
       {NULL,0,NULL,NULL}
     };