Johannes Schindelin 5ae8a3c0e2 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>

2016-11-16 17:40:56 +01:00

..

howto

Merge branch 'po/fix-doc-merge-base-illustration' into maint

2016-10-28 09:01:21 -07:00

RelNotes

Git 2.10.2

2016-10-28 09:02:44 -07:00

technical

Merge branch 'ls/packet-line-protocol-doc-fix' into maint

2016-09-08 21:35:57 -07:00

.gitattributes

…

.gitignore

…

asciidoc.conf

…

blame-options.txt

Merge branch 'ea/blame-progress'

2016-01-12 15:16:54 -08:00

build-docdep.perl

…

cat-texi.perl

…

cmd-list.perl

command-list: prepare machinery for upcoming "common groups" section

2015-05-21 13:03:37 -07:00

CodingGuidelines

CodingGuidelines: formatting HEAD in documentation

2016-06-28 08:36:45 -07:00

config.txt

Merge branch 'program-data-config'

2016-10-29 10:41:12 +02:00

date-formats.txt

doc: more consistency in environment variables format

2016-06-08 12:04:37 -07:00

diff-config.txt

Merge branch 'mm/doc-tt' into maint

2016-07-28 11:25:54 -07:00

diff-format.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

diff-generate-patch.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

diff-options.txt

Merge branch 'jc/doc-diff-filter-exclude' into maint

2016-08-08 14:21:44 -07:00

docbook-xsl.css

…

docbook.xsl

…

everyday.txto

Documentation: fix linkgit references

2016-05-09 15:44:14 -07:00

fetch-options.txt

Merge branch 'mm/doc-tt' into maint

2016-07-28 11:25:54 -07:00

fix-texi.perl

…

fmt-merge-msg-config.txt

Documentation: include 'merge.branchdesc' for merge and config as well

2015-05-28 12:38:46 -07:00

git-add.txt

add: document the chmod option

2016-09-12 15:03:32 -07:00

git-am.txt

Merge branch 'mm/doc-tt'

2016-07-13 11:24:14 -07:00

git-annotate.txt

…

git-apply.txt

git-apply.txt: mention the behavior inside a subdir

2016-03-24 10:16:52 -07:00

git-archimport.txt

…

git-archive.txt

…

git-bisect-lk2009.txt

doc: more consistency in environment variables format

2016-06-08 12:04:37 -07:00

git-bisect.txt

doc: typeset HEAD and variants as literal

2016-06-28 08:36:45 -07:00

git-blame.txt

blame: add support for --[no-]progress option

2015-12-16 10:18:34 -08:00

git-branch.txt

doc: typeset HEAD and variants as literal

2016-06-28 08:36:45 -07:00

git-bundle.txt

transport: drop support for git-over-rsync

2016-02-01 13:07:41 -08:00

git-cat-file.txt

cat-file: support --textconv/--filters in batch mode

2016-10-29 10:41:14 +02:00

git-check-attr.txt

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07:00

git-check-ignore.txt

Documentation: fix linkgit references

2016-05-09 15:44:14 -07:00

git-check-mailmap.txt

…

git-check-ref-format.txt

git-check-ref-format.txt: fixup documentation

2016-09-21 11:12:41 -07:00

git-checkout-index.txt

…

git-checkout.txt

checkout.txt: document a common case that ignores ambiguation rules

2016-09-21 08:44:41 -07:00

git-cherry-pick.txt

Merge branch 'mm/doc-tt' into maint

2016-07-28 11:25:54 -07:00

git-cherry.txt

…

git-citool.txt

…

git-clean.txt

doc: typeset short command-line options as literal

2016-06-28 08:20:52 -07:00

git-clone.txt

Merge branch 'sb/clone-shallow-passthru' into maint

2016-07-11 10:44:12 -07:00

git-column.txt

…

git-commit-tree.txt

Merge branch 'mm/doc-tt' into maint

2016-07-28 11:25:54 -07:00

git-commit.txt

Merge branch 'nd/commit-p-doc' into maint

2016-10-28 09:01:15 -07:00

git-config.txt

Clarify the location of the Windows-specific ProgramData config

2016-10-29 10:40:48 +02:00

git-count-objects.txt

…

git-credential-cache--daemon.txt

…

git-credential-cache.txt

