summary refs log tree commit diff
diff options
context:
space:
mode:
authorWilliam da Silva <w.vigolodasilva@gmail.com>2017-08-25 15:29:30 +0000
committerDaniel Shahaf <d.s@daniel.shahaf.name>2017-08-25 15:29:36 +0000
commitdd2e003c8e1d591d931dd3b1e7d0a0cec474704a (patch)
tree4b5186bf3de25080fa680b3a7da1ad0617bcfa3c
parent3fbb80b1d3581066f423e8240587cbc3f750861a (diff)
downloadzsh-dd2e003c8e1d591d931dd3b1e7d0a0cec474704a.tar.gz
zsh-dd2e003c8e1d591d931dd3b1e7d0a0cec474704a.tar.xz
zsh-dd2e003c8e1d591d931dd3b1e7d0a0cec474704a.zip
41602 (tweaked): Improve wording in gpg completion.
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_gpg12
2 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 377b390a3..ea4dc078f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-08-25  William da Silva  <w.vigolodasilva@gmail.com>
+
+	* 41602 (tweaked): Completion/Unix/Command/_gpg: Improve wording
+	in gpg completion.
+
 2017-08-25  Oliver Kiddle  <opk@zsh.org>
 
 	* 41601: Completion/Unix/Command/_arp,
diff --git a/Completion/Unix/Command/_gpg b/Completion/Unix/Command/_gpg
index fe6084f20..d7a8ece4c 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[interactively edit a key]: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'
+  '--import[import a gpg key from a file]:attachment (file):_files'
+  '--fast-import[import a file without adding to trustdb]:attachment (file):_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]'