Rename @code{--option} to @option{--option}

Rename @code{-Q} to @option{--download (-Q)}. The reasoning is that the reader of the manual is a newcomer, and as a newcomer --download is more self-explicit compared to a cryptic single letter. But information is kept for advanced user who can still exercise their mastery with cryptic things.

Fix short option -Z (and not -L) for --price-exp

Fix "@section Balance format" (as @option in title is causing issues with makeinfo).

Fix consistency of @option{--option @var{VAR}} by adding systematically @var{VAR}.

Add period at end of sentences.

1 files changed, 461 insertions, 417 deletions

diff --git a/doc/ledger3.texi b/doc/ledger3.texi
index d71bb50f..f4d706df 100644
--- a/doc/ledger3.texi
+++ b/doc/ledger3.texi
@@ -10,11 +10,14 @@
 @c | Formating | Indexing |                                           |
 @c |           | @cindex  | concept                                   |
 @c | @command  | @findex  | Ledger CLI Command (like balance)         |
-@c | @option   | @oindex  | Ledger CLI Option (like --file)           |
+@c | @option   | @findex  | Ledger CLI Option (like --market)         |
 @c | @var      |          | Ledger CLI option Variable (like -f FILE) |
 @c |           | @sindex  | Ledger file Syntax                        |
 @c | @samp     |          | Example                                   |
 
+@c Restructuring manual ideas
+@c http://beyondgrep.com/documentation/ack-2.04-man.html
+
 @copying
 
 Copyright @copyright{} 2003–2013, John Wiegley.  All rights reserved.
@@ -891,9 +894,9 @@ P 2004/06/21 02:18:02 AU $400.00
 
 @findex --price-db @var{FILE}
 @findex --market
-Specify the price history to use with the @code{--price-db} option,
-with the @code{-V (--market)} option to report in terms of current
-market value:
+Specify the price history to use with the @option{--price-db @var{FILE}}
+option, with the @option{--market (-V)} option to report in terms of
+current market value:
 
 @smallexample
 $ ledger --price-db prices.db -V balance brokerage
@@ -1190,7 +1193,7 @@ $ ledger bal -^Assets
 @end smallexample
 
 @findex --real
-If the @code{--real} option is used, the report will be in terms of
+If the @option{--real} option is used, the report will be in terms of
 the real accounts:
 
 @smallexample
@@ -1212,7 +1215,7 @@ The second way of tracking funds is to use transaction codes.  In this
 respect the codes become like virtual accounts that embrace the entire
 set of postings.  Basically, we are associating a transaction with a
 fund by setting its code.  Here are two transactions that deposit money
-into, and spend money from, the @code{Funds:School} fund:
+into, and spend money from, the @samp{Funds:School} fund:
 
 @smallexample
 2004/03/25 (Funds:School) Donations
@@ -1231,18 +1234,18 @@ relate to a particular fund is kept only in the code.
 @findex --code-as-payee
 @findex --by-payee
 How does this become a fund report?  By using the
-@code{--code-as-payee} option, you can generate a register report
-where the payee for each posting shows the code.  Alone, this is
-not terribly interesting; but when combined with the
-@code{--by-payee} option, you will now see account subtotals for any
-postings related to a specific fund.  So, to see the current
-monetary balances of all funds, the command would be:
+@option{--code-as-payee} option, you can generate a register report
+where the payee for each posting shows the code.  Alone, this is not
+terribly interesting; but when combined with the @option{--by-payee
+(-P)} option, you will now see account subtotals for any postings
+related to a specific fund.  So, to see the current monetary balances of
+all funds, the command would be:
 
 @smallexample
 $ ledger --code-as-payee -P reg ^Assets
 @end smallexample
 
-Or to see a particular funds expenses, the @code{School} fund in this
+Or to see a particular funds expenses, the @samp{School} fund in this
 case:
 
 @smallexample
@@ -1389,10 +1392,10 @@ system.
 At the highest level you have five sorts of accounts:
 
 @enumerate
-@item Expenses: where money goes
-@item Assets: where money sits
-@item Income: where money comes from
-@item Liabilities: money you owe
+@item Expenses: where money goes,
+@item Assets: where money sits,
+@item Income: where money comes from,
+@item Liabilities: money you owe,
 @item Equity: the real value of your property.
 @end enumerate
 
@@ -1644,18 +1647,18 @@ Assets:Checking because its amount is null.
 
 Ledger allows you to have very detailed control over how your
 commodities are valued. You can fine tune the results given using the
-@code{--market} or @code{--exchange @var{COMMODITY}} options. There
+@option{--market} or @option{--exchange @var{COMMODITY}} options. There
 are now several points of interception, you can specify the valuation
 method:
 
 @enumerate
