From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 23 May 2018 05:38:25 +0000 (+0900)
Subject: Merge branch 'bc/asciidoctor-tab-width'
X-Git-Tag: v2.18.0-rc0~37
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d7e96110254410c9c9908a13ba2e5e2730ee8f05?ds=inline;hp=-c

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
---

d7e96110254410c9c9908a13ba2e5e2730ee8f05
diff --combined Documentation/Makefile
index fa9e5c0acd,bcd216d96c..d079d7c73a
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@@ -78,7 -78,6 +78,7 @@@ TECH_DOCS += technical/pack-heuristic
  TECH_DOCS += technical/pack-protocol
  TECH_DOCS += technical/protocol-capabilities
  TECH_DOCS += technical/protocol-common
 +TECH_DOCS += technical/protocol-v2
  TECH_DOCS += technical/racy-git
  TECH_DOCS += technical/send-pack-pipeline
  TECH_DOCS += technical/shallow
@@@ -185,7 -184,7 +185,7 @@@ ASCIIDOC = asciidocto
  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 --combined Documentation/revisions.txt
index e760416d07,8f60c9f431..7d1bd44094
--- a/Documentation/revisions.txt
+++ b/Documentation/revisions.txt
@@@ -7,10 -7,6 +7,10 @@@ syntax.  Here are various ways to spel
  ones listed near the end of this list name trees and
  blobs contained in a commit.
  
 +NOTE: This document shows the "raw" syntax as seen by git. The shell
 +and other UIs might require additional quoting to protect special
 +characters and to avoid word splitting.
 +
  '<sha1>', e.g. 'dae86e1950b1277e545cee180551750029cfe735', 'dae86e'::
    The full SHA-1 object name (40-byte hexadecimal string), or
    a leading substring that is unique within the repository.
@@@ -190,8 -186,6 +190,8 @@@ existing tag object
    is matched. ':/!-foo' performs a negative match, while ':/!!foo' matches a
    literal '!' character, followed by 'foo'. Any other sequence beginning with
    ':/!' is reserved for now.
 +  Depending on the given text, the shell's word splitting rules might
 +  require additional quoting.
  
  '<rev>:<path>', e.g. 'HEAD:README', ':README', 'master:./README'::
    A suffix ':' followed by a path names the blob or tree
@@@ -351,6 -345,7 +351,7 @@@ Here are a handful of examples using th
  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 -368,4 +374,4 @@@
  	  = B ^B^1 ^B^2 ^B^3
  	  = B ^D ^E ^F          B
     F^! D  = F ^I ^J D           G H D F
+ ....