From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 20 Aug 2018 18:33:55 +0000 (-0700)
Subject: Merge branch 'jh/partial-clone-doc'
X-Git-Tag: v2.19.0-rc0~12
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6bbd1034d869756ac2679879bd2fa085b1a8f137?ds=inline;hp=-c

Merge branch 'jh/partial-clone-doc'

Doc updates.

* jh/partial-clone-doc:
partial-clone: render design doc using asciidoc
---

6bbd1034d869756ac2679879bd2fa085b1a8f137
diff --combined Documentation/Makefile
index d079d7c73a,74f101d6e5..a42dcfc745
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@@ -39,7 -39,6 +39,7 @@@ MAN7_TXT += gitworkflows.tx
  MAN_TXT = $(MAN1_TXT) $(MAN5_TXT) $(MAN7_TXT)
  MAN_XML = $(patsubst %.txt,%.xml,$(MAN_TXT))
  MAN_HTML = $(patsubst %.txt,%.html,$(MAN_TXT))
 +GIT_MAN_REF = master
  
  OBSOLETE_HTML += everyday.html
  OBSOLETE_HTML += git-remote-helpers.html
@@@ -72,13 -71,12 +72,14 @@@ TECH_DOCS += SubmittingPatche
  TECH_DOCS += technical/hash-function-transition
  TECH_DOCS += technical/http-protocol
  TECH_DOCS += technical/index-format
 +TECH_DOCS += technical/long-running-process-protocol
  TECH_DOCS += technical/pack-format
  TECH_DOCS += technical/pack-heuristics
  TECH_DOCS += technical/pack-protocol
+ TECH_DOCS += technical/partial-clone
  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 -183,7 +186,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 =
@@@ -440,14 -438,14 +441,14 @@@ require-manrepo:
  	then echo "git-manpages repository must exist at $(MAN_REPO)"; exit 1; fi
  
  quick-install-man: require-manrepo
 -	'$(SHELL_PATH_SQ)' ./install-doc-quick.sh $(MAN_REPO) $(DESTDIR)$(mandir)
 +	'$(SHELL_PATH_SQ)' ./install-doc-quick.sh $(MAN_REPO) $(DESTDIR)$(mandir) $(GIT_MAN_REF)
  
  require-htmlrepo::
  	@if test ! -d $(HTML_REPO); \
  	then echo "git-htmldocs repository must exist at $(HTML_REPO)"; exit 1; fi
  
  quick-install-html: require-htmlrepo
 -	'$(SHELL_PATH_SQ)' ./install-doc-quick.sh $(HTML_REPO) $(DESTDIR)$(htmldir)
 +	'$(SHELL_PATH_SQ)' ./install-doc-quick.sh $(HTML_REPO) $(DESTDIR)$(htmldir) $(GIT_MAN_REF)
  
  print-man1:
  	@for i in $(MAN1_TXT); do echo $$i; done