-@item on a commodity itself
-@item on a posting, via metadata (affect is largely the same as #1)
-@item on an xact, which then applies to all postings in that xact
-@item on any posting via an automated transaction
-@item on a per-account basis
-@item on a per-commodity basis
-@item by changing the journal default of @code{market}
+@item on a commodity itself,
+@item on a posting, via metadata (affect is largely the same as #1),
+@item on an xact, which then applies to all postings in that xact,
+@item on any posting via an automated transaction,
+@item on a per-account basis,
+@item on a per-commodity basis,
+@item by changing the journal default of @code{market}.
 @end enumerate
 
 Fixated pricing (such as @samp{@{=$20@}}) still plays a role in this
@@ -1668,15 +1671,15 @@ A valuation function receives three arguments:
 
 @item  source
 A string identifying the commodity whose price is being asked for
-(example: @samp{EUR})
+(example: @samp{EUR}).
 
 @item date
 The reference date the price should be relative.
 
 @item target
 A string identifying the ``target'' commodity, or the commodity the
-returned price should be in. This argument is null if @code{--market}
-was used instead of @code{--exchange @var{COMMODITY}}.
+returned price should be in. This argument is null if @option{--market}
+was used instead of @option{--exchange @var{COMMODITY}}.
 
 @end table
 
@@ -1884,9 +1887,10 @@ the syntax @code{[ACTUAL_DATE]} or @code{[=EFFECTIVE_DATE]} or
 @code{[ACTUAL_DATE=EFFECTIVE_DATE]} (@pxref{Virtual postings}).
 
 @item P
+@findex --download
 Specifies a historical price for a commodity.  These are usually found
-in a pricing history file (see the @code{-Q} option).  The syntax
-is:
+in a pricing history file (see the @option{--download (-Q)} option).
+The syntax is:
 
 @smallexample
 P DATE SYMBOL PRICE
@@ -1934,7 +1938,7 @@ Command directives must occur at the beginning of a line.  Use of
 
 @item account
 Pre-declare valid account names.  This only has effect if
-@code{--strict} or @code{--pedantic} is used (see below).  The
+@option{--strict} or @option{--pedantic} is used (see below).  The
 @code{account} directive supports several optional sub-directives, if
 they immediately follow the account directive and if they begin with
 whitespace:
@@ -2065,8 +2069,8 @@ account. For example:
 capture  Expenses:Deductible:Medical  Medical
 @end smallexample
 
-Would cause any posting with @code{Medical} in its name to be replaced
-with @code{Expenses:Deductible:Medical}.
+Would cause any posting with @samp{Medical} in its name to be replaced
+with @samp{Expenses:Deductible:Medical}.
 
 Ledger will display the mapped payees in @command{print} and
 @command{register} reports.
@@ -2085,8 +2089,8 @@ check <VALUE EXPRESSION BOOLEAN RESULT>
 Start a block comment, closed by @code{end comment}.
 
 @item commodity
-Pre-declare commodity names.  This only has effect if @code{--strict}
-or @code{--pedantic} is used (see below).
+Pre-declare commodity names.  This only has effect if @option{--strict}
+or @option{--pedantic} is used (see below).
 
 @smallexample
 commodity $
@@ -2237,7 +2241,7 @@ end apply tag hastag
 @end smallexample
 
 @noindent
-is the equivalent of
+is the equivalent of:
 
 @smallexample
 2011/01/25 Tom's Used Cars
@@ -2264,8 +2268,8 @@ the name of the tag that is being closed is a simple way to keep
 track.
 
 @item tag
-Pre-declares tag names.  This only has effect if @code{--strict} or
-@code{--pedantic} is used (see below).
+Pre-declares tag names.  This only has effect if @option{--strict} or
+@option{--pedantic} is used (see below).
 
 @smallexample
 tag Receipt
@@ -2310,10 +2314,10 @@ alone, for backwards compatibility with older Ledger versions.
 @table @code
 
 @item A
-See @code{bucket}
+See @code{bucket}.
 
 @item Y
-See @code{year}
+See @code{year}.
 
 @item N SYMBOL
 Indicates that pricing information is to be ignored for a given
@@ -2544,9 +2548,9 @@ primary date with an equals sign:
 @end smallexample
 
 What this auxiliary date means is entirely up to you.  The only use
-Ledger has for it is that if you specify @code{--aux-date}, then all
-reports and calculations (including pricing) will use the aux date as
-if it were the primary date.
+Ledger has for it is that if you specify @option{--aux-date}, then all
+reports and calculations (including pricing) will use the aux date as if
+it were the primary date.
 
 @node Codes, Transaction state, Auxiliary dates, Transactions
 @section Codes
@@ -2587,9 +2591,9 @@ To mark it pending, use a !:
     Assets:Cash
 @end smallexample
 
-What these mean is entirely up to you.  The @code{--cleared} option
-will limits to reports to only cleared items, while @code{--uncleared}
-shows both uncleared and pending items, and @code{--pending} shows
+What these mean is entirely up to you.  The @option{--cleared} option
+will limits to reports to only cleared items, while @option{--uncleared}
+shows both uncleared and pending items, and @option{--pending} shows
 only pending items.
 
 I use cleared to mean that I've reconciled the transaction with my
@@ -2769,7 +2773,7 @@ is all about!  But there are some tricks up Ledger's sleeve...
 You can use virtual accounts to transfer amounts to an account on the
 sly, bypassing the balancing requirement.  The trick is that these
 postings are not considered ``real'', and can be removed from all
-reports using @code{--real}.
+reports using @option{--real}.
 
 To specify a virtual account, surround the account name with
 parentheses:
@@ -2875,6 +2879,7 @@ indirectly provided by the balance assignment's value.
 
 @node  Balancing transactions,  , Resetting a balance, Balance verification
 @subsection Balancing transactions
+@findex --empty
 
 As a consequence of all the above, consider the following transaction:
 
@@ -2889,9 +2894,9 @@ posting must balance, ensure that its value is zero.  This can only be
 true if Assets:Brokerage does indeed contain 10 AAPL at that point in
 the input file.
 
-A balanced virtual transaction is used simply to indicate to Ledger
-that this is not a ``real'' transaction.  It won't appear in any
-reports anyway (unless you use a register report with @code{--empty}).
+A balanced virtual transaction is used simply to indicate to Ledger that
+this is not a ``real'' transaction.  It won't appear in any reports
+anyway (unless you use a register report with @option{--empty}).
 
 @node Posting cost, Explicit posting costs, Balance verification, Transactions
 @section Posting cost
@@ -2942,6 +2947,8 @@ from the first posting's cost, you can elide the otheramount:
 
 @node Primary and secondary commodities,  , Explicit posting costs, Explicit posting costs
 @subsection Primary and secondary commodities
+@findex --market
+@findex --exchange @var{COMMODITY}
 
 It is a general convention within Ledger that the ``top'' postings in
 a transaction contain the target accounts, while the final posting
@@ -2954,9 +2961,9 @@ Said another way, whenever Ledger sees a posting cost of the form
 "AMOUNT @@ AMOUNT", the commodity used in the second amount is marked
 ``primary''.
 
-The only meaning a primary commodity has is that @code{-V} flag will
-never convert a primary commodity into any other commodity.  @code{-X
-@var{COMMODITY}} still will, however.
+The only meaning a primary commodity has is that @option{--market (-V)}
+flag will never convert a primary commodity into any other commodity.
+@option{--exchange @var{COMMODITY} (-X)} still will, however.
 
 @node Posting cost expressions, Total posting costs, Explicit posting costs, Transactions
 @section Posting cost expressions
@@ -3020,9 +3027,9 @@ happening in the case of an exceptional transaction, surround the
 
 When a transaction occurs that exchange one commodity for another,
 Ledger records that commodity price not only within its internal price
-database, but also attached to the commodity itself.  Usually this
-fact remains invisible to the user, unless you turn on
-@code{--lot-prices} to show these hidden price figures.
+database, but also attached to the commodity itself.  Usually this fact
+remains invisible to the user, unless you turn on @option{--lot-prices}
+to show these hidden price figures.
 
 For example, consider the stock sale given above:
 
@@ -3201,7 +3208,7 @@ found in @ref{Prices vs. costs}.
 @findex --lot-dates
 
 In addition to lot prices, you can specify lot dates and reveal them
-with @code{--lot-dates}.  Other than that, however, they have no
+with @option{--lot-dates}.  Other than that, however, they have no
 special meaning to Ledger.  They are specified after the amount in
 square brackets (the same way that dates are parsed in value
 expressions):
@@ -3219,7 +3226,7 @@ expressions):
 @findex --lots
 
 You can also associate arbitrary notes for your own record keeping in
-parentheses, and reveal them with @code{--lot-notes}.  One caveat is
+parentheses, and reveal them with @option{--lot-notes}.  One caveat is
 that the note cannot begin with an @samp{@@} character, as that would
 indicate a virtual cost:
 
@@ -3233,15 +3240,15 @@ indicate a virtual cost:
 You can any combination of lot prices, dates or notes, in any order.
 They are all optional.
 
-To show all lot information in a report, use @code{--lots}.
+To show all lot information in a report, use @option{--lots}.
 
 @node Lot value expressions, Automated Transactions, Lot notes, Transactions
 @section Lot value expressions
 
-Normally when you ask Ledger to display the values of commodities
-held, it uses a value expression called ``market'' to determine the
-most recent value from its price database---even downloading prices
-from the Internet, if @code{-Q} was specified and a suitable
+Normally when you ask Ledger to display the values of commodities held,
+it uses a value expression called ``market'' to determine the most
+recent value from its price database---even downloading prices from the
+Internet, if @option{--download (-Q)} was specified and a suitable
 ``getquote'' script is found on your system.
 
 However, you can override this valuation logic by providing
@@ -3594,8 +3601,9 @@ really knows that it debited $225 this month.
 
 A periodic transaction starts with a @samp{~} followed by a period
 expression.  Periodic transactions are used for budgeting and
-forecasting only, they have no effect without the @code{--budget} option
-specified. For examples and details, @pxref{Budgeting and Forecasting}.
+forecasting only, they have no effect without the @option{--budget}
+option specified. For examples and details, @pxref{Budgeting and
+Forecasting}.
 
 @node Concrete Example of Automated Transactions,  , Periodic Transactions, Automated Transactions
 @subsection Concrete Example of Automated Transactions
@@ -3781,6 +3789,7 @@ there are none.  The second looks for any account with ``Bo'', which is
 @code{Expenses:Books}.
 
 @cindex limit by payees
+@findex --limit @var{EXPR}
 
 If you want to know exactly how much you have spent in a particular
 account on a particular payee, the following are equivalent:
@@ -3833,9 +3842,10 @@ total; and report the balance for all accounts that begin with
 @node Reporting monthly expenses,  , Typical queries, Typical queries
 @subsection Reporting monthly expenses
 @findex --monthly
-@findex -M
 @findex --display @var{EXPR}
 @findex --period-sort @var{VEXPR}
+@findex --related
+@findex --subtotal
 
 The following query makes it easy to see monthly expenses, with each
 month's expenses sorted by the amount:
@@ -3844,8 +3854,8 @@ month's expenses sorted by the amount:
 $ ledger -M --period-sort "(amount)" reg ^expenses
 @end smallexample
 
-Now, you might wonder where the money came from to pay for these
-things.  To see that report, add @code{-r}, which shows the
+Now, you might wonder where the money came from to pay for these things.
+To see that report, add @option{--related (-r)}, which shows the
 ``related account'' postings:
 
 @smallexample
@@ -3873,9 +3883,9 @@ This works just as well for report the overall total, too:
 $ ledger -s -r --display "account =~ /mastercard/" reg ^expenses
 @end smallexample
 
-The @code{-s} option subtotals all postings, just as @code{-M}
-subtotaled by the month.  The running total in both cases is off,
-however, since a display expression is being used.
+The @option{--subtotal (-s)} option subtotals all postings, just as
+@option{--monthly (-M)} subtotaled by the month.  The running total in
+both cases is off, however, since a display expression is being used.
 
 @node Advanced Reports,  , Typical queries, Building Reports
 @section Advanced Reports
@@ -4009,17 +4019,18 @@ nothing.
 @cindex Gnuplot
 @findex --amount-data
 @findex --total-data
+@findex --limit @var{EXPR}
+@findex --display @var{EXPR}
 
-If you have @command{Gnuplot} installed, you can graph any of the
-above register reports. The script to do this is included in the
-ledger distribution, and is named @file{contrib/report}. Install
-@file{report} anywhere along your @env{PATH}, and then use
-@command{report} instead of @command{ledger} when doing a register
-report. The only thing to keep in mind is that you must specify
-@code{-j (--amount-data)} or @code{-J (--total-data)} to indicate
-whether Gnuplot should plot the amount, or the running total. For
-example, this command plots total monthly expenses made on your
-MasterCard.
+If you have @command{Gnuplot} installed, you can graph any of the above
+register reports. The script to do this is included in the ledger
+distribution, and is named @file{contrib/report}. Install @file{report}
+anywhere along your @env{PATH}, and then use @command{report} instead of
+@command{ledger} when doing a register report. The only thing to keep in
+mind is that you must specify @option{--amount-data (-j)} or
+@option{--total-data (-J)} to indicate whether Gnuplot should plot the
+amount, or the running total. For example, this command plots total
+monthly expenses made on your MasterCard.
 
 @smallexample
 $ report -j -M -r --display "account =~ /mastercard/" reg ^expenses
@@ -4048,13 +4059,13 @@ report -J -l "Ua>=@{\$0.01@}" reg ^assets ^liab
 report -J -l "Ua>=@{\$0.01@}" -d "d>=[last feb]" reg ^assets ^liab
 @end smallexample
 
-The last report uses both a calculation predicate (@code{-l}) and
-a display predicate (@code{-d}).  The calculation predicates limits
-the report to postings whose amount is greater than $1 (which can only
-happen if the posting amount is in dollars).  The display predicate
-limits the transactions @emph{displayed} to just those since last
-February, even those transactions from before then will be computed as
-part of the balance.
+The last report uses both a calculation predicate @option{--limit
+@var{EXPR} (-l)} and a display predicate @option{--display @var{EXPR}
+(-d)}.  The calculation predicates limits the report to postings whose
+amount is greater than $1 (which can only happen if the posting amount
+is in dollars).  The display predicate limits the transactions
+@emph{displayed} to just those since last February, even those
+transactions from before then will be computed as part of the balance.
 
 @node Reporting Commands, Command-line Syntax, Building Reports, Top
 @chapter Reporting Commands
@@ -4096,6 +4107,8 @@ balances for an account, such as when @ref{Archiving Previous Years}.
 @node  The @command{register} command, The @command{print} command, The @command{equity} command, Primary Financial Reports
 @subsection The @command{register} command
 @findex register
+@findex --amount-data
+@findex --total-data
 
 The @command{register} command displays all the postings occurring
 in a single account, line by line.  The account regex must be
@@ -4109,11 +4122,12 @@ checkbook, or single-account ledger, would look like.  It also shows a
 running balance.  The final running balance of any register should
 always be the same as the current balance of that account.
 
-If you have Gnuplot installed, you may plot the amount or running
-total of any register by using the script @file{report}, which is
-included in the Ledger distribution.  The only requirement is that you
-add either @code{-j} or @code{-J} to your register command, in
-order to plot either the amount or total column, respectively.
+If you have Gnuplot installed, you may plot the amount or running total
+of any register by using the script @file{report}, which is included in
+the Ledger distribution.  The only requirement is that you add either
+@option{--amount-data (-j)} or @option{--total-data (-J)} to your
+register command, in order to plot either the amount or total column,
+respectively.
 
 @node  The @command{print} command,  , The @command{register} command, Primary Financial Reports
 @subsection The @command{print} command
@@ -4196,9 +4210,8 @@ Transaction Number,Date,Description,Memo,Amount Debit,Amount Credit,Balance,Chec
 Unfortunately, as it stands Ledger cannot read it, but you can. Ledger
 expects the first line to contain a description of the fields on each
 line of the file. The fields ledger can recognize are called
-@option{date}, @option{posted}, @option{code}, @option{payee} or
-@option{desc}, @option{amount}, @option{cost}, @option{total}, and
-@option{note}.
+@code{date}, @code{posted}, @code{code}, @code{payee} or @code{desc},
+@code{amount}, @code{cost}, @code{total}, and @code{note}.
 
 Delete the account description lines at the top, and replace the first
 line in the data above with:
@@ -4213,8 +4226,8 @@ Then execute ledger like this:
 $ ledger convert download.csv --input-date-format "%m/%d/%Y"
 @end smallexample
 
-Where the @code{--input-date-format} option tells ledger how to
-interpret the dates.
+Where the @option{--input-date-format @var{DATE_FORMAT}} option tells
+ledger how to interpret the dates.
 
 Importing csv files is a lot of work, and but is very amenable to
 scripting.
@@ -4238,13 +4251,14 @@ is from the file above.
 @findex --rich-data
 
 The @command{convert} command accepts three options, the most important
-ones are @code{--invert} which inverts the amount field, and
-@code{--account @var{STR}} which you can use to specify the account to
-balance against and @code{--rich-data}. When using the rich-data switch
-additional metadata is stored as tags. There is, for example, a UUID
-field. If an entry with the same UUID tag is already included in the
-normal ledger file (specified via @code{-f} or via environment variable
-@env{LEDGER_FILE}) this entry will not be printed again.
+ones are @option{--invert} which inverts the amount field, and
+@option{--account @var{STR}} which you can use to specify the account to
+balance against and @option{--rich-data}. When using the rich-data
+switch additional metadata is stored as tags. There is, for example,
+a UUID field. If an entry with the same UUID tag is already included in
+the normal ledger file (specified via @option{--file @var{FILE} (-f)} or
+via environment variable @env{LEDGER_FILE}) this entry will not be
+printed again.
 
 You can also use @command{convert} with @code{payee} and @code{account}
 directives. First, you can use the @code{payee} and @code{alias}
@@ -4532,6 +4546,7 @@ transactions.
 
 @node An overall balance summary, Generating a monthly register, Financial Summaries, Org mode with Babel
 @subsubsection An overall balance summary
+@findex --subtotal
 
 The overall balance of your account and expenditure with a breakdown
 according to category is specified by passing the @code{:cmdline bal}
@@ -4553,7 +4568,7 @@ by the @code{<<income>>} and @code{<<expenses>>} lines.
 @end smallexample
 
 If you want a more detailed breakdown of where your money is and where
-it has been spent, you can specify the @code{-s} flag
+it has been spent, you can specify the @option{--subtotal (-s)} flag
 (i.e. @code{:cmdline -s bal}) to tell Ledger to include sub-accounts in
 the report.
 
@@ -4579,12 +4594,13 @@ the report.
 @node Generating a monthly register, Summary, An overall balance summary, Org mode with Babel
 @subsubsection Generating a monthly register
 @findex register
+@findex --monthly
 
 You can also generate a monthly register (the @command{reg} command) by
 executing the following @code{src} block. This presents a summary of
-transactions for each monthly period (the @code{-M} argument) with
-a running total in the final column (which should be 0 at the end if all
-the entries are correct).
+transactions for each monthly period (the @option{--monthly (-M)}
+argument) with a running total in the final column (which should be 0 at
+the end if all the entries are correct).
 
 @smallexample
 #+name: monthlyregister
@@ -4721,10 +4737,10 @@ Lastly follows the amount of the posting, indicated by
 there are four different kinds, each with its own format:
 
 @enumerate
-@item Boolean
-@item integer
-@item amount
-@item balance
+@item Boolean,
+@item integer,
+@item amount,
+@item balance.
 @end enumerate
 
 The format of a Boolean value is @code{true} or @code{false}
@@ -4804,11 +4820,12 @@ the same data.
 @subsection @command{prices} and @command{pricedb} commands
 @findex prices
 @findex pricedb
+@findex --average
 
 The @command{prices} command displays the price history for matching
-commodities.  The @code{-A} flag is useful with this report, to
-display the running average price, or @code{-D} to show each price's
-deviation from that average.
+commodities.  The @option{--average (-A)} option is useful with this
+report, to display the running average price, or @option{--deviation
+(-D)} to show each price's deviation from that average.
 
 There is also a @command{pricedb} command which outputs the same
 information as @command{prices}, but does in a format that can be
@@ -4834,17 +4851,16 @@ pricedb database files.
 @findex accounts
 
 The @command{accounts} reports all of the accounts in the journal.
-Following the command with a regular expression will limit the output
-to accounts matching the regex. The output is sorted by name.  Using
-the @code{--count} option will tell you how many entries use each
-account.
+Following the command with a regular expression will limit the output to
+accounts matching the regex. The output is sorted by name.  Using the
+@option{--count} option will tell you how many entries use each account.
 
 @node @command{payees}, @command{commodities}, @command{accounts}, Reports about your Journals
 @subsection @command{payees}
 @findex payees
 
 The @command{payees} reports all of the unique payees in the journal.
-Using the @code{--count} option will tell you how many entries use
+Using the @option{--count} option will tell you how many entries use
 each payee. To filter the payees displayed you must use the prefix:
 
 @smallexample
@@ -4859,9 +4875,9 @@ Vaca Veronica
 @subsection @command{commodities}
 @findex commodities
 
-Report all commodities present in the journals under consideration.
-The output is sorted by name.  Using the @code{--count} option will
-tell you how many entries use each commodity.
+Report all commodities present in the journals under consideration.  The
+output is sorted by name.  Using the @option{--count} option will tell
+you how many entries use each commodity.
 
 @node @command{tags}, @command{xact}, @command{commodities}, Reports about your Journals
 @subsection @command{tags}
@@ -4869,8 +4885,8 @@ tell you how many entries use each commodity.
 @findex --values
 
 The @command{tags} reports all of the tags in the journal.  The output
-is sorted by name.  Using the @code{--count} option will tell you how
-many entries use each tag.  Using the @code{--values} option will
+is sorted by name.  Using the @option{--count} option will tell you how
+many entries use each tag.  Using the @option{--values} option will
 report the values used by each tag.
 
 @node @command{xact}, @command{stats}, @command{tags}, Reports about your Journals
@@ -5019,36 +5035,36 @@ commands.
 
 @item balance
 @itemx bal
-Show account balances
+Show account balances.
 
 @item register
 @itemx reg
-Show all transactions with running total
+Show all transactions with running total.
 
 @item csv
-Show transactions in csv format, for exporting to other programs
+Show transactions in csv format, for exporting to other programs.
 
 @item print
-Print transaction in a ledger readable format
+Print transaction in a ledger readable format.
 
 @item xml
-Produce XML output of the register command
+Produce XML output of the register command.
 
 @item lisp
 @itemx emacs
-Produce Emacs lisp output
+Produce Emacs lisp output.
 
 @item equity
-Print account balances as transactions
+Print account balances as transactions.
 
 @item prices
-Print price history for matching commodities
+Print price history for matching commodities.
 
 @item pricedb
-Print price history for matching commodities in ledger readable format
+Print price history for matching commodities in ledger readable format.
 
 @item xact
-Generate transactions based on previous postings
+Generate transactions based on previous postings.
 
 @end ftable
 
@@ -5059,27 +5075,27 @@ Generate transactions based on previous postings
 
 @item --help
 @itemx -h
-Print summary of all options
+Print summary of all options.
 
 @item --version
 @itemx -v
-Print version of ledger executable
+Print version of ledger executable.
 
 @item --file @var{FILE}
 @itemx -f @var{FILE}
-Read @file{FILE} as a ledger file
+Read @file{FILE} as a ledger file.
 
 @item --output @var{FILE}
 @itemx -o @var{FILE}
-Redirect output to @file{FILE}
+Redirect output to @file{FILE}.
 
 @item --init-file @var{FILE}
 @itemx -i @var{FILE}
-Specify options file
+Specify options file.
 
 @item --account @var{STR}
 @itemx -a @var{STR}
-Specify default account @var{STR} for QIF file postings
+Specify default account @var{STR} for QIF file postings.
 
 @end ftable
 
@@ -5090,70 +5106,70 @@ Specify default account @var{STR} for QIF file postings
 
 @item --current
 @itemx -c
-Display transaction on or before the current date
+Display transaction on or before the current date.
 
 @item --begin @var{DATE}
 @itemx -b @var{DATE}
-Begin reports on or after @var{DATE}
+Begin reports on or after @var{DATE}.
 
 @item --end @var{DATE}
 @itemx -e @var{DATE}
-Limit end date of transactions for report
+Limit end date of transactions for report.
 
 @item --period @var{PERIOD_EXPRESSION}
 @itemx -p @var{PERIOD_EXPRESSION}
-Set report period to @var{PERIOD_EXPRESSION}
+Set report period to @var{PERIOD_EXPRESSION}.
 
 @item --period-sort @var{VEXPR}
-Sort postings within each period
+Sort postings within each period.
 
 @item --cleared
 @itemx -C
-Display only cleared postings
+Display only cleared postings.
 
 @item --dc
-Display register or balance in debit/credit format
+Display register or balance in debit/credit format.
 
 @item --uncleared
 @itemx -U
-Display only uncleared postings
+Display only uncleared postings.
 
 @item --real
 @itemx -R
-Display only real postings
+Display only real postings.
 
 @item --actual
 @itemx -L
-Display only actual postings, not automated
+Display only actual postings, not automated.
 
 @item --related
 @itemx -r
-Display related postings
+Display related postings.
 
 @item --budget
-Display how close your postings meet your budget
+Display how close your postings meet your budget.
 
 @item --add-budget
-Show un-budgeted postings
+Show un-budgeted postings.
 
 @item --unbudgeted
-Show only un-budgeted postings
+Show only un-budgeted postings.
 
-@item --forecast
-Project balances into the future
+@item --forecast @var{VEXPR}
+Project balances into the future.
 
 @item --limit @var{EXPR}
 @itemx -l @var{EXPR}
-Limit postings in calculations
+Limit postings in calculations.
 
 @item --amount @var{EXPR}
 @itemx -t @var{EXPR}
-Change value expression reported in @command{register} report
+Change value expression reported in @command{register} report.
 
 @item --total @var{VEXPR}
 @itemx -T @var{VEXPR}
 Change the value expression used for ``totals'' column in
-@command{register} and @command{balance} reports
+@command{register} and @command{balance} reports.
 
 @end ftable
 
@@ -5185,97 +5201,97 @@ Instruct ledger to evaluate calculations immediately rather than lazily.
 
 @item --collapse
 @itemx -n
-Collapse transactions with multiple postings
+Collapse transactions with multiple postings.
 
 @item --subtotal
 @itemx -s
-Report register as a single subtotal
+Report register as a single subtotal.
 
 @item --by-payee
 @itemx -P
-Report subtotals by payee
+Report subtotals by payee.
 
 @item --empty
 @itemx -E
-Include empty accounts in report
+Include empty accounts in report.
 
 @item --weekly
 @itemx -W
-Report posting totals by week
+Report posting totals by week.
 
 @item --yearly
 @itemx -Y
-Report posting totals by year
+Report posting totals by year.
 
 @item --dow
-Report Posting totals by day of week
+Report Posting totals by day of week.
 
 @item --sort @var{VEXPR}
 @itemx -S @var{VEXPR}
-Sort a report using @var{VEXPR}
+Sort a report using @var{VEXPR}.
 
 @item --wide
 @itemx -w
-Assume 132 columns instead of 80
+Assume 132 columns instead of 80.
 
 @item --head @var{INT}
-Report the first @var{INT} postings
+Report the first @var{INT} postings.
 
 @item --tail @var{INT}
-Report the last @var{INT} postings
+Report the last @var{INT} postings.
 
 @item --pager @var{FILE}
-Direct output to @var{FILE} pager program
+Direct output to @var{FILE} pager program.
 
 @item --average
 @itemx -A
-Report average posting value
+Report average posting value.
 
 @item --deviation
 @itemx -D
-Report each posting deviation from the average
+Report each posting deviation from the average.
 
 @item --percent
 @itemx -%
-Show subtotals in the balance report as percentages
+Show subtotals in the balance report as percentages.
 @c @item --totals
 @c Include running total in the @command{xml} report
 
 @item --pivot @var{TAG}
-Produce a pivot table of the @var{TAG} type specified
+Produce a pivot table of the @var{TAG} type specified.
 
 @item --amount-data
 @itemx -j
-Show only date and value column to format the output for plots
+Show only date and value column to format the output for plots.
 
 @item --plot-amount-format @var{FORMAT_STRING}
-Specify the format for the plot output
+Specify the format for the plot output.
 
 @item --total-data
 @itemx -J
-Show only dates and totals to format the output for plots
+Show only dates and totals to format the output for plots.
 
 @item --plot-total-format @var{FORMAT_STRING}
-Specify the format for the plot output
+Specify the format for the plot output.
 
 @item --display @var{EXPR}
 @itemx -d @var{EXPR}
-Display only posting that meet the criterias in the @var{EXPR}
+Display only posting that meet the criterias in the @var{EXPR}.
 
 @item --date-format @var{DATE_FORMAT}
 @itemx -y @var{DATE_FORMAT}
-Change the basic date format used in reports
+Change the basic date format used in reports.
 
 @item --format @var{FORMAT_STRING}
 @itemx --balance-format @var{FORMAT_STRING}
 @itemx --register-format @var{FORMAT_STRING}
 @itemx --prices-format @var{FORMAT_STRING}
 @itemx -F @var{FORMAT_STRING}
-Set reporting format
+Set reporting format.
 
 @item --wide
 @itemx -w
-Wide
+Wide.
 
 @item --anon
 Print the ledger register with anonymized accounts and payees, useful
@@ -5290,33 +5306,33 @@ for filing bug reports.
 
 @item --by-payee
 @itemx -P
-Group postings by common payee names
+Group postings by common payee names.
 
 @item --daily
 @itemx -D
-Group postings by day
+Group postings by day.
 
 @item --weekly
 @itemx -W
-Group postings by week
+Group postings by week.
 
 @item --monthly
 @itemx -M
-Group postings by month
+Group postings by month.
 
 @item --quarterly
-Group postings by quarter
+Group postings by quarter.
 
 @item --yearly
 @itemx -Y
-Group postings by year
+Group postings by year.
 
 @item --dow
-Group by day of weeks
+Group by day of weeks.
 
 @item --subtotal
 @itemx -s
-Group posting together, similar to balance report
+Group posting together, similar to balance report.
 
 @end ftable
 
@@ -5329,7 +5345,7 @@ Group posting together, similar to balance report
 Use @file{FILE} for retrieving stored commodity prices.
 
 @item --price-exp @var{INT}
-@itemx -L @var{INT}
+@itemx -Z @var{INT}
 Set expected freshness of prices in @var{INT} minutes.
 
 @item --download
@@ -5397,7 +5413,7 @@ FIX THIS ENTRY @c FIXME thdox
 Display the info page for ledger.
 
 @item --init-file @var{FILE}
-Specify the location of the init file. The default is @file{~/.ledgerrc}
+Specify the location of the init file. The default is @file{~/.ledgerrc}.
 
 @item --options
 Display the options in effect for this Ledger invocation, along with
@@ -5488,7 +5504,7 @@ decimal separator, vice a period.
 @item --download
 @itemx -Q
 Direct Ledger to download prices using the script defined in
-@code{--getquote @var{FILE}}.
+@option{--getquote @var{FILE}}.
 
 @item --explicit
 FIX THIS ENTRY @c FIXME thdox
@@ -5554,26 +5570,26 @@ Specify the location of the price entry data file.
 @itemx -Z @var{INT}
 @itemx --leeway @var{INT}
 Set the expected freshness of price quotes, in @var{INT} minutes. That
-is, if the last known quote for any commodity is older than this
-value, and if @code{--download} is being used, then the Internet will
-be consulted again for a newer price. Otherwise, the old price is
-still considered to be fresh enough.
+is, if the last known quote for any commodity is older than this value,
+and if @option{--download} is being used, then the Internet will be
+consulted again for a newer price. Otherwise, the old price is still
+considered to be fresh enough.
 
 @item --strict
-Ledger normally silently accepts any account or commodity in
-a posting, even if you have misspelled a common used one.  The option
-@code{--strict} changes that behavior.  While running @code{--strict},
-Ledger interprets all cleared transactions as correct, and if it finds
-a new account or commodity (same as a misspelled commodity or account)
-it will issue a warning giving you the file and line number of the
-problem.
+Ledger normally silently accepts any account or commodity in a posting,
+even if you have misspelled a common used one.  The option
+@option{--strict} changes that behavior.  While running
+@option{--strict}, Ledger interprets all cleared transactions as
+correct, and if it finds a new account or commodity (same as
+a misspelled commodity or account) it will issue a warning giving you
+the file and line number of the problem.
 
 @item --time-colon
-The @code{--time-colon} option will display the value for a seconds
+The @option{--time-colon} option will display the value for a seconds
 based commodity as real hours and minutes.
 
 For example 8100 seconds by default will be displayed as 2.25 whereas
-with the @code{--time-colon} option they will be displayed as 2:15.
+with the @option{--time-colon} option they will be displayed as 2:15.
 
 @item --value-expr @var{FIXME}
 FIX THIS ENTRY @c FIXME thdox
@@ -5602,7 +5618,7 @@ desired width.
 
 @item --account @var{STR}
 Prepend @var{STR} to all accounts reported. That is, the option
-@code{--account Personal} would tack @samp{Personal:} to the beginning
+@samp{--account Personal} would track @samp{Personal:} to the beginning
 of every account reported in a balance report or register report.
 
 @item --account-width @var{INT}
@@ -5620,8 +5636,8 @@ Show only un-budgeted postings.
 @item --amount @var{EXPR}
 @itemx -t @var{EXPR}
 Apply the given value expression to the posting amount (@pxref{Value
-Expressions}). Using @code{--amount} you can apply an arbitrary
-transformation to the postings.
+Expressions}). Using @option{--amount @var{EXPR}} you can apply an
+arbitrary transformation to the postings.
 
 @item --amount-data
 @itemx -j
