diff options
| author | rhatto <rhatto@ratatosk.fluxo.info> | 2014-03-22 16:47:53 -0300 |
|---|---|---|
| committer | rhatto <rhatto@ratatosk.fluxo.info> | 2014-03-22 16:47:53 -0300 |
| commit | f0c291e7fd3b7f4456568d7c70d6f5f936392924 (patch) | |
| tree | 2e707e0aa8cdebabcd413ec33e9b78aa5e8900ac /share/man | |
| parent | 4078166d62f967221db1a98c2830e14ff666d63a (diff) | |
| parent | 89005b548f9bc87b9a16f43ac40f12e4280c860f (diff) | |
| download | keyringer-f0c291e7fd3b7f4456568d7c70d6f5f936392924.tar.gz keyringer-f0c291e7fd3b7f4456568d7c70d6f5f936392924.tar.bz2 | |
Merge tag 'upstream_keyringer_0.3.3' into debian
Upstream version 0.3.3
Diffstat (limited to 'share/man')
| -rw-r--r-- | share/man/keyringer.1 | 8 | ||||
| -rw-r--r-- | share/man/keyringer.1.mdwn | 8 |
2 files changed, 8 insertions, 8 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 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. |