From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 2 Feb 2017 21:36:57 +0000 (-0800)
Subject: Merge branch 'bc/use-asciidoctor-opt'
X-Git-Tag: v2.12.0-rc0~12
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a77fe4a976dadea6ae0549a78a004665dbefdc7a

Merge branch 'bc/use-asciidoctor-opt'

Asciidoctor, an alternative reimplementation of AsciiDoc, still
needs some changes to work with documents meant to be formatted
with AsciiDoc.  "make USE_ASCIIDOCTOR=YesPlease" to use it out of
the box to document our pages is getting closer to reality.

* bc/use-asciidoctor-opt:
Documentation: implement linkgit macro for Asciidoctor
Makefile: add a knob to enable the use of Asciidoctor
Documentation: move dblatex arguments into variable
Documentation: add XSLT to fix DocBook for Texinfo
Documentation: sort sources for gitman.texi
Documentation: remove unneeded argument in cat-texi.perl
Documentation: modernize cat-texi.perl
Documentation: fix warning in cat-texi.perl
---

a77fe4a976dadea6ae0549a78a004665dbefdc7a