Merge http://www.kernel.org/pub/scm/gitk/gitk

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 01fad8ea5d0867fa32b03a0e9b77383201b6a41b..aecae676dea995749ed9ba7122e31f5d0c64974c 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -59,13 +59,13 @@ clean:
        rm -f *.xml *.html *.1 *.7 howto-index.txt howto/*.html
 
 %.html : %.txt
-       asciidoc -b xhtml11 -d manpage $<
+       asciidoc -b xhtml11 -d manpage -f asciidoc.conf $<
 
 %.1 %.7 : %.xml
        xmlto man $<
 
 %.xml : %.txt
-       asciidoc -b docbook -d manpage $<
+       asciidoc -b docbook -d manpage -f asciidoc.conf $<
 
 git.html: git.txt ../README