[PATCH 9/8] doc: convert AsciiDoc {?foo} to ifdef::foo[]
- From
Jeff King <peff@peff.net>
- Date
- May 14, 2015, 04:34 UTC
- Message-ID
- <20150514043448.GA21855@peff.net>
- In-Reply-To
- <20150514042544.GA9351@peff.net>
The former seems to just be syntactic sugar for the latter. And as it's sugar that AsciiDoctor doesn't understand, it would be nice to avoid it. Since there are only two spots, and the resulting source is not significantly harder to read, it's worth doing.
Note that this does slightly affect the generated HTML (it has an extra newline), but the rendered result for both HTML and docbook should be the same (since the newline is not syntactically significant there).
Signed-off-by: Jeff King <peff@peff.net> --- Documentation/diff-options.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index ccd4998..b7c3afe 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -23,7 +23,9 @@ ifndef::git-format-patch[] -u:: --patch:: Generate patch (see section on generating patches). - {git-diff? This is the default.} +ifdef::git-diff[] + This is the default. +endif::git-diff[] endif::git-format-patch[] -s:: @@ -42,7 +44,9 @@ endif::git-format-patch[] ifndef::git-format-patch[] --raw:: Generate the raw format. - {git-diff-core? This is the default.} +ifdef::git-diff-core[] + This is the default. +endif::git-diff-core[] endif::git-format-patch[] ifndef::git-format-patch[]
-- 2.4.0.327.ge28c153