@@ -5665,7 +5681,7 @@ FIX THIS ENTRY @c ASK JOHN
 @item --basis
 @itemx -B
 @itemx --cost
-Report the cost basis on all posting
+Report the cost basis on all posting.
 
 @item --begin @var{DATE}
 Specify the start @var{DATE} of all calculations. Transactions before
@@ -5681,7 +5697,7 @@ $ ledger reg Expenses --begin Dec --bold-if "amount > 100"
 
 @noindent
 list all transactions since the beginning of December and bold any
-posting greater than $100
+posting greater than $100.
 
 @item --budget
 Only display budgeted items. In a register report this
@@ -5706,8 +5722,8 @@ Group the register report by payee.
 
 @item --cleared
 @itemx -C
-Consider only transaction that have been cleared for
-display and calculation.
+Consider only transaction that have been cleared for display and
+calculation.
 
 @item --cleared-format @var{FORMAT_STRING}
 FIX THIS ENTRY @c FIXME thdox: to keep?
@@ -5729,11 +5745,10 @@ Strings}). The default is:
 @item --collapse
 @itemx -n
 By default ledger prints all account in an account tree. With
-@code{--collapse} it print only the top level account specified.
+@option{--collapse} it print only the top level account specified.
 
 @item --collapse-if-zero
