Adjust contrib/subtree to AsciiDoctor 2, too

[dscho]

This is something I had to do because the Git for Windows release process now offers only AsciiDoctor 2.

[dscho]

/submit

[gitgitgadget]

Submitted as pull.600.git.1586355949189.gitgitgadget@gmail.com

[gitgitgadget]

On the Git mailing list, Junio C Hamano wrote (reply to this):

"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
writes:

> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> This is a (late) companion for f6461b82b93 (Documentation: fix build
> with Asciidoctor 2, 2019-09-15).
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
>     Adjust contrib/subtree to AsciiDoctor 2, too
>     
>     This is something I had to do because the Git for Windows release
>     process now offers only AsciiDoctor 2.

Thanks.  The original justifies its change quite well, and its
reasoning applies perfectly well here, too.

> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-600%2Fdscho%2Fsubtree-and-docbook-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-600/dscho/subtree-and-docbook-v1
> Pull-Request: https://github.com/gitgitgadget/git/pull/600
>
>  contrib/subtree/Makefile | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile
> index 6906aae4414..6fa7496bfdb 100644
> --- a/contrib/subtree/Makefile
> +++ b/contrib/subtree/Makefile
> @@ -25,14 +25,16 @@ ASCIIDOC_HTML    = xhtml11
>  ASCIIDOC_DOCBOOK = docbook
>  ASCIIDOC_EXTRA   =
>  XMLTO            = xmlto
> +XMLTO_EXTRA      =
>  
>  ifdef USE_ASCIIDOCTOR
>  ASCIIDOC         = asciidoctor
>  ASCIIDOC_CONF    =
>  ASCIIDOC_HTML    = xhtml5
> -ASCIIDOC_DOCBOOK = docbook45
> +ASCIIDOC_DOCBOOK = docbook
>  ASCIIDOC_EXTRA  += -I../../Documentation -rasciidoctor-extensions
>  ASCIIDOC_EXTRA  += -alitdd='&\#x2d;&\#x2d;'
> +XMLTO_EXTRA     += --skip-validation
>  endif
>  
>  ifndef SHELL_PATH
> @@ -78,7 +80,7 @@ install-html: $(GIT_SUBTREE_HTML)
>  	$(INSTALL) -m 644 $^ $(DESTDIR)$(htmldir)
>  
>  $(GIT_SUBTREE_DOC): $(GIT_SUBTREE_XML)
> -	$(XMLTO) -m $(MANPAGE_XSL) man $^
> +	$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $^
>  
>  $(GIT_SUBTREE_XML): $(GIT_SUBTREE_TXT)
>  	$(ASCIIDOC) -b $(ASCIIDOC_DOCBOOK) -d manpage $(ASCIIDOC_CONF) \
>
> base-commit: 9fadedd637b312089337d73c3ed8447e9f0aa775

[gitgitgadget]

This branch is now known as js/subtree-doc-update-to-asciidoctor-2.

[gitgitgadget]

This patch series was integrated into pu via git@66ee4d8.

[gitgitgadget]

This patch series was integrated into pu via git@b8afaff.

[gitgitgadget]

This patch series was integrated into pu via git@242fc06.

[gitgitgadget]

This patch series was integrated into pu via git@30425e0.

[gitgitgadget]

This patch series was integrated into pu via git@1141d87.

[gitgitgadget]

This patch series was integrated into pu via git@8b08a64.

[gitgitgadget]

This patch series was integrated into pu via git@932f8c3.

[gitgitgadget]

This patch series was integrated into pu via git@3b1b76e.

[gitgitgadget]

This patch series was integrated into pu via git@dff4f73.

[gitgitgadget]

This patch series was integrated into pu via git@c85e1b7.

[gitgitgadget]

This patch series was integrated into pu via git@5d48545.

[gitgitgadget]

This patch series was integrated into pu via git@59b06f6.

[gitgitgadget]

This patch series was integrated into pu via git@1c0b753.

[gitgitgadget]

This patch series was integrated into pu via git@96bc0b6.

[gitgitgadget]

This patch series was integrated into next via git@db1ed7a.

[gitgitgadget]

This patch series was integrated into pu via git@3b3f97a.

[gitgitgadget]

This patch series was integrated into pu via git@0191762.

[gitgitgadget]

This patch series was integrated into pu via git@db3ee69.

[gitgitgadget]

This patch series was integrated into pu via git@772d785.

[gitgitgadget]

This patch series was integrated into next via git@772d785.

[gitgitgadget]

This patch series was integrated into master via git@772d785.

[gitgitgadget]

Closed via 772d785.