summaryrefslogtreecommitdiff
path: root/share/man
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-03-30 09:04:23 -0300
committerSilvio Rhatto <rhatto@riseup.net>2015-03-30 09:04:23 -0300
commite6f6d21f9955ac7c428d8fe43def599c6bc36a8b (patch)
tree3f7836af002df7bd20b1b4011fa78b95855ec721 /share/man
parentcffe8137d024091d0f1bee9c2484c28d2986febc (diff)
parent347f255ec06b26a0437b653d87b5753d57d3c998 (diff)
downloadkeyringer-e6f6d21f9955ac7c428d8fe43def599c6bc36a8b.tar.gz
keyringer-e6f6d21f9955ac7c428d8fe43def599c6bc36a8b.tar.bz2
Merge branch 'release/0.3.8'0.3.8
Diffstat (limited to 'share/man')
-rw-r--r--share/man/keyringer.112
-rw-r--r--share/man/keyringer.1.mdwn7
2 files changed, 15 insertions, 4 deletions
diff --git a/share/man/keyringer.1 b/share/man/keyringer.1
index 82cb520..13de085 100644
--- a/share/man/keyringer.1
+++ b/share/man/keyringer.1
@@ -201,13 +201,21 @@ Useful inside scripts.
.RS
.RE
.TP
-.B genpair <\f[I]ssh\f[]|\f[I]gpg\f[]|\f[I]ssl\f[]|\f[I]ssl-self\f[]>
+.B genkeys
+<\f[I]ssh\f[]|\f[I]gpg\f[]|\f[I]x509\f[]|\f[I]x509-self\f[]|\f[I]ssl\f[]|\f[I]ssl-self\f[]>
[\f[I]options\f[]]
Wrapper to generate encryption key-pairs, useful for automated key
deployment.
.RS
.RE
.TP
+.B genpair
+<\f[I]ssh\f[]|\f[I]gpg\f[]|\f[I]x509\f[]|\f[I]x509-self\f[]|\f[I]ssl\f[]|\f[I]ssl-self\f[]>
+[\f[I]options\f[]]
+Alias for \f[I]genkeys\f[] action.
+.RS
+.RE
+.TP
.B open <\f[I]secret\f[]>
Decrypt a secret into a temporary folder and open it using xdg-open,
which tries to figure out the file type and then calls the associated
@@ -377,7 +385,7 @@ so be careful when decrypting secrets and writing them to the disk or
other storage media.
.PP
Pay special attention that keyringer outputs data to stdout, which could
-be easilly spotted by any agent looking directly at you computer screen.
+be easily spotted by any agent looking directly at you computer screen.
.PP
The xclip action even copies secret data to the X11 clipboard, which can
be accessed by any application running in the user\[aq]s X11 session, so
diff --git a/share/man/keyringer.1.mdwn b/share/man/keyringer.1.mdwn
index af098a3..55ae216 100644
--- a/share/man/keyringer.1.mdwn
+++ b/share/man/keyringer.1.mdwn
@@ -150,9 +150,12 @@ encrypt-batch <*secret*> [*file*]
: Encrypt content, batch mode. Behavior is identical to *encrypt* action, but less
verbose. Useful inside scripts.
-genpair <*ssh*|*gpg*|*ssl*|*ssl-self*> [*options*]
+genkeys <*ssh*|*gpg*|*x509*|*x509-self*|*ssl*|*ssl-self*> [*options*]
: Wrapper to generate encryption key-pairs, useful for automated key deployment.
+genpair <*ssh*|*gpg*|*x509*|*x509-self*|*ssl*|*ssl-self*> [*options*]
+: Alias for *genkeys* action.
+
open <*secret*>
: Decrypt a secret into a temporary folder and open it using xdg-open, which
tries to figure out the file type and then calls the associated application.
@@ -288,7 +291,7 @@ Keyringer currently has the following limitations:
other storage media.
Pay special attention that keyringer outputs data to stdout, which could
- be easilly spotted by any agent looking directly at you computer screen.
+ be easily spotted by any agent looking directly at you computer screen.
The xclip action even copies secret data to the X11 clipboard, which can
be accessed by any application running in the user's X11 session, so use