From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 Nov 2018 13:57:53 +0000 (+0900)
Subject: Merge branch 'ts/doc-build-manpage-xsl-quietly' into maint
X-Git-Tag: v2.19.2~37
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7532a181895e2560ffe8b631df9add386b84671c?hp=-c

Merge branch 'ts/doc-build-manpage-xsl-quietly' into maint

Build tweak.

* ts/doc-build-manpage-xsl-quietly:
Documentation/Makefile: make manpage-base-url.xsl generation quieter
---

7532a181895e2560ffe8b631df9add386b84671c
diff --combined Documentation/Makefile
index a42dcfc745,4a59c6243f..95f6a321f2
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@@ -72,14 -72,11 +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
@@@ -186,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 =
@@@ -344,7 -341,7 +344,7 @@@ $(OBSOLETE_HTML): %.html : %.txto ascii
  	mv $@+ $@
  
  manpage-base-url.xsl: manpage-base-url.xsl.in
- 	sed "s|@@MAN_BASE_URL@@|$(MAN_BASE_URL)|" $< > $@
+ 	$(QUIET_GEN)sed "s|@@MAN_BASE_URL@@|$(MAN_BASE_URL)|" $< > $@
  
  %.1 %.5 %.7 : %.xml manpage-base-url.xsl
  	$(QUIET_XMLTO)$(RM) $@ && \