summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
l---------lib/keyringer/actions/delete1
-rw-r--r--share/man/keyringer.15
-rw-r--r--share/man/keyringer.1.mdwn3
4 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6f0c59b..ff881b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-01-15 - develop - Silvio Rhatto <rhatto@riseup.net>
+
+ Adds "delete" alias to "del" action.
+
2016-12-21 - 0.5.0 - Silvio Rhatto <rhatto@riseup.net>
Fixes keyringer_check_expiration failure if a public key is listed multiple
diff --git a/lib/keyringer/actions/delete b/lib/keyringer/actions/delete
new file mode 120000
index 0000000..1a7ac23
--- /dev/null
+++ b/lib/keyringer/actions/delete
@@ -0,0 +1 @@
+del \ No newline at end of file
diff --git a/share/man/keyringer.1 b/share/man/keyringer.1
index 19f447f..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
diff --git a/share/man/keyringer.1.mdwn b/share/man/keyringer.1.mdwn
index 09b1a26..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.