diff --git a/Ledger/Amount.hs b/Ledger/Amount.hs index 0d99df34e..c5cefbc60 100644 --- a/Ledger/Amount.hs +++ b/Ledger/Amount.hs @@ -13,13 +13,14 @@ A simple amount is a commodity, quantity pair (where commodity can be anything): 0 @ -A mixed amount (not yet implemented) is one or more simple amounts: +A mixed amount is zero or more simple amounts: @ $50, EUR 3, AAPL 500 16h, $13.55, oranges 6 @ +Not fully implemented: Commodities may be convertible or not. A mixed amount containing only convertible commodities can be converted to a simple amount. Arithmetic examples: diff --git a/Options.hs b/Options.hs index 3c207f8cb..5162ae663 100644 --- a/Options.hs +++ b/Options.hs @@ -13,7 +13,7 @@ warning = if negativepatternchar=='-' then " (must appear before command)" e usageftr = "\n" ++ "Commands (may be abbreviated):\n" ++ "balance - show account balances\n" ++ - "print - show parsed and reformatted ledger entries\n" ++ + "print - show formatted ledger entries\n" ++ "register - show register transactions\n" ++ "\n" ++ "Account and description patterns are regular expressions, optionally prefixed\n" ++