summaryrefslogtreecommitdiff
path: root/share/man
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2017-05-31 19:20:50 -0300
committerSilvio Rhatto <rhatto@riseup.net>2017-05-31 19:20:50 -0300
commit374887922e7018e6b0c8e3d2ba8f52d4386ec682 (patch)
tree4509c0fa1e93d40dfc03141896aef20e877553f4 /share/man
parente597eb9acfab30157abefe6317387f6297d3e869 (diff)
parent5d3a8d7c25c2ec07b0dc74bdf6603dea1e12180e (diff)
downloadkeyringer-374887922e7018e6b0c8e3d2ba8f52d4386ec682.tar.gz
keyringer-374887922e7018e6b0c8e3d2ba8f52d4386ec682.tar.bz2
Merge branch 'develop'
Diffstat (limited to 'share/man')
-rw-r--r--share/man/keyringer.17
-rw-r--r--share/man/keyringer.1.mdwn5
2 files changed, 10 insertions, 2 deletions
diff --git a/share/man/keyringer.1 b/share/man/keyringer.1
index fe17968..7b1b030 100644
--- a/share/man/keyringer.1
+++ b/share/man/keyringer.1
@@ -159,6 +159,11 @@ Git history.\f[] To completely remove a file from a keyring, you should
also rewrite the Git history yourself.
.RE
.TP
+.B delete <\f[I]secret\f[]>
+Alias for \f[I]del\f[] action.
+.RS
+.RE
+.TP
.B rm <\f[I]secret\f[]>
Alias for \f[I]del\f[] action.
.RS
@@ -258,7 +263,7 @@ Alias to clip action.
.B sclip <\f[I]secret\f[]>
Same as clip action, but sleeps five seconds, overwrite clipboard and
exit.
-If xdotool is available, it also switchs to the next window using the
+If xdotool is available, it also switches to the next window using the
alt+Tab shortcut.
This action is useful to be invoked by a custom key combo in a window
manager so it becomes easy to provide keyringer managed passphrases to
diff --git a/share/man/keyringer.1.mdwn b/share/man/keyringer.1.mdwn
index afe7e99..8acd747 100644
--- a/share/man/keyringer.1.mdwn
+++ b/share/man/keyringer.1.mdwn
@@ -125,6 +125,9 @@ del <*secret*>
To completely remove a file from a keyring, you should also rewrite the Git
history yourself.
+delete <*secret*>
+: Alias for *del* action.
+
rm <*secret*>
: Alias for *del* action.
@@ -186,7 +189,7 @@ xclip <*secret*>
sclip <*secret*>
: Same as clip action, but sleeps five seconds, overwrite clipboard and exit. If xdotool
- is available, it also switchs to the next window using the alt+Tab shortcut. This action
+ is available, it also switches to the next window using the alt+Tab shortcut. This action
is useful to be invoked by a custom key combo in a window manager so it becomes easy to
provide keyringer managed passphrases to other applications such as a web browser.