From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 26 Jul 2009 05:54:03 +0000 (-0700)
Subject: Merge git://git.bogomips.org/git-svn
X-Git-Tag: v1.6.4-rc3~2
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/ae71760d242abd564eef2f5587a9633f2ee882dc?hp=5f8b2cbacd3bad38d0ae4d358fe9b34e98190935

Merge git://git.bogomips.org/git-svn

* git://git.bogomips.org/git-svn:
git svn: make minimize URL more reliable over http(s)
git svn: avoid escaping '/' when renaming/copying files
t9142: stop httpd after the test
git svn: the branch command no longer needs the full path
git svn: revert default behavior for --minimize-url
git svn: add gc command
---

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 7a8037f586..06b0c57b95 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -84,7 +84,7 @@ endif
 #
 
 ifdef ASCIIDOC8
-ASCIIDOC_EXTRA += -a asciidoc7compatible
+ASCIIDOC_EXTRA += -a asciidoc7compatible -a no-inline-literal
 endif
 ifdef DOCBOOK_XSL_172
 ASCIIDOC_EXTRA += -a git-asciidoc-no-roff