Merge branch 'jk/doc-asciidoc-inline-literal' into maint
commitbadabc06f3f34a85a931dffa8e8d607d2ff016fc
authorJunio C Hamano <gitster@pobox.com>
Mon, 14 May 2012 18:43:04 +0000 (14 11:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 14 May 2012 18:43:04 +0000 (14 11:43 -0700)
treea18d3b797aac88c667b5fb5a5cf79c08274d8709
parent3734dbc4abce39c20530e36c2d47d3269ac0e6cd
parent6cf378f0cbe7c7f944637892caeb9058c90a185a
Merge branch 'jk/doc-asciidoc-inline-literal' into maint

By Jeff King
* jk/doc-asciidoc-inline-literal:
  docs: stop using asciidoc no-inline-literal
Documentation/config.txt