Merge branch 'fixes'

diff --combined Documentation/Makefile
index 822098ad9ca24b84e3524787904c118874b2de79,01fad8ea5d0867fa32b03a0e9b77383201b6a41b..aecae676dea995749ed9ba7122e31f5d0c64974c
--- 1/Documentation/Makefile
--- 2/Documentation/Makefile
+++ b/Documentation/Makefile
@@@ -44,26 -44,28 +44,28 @@@ man: man1 man
  man1: $(DOC_MAN1)
  man7: $(DOC_MAN7)
  
- install:
+ install: man
        $(INSTALL) -d -m755 $(DESTDIR)/$(man1) $(DESTDIR)/$(man7)
        $(INSTALL) $(DOC_MAN1) $(DESTDIR)/$(man1)
        $(INSTALL) $(DOC_MAN7) $(DESTDIR)/$(man7)
  
  # 'include' dependencies
- git-diff-%.txt: diff-format.txt diff-options.txt
-       touch $@
+ $(patsubst %.txt,%.1,$(wildcard git-diff-*.txt)): \
+       diff-format.txt diff-options.txt
+ $(patsubst %,%.1,git-fetch git-pull git-push): pull-fetch-param.txt
+ git.7: ../README
  
  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