-Collapse the account display only if it has
-a zero balance.
+Collapse the account display only if it has a zero balance.
 
 @item --color
 @itemx --ansi
@@ -5743,8 +5758,8 @@ Use color is the tty supports it.
 Specify the width of the @command{register} report in characters.
 
 @item --count
-Direct ledger to report the number of items when
-appended to the commodities, accounts or payees command.
+Direct ledger to report the number of items when appended to the
+commodities, accounts or payees command.
 
 @item --csv-format @var{FORMAT_STRING}
 Specify the format to use for the @command{csv} report (@pxref{Format
@@ -5762,11 +5777,11 @@ Strings}).  The default is:
 @end smallexample
 
 @item --current
-Shorthand for @code{--limit "date <= today"}
+Shorthand for @samp{--limit "date <= today"}.
 
 @item --daily
 @itemx -D
-Shorthand for @code{--period "daily"}
+Shorthand for @samp{--period "daily"}.
 
 @item --date @var{EXPR}
 Transform the date of the transaction using @var{EXPR}.
@@ -5785,7 +5800,7 @@ FIX THIS ENTRY @c ASK JOHN
 
 @item --dc
 Display register or balance in debit/credit format If you use
-@code{--dc} with either the register (reg) or balance (bal) commands,
+@option{--dc} with either the register (reg) or balance (bal) commands,
 you will now get extra columns.  The register goes from this:
 
 @smallexample
