Merge branch 'master' of git://linux-nfs.org/~bfields/git

This is in the hope of giving JBF's user-manual wider exposure.
I am not very happy with trailing whitespaces in the new
document, but let's not worry too much about the formatting
issues for now, but concentrate more on the structure and the
contents.

diff --combined Documentation/Makefile
index 5314068d32f1e9205ec7b76c9356674a414d773c,c2ee5b4824aa8708ddbddf0afd4415442a086557..5e012f48e360985f8433da971daa1de8075da758
--- 1/Documentation/Makefile
--- 2/Documentation/Makefile
+++ b/Documentation/Makefile
@@@ -17,7 -17,7 +17,7 @@@ ARTICLES += hook
  ARTICLES += everyday
  ARTICLES += git-tools
  # with their own formatting rules.
- SP_ARTICLES = glossary howto/revert-branch-rebase
+ SP_ARTICLES = glossary howto/revert-branch-rebase user-manual
  
  DOC_HTML += $(patsubst %,%.html,$(ARTICLES) $(SP_ARTICLES))
  
@@@ -71,24 -71,14 +71,24 @@@ doc.dep : $(wildcard *.txt) build-docde
  
  -include doc.dep
  
 -git.7: README
 +cmds_txt = cmds-ancillaryinterrogators.txt \
 +      cmds-ancillarymanipulators.txt \
 +      cmds-mainporcelain.txt \
 +      cmds-plumbinginterrogators.txt \
 +      cmds-plumbingmanipulators.txt \
 +      cmds-synchingrepositories.txt \
 +      cmds-synchelpers.txt \
 +      cmds-purehelpers.txt \
 +      cmds-foreignscminterface.txt
  
 -README: ../README
 -      cp $< $@
 +$(cmds_txt): cmd-list.perl $(MAN1_TXT)
 +      perl ./cmd-list.perl
  
 +git.7 git.html: git.txt core-intro.txt
  
  clean:
 -      rm -f *.xml *.html *.1 *.7 howto-index.txt howto/*.html doc.dep README
 +      rm -f *.xml *.html *.1 *.7 howto-index.txt howto/*.html doc.dep
 +      rm -f $(cmds_txt)
  
  %.html : %.txt
        asciidoc -b xhtml11 -d manpage -f asciidoc.conf $<
@@@ -99,6 -89,14 +99,12 @@@
  %.xml : %.txt
        asciidoc -b docbook -d manpage -f asciidoc.conf $<
  
 -git.html: git.txt README
 -
+ user-manual.xml: user-manual.txt user-manual.conf
+       asciidoc -b docbook -d book $<
+ 
+ user-manual.html: user-manual.xml
+       xmlto -m /etc/asciidoc/docbook-xsl/xhtml.xsl html-nochunks $<
+ 
  glossary.html : glossary.txt sort_glossary.pl
        cat $< | \
        perl sort_glossary.pl | \