@matheusbsbs / matheus-bagliano / commits / 9574901c02

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*: https://github.com/asciidoctor/asciidoctor/issues/1478 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Johannes Schindelin committed Jan 2, 2017 at 17:04 UTC 9574901c02d5f216efe20a9995c2f2056360f9f1
1 file changed +9 -8
Documentation/giteveryday.txt
+9 -8
@@ -307,9 +307,16 @@ master or exposed as a part of a stable branch.
307 <9> backport a critical fix.
308 <10> create a signed tag.
309 <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
318 repository at kernel.org, and looks like this:
312 -+
319 +
320 ------------
321 (in .git/config)
322 [remote "ko"]
@@ -320,12 +327,6 @@ repository at kernel.org, and looks like this:
327 push = +refs/heads/pu
328 push = refs/heads/maint
329 ------------
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.
330
331
332 Repository Administration[[ADMINISTRATION]]