@@ -5820,7 +5835,7 @@ Where the first column is debits, the second is credits, and the third
 is the running total.  Only the running total may contain negative
 values.
 
-For the balance report without @code{--dc}:
+For the balance report without @option{--dc}:
 
 @smallexample
                  $70  Assets:Cash
@@ -5831,7 +5846,7 @@ For the balance report without @code{--dc}:
 @end smallexample
 
 @noindent
-And with @code{--dc} it becomes this:
+And with @option{--dc} it becomes this:
 
 @smallexample
           $105            $35            $70  Assets:Cash
@@ -5842,15 +5857,15 @@ And with @code{--dc} it becomes this:
 @end smallexample
 
 @item --depth @var{INT}
-Limit the depth of the account tree.  In a balance report, for
-example, a @code{--depth 2} statement will print balances only for
-account with two levels, i.e. @code{Expenses:Entertainment} but not
-@code{Expenses:entertainemnt:Dining}. This is a display predicate,
-which means it only affects display, not the total calculations.
+Limit the depth of the account tree.  In a balance report, for example,
+a @samp{--depth 2} statement will print balances only for account with
+two levels, i.e. @samp{Expenses:Entertainment} but not
+@samp{Expenses:entertainemnt:Dining}. This is a display predicate, which
+means it only affects display, not the total calculations.
 
 @item --deviation
-Report each posting’s deviation from the average. It is only
-meaningful in the register and prices reports.
+Report each posting’s deviation from the average. It is only meaningful
+in the register and prices reports.
 
 @item --display @var{EXPR}
 Display lines that satisfy the expression given.
@@ -5934,8 +5949,8 @@ or @code{commodity}. The @code{tags()} function is also useful here.
 
 @item --group-title-format @var{FORMAT_STRING}
 Set the format for the headers that separate reports section of
-a grouped report.  Only has effect with a @code{--group-by} register
-report.
+a grouped report.  Only has effect with a @option{--group-by @var{EXPR}}
+register report.
 
 @smallexample
 $ ledger reg Expenses --group-by "payee" --group-title-format "------------------------ %-20(value) ---------------------\n"
@@ -5952,7 +5967,8 @@ $ ledger reg Expenses --group-by "payee" --group-title-format "-----------------
 
 @item --head @var{INT}
 @itemx --first @var{INT}
-Print the first @var{INT} entries. Opposite of @code{--tail}.
+Print the first @var{INT} entries. Opposite of @option{--tail
+@var{INT}}.
 
 @item --historical
 @itemx -H
@@ -6011,30 +6027,30 @@ In the register report, prepend the transaction with the value of the
 given @var{TAG}.
 
 @item --meta-width @var{INT}
-Specify the width of the Meta column used for the @code{--meta}
-options.
+Specify the width of the Meta column used for the @option{--meta
+@var{TAG}} options.
 
 @item --monthly
 @itemx -M
-Synonym for @code{--period "monthly"}
+Synonym for @samp{--period "monthly"}.
 
 @item --no-color
-suppress any color TTY output.
+Suppress any color TTY output.
 
 @item --no-rounding
-Don't output <Rounding> postings.  Note that this will cause the
-running total to often not add up!  It's main use is for @code{-j} and
-@code{-J} reports.
+Don't output <Rounding> postings.  Note that this will cause the running
+total to often not add up!  It's main use is for @option{--amount-data
+(-j)} and @option{--total-data (-J)} reports.
 
 @item --no-titles
-Suppress the output of group titles
+Suppress the output of group titles.
 
 @item --no-total
 Suppress printing the final total line in a balance report.
 
 @item --now @var{DATE}
 Define the current date in case to you to do calculate in the past or
-future using @code{--current}
+future using @option{--current}.
 
 @item --only @var{FIXME}
 This is a postings predicate that applies after certain transforms have
@@ -6056,7 +6072,7 @@ Set the number of columns dedicated to the payee in the register
 report.
 
 @item --pending
-Use only postings that are marked pending
+Use only postings that are marked pending.
 
 @item --percent
 @itemx -%
@@ -6100,7 +6116,7 @@ Define the output format for a total data plot. @xref{Visualizing with
 Gnuplot}.
 
 @item --prepend-format @var{FORMAT_STRING}
-Prepend @var{STR} to every line of the output
+Prepend @var{STR} to every line of the output.
 
 @item --prepend-width @var{INT}
 Reserve @var{INT} spaces at the beginning of each line of the output.
@@ -6124,7 +6140,7 @@ Show primary dates for all calculations (@pxref{Effective Dates}).
 FIX THIS ENTRY
 
 @item --quarterly
-Synonym for @code{--period "quarterly"}.
+Synonym for @samp{--period "quarterly"}.
 
 @item --raw
 In the print report, show transactions using the exact same syntax as
@@ -6145,7 +6161,7 @@ In a register report show the related account.  This is the other
 ``side'' of the transaction.
 
 @item --related-all
-Show all postings in a transaction, similar to @code{--related} but
+Show all postings in a transaction, similar to @option{--related} but
 show both ``sides'' of each transaction.
 
 @item --revalued
@@ -6178,7 +6194,7 @@ Sort the posting within transactions using the given value expression.
 
 @item --start-of-week @var{INT}
 Tell ledger to use a particular day of the week to start its ``weekly''
-summary. @code{--start-of-week=1} specifies Monday as the start of the
+summary. @samp{--start-of-week=1} specifies Monday as the start of the
 week.
 
 @item --subtotal
@@ -6239,15 +6255,15 @@ FIX THIS ENTRY @c FIXME thdox
 
 @item --weekly
 @itemx -W
-Synonym for @code{--period "weekly"}
+Synonym for @samp{--period "weekly"}.
 
 @item --wide
-Let the register report use 132 columns.  Identical to @code{--columns
-"132"}
+Let the register report use 132 columns.  Identical to @samp{--columns
+"132"}.
 
 @item --yearly
 @itemx -Y
-Synonym for @code{--period "yearly"}
+Synonym for @samp{--period "yearly"}.
 
 @end ftable
 
@@ -6326,7 +6342,7 @@ Constrain the report to transactions on or after @var{DATE}.  Only
 transactions after that date will be calculated, which means that the
 running total in the balance report will always start at zero with the
 first matching transaction.  (Note: This is different from using
-@code{--display} to constrain what is displayed).
+@option{--display @var{EXPR}} to constrain what is displayed).
 
 @item --end @var{DATE}
 @itemx -e @var{DATE}
@@ -6405,10 +6421,10 @@ posting that matched:
 
 @item --budget
 Useful for displaying how close your postings meet your budget.
-@code{--add-budget} also shows un-budgeted postings, while
-@code{--unbudgeted} shows only those.  @code{--forecast} is a related
-option that projects your budget into the future, showing how it will
-affect future balances.  @xref{Budgeting and Forecasting}.
+@option{--add-budget} also shows un-budgeted postings, while
+@option{--unbudgeted} shows only those.  @option{--forecast @var{VEXPR}}
+is a related option that projects your budget into the future, showing
+how it will affect future balances.  @xref{Budgeting and Forecasting}.
 
 @item --limit @var{EXPR}
 @itemx -l @var{EXPR}
@@ -6506,11 +6522,12 @@ begin date, use a period string, such as @code{weekly from DATE}.
 
 @item --monthly
 @itemx -M
-Report posting totals by month;
+Report posting totals by month.
 
 @item --yearly
 @itemx -Y
 Report posting totals by year.  For more complex period, using the
+@c TODO end this sentence
 
 @item --period @var{PERIOD_EXPRESSION}
 Option described above.
@@ -6522,10 +6539,10 @@ to see if weekend spending is more than on weekdays.
 @item --sort @var{VEXPR}
 @itemx -S @var{VEXPR}
 Sort a report by comparing the values determined using the value
-expression @var{VEXPR}.  For example, using @code{-S -UT} in the
-balance report will sort account balances from greatest to least, using
-the absolute value of the total.  For more on how to use value
-expressions, see @ref{Value Expressions}.
+expression @var{VEXPR}.  For example, using @samp{-S -UT} in the balance
+report will sort account balances from greatest to least, using the
+absolute value of the total.  For more on how to use value expressions,
+see @ref{Value Expressions}.
 
 @item --pivot @var{TAG}
 Produce a pivot table around the @var{TAG} provided. This requires
