Merge branch 'master' into canary

1 files changed, 4 insertions, 4 deletions

diff --git a/share/man/keyringer.1.mdwn b/share/man/keyringer.1.mdwn
index 84895c2..adbaaa2 100644
--- a/share/man/keyringer.1.mdwn
+++ b/share/man/keyringer.1.mdwn
@@ -20,8 +20,8 @@ re-encrypt secrets. It also supports encryption to multiple recipients
 and groups of recipients, to allow a workgroup to share access to a single
 repository while restricting some secrets to subsets of the group.
 
-Secrets are encrypted using GPG and added to a Git tree so that they can be
-synced with remote branches later.
+Secrets are encrypted using OpenPGP and added to a Git tree so that they
+can be synced with remote branches later.
 
 # ACTIONS
 
@@ -160,7 +160,7 @@ clip <*secret*>
 :   Copy the first line of a secret to the clipboard, following password-store convention.
 
 xclip <*secret*>
-:   Alis to clip action.
+:   Alias to clip action.
 
 # CONFIGURATION ACTIONS
 
@@ -209,7 +209,7 @@ recipients <*ls*|*edit*> <*recipients-file*>
 
     Each line in a recipients file has entries in the format
     'john@doe.com XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', where *john@doe.com*
-    is an alias for the GPG public key whose fingerprint is
+    is an alias for the OpenPGP public key whose fingerprint is
     *XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.*
 
     All lines starting with the hash (#) character are interpreted as comments.