summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-05-23 05:38:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-05-23 05:38:25 (GMT)
commitd7e96110254410c9c9908a13ba2e5e2730ee8f05 (patch)
tree96bbe37d4c9e26868472c7b8670611a54eb7334a /Documentation
parent5a97e7be8846727597be322bf04541a2c61a2c81 (diff)
parent379805051d3aae54f011eec429c07ce93daf8194 (diff)
downloadgit-d7e96110254410c9c9908a13ba2e5e2730ee8f05.zip
git-d7e96110254410c9c9908a13ba2e5e2730ee8f05.tar.gz
git-d7e96110254410c9c9908a13ba2e5e2730ee8f05.tar.bz2
Merge branch 'bc/asciidoctor-tab-width'
Asciidoctor gives a reasonable imitation for AsciiDoc, but does not render illustration in a literal block correctly when indented with HT by default. The problem is fixed by forcing 8-space tabs. * bc/asciidoctor-tab-width: Documentation: render revisions correctly under Asciidoctor Documentation: use 8-space tabs with Asciidoctor
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/Makefile2
-rw-r--r--Documentation/revisions.txt2
2 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile
index fa9e5c0..d079d7c 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -185,7 +185,7 @@ ASCIIDOC = asciidoctor
ASCIIDOC_CONF =
ASCIIDOC_HTML = xhtml5
ASCIIDOC_DOCBOOK = docbook45
-ASCIIDOC_EXTRA += -acompat-mode
+ASCIIDOC_EXTRA += -acompat-mode -atabsize=8
ASCIIDOC_EXTRA += -I. -rasciidoctor-extensions
ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;'
DBLATEX_COMMON =
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
index e760416..7d1bd44 100644
--- a/Documentation/revisions.txt
+++ b/Documentation/revisions.txt
@@ -351,6 +351,7 @@ Here are a handful of examples using the Loeliger illustration above,
with each step in the notation's expansion and selection carefully
spelt out:
+....
Args Expanded arguments Selected commits
D G H D
D F G H I J D F
@@ -373,3 +374,4 @@ spelt out:
= B ^B^1 ^B^2 ^B^3
= B ^D ^E ^F B
F^! D = F ^I ^J D G H D F
+....