summaryrefslogtreecommitdiff
path: root/kiki.hs
diff options
context:
space:
mode:
authorjoe <joe@jerkface.net>2014-05-05 21:57:23 -0400
committerjoe <joe@jerkface.net>2014-05-05 21:57:23 -0400
commitb67c7e1a1fab761159e45505579e9ab6d8ec78d8 (patch)
tree59adb326cc0ef223ab7c7a0d69b683f019cfb0b2 /kiki.hs
parent9deb2a81dcfc3c4489824d5a753cbe03fe82c492 (diff)
renamed merge KEYSPEC to SPEC for consistency with other commands.
Diffstat (limited to 'kiki.hs')
-rw-r--r--kiki.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/kiki.hs b/kiki.hs
index a7189f0..6c72eb5 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -877,7 +877,7 @@ kiki "merge" [] = do
877 [ "kiki merge ( --home[=HOMEDIR]" 877 [ "kiki merge ( --home[=HOMEDIR]"
878 , " | --type=(keyring|pem|wallet|hosts)" 878 , " | --type=(keyring|pem|wallet|hosts)"
879 , " | --access=[auto|secret|public]" 879 , " | --access=[auto|secret|public]"
880 , " | --flow=(fill|spill|sync)[,(subkeys|match=KEYSPEC)]" 880 , " | --flow=(fill|spill|sync)[,(subkeys|match=SPEC)]"
881 , " | --create=CMD" 881 , " | --create=CMD"
882 , " | --autosign[=no]" 882 , " | --autosign[=no]"
883 , " | --" 883 , " | --"