summaryrefslogtreecommitdiff
path: root/share/man/keyringer.1
diff options
context:
space:
mode:
authorrhatto <rhatto@ratatosk.fluxo.info>2014-03-22 16:47:52 -0300
committerrhatto <rhatto@ratatosk.fluxo.info>2014-03-22 16:47:52 -0300
commit89005b548f9bc87b9a16f43ac40f12e4280c860f (patch)
treef8a53cfa1312defc42b371ae06f6194fe3445463 /share/man/keyringer.1
parent307fadff79b8f725d4ab9e41f270c024c05a0ef9 (diff)
parentfc9954384ee5543d742395c5b9245e83d6e9fd07 (diff)
downloadkeyringer-89005b548f9bc87b9a16f43ac40f12e4280c860f.tar.gz
keyringer-89005b548f9bc87b9a16f43ac40f12e4280c860f.tar.bz2
Imported Upstream version 0.3.3upstream_keyringer_0.3.3
Diffstat (limited to 'share/man/keyringer.1')
-rw-r--r--share/man/keyringer.18
1 files changed, 4 insertions, 4 deletions
diff --git a/share/man/keyringer.1 b/share/man/keyringer.1
index 29c618b..f460cbf 100644
--- a/share/man/keyringer.1
+++ b/share/man/keyringer.1
@@ -16,8 +16,8 @@ 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.
.PP
-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.
.SH ACTIONS
.PP
Keyringer has three types of actions:
@@ -219,7 +219,7 @@ password-store convention.
.RE
.TP
.B xclip <\f[I]secret\f[]>
-Alis to clip action.
+Alias to clip action.
.RS
.RE
.SH CONFIGURATION ACTIONS
@@ -286,7 +286,7 @@ file\f[C]$KEYRING_FOLDER/config/recipients/accounting\f[].
.PP
Each line in a recipients file has entries in the format
\[aq]john\@doe.com XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\[aq], where
-\f[I]john\@doe.com\f[] is an alias for the GPG public key whose
+\f[I]john\@doe.com\f[] is an alias for the OpenPGP public key whose
fingerprint is \f[I]XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.\f[]
.PP
All lines starting with the hash (#) character are interpreted as