credential-cache--daemon: disallow relative socket path

2016-02-23 12:56:27 -08:00

git-credential-store.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-credential.txt

…

git-cvsexportcommit.txt

…

git-cvsimport.txt

Merge branch 'jk/doc-cvs-update' into maint

2016-10-03 13:22:25 -07:00

git-cvsserver.txt

doc: typeset HEAD and variants as literal

2016-06-28 08:36:45 -07:00

git-daemon.txt

doc: typeset HEAD and variants as literal

2016-06-28 08:36:45 -07:00

git-describe.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-diff-files.txt

…

git-diff-index.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-diff-tree.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-diff.txt

…

git-difftool.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-fast-export.txt

doc: convert \--option to --option

2015-05-12 22:14:46 -07:00

git-fast-import.txt

Merge branch 'mm/doc-tt'

2016-07-13 11:24:14 -07:00

git-fetch-pack.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-fetch.txt

fetch: reduce duplicate in ref update status lines with placeholder

2016-07-06 11:48:25 -07:00

git-filter-branch.txt

doc: typeset '--' as literal

2016-06-28 08:36:45 -07:00

git-fmt-merge-msg.txt

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07:00

git-for-each-ref.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-format-patch.txt

Merge branch 'tr/doc-tt' into maint

2016-07-06 13:06:34 -07:00

git-fsck-objects.txt

…

git-fsck.txt

fsck: optionally show more helpful info for broken links

2016-07-18 15:15:59 -07:00

git-gc.txt

doc: change configuration variables format

2016-06-08 12:04:55 -07:00

git-get-tar-commit-id.txt

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07:00

git-grep.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-gui.txt

doc: typeset HEAD and variants as literal

2016-06-28 08:36:45 -07:00

git-hash-object.txt

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07:00

git-help.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-http-backend.txt

doc: more consistency in environment variables format

2016-06-08 12:04:37 -07:00

git-http-fetch.txt

…

git-http-push.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-imap-send.txt

…

git-index-pack.txt

…

git-init-db.txt

…

git-init.txt

Merge branch 'tr/doc-tt' into maint

2016-07-06 13:06:34 -07:00

git-instaweb.txt

doc: change configuration variables format

2016-06-08 12:04:55 -07:00

git-interpret-trailers.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-log.txt

Merge branch 'mj/log-show-signature-conf'

2016-07-11 10:31:08 -07:00

git-ls-files.txt

git ls-files: text=auto eol=lf is supported in Git 2.10

2016-08-25 13:38:18 -07:00

git-ls-remote.txt

ls-remote: add support for showing symrefs

2016-01-19 10:07:56 -08:00

git-ls-tree.txt

doc: typeset HEAD and variants as literal

2016-06-28 08:36:45 -07:00

git-mailinfo.txt

Merge branch 'va/mailinfo-doc-typofix' into maint

2016-05-26 13:17:14 -07:00

git-mailsplit.txt

mailsplit: support unescaping mboxrd messages

2016-06-06 11:14:43 -07:00

git-merge-base.txt

doc: fix merge-base ASCII art tab spacing

2016-10-21 09:46:48 -07:00

git-merge-file.txt

merge-file: clamp exit code to maximum 127

2015-10-29 12:10:23 -07:00

git-merge-index.txt

…

git-merge-one-file.txt

…

git-merge-tree.txt

…

git-merge.txt

pull: pass --allow-unrelated-histories to "git merge"

2016-04-21 11:58:51 -07:00

git-mergetool--lib.txt

…

git-mergetool.txt

…

git-mktag.txt

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07:00

git-mktree.txt

doc: typeset short command-line options as literal

2016-06-28 08:20:52 -07:00

git-mv.txt

doc: typeset short command-line options as literal

2016-06-28 08:20:52 -07:00

git-name-rev.txt

…

git-notes.txt

doc: typeset short command-line options as literal

2016-06-28 08:20:52 -07:00

git-p4.txt

Merge branch 'mm/doc-tt' into maint

2016-07-28 11:25:54 -07:00

git-pack-objects.txt

document git-repack interaction of pack.threads and pack.windowMemory

2016-08-10 10:55:13 -07:00

git-pack-redundant.txt

…

git-pack-refs.txt

…

git-parse-remote.txt

…

git-patch-id.txt

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07:00