@@ -6539,8 +6556,8 @@ instead of 80.
 @item --head @var{INT}
 Cause only the first @var{INT} transactions to be printed. This is
 different from using the command-line utility @command{head}, which
-would limit to the first @var{INT} postings. @code{--tail} outputs
-only the last @var{INT} transactions. Both options may be used
+would limit to the first @var{INT} postings. @option{--tail @var{INT}}
+outputs only the last @var{INT} transactions. Both options may be used
 simultaneously. If a negative amount is given, it will invert the
 meaning of the flag (instead of the first five transactions being
 printed, for example, it would print all but the first five).
@@ -6556,15 +6573,15 @@ Report the average posting value.
 
 @item --deviation
 @itemx -D
-Report each posting's deviation from the average.  It is only
-meaningful in the @command{register} and @command{prices} reports.
+Report each posting's deviation from the average.  It is only meaningful
+in the @command{register} and @command{prices} reports.
 
 @item --percent
 @itemx -%
 Show account subtotals in the @command{balance} report as percentages of
 the parent account.
 
-@c @code{--totals} include running total information in the
+@c @option{--totals} include running total information in the
 @c @command{xml} report.
 
 @item --amount-data
@@ -6601,15 +6618,16 @@ $ ledger -p "last month" reg checking
 @end smallexample
 
 Which is more useful depends on what you're looking to know: the total
-amount for the reporting range (@code{-p}), or simply a display
-restricted to the reporting range (using @code{-d}).
+amount for the reporting range (using @option{--period
+@var{PERIOD_EXPRESSION} (-p)}), or simply a display restricted to the
+reporting range (using @option{--display @var{EXPR} (-d)}).
 
 @item --date-format @var{DATE_FORMAT}
 @itemx -y @var{DATE_FORMAT}
 Change the basic date format used by reports.  The default uses a date
 like @code{2004/08/01}, which represents the default date format of
 @code{%Y/%m/%d}.  To change the way dates are printed in general, the
-easiest way is to put @code{--date-format @var{DATE_FORMAT}} in the
+easiest way is to put @option{--date-format @var{DATE_FORMAT}} in the
 Ledger initialization file @file{~/.ledgerrc} (or the file referred to
 by @env{LEDGER_INIT}).
 
@@ -6705,23 +6723,23 @@ Set the format for @command{csv} reports.  The default is:
 @end smallexample
 
 @item --plot-amount-format @var{FORMAT_STRING}
-Set the format for amount plots, using the @code{-j} option. The
-default is:
+Set the format for amount plots, using the @option{--amount-data (-j)}
+option. The default is:
 
 @smallexample
 "%(format_date(date, \"%Y-%m-%d\")) %(quantity(scrub(display_amount)))\n"
 @end smallexample
 
 @item --plot-total-format @var{FORMAT_STRING}
-Set the format for total plots, using the @code{-J} option.  The
-default is:
+Set the format for total plots, using the @option{--total-data (-J)}
+option.  The default is:
 
 @smallexample
 "%(format_date(date, \"%Y-%m-%d\")) %(quantity(scrub(display_total)))\n"
 @end smallexample
 
 @item --pricedb-format @var{FORMAT_STRING}
-Set the format expected for the historical price file. The default is
+Set the format expected for the historical price file. The default is:
 
 @smallexample
 "P %(datetime) %(display_account) %(scrub(display_amount))\n"
@@ -6763,15 +6781,15 @@ updating the price-db file.  The best way is to have your price
 download script maintain this file.
 
 The format of the file can be changed by telling ledger to use the
-@code{--pricedb-format @var{FORMAT_STRING}} you define.
+@option{--pricedb-format @var{FORMAT_STRING}} you define.
 
 @item --price-exp @var{INT}
-@itemx -L @var{INT}
+@itemx -Z @var{INT}
 Set the expected freshness of price quotes, in @var{INT} minutes. That
-is, if the last known quote for any commodity is older than this
-value, and if @code{--download} is being used, then the Internet will
-be consulted again for a newer price. Otherwise, the old price is
-still considered to be fresh enough.
+is, if the last known quote for any commodity is older than this value,
+and if @option{--download} is being used, then the Internet will be
+consulted again for a newer price. Otherwise, the old price is still
+considered to be fresh enough.
 
 @item --download
 @itemx -Q
@@ -6787,15 +6805,16 @@ database, usually specified using the environment variable
 
 There are several different ways that ledger can report the totals it
 displays.  The most flexible way to adjust them is by using value
-expressions, and the @code{-t} and @code{-T} options.  However,
-there are also several ``default'' reports, which will satisfy most
-users basic reporting needs:
+expressions, and the @option{--amount @var{EXPR} (-t)} and
+@option{--total @var{VEXPR} (-T)} options.  However, there are also
+several ``default'' reports, which will satisfy most users basic
+reporting needs:
 
 @ftable @code
 
 @item --quantity
 @itemx -O
-Report commodity totals (this is the default)
+Report commodity totals (this is the default).
 
 @item --basis
 @itemx -B
@@ -6821,13 +6840,15 @@ the accounts involved, the commodities, the nature of the transactions,
 etc.
 
 @findex --now @var{DATE}
+@findex --market
+@findex --exchange @var{COMMODITY}
 
-When you specify @code{-V}, or @code{-X @var{COMMODITY}}, you are
-requesting that some or all of the commodities be valuated as of today
-(or whatever @code{--now @var{DATE}} is set to). But what does such
-a valuation mean? This meaning is governed by the presence of
-a @code{VALUE} meta-data property, whose content is an expression used
-to compute that value.
+When you specify @option{--market (-V)}, or @option{--exchange
+@var{COMMODITY} (-X)}, you are requesting that some or all of the
+commodities be valuated as of today (or whatever @option{--now
+@var{DATE}} is set to). But what does such a valuation mean? This
+meaning is governed by the presence of a @code{VALUE} meta-data
+property, whose content is an expression used to compute that value.
 
 If no VALUE property is specified, each posting is assumed to have a
 default, as if you'd specified a global, automated transaction as
@@ -6838,9 +6859,10 @@ follows:
     ; VALUE:: market(amount, date, exchange)
 @end smallexample
 
-This definition emulates the present day behavior of @code{-V} and
-@code{-X @var{COMMODITY}} (in the case of @code{-X}, the requested
-commodity is passed via the string @samp{exchange} above).
+This definition emulates the present day behavior of @option{--market
+(-V)} and @option{--exchange @var{COMMODITY} (-X)} (in the case of
+@samp{-X}, the requested commodity is passed via the string
+@samp{exchange} above).
 
 @cindex Euro conversion
 One thing many people have wanted to do is to fixate the valuation of
@@ -6851,8 +6873,8 @@ old European currencies in terms of the Euro after a certain date:
     ; VALUE:: date < [Jun 2008] ? market(amount, date, exchange) : 1.44 EUR
 @end smallexample
 
-This says: If @code{--now @var{DATE}} is some old date, use market
-prices as they were at that time; but if @code{--now @var{DATE}} is
+This says: If @option{--now @var{DATE}} is some old date, use market
+prices as they were at that time; but if @option{--now @var{DATE}} is
 past June 2008, use a fixed price for converting Deutsch Mark to Euro.
 
 Or how about never re-valuating commodities used in Expenses, since
@@ -6865,7 +6887,7 @@ they cannot have a different future value:
 
 This says the future valuation is the same as the valuation at the time
 of posting.  post.date equals the posting's date, while just 'date' is
-the value of @code{--now @var{DATE}} (defaults to today).
+the value of @option{--now @var{DATE}} (defaults to today).
 
 Or how about valuating miles based on a reimbursement rate during a
 specific time period:
@@ -6914,21 +6936,28 @@ valuated in another currency.  For example:
 @cindex FIFO/LIFO
 @cindex LIFO/FIFO
 @findex --lots
+@findex --lot-prices
+@findex --exchange @var{COMMODITY}
+@findex --historical
+@findex --basis
+@findex --price
+
 Ledger presently has no way of handling such things as FIFO and LIFO.
 
 If you specify an unadorned commodity name, like AAPL, it will balance
-against itself.  If @code{--lots} are not being displayed, then it will
-appear to balance against any lot of AAPL.
+against itself.  If @option{--lots} are not being displayed, then it
+will appear to balance against any lot of AAPL.
 
 @cindex adorned commodity
 @findex --lot-prices
-If you specify an adorned commodity, like AAPL @{$10.00@}, it will
-also balance against itself, and against any AAPL if @code{--lots} is
-not specified.  But if you do specify @code{--lot-prices}, for
-example, then it will balance against that specific price for AAPL.
+If you specify an adorned commodity, like AAPL @{$10.00@}, it will also
+balance against itself, and against any AAPL if @option{--lots} is not
+specified.  But if you do specify @option{--lot-prices}, for example,
+then it will balance against that specific price for AAPL.
 
-Normally when you use @code{-X @var{COMMODITY}} to request that
-amounts be reported in a specific commodity, Ledger uses these values:
+Normally when you use @option{--exchange @var{COMMODITY} (-X)} to
+request that amounts be reported in a specific commodity, Ledger uses
+these values:
 
 @itemize
 
@@ -6942,18 +6971,20 @@ For the balance report, use the value of that commodity as of today.
 
 @end itemize
 
-You can now specify @code{-H} to ask that all valuations for any
-amount be done relative to the date that amount was encountered.
+You can now specify @option{--historical (-H)} to ask that all
+valuations for any amount be done relative to the date that amount was
+encountered.
 
