Merge branch 'maint' to sync with GIT 1.5.2.2

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 9cef4806d1a51bac670ebe192a4482fde95c9013..4edf788c3a8ddf39638028447ca78624305da778 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -37,6 +37,9 @@ man7dir=$(mandir)/man7
 
 ASCIIDOC=asciidoc
 ASCIIDOC_EXTRA =
+ifdef ASCIIDOC8
+ASCIIDOC_EXTRA += -a asciidoc7compatible
+endif
 INSTALL?=install
 DOC_REF = origin/man