From b0967e64df7a4f4d1cd2af95ccda8a0ba3447138 Mon Sep 17 00:00:00 2001 From: Joe Crayne Date: Fri, 5 Jul 2019 23:18:59 -0400 Subject: Correction to merge documentation. --- kiki.hs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/kiki.hs b/kiki.hs index bca3ca5..4126a93 100644 --- a/kiki.hs +++ b/kiki.hs @@ -1303,11 +1303,7 @@ kiki "merge" [] = do , " | --" , " | FILE ) ..." , "" - , "OPERANDS" - , "" - , " --home[=HOMEDIR] A symbolic operand that is a place holder for two files:" - , " HOMEDIR/{secring.gpg,pubring.gpg}" - , " HOMEDIR defaults to your GnuPG home directory." + , "OPTIONS" , "" , " --agent Use gpg-agent." , "" @@ -1319,6 +1315,12 @@ kiki "merge" [] = do , "" , " --packets After files have been written, declare each known pkg packet." , "" + , "OPERANDS" + , "" + , " --home[=HOMEDIR] A symbolic operand that is a place holder for two files:" + , " HOMEDIR/{secring.gpg,pubring.gpg}" + , " HOMEDIR defaults to your GnuPG home directory." + , "" , " FILE A path to a key file to read or update." , "" , "MODIFIERS" -- cgit v1.2.3