-You can also now use @code{-X @var{COMMODITY}} (and @code{-H}) in
-conjunction with @code{-B} and @code{-I}, to see valuation reports of
-just your basis costs or lot prices.
+You can also now use @option{--exchange @var{COMMODITY} (-X)} (and
+@option{--historical (-H)}) in conjunction with @option{--basis (-B)}
+and @option{--price (-I)}, to see valuation reports of just your basis
+costs or lot prices.
 
 @node Environment Variables,  , Commodity Reporting, Detailed Options Description
 @subsection Environment variables
 
 Every option to ledger may be set using an environment variable.  If
-an option has a long name such @code{--this-option}, setting the
+an option has a long name such @option{--this-option}, setting the
 environment variable @env{LEDGER_THIS_OPTION} will have the same
 effect as specifying that option on the command-line.  Options on the
 command-line always take precedence over environment variable
@@ -7067,6 +7098,7 @@ weekly last august
 @findex --budget
 @findex --add-budget
 @findex --unbudgeted
+@findex --monthly
 
 Keeping a budget allows you to pay closer attention to your income and
 expenses, by reporting how far your actual financial activity is from
@@ -7105,9 +7137,9 @@ $ ledger -p "this year" --monthly --average --subtotal balance ^expenses
 
 The reported totals are the current year's average for each account.
 
-Once these period transactions are defined, creating a budget report
-is as easy as adding @code{--budget} to the command-line.  For
-example, a typical monthly expense report would be:
+Once these period transactions are defined, creating a budget report is
+as easy as adding @option{--budget} to the command-line.  For example,
+a typical monthly expense report would be:
 
 @smallexample
 $ ledger --monthly register ^expenses
@@ -7119,10 +7151,10 @@ To see the same report balanced against your budget, use:
 $ ledger --budget --monthly register ^expenses
 @end smallexample
 
-A budget report includes only those accounts that appear in the
-budget.  To see all expenses balanced against the budget, use
-@code{--add-budget}.  You can even see only the un-budgeted expenses
-using @code{--unbudgeted}:
+A budget report includes only those accounts that appear in the budget.
+To see all expenses balanced against the budget, use
+@option{--add-budget}.  You can even see only the un-budgeted expenses
+using @option{--unbudgeted}:
 
 @smallexample
 $ ledger --unbudgeted --monthly register ^expenses
@@ -7132,7 +7164,7 @@ You can also use these flags with the @command{balance} command.
 
 @node Forecasting,  , Budgeting, Budgeting and Forecasting
 @section Forecasting
-@findex --forecast
+@findex --forecast @var{VEXPR}
 
 Sometimes it's useful to know what your finances will look like in the
 future, such as determining when an account will reach zero.  Ledger
@@ -7156,6 +7188,7 @@ $ ledger --forecast "d<[2010]" bal ^assets ^liabilities
 
 @node Time Keeping, Value Expressions, Budgeting and Forecasting, Top
 @chapter Time Keeping
+@findex --day-break
 
 Ledger directly supports ``timelog'' entries, which have this form:
 
@@ -7164,13 +7197,13 @@ i 2013/03/28 22:13:00 ACCOUNT[  PAYEE]
 o 2013/03/29 03:39:00
 @end smallexample
 
-This records a check-in to the given ACCOUNT, and a check-out.  You
-can be checked-in to multiple accounts at a time, if you wish, and
-they can span multiple days (use @code{--day-break} to break them up
-in the report).  The number of seconds between is accumulated as time
-to that ACCOUNT.  If the checkout uses a capital @samp{O}, the
-transaction is marked ``cleared''.  You can use an optional PAYEE for
-whatever meaning you like.
+This records a check-in to the given ACCOUNT, and a check-out.  You can
+be checked-in to multiple accounts at a time, if you wish, and they can
+span multiple days (use @option{--day-break} to break them up in the
+report).  The number of seconds between is accumulated as time to that
+ACCOUNT.  If the checkout uses a capital @samp{O}, the transaction is
+marked ``cleared''.  You can use an optional PAYEE for whatever meaning
+you like.
 
 Now, there are a few ways to generate this information.  You can use
 the @file{timeclock.el} package, which is part of Emacs.  Or you can
@@ -7185,6 +7218,8 @@ transactions are.
 
 @node Value Expressions, Format Strings, Time Keeping, Top
 @chapter Value Expressions
+@findex --limit @var{EXPR}
+@findex --display @var{EXPR}
 
 Ledger uses value expressions to make calculations for many different
 purposes:
@@ -7192,11 +7227,12 @@ purposes:
 @enumerate
 
 @item
-The values displayed in reports
+The values displayed in reports.
 
 @item
 For predicates (where truth is anything non-zero), to determine which
-postings are calculated (@code{-l}) or displayed (@code{-d}).
+postings are calculated (option @option{--limit @var{EXPR} (-l)}) or
+displayed (option @option{--display @var{EXPR} (-d)}).
 
 @item
 For sorting criteria, to yield the sort key.
@@ -7249,6 +7285,8 @@ $ ledger -b "this month" register checking
 
 @node Variables, Functions, Value Expressions, Value Expressions
 @section Variables
+@findex --amount @var{EXPR}
+@findex --total @var{VEXPR}
 
 Below are the one letter variables available in any value expression.
 For the register and print commands, these variables relate to
@@ -7260,16 +7298,18 @@ variable for both is specified.
 @table @code
 
 @item t
-This maps to whatever the user specified with @code{-t}.  In a
-register report, @code{-t} changes the value column; in a balance
-report, it has no meaning by default.  If @code{-t} was not
-specified, the current report style's value expression is used.
+This maps to whatever the user specified with @option{--amount
+@var{EXPR} (-t)}.  In a register report, @option{--amount @var{EXPR}
+(-t)} changes the value column; in a balance report, it has no meaning
+by default.  If @option{--amount @var{EXPR} (-t)} was not specified, the
+current report style's value expression is used.
 
 @item T
-This maps to whatever the user specified with @code{-T}.  In a
-register report, @code{-T} changes the totals column; in a balance
-report, this is the value given for each account.  If @code{-T} was
-not specified, the current report style's value expression is used.
+This maps to whatever the user specified with @option{--total
+@var{VEXPR} (-T)}.  In a register report, @option{--total @var{VEXPR}
+(-T)} changes the totals column; in a balance report, this is the value
+given for each account.  If @option{--total @var{VEXPR} (-T)} was not
+specified, the current report style's value expression is used.
 
 @item m
 This is always the present moment/date.
@@ -7545,14 +7585,13 @@ Return value rounded to n digits.  Does not affect formatting.
 * Basics::
 * Format String Structure::
 * Format Expressions::
-* @code{--balance-format}::
+* Balance format::
 * Formatting codes::
 @end menu
 
 @node Basics, Format String Structure, Format Strings, Format Strings
 @section Format String Basics
 @findex --format @var{FORMAT_STRING}
-@findex -F @var{FORMAT_STRING}
 @findex --balance-format @var{FORMAT_STRING}
 @findex --budget-format @var{FORMAT_STRING}
 @findex --cleared-format @var{FORMAT_STRING}
@@ -7563,11 +7602,11 @@ Return value rounded to n digits.  Does not affect formatting.
 @findex --prices-format @var{FORMAT_STRING}
 @findex --register-format @var{FORMAT_STRING}
 
-Format strings may be used to change the output format of reports.
-They are specified by passing a formatting string to the @code{-F
-(--format)} option. Within that string, constructs are allowed which
-make it possible to display the various parts of an account or posting
-in custom ways.
+Format strings may be used to change the output format of reports.  They
+are specified by passing a formatting string to the @option{--format
+@var{FORMAT_STRING} (-F)} option. Within that string, constructs are
+allowed which make it possible to display the various parts of an
+account or posting in custom ways.
 
 There are several additional flags that allow you to define formats
 for specific reports. These are useful to define in your configuration
@@ -7575,15 +7614,15 @@ file and will allow you to run ledger reports from the command line
 without having to enter a new format for each command.
 
 @itemize
-@item @code{--balance-format}
-@item @code{--budget-format}
-@item @code{--cleared-format}
-@item @code{--csv-format}
-@item @code{--plot-amount-format}
-@item @code{--plot-total-format}
-@item @code{--pricedb-format}
-@item @code{--prices-format}
-@item @code{--register-format}
+@item @option{--balance-format @var{FORMAT_STRING}}
+@item @option{--budget-format @var{FORMAT_STRING}}
+@item @option{--cleared-format @var{FORMAT_STRING}}
+@item @option{--csv-format @var{FORMAT_STRING}}
+@item @option{--plot-amount-format @var{FORMAT_STRING}}
+@item @option{--plot-total-format @var{FORMAT_STRING}}
+@item @option{--pricedb-format @var{FORMAT_STRING}}
+@item @option{--prices-format @var{FORMAT_STRING}}
+@item @option{--register-format @var{FORMAT_STRING}}
 @end itemize
 
 @node Format String Structure, Format Expressions, Basics, Format Strings
@@ -7619,8 +7658,10 @@ The same, no more than 20 chars wide.
 The expression following the format constraints can be a single letter,
 or an expression enclosed in parentheses or brackets.
 
-@node Format Expressions, @code{--balance-format}, Format String Structure, Format Strings
+@node Format Expressions, Balance format, Format String Structure, Format Strings
 @section Format Expressions
+@findex --amount @var{EXPR}
+@findex --total @var{VEXPR}
 
 The allowable expressions are:
 
@@ -7630,14 +7671,14 @@ The allowable expressions are:
 Inserts a percent sign.
 
 @item t
-Inserts the results of the value expression specified by @code{-t}.
-If @code{-t} was not specified, the current report style's value
-expression is used.
+Inserts the results of the value expression specified by
+@option{--amount @var{EXPR} (-t)}.  If @option{--amount @var{EXPR} (-t)}
+was not specified, the current report style's value expression is used.
 
 @item T
-Inserts the results of the value expression specified by @code{-T}.
-If @code{-T} was not specified, the current report style's value
-expression is used.
+Inserts the results of the value expression specified by @option{--total
+@var{VEXPR} (-T)}.  If @option{--total @var{VEXPR} (-T)} was not
+specified, the current report style's value expression is used.
 
 @item (EXPR)
 Inserts the amount resulting from the value expression given in
