Merge branch 'jk/no-more-asciidoc7'
commit10fcd5194f442c5320f1001feed8cb1ca4d201ae
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Jun 2012 18:24:10 +0000 (25 11:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Jun 2012 18:24:10 +0000 (25 11:24 -0700)
treef45f6cc18f564db7438fda8342fd4a2b9bfdde74
parent8df9be792b1a8cc349a7a9f321be7c36c2a2a18d
parenta3d05510ceb442fd6987eb284bb25d1f38535469
Merge branch 'jk/no-more-asciidoc7'

We no longer use AsciiDoc7 syntax in our documentation and favor a
more modern style.

* jk/no-more-asciidoc7:
  docs: drop antique comment from Makefile
  docs: drop asciidoc7compatible flag
Documentation/Makefile
Makefile