Merge branch 'mv/um-pdf'

* mv/um-pdf:
  Add support for a pdf version of the user manual

diff --cc Documentation/Makefile
index 5cd8b63ac553e13c1e3d779ea17dec0c5fb615cb,69f4ade06f94acb80289cf9f12928c574801801a..144ec32f12a7950746dd71e2ddde5b3f0cab57b0
--- 1/Documentation/Makefile
--- 2/Documentation/Makefile
+++ b/Documentation/Makefile
@@@ -187,14 -195,18 +195,19 @@@ git.info: user-manual.tex
  
  user-manual.texi: user-manual.xml
        $(RM) $@+ $@
 -      $(DOCBOOK2X_TEXI) user-manual.xml --to-stdout | $(PERL_PATH) fix-texi.perl >$@+
 +      $(DOCBOOK2X_TEXI) user-manual.xml --encoding=UTF-8 --to-stdout | \
 +              $(PERL_PATH) fix-texi.perl >$@+
        mv $@+ $@
  
+ user-manual.pdf: user-manual.xml
+       $(RM) $@+ $@
+       $(DBLATEX) -o $@+ -p /etc/asciidoc/dblatex/asciidoc-dblatex.xsl -s /etc/asciidoc/dblatex/asciidoc-dblatex.sty $<
+       mv $@+ $@
+ 
  gitman.texi: $(MAN_XML) cat-texi.perl
        $(RM) $@+ $@
 -      ($(foreach xml,$(MAN_XML),$(DOCBOOK2X_TEXI) --to-stdout $(xml);)) | \
 -      $(PERL_PATH) cat-texi.perl $@ >$@+
 +      ($(foreach xml,$(MAN_XML),$(DOCBOOK2X_TEXI) --encoding=UTF-8 \
 +              --to-stdout $(xml);)) | $(PERL_PATH) cat-texi.perl $@ >$@+
        mv $@+ $@
  
  gitman.info: gitman.texi

diff --cc Makefile
Simple merge