git-prune-packed.txt

…

git-prune.txt

worktree: new place for "git prune --worktrees"

2015-06-29 08:48:44 -07:00

git-pull.txt

pull --rebase: add --[no-]autostash flag

2016-03-21 13:30:36 -07:00

git-push.txt

Merge branch 'jk/push-force-with-lease-creation' into maint

2016-09-08 21:35:53 -07:00

git-quiltimport.txt

doc: more consistency in environment variables format

2016-06-08 12:04:37 -07:00

git-read-tree.txt

…

git-rebase.txt

Merge branch 'mm/doc-tt' into maint

2016-07-28 11:25:54 -07:00

git-receive-pack.txt

…

git-reflog.txt

git-reflog: add exists command

2015-07-21 14:08:14 -07:00

git-relink.txt

…

git-remote-ext.txt

…

git-remote-fd.txt

Spelling fixes

2016-08-11 14:35:42 -07:00

git-remote-helpers.txto

…

git-remote-testgit.txt

…

git-remote.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-repack.txt

Merge branch 'ms/document-pack-window-memory-is-per-thread'

2016-08-12 09:47:35 -07:00

git-replace.txt

doc: change environment variables format

2016-06-08 12:04:37 -07:00

git-request-pull.txt

doc: show usage of branch description

2015-09-14 12:50:33 -07:00

git-rerere.txt

…

git-reset.txt

reset: support the experimental --stdin option

2016-10-29 10:41:38 +02:00

git-rev-list.txt

Merge branch 'jk/date-local'

2015-10-05 12:30:13 -07:00

git-rev-parse.txt

rev-parse --parseopt: allow [*=?!] in argument hints

2015-07-15 10:30:54 -07:00

git-revert.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-rm.txt

…

git-send-email.txt

Merge branch 'mm/doc-tt' into maint

2016-07-28 11:25:54 -07:00

git-send-pack.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-sh-i18n--envsubst.txt

…

git-sh-i18n.txt

…

git-sh-setup.txt

doc: more consistency in environment variables format

2016-06-08 12:04:37 -07:00

git-shell.txt

doc: typeset short command-line options as literal

2016-06-28 08:20:52 -07:00

git-shortlog.txt

…

git-show-branch.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-show-index.txt

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07:00

git-show-ref.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-show.txt

doc: convert \--option to --option

2015-05-12 22:14:46 -07:00

git-stage.txt

…

git-stash.txt

stash: allow "stash show" diff output configurable

2015-08-31 11:29:04 -07:00

git-status.txt

Merge branch 'interactive-rebase'

2016-10-29 10:41:40 +02:00

git-stripspace.txt

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07:00

git-submodule.txt

submodules doc: update documentation for "." used for submodule branches

2016-10-19 14:58:53 -07:00

git-svn.txt

Merge branch 'mm/doc-tt' into maint

2016-07-28 11:25:54 -07:00

git-symbolic-ref.txt

…

git-tag.txt

Merge branch 'yk/git-tag-remove-mention-of-old-layout-in-doc' into maint

2016-10-28 09:01:10 -07:00

git-tools.txt

Documentation/git-tools: retire manually-maintained list

2015-07-28 13:21:59 -07:00

git-unpack-file.txt

…

git-unpack-objects.txt

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07:00

git-update-index.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-update-ref.txt

update-ref and tag: add --create-reflog arg

2015-07-21 14:08:35 -07:00

git-update-server-info.txt

…

git-upload-archive.txt

Documentation: match underline with the text

2015-10-22 10:16:12 -07:00

git-upload-pack.txt

upload-pack.c: use parse-options API

2016-05-31 10:17:20 -07:00

git-var.txt

…

git-verify-commit.txt

Merge branch 'dn/gpg-doc' into maint

2016-07-06 13:06:36 -07:00

git-verify-pack.txt

git-verify-pack.txt: fix inconsistent spelling of "packfile"

2015-05-17 11:24:57 -07:00

git-verify-tag.txt

verify-tag: add option to print raw gpg status information

2015-06-22 14:20:47 -07:00

git-web--browse.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

git-whatchanged.txt

…

git-worktree.txt

Merge branch 'nd/worktree-lock'

2016-07-28 10:34:42 -07:00

git-write-tree.txt

…

git.txt

Windows: add support for a Windows-wide configuration

