Skip to content

Commit

Permalink
doc: convert AsciiDoc {?foo} to ifdef::foo[]
Browse files Browse the repository at this point in the history
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Jeff King authored and Junio C Hamano committed May 14, 2015
1 parent d595bdc commit d0258b9
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions Documentation/diff-options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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::
Expand All @@ -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[]
Expand Down

0 comments on commit d0258b9

Please sign in to comment.