aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--index.mdwn4
-rwxr-xr-xlib/keyringer/functions6
-rw-r--r--share/man/keyringer.1.mdwn8
3 files changed, 9 insertions, 9 deletions
diff --git a/index.mdwn b/index.mdwn
index 23a70e5..f9df557 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -26,7 +26,7 @@ Just clone
And then leave it somewhere, optionally adding it to your `$PATH` environment variable
or package it to your preferred distro.
-If you're using debian `jessie` or `unstable`, just run
+If you're using Debian `jessie` or `unstable`, just run
apt-get install keyringer
@@ -60,7 +60,7 @@ want to checkout it, use
Managing recipients
-------------------
-Your next step is tell keyringer the GPG key ids to encrypt files to:
+Your next step is tell keyringer the OpenPGP key IDs to encrypt files to:
keyringer <keyring> recipients edit [recipient-name]
keyringer <keyring> recipients ls
diff --git a/lib/keyringer/functions b/lib/keyringer/functions
index 832385e..b8e4bc7 100755
--- a/lib/keyringer/functions
+++ b/lib/keyringer/functions
@@ -581,7 +581,7 @@ function keyringer_check_recipient_size {
local size=$(echo "$recipient" | wc -c)
if (( $size < 41 )); then
- echo "Fatal: please set the full GPG signature hash for key ID $recipient:"
+ echo "Fatal: please set the full OpenPGP fingerprint for key ID $recipient:"
cat <<-EOF
Please provide a full OpenPGP fingerprint, for example:
@@ -671,8 +671,8 @@ function keyringer_check_recipient_key {
fi
echo ""
else
- echo "Fatal: no such key $recipient on your GPG keyring."
- echo "Please check for this key or fix the recipient file."
+ echo "Fatal: no such key $recipient on your OpenPGP keyring."
+ echo "Please retrieve this key yourself or fix the recipient file."
exit 1
fi
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.