diff --git a/doc/common.m4 b/doc/common.m4 index 01cb2e920..830d62c5f 100644 --- a/doc/common.m4 +++ b/doc/common.m4 @@ -230,11 +230,16 @@ and largely interconvertible with beancount(1). }} )m4_dnl m4_dnl m4_dnl A standard description of where hledger reads data from. m4_define({{_inputfiles_}}, -{{data from one or more files in journal, timeclock, timedot, or CSV format. -The default file is `.hledger.journal` in your home directory; -this can be overridden with one or more `-f FILE` options, -or the `LEDGER_FILE` environment variable.}})m4_dnl +{{reads from (and appends to) a journal file specified by the `LEDGER_FILE` environment variable +(defaulting to `$HOME/.hledger.journal`); or you can specify files with `-f` options. +It can also read timeclock files, timedot files, or any CSV/SSV/TSV file with a date field.}} )m4_dnl m4_dnl +m4_dnl Like the above, with an added pointer to the hledger manual. +m4_define({{_inputfileswithptr_}}, +{{_inputfiles_ +(See hledger(1) -> Input for details.)}} )m4_dnl +m4_dnl + m4_dnl A standard description of the LEDGER_FILE environment variable. m4_define({{_LEDGER_FILE_}}, {{ **LEDGER_FILE** diff --git a/hledger-ui/hledger-ui.m4.md b/hledger-ui/hledger-ui.m4.md index cf5c65675..78b808c64 100644 --- a/hledger-ui/hledger-ui.m4.md +++ b/hledger-ui/hledger-ui.m4.md @@ -42,8 +42,7 @@ for viewing accounts and transactions, and some limited data entry capability. It is easier than hledger's command-line interface, and sometimes quicker and more convenient than the web interface. -Like hledger, it reads _inputfiles_ -For more about this see hledger(1), hledger_journal(5) etc. +Like hledger, it _inputfileswithptr_ Unlike hledger, hledger-ui hides all future-dated transactions by default. They can be revealed, along with any rule-generated periodic transactions, @@ -376,7 +375,7 @@ _LEDGER_FILE_ # FILES -Reads _inputfiles_ +It _inputfileswithptr_ # BUGS diff --git a/hledger-web/hledger-web.m4.md b/hledger-web/hledger-web.m4.md index 5eed2114d..58c639115 100644 --- a/hledger-web/hledger-web.m4.md +++ b/hledger-web/hledger-web.m4.md @@ -47,8 +47,7 @@ behind a suitable web proxy. As a small protection against data loss when running an unprotected instance, it writes a numbered backup of the main journal file (only) on every edit. -Like hledger, it reads _inputfiles_ -For more about this see hledger(1). +Like hledger, it _inputfileswithptr_ hledger-web can be run in three modes: @@ -422,7 +421,7 @@ _LEDGER_FILE_ # FILES -Reads _inputfiles_ +It _inputfileswithptr_ # BUGS diff --git a/hledger/hledger.m4.md b/hledger/hledger.m4.md index 8be33d87b..bfb04d152 100644 --- a/hledger/hledger.m4.md +++ b/hledger/hledger.m4.md @@ -56,10 +56,9 @@ and print a useful report on the terminal (or save it as HTML, CSV, JSON or SQL) Many reports are available, as subcommands. hledger will also detect other `hledger-*` executables as extra subcommands. -hledger reads _inputfiles_ -hledger CLI can also read from stdin with `-f-`; more on that below. +hledger usually _inputfiles_ -Here is a small but valid hledger journal file describing one transaction: +Here is a small journal file describing one transaction: _journal_({{ 2015-10-16 bought food