Merge branch 'jc/diff' into next

diff --git a/Documentation/Makefile b/Documentation/Makefile
index f4cbf7e159be721bf17625b07c1d7b4f36c60f78..c1af22ce04f71fe2d4a49a908e10878f7b5e0bcf 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -79,7 +79,7 @@ clean:
        asciidoc -b xhtml11 -d manpage -f asciidoc.conf $<
 
 %.1 %.7 : %.xml
-       xmlto man $<
+       xmlto -m callouts.xsl man $<
 
 %.xml : %.txt
        asciidoc -b docbook -d manpage -f asciidoc.conf $<