@@ -7669,10 +7710,10 @@ file.
 @item e
 Inserts the ending line of that transaction within the file.
 
-@c @item D By default, this is the same as @code{%[%Y/%m%/d]}.  The
-@c date format used can be changed at any time with the @code{-y}
-@c flag, however.  Using @code{%D} gives the user more control over
-@c the way dates are output.
+@c @item D By default, this is the same as @code{%[%Y/%m%/d]}.  The date
+@c format used can be changed at any time with the @option{--date-format
+@c @var{DATE_FORMAT} (-y)} flag, however.  Using @code{%D} gives the
+@c user more control over the way dates are output.
 
 @item d
 Returns the date according to the default format.  If the transaction
@@ -7725,14 +7766,14 @@ same format string is used for all postings.
 
 @end table
 
-@node @code{--balance-format}, Formatting codes, Format Expressions, Format Strings
-@section @code{--balance-format}
+@node  Balance format, Formatting codes, Format Expressions, Format Strings
+@section Balance format
 @findex --balance-format @var{FORMAT_STRING}
 @findex --format @var{FORMAT_STRING}
 
-As an example of how flexible the @code{--format @var{FORMAT_STRING}}
-strings can be, the default balance format looks like this (the
-various functions are described later):
+As an example of how flexible the @option{--format @var{FORMAT_STRING}}
+strings can be, the default balance format looks like this (the various
+functions are described later):
 
 @smallexample
 "%(justify(scrub(display_total), 20, -1, true, color))"
@@ -7742,7 +7783,7 @@ various functions are described later):
 "--------------------\n"
 @end smallexample
 
-@node Formatting codes,  , @code{--balance-format}, Format Strings
+@node Formatting codes,  , Balance format, Format Strings
 @section Formatting Functions and Codes
 
 @menu
@@ -7819,24 +7860,24 @@ The following functions allow you to manipulate and format dates.
 @table @code
 
 @item date
-Return the date of the current transaction
+Return the date of the current transaction.
 
 @item format_date(date, "FORMAT_STRING")
 Format the date using the given format string.
 
 @item now
-Return the current date and time.  If the @code{--now @var{DATE}}
+Return the current date and time.  If the @option{--now @var{DATE}}
 option is defined it will return that value.
 
 @item today
-Return the current date. If the @code{--now @var{DATE}} option is
+Return the current date. If the @option{--now @var{DATE}} option is
 defined it will return that value.
 
 @item to_datetime
-Convert a string to a date-time value
+Convert a string to a date-time value.
 
 @item to_date
-Convert a string to date value
+Convert a string to date value.
 
 @item value_date
 
@@ -7869,16 +7910,16 @@ whatever order you prefer:
 @table @code
 
 @item %Y
-Four digit year
+Four digit year.
 
 @item %y
-Two digit year
+Two digit year.
 
 @item %m
-Two digit month
+Two digit month.
 
 @item %d
-Two digit date
+Two digit date.
 
 @end table
 
@@ -7895,10 +7936,10 @@ as
 @table @code
 
 @item %m-%d-%Y %A
-yields @samp{02-10-2010 Wednesday}
+yields @samp{02-10-2010 Wednesday}.
 
 @item %A %m-%d-%Y
-yields @samp{Wednesday 02-10-2010}
+yields @samp{Wednesday 02-10-2010}.
 
 @end table
 
@@ -7908,25 +7949,25 @@ These are options you can select for weekday
 @table @code
 
 @item %a
-weekday, abbreviated Wed
+weekday, abbreviated Wed.
 
 @item %A
-weekday, full Wednesday
+weekday, full Wednesday.
 
 @item %d
-day of the month (dd), zero padded 10
+day of the month (dd), zero padded 10.
 
 @item %e
-day of the month (dd) 10
+day of the month (dd) 10.
 
 @item %j
-day of year, zero padded 000–366
+day of year, zero padded 000–366.
 
 @item %u
-day of week starting with Monday (1), i.e. @code{mtwtfss} 3
+day of week starting with Monday (1), i.e. @code{mtwtfss} 3.
 
 @item %w
-day of week starting with Sunday (0), i.e. @code{smtwtfs} 3
+day of week starting with Sunday (0), i.e. @code{smtwtfs} 3.
 
 @end table
 
@@ -7939,10 +7980,10 @@ as
 @table @code
 
 @item %m-%d-%Y %B
-yields @samp{02-10-2010 February}
+yields @samp{02-10-2010 February}.
 
 @item %B %m-%d-%Y
-yields @samp{February 02-10-2010}
+yields @samp{February 02-10-2010}.
 
 @end table
 
@@ -7952,14 +7993,14 @@ These are options you can select for month
 @table @code
 
 @item %m
-@samp{mm} month as two digits
+@samp{mm} month as two digits.
 
 @item %b
 Locale’s abbreviated month, for example @samp{02} might be abbreviated
-as @samp{Feb}
+as @samp{Feb}.
 
 @item %B
-Locale’s full month, variable length February
+Locale’s full month, variable length February.
 
 @end table
 
@@ -7971,25 +8012,25 @@ Additional date format parameters which can be used:
 @table @code
 
 @item %U
-week number Sunday as first day of week, ranging 01–53
+week number Sunday as first day of week, ranging 01–53.
 
 @item %W
-week number Monday as first day of week, ranging 01–53
+week number Monday as first day of week, ranging 01–53.
 
 @item %V
-week of the year, ranging 01–53
+week of the year, ranging 01–53.
 
 @item %C
-century, ranging 00–99
+century, ranging 00–99.
 
 @item %D
-yields @code{%m/%d/%y} as in @samp{02/10/10}
+yields @code{%m/%d/%y} as in @samp{02/10/10}.
 
 @item %x
 locale’s date representation, as @samp{02/10/2010} for the U.S.
 
 @item %F
-yields @code{%Y-%m-%d} as in @samp{2010-02-10}
+yields @code{%Y-%m-%d} as in @samp{2010-02-10}.
 
 @end table
 
@@ -8042,23 +8083,23 @@ generated the posting.
 @table @code
 
 @item filename
-name of ledger data file from whence posting came, abbreviated @samp{S}
+name of ledger data file from whence posting came, abbreviated @samp{S}.
 
 @item beg_pos
 character position in @code{filename} where entry for posting begins,
-abbreviated @samp{B}
+abbreviated @samp{B}.
 
 @item end_pos
 character position in @code{filename} where entry for posting ends,
-abbreviated @samp{E}
+abbreviated @samp{E}.
 
 @item beg_line
 line number in @code{filename} where entry for posting begins,
-abbreviated @samp{b}
+abbreviated @samp{b}.
 
 @item end_line
 line number in @code{filename} where posting's entry for posting ends,
-abbreviated @samp{e}
+abbreviated @samp{e}.
 
 @end table
 
@@ -8173,7 +8214,7 @@ journal file.
 @section Queries
 
 The Journal.query() method accepts every argument you can specify on
-the command-line, including @code{--options}.
+the command-line, including @option{--options}.
 
 Since a query ``cooks'' the journal it applies to, only one query may
 be active for that journal at a given time.  Once the query object is
@@ -8362,9 +8403,9 @@ the basic journal objects themselves for the sake of modularity.
 
 @item Comparators
 
-Another abstraction isolated to its own layer, this class
-encapsulating the comparison of journal objects, based on whatever
-value expression the user passed to @code{--sort}.
+Another abstraction isolated to its own layer, this class encapsulating
+the comparison of journal objects, based on whatever value expression
+the user passed to @option{--sort @var{VEXPR}}.
 
 @item Temporaries
 
@@ -8452,7 +8493,7 @@ Application object.
 
 This creates the global scope object, performs error reporting, and
 handles command-line options which must precede even the creation of
-the global scope, such as @code{--debug}.
+the global scope, such as @option{--debug @var{CODE}}.
 
 @end itemize
 
@@ -8699,6 +8740,8 @@ posting automatically so that the transaction balances.
 
 @node Primary commodities,  , Posting costs, Journal File Format
 @subsection Primary commodities
+@findex --market
+@findex --basis
 
 In every transaction involving more than one commodity, there is
 always one which is the @dfn{primary commodity}.  This commodity
@@ -8722,8 +8765,9 @@ on the placement of the commodity in the transaction:
 @end smallexample
 
 The only case where knowledge of primary versus secondary comes into
-play is in reports that use the @code{-V} or @code{-B} options.
-With these, only primary commodities are shown.
+play is in reports that use the @option{--market (-V)} or
+@option{--basis (-B)} options.  With these, only primary commodities are
+shown.
 
 If a transaction uses only one commodity, this commodity is also
 considered a primary.  In fact, when Ledger goes about ensures that
@@ -8830,7 +8874,7 @@ Print detailed information on the execution of Ledger.
 
 @item --verify
 Enable additional assertions during run-time. This causes a significant
-slowdown.  When combined with @code{--debug} ledger will produce
+slowdown.  When combined with @option{--debug @var{CODE}} ledger will produce
 memory trace information.
 
 @item --verify-memory
@@ -8853,7 +8897,7 @@ the user's init file read.
 @ftable @command
 
 @item eval @var{VEXPR}
-Evaluate the given value expression against the model transaction
+Evaluate the given value expression against the model transaction.
 
 @item format @var{FORMAT_STRING}
 Print details of how ledger uses the given formatting description and
@@ -8861,7 +8905,7 @@ apply it against a model transaction.
 
 @item generate
 Randomly generates syntactically valid Ledger data from a seed.  Used
-by the GenerateTests harness for development testing
+by the GenerateTests harness for development testing.
 
 @item parse @var{VEXPR}
 @itemx expr @var{VEXPR}
@@ -8995,10 +9039,10 @@ for example, issue @code{ctest -V -R "5FB"}.
 
 @itemize
 
-@item 
+@item
 OFX support has been removed from Ledger 3.0
 
-@item 
+@item
 Single character value expressions are deprecated and should be changed
 to the new value expressions available in 3.0