From e3dacfc402108d2da408f843542d82dcab58157d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 26 Dec 2016 11:54:37 -0400 Subject: get usage and man page back in sync Remove --build which is no longer present. Order the list of options the same. Document --rm-key in man page. --- doc/usage.mdwn | 4 ++++ src/Propellor/CmdLine.hs | 7 +++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/doc/usage.mdwn b/doc/usage.mdwn index fec346ae..fc1f8391 100644 --- a/doc/usage.mdwn +++ b/doc/usage.mdwn @@ -66,6 +66,10 @@ and configured in haskell. using this key. Propellor requires signed commits when pulling from a central git repository. +* propellor --rm-key keyid + + Stops encrypting the privdata to a gpg key. + * propellor --list-fields Lists all privdata fields that are used by your propellor configuration. diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs index fc256109..448abf62 100644 --- a/src/Propellor/CmdLine.hs +++ b/src/Propellor/CmdLine.hs @@ -25,19 +25,18 @@ usage h = hPutStrLn h $ unlines [ "Usage:" , " propellor --init" , " propellor" - , " propellor hostname" , " propellor --spin targethost [--via relayhost]" , " propellor --add-key keyid" , " propellor --rm-key keyid" , " propellor --list-fields" - , " propellor --dump field context" - , " propellor --edit field context" , " propellor --set field context" , " propellor --unset field context" , " propellor --unset-unused" + , " propellor --dump field context" + , " propellor --edit field context" , " propellor --merge" - , " propellor --build" , " propellor --check" + , " propellor hostname" ] usageError :: [String] -> IO a -- cgit v1.2.3