2016-10-29 10:40:48 +02:00

gitattributes.txt

Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maint

2016-09-08 21:35:52 -07:00

gitcli.txt

…

gitcore-tutorial.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

gitcredentials.txt

credential: let empty credential specs reset helper list

2016-02-26 10:58:14 -08:00

gitcvs-migration.txt

docs/cvs-migration: mention cvsimport caveats

2016-09-22 11:23:45 -07:00

gitdiffcore.txt

doc: typeset long command-line options as literal

2016-06-28 08:36:45 -07:00

giteveryday.txt

giteveryday: unbreak rendering with AsciiDoctor

2016-11-16 17:40:56 +01:00

gitglossary.txt

…

githooks.txt

push options: {pre,post}-receive hook learns about push options

2016-07-14 15:50:17 -07:00

gitignore.txt

doc: change configuration variables format

2016-06-08 12:04:55 -07:00

gitk.txt

Merge branch 'po/range-doc' into maint

2016-09-19 13:51:38 -07:00

gitmodules.txt

Merge branch 'bw/submodule-branch-dot-doc' into maint

2016-10-28 09:01:19 -07:00

gitnamespaces.txt

…

gitremote-helpers.txt

doc: typeset HEAD and variants as literal

2016-06-28 08:36:45 -07:00

gitrepository-layout.txt

Documentation/git-worktree: wordsmith worktree-related manpages

2015-07-20 11:07:18 -07:00

gitrevisions.txt

doc: gitrevisions - clarify 'latter case' is revision walk

2016-08-13 19:36:44 -07:00

gittutorial-2.txt

…

gittutorial.txt

transport: drop support for git-over-rsync

2016-02-01 13:07:41 -08:00

gitweb.conf.txt

doc: more consistency in environment variables format

2016-06-08 12:04:37 -07:00

gitweb.txt

doc: change environment variables format

2016-06-08 12:04:37 -07:00

gitworkflows.txt

…

glossary-content.txt

Merge branch 'rn/glossary-typofix' into HEAD

2016-05-18 14:40:14 -07:00

howto-index.sh

…

i18n.txt

Documentation/i18n.txt: clarify character encoding support

2015-07-01 14:55:53 -07:00

install-doc-quick.sh

…

install-webdoc.sh

…

line-range-format.txt

Documentation: change -L:<regex> to -L:<funcname>

2015-04-20 11:05:50 -07:00

lint-gitlink.perl

ci: validate "linkgit:" in documentation

2016-05-10 11:15:04 -07:00

mailmap.txt

…

Makefile

Avoid illegal filenames when building Documentation on NTFS

2016-10-29 10:40:44 +02:00

manpage-1.72.xsl

…

manpage-base-url.xsl.in

…

manpage-base.xsl

…

manpage-bold-literal.xsl

…

manpage-normal.xsl

…

manpage-quote-apos.xsl

…

manpage-suppress-sp.xsl

…

merge-config.txt

doc: change environment variables format

2016-06-08 12:04:37 -07:00

merge-options.txt

Merge branch 'kf/gpg-sig-verification-doc'

2016-05-17 14:38:39 -07:00

merge-strategies.txt

merge-strategies.txt: fix typo

2016-02-22 10:42:52 -08:00

pretty-formats.txt

Merge branch 'rs/pretty-format-color-doc-fix' into maint

2016-10-28 09:01:23 -07:00

pretty-options.txt

Merge branch 'tr/doc-tt' into maint

2016-07-06 13:06:34 -07:00

pull-fetch-param.txt

…

rev-list-options.txt

Merge branch 'pb/rev-list-reverse-with-count' into maint

2016-10-11 14:20:06 -07:00

revisions.txt

Merge branch 'po/range-doc' into maint

2016-09-19 13:51:38 -07:00

sequencer.txt

…

SubmittingPatches

SubmittingPatches: use gitk's "Copy commit summary" format

2016-08-26 15:58:10 -07:00

urls-remotes.txt

Documentation: match underline with the text

2015-10-22 10:16:12 -07:00

urls.txt

transport: drop support for git-over-rsync

2016-02-01 13:07:41 -08:00

user-manual.conf

…

user-manual.txt

asciidoctor: Fix user-manual to be built by asciidoctor

2016-10-29 10:40:36 +02:00