Skip to content

Commit d0258b9

Browse files
peffgitster
authored andcommitted
doc: convert AsciiDoc {?foo} to ifdef::foo[]
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d595bdc commit d0258b9

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

Documentation/diff-options.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ ifndef::git-format-patch[]
2323
-u::
2424
--patch::
2525
Generate patch (see section on generating patches).
26-
{git-diff? This is the default.}
26+
ifdef::git-diff[]
27+
This is the default.
28+
endif::git-diff[]
2729
endif::git-format-patch[]
2830

2931
-s::
@@ -42,7 +44,9 @@ endif::git-format-patch[]
4244
ifndef::git-format-patch[]
4345
--raw::
4446
Generate the raw format.
45-
{git-diff-core? This is the default.}
47+
ifdef::git-diff-core[]
48+
This is the default.
49+
endif::git-diff-core[]
4650
endif::git-format-patch[]
4751

4852
ifndef::git-format-patch[]

0 commit comments

Comments
 (0)