PATCH: improve wording in gpg completion

PATCH: improve wording in gpg completion

[William da Silva]

[-- Attachment #1: Type: text/plain, Size: 2906 bytes --]

I noticed a few of the hints for GPG completions that were somewhat
inconsistent or grammatically incorrect.
This patch aims to improve those.

Thanks,
William

diff --git a/Completion/Unix/Command/_gpg b/Completion/Unix/Command/_gpg
index fe6084f20..44db5e039 100644
--- a/Completion/Unix/Command/_gpg
+++ b/Completion/Unix/Command/_gpg
@@ -26,7 +26,7 @@ fi
 [[ $service = gpgv ]] || args+=(
   '(-e --encrypt)'{-e,--encrypt}'[encrypt data. this option may be
combined  with --sign]'
   {-d,--decrypt}'[decrypt file or stdin]'
-  '(-c --symmetric)'{-c,--symmetric}'[encrypt with symmetric cypher only]'
+  '(-c --symmetric)'{-c,--symmetric}'[encrypt with symmetric cipher only]'
   '(-s --sign)'{-s,--sign}'[make a signature]'
   '*'{-r+,--recipient}'[specify user to encrypt
for]:recipient:->public-keys'
   '(-u --local-user)'{-u+,--local-user}'[use name as the user ID to
sign]:user attachment:_users'
@@ -52,7 +52,7 @@ fi
   '--fingerprint[list all keys with their fingerprints]:key
attachment:->public-keys'
   '--list-packets[list only the sequence of packets]'
   '--gen-key[generate a new pair key]'
-  '--edit-key[a menu for edit yours keys]:key attachment:->public-keys'
+  '--edit-key[a menu for editing your keys]:key attachment:->public-keys'
   '--sign-key[sign a key]:key attachment:->public-keys'
   '--lsign-key[sign a key but mark as non-exportable]:key
attachment:->public-keys'
   '--delete-keys[remove key from public keyring]:key
attachment:->public-keys'
@@ -60,12 +60,12 @@ fi
   '--delete-secret-and-public-keys:key attachment:->secret-keys'
   '--gen-revoke[generate a revocation certificate]'
   '--desig-revoke[generate a designated revocation certificate]'
-  '--export[export all key from all keyrings]'
+  '--export[export all keys from all keyrings]'
   '--send-keys[send keys to a keyserver]:key attachment:->public-keyids'
   '--export-secret-keys:key attachment:->secret-keys'
   '--export-secret-subkeys:key attachment:->secret-keys'
   '--import[import a gpg key from a file]:_files attachment:_files'
-  '--fast-import[import a file without build trustdb]:_files
attachment:_files'
+  '--fast-import[import a file without adding to trust database]:_files
attachment:_files'
   '--fetch-keys[fetch key at URIs]:uri:'
   '--recv-keys[receive a list of keys from a keyserver]:key
attachment:->public-keyids'
   '--refresh-keys[update all keys from a keyserver]'
@@ -82,7 +82,7 @@ fi
   '--gen-random:count' '--gen-prime'
   '--warranty[print warranty info]'
   '(-a --armor)'{-a,--armor}'[create ASCII armored output]'
-  '--default-key[specify default user-id for signatures]:key:->secret-keys'
+  '--default-key[specify default user ID for signatures]:key:->secret-keys'
   '--default-recipient[specify default recipient]:recipient:->public-keys'
   '--default-recipient-self[use default key as default recipient]'
   '--no-default-recipient[reset default recipient]'

Re: PATCH: improve wording in gpg completion

[Daniel Shahaf]

William da Silva wrote on Fri, 25 Aug 2017 14:31 +0000:
> diff --git a/Completion/Unix/Command/_gpg b/Completion/Unix/Command/_gpg
> index fe6084f20..44db5e039 100644
> --- a/Completion/Unix/Command/_gpg
> +++ b/Completion/Unix/Command/_gpg
> @@ -26,7 +26,7 @@ fi
>  [[ $service = gpgv ]] || args+=(
>    '(-e --encrypt)'{-e,--encrypt}'[encrypt data. this option may be
> combined  with --sign]'

As you see, your MUA wrapped lines hard, which breaks patches.  When
sending patches, either disable line wrapping and whitespace mangling or
send the patches as attachments named *.txt.

>    {-d,--decrypt}'[decrypt file or stdin]'
> -  '(-c --symmetric)'{-c,--symmetric}'[encrypt with symmetric cypher only]'
> +  '(-c --symmetric)'{-c,--symmetric}'[encrypt with symmetric cipher only]'

The man page uses the "cipher" spelling so okay.

> -  '--fast-import[import a file without build trustdb]:_files
> attachment:_files'
> +  '--fast-import[import a file without adding to trust database]:_files

"trustdb" is used as a noun in the man page so I think we should use it as a
noun here, too.  I've omitted this and committed the rest with a tweak to
--edit-key.  Thanks for the patch!

Daniel

Re: PATCH: improve wording in gpg completion

[William da Silva]

[-- Attachment #1: Type: text/plain, Size: 218 bytes --]

Thanks Daniel,

> As you see, your MUA wrapped lines hard, which breaks patches

I was wrong in trusting my email client's wysiwyg editor with the newlines.
I'll be sure to just use attachments in the future.

William