Merge branch 'js/asciidoctor-tweaks' into next
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Jan 2017 01:05:45 +0000 (17:05 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Jan 2017 01:05:45 +0000 (17:05 -0800)
commit8553c6e5137d7fde1cda49817bcc035d3ce35aeb
treec0a22d5d0bfc31e991af3195e8c662fb48117781
parent7c9eae479eec29a9c579e63fd6ec3ce849721fc8
parent03920ac69b62db6e95a7bb4914cf01d932421555
Merge branch 'js/asciidoctor-tweaks' into next

Adjust documentation to help AsciiDoctor render better while not
breaking the rendering done by AsciiDoc.

* js/asciidoctor-tweaks:
  asciidoctor: fix user-manual to be built by `asciidoctor`