From 2a286f16215ebfac88a32d259f2b68191eb8d27e Mon Sep 17 00:00:00 2001 From: Richard Jones Date: Thu, 22 Jul 2010 10:59:43 +0100 Subject: [PATCH 1/1] generator: Make documentation inside guestfish match man page. --- src/generator.ml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/generator.ml b/src/generator.ml index 71421bc..69f561c 100755 --- a/src/generator.ml +++ b/src/generator.ml @@ -7773,10 +7773,17 @@ and generate_fish_cmds () = name2 (String.concat " " (List.map name_of_argt args)) in let warnings = - if List.mem ProtocolLimitWarning flags then - ("\n\n" ^ protocol_limit_warning) + if List.exists (function Key _ -> true | _ -> false) (snd style) then + "\n\nThis command has one or more key or passphrase parameters. +Guestfish will prompt for these separately." else "" in + let warnings = + warnings ^ + if List.mem ProtocolLimitWarning flags then + ("\n\n" ^ protocol_limit_warning) + else "" in + (* For DangerWillRobinson commands, we should probably have * guestfish prompt before allowing you to use them (especially * in interactive mode). XXX -- 1.8.3.1