Skip to content

Commit 82f43e1

Browse files
dschoGit for Windows Build Agent
authored andcommitted
giteveryday: unbreak rendering with AsciiDoctor
The "giteveryday" document has a callout list that contains a code block. This is not a problem for AsciiDoc, but AsciiDoctor sadly was explicitly designed *not* to render this correctly [*1*]. The symptom is an unhelpful line 322: callout list item index: expected 1 got 12 line 325: no callouts refer to list item 1 line 325: callout list item index: expected 2 got 13 line 327: no callouts refer to list item 2 In Git for Windows, we rely on the speed improvement of AsciiDoctor (on this developer's machine, `make -j15 html` takes roughly 30 seconds with AsciiDoctor, 70 seconds with AsciiDoc), therefore we need a way to render this correctly. The easiest way out is to simplify the callout list, as suggested by AsciiDoctor's author, even while one may very well disagree with him that a code block hath no place in a callout list. *1*: asciidoctor/asciidoctor#1478 Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 5ebc601 commit 82f43e1

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

Documentation/giteveryday.txt

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -307,9 +307,16 @@ master or exposed as a part of a stable branch.
307307
<9> backport a critical fix.
308308
<10> create a signed tag.
309309
<11> make sure master was not accidentally rewound beyond that
310-
already pushed out. `ko` shorthand points at the Git maintainer's
310+
already pushed out.
311+
<12> In the output from `git show-branch`, `master` should have
312+
everything `ko/master` has, and `next` should have
313+
everything `ko/next` has, etc.
314+
<13> push out the bleeding edge, together with new tags that point
315+
into the pushed history.
316+
317+
In this example, the `ko` shorthand points at the Git maintainer's
311318
repository at kernel.org, and looks like this:
312-
+
319+
313320
------------
314321
(in .git/config)
315322
[remote "ko"]
@@ -320,12 +327,6 @@ repository at kernel.org, and looks like this:
320327
push = +refs/heads/pu
321328
push = refs/heads/maint
322329
------------
323-
+
324-
<12> In the output from `git show-branch`, `master` should have
325-
everything `ko/master` has, and `next` should have
326-
everything `ko/next` has, etc.
327-
<13> push out the bleeding edge, together with new tags that point
328-
into the pushed history.
329330

330331

331332
Repository Administration[[ADMINISTRATION]]

0 commit comments